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

66 Commits

Author SHA1 Message Date
Sebastian Grewe
32054045fb Merge branch 'development' into bootstrap 2014-03-11 09:33:03 +01:00
Sebastian Grewe
4f01b277fb [FIX] Disable monitor option in workers page 2014-03-10 14:20:12 +01:00
Sebastian Grewe
d289b422f3 [ADDED] IDLE Worker Global Switch 
Fixes #1921 once merged.
 2014-03-10 13:40:23 +01:00
Sebastian Grewe
7e49e90996 [Merge] Fix conflicts with development 2014-03-07 08:37:51 +01:00
Sebastian Grewe
c3ad49aab2 [FIX] Remove +x bits 2014-03-06 18:40:57 +01:00
iAmShorty
e03010b56e [FIX] removed calc 2014-03-05 13:27:45 +01:00
iAmShorty
d8decf221b [UPDATE] minimum manual payout 2014-03-05 12:58:08 +01:00
rog1121
93981f6044 Various Fixes 2014-03-01 17:57:43 -07:00
rog1121
7e3623d659 Various Fixes 2014-03-01 17:56:23 -07:00
Sebastian Grewe
8bcce6c37d Merge branch 'development' into bootstrap 2014-03-01 13:50:55 +01:00
Sebastian Grewe
735bdadd88 [FIX] Payout notification type in list 2014-03-01 13:50:03 +01:00
iAmShorty
549d4dd749 [BOOTSTRAP] basic implementation 2014-02-27 17:45:48 +01:00
Sebastian Grewe
9ad568a1d1 [FIX] Do not use CTOKEN if CSRF disabled 
* [FIX] Workers page not checking for CTOKEN properly

Fixes #1848 once merged.
 2014-02-27 11:56:46 +01:00
iAmShorty
8f4237945b [UPDATE] make it uppercase 2014-02-17 15:40:26 +01:00
iAmShorty
4532bd6601 [UPDATE] add coinname to qrode 2014-02-17 15:39:10 +01:00
rog1121
eb382b677c Notifications Fix 2014-02-15 18:00:36 -07:00
Sebastian Grewe
6509cc6039 [ADDE] CSRF validation for Worker Deletion 
* [ADDED] CSRF token checks to worker page
* [CHANGED] Check for both _GET and _POST ctokens
* [ADDED] CSRF token to each delete call URL

Fixes #1702 once merged
 2014-02-07 12:24:48 +01:00
Sebastian Grewe
7cf3fb27fb [UPDATE] Allow global notification settings 
Fixes #1232 and allows further expansion in the future.
Addresses #1672 too.
 2014-02-06 11:13:22 +01:00
Sebastian Grewe
5f65904431 [FIX] HTTPS detecion on Template 2014-01-28 09:25:50 +01:00
xisi
3006cb544f Reworked csrf tokens, now enabled globally 
The way this now works is, if csrf is enabled:
 * Any new or existing template can have csrf protection by adding the hidden input ctoken that's in this batch to its form, removes any logic in templates
 * Page controllers that already exist have been updated, new ones only require checking if csrf is enabled and valid
 2014-01-24 13:00:24 -05:00
Sebastian Grewe
a1a3d7e873 [IMPROVED] Added donation minimum and rounding 
* [ADDED] Config option `$config['donate_threshold']['min'] = 1;`
* [VERSION] Incremented config file version to `0.0.6`
* [CHANGED] Round donations to at least two digits
* [CHANGED] Honor minimum set pool donation percentage
* [UPDATED] Account edit template

Fixes #1475 once merged
 2014-01-24 10:06:13 +01:00
Sebastian Grewe
0edd964930 Merge pull request #1507 from xisi/security-js-pwstrength 
Simple javascript password strength/match
 2014-01-21 00:04:18 -08:00
xisi
a20c2324e2 Added pw strength/match to change password form 2014-01-21 00:02:57 -05:00
Sebastian Grewe
eb6692b31c Merge pull request #1481 from raistlinthewiz/next 
tx fee's shouldn't be %
 2014-01-20 07:46:45 -08:00
