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

1094 Commits

Author SHA1 Message Date
Sebastian Grewe
5ce2662ae5 Merge pull request #1246 from TheSerapher/issue-1242 
[INITIAL] Working version checks
 2014-01-06 08:05:32 -08:00
Sebastian Grewe
cfe47ed787 [FIX] Caching issues with hybrid templates 
* Create subfolders for cache/compiled files for themes

Fixes #1016 once merged.
 2014-01-06 10:52:21 +01:00
Sebastian Grewe
3f1e74e381 [UPSTREAM] Upgraded smarty libraries 
Fixes #1249 once merged.
 2014-01-05 13:41:41 +01:00
Sebastian Grewe
2568ced4d4 [INITIAL] Working version checks 
* Check DB structure version, config file version and MPOS core version
* Added new Admin Dashboard to show this core information
* Cronjobs will be disabled if SQL files are not imported
 * SQL files must re-set the db_upgrade_required setting
* Cronjobs will disabled if config files are not updated
 * Simple config file update and version string update will fix this
* Added MPOS status overview
 * Cronjobs and Wallet information for now, others may be added later
* Added new navigation link for Admin Panel Dashboard
* Added new version file
 * Will require updates whenever DB or configs are updated
* Update SQL file that adds the DB_VERSION setting

This will address #1242 and already includes a huge chunk of changes
required to make this work.
 2014-01-05 11:19:09 +01:00
Sebastian Grewe
8fcd59eeea [ADDED] Account unlock mail on failed PIN 2014-01-02 13:28:33 +01:00
Sebastian Grewe
878fa1c1c8 [IMPROVED] Unlock notification mails on auto-locks 
* Added new token type: account_unlock
* Added update SQL File
* Updated base structure with new token type
* Added empty template
* Updated user class to send mail on failed passwords
* Added unlock account page to use tokens

Addresses #670
 2014-01-02 11:51:22 +01:00
Sebastian Grewe
5c5db8dc93 Merge pull request #1191 from TheSerapher/issue-1181 
Issue 1181
 2014-01-02 02:08:19 -08:00
Sebastian Grewe
e8d460cfe6 [UPDATE] Removed debug echo output 2014-01-02 11:05:49 +01:00
Sebastian Grewe
67a6d9aff4 [UPDATE] Coding style 2014-01-02 11:05:07 +01:00
Sebastian Grewe
4c3421cc8a Merge pull request #1165 from Neozonz/issue-1164 
Initial commit for pin reset functionality
 2014-01-02 02:02:37 -08:00
Sebastian Grewe
dc81ad3123 Merge pull request #1166 from TheSerapher/issue-1159 
Issue 1159
 2014-01-01 02:11:02 -08:00
Sebastian Grewe
e762bb0391 [IMPROVED] Use data interval on getuserworkers 2014-01-01 09:08:09 +01:00
Sebastian Grewe
6656e47fdc [FIX] Spelling error 
Fixes #1192 once merged
 2014-01-01 08:39:49 +01:00
Sebastian Grewe
731985b30f [IMPROVED] Token expiration timers 
* Added new SQL file to update tokentypes table
* Added new function to base class
* Renamed function in base class used in shares class
* Added new error code
* Added new cronjob to delete expired tokens
* Added new cronjob to run-cron scripts and monitoring page
* Added new function to tokentype class
* Added new function to token class

Will address #1181 once merged.
 2013-12-31 22:31:47 +01:00
Sebastian Grewe
82efbb4609 Merge branch 'issue-1185' into next 
Conflicts:
	public/templates/mpos/global/navigation.tpl
 2013-12-31 17:11:03 +01:00
Sebastian Grewe
ee02445b7d Merge branch 'issue-965' into next 
Conflicts:
	public/templates/mpos/master.tpl
 2013-12-31 16:27:16 +01:00
Sebastian Grewe
4026eec570 Merge pull request #1187 from TheSerapher/issue-1159-dashboardsplit 
[IMPROVED]
 2013-12-31 07:19:11 -08:00
Sebastian Grewe
4a98724fc5 [FIX] Disallow to post messages for guests 
* Disallow to post messages if guest forms are disabled
 2013-12-31 16:17:02 +01:00
Sebastian Grewe
a8a7d2c52f [IMPROVED] Allow contactform for guests 
* Added admin option to disable access to contactform for guests
* Propagated new option to templates

Fixes #1185
 2013-12-31 16:14:56 +01:00
Frederick Behrends
f333bdcc0e moved blockchainsettings to extra page in admin settings 2013-12-31 04:39:27 +01:00
Frederick Behrends
3b980cbf5d [IMPROVMENT] Added option to link transaction-ids to transaction on blockchainwebsite 2013-12-31 04:25:47 +01:00
Sebastian Grewe
8e4c56d597 [IMPROVED] 
Splitting dashboard calls up instead of using one single API call:

* Use getuserbalance for Balance updates
* Use getuserworkers for Worker updates

For those and potential other SQL intensive Ajax calls I have added a
long ajax refresh interval setting. It can be set via admin panel and
will change the refresh time on the JS file on the dashboard for those
two calls.

Should help a bit with high worker and transaction volume pools.

Address #1159
 2013-12-30 19:23:27 +01:00
Neozonz
5e401bd6dd fixed indent 2013-12-30 09:17:22 -08:00
Sebastian Grewe
2c18abf8be [SECURITY] Better token generator 2013-12-30 12:15:36 +01:00
Sebastian Grewe
abb3688e56 [FIX] Hardcoded confirms removed 2013-12-30 12:05:33 +01:00
Sebastian Grewe
48a4edad5b [FIX] Proper account summary 2013-12-30 12:02:38 +01:00
Sebastian Grewe
de302a03dc [IMPROVED] data gathering for Auto Payout 
* Using improved SQL query created by @feeleep75
* Adjusted the query to further cut down the data returned

