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

392 Commits

Author SHA1 Message Date
Sebastian Grewe
1dfb7e9702 Merge pull request #673 from TheSerapher/issue-444-theserapher 
Issue 444 theserapher
 2013-10-04 02:27:28 -07:00
obigal
66296a8f36 pplns_payout block average fix when multiple blocks found during a payout run 2013-10-02 16:42:03 -04:00
Sebastian Grewe
617ff46689 Merge branch 'next' into issue-444-theserapher 2013-09-30 13:50:43 +02:00
Sebastian Grewe
d74770aaeb [FIX] Proper formatting for network hashrates 2013-09-30 13:50:13 +02:00
Sebastian Grewe
fe982c112c Merge branch 'next' into issue-444-theserapher 2013-09-30 13:43:44 +02:00
Sebastian Grewe
594b2c0e10 [FIX] Network Hashrate on Novacoin 2013-09-30 13:43:27 +02:00
Sebastian Grewe
1d4f60b4d9 [FIX] Logout on HTTPS 2013-09-30 13:25:27 +02:00
Sebastian Grewe
64205dd099 [MERGE] Fix merge conflict with NEXT 2013-09-30 09:56:49 +02:00
Sebastian Grewe
db89768cd5 Merge pull request #648 from TheSerapher/issue-145 
Issue 145
 2013-09-30 00:53:45 -07:00
Sebastian Grewe
84071cbd5d Merge branch 'next' into issue-444-theserapher 2013-09-25 11:35:24 +02:00
Sebastian Grewe
abcd62d8e8 Fix #657, added getmininginfo to wrapper 2013-09-25 11:31:42 +02:00
Sebastian Grewe
1f6ec91dfa Honor donations and anon state in caches 2013-09-25 11:08:12 +02:00
Sebastian Grewe
6c3d2d1e96 Allow Public ACL for all round transactions 2013-09-25 10:34:36 +02:00
Sebastian Grewe
716e118041 Update statistics.class.php 
Fixes #664
 2013-09-23 07:11:43 +02:00
