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

1432 Commits

Author SHA1 Message Date
Sebastian Grewe
914bc6bf1a [FIX] Use configured currency as target 2014-03-14 10:57:35 +01:00
Sebastian Grewe
d468c82694 [ADDED] Block or Payout based bonus percentage 2014-03-13 14:25:52 +01:00
Sebastian Grewe
45851ea654 [FEATURE] Added Pool Bonus for Prop and PPLNS 2014-03-13 07:43:45 +01:00
jamieede
0b765417f2 The hacky way simplified. Removed variable 2014-03-12 17:20:22 +00:00
jamieede
790617dd11 Cryptorush API Price Ticker 
Simple yet effective way to get ticker cron to use the Cryptorush.in API
via get=all parameter.

Just enter on your global cfg file:
$config['price']['url'] = 'https://cryptorush.in';
$config['price']['target'] =
'/api.php?get=all&key=YOUR_API_KEY&id=YOUR_USER_ID';
$config['price']['currency'] = 'COIN';

and run the cron. Enjoy!
 2014-03-12 16:48:31 +00:00
Sebastian Grewe
3a73ef54ae [FIX] Remove static table reference 2014-03-12 11:53:12 +01:00
iAmShorty
19697443f5 [FIX] typo in config 2014-03-12 11:43:32 +01:00
Sebastian Grewe
89fad152fe [FIX] Logic error 2014-03-12 11:10:14 +01:00
Sebastian Grewe
fd30568af7 [CLEANUP] In-line with rest of account pages 2014-03-12 11:03:37 +01:00
iAmShorty
d9cfd2a9d4 [FIX] user earnings only visible as admin 2014-03-12 11:01:18 +01:00
Sebastian Grewe
846165d512 Merge branch 'development' into bootstrap 2014-03-11 21:55:24 +01:00
Sebastian Grewe
adc7f9f2d6 Merge pull request #1926 from MPOS/settings-class-cache 
[ADDED] Settings Runtime Cache
 2014-03-11 21:54:52 +01:00
Sebastian Grewe
74d4eba27d [CLEANUP] Admin Checks 
* [REMOVED] SQL Checks, those won't be done since we need SQL to
  login as admin anyway. Are handled in database.inc.php too.
* [CHANGE] Dropped *nix detection since it would not detect Linux PHP_OS
* [IMPROVED] Simply check if we can use socket_create at all, fall back
  to fsockopen if this does not exist.

Not addressing any specific issue, just some cleanup.
 2014-03-11 20:32:09 +01:00
Sebastian Grewe
9eeb2b879c [ADDED] Settings Runtime Cache 2014-03-11 10:54:33 +01:00
Sebastian Grewe
32054045fb Merge branch 'development' into bootstrap 2014-03-11 09:33:03 +01:00
Sebastian Grewe
9941c61449 [FIX] Disable monitor column on admin pool workers 2014-03-11 08:48:34 +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
bf1ac16b07 Merge branch 'development' into bootstrap 2014-03-10 13:22:56 +01:00
iAmShorty
7bc6ec9ace [FIX] mpos compatibility for icons in navigation 2014-03-10 09:36:50 +01:00
iAmShorty
e3317f320c [FIX] mpos theme notification fix 2014-03-10 09:04:36 +01:00
Sebastian Grewe
0f13bd7c4f Merge pull request #1912 from MPOS/cookie-domain-fix 
[FIX] Changing Cookie Domain
 2014-03-09 20:09:55 +01:00
Sebastian Grewe
6953b8ece8 Merge pull request #1910 from iAmShorty/stratum-poke 
[CHANGE] issue #1905
 2014-03-08 11:15:06 +01:00
iAmShorty
3c33e1b36f [CHANGE] issue #1905 2014-03-08 11:11:09 +01:00
Sebastian Grewe
8651cd38ad [FIX] Changing Cookie Domain 2014-03-08 08:41:00 +01:00
Sebastian Grewe
7e49e90996 [Merge] Fix conflicts with development 2014-03-07 08:37:51 +01:00
Sebastian Grewe
e62db71c04 [FIX] Tickerupdate Checks 2014-03-07 08:36:55 +01:00
Sebastian Grewe
581f365628 [FIX] Removed +x bit 2014-03-07 08:24:34 +01:00
Sebastian Grewe
0b0a26a010 [FIX] Unset POPUPs on disabled API 2014-03-07 07:56:43 +01:00
Sebastian Grewe
c3ad49aab2 [FIX] Remove +x bits 2014-03-06 18:40:57 +01:00
iAmShorty
dcfa79c1c9 [FIX] coin_address is string, not int 2014-03-06 15:04:22 +01:00
iAmShorty
59b7c364fd [FIX] coin_address is string, not int 
throws a mysql error when updating coin address in user settings
 2014-03-06 15:01:27 +01:00