Hüseyin Uslu
51d0879f8d Wording fix for index.php?page=account&action=edit - tx fee's shouldn't be % 2014-01-20 17:44:45 +02:00
xisi
fd49e0eb78 disabled is actually correct to use in cash out form, we want the css props 
slightly optimization
 2014-01-20 04:41:13 -05:00
xisi
a987878c8e removed extraneous disabling of a field in edit account page, thanks @rog1121 2014-01-20 04:41:13 -05:00
xisi
b0413226b4 removed extraneous disabling of a field in edit account page, thanks @rog1121 2014-01-20 04:41:13 -05:00
xisi
76a67cb71a Changed the config options for CSRF/disabling forms 
* Now an array to disable with granularity
 * Fixed all CSRF tokens back to 1 min
 * Added CSRF protection for unlock account
 * Unified error message for all csrf tokens
 * Fixed a few issues with last commit
 2014-01-20 04:41:13 -05:00
xisi
bd2999526e fixed mobile templates, have not tested as they use same methods as main template 
fixed change pw templates; added csrf token
added csrf protection for password reset
fixed reset and change pass templates; were missing csrf token (form only tpl)
 2014-01-20 04:40:38 -05:00
xisi
15eca659b9 fixed a bug in edit account template 
moved csrf token to above template in smarty assigns
fixed a bug in user class
remove small login/fix header to catch up
 2014-01-20 04:30:17 -05:00
xisi
8756036646 cleaned up account edit csrf slightly 
added csrf protection to workers under sitewide config
added csrf protection to notifications under sitewide config
added csrf protection to invitations under sitewide config
cleaned up login page csrf
cleaned up contactform/contactform page
cleaned up register/register page
moved config->csrf->forms->register to sitewide
added login ip/user/time to notification on login
 2014-01-20 04:29:45 -05:00
xisi
e5c9720174 Finished cleanup of account edit page 
added csrf protection to account edit page under sitewide config
escaped all instances of CTOKEN for csrf in smarty templates
 2014-01-20 04:29:13 -05:00
xisi
9d14902bb5 fix nocache in account/edit template 2014-01-16 05:55:57 -05:00
xisi
ed8349ef50 works as far as I can tell 2014-01-16 05:53:36 -05:00
xisi
d9d678be61 retooled most of the email confirmation setup 2014-01-16 05:53:36 -05:00
xisi
69eec05cb7 simplified notifications with index, updated the settings method, and fixed up template, sql fixes 2014-01-16 05:42:43 -05:00
xisi
ef904858ae [Addition] E-mail confirmations for user actions 
* If enabled, sends e-mail to confirm user withdraws, edits and pw changes
 * Adds 4 config options, enabled + individual settings
 * Adds 3 new token_types
 2014-01-16 05:42:43 -05:00
nrpatten
6b8953c048 Update default.tpl 
[FIX] Alignment of text and image.
 2014-01-16 19:54:12 +11:00
nrpatten
43117e555d Update default.tpl 
[FIX] Me being an idiot :)
 2014-01-16 19:36:30 +11:00
nrpatten
415461fe32 Update default.tpl 
[FIX] Issue #1423 Add mouse over explanation for TX fee for auto payouts and manual payouts.
 2014-01-16 12:28:57 +11:00
nicoschtein
451d57cbce Changed txfee to txfee_manual in edit account manual payout request 2014-01-14 19:14:11 -02:00
Sebastian Grewe
adf2d4782b [FIX] Potential caching issue 2014-01-14 17:14:41 +01:00
Sebastian Grewe
f98d08df83 [SECURITY] Fixing XSS in PHP_SELF 
Fixes #1364 once merged.
 2014-01-11 19:01:14 +01: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
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
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
64958782a4 [FIX] Closing nocache tags 
Fixes #1255 once merged.
 2014-01-06 07:25: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
11c417230b [FIX] Reset pin button 2014-01-02 12:25:22 +01:00