Fixes #1159 once merged.
 2013-12-30 11:57:29 +01:00
Neozonz
e3db7e0a02 Initial commit for pin reset functionality 2013-12-30 03:29:20 -05:00
Sebastian Grewe
96d096f669 [MERGE] Fix merge conflict 2013-12-30 08:19:13 +01:00
Sebastian Grewe
f4a1110c48 Merge pull request #1089 from TheSerapher/issue-1043 
Issue 1043
 2013-12-28 12:23:23 -08:00
Sebastian Grewe
bac119dcc8 Merge pull request #1132 from poolpm/patch-1 
[FIX] Wrong behavior on Edit Account with no addy
 2013-12-28 12:18:05 -08:00
neonbunny
f94e48eb89 Fix for reflected XSS security issue. 2013-12-28 17:34:09 +00:00
poolpm
c9215475b0 [FIX] Wrong behavior on Edit Account with no addy 
When an account is edited and no payment address has been set, the following non-sense message appears:
Unable to connect to RPC server for coin address validation

This patch fixes the issue and allows profile to be edited with no payment address
 2013-12-27 16:21:25 +01:00
Sebastian Grewe
91e7413539 Merge pull request #1125 from TheSerapher/issue-1118 
[SECURITY] Fixed exploit in token types
 2013-12-26 15:40:00 -08:00
Sebastian Grewe
b16d9afcad [SECURITY] Fixed exploit in token types 
Fixes an exploit due to missing check of token type used.

Fixes #1118 once merged.
 2013-12-27 00:21:22 +01:00
Andre Jochems
76655f87b9 gettransaction query not working 
The method gettransaction is not spelled correctly
 2013-12-26 14:06:52 -05:00
Sebastian Grewe
9572de451b [FIX] Fixes #1110 2013-12-26 16:10:04 +01:00
Sebastian Grewe
c935e7fc6c [ADDED] Warning for coin coinformation setting 2013-12-23 23:11:01 +01:00
Sebastian Grewe
2a24f90ed0 [ADDED] Pagination support on pool workers page 
Adds pagination support for the admin panel pool workers page. Will
greatly increase loading times of this page if working as intended.

Fixes another part of #1043.
 2013-12-23 23:04:13 +01:00
Sebastian Grewe
065d10d2e0 [IMPROVED] User info pagination and filters 
This will add pagination and user filters to the Admin Panel User
Information page.

* Added various filter methods (combined with AND in SQL)
* Added pagination and limits to fetch only matching users

This will greatly increase efficiency on larger pools

Fixes #1043 once merged.
 2013-12-23 22:37:57 +01:00
Sebastian Grewe
9485b3f9d6 [ADDED] Possibility to disable navbar live updates 
* Added new admin options: disable_navbar and disable_navbar_api
* Removes LIVE STATS from navigation list
* Removes live updates on Pool General Statistics page
* Added system load checks to getnavbardata API call

This will help to decrease load on high-volume servers at the cost of
losing live status.

Fixes #1014 once merged.
 2013-12-23 21:38:21 +01:00
Sebastian Grewe
5cf9ed0b3a [ADDED] getusertransactions API call 
* Fetch last `n` transactions, default `5` max `30`
* Fetch transaction summary if enabled in admin panel

Fixes #1079 once merged.
 2013-12-23 21:20:39 +01:00
Sebastian Grewe
e2681fe5bf [UPDATE] Moved transactions into special API call 2013-12-23 21:20:33 +01:00
Sebastian Grewe
51a996573d [IMPROVED] Transaction data handling 
This will improve loading times on large transaction tables. Thanks
@feeleep75 for helping with this one.

* Do not use SQL_CALC_NUM_ROWS since it will do a full table scan
* Allow admins to disable account transaction summaries to speed up page
  loads on large tables
* added new admin setting under system to Disable TX Summaries

Fixes #1065 once merged
 2013-12-23 10:48:12 +01:00
Frederick Behrends
a785d251e0 [FIX] fixed division by Zero for Coins without valid Network Hashrate 2013-12-23 09:58:47 +01:00
Sebastian Grewe
126dbae525 Merge pull request #1029 from TheSerapher/issue-1021 
Issue 1021
 2013-12-22 00:01:01 -08:00
headz
549fb9b6cb [FiX] Division by zero warning on $dNetworkHashrate 
When not connected to a wallet, the value of $dnetworkHashrate is set to 0, which causes a division by zero error.
 2013-12-20 19:56:27 -05:00
Sebastian Grewe
cda57db81f Merge pull request #1053 from Fredyy90/patch-6 
[FIX] fixed 3 Notices
 2013-12-20 07:27:06 -08:00
Frederick Behrends
a6d5b6e248 [FIX] fixed 3 Notices 2013-12-20 16:14:40 +01:00
Frederick Behrends
7e594324f3 Added one more Option to "Ajax Data Interval", for better performance management 2013-12-20 15:47:06 +01:00
Sean Hickey
5ddf30983e Undefined property: Notification::$mail 
I'm not 100% sure this is a bug, but I'm getting the following error from my crons.

> PHP Notice:  Undefined property: Notification::$mail in /var/www/MPOS/public/include/classes/notification.class.php on line 158

> PHP Fatal error:  Call to a member function getError() on a non-object in /var/www/MPOS/public/include/classes/notification.class.php on line 158

It appears the `Notification` class extends the `Mail` class instead of `Base`, in which case `$this->mail` does not exist.
 2013-12-20 05:10:09 -05:00
