Commit Graph

543 Commits

Author SHA1 Message Date
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
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
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
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
Joey
47a13f937b Update worker.class.php
Cleaned up code
2013-12-19 09:11:59 -05: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
Joey
019e3c8082 Update worker.class.php
Fix for issue #957
2013-12-19 05:59:23 -05: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
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
f465bda350 [ADDED] Accept TaC during registration 2013-12-12 10:11:44 +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
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
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
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
eec52b7e4a [UPDATE] Cache RPC getinfo calls 2013-12-07 13:32:57 +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
288c2dd866 Merge pull request #893 from TheSerapher/issue-872
Issue 872
2013-12-03 01:10:35 -08: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
f07064a0a3 [FIX] Hourly Hashrate Graphs 2013-11-29 16:25:37 +01: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
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
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
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
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
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
9ccc3403f8 [UPDATED] Query improved for first blocks time 2013-11-11 12:42:35 +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
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
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
f8f8b0a997 [FEATURE] calculating-luck 2013-11-07 10:50:32 +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
7785fbf8b7 [FIX] Settings return value on empty result 2013-11-06 14:47: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
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
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
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
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