RanchiMall/php-mpos
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
2,186 Commits 4 Branches 11 Tags 14 MiB
ef904858ae
Commit Graph

1451 Commits

Author SHA1 Message Date
Sebastian Grewe
88c962266f [IMPROVED] Wrapper for contributor stats 
Fixes a small alignment issue with unbalance table heights.
 2014-01-11 12:04:48 +01:00
Sebastian Grewe
41defc88fa Merge pull request #1338 from cpo/next 
issue-1336
 2014-01-10 23:17:31 -08:00
Sebastian Grewe
07cc791d83 Merge pull request #1350 from rog1121/next 
Add Custom Stratum URL
 2014-01-10 22:21:10 -08:00
rog1121
412807b7a8 Add Stratum URL 2014-01-10 18:40:06 -07:00
Glen
bbb82ccd69 Update global.inc.dist.php 
Just thought I would fix a couple of spelling errors for next global.inc.dist.php release :)
 2014-01-11 10:49:59 +11:00
Sebastian Grewe
af15e45632 Merge pull request #1346 from TheSerapher/issue-1341 
[FIX] No filter on admin news pages
 2014-01-10 11:00:32 -08:00
Sebastian Grewe
7a1a917af0 [FIX] No filter on admin news pages 2014-01-10 20:00:09 +01:00
Sebastian Grewe
aa716c274c Merge pull request #1342 from TheSerapher/issue-1315 
Issue 1315
 2014-01-10 10:38:01 -08:00
Sebastian Grewe
67b2ce6bff [FIX] News formatting 2014-01-10 19:23:38 +01:00
Sebastian Grewe
9fbc36f9ac [FIX] Re-added simple error to jsonRPC 2014-01-10 17:08:11 +01:00
Sebastian Grewe
43bd1beeb8 [FIX] Surpress any URL info 2014-01-10 17:00:58 +01:00
Sebastian Grewe
6aefea6b6f [FIX] Better error handling 2014-01-10 16:41:05 +01:00
Sebastian Grewe
0b43c66e67 [CLEANUP] Removed newline 2014-01-10 16:34:36 +01:00
Sebastian Grewe
90a8404bab [CLEANUP] Code cleanup, error checking 
Fixes #1315 once merged.
 2014-01-10 16:34:36 +01:00
myrinx
fca7bd7b3d Update global.inc.dist.php 
removed wallet address :)
 2014-01-10 16:34:36 +01:00
myrinx
be77b05b12 Update global.inc.dist.php 
added config variabled for the liquid_payout.php cronjob
 2014-01-10 16:34:36 +01:00
myrinx
a37ebd2db8 Update version.inc.php 
changed config to 0.0.2 to support liquid_payout.php cron
 2014-01-10 16:34:36 +01:00
Sebastian Grewe
627b7a17ff [FIX] Catch jsonRPC exceptions 
Fixes #1339 once merged.
 2014-01-10 16:20:24 +01:00
Chris Polderman
5981489925 issue-1336 2014-01-10 14:15:41 +01:00
Sebastian Grewe
10dbcd471d [IMPROVE] Enable SSL on recaptcha_get_html 
Fixes #1334 once merged.
 2014-01-10 11:00:00 +01:00
Sebastian Grewe
d16b5a1067 Merge pull request #1327 from rog1121/next 
Add CLEditor to News
 2014-01-10 00:27:54 -08:00
Sebastian Grewe
8498692f2b [FIX] Properly un-escape Google Analytics code 2014-01-10 09:15:08 +01:00
Sebastian Grewe
691fa28cc0 Update master.tpl 
Fixed analytical code position.
 2014-01-10 07:53:36 +01:00
Sebastian Grewe
19094e73e3 Merge pull request #1271 from drainx/next 
JSON-RPC
 2014-01-09 22:11:35 -08:00
Sebastian Grewe
c16945d564 Merge pull request #1313 from TheSerapher/issue-1233 
[IMPROVED] Auto-escape all used smarty variables
 2014-01-09 22:11:12 -08:00
Sebastian Grewe
8e356d1eaf Merge pull request #1311 from TheSerapher/issue-1281 
[FIX] Number formatting on pages
 2014-01-09 22:10:22 -08:00
rog1121
8e06c41a90 CLEditor 2014-01-09 21:13:47 -07:00
Glen
748a3d48c3 Update default.tpl 
Suggestion to remove 'account' column from user 'transactions' page to allow more real estate on the page.

The 'account' really is a waste of space anyway for the user view on the other hand the transactions in the Admin panel the account column is useful.
 2014-01-10 13:17:45 +11:00
Sebastian Grewe
b12a45ed2a Merge pull request #1306 from TheSerapher/issue-1300 
Issue 1300
 2014-01-09 08:41:30 -08:00