Sebastian Grewe
464c6fc5c2 Merge pull request #1044 from Fredyy90/patch-1 
[FIX] use configured port for mysql connection
 2013-12-19 22:51:13 -08:00
Sebastian Grewe
6d7004e5ec Merge pull request #1047 from Fredyy90/patch-3 
added blocks until next difficulty change to EstNextDifficulty
 2013-12-19 22:48:28 -08:00
Frederick Behrends
8495fa3fc3 [FIX] calculation 2013-12-20 06:51:41 +01:00
Frederick Behrends
ccb14c37cd added blocks until next difficulty change to EstNextDifficulty 2013-12-20 03:59:47 +01:00
Frederick Behrends
4ec364f036 [FIX] enable Caching for ExpectedNextDifficulty and NetworkExpectedTimePerBlock 2013-12-20 03:38:53 +01:00
Frederick Behrends
fd66500a28 [FIX] use configured port for mysql connection 2013-12-20 02:02:38 +01:00
xisi
fd98a9bfaa Actually fixing the code this time? 2013-12-19 09:25:20 -05:00
xisi
a51d195141 Cleanup code for update/add 2013-12-19 09:20:15 -05:00
Sebastian Grewe
0d6ee6d821 [IMPROVED] Auto/Manual Payout Disabled 
This will re-add the ability to disable auto or manual payouts. Option
to disable the entire cronjob is left intact.

Fixes #1034 when merged.
 2013-12-19 15:17:29 +01:00
Joey
47a13f937b Update worker.class.php 
Cleaned up code
 2013-12-19 09:11:59 -05:00
nrpatten
61151a50ac Update tacpop.inc.php 2013-12-20 00:15:28 +11:00
Joey
d85ae9bd7c Update worker.class.php 
[UPDATE] Fix for issue #957
 2013-12-19 06:51:28 -05:00
Joey
fcebc8eb2b Update worker.class.php 
Fix for issue #957
 2013-12-19 06:48:00 -05:00
nrpatten
fc2ffd4868 TAC PopUp window for registrations 2013-12-19 06:42:34 -05:00
Joey
722432fecc Update error_codes.inc.php 
Fix to issue #957
 2013-12-19 06:00:55 -05:00
Joey
019e3c8082 Update worker.class.php 
Fix for issue #957
 2013-12-19 05:59:23 -05:00
nrpatten
e0c066d656 Create tacpop.inc.php 2013-12-19 20:59:26 +11:00
Sebastian Grewe
ac1a561f7b [IMPROVED] Better handling of archived shares 
Please check the appropriate ticket #1021 for details of the changes
made. Tested locally with shares created via INSERT.

Fixes #1021 after merge.
 2013-12-19 09:34:45 +01:00
Sebastian Grewe
cba4e5f1a4 Merge pull request #1003 from TheSerapher/issue-986 
[FIX] Admin User Panel for PPS Payouts
 2013-12-18 22:40:22 -08:00
Joey
e0c2a19542 [FIX] Uninitialized var in roundstats class 2013-12-18 09:34:38 -05:00
Sebastian Grewe
dd80fdcc1a Merge pull request #1020 from TheSerapher/issue-997 
Issue 997
 2013-12-18 00:27:42 -08:00
Sebastian Grewe
6cc367ad50 [FIX] Admin User Panel for PPS Payouts 
This will fix #986 once merged.
 2013-12-17 10:56:37 +01:00
Sebastian Grewe
cef176c754 [FIX] Wrong parameter count 2013-12-17 09:48:07 +01:00
Sebastian Grewe
9d9401d673 Merge pull request #999 from headzoo/memcache_fix 
Windows Memcache Compatibility
 2013-12-17 00:35:23 -08:00
Sebastian Grewe
405fd3d9e0 Merge pull request #981 from Fredyy90/next 
3 small improvments
 2013-12-17 00:10:09 -08:00
headz
cb4d69f092 [FIX] Calling $this from static context 
The static function pubKeyToAddress() was calling $this->hash160(). Changed to self::hash160().
 2013-12-16 23:51:50 -05:00
Frederick Behrends
ed769f9659 Moved Calculation of "Expected Time Per Block (Network)" and "Next Difficulty" to Statistics Class and fixed Dashboard-API for Ajax Refresh 2013-12-16 21:51:31 +01:00
Frederick Behrends
f09459433b added "Est. Next Difficulty" and "Avg. Time per Round" to dashboard and dashboard api 2013-12-16 20:01:22 +01:00
Frederick Behrends
9fd291b9c0 Added "Est. Next Difficulty" and "Est Round Time (Network)" to the global statistics. 2013-12-16 20:01:18 +01:00
headz
132c497d89 [FIX] Use Memcached wrapper on Windows 2013-12-16 13:57:49 -05:00
headz
f00b30d0e2 Initial import 2013-12-16 13:56:10 -05:00
Sebastian Grewe
35ab40cbb7 [FIX] Inifite loop on archive_cleanup 
Fixes an infinite loop in cleaning up the archive table:

* Shares come in faster than defined in cleanup sleep timeout

Will use an upper limit ID which would match the delete query at the
initial state. Skips archiving if no ID is found (e.g. no rows match the
archive purge conditions).

This will fix #997 once merged.
 2013-12-16 16:50:39 +01:00
Sebastian Grewe
8f89b7fceb Merge pull request #867 from Kukunin/next 
Admin Template Editor page
 2013-12-15 01:45:05 -08:00
Sebastian Grewe
afb5fc6c0d [CHANGED] Merge payout crons 
* Merge manual and auto-payout into single cronjob
* Update template/code to reflect single payout cron
* Update monitoring page
* Update disable payouts option in admin panel settings
* Update account payout page to use new option

