Commit Graph

370 Commits

Author SHA1 Message Date
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
neonbunny
f94e48eb89 Fix for reflected XSS security issue. 2013-12-28 17:34:09 +00: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
Sebastian Grewe
9572de451b [FIX] Fixes #1110 2013-12-26 16:10:04 +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
a6d5b6e248 [FIX] fixed 3 Notices 2013-12-20 16:14:40 +01:00
Frederick Behrends
ccb14c37cd added blocks until next difficulty change to EstNextDifficulty 2013-12-20 03:59:47 +01: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
nrpatten
61151a50ac Update tacpop.inc.php 2013-12-20 00:15:28 +11:00
nrpatten
fc2ffd4868 TAC PopUp window for registrations 2013-12-19 06:42:34 -05:00
nrpatten
e0c066d656 Create tacpop.inc.php 2013-12-19 20:59:26 +11: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
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
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
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
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
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
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
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
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
root
2b33b21350 [FIX Blockfinder Stats] Working with public and private settings 2013-11-22 14:11:18 +01:00
root
a1493032d2 [FIX] undefined index: USERDATA 2013-11-18 13:20:23 +01:00
root
510c076452 [FEATURE] blockfinder statistics 2013-11-18 12:43:17 +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
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
629dfb58ed [FIX] Name of Uptime Robot Setting 2013-11-11 12:30:36 +01:00
root
07e7bf59c0 [UPDATE] disabled pages and showing popup 2013-11-11 09:09:06 +01:00
Sebastian Grewe
8edfb88ee3 [FIX] Use default cointarget if unset 2013-11-08 10:41:40 +01:00
root
a7cda8fedc [TEMPLATE] block stats in mmcfe 2013-11-07 15:27:39 +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
dd1ef86b81 [ADDED] Pool name to getpoolstatus API 2013-11-05 15:15:48 +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
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
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
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
ab2b2d6062 Merge pull request #812 from TheSerapher/uptimerobot
Uptimerobot
2013-11-02 02:58:03 -07:00
root
3b7d36059f [IMPROVED] another mistake :) 2013-10-31 14:25:50 +01:00
root
1973429422 [IMPROVED] forgot declaration in sites 2013-10-31 13:09:30 +01: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
obigal
c0756d39df 24 hour pool statistics 2013-10-29 22:25:45 -04:00
Sebastian Grewe
ef5ac9cbfd [ADDED] Last check footer 2013-10-29 14:54:35 +01:00
Sebastian Grewe
caf85b5dba Revert "Revert "Merge pull request #784 from iAmShorty/pool-stat-additions""
This reverts commit 178f798d8f.
2013-10-29 09:56:17 +01:00
Sebastian Grewe
178f798d8f Revert "Merge pull request #784 from iAmShorty/pool-stat-additions"
This reverts commit df6134db76, reversing
changes made to 0d1a53c7a3.
2013-10-29 09:33:45 +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
c61c5f096e [MERGE] Fix merge conflicts 2013-10-28 07:14:25 +01:00
obigal
1b277c69cf admin panel reports 2013-10-27 10:24:49 -04:00
obigal
aeaeb32d4a admin panel pool-workers 2013-10-27 09:45:52 -04: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
1b53456fd6 [FIX] No user round shares on navbardata API 2013-10-27 03:08:59 +01:00
Sebastian Grewe
3a0e2a9a13 [FIX] Dashboard API on non-PPS system 2013-10-27 02:45:43 +01:00
nrpatten
6eb74aa57d Some live stats for General Statistics, And add Est. Shares to dashboard stats removed est: from Pool Valid 2013-10-26 18:47:10 -04:00
Sebastian Grewe
a6f9c25b5b [UPDATE] Proper implementation of target bits
* [ADDED] New Config Option: Algorithm
 * scrypt and sha256d supported right now
 * might add SHA coin support across MPOS
 * Compatible with previous implementation
* [REMOVED] config option: pps_target
 * Replaced by config option: algorithm
 * Please update your config, defaults to srypt now!
* [ADDED] Unpaid Shares in Dashboard
* [MODIFIED] User estshares from DB query instead template math
2013-10-26 14:10:34 +02:00
Sebastian Grewe
06997429f2 [FIX] Round invalid % values 2013-10-25 11:57:17 +02:00
Sebastian Grewe
ad3f7ecde9 [UPDATED] Added more data to getdashboarddata API
* [UPDATED] Added % values to Dashboard
* [UPDATED] Allow dashboard to update % values
2013-10-25 11:52:06 +02:00
Sebastian Grewe
ccb8faf5e3 Merge pull request #763 from TheSerapher/issue-743
[IMPROVED] User payout estimations
2013-10-25 02:43:18 -07:00
Sebastian Grewe
1c2b84bb50 Merge pull request #744 from obigal/pplns-stats
Pplns stats
2013-10-25 00:50:16 -07:00