Sebastian Grewe
a2a6f36c1f [IMPROVED] Auto-escape all used smarty variables 
http://www.smarty.net/docs/en/variable.escape.html.tpl

Addresses #1233
 2014-01-09 11:10:47 +01:00
Sebastian Grewe
02cd098099 [FIX] #1245 Typo 2014-01-09 11:05:06 +01:00
Sebastian Grewe
3645a23333 Merge pull request #1312 from TheSerapher/issue-1061-deleteuser 
[UPDATE] Allow deletion of accounts
 2014-01-09 01:33:12 -08:00
Sebastian Grewe
b82e500379 [FIX] Number formatting on pages 
* Added new global js library to convert number_format similar to PHP
 * Does some rounding, so not 100% perfect but does the trick
* Added new library to master template
* Updated dashboard to use this library for all numbers in question

Fixes #1276
 2014-01-09 10:25:48 +01:00
Sebastian Grewe
fcbf153bd9 [FIX] Do not show xaxis ticks 
Ticks take too much room and don't convey enough information. They are
now removed.

Fixes #1276 once merged.
 2014-01-09 09:16:50 +01:00
Sebastian Grewe
eafb241bde [REMOVED] Support page code 2014-01-09 09:11:33 +01:00
Sebastian Grewe
6e99806479 [REMOVE] Uneeded, useless support page 
* Removed support page templates
* Changed navigation to contact
* Modified contact form behaviour on enable/disable events

This fixes #1300. It wasn't clear which templates needed to be edited
for the contact form to work.
 2014-01-09 09:09:14 +01:00
Sebastian Grewe
146cf94a5e [CLEANUP] Registration page 2014-01-08 09:23:42 +01:00
Andrea Baccega
7fd258fab4 Fixed documentation typos. 2014-01-07 15:56:47 +01:00
Sebastian Grewe
937bf56c18 Merge pull request #1279 from raistlinthewiz/next 
Updated max lenght of username field in password-reset form
 2014-01-07 04:13:11 -08:00
Hüseyin Uslu
b69991e129 Increased password-reset form username size to 100 
Increased the accepted max-length to 100 as requested:  https://github.com/TheSerapher/php-mpos/pull/1279#issuecomment-31732351
 2014-01-07 14:11:26 +02:00
Hüseyin Uslu
748e4796c1 Updated max lenght of username field in password-reset form 
As the password reset form can also accept emails, increased the max-length size to 50 - so that we can accept long emails too.
 2014-01-07 14:04:21 +02:00
Sebastian Grewe
549477a7ad [ADDED] User overview in admin dashboard 
* Total users
* Locked users
* Admin users
* No Fees users

Thanks @daygle for the suggestion!

Fixes #1277 once merged
 2014-01-07 10:32:34 +01:00
Sebastian Grewe
ef28547940 Merge branch 'next' of https://github.com/TheSerapher/php-mpos into next 2014-01-07 09:40:02 +01:00
Sebastian Grewe
727b082059 [FIX] Registration password lenght, API class default time 2014-01-07 09:39:43 +01:00
drainx
f7b087df98 Small human error fix. 2014-01-06 18:29:23 -06:00
drainx
5a1c693fa6 Move from XML-RPC to JSON-RPC. 2014-01-06 17:34:54 -06:00
Sebastian Grewe
5ce2662ae5 Merge pull request #1246 from TheSerapher/issue-1242 
[INITIAL] Working version checks
 2014-01-06 08:05:32 -08:00
Sebastian Grewe
fe31737576 Merge pull request #1264 from TheSerapher/issue-1016 
[FIX] Caching issues with hybrid templates
 2014-01-06 03:27:56 -08:00
Sebastian Grewe
418728071b [UPDATE] Allow deletion of accounts 
Updated backend and theme to be able to deal with deleted accounts

    * Backends will skip any users that have no account_id associated with
      their shares
    * Updated round stats theme to show users as unknown if none can be found

    This will not fully address the issue of account deletion but at least
    wont break the system anymore.
 2014-01-06 12:26:57 +01:00
Sebastian Grewe
d0e899b7d0 [FIX] Empty / no template detection 2014-01-06 12:00:48 +01:00
Sebastian Grewe
cfe47ed787 [FIX] Caching issues with hybrid templates 
* Create subfolders for cache/compiled files for themes

Fixes #1016 once merged.
 2014-01-06 10:52:21 +01:00
Sebastian Grewe
766032fbdb Merge pull request #1259 from TheSerapher/issue-1255 
[FIX] Closing nocache tags
 2014-01-05 22:26:03 -08:00