This will fix #967 once merged.
 2013-12-12 11:45:33 +01:00
Sebastian Grewe
f465bda350 [ADDED] Accept TaC during registration 2013-12-12 10:11:44 +01:00
Sebastian Grewe
9338af0d31 [ADDED] Terms and Conditions page 2013-12-12 09:58:05 +01:00
Sebastian Grewe
847c1283b6 [CHANGE] Adjusted purge defaults 2013-12-10 16:59:53 +01:00
Sebastian Grewe
ab2326a557 [IMPROVED] Use limits for DELETE statements 
This will address #886. Long rounds can cause a system to become
very unresponsive due to high SQL/IO load when doing cleanups of
shares and archived tables.

* Run DELETE from shares with LIMIT
* Run DELETE from shares_archive with LIMIT
* Configure DELETE behaviour via config file
* Only archive shares that are really required (PROP, PPS)

Should greatly improve round ends on PROP and PPS after large rounds,
also improves PPLNS though archving will still take some time unless
we limit the share amount artificially. Shares could be needed though,
so we don't.
 2013-12-10 16:59:52 +01:00
Sebastian Grewe
6315d8fe03 [FIX] Validate coin_address on account updates 
Fixes #945 once merged.
 2013-12-10 16:53:56 +01:00
Sebastian Grewe
b2df4c9d9f [FIX] PHP Notice on missing $aRoundShares 
Fixes #941 once merged.
 2013-12-10 16:23:54 +01:00
Sebastian Grewe
6a693ea25e [FIX] Account Lockouts on Edit Account page 
Fixes #939 once merged.
 2013-12-10 16:14:44 +01:00
Sebastian Grewe
216b986be2 Merge pull request #930 from TheSerapher/issue-926 
[SECURITY] Fixing potential XSS issues
 2013-12-10 03:07:33 -08:00
Sergey Kukunin
f97116b1b2 Show templates tree on Admin Templates page 
Show active and activated templates in Tree
Make templates tree persistent
 2013-12-09 20:55:59 +02:00
Sergey Kukunin
9e2b6da3f0 Add disable_template_override variable to Smarty 
To disable Database Template Overriding and use original files
 2013-12-09 20:55:58 +02:00
Sergey Kukunin
1aee65859f Make Smarty search template in database first 
If not, fallback to file template
Implement normalizer to convert gettingstarted/../support/default.tpl to support/default.tpl
 2013-12-09 20:55:58 +02:00
Sergey Kukunin
75c7e0fc6d Implement Templates admin page 
Create `templates` table in database
Add navigation links to Template page
Let admin to manage his templates from adminpanel
 2013-12-09 20:55:58 +02:00
Sebastian Grewe
47e0b2ac74 [FIX] Network hashrate in dashboard 
Also adds some fixes for hashrate updates on the pool statistics page in
case the API is disabled alltogether.

Fixes #934 once merged.
 2013-12-09 16:11:31 +01:00
Sebastian Grewe
ceadf30a85 [SECURITY] Fixing potential XSS issues 
Will resolve #926 once merged.
 2013-12-09 08:02:41 +01:00
Sebastian Grewe
f884349359 Merge pull request #920 from TheSerapher/issue-670 
[IMPROVED] Lockout user on invalid pin/password
 2013-12-08 22:27:17 -08:00
Sebastian Grewe
f4beb36708 Merge pull request #919 from TheSerapher/issue-904 
[IMPROVED] Added balance checks post payouts
 2013-12-08 22:24:08 -08:00
Sebastian Grewe
50634502d2 [ADDED] Transaction summary to getuserstatus API 
Fixes #917 once merged.
 2013-12-08 09:45:51 +01:00
Sebastian Grewe
bb55001db7 [ADDED] ACL to hide news post author 
This will allow admins to hide the actual username/author from their newsposts.
Useful if you don't wish to give your admin account away or in case you
have no admin-only account.
 2013-12-07 22:30:27 +01:00
Sebastian Grewe
256b5f59c6 [IMPROVED] Lockout user on invalid pin/password 
This will lock a user account if a password or PIN has been entered
wrong for multiple times in a row. When unlocking the account via admin
panel, both counters are reset so the user can log in again.

This should fix issues with brute force attacks to access user accounts.

Please see configuration dist file for new config options.
Please import SQL upgrade 007 to add new column to user accounts table.

Addresses #670 and should be merged once tested.
 2013-12-07 22:14:14 +01:00
Sebastian Grewe
fa8406b172 [FIX] No uptime status on empty result 
Fixes #910 once merged
 2013-12-07 14:15:10 +01:00
Sebastian Grewe
d98bb2f368 [ADDED] getInfo output to wallet information 
Adds some additional wallet infos to the wallet info page in the admin
panel. Specifically the errors output might be interesting for users not
checking their RPC regularly for mandatory updates.

Fixes #912 once merged.
 2013-12-07 13:59:33 +01:00
Sebastian Grewe
eec52b7e4a [UPDATE] Cache RPC getinfo calls 2013-12-07 13:32:57 +01:00
Sebastian Grewe
217f4a7993 [MERGE] Fixed merge conflict 2013-12-06 15:45:03 +01:00
Sebastian Grewe
4bd371ffc6 [IMPROVED] Check system load, dashboard updates 
This will suspend any dashboard updates if the system load exceeds a
configurable threshold. Graphs will not update until the system load is
again below the threshold.

See dist config for new option.

Should help those pools suffering from too many live update users.
 2013-12-06 14:58:37 +01:00