iAmShorty
f9835e671c [FIX] trim whitespaces 2014-03-06 11:49:37 +01:00
Sebastian Grewe
eb6454c8fc Merge pull request #1896 from iAmShorty/uptimerobot-trim-whitespaces 
[FIX] delete whitespaces in uptimerobot api keys
 2014-03-06 09:43:14 +01:00
Sebastian Grewe
5fc516f6b9 Merge pull request #1890 from mxaddict/master 
Pull request for findblock cron fix, related to orphaned blocks.
 2014-03-06 09:43:05 +01:00
rog1121
69e47fe261 Add Ticketupdate 'enabled' var 2014-03-05 16:22:37 -07:00
iAmShorty
2f1f70f54e [FIX] delete whitespaces in api keys 2014-03-05 21:11:29 +01:00
iAmShorty
7a86b827d5 [FIX] min payout fix, balance not initialized 2014-03-05 18:51:17 +01:00
iAmShorty
b85a47ac50 [UPDATE] dashboard fixes, disable tickerupdate in cron/dashboard 2014-03-05 16:21:23 +01:00
iAmShorty
faf414e669 [FEATURE] added minimum payout 2014-03-05 15:02:16 +01:00
Sebastian Grewe
f72cdf3842 Merge pull request #1891 from iAmShorty/minimum-payout 
[UPDATE] minimum manual payout
 2014-03-05 13:50:43 +01:00
iAmShorty
75945eb5b0 [FIX] added minimum payout to notification message 2014-03-05 13:26:02 +01:00
iAmShorty
22bc32ca08 [UPDATE] changed wiki url 2014-03-05 13:03:42 +01:00
iAmShorty
d8decf221b [UPDATE] minimum manual payout 2014-03-05 12:58:08 +01:00
iAmShorty
50de3925ca [UPDATE] autohide notifications and settings update 2014-03-05 12:23:24 +01:00
Sebastian Grewe
4136cc739b [CHANGE] Show 10 instead of 5 blocks on pool stats 2014-03-04 18:18:53 +01:00
iAmShorty
d45e171977 [UPDATE] notification dismiss motd/backend/lastlogin 2014-03-04 16:35:54 +01:00
iAmShorty
c29bcf238f [CLEANUP] removed mobile settings and template files 2014-03-04 16:03:48 +01:00
iAmShorty
e48bb249e8 [UPDATE] hide lastlogin message without site reload 2014-03-04 15:50:03 +01:00
Sebastian Grewe
59aef1d1e3 Merge branch 'development' into bootstrap 2014-03-04 10:41:37 +01:00
Sebastian Grewe
75c20a4baa [SQL] Updated blocks table share_id to bigint 
Will avoid issues with BIGINT from shares table getting too big for the
INT on the blocks share_id column.

Thanks IRC@webxassDE for the heads up!
 2014-03-04 10:21:46 +01:00
iAmShorty
57e6b2dd8c [FIX] permission fix 2014-03-03 17:34:53 +01:00
iAmShorty
887eef3f37 [FIX] fixed typo in notification class 2014-03-03 17:34:09 +01:00
iAmShorty
1960df0d91 [UPDATE] updated query and template 2014-03-03 16:59:06 +01:00
iAmShorty
84b62aedbd [FEATURE] timeframed earning stats 2014-03-03 15:43:23 +01:00
Sebastian Grewe
0ce22ebf7a [ADDED] Template Editor 2014-03-03 11:44:06 +01:00
Sebastian Grewe
c249b7bac5 Merge pull request #1877 from iAmShorty/hashrate-fix 
[FIX] another hashrate calc error
 2014-03-03 11:43:13 +01:00
iAmShorty
ec06339867 [FIX] another hashrate calc error 2014-03-03 11:42:03 +01:00
Sebastian Grewe
b59f878c22 [MERGE] Development, merge conflicts fixed 2014-03-03 10:50:58 +01:00
Sebastian Grewe
d17eec85d0 Merge pull request #1873 from rog1121/master 
Use Defined Limit on getusertransactions API
 2014-03-03 10:36:27 +01:00
Sebastian Grewe
a1dbe8bb09 [FIX] Workaround for missing confirmations 
This will fix issues with those coins that don't track confirmations for
blocks inside the getblock RPC call. It will try to fallback to the
transactions confirmations and insert those instead.

Fixes #1823 as mentioned by @ice00 - Thanks for that!
 2014-03-03 09:42:36 +01:00