Sebastian Grewe
64958782a4 [FIX] Closing nocache tags 
Fixes #1255 once merged.
 2014-01-06 07:25:09 +01:00
Sebastian Grewe
3f1e74e381 [UPSTREAM] Upgraded smarty libraries 
Fixes #1249 once merged.
 2014-01-05 13:41:41 +01:00
Sebastian Grewe
2568ced4d4 [INITIAL] Working version checks 
* Check DB structure version, config file version and MPOS core version
* Added new Admin Dashboard to show this core information
* Cronjobs will be disabled if SQL files are not imported
 * SQL files must re-set the db_upgrade_required setting
* Cronjobs will disabled if config files are not updated
 * Simple config file update and version string update will fix this
* Added MPOS status overview
 * Cronjobs and Wallet information for now, others may be added later
* Added new navigation link for Admin Panel Dashboard
* Added new version file
 * Will require updates whenever DB or configs are updated
* Update SQL file that adds the DB_VERSION setting

This will address #1242 and already includes a huge chunk of changes
required to make this work.
 2014-01-05 11:19:09 +01:00
Sebastian Grewe
017a56549d Merge pull request #1213 from TheSerapher/issue-670-unlocks 
[IMPROVED] Unlock notification mails on auto-locks
 2014-01-04 00:11:28 -08:00
Sebastian Grewe
8fcd59eeea [ADDED] Account unlock mail on failed PIN 2014-01-02 13:28:33 +01:00
Sebastian Grewe
8c2912a7df Merge branch 'next' of https://github.com/TheSerapher/php-mpos into next 2014-01-02 12:25:46 +01:00
Sebastian Grewe
11c417230b [FIX] Reset pin button 2014-01-02 12:25:22 +01:00
Sebastian Grewe
878fa1c1c8 [IMPROVED] Unlock notification mails on auto-locks 
* Added new token type: account_unlock
* Added update SQL File
* Updated base structure with new token type
* Added empty template
* Updated user class to send mail on failed passwords
* Added unlock account page to use tokens

Addresses #670
 2014-01-02 11:51:22 +01:00
Sebastian Grewe
80d0467c2d Merge pull request #1211 from TheSerapher/issue-1040 
[CHANGE] Moved from bar shares to pie shares
 2014-01-02 02:09:34 -08:00
Sebastian Grewe
5c5db8dc93 Merge pull request #1191 from TheSerapher/issue-1181 
Issue 1181
 2014-01-02 02:08:19 -08:00
Sebastian Grewe
e8d460cfe6 [UPDATE] Removed debug echo output 2014-01-02 11:05:49 +01:00
Sebastian Grewe
67a6d9aff4 [UPDATE] Coding style 2014-01-02 11:05:07 +01:00
Sebastian Grewe
4c3421cc8a Merge pull request #1165 from Neozonz/issue-1164 
Initial commit for pin reset functionality
 2014-01-02 02:02:37 -08:00
rog1121
494a3a2714 Fix Hardcoded blockchain 2014-01-01 15:08:39 -07:00
Sebastian Grewe
dc81ad3123 Merge pull request #1166 from TheSerapher/issue-1159 
Issue 1159
 2014-01-01 02:11:02 -08:00
Sebastian Grewe
e762bb0391 [IMPROVED] Use data interval on getuserworkers 2014-01-01 09:08:09 +01:00
Sebastian Grewe
020905679a [FIX] Display TX Fee in account panel 
Fixes #1196 once merged.
 2014-01-01 08:43:53 +01:00
Sebastian Grewe
6656e47fdc [FIX] Spelling error 
Fixes #1192 once merged
 2014-01-01 08:39:49 +01:00
Sebastian Grewe
4fa4259932 [CHANGE] Moved from bar shares to pie shares 
The cake is a lie! It's a pie!

Addresses #1040
 2013-12-31 23:51:39 +01:00
Sebastian Grewe
731985b30f [IMPROVED] Token expiration timers 
* Added new SQL file to update tokentypes table
* Added new function to base class
* Renamed function in base class used in shares class
* Added new error code
* Added new cronjob to delete expired tokens
* Added new cronjob to run-cron scripts and monitoring page
* Added new function to tokentype class
* Added new function to token class

Will address #1181 once merged.
 2013-12-31 22:31:47 +01:00
Sebastian Grewe
82efbb4609 Merge branch 'issue-1185' into next 
Conflicts:
	public/templates/mpos/global/navigation.tpl
 2013-12-31 17:11:03 +01:00
Sebastian Grewe
2675a9573f [FIX] Better version 2013-12-31 16:34:37 +01:00
Sebastian Grewe
e9c780f2ee [FIX] Don not show decimals > 0.0001 fee 2013-12-31 16:32:57 +01:00
Sebastian Grewe
9c2e6fa30b [FIX] Properly display pool fee in dashboard 
Fixes #1178 once merged.
 2013-12-31 16:28:53 +01:00