Sebastian Grewe
9bd1f8e963 [ADDED] System load to dashboard call 2013-12-06 14:38:59 +01:00
Sebastian Grewe
1074c8c0bf [UPDATE] Removed redundant calls 2013-12-06 14:35:28 +01:00
Sebastian Grewe
0740eca0ab [IMPROVED] Added balance checks post payouts 
Fixes #904 once merged.
 2013-12-05 18:12:40 +01:00
Sebastian Grewe
e18c7b0508 [SECURITY] Clear cache before sending a mail 
Will fix an issue with users receiving wrong mails, e.g. during password
resets ONLY IF smarty cache is enabled.

Please update ASAP if you have smarty caches enabled! This is a very big
issue. By default smarty caches are disabled and not recommended to be
used. See configuration file.

Fixes #899 once merged.
 2013-12-04 19:15:51 +01:00
Sebastian Grewe
084bf67dc7 [FIX] Undefined index in Mail Class 2013-12-04 15:58:36 +01:00
Sebastian Grewe
ca427b414b [FEATURE] Disable Dashboard and Dashboard API 
Allows pools to disable the dashboard and dashboard API completely.
Useful if you are not running a master/load(/load/load) setup to deal
with frequent live queries.

Fixes #876 once merged.
 2013-12-04 09:54:11 +01:00
Sebastian Grewe
288c2dd866 Merge pull request #893 from TheSerapher/issue-872 
Issue 872
 2013-12-03 01:10:35 -08:00
Sebastian Grewe
8e7004dd7d [ADDED] gettopcontributors API call 
* List top 15 share and hashrate contributors

Fixes #866
 2013-12-03 09:15:51 +01:00
Sebastian Grewe
9c101e5ca0 [FIX] Division by 0 2013-12-02 17:14:16 +01:00
Sebastian Grewe
61d52657f1 [FIX] Division by 0 2013-12-02 17:13:55 +01:00
Sebastian Grewe
5edf88b2ee [FIX] Division by 0 2013-12-02 17:13:09 +01:00
Sebastian Grewe
7b41a75f92 [FIX] Added where clause for archived 2013-12-02 16:50:16 +01:00
Sebastian Grewe
7a2e6061ab [REVERT] Do not use TX ID boundaries for archiving 2013-12-02 16:46:42 +01:00
Sebastian Grewe
44f4b466a4 Merge branch 'next' of https://github.com/TheSerapher/php-mpos into next 2013-11-29 16:25:55 +01:00
Sebastian Grewe
f07064a0a3 [FIX] Hourly Hashrate Graphs 2013-11-29 16:25:37 +01:00
ahmedbodi
810b9e3987 Fixed Config Array 2013-11-29 10:02:47 +00:00
ahmedbodi
297fbd1d6b Added Algorithm to Globals 
Added Algorithm to Globals for Getting Started Guide
 2013-11-29 09:56:11 +00:00
Sebastian Grewe
1ffcba8b51 [ADDED] RPC txid to Transaction lists 2013-11-28 11:52:15 +01:00
Sebastian Grewe
232dd76af5 [ADDED] TXID on debit transactions 2013-11-28 10:53:24 +01:00
Sebastian Grewe
3094681018 Merge pull request #863 from TheSerapher/issue-642 
[FIX] Hashrate increase on round ends
 2013-11-27 04:51:44 -08:00
Sebastian Grewe
98c62b6aa0 Merge pull request #871 from TheSerapher/issue-869 
[FIX] Proper estimates on changed personal modifier
 2013-11-27 04:50:28 -08:00
Sebastian Grewe
6063a3498b [FIX] Proper estimates on changed personal modifier 2013-11-27 13:43:59 +01:00
Sebastian Grewe
dbdd80575c Merge pull request #857 from nicoschtein/patch-9 
Added "Reply-To" header to email
 2013-11-25 00:18:22 -08:00
Sebastian Grewe
1e34018e7f Merge pull request #861 from iAmShorty/blockfinder-update 
[FIX Blockfinder Stats] Working with public and private settings
 2013-11-24 23:55:44 -08:00
Sebastian Grewe
1e7e92b5fe [FIX] Hashrate increase on round ends 
This should address issues with pools finishing very long rounds where
hashrate statistics suddenly dramatically increased. This was caused due
to both shares and archived shares being added before they they were
deleted from shares.

* adds the proper way to calculate user based hash- and sharerates.
* replaces `UNION ALL` with `UNION`

Fixes #642 once merged.
 2013-11-23 22:17:10 +01:00
Sebastian Grewe
c418e98aca [FIX] Idle Worker Notifiaction reset 2013-11-23 20:37:19 +01:00
root
2b33b21350 [FIX Blockfinder Stats] Working with public and private settings 2013-11-22 14:11:18 +01:00
Sebastian Grewe
ae89c7f198 [FIX] Backport from #855 2013-11-21 09:36:44 +01:00
nicoschtein
3433bd658f Added "Reply-To" header to email 
Added simple verification for cases where no sender name or email are set.
 2013-11-20 13:12:29 -02:00
Sebastian Grewe
55190b7d08 [FIX] Also exclude TXFee records for last ID 2013-11-20 11:13:11 +01:00
Sebastian Grewe
038d398344 [FIX] Wrong TX ID boundaries 
* We must ignore the last debit transaction to find the proper TX ID
  that has been archived

This should now complete the fix for #853 - needs live testing but I am
confident it will work as intended. Deploying to my live FST pool for
testing.
 2013-11-20 09:53:40 +01:00