Sebastian Grewe
baeae10027 Merge branch 'next' into issue-444-theserapher 2013-09-20 16:11:41 +02:00
Sebastian Grewe
432f2b1fba Merge branch 'next' into issue-145 2013-09-20 16:11:25 +02:00
Sebastian Grewe
ab90b045c0 [FIX #662] IDLE Worker False Positives 2013-09-20 16:07:57 +02:00
Sebastian Grewe
5ce61d9f18 Merge branch 'next' into issue-145 2013-09-19 09:25:15 +02:00
Sebastian Grewe
c4d11885e3 [FIX] Properly show user sharerate 2013-09-19 09:24:48 +02:00
Sebastian Grewe
1387bbdf44 [MERGE] Merge conflict NEXT 2013-09-18 16:34:52 +02:00
Sebastian Grewe
c578c504ed [MERGE] Conflict with NEXT 2013-09-18 16:32:29 +02:00
Sebastian Grewe
d863e66ef4 [BUG] Fixing contrib shares issue without cache 2013-09-18 16:31:36 +02:00
Sebastian Grewe
50cc2da3a3 [BUG] Fixed contrib shares with empty cache 2013-09-18 16:23:34 +02:00
Sebastian Grewe
c8f19d2841 Revert "[FEATURE] Added Ajax JSON Memcache" 
This reverts commit bd8796b824.

It turns out it's pretty much useless as long as the data passed to
get_json is not also being cached.
 2013-09-18 13:16:25 +02:00
Sebastian Grewe
bd8796b824 [FEATURE] Added Ajax JSON Memcache 2013-09-18 13:11:24 +02:00
Sebastian Grewe
1a9ada84d4 fixing merge conflict from next to branch 2013-09-18 11:46:22 +02:00
Sebastian Grewe
a349e1e060 use archive table for sharerate calcs 2013-09-18 11:38:51 +02:00
Sebastian Grewe
4954f14923 Merge branch 'next' into issue-444-theserapher 2013-09-18 11:03:07 +02:00
Sebastian Grewe
07f0361050 [IMPROVEMENT] Support incremental contrib shares 2013-09-18 10:48:02 +02:00
Sebastian Grewe
a0fa71b264 [IMPROVEMENT] Adding incremental round/user shares 
This will address #510. It needs thorough testing and is a WiP but
is a start to improve cron runtime and DB loads.
 2013-09-18 09:45:52 +02:00
Sebastian Grewe
5e64d43732 [IMPROVEMENT] Allow user login via E-Mail 2013-09-18 07:33:57 +02:00
Sebastian Grewe
fbf2a86162 [FIX] Properly redirect after login 2013-09-18 07:24:34 +02:00
Sebastian Grewe
cdf71cbfba adding account balance to new dashboard via Ajax 2013-09-17 14:27:46 +02:00
Sebastian Grewe
4ffca7d5ac API overhaul for easier handling of API calls 
* [FEATURE] Allow in-class checking for user permissions
* [FEATURE] Allow in-class creation of the JSON data for coherence
* [FEATURE} Added API version in JSON data for client side checks
* [IMPROVEMENT] Adjusted all API calls to use the new JSON layout

**NOTE**: This is breaking backwads compatibility with the old API!
Please adjust your client application to support this new version.
The data array should not change much more other than added features.
 2013-09-17 11:55:54 +02:00
Sebastian Grewe
e88d80cd02 Merge branch 'next' into issue-444-theserapher 2013-09-17 09:42:56 +02:00
Sebastian Grewe
bbe39228e1 Bitcoin Wrapper improvements 
* [FEATURE] Allow for PoS/PoW Detecion in getdifficulty
* [FEATURE] Allow for SHA detecion in getnetworkhashps
* [IMRPOVEMENT] Added caching for bitcoin values (30s only)
 * Will reduce the amount of RPC calls for high load pages
 2013-09-17 09:36:08 +02:00
Sebastian Grewe
faadf7cbaf [FEATURE] Proper login/logout/auth redirects 
* Allow to redirect to referrer page when access is denied
* Logout user and point towards login, add redirect
* Logout user as usual but added save redirects
* Adjusted templates and page codes
 2013-09-14 21:20:12 +02:00
Sebastian Grewe
e6ab8006d1 [FEATURE] Adding more to gauges, adding graph to dashboard 
* Adding live-updates for gauges
* Adding new API calls
* Updated statistics to allow custom intervals
* Disabled caching for API calls for now
* Added new hashrate graph with auto-update

Addresses #444
 2013-09-14 14:43:14 +02:00
Sebastian Grewe
5e1c3ae372 fixing issue mentioned in #145 with payouts 2013-09-12 13:22:39 +02:00
nrpatten
34bc88533f Update mail.class.php 2013-09-12 19:57:30 +10:00
nrpatten
493dfcd85c Update mail.class.php 2013-09-12 19:55:59 +10:00
Sebastian Grewe
62c0641131 Merge branch 'next' into issue-145 2013-09-09 14:53:42 +02:00
Sebastian Grewe
5c11c74974 allow simple authentication checks wihtout logout 2013-09-09 07:45:55 +02:00
Sebastian Grewe
bc7e511177 removing debug echos 2013-09-06 15:00:47 +02:00
Sebastian Grewe
5257001153 fixing blockhash in round block details 2013-09-06 14:55:44 +02:00
Sebastian Grewe
f87a7fc380 Merge branch 'next' into issue-145 2013-09-06 10:55:31 +02:00
Sebastian Grewe
b656be751d indentations 2013-09-06 10:51:55 +02:00
Sebastian Grewe
d4ce764d77 proper allow back/forth on blocks 2013-09-06 10:49:19 +02:00
Sebastian Grewe
b3ba080345 obigals work, cherrypicked 2013-09-06 09:48:08 +02:00
Sebastian Grewe
0e27cda093 Fix: Blocks not being confirmed 
Fixes an issue introduce with #610.
 2013-08-26 11:11:52 +02:00
Sebastian Grewe
e6cf43efa0 Fix: Properly send notifications again 
Fixes #630
 2013-08-23 11:28:07 +02:00
Sebastian Grewe
6eec747be6 fixing PPLNS payouts one last time 2013-08-22 16:16:04 +02:00
Sebastian Grewe
db754c146e Revert "Revert "adjusting pplns target to baseline shares"" 
Reverting the revert .... :-/

This reverts commit 2d27132725.
 2013-08-22 15:20:46 +02:00
Sebastian Grewe
927fc12cb3 fixing admin panel user info 2013-08-22 15:01:00 +02:00
Sebastian Grewe
2d27132725 Revert "adjusting pplns target to baseline shares" 
* Shares are already baselined when calculating rounds

This reverts commit c9a8f8dc65.
 2013-08-22 14:51:30 +02:00
Sebastian Grewe
c9a8f8dc65 adjusting pplns target to baseline shares 2013-08-22 14:39:46 +02:00
Sebastian Grewe
eb435b4072 fixing difficulty per worker value 2013-08-22 12:33:29 +02:00
Sebastian Grewe
6522fb2747 fixing merge conflicts 2013-08-22 11:54:17 +02:00
Sebastian Grewe
1f6ccfd6be Merge pull request #628 from TheSerapher/issue-610 
Issue 610
 2013-08-22 02:47:46 -07:00
Sebastian Grewe
1c24820735 Adding network_confirmations to configuration 
* Added new configuration option `$config['network_confirmations']` to
  dist config
* Default to 120 if not set

This will allow us to define a different confirmation level for user
transactions but still display blocks at their approriate unconfirmed
value when displaying them in the wallet information for admins. Risky
for pool owners but still a viable option.

Fixes #610
 2013-08-22 11:45:40 +02:00
Sebastian Grewe
10a794cd4f Merge pull request #626 from TheSerapher/issue-622 
Issue 622
 2013-08-22 02:36:12 -07:00
Sebastian Grewe
6ec5b4b845 Fixing hashrate graphs 
* Proper initilize array in order
* Fill data after initilizing
* Removed 0 fills

Thanks @iriiria for this fix!

Fixes #624
 2013-08-22 11:33:26 +02:00
Sebastian Grewe
ae1a5c8ed3 Use baseline shares for share class 2013-08-22 11:30:13 +02:00
Sebastian Grewe
b23dd56bc8 Adding baseline shares to statistics class 
* Calculate shares towards our base diff
* Calculate share rate based on actual shares not diff
 2013-08-22 11:29:26 +02:00
Sebastian Grewe
56cfa24eb4 Include worker diff in API 
Addresses #145
 2013-08-20 17:03:41 +02:00
Sebastian Grewe
96066993ac adding per-worker difficulty display 2013-08-20 16:50:40 +02:00
Sebastian Grewe
526701d2e1 Merging with origin/next to get branch updated 2013-08-20 15:55:05 +02:00
Sebastian Grewe
7ec8fa9b95 Moving a lot of settings from config to adminpanel 
* Migrated configuration options to admin panel
* Removed configuration options from config file
* Added help text for each configuration option into panel

Addresses #622 and needs extensive testing by pools. A lot has changed
so pool owners might have to adjust their own templates to match this
new system.
 2013-08-20 12:02:47 +02:00
Sebastian Grewe
7e4c5dab4e Adding unconfirmed blocks to wallet 
First attempt addressing #610, still missing a detection for the actual
confirmation limit required for each block in case one lowers it in the
config.
 2013-08-19 09:31:53 +02:00
Sebastian Grewe
1708e5d2b5 Do not add 24th hour, use 0 hour 2013-08-15 10:03:22 +02:00
Sebastian Grewe
14c0535b10 Fill empty hours with proper data 
* Properly sort the array prior to sending it back
 * Sort from current to one hour earlier for proper data display
 * Adjusted templates to use new sorted arrays

Fixes #606
 2013-08-15 09:58:33 +02:00
Sebastian Grewe
50f380c25e first test to fill with data 2013-08-15 09:14:02 +02:00
Sebastian Grewe
1a459a7913 Adding transaction summary by types 
Addresses #581
 2013-08-08 12:02:39 +02:00
Sebastian Grewe
03da52117a Fix user seeing other users transactions 
Fixes #577
 2013-08-08 09:36:05 +02:00
Sebastian Grewe
0dbe1ebe11 fixing hashrate graphs 2013-08-07 09:45:40 +02:00
obigal
1819a47bf4 Vardiff/pushpool and pps payout support 2013-08-07 09:44:11 +02:00
obigal
360bd22dc6 Updates 2013-08-07 09:42:06 +02:00
obigal
fcb9ebd529 Update statistics.class.php 2013-08-07 09:41:19 +02:00
obigal
6f3a7c5b50 Update share.class.php 2013-08-07 09:40:25 +02:00
obigal
1f2bc294f2 Update for pushpool compatibility 2013-08-07 09:39:04 +02:00
obigal
84e22ae4a9 Update share.class.php 2013-08-07 09:36:26 +02:00
obigal
f4451aee1c Update share.class.php 2013-08-07 09:33:41 +02:00
obigal
f452f79f07 Update statistics.class.php 2013-08-07 09:32:51 +02:00
obigal
691611eb13 Update share.class.php 2013-08-07 09:30:39 +02:00
obigal
ef234fe80b Vardiff/pushpool and pps payout support 2013-08-07 09:29:48 +02:00
obigal
c3a63d58ce Updates 2013-08-07 09:29:48 +02:00
obigal
b6f3fd5972 Update statistics.class.php 2013-08-07 09:29:48 +02:00
obigal
5607103d81 Update share.class.php 2013-08-07 09:29:48 +02:00
obigal
d89c1f43c8 Update for pushpool compatibility 2013-08-07 09:29:48 +02:00
obigal
41183b2e65 Update for pushpool compatibility 2013-08-07 09:29:48 +02:00
obigal
657839014a Update for pushpool compatibility 2013-08-07 09:29:48 +02:00
obigal
b2a898e292 Update share.class.php 2013-08-07 09:29:48 +02:00
obigal
fd427f77de Update share.class.php 2013-08-07 09:29:47 +02:00
obigal
a45bc6dbef Update worker.class.php 2013-08-07 09:29:47 +02:00
obigal
a42adb11b2 Update statistics.class.php 2013-08-07 09:29:47 +02:00
obigal
7378e593bd Update share.class.php 2013-08-07 09:29:47 +02:00
Sebastian Grewe
cbf39f7905 Fix IDLE worker detection 
* Also mark as IDLE if no valid shares were received

Fixes #561
 2013-08-07 09:27:50 +02:00
Sebastian Grewe
073a42cfc8 Fixing worker hashrates and activity status 
* Fix hashrate calculations and include archived shares
* Fix worker activity to only check for our_result = Y shares
* Mark as active if worker has a hashrate > 0, removes a query

Addresses #561, crons need to be updated to remove the active flag from
as the worker activity and check the hashrate instead.
 2013-08-07 09:20:08 +02:00
Sebastian Grewe
d4a9af86c4 removed debug output 2013-08-06 09:26:43 +02:00
Sebastian Grewe
0b8243ab69 Fixing archiving of PPS, TXFees and Debits 
Emergency fix. Includes balance PPS calculation fix.

Addresses #563
 2013-08-06 09:24:01 +02:00