iAmShorty
f891743aed [FIX] fixed calculation 2014-03-03 08:50:12 +01:00
iAmShorty
863dbb56eb [FIX] fixed nethashrate for some coins 2014-03-03 08:41:44 +01:00
rog1121
73f4cafc28 Use Defined Limit 2014-03-02 12:16:14 -07:00
rog1121
b8aa9f8738 Update getusertransactions.inc.php 2014-03-02 12:07:22 -07:00
iAmShorty
9fa4b17207 [CHANGE] move transaction summary to earnings to add timeframed stats later 2014-03-02 18:08:38 +01:00
iAmShorty
6705f879b1 [UPDATE] total user earnings, icons in invitations 2014-03-02 17:36:21 +01:00
Sebastian Grewe
6fd55536fa [FIX] Removed method call on PPS globals 2014-03-02 16:26:31 +01:00
iAmShorty
057f453ff5 [UPDATE] make news style as an option 2014-03-02 14:37:51 +01:00
Sebastian Grewe
58807e580b [FIX] PHP Notice on Admin Settings page 2014-03-02 12:33:40 +01:00
Sebastian Grewe
8b13d0193e [REVERT] Permission changes 2014-03-02 08:20:22 +01:00
Barry Deeney
7dce981901 Added the getLastValid function for findblock cron 2014-03-02 11:02:28 +08:00
rog1121
d6b223c9be Permissions Fix 2014-03-01 18:25:58 -07: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
rog1121
639d4ccb10 Fix Notifications Class 2014-03-01 17:00:51 -07:00
Sebastian Grewe
8ac9aa8500 Merge branch 'master' into bootstrap 2014-03-01 22:28:20 +01:00
Sebastian Grewe
429ef80430 [FIX] Pagination for Block Stats 2014-03-01 22:27:59 +01:00
Sebastian Grewe
552f8d6912 [FIX] Reports page 2014-03-01 21:01:32 +01:00
Sebastian Grewe
97ee53d726 [FIX] Recent notifications & same symbol as navbar 2014-03-01 13:56:03 +01:00
Sebastian Grewe
34079926e0 [CLEANUP] More code cleanup for last notifications 2014-03-01 13:44:04 +01:00
Sebastian Grewe
6a5376eaec [FIX] PHP Notice undeclared variable 2014-03-01 13:40:10 +01:00
iAmShorty
8f4c5cc570 [UPDATE] added notifications to header 2014-03-01 12:37:53 +01:00
Sebastian Grewe
dbd26e8be1 [FIX] PHP Notice if wallet down 2014-02-28 09:28:50 +01:00
Sebastian Grewe
6544bc5cba Merge branch 'development' into bootstrap 2014-02-28 09:20:42 +01:00
Sebastian Grewe
dcdc22b15b [ADDED] Missing comment 2014-02-28 09:20:07 +01:00
Sebastian Grewe
9969352056 [FIX] Potential regression 2014-02-28 09:18:38 +01:00
Sebastian Grewe
aac80502e1 [FIX] Bail findblocks on block insertion errors 
Fixes #1857 once merged.
 2014-02-28 09:09:29 +01:00
root
047ebb2185 Fix Error Class 2014-02-27 18:22:43 -07:00
Sebastian Grewe
12b80856c4 [UPDATE] Enable PPLNS Backpay by default 2014-02-27 22:34:47 +01:00
iAmShorty
7b86293278 [UPDATE] notifications for pages 2014-02-27 22:16:26 +01:00
iAmShorty
9cec714993 [UPDATE] notification fix 2014-02-27 21:56:39 +01:00
iAmShorty
549d4dd749 [BOOTSTRAP] basic implementation 2014-02-27 17:45:48 +01:00
Sebastian Grewe
8d369d5ba4 [IMPROVED] Deduct TXFEE in Transaction CreateDebit 
No need to deduct the fees on our cronjob, do it automatically in our
transaction class when creating a Debit record.
 2014-02-27 15:19:01 +01:00
Sebastian Grewe
5966f77e76 [ADDED] Hashrate modifier name and value 
* [ADDED] Hashrate modifier value to getnavbardata
* [ADDED] Hashrate modifier name to getnavbardata

Fixes #1845 once merged.
 2014-02-27 15:19:00 +01:00
Sebastian Grewe
d857a3d85e [FIX] No captcha on contactform if disabled 
Fixes #1846 once merged
 2014-02-27 11:07:37 +01:00
Sebastian Grewe
bbba9d1daf Merge pull request #1837 from MPOS/unified-user-miningstats 
Unified user miningstats
 2014-02-26 09:53:41 +01:00
Sebastian Grewe
3e64dd3487 Merge pull request #1798 from MPOS/x-forwarded-for-check 
[CHANGED] Parse X-FORWARDED-FOR when supplied
 2014-02-26 09:53:29 +01:00
Sebastian Grewe
d750e81b02 [FIX] Wait for global cache data, don't run queries 2014-02-26 09:42:49 +01:00
Sebastian Grewe
78619c1427 [IMPROVED] Unified user speed statistics 
* [ADDED] getUserMiningStats to fetch all speed related data
 * Uses global cache if available, falls back to local query and then
   local caches
* [REMOVED] getUserHashrate, getUserSharerate, getUserAvgShareDifficulty
* [UPDATED] All code occurences for the above to use the new system

Probably won't change much since global cache was already used but does
help on the Dashboard since we combine at least 2 calls into one.
 2014-02-26 09:27:32 +01:00