Sebastian Grewe
4819b6819f [FIX] Remove debug output 2013-11-20 09:31:54 +01:00
Sebastian Grewe
09cf821730 [FIX] Honor confirmation status 2013-11-20 09:30:21 +01:00
Sebastian Grewe
f80826ff71 [UPDATE] Cache transaction summaries 2013-11-20 08:21:11 +01:00
Sebastian Grewe
78ae3174d8 [UPDATE] Use proper transaction ID boundaries 2013-11-20 08:11:16 +01:00
Sebastian Grewe
b0cdbd54bc [FIX] Removed blocks JOIN on archive query 2013-11-20 07:43:09 +01:00
Sebastian Grewe
ffc39f855d Addressing #853 with a fix and proposed change 2013-11-20 07:33:24 +01:00
Sebastian Grewe
eb9f63b821 Merge branch 'next' of https://github.com/TheSerapher/php-mpos into next 2013-11-19 12:06:03 +01:00
Sebastian Grewe
86e22fcfc7 [FIX] Admin Panel worker hashrates on SHA coins 2013-11-19 12:05:50 +01:00
root
a1493032d2 [FIX] undefined index: USERDATA 2013-11-18 13:20:23 +01:00
root
65c7edf503 [REBASE] fixes 2013-11-18 12:43:17 +01:00
root
2211dc0863 [REBASE] fixes 2013-11-18 12:43:17 +01:00
root
3133a9c1e7 [REBASE] fixes 2013-11-18 12:43:17 +01:00
root
40d223d584 [UPDATE] template changes 2013-11-18 12:43:17 +01:00
root
3c580ad8d0 [UPDATE] latest 2013-11-18 12:43:17 +01:00
root
510c076452 [FEATURE] blockfinder statistics 2013-11-18 12:43:17 +01:00
Sebastian Grewe
b28061142d [ADDED] New error code, forgot to commit 2013-11-17 17:12:56 +01:00
Sebastian Grewe
21acec83d0 [FIX] Proper error on missing shares 2013-11-17 16:36:30 +01:00
Sebastian Grewe
d95961b470 [FIX] Coins without nethashrate in getmininginfo 
Fixes issues with coins that did not implement a proper array index into
their `getmininginfo` output. Currently supported keys are

* networkhashps
* hashespersec
* netmhashps

If none of there are found or `getmininginfo` fails itself, we now
default to `0` to ensure the webfrontend still works.

Fixes #847 and also fixes #834 which has not reported back the
required information.
 2013-11-16 20:39:41 +01:00
Sebastian Grewe
fcd00be62c [FIX] Do not cache admin panel query for setting updates 2013-11-14 15:37:28 +01:00
Sebastian Grewe
089d63931d [IMPROVE] Use round shares cache for user admin 
Fixes #843 once merged.
 2013-11-14 15:29:16 +01:00
Sebastian Grewe
d2af97507b [UPDATED] Removed unused Smarty / PHP variables 2013-11-13 12:51:41 +01:00
Sebastian Grewe
629cc22e8d [UPDATE] Do not use DateTime class, use time() 2013-11-13 12:49:30 +01:00
Sebastian Grewe
010a9f6f00 [UPDATE] Removed some newlines/whitespaces 2013-11-12 10:10:03 +01:00
Sebastian Grewe
08a59f0d96 Merge pull request #833 from iAmShorty/settings-update 
[SETTINGS] show/hide donors and about page
 2013-11-12 01:07:08 -08:00
Sebastian Grewe
e3d7fd6e81 [UPDATE] getdashboarddata pool info added 2013-11-12 08:50:01 +01:00
Sebastian Grewe
33958919c6 Merge branch 'next' of https://github.com/TheSerapher/php-mpos into next 2013-11-11 14:42:11 +01:00
Sebastian Grewe
c7b783f6d5 [ADDED] Pool name to dashboard API 2013-11-11 14:41:57 +01:00
Sebastian Grewe
d155804a06 [FIX] Skip payouts until block has a share_id 2013-11-11 12:51:06 +01:00
Sebastian Grewe
9ccc3403f8 [UPDATED] Query improved for first blocks time 2013-11-11 12:42:35 +01:00
Sebastian Grewe
629dfb58ed [FIX] Name of Uptime Robot Setting 2013-11-11 12:30:36 +01:00
Sebastian Grewe
dc4d1b3b8e [FIX] Class Warning on new pools 2013-11-11 12:24:54 +01:00
Sebastian Grewe
708de1c1b8 Merge pull request #838 from TheSerapher/issue-837 
[FIX] Defaults via Smarty for empty settings
 2013-11-11 01:03:12 -08:00
Sebastian Grewe
ef120d9504 [FIX] Skip uptime robot with defaults set 
This will skip any updates if we detect the default string in our
settings table. Otherwise the script will return an error and disable
itself.

Fixes #839 once merged
 2013-11-11 10:01:52 +01:00
Sebastian Grewe
253aa26f97 [FIX] Defaults via Smarty for empty settings 2013-11-11 09:43:48 +01:00
root
07e7bf59c0 [UPDATE] disabled pages and showing popup 2013-11-11 09:09:06 +01:00
root
be3421fa3b [FIX] removed from acl, placed under system 2013-11-10 14:07:36 +01:00
root
4fea5de341 [SETTINGS] show/hide donors and about page 2013-11-10 11:06:20 +01:00
Sebastian Grewe
0164a7b918 [FIX] Wrong column name in worker tables 2013-11-09 16:29:27 +01:00
Sebastian Grewe
5f91cc45bf [FIX] PHP error due to worker change 2013-11-08 16:31:04 +01:00
Sebastian Grewe
1cb23e7ecd Merge branch 'next' of https://github.com/TheSerapher/php-mpos into next 2013-11-08 16:16:58 +01:00
Sebastian Grewe
1f491497bc [IMPROVED] Cache active workers 2013-11-08 16:16:16 +01:00
Sebastian Grewe
8edfb88ee3 [FIX] Use default cointarget if unset 2013-11-08 10:41:40 +01:00
Sebastian Grewe
ae46d2496d [IMPROVE] Merged block statistics 
* Removed 24 Hour Shares totals
* Expanded Block Overview with shares stats
 2013-11-07 17:00:30 +01:00
