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

1514 Commits

Author SHA1 Message Date
xisi
ed8349ef50 works as far as I can tell 2014-01-16 05:53:36 -05:00
xisi
40d09a4ee4 oops, forgot to make sure we're auth'ed 2014-01-16 05:53:36 -05:00
xisi
a598eec924 fix sync changes done in edit.inc.php at the end of request 2014-01-16 05:53:36 -05:00
xisi
1b1f552567 fix cosmetic issue #2 2014-01-16 05:53:36 -05:00
xisi
a0ecbd0294 fix cosmetic issue 2014-01-16 05:53:36 -05:00
xisi
96b734edaa fix how late we delete tokens for 2fa 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
bfd803ec28 Incremented version, moved config options, return vals fixed in 2f checks 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
Sebastian Grewe
409f41bc35 Merge pull request #1437 from nrpatten/next 
[FIX] Issue #1423
 2014-01-16 02:42:05 -08:00
Sebastian Grewe
24a7085519 Merge pull request #1428 from nicoschtein/patch-16 
Added User Last Login column to Admin User Info section
 2014-01-16 01:01:21 -08: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
rog1121
33763e12a6 Fix Dashboard 2014-01-15 18:01:51 -07:00
nicoschtein
ced8a16a66 [Fix] Wrong var name and Align 2014-01-15 18:04:22 -02:00
nicoschtein
5c0decee41 Added date formatting to Last Login column 2014-01-15 17:57:57 -02:00
nicoschtein
14ad54a8ed Added last_login table column to getAllUserStats 2014-01-15 17:51:10 -02:00
nicoschtein
a55da151a0 Added Last Login column to User Info section 2014-01-15 17:43:28 -02:00
Fred
41e89f7830 Version 3 
New additions some clean up
 2014-01-15 10:40:06 -06:00
Sebastian Grewe
610e564c2f [IMPROVED] Further improvements on error handling 2014-01-15 16:28:26 +01:00
Sebastian Grewe
f2f539ef53 [IMPROVED] Payout logging and indent 2014-01-15 16:12:00 +01:00
Sebastian Grewe
c42fc60742 [FIX] Proper response string for debug output 2014-01-15 16:11:59 +01:00
Sebastian Grewe
aa27e8dfde [IMPROVED] jsonRPC Error Handling with CURL 
* [ADDED] Use curl instead of fopen
* [ADDED] Error handling for various connection issues
* [MOVED] jsonRPC library into lib folder
* [UPDATED] Pools page for proper RPC errors with caching enabled

It's using the base RPC class but modified to support CURL. Simplified
some code since we won't need those features. Should make maintaining
that code a whole lot easier.

Fixes #1343 once merged.
 2014-01-15 16:11:59 +01:00
Sebastian Grewe
290ac36729 [FIX] Config Version check 2014-01-15 15:33:00 +01:00
Sebastian Grewe
7d8d5d3c04 Merge pull request #1412 from nicoschtein/patch-13 
Issue 875 - Manual and Auto TXFee (REBASED again..)
 2014-01-15 06:31:49 -08:00
Sebastian Grewe
a496a37159 [FIX] MMinor on mobile template 2014-01-15 11:37:09 +01:00
nicoschtein
19b969650f Bump global.inc.dist.php version to 0.0.3 
Changes from 0.0.2:
Added $config['txfee_auto']
Added $config['txfee_manual']
Removed $config['txfee']
 2014-01-14 19:19:37 -02:00
nicoschtein
064dfe09df Changed txfee to txfee_manual in account/edit.inc.php 2014-01-14 19:16:27 -02:00
nicoschtein
f3a2812cac Added txfee_manual and txfee_auto to smary_globals config array 
removed txfee
 2014-01-14 19:15:08 -02:00
nicoschtein
451d57cbce Changed txfee to txfee_manual in edit account manual payout request 2014-01-14 19:14:11 -02:00
nicoschtein
501e127747 Added txfee_manual and txfee_auto to config file 
Added txfee_manual and txfee_auto to config file so you can set two different transaction fees for manual and auto payouts
 2014-01-14 19:07:49 -02:00
Sebastian Grewe
adf2d4782b [FIX] Potential caching issue 2014-01-14 17:14:41 +01:00
Sebastian Grewe
58e23975b7 [FIX] Anon worker_name on getblocksfound API 
Forgot that.
 2014-01-14 17:10:08 +01:00
Sebastian Grewe
98f2a2d61a [FIX] Honor anon flag on API getblocksfound 
Fixes #1407 once merged
 2014-01-14 17:04:59 +01:00
