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

1474 Commits

Author SHA1 Message Date
Sebastian Grewe
74d872755f Merge pull request #2002 from Contex/development 
Cloudflare IP forwarding when using getCurrentIP()
 2014-03-25 06:44:50 +01:00
Sebastian Grewe
56e757a7da Merge pull request #1994 from kthxbai2u/patch-1 
Update bootstrap.php
 2014-03-25 06:38:12 +01:00
Contex
d4c23fe1b2 Cloudflare IP forwarding when using getCurrentIP() 
HTTP_X_FORWARDED_FOR doesn't always work with Cloudflare,
HTTP_CF_CONNECTING_IP however does.

https://support.cloudflare.com/hc/en-us/articles/200170986-How-does-CloudFlare-handle-HTTP-Request-headers-
 2014-03-24 19:59:59 +01:00
Sebastian Grewe
4b8db482d6 Merge pull request #1989 from SamuelNZ/patch-4 
Update mpos.css
 2014-03-24 19:19:04 +01:00
iAmShorty
1ca9c9e336 [UPDATE] removed baseline shares from api 2014-03-24 17:58:07 +01:00
iAmShorty
ad0feb3a20 [UPDATE] description update 2014-03-24 10:32:18 +01:00
iAmShorty
9d0700ee4b [UPDATE] added Pool Navigation to header and admin settings 2014-03-24 10:30:24 +01:00
John Doe
1de50786ae Fix Typo 2014-03-23 14:05:45 -06:00
Shawn Read
94035b58f7 Update bootstrap.php 
Add in a more user friendly error that tells the user WHERE the script is looking for the file (in case the base path or other variable is wrong)
 2014-03-23 11:52:13 -04:00
iAmShorty
bd4096bccb [UPDATE] added exchange url to price ticker 2014-03-22 21:12:55 +01:00
Sebastian Grewe
5b4727479f Merge branch 'development' into bootstrap 2014-03-22 14:39:49 +01:00
Sebastian Grewe
ad1db8dfca [FIX] Same for PPLNS Archive shares 2014-03-22 14:39:38 +01:00
Sebastian Grewe
af3b0487b1 Merge branch 'development' into bootstrap 2014-03-22 14:26:23 +01:00
Sebastian Grewe
be50e8ab47 [FIX] Remove baseline conversion from PPLNS Targets 2014-03-22 14:26:12 +01:00
SamuelNZ
aa63eac2ea Update global.inc.dist.php 
Double vision
 2014-03-23 00:45:43 +13:00
Sebastian Grewe
5841eb458e Merge branch 'development' into bootstrap 2014-03-21 16:01:03 +01:00
Sebastian Grewe
d72b4f6a51 [REMOVED] Baseline from roundstats 2014-03-21 12:56:31 +01:00
Sebastian Grewe
055e4259e1 [REMOVED] Baseline shares from statistics 2014-03-21 12:54:29 +01:00
Sebastian Grewe
1f6ef81b9c [ADDED] SQL Upgrade Script 2014-03-21 12:47:24 +01:00
Sebastian Grewe
67a4713cf0 [REMOVED] Baseline Share calculations 
* We now track diff1 shares instead of converting into a baselined value
* PPS has been adjusted to payout shares directly
* Estimated Shares in coin_base adjusted
 2014-03-21 11:51:34 +01:00
Sebastian Grewe
0bdc124eb2 [FIX] Spelling mistake 
Thanks @szoyj
 2014-03-20 14:00:38 +01:00
Sebastian Grewe
e684a987cc [ADDED] Calc Coin PPS Value Method 2014-03-20 12:11:35 +01:00
Sebastian Grewe
88e3edbd84 [MERGE] Fix merge conflict 2014-03-19 17:24:18 +01:00
Sebastian Grewe
c71bc991ef Merge pull request #1955 from MPOS/coin-plugin-system 
Coin plugin system
 2014-03-19 17:22:40 +01:00
Sebastian Grewe
3c537d577e [FIX] Target Bits on Dashboard 2014-03-19 17:15:19 +01:00
Sebastian Grewe
5c4112d598 Merge branch 'development' into bootstrap 2014-03-19 17:05:38 +01:00
Sebastian Grewe
457e40c24c [FIX] Cryptorush API fix 2014-03-19 16:44:37 +01:00
iAmShorty
452d468843 [UPDATE] added datatable to user info 2014-03-19 16:09:48 +01:00
iAmShorty
daf0703857 [UPDATE] added mintpal ticker api 2014-03-19 13:27:06 +01:00
Sebastian Grewe
9d66c2f574 [FIX] Worker class 2014-03-17 17:08:38 +01:00
Sebastian Grewe
2089af60cd [FIX] Proper getTargetBits call 2014-03-17 16:21:19 +01:00
Sebastian Grewe
e863ef3a0a Merge branch 'development' into bootstrap 2014-03-17 15:53:53 +01:00
Sebastian Grewe
3694af742f Merge branch 'development' into coin-plugin-system 2014-03-17 15:53:40 +01:00
Boris
bf327a23a9 [FIX] Remove a couple more static table references 2014-03-17 14:49:27 +00:00
Sebastian Grewe
5fd4085a15 [MOVED] Coin Classes into own folder 2014-03-17 15:19:09 +01:00
Sebastian Grewe
1583877206 Merge branch 'development' into coin-plugin-system 2014-03-17 14:17:40 +01:00
Boris
0e61aaa9fe [FIX] Remove more static table references #1929 2014-03-17 12:55:13 +00:00
Sebastian Grewe
5d37a77958 [UPDATE] Blocks overview est shares 2014-03-17 13:28:31 +01:00
Sebastian Grewe
914df494ed [FIX] Access to protected var 2014-03-17 13:18:53 +01:00
Sebastian Grewe
46cfd2cf8c [POC] Replaced config target bits with coin base 
* Do not auto-set target bits via autoloader
* Use coin_base to declare target_bits
* Adjust target_bits in each coin_algo class instead

Addresses #1953
 2014-03-17 13:11:50 +01:00
Sebastian Grewe
7d17fd5eb5 [POC] Coin-based Classes 
* Added coin_base class to extend from
* Defaults in coin_base apply for scrypt/sha256d
* Added coin_scrypt and coin_sha256d that extend without changes
* Updated statistics class to use new coin class calls

Addresses #1953
 2014-03-17 12:54:02 +01:00
Sebastian Grewe
9b36c9ac8e Merge pull request #1936 from MPOS/pool-bonus-feature 
[FEATURE] Added Pool Bonus for Prop and PPLNS
 2014-03-14 13:26:06 +01:00
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