root
a7cda8fedc [TEMPLATE] block stats in mmcfe 2013-11-07 15:27:39 +01:00
root
baa3c8ff3e [UPDATE] removed unused stuff 2013-11-07 12:19:59 +01:00
root
9fa40eaf45 [FEATURE] added block finding rate - HINT new config setting cointarget 2013-11-07 12:14:37 +01:00
root
f8f8b0a997 [FEATURE] calculating-luck 2013-11-07 10:50:32 +01:00
Sebastian Grewe
3a120c4709 Merge pull request #828 from TheSerapher/optimize-blockstats 
[IMPROVED] Block statistics
 2013-11-07 00:16:13 -08:00
Sebastian Grewe
a0015103a2 Merge pull request #817 from TheSerapher/issue-773 
Issue 773
 2013-11-07 00:15:45 -08:00
Sebastian Grewe
c359b83d8d [FIX] Surpress PHP notices on empty registration vars 2013-11-06 16:17:58 +01:00
Sebastian Grewe
a4ca4530a3 [IMPROVED] Block statistics 
* [ADDED] Block over times stats to blocks stats page
* [CHANGED] Split default block stats page template up into subtemplates
* [IMPROVED] Single SQL Query for all Block Stats over Time
* [UPDATED] Templates for new SQL Data
 2013-11-06 16:04:36 +01:00
Sebastian Grewe
c264555405 [FIX] Wrong settings variable 2013-11-06 14:48:00 +01:00
Sebastian Grewe
7785fbf8b7 [FIX] Settings return value on empty result 2013-11-06 14:47:25 +01:00
Sebastian Grewe
dd1ef86b81 [ADDED] Pool name to getpoolstatus API 2013-11-05 15:15:48 +01:00
Sebastian Grewe
5f2a7c01c4 [FIX] Removed empty error string 2013-11-05 14:41:25 +01:00
Sebastian Grewe
f67e63b6fc [REFACTOR] Refactored classes for error handling 
* [ADDED] More error codes
* [MODIFIED] Class updates to use Base Class all the time
* [MODIFIED] Cronjobs have been slightly adjusted
* [ADDED] More base class features
 2013-11-05 14:34:31 +01:00
Sebastian Grewe
04e2bf5932 [IMPROVED] More testing of error handling, block class 2013-11-05 08:19:16 +01:00
Sebastian Grewe
172444d3d8 [IMPROVED] Added logging failed SQL queries to payouts 2013-11-05 07:28:07 +01:00
Sebastian Grewe
ae45939fea [IMPROVED] Re-factored monitoring criticals/errors 
* [ADDED] new monitoring method : endCronjob
* [IMPROVED] Use newly added error codes
* [ADDED] mail notifications, enabled by default
* [ADDED] cron disable on fatal errors with exit code != 0
* [ADDED] Command line swtich: -f = Force running crons even if disabled
* [ADDED] Disabled status in monitoring site

This will improve error handling in our cronjobs. Fatal errors now
require manual intervention by explicityly running crons with the force
option (`-f`). Until they are forced to run, crons will stay disabled.

Fixes #773 once merged
 2013-11-05 07:28:07 +01:00
Sebastian Grewe
aa4fc55622 [ADDED] Error Code Array 2013-11-05 07:28:07 +01:00
Sebastian Grewe
d2d7ee6796 Merge pull request #821 from TheSerapher/issue-819 
[FIX] Display issues on SHA coins
 2013-11-04 22:17:04 -08:00
Sebastian Grewe
44e29fc3f2 [FIX] Regression bug creating workers 
Fixes #823 once merged.
 2013-11-05 07:14:39 +01:00
Sebastian Grewe
2e64c4108d [FIX] Worker Hashrates in Account -> My Worker 2013-11-04 18:30:01 +01:00
Sebastian Grewe
4e68de0e5a [FIX] Display issues on SHA coins 
* [FIX] Estimated shares on various places
* [ADDED] Calculate estimated shares based on network diff in stats
  class
* [UPDATED] Themes updated as needed

Fixes #819 once merged
 2013-11-04 18:23:38 +01:00
Sebastian Grewe
556e02024f Merge pull request #820 from TheSerapher/issue-811 
[IMPROVED] Optimized IDLE Worker Query
 2013-11-04 09:17:13 -08:00
Sebastian Grewe
c0e7385332 [ADDED] Re-added custom HTTP port support 2013-11-04 15:25:38 +01:00
Sebastian Grewe
5eefb730ae [FIX] Re-location via HTTPS on login 2013-11-04 14:26:21 +01:00
Sebastian Grewe
f713edf234 Revert "[FIX] Honor custom HTTP ports" 
This reverts commit fc4b718067.
 2013-11-04 14:16:54 +01:00
Sebastian Grewe
8e5dc78df4 Merge pull request #815 from iAmShorty/google-analytics 
[FEATURE] Added Google Analytics
 2013-11-04 00:15:11 -08:00
root
84781763b0 [FIX] small style changes and smarty default value 2013-11-03 17:31:02 +01:00
root
f14af44d4c [FIX] Placed under Statistics 2013-11-03 16:48:47 +01:00
Sebastian Grewe
70d59d4900 [IMPROVED] Hide uptime status if no API keys set 2013-11-03 15:23:35 +01:00
root
505d242cbd [FEATURE] Added Google Analytics 2013-11-03 15:08:46 +01:00
Sebastian Grewe
83ee00259f [FIX] Fixed typo in cron logs 2013-11-02 18:57:15 +01:00
Sebastian Grewe
ab2b2d6062 Merge pull request #812 from TheSerapher/uptimerobot 
Uptimerobot
 2013-11-02 02:58:03 -07:00