Sebastian Grewe
ee02445b7d Merge branch 'issue-965' into next 
Conflicts:
	public/templates/mpos/master.tpl
 2013-12-31 16:27:16 +01:00
Sebastian Grewe
4026eec570 Merge pull request #1187 from TheSerapher/issue-1159-dashboardsplit 
[IMPROVED]
 2013-12-31 07:19:11 -08:00
Sebastian Grewe
4a98724fc5 [FIX] Disallow to post messages for guests 
* Disallow to post messages if guest forms are disabled
 2013-12-31 16:17:02 +01:00
Sebastian Grewe
a8a7d2c52f [IMPROVED] Allow contactform for guests 
* Added admin option to disable access to contactform for guests
* Propagated new option to templates

Fixes #1185
 2013-12-31 16:14:56 +01:00
Frederick Behrends
f333bdcc0e moved blockchainsettings to extra page in admin settings 2013-12-31 04:39:27 +01:00
Frederick Behrends
3b980cbf5d [IMPROVMENT] Added option to link transaction-ids to transaction on blockchainwebsite 2013-12-31 04:25:47 +01:00
Neozonz
33b06946f4 PIN Reset email template 2013-12-30 11:45:39 -08:00
Sebastian Grewe
8e4c56d597 [IMPROVED] 
Splitting dashboard calls up instead of using one single API call:

* Use getuserbalance for Balance updates
* Use getuserworkers for Worker updates

For those and potential other SQL intensive Ajax calls I have added a
long ajax refresh interval setting. It can be set via admin panel and
will change the refresh time on the JS file on the dashboard for those
two calls.

Should help a bit with high worker and transaction volume pools.

Address #1159
 2013-12-30 19:23:27 +01:00
Neozonz
5e401bd6dd fixed indent 2013-12-30 09:17:22 -08:00
Sebastian Grewe
b2ac77d9a5 Merge pull request #1128 from nicoschtein/patch-12 
Make TXId & Address clickable on Transaction Lists
 2013-12-30 03:23:14 -08:00
Sebastian Grewe
2c18abf8be [SECURITY] Better token generator 2013-12-30 12:15:36 +01:00
Sebastian Grewe
abb3688e56 [FIX] Hardcoded confirms removed 2013-12-30 12:05:33 +01:00
Sebastian Grewe
48a4edad5b [FIX] Proper account summary 2013-12-30 12:02:38 +01:00
Sebastian Grewe
de302a03dc [IMPROVED] data gathering for Auto Payout 
* Using improved SQL query created by @feeleep75
* Adjusted the query to further cut down the data returned

Fixes #1159 once merged.
 2013-12-30 11:57:29 +01:00
Neozonz
e3db7e0a02 Initial commit for pin reset functionality 2013-12-30 03:29:20 -05:00
Sebastian Grewe
96d096f669 [MERGE] Fix merge conflict 2013-12-30 08:19:13 +01:00
Sebastian Grewe
f4a1110c48 Merge pull request #1089 from TheSerapher/issue-1043 
Issue 1043
 2013-12-28 12:23:23 -08:00
Sebastian Grewe
bac119dcc8 Merge pull request #1132 from poolpm/patch-1 
[FIX] Wrong behavior on Edit Account with no addy
 2013-12-28 12:18:05 -08:00
neonbunny
f94e48eb89 Fix for reflected XSS security issue. 2013-12-28 17:34:09 +00:00
poolpm
c9215475b0 [FIX] Wrong behavior on Edit Account with no addy 
When an account is edited and no payment address has been set, the following non-sense message appears:
Unable to connect to RPC server for coin address validation

This patch fixes the issue and allows profile to be edited with no payment address
 2013-12-27 16:21:25 +01:00
nicoschtein
9481eae316 Make TXId & Address clickable on Transaction Lists 
Added an alert box displaying full TXId and Address when clicked on Admin Transaction List
 2013-12-27 03:49:45 -02:00
nicoschtein
e5ffc85084 Make TXId & Address clickable on Transaction Lists 
Added an alert box displaying full TXId and Address when clicked on User Account Transaction List
 2013-12-27 03:47:36 -02:00
Sebastian Grewe
91e7413539 Merge pull request #1125 from TheSerapher/issue-1118 
[SECURITY] Fixed exploit in token types
 2013-12-26 15:40:00 -08:00
Sebastian Grewe
b16d9afcad [SECURITY] Fixed exploit in token types 
Fixes an exploit due to missing check of token type used.

Fixes #1118 once merged.
 2013-12-27 00:21:22 +01:00