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

673 Commits

Author SHA1 Message Date
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
5d19964321 adding DEBUG console 2013-09-18 08:06:22 +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
e7f62134f1 adding cold wallet coin display and setting 2013-09-17 16:15:18 +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
ffe6a01003 Merge branch 'next' into issue-444-theserapher 2013-09-17 09:56:36 +02:00
Sebastian Grewe
b8029c04f3 use wrapper to fetch last network block 2013-09-17 09:55:41 +02:00
Sebastian Grewe
e88d80cd02 Merge branch 'next' into issue-444-theserapher 2013-09-17 09:42:56 +02:00
Sebastian Grewe
baaf743218 use bitcoin wrapper method for getdiff calls 2013-09-17 09:42:41 +02:00
Sebastian Grewe
af21cafea5 use new bitcoin method wrapper for public API 2013-09-17 09:39:37 +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
04786aafb5 Merge branch 'next' into issue-145 2013-09-17 08:53:21 +02:00
Sebastian Grewe
ae9459eb92 Merge branch 'next' into issue-444-theserapher 2013-09-16 17:46:31 +02:00
Sebastian Grewe
8abe371fba fixing cryptsy again, ty @Metice 2013-09-16 17:25:04 +02:00
Sebastian Grewe
29246a1f11 add cached share information to dashboard data API 2013-09-16 16:21:23 +02:00
Sebastian Grewe
8ad5a234c0 fixing website name in pub api 2013-09-16 15:41:23 +02:00
Sebastian Grewe
b533ea11a7 Updated hashrate graphs in dashboard 
* [FEATURE] Display both pool and personal hashrate
* [FEATURE] Use EnhancedLegendRendere to toggle lines in graph
* [IMPROVEMENT] Unified Ajax call for graph and gauges
* [IMPROVEMENT] Allow `getdashboarddata` to supply raw hashrate values
 2013-09-16 09:59:22 +02:00
Sebastian Grewe
7a73fbf099 API optimizations 
* [IMRPOVEMENT] Do not include smarty globals, they are not needed on the API
* [IMPROVEMENT] Display correct runtimeinformation of entire script, not
  just the SQL queries
 2013-09-15 17:29:44 +02:00
Sebastian Grewe
728ee2dd11 Feature update and Improvement to Dashboard 
* [FEATURE] Dasboard honors Ajax interval for hashrate graph
* [IMPROVEMENT] Load graph plugins on graph template not on master template
 2013-09-14 23:01:31 +02:00
Sebastian Grewe
8c96e166b7 [FEATURE] Added Ajax Data Interval Setting 
* Allows Admins to change the SQL Interval used in queries
 * Default: 300 seconds / 5 minutes
 * Allowed: 1 minute, 5 minutes, 10 minutes
 * Tooltop in admin panel explains this setting
* Added data interval to API call for dashboard
* Added additional output to gauges footer

Addresses #444
 2013-09-14 21:45:31 +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
b66c3eafec Admin Option for Ajax Refresh Interval 
* Allow admins to change the refresh interval for Ajax calls
 * Only Gauges affected for now

Further Addresses #444 with more goodies
 2013-09-14 19:35:30 +02:00
Sebastian Grewe
727ed1f79a adding gethashps changes to dashboard 2013-09-14 19:32:37 +02:00
Sebastian Grewe
4e19de4c7a Unified gauges Ajax 
* Single call for all data
* Use proper hash units as configured in pool
* New API call for dashboard data that has adjusted output
 2013-09-14 17:03:19 +02:00
Sebastian Grewe
c7ca211532 Merge branch 'next' into issue-444-theserapher 2013-09-14 15:50:28 +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
504855b55d Merge pull request #656 from TheSerapher/issue-646 
Issue 646
 2013-09-14 00:39:01 -07:00
Sebastian Grewe
c20c9619a4 Update wallet.inc.php 2013-09-14 09:37:08 +02:00
Sebastian Grewe
f67d293382 Merge branch 'issue-652' into next 2013-09-13 16:24:47 +02:00
Sebastian Grewe
2e9332b7a0 fixed cryptsy API example 2013-09-13 15:49:07 +02:00
Sebastian Grewe
aa10b6efc1 [FEATURE] Adding hashrate modifiers 
* Allow admins to set hashrate speed displays via admin panel
 * Personal
 * Pool
 * Network