Sebastian Grewe
ab73e9ad0f [IMPROVED] Error Handling, logging 2013-11-02 10:56:46 +01:00
Sebastian Grewe
6ca1179e47 [IMPROVED] Optimized IDLE Worker Query 
Fixes #811
 2013-11-02 10:35:59 +01:00
Sebastian Grewe
8601e71802 Merge pull request #807 from iAmShorty/update-gettingstarted 
[IMPROVED] make Gettingstarted more dynamic
 2013-10-31 09:13:22 -07:00
root
3b7d36059f [IMPROVED] another mistake :) 2013-10-31 14:25:50 +01:00
Sebastian Grewe
ff6a6e0931 Merge branch 'next' of github.com:TheSerapher/php-mpos into next 2013-10-31 13:41:04 +01:00
Sebastian Grewe
35a6c21024 [FIX] Worker hashrates for SHA/Scrypt compat 2013-10-31 13:39:01 +01:00
root
1973429422 [IMPROVED] forgot declaration in sites 2013-10-31 13:09:30 +01:00
root
6d9195b747 [IMPROVED] make Gettingstarted more dynamic 2013-10-31 12:13:45 +01:00
Sebastian Grewe
efe14ce629 Merge pull request #798 from TheSerapher/issue-797 
[FIX] Exclude invalid shares from statistics
 2013-10-31 00:07:49 -07:00
Sebastian Grewe
0c3eb82be3 Merge pull request #805 from TheSerapher/issue-803 
[FIX] Honor custom HTTP ports
 2013-10-31 00:07:24 -07:00
Sebastian Grewe
f6056aced1 [FIX] Propagate dashboard when API disabled 
Fixes #804
 2013-10-31 08:02:26 +01:00
Sebastian Grewe
fc4b718067 [FIX] Honor custom HTTP ports 
Fixes #803
 2013-10-31 07:55:12 +01:00
Sebastian Grewe
7ec1fcfafb [FIX] Exclude invalid shares from statistics 
* Hashrates
* Sharetes
* Time Graphs

Fixes #797
 2013-10-30 19:26:02 +01:00
nicoschtein
7e602f2eda Added "system"->system_error_email to Settings 
E-mail address for system error notifications
 2013-10-30 16:13:38 -02:00
obigal
c0756d39df 24 hour pool statistics 2013-10-29 22:25:45 -04:00
obigal
4f3503bbb1 Admin poolworkers average difficulty fixes 2013-10-29 20:13:24 -04:00
Sebastian Grewe
8752b718e3 [FIX] Sort by donation amount not username 2013-10-29 18:13:00 +01:00
Sebastian Grewe
3ee2874110 [FIX] Removed debug output 2013-10-29 18:02:37 +01:00
Sebastian Grewe
272448dc6c [IMPROVED] Allow multi-monitor setup via API Keys 2013-10-29 18:00:21 +01:00
Sebastian Grewe
ef5ac9cbfd [ADDED] Last check footer 2013-10-29 14:54:35 +01:00
root
c4d1ca39c5 [UPDATE] reworked functions 2013-10-29 09:46:32 +01:00
Sebastian Grewe
88a2a29b3b [UPDATE] Adding missing files 2013-10-29 09:23:52 +01:00
root
b0f4edbc13 [IMPROVED] Added Found/Valid/Orphaned to Stats 2013-10-28 21:29:48 +01:00
root
03aef00367 [IMPROVED] Added some block stats to Pool Statistics 2013-10-28 20:42:39 +01:00
Sebastian Grewe
c6dd4086ff Merge pull request #764 from TheSerapher/payout-fixes 
Payout fixes
 2013-10-28 05:20:19 -07:00
Sebastian Grewe
8f51faf963 [IMPROVED] Adding pools specific PPS rate 
* Show Diff1 Baseline PPS Rate
* Use pools set minimum difficulty to display pool based rate
 2013-10-28 13:16:17 +01:00
Sebastian Grewe
c61c5f096e [MERGE] Fix merge conflicts 2013-10-28 07:14:25 +01:00
Sebastian Grewe
7a95e4c086 Merge pull request #775 from obigal/admin-reports 
Admin panel earnings report
 2013-10-27 22:47:47 -07:00
obigal
1b277c69cf admin panel reports 2013-10-27 10:24:49 -04:00
Sebastian Grewe
a841880fe7 Merge pull request #760 from TheSerapher/issue-759 
Issue 759
 2013-10-27 07:02:02 -07:00
obigal
aeaeb32d4a admin panel pool-workers 2013-10-27 09:45:52 -04:00
Sebastian Grewe
e238323395 Merge pull request #772 from TheSerapher/issue-770 
[FIX] TX Summary for Accounts
 2013-10-27 03:41:36 -07:00
Sebastian Grewe
b8159f06d7 [IMPROVED] Roundstatistics code and templates 
* [IMPROVED] Removed uneeded data array from round page
* [IMRPOVED] Sorted round shares via User ID as key for easier access
* [IMPROVED] Added share count to transaction list in prop
 2013-10-27 09:12:34 +01:00
Sebastian Grewe
bae4f1712c [FIX] TX Summary for Accounts 
Fixes #770
 2013-10-27 08:41:25 +01:00
Sebastian Grewe
a2472284a8 [FIX] Proper fetch Archive Shares 
Is now in-line with getMininumShareId.
 2013-10-27 03:28:41 +01:00