Sebastian Grewe
57eed58a47 [FIX] Caching issues for popups 2014-01-14 13:26:58 +01:00
Sebastian Grewe
2b3a3edf3c [FIX] Do not filter reCaptcha HTML 2014-01-14 11:15:16 +01:00
Sebastian Grewe
78beb8b674 [UPDATE] Added index call checks where missing 2014-01-14 11:05:41 +01:00
Sebastian Grewe
9f7e81748e Merge pull request #1391 from raistlinthewiz/next 
Added two brand new api calls; getblockstats and getpoolinfo
 2014-01-13 21:51:25 -08:00
Sebastian Grewe
ef462bebf1 Merge pull request #1395 from Neozonz/issue-1392 
Mobile template changes/updates
 2014-01-13 21:48:25 -08:00
Neozonz
d9b8f11f67 [FIX] Password change for mobile users 
[FIX] Allow unlock via mobile phone
 2014-01-13 17:42:23 -05:00
Neozonz
1be228812d [FIX] Type Success on notifications 2014-01-13 17:27:50 -05:00
Hüseyin Uslu
0340bf523d added two brand new api calls; getblockstats and getpoolinfo 2014-01-13 23:57:26 +02:00
Sebastian Grewe
175402fa85 [FIX] Illegal offset 
Fixes #1382 once merged.
 2014-01-13 12:42:55 +01:00
Sebastian Grewe
4be76130cb [FIX] Show cron status in admin dashboard 
Removing duplicate version box

Fixes #1379 once merged.
 2014-01-12 17:49:20 +01:00
Sebastian Grewe
141556d77a [UPDATE] Moved notice to footer 2014-01-12 10:25:50 +01:00
Sebastian Grewe
cc67decd28 [FIX] Ignore master template on template editor 
Don't use SQL templates for large amount of changes. Create your own
file based theme then!

This fixes #1375 once merged
 2014-01-12 10:15:37 +01:00
Sebastian Grewe
9da944c61e [FIX] Day in seconds wrong 2014-01-12 09:15:51 +01:00
Sebastian Grewe
20305026e8 [ADDED] User login overview to admin dashboard 
Fixes #1374 once merged
 2014-01-12 09:05:59 +01:00
Sebastian Grewe
20ef443ae1 [FIX] Custom smarty code HTML 2014-01-12 08:50:24 +01:00
Sebastian Grewe
4fe46cbd2a [ADDED] last_login timestamp 
* [RENAMED] sessionTimeoutStamp to last_login
* [UPDATE] user class to store login time after successful login
* [ADDED] SQL Upgrade file for new column
* [UPDATE] Updated base SQL file

Fixes #1162 once merged.
 2014-01-11 20:32:45 +01:00
Sebastian Grewe
2417ee7c4f [FIX] Log SQL errors on invalid checkUserPassword 
Fixes #1366 once merged.
 2014-01-11 19:28:37 +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
9526cf0093 [IMPROVED] Show static nav hashrate if live off 
Fixes #1362 once merged.
 2014-01-11 18:37:55 +01:00
Sebastian Grewe
1485a02528 [ADDED] Invitation overview to admin dashboard 
* Split up dashboard default template into subfiles
* Added new invitation overview
* Updated page file

Fixes #1357 once merged.
 2014-01-11 13:45:55 +01:00
Sebastian Grewe
9a959164a6 [FIX] wrong percentage calculations in API 2014-01-11 13:18:46 +01:00
Sebastian Grewe
fb3f527e86 [FIX] Typo in modifier 2014-01-11 13:15:44 +01:00
Sebastian Grewe
93dd7c92a6 Merge pull request #1356 from TheSerapher/issue-1354 
[CLEANUP] Missed two values
 2014-01-11 04:13:40 -08:00
Sebastian Grewe
1ca8144ad5 [CLEANUP] Missed two values 2014-01-11 13:13:20 +01:00
Sebastian Grewe
c1d08895cf Merge pull request #1355 from TheSerapher/issue-1354 
[CLEANUP] Dashboard number formatting
 2014-01-11 04:11:49 -08:00
Sebastian Grewe
5f942d9ba7 [CLEANUP] Dashboard number formatting 
Cleans up some Ajax data on the dashboard to match the static template
data format. No more jumpy numbers.

Fixes #1354
 2014-01-11 13:10:44 +01:00
Sebastian Grewe
6baad2dd06 [UPDATE] Added active workers to admin dashboard 
* Using lower time range for shares: 120 seconds
* Updated worker class with new time range for active workers
* Added statistics, active users call with 120 seconds time range
* Updated admin panel dashboard template

Fixes #1352 once merged.
 2014-01-11 12:37:39 +01:00
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