* Allows for easier integration of SHA coins

Fixes #652
 2013-09-13 13:36:36 +02:00
Sebastian Grewe
f35c7cedc8 adding network hashrate to poolstatus 2013-09-13 10:28:12 +02:00
Sebastian Grewe
5e09208f54 adding share-rate to getuserstatus API 2013-09-13 09:35:14 +02:00
Sebastian Grewe
5e1c3ae372 fixing issue mentioned in #145 with payouts 2013-09-12 13:22:39 +02:00
nrpatten
61f6f5b94b Create contactform.inc.php 2013-09-12 20:03:58 +10:00
nrpatten
ff6bd18749 Create contactform.inc.php 2013-09-12 20:01:28 +10:00
nrpatten
c9c507c93e Update admin_settings.inc.php 2013-09-12 19:59:38 +10: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
e2011a68b0 [FIX] Unconfirmed Wallet Balance 
Fixes #646
 2013-09-12 08:30:34 +02:00
Sebastian Grewe
f738b426f2 cleaned up dashboard page file 2013-09-09 16:07:42 +02:00
Sebastian Grewe
62c0641131 Merge branch 'next' into issue-145 2013-09-09 14:53:42 +02:00
Sebastian Grewe
0dd1cc7d50 template updates for new empty content 2013-09-09 07:46:36 +02:00
Sebastian Grewe
5c11c74974 allow simple authentication checks wihtout logout 2013-09-09 07:45:55 +02:00
Sebastian Grewe
82e8941c02 Merge branch 'next' into issue-444-theserapher 2013-09-07 23:55:49 +02:00
Sebastian Grewe
98688d5839 Updated testing template 
* Removed unneeded template icons
* Added new icon font
* Added icons to navbard
* Added full admin features

Updates #444
 2013-09-07 23:49:45 +02:00
Sebastian Grewe
bf5408568b Merge branch 'next' of https://github.com/TheSerapher/php-mmcfe-ng into next 2013-09-07 20:53:39 +02:00
Sebastian Grewe
8ae36844f1 fixing some PHP warnings 2013-09-07 20:53:28 +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
ab6a4f57d3 further implemetation into mmcfe-ng 2013-09-06 10:29:42 +02:00
Sebastian Grewe
b3ba080345 obigals work, cherrypicked 2013-09-06 09:48:08 +02:00
Sebastian Grewe
5b353ab759 Merge branch 'next' into issue-543 2013-09-06 09:40:28 +02:00
Sebastian Grewe
cecbcb7d4b Adding testing theme for #444 
This is just a WiP to test a new website template. Taken online from
source referenced in the sidebar footer.

Very nice and clean look, have not had the time to add all features yet
and is only used to demonstrate it.
 2013-08-26 20:07:54 +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
0a4047420b Merge pull request #631 from TheSerapher/issue-630 
Fix: Properly send notifications again
 2013-08-23 02:45:11 -07:00
Sebastian Grewe
e6cf43efa0 Fix: Properly send notifications again 
Fixes #630
 2013-08-23 11:28:07 +02:00
Sebastian Grewe
a98080ec13 adding missing THEME_DIR to dist config 2013-08-22 16:32:06 +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
d28e728d6c minor cleanup 2013-08-22 11:28:18 +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
7769550f89 fixing missing network hashrate in this branch 2013-08-20 15:58:17 +02:00
Sebastian Grewe
526701d2e1 Merging with origin/next to get branch updated 2013-08-20 15:55:05 +02:00
Sebastian Grewe
ba95d678a0 moved motd to website tab 2013-08-20 12:08:59 +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
4abe462e01 Merge pull request #618 from TheSerapher/issue-617 
Fix: Display proper PPS value
 2013-08-19 01:41:44 -07:00
Sebastian Grewe
2db6dba482 Fix: Display proper PPS value 
* Fixes: Wrong PPS value before the first block is found

Fixes #617
 2013-08-19 10:40:25 +02:00
Sebastian Grewe
c057efce3e Merge pull request #616 from TheSerapher/issue-605 
Issue 605
 2013-08-19 01:00:12 -07:00
Sebastian Grewe
59bd71c75d Fixing admin requests 
Fixes #605
 2013-08-19 09:59:41 +02:00
Sebastian Grewe
d6422ea5a8 Merge pull request #602 from TheSerapher/issue-582 
Adding QRCodes under Accounts
 2013-08-19 00:38:37 -07: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
a56907ba00 Adding gethourlyhashrates API call 
Fixes #608
 2013-08-15 10:08:48 +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
16557465e4 Added: getuserbalance API call 
* Adds getbalance to API
* Admins: Can fetch any users balance
* Users: Can fetch only their own balance

Fixes #605
 2013-08-15 08:58:50 +02:00
Sebastian Grewe
fcf5a21ce3 Adding QRCodes under Accounts 
* Added: API String QR Code for #582 and #591

This will allow more QRCodes being added that are specific to an
account. The require library is added and the API string can be used as
an example how codes are generated.

Fixes #582
 2013-08-14 11:44:29 +02:00
Sebastian Grewe
22e7904da7 Fixing round estimates on public stats page 
* Fix: Display round restimates when making pool stats public via ACL
* Fix: Display proper pool efficiency when pool stats are public

Fixes #585
 2013-08-13 09:20:06 +02:00
Sebastian Grewe
031b4940cd admin should see all transactions in summary 2013-08-08 12:05:06 +02:00
Sebastian Grewe
1a459a7913 Adding transaction summary by types 
Addresses #581
 2013-08-08 12:02:39 +02:00
Sebastian Grewe
c568683152 Adding empty example for round stat integration 
Addresses #543
 2013-08-08 10:01:33 +02:00
Sebastian Grewe
03da52117a Fix user seeing other users transactions 
Fixes #577
 2013-08-08 09:36:05 +02:00
Sebastian Grewe
6767b5a235 Merge pull request #576 from TheSerapher/issue-561 
Issue 561
 2013-08-07 21:46:44 -07:00
Sebastian Grewe
c9139034a4 Merge pull request #573 from TheSerapher/issue-549 
Make block count on stats page configurable
 2013-08-07 21:44:30 -07: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
99bb4470f3 Update smarty_globals.inc.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
a7278401b0 Update smarty_globals.inc.php 2013-08-07 09:34:55 +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
f7a95d9f26 Update smarty_globals.inc.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
31e10bfa2f Update smarty_globals.inc.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
Sebastian Grewe
c55bf8354f Fixing bug with archived transactions 
This will fix #563, only mark transactions as archived that have been
confirmed.
 2013-08-05 23:00:24 +02:00
Sebastian Grewe
df28e77319 fixing payout cron display 2013-08-05 17:51:31 +02:00
Sebastian Grewe
367f057e6d Refactored monitoring page 
* Allow easier addition of new crons to the monitor list
* Make the data generation dynamic instead of hard to adjust lists

Fixes #559 upon merge.
 2013-08-05 17:45:56 +02:00
Sebastian Grewe
2cddc27130 fixing PPS locked balance 2013-08-05 10:54:32 +02:00
Sebastian Grewe
f675fc7055 Removed page generation PHP from settings 
Committed those by accident, so removed.
 2013-08-05 10:08:24 +02:00
Sebastian Grewe
4d77a7d299 Refactored admin panel settings 
This will allow easier integration of new settings managed by the admin
panel. Includes setting types, tooltips, tabs etc.

No open ticket, just figured I'd add this.
 2013-08-05 10:02:39 +02:00
Sebastian Grewe
2ced75b752 Merge pull request #556 from TheSerapher/issue-536 
Issue 536
 2013-08-05 00:20:53 -07:00
Sebastian Grewe
d59b8ef563 Make block count on stats page configurable 
Fixes #549
 2013-08-05 09:18:52 +02:00
Sebastian Grewe
c25e54f79c Adding Admin MOTD 
* Adding MOTD to admin settings
* Adding MOTD to smarty_globals as regular INFO popup

Fixes #545
 2013-08-01 16:25:43 +02:00
Sebastian Grewe
7bde00c452 properly display auto-confirmed tx 2013-08-01 12:48:55 +02:00
Sebastian Grewe
95825224a1 Adding archiving flag for transactions 
* Added new column to transactions table (`007_transactions.sql`)
* Added setArchived method to mark old transactions as archived
* Honor archived flag in getBalance and getLockedBalance

This will further address and fix #536 once merged.
 2013-08-01 12:16:59 +02:00