Commit Graph

2365 Commits

Author SHA1 Message Date
Sebastian Grewe
20305026e8 [ADDED] User login overview to admin dashboard
Fixes #1374 once merged
2014-01-12 09:05:59 +01:00
Sebastian Grewe
20ef443ae1 [FIX] Custom smarty code HTML 2014-01-12 08:50:24 +01:00
Sebastian Grewe
4fe46cbd2a [ADDED] last_login timestamp
* [RENAMED] sessionTimeoutStamp to last_login
* [UPDATE] user class to store login time after successful login
* [ADDED] SQL Upgrade file for new column
* [UPDATE] Updated base SQL file

Fixes #1162 once merged.
2014-01-11 20:32:45 +01:00
Sebastian Grewe
2417ee7c4f [FIX] Log SQL errors on invalid checkUserPassword
Fixes #1366 once merged.
2014-01-11 19:28:37 +01:00
Sebastian Grewe
f98d08df83 [SECURITY] Fixing XSS in PHP_SELF
Fixes #1364 once merged.
2014-01-11 19:01:14 +01:00
Sebastian Grewe
9526cf0093 [IMPROVED] Show static nav hashrate if live off
Fixes #1362 once merged.
2014-01-11 18:37:55 +01:00
Sebastian Grewe
1485a02528 [ADDED] Invitation overview to admin dashboard
* Split up dashboard default template into subfiles
* Added new invitation overview
* Updated page file

Fixes #1357 once merged.
2014-01-11 13:45:55 +01:00
Sebastian Grewe
9a959164a6 [FIX] wrong percentage calculations in API 2014-01-11 13:18:46 +01:00
Sebastian Grewe
fb3f527e86 [FIX] Typo in modifier 2014-01-11 13:15:44 +01:00
Sebastian Grewe
93dd7c92a6 Merge pull request #1356 from TheSerapher/issue-1354
[CLEANUP] Missed two values
2014-01-11 04:13:40 -08:00
Sebastian Grewe
1ca8144ad5 [CLEANUP] Missed two values 2014-01-11 13:13:20 +01:00
Sebastian Grewe
c1d08895cf Merge pull request #1355 from TheSerapher/issue-1354
[CLEANUP] Dashboard number formatting
2014-01-11 04:11:49 -08:00
Sebastian Grewe
5f942d9ba7 [CLEANUP] Dashboard number formatting
Cleans up some Ajax data on the dashboard to match the static template
data format. No more jumpy numbers.

Fixes #1354
2014-01-11 13:10:44 +01:00
Sebastian Grewe
6baad2dd06 [UPDATE] Added active workers to admin dashboard
* Using lower time range for shares: 120 seconds
* Updated worker class with new time range for active workers
* Added statistics, active users call with 120 seconds time range
* Updated admin panel dashboard template

Fixes #1352 once merged.
2014-01-11 12:37:39 +01:00
Sebastian Grewe
88c962266f [IMPROVED] Wrapper for contributor stats
Fixes a small alignment issue with unbalance table heights.
2014-01-11 12:04:48 +01:00
Sebastian Grewe
41defc88fa Merge pull request #1338 from cpo/next
issue-1336
2014-01-10 23:17:31 -08:00
Sebastian Grewe
07cc791d83 Merge pull request #1350 from rog1121/next
Add Custom Stratum URL
2014-01-10 22:21:10 -08:00
rog1121
412807b7a8 Add Stratum URL 2014-01-10 18:40:06 -07:00
Glen
bbb82ccd69 Update global.inc.dist.php
Just thought I would fix a couple of spelling errors for next global.inc.dist.php release :)
2014-01-11 10:49:59 +11:00
Sebastian Grewe
af15e45632 Merge pull request #1346 from TheSerapher/issue-1341
[FIX] No filter on admin news pages
2014-01-10 11:00:32 -08:00
Sebastian Grewe
7a1a917af0 [FIX] No filter on admin news pages 2014-01-10 20:00:09 +01:00
Sebastian Grewe
aa716c274c Merge pull request #1342 from TheSerapher/issue-1315
Issue 1315
2014-01-10 10:38:01 -08:00
Sebastian Grewe
67b2ce6bff [FIX] News formatting 2014-01-10 19:23:38 +01:00
Sebastian Grewe
9fbc36f9ac [FIX] Re-added simple error to jsonRPC 2014-01-10 17:08:11 +01:00
Sebastian Grewe
43bd1beeb8 [FIX] Surpress any URL info 2014-01-10 17:00:58 +01:00
Sebastian Grewe
6aefea6b6f [FIX] Better error handling 2014-01-10 16:41:05 +01:00
Sebastian Grewe
0b43c66e67 [CLEANUP] Removed newline 2014-01-10 16:34:36 +01:00
Sebastian Grewe
90a8404bab [CLEANUP] Code cleanup, error checking
Fixes #1315 once merged.
2014-01-10 16:34:36 +01:00
myrinx
fca7bd7b3d Update global.inc.dist.php
removed wallet address :)
2014-01-10 16:34:36 +01:00
myrinx
be77b05b12 Update global.inc.dist.php
added config variabled for the liquid_payout.php cronjob
2014-01-10 16:34:36 +01:00
myrinx
a37ebd2db8 Update version.inc.php
changed config to 0.0.2 to support liquid_payout.php cron
2014-01-10 16:34:36 +01:00
Sebastian Grewe
627b7a17ff [FIX] Catch jsonRPC exceptions
Fixes #1339 once merged.
2014-01-10 16:20:24 +01:00
Chris Polderman
5981489925 issue-1336 2014-01-10 14:15:41 +01:00
Sebastian Grewe
10dbcd471d [IMPROVE] Enable SSL on recaptcha_get_html
Fixes #1334 once merged.
2014-01-10 11:00:00 +01:00
Sebastian Grewe
d16b5a1067 Merge pull request #1327 from rog1121/next
Add CLEditor to News
2014-01-10 00:27:54 -08:00
Sebastian Grewe
8498692f2b [FIX] Properly un-escape Google Analytics code 2014-01-10 09:15:08 +01:00
Sebastian Grewe
691fa28cc0 Update master.tpl
Fixed analytical code position.
2014-01-10 07:53:36 +01:00
Sebastian Grewe
19094e73e3 Merge pull request #1271 from drainx/next
JSON-RPC
2014-01-09 22:11:35 -08:00
Sebastian Grewe
c16945d564 Merge pull request #1313 from TheSerapher/issue-1233
[IMPROVED] Auto-escape all used smarty variables
2014-01-09 22:11:12 -08:00
Sebastian Grewe
8e356d1eaf Merge pull request #1311 from TheSerapher/issue-1281
[FIX] Number formatting on pages
2014-01-09 22:10:22 -08:00
rog1121
8e06c41a90 CLEditor 2014-01-09 21:13:47 -07:00
Glen
748a3d48c3 Update default.tpl
Suggestion to remove 'account' column from user 'transactions' page to allow more real estate on the page.

The 'account' really is a waste of space anyway for the user view on the other hand the transactions in the Admin panel the account column is useful.
2014-01-10 13:17:45 +11:00
Sebastian Grewe
b12a45ed2a Merge pull request #1306 from TheSerapher/issue-1300
Issue 1300
2014-01-09 08:41:30 -08:00
Sebastian Grewe
a2a6f36c1f [IMPROVED] Auto-escape all used smarty variables
http://www.smarty.net/docs/en/variable.escape.html.tpl

Addresses #1233
2014-01-09 11:10:47 +01:00
Sebastian Grewe
02cd098099 [FIX] #1245 Typo 2014-01-09 11:05:06 +01:00
Sebastian Grewe
3645a23333 Merge pull request #1312 from TheSerapher/issue-1061-deleteuser
[UPDATE] Allow deletion of accounts
2014-01-09 01:33:12 -08:00
Sebastian Grewe
b82e500379 [FIX] Number formatting on pages
* Added new global js library to convert number_format similar to PHP
 * Does some rounding, so not 100% perfect but does the trick
* Added new library to master template
* Updated dashboard to use this library for all numbers in question

Fixes #1276
2014-01-09 10:25:48 +01:00
Sebastian Grewe
fcbf153bd9 [FIX] Do not show xaxis ticks
Ticks take too much room and don't convey enough information. They are
now removed.

Fixes #1276 once merged.
2014-01-09 09:16:50 +01:00
Sebastian Grewe
eafb241bde [REMOVED] Support page code 2014-01-09 09:11:33 +01:00
Sebastian Grewe
6e99806479 [REMOVE] Uneeded, useless support page
* Removed support page templates
* Changed navigation to contact
* Modified contact form behaviour on enable/disable events

This fixes #1300. It wasn't clear which templates needed to be edited
for the contact form to work.
2014-01-09 09:09:14 +01:00
Sebastian Grewe
146cf94a5e [CLEANUP] Registration page 2014-01-08 09:23:42 +01:00
Andrea Baccega
7fd258fab4 Fixed documentation typos. 2014-01-07 15:56:47 +01:00
Sebastian Grewe
937bf56c18 Merge pull request #1279 from raistlinthewiz/next
Updated max lenght of username field in password-reset form
2014-01-07 04:13:11 -08:00
Hüseyin Uslu
b69991e129 Increased password-reset form username size to 100
Increased the accepted max-length to 100 as requested:  https://github.com/TheSerapher/php-mpos/pull/1279#issuecomment-31732351
2014-01-07 14:11:26 +02:00
Hüseyin Uslu
748e4796c1 Updated max lenght of username field in password-reset form
As the password reset form can also accept emails, increased the max-length size to 50 - so that we can accept long emails too.
2014-01-07 14:04:21 +02:00
Sebastian Grewe
549477a7ad [ADDED] User overview in admin dashboard
* Total users
* Locked users
* Admin users
* No Fees users

Thanks @daygle for the suggestion!

Fixes #1277 once merged
2014-01-07 10:32:34 +01:00
Sebastian Grewe
ef28547940 Merge branch 'next' of https://github.com/TheSerapher/php-mpos into next 2014-01-07 09:40:02 +01:00
Sebastian Grewe
727b082059 [FIX] Registration password lenght, API class default time 2014-01-07 09:39:43 +01:00
drainx
f7b087df98 Small human error fix. 2014-01-06 18:29:23 -06:00
drainx
5a1c693fa6 Move from XML-RPC to JSON-RPC. 2014-01-06 17:34:54 -06:00
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
fe31737576 Merge pull request #1264 from TheSerapher/issue-1016
[FIX] Caching issues with hybrid templates
2014-01-06 03:27:56 -08:00
Sebastian Grewe
418728071b [UPDATE] Allow deletion of accounts
Updated backend and theme to be able to deal with deleted accounts

    * Backends will skip any users that have no account_id associated with
      their shares
    * Updated round stats theme to show users as unknown if none can be found

    This will not fully address the issue of account deletion but at least
    wont break the system anymore.
2014-01-06 12:26:57 +01:00
Sebastian Grewe
d0e899b7d0 [FIX] Empty / no template detection 2014-01-06 12:00:48 +01: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
766032fbdb Merge pull request #1259 from TheSerapher/issue-1255
[FIX] Closing nocache tags
2014-01-05 22:26:03 -08:00
Sebastian Grewe
64958782a4 [FIX] Closing nocache tags
Fixes #1255 once merged.
2014-01-06 07:25:09 +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
017a56549d Merge pull request #1213 from TheSerapher/issue-670-unlocks
[IMPROVED] Unlock notification mails on auto-locks
2014-01-04 00:11:28 -08:00
Sebastian Grewe
8fcd59eeea [ADDED] Account unlock mail on failed PIN 2014-01-02 13:28:33 +01:00
Sebastian Grewe
8c2912a7df Merge branch 'next' of https://github.com/TheSerapher/php-mpos into next 2014-01-02 12:25:46 +01:00
Sebastian Grewe
11c417230b [FIX] Reset pin button 2014-01-02 12:25:22 +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
80d0467c2d Merge pull request #1211 from TheSerapher/issue-1040
[CHANGE] Moved from bar shares to pie shares
2014-01-02 02:09:34 -08: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
rog1121
494a3a2714 Fix Hardcoded blockchain 2014-01-01 15:08:39 -07: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
020905679a [FIX] Display TX Fee in account panel
Fixes #1196 once merged.
2014-01-01 08:43:53 +01:00
Sebastian Grewe
6656e47fdc [FIX] Spelling error
Fixes #1192 once merged
2014-01-01 08:39:49 +01:00
Sebastian Grewe
4fa4259932 [CHANGE] Moved from bar shares to pie shares
The cake is a lie! It's a pie!

Addresses #1040
2013-12-31 23:51:39 +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
2675a9573f [FIX] Better version 2013-12-31 16:34:37 +01:00
Sebastian Grewe
e9c780f2ee [FIX] Don not show decimals > 0.0001 fee 2013-12-31 16:32:57 +01:00
Sebastian Grewe
9c2e6fa30b [FIX] Properly display pool fee in dashboard
Fixes #1178 once merged.
2013-12-31 16:28:53 +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
Neozonz
33b06946f4 PIN Reset email template 2013-12-30 11:45:39 -08: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
b2ac77d9a5 Merge pull request #1128 from nicoschtein/patch-12
Make TXId & Address clickable on Transaction Lists
2013-12-30 03:23:14 -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
nicoschtein
9481eae316 Make TXId & Address clickable on Transaction Lists
Added an alert box displaying full TXId and Address when clicked on Admin Transaction List
2013-12-27 03:49:45 -02:00
nicoschtein
e5ffc85084 Make TXId & Address clickable on Transaction Lists
Added an alert box displaying full TXId and Address when clicked on User Account Transaction List
2013-12-27 03:47:36 -02: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
Joey
39b8d78379 Breadcrumbs
Bugfix for breadcrumbs tpl
2013-12-26 17:38:17 -05: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
003b8c79b6 [FIX] Removed old paginator 2013-12-23 22:51:26 +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
16636f6a39 [FIX] Display bug on mobile 2013-12-23 21:07:04 +01:00
Sebastian Grewe
96085cb683 [FIX] Minor display fix 2013-12-23 21:06:08 +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
ab05eca651 [UPDATE] Mention Markdown on Newspost creation 2013-12-20 10:29:09 +01: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
8b69ba1216 Update layout.css 2013-12-20 00:28:45 +11:00
nrpatten
61151a50ac Update tacpop.inc.php 2013-12-20 00:15:28 +11:00
nrpatten
01a23a638f Update index.php 2013-12-20 00:14:25 +11:00
nrpatten
e02df01ed0 Update master.tpl
[ADDED] tinybox.js for tac popup, Removed not double type="text/javascript"
2013-12-19 23:04:47 +11:00
nrpatten
ff8f2d94e3 TAC PopUp window for registrations 2013-12-19 06:58:53 -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
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
6df340c1ef Update default.tpl
Add Tac Popup Center Captcha align Tac Image
2013-12-19 21:11:51 +11:00
nrpatten
66a99cd086 Create default.tpl
Add TacPop default.tpl
2013-12-19 21:07:10 +11:00
nrpatten
147f7bfc21 Update master.tpl
Add tinybox.js
2013-12-19 21:02:17 +11:00
nrpatten
e0c066d656 Create tacpop.inc.php 2013-12-19 20:59:26 +11:00
nrpatten
4d06f36590 Update custom.css
Add PopUp CSS
2013-12-19 20:57:38 +11:00
nrpatten
64494672d8 Create tinybox.js
TinyBox PopUp JS
2013-12-19 20:51:35 +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
4992274eea [CHANGE] 8 digits for dashboard estimates
Fixes #1024 once merged.
2013-12-19 09:04:38 +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
322a759249 [FIX] Typo in Navbar
Fixes #1017 once merged.
2013-12-18 09:23:12 +01: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
a407f964d7 fix autopayment for coins with larger blockreward 2013-12-16 20:01:21 +01:00
Frederick Behrends
9643f34183 Escaping values in Admin Setting Panel to prevent html to break the form. 2013-12-16 20:01:19 +01:00
Frederick Behrends
6695d58401 Added "Est. Next Difficulty" and "Est Round Time (Network)" to the general stats in mobile theme. 2013-12-16 20:01:19 +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
8275e06fcc Merge pull request #988 from grimd34th/next
Convert some resources to CDNs instead of local hosting
2013-12-16 00:36:08 -08:00
Trevor
0a658df355 Update master.tpl
github is not a cdn
2013-12-15 09:33:42 -05: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
58eb7b6794 Merge pull request #968 from TheSerapher/issue-967
[CHANGED] Merge payout crons
2013-12-15 01:40:43 -08:00
Trevor
7f8d7db761 Convert some dependencies to CDNs
Improve page load times by using cdns instead of local hosted files
2013-12-14 10:10:40 -05:00
Sebastian Grewe
68958fb7bf [UPDATE] Increase login input cap 2013-12-13 08:52:43 +01: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
d0a29747a2 [ADDED] TaC link to Navigation
This, and other, commit will address #965
2013-12-12 10:14:49 +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
666a9ccc4a Merge pull request #890 from TheSerapher/issue-886
[IMPROVED] Use limits for DELETE statements
2013-12-11 04:36:05 -08:00
Sebastian Grewe
bd2ef0f56f [REMOVED] Old unused stats on mobile 2013-12-11 10:55:18 +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
4ded825326 [IMPROVED] Use static data first on dashboard 2013-12-06 16:35:39 +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
4c7fe3387d Merge pull request #905 from TheSerapher/issue-899
[FIX] Disable caching for mail data
2013-12-05 09:33:38 -08:00
Sebastian Grewe
0740eca0ab [IMPROVED] Added balance checks post payouts
Fixes #904 once merged.
2013-12-05 18:12:40 +01:00
Sebastian Grewe
524be78a28 Update footer.tpl
Reducing donation coin spread
2013-12-05 17:52:25 +01:00
Sebastian Grewe
7f3fc63d0e Merge pull request #894 from TheSerapher/issue-874
[REMOVED] mmcFE Theme dropped from project
2013-12-05 01:57:07 -08:00
Sebastian Grewe
100b4453c3 [FIX] Disable caching for mail data 2013-12-05 01:13:16 +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
9cfce0ff06 [FIX] Show price/workers 2013-12-04 10:45:01 +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
ae20f3bfd0 [FIX] Added missing space in Getting Started link
Fixes #883 once merged.
2013-12-03 10:03:06 +01:00
Sebastian Grewe
34a083fa1c [REMOVED] mmcFE Theme dropped from project
This fixes #874 once merged.

It will require a couple of tests by other users to ensure that
MPOS is not affected (via hard-linked URLs for example).
2013-12-03 10:00:15 +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
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
89c6857e72 Removed WhiteSpace 2013-11-29 10:45:40 +00:00
ahmedbodi
810b9e3987 Fixed Config Array 2013-11-29 10:02:47 +00:00
ahmedbodi
84fcbef4d7 Added Algorithm Check 2013-11-29 10:01:03 +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
e8ec8aa301 Merge pull request #870 from TheSerapher/issue-868
[FIX] Display username when unlisted
2013-11-27 04:50:35 -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
a35bb0d4cd [FIX] Potential XSS 2013-11-27 13:27:56 +01:00
Sebastian Grewe
f7adadc2da [FIX] Display username when unlisted 2013-11-27 13:25:15 +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
34ea68e271 Merge pull request #862 from WKNiGHT-/patch-7
Update default.tpl
2013-11-23 13:12:49 -08:00
Sebastian Grewe
c418e98aca [FIX] Idle Worker Notifiaction reset 2013-11-23 20:37:19 +01:00
Fred
cc5a82c3f2 Update default.tpl
No reason max width should be less then 100. Quick fix.
2013-11-23 09:19:09 -06: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
Sebastian Grewe
70432eaf66 Merge pull request #854 from TheSerapher/issue-853
Issue 853
2013-11-20 23:10:19 -08:00
nicoschtein
56b6e98799 Changed sender email field max length
It should be 254 (http://stackoverflow.com/questions/386294/what-is-the-maximum-length-of-a-valid-email-address), but that seems improbable.. so I would go with 50 chars max, instead of 20 that cuts 4 out of 10 emails I receive.
2013-11-20 13:18:43 -02: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
7a30af2daf [FEATURE] removed unneeded files 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
6010f81155 [UPDATE] More digits in price on dashboard 2013-11-17 10:04:18 +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
91bd48de5e [FIX] wrong variables used 2013-11-10 13:53:20 +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
41f33bde1b [IMPROVE] Removed whitespace 2013-11-08 10:41:54 +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
e92e0d7abb [FIX] default coin target in templates 2013-11-07 14:51:21 +01:00
root
dc990a5e64 [FIX] changed text 2013-11-07 13:48:49 +01:00
root
1bd6bfdd45 [FIX] calculation since first block found 2013-11-07 12:23:29 +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
90a000e7ee [FIX] division by zero 2013-11-07 11:18:48 +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
174e25e90a [FIX] Default pool to unknown if unset 2013-11-06 15:39:53 +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
86226bd606 [IMRPOVED] Error Notification Mail with new headers 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
d08bee5c4c [FIX] Increase mail size in contactform 2013-11-04 14:28:24 +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
c8ac14a35f [FIX] Removed duplicate name in textarea 2013-11-03 15:14:19 +01:00
root
505d242cbd [FEATURE] Added Google Analytics 2013-11-03 15:08:46 +01:00
Sebastian Grewe
1f07b96d92 Merge branch 'next' of github.com:TheSerapher/php-mpos into next 2013-11-03 10:04:07 +01:00
Sebastian Grewe
93affd05a6 [FIX] Removing unused CSS 2013-11-03 10:03:57 +01:00
nrpatten
ee284576b9 [FIX] Toggle text position
Remove: <td align="center> "This pushes toggle text out of position"
Add: style="margin: 0px 28px;" to span, Keep's text in place and centers toggle.
2013-11-03 09:34:56 +11:00
Sebastian Grewe
d25cfb0001 [FIX] XSS Vulnerability 2013-11-02 18:57:35 +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
bd0398d927 Merge branch 'next' of github.com:TheSerapher/php-mpos into next 2013-11-01 08:30:07 +01:00
Sebastian Grewe
e4dcc7b160 [IMPROVED] Mobile general stats for blocks 2013-11-01 08:29:55 +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
b681add0e4 [FIX] added default variables 2013-10-31 16:58:00 +01:00
Sebastian Grewe
75abbb99a0 Merge pull request #808 from iAmShorty/low-cost-coins
[IMPROVED] changed decimal places to 4 to display low cost coins
2013-10-31 07:39:27 -07:00
root
2c10504aa5 [FIX] added to mobile template 2013-10-31 14:29:19 +01: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
126563c8f7 [IMPROVED] changed decimal places to 4 to display low cost coins 2013-10-31 12:16:52 +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
Sebastian Grewe
fb2cae9430 [UPDATE] Changed back scale of gauges 2013-10-30 11:34:28 +01:00
Sebastian Grewe
7e106644c5 [UPDATE] Slight change for block 24h totals 2013-10-30 10:44:48 +01:00
Sebastian Grewe
12265550b6 [ADDED] More icons 2013-10-30 09:55:15 +01:00
Sebastian Grewe
9308da54ed [IMPROVED] Block stats in pool overview 2013-10-30 08:38:54 +01: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
4793d38764 [FIX] Number format for PPS Rates 2013-10-29 16:56:59 +01:00
Sebastian Grewe
ef5ac9cbfd [ADDED] Last check footer 2013-10-29 14:54:35 +01:00
Sebastian Grewe
208ae68a2a Merge pull request #789 from iAmShorty/pool-stat-additions
[UPDATE] reworked functions
2013-10-29 01:56:33 -07: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
root
c4d1ca39c5 [UPDATE] reworked functions 2013-10-29 09:46:32 +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
df6134db76 Merge pull request #784 from iAmShorty/pool-stat-additions
[IMPROVED] Added some block stats to Pool Statistics
2013-10-29 01:27:59 -07:00
Sebastian Grewe
88a2a29b3b [UPDATE] Adding missing files 2013-10-29 09:23:52 +01:00
Sebastian Grewe
60688bb4dc [INITIAL] First commit for Uptime Robot API Feature 2013-10-29 09:08:21 +01:00
obigal
728b7c4f98 report button fix / hide pplns stats 2013-10-28 23:43:24 -04:00
Fred
a0c395850e Update default.tpl
Fixed for Website name instead of Pool Collective.
2013-10-28 15:43:15 -05: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
Sebastian Grewe
1b53456fd6 [FIX] No user round shares on navbardata API 2013-10-27 03:08:59 +01:00
Sebastian Grewe
a0d30664f2 Merge pull request #769 from nrpatten/stats-test
Stats test
2013-10-26 18:55:11 -07:00
Sebastian Grewe
20a9fc3e28 Revert "[FIX] Fixed potential PPLNS issue"
This reverts commit ee46e65fca.
2013-10-27 02:51:03 +01:00
nrpatten
8c3f590dd4 Delete statsjs.tpl 2013-10-27 12:47:35 +11:00
Sebastian Grewe
3a0e2a9a13 [FIX] Dashboard API on non-PPS system 2013-10-27 02:45:43 +01:00
nrpatten
418e0bd89d Update statsjs.tpl to js.tpl 2013-10-26 21:43:38 -04:00
Sebastian Grewe
1d180c3e3d [FIX] Do not include orphans in transaction summary 2013-10-27 02:18:49 +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
3326ce0927 [FIX] 14 and 30 days estimates 2013-10-26 09:48:07 +02:00
Sebastian Grewe
0838bc7783 [FIX] Fixing PPS calculations
* [FIX] PPS estimations
* [FIX] PPS Value, PPS Payouts being off (too low)

Tested on testnet, estimates worked perfectly and payouts worked well.
2013-10-26 02:38:24 +02:00
Sebastian Grewe
ee46e65fca [FIX] Fixed potential PPLNS issue
* getMinimumShareId did not use Share Counts but Weights
2013-10-26 02:35:51 +02:00
Sebastian Grewe
ed6382c81d [CHANGE] Removed Round estimate reference 2013-10-25 22:17:31 +02:00
Sebastian Grewe
a545362ba5 [FIX] getUserShareDifficulty must return 0 on NULL 2013-10-25 14:48:36 +02:00
Sebastian Grewe
6fd04fc838 [UPDATE] Removing colors in round shares 2013-10-25 14:39:28 +02:00
Sebastian Grewe
f55d0ba982 [IMRPOVED] MPOS Theme Dashboard
* [CHANGE] Removed `default_<payout_sytem>` files
* [ADDED] Added generic, simple templates to remove code duplication
* [CHANGE] New default payment system template expanding on payout type
2013-10-25 14:17:36 +02:00
Sebastian Grewe
fa4d666f1f [FIX] Escape some query parameters 2013-10-25 13:05:57 +02:00
Sebastian Grewe
8d005cbe5d [FIX] Properly align popup boxes with content 2013-10-25 12:54:21 +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
Sebastian Grewe
0addd6ec80 [IMPROVED] User payout estimations
* [ADDED] Proper PPS caclulations to statistics getUserEstimates
* [IMPROVED] Updated themes to use new estimates format in global smarty
* [IMPROVED] Updated PPS Dashboard to update estimates via Ajax
* [IMPROVED] Added PPS estimates to getdashboarddata API

This will require theme updates for those sites relying on the
est_<value> format for user payout estimates!

Fixes #743 once merged.
2013-10-25 09:31:25 +02:00
Sebastian Grewe
f321364ff2 [FIX] Proper max for Sharerates < 1.00 2013-10-24 14:21:07 +02:00
Sebastian Grewe
c09f8700a0 [FIX] My Workers hashrate/difficulty 2013-10-24 14:03:16 +02:00
Sebastian Grewe
412fbe3f5b [FIX] Proper getTableName in Base Class 2013-10-24 12:32:58 +02:00
Sebastian Grewe
ac5c0fce95 [IMPROVED] Out of Order Share detection
* [ADDED] Allow findblocks to detect and fix out of order shares
* [IMPROVED] Share class extends Base class for common functions
* [IMPROVED] Added more debugging and logging output to cronjob
* [ADDED] Added various new methods to blocks, share, base classes

For an overview of errors thrown in crons, please check:

https://github.com/TheSerapher/php-mpos/wiki/Error-Codes

Fixes #759 once merged.
2013-10-24 12:04:00 +02:00
Sebastian Grewe
f0e39d9158 Merge pull request #754 from nrpatten/dashboard-test
Dashboard test
2013-10-23 05:20:36 -07:00
nrpatten
dab792736d Update default_pplns.tpl
add GLOBAL.hashunits.pool for hashrate.
2013-10-23 22:22:59 +11:00
nrpatten
2a1e0ab390 New Dashboard Layout 2013-10-23 06:11:03 -04:00
Sebastian Grewe
a63ed9700a [FIX] Account filter in admin transactions 2013-10-23 09:26:42 +02:00
Sebastian Grewe
1c5b53452a [FIX] Do not parse non-existing cache data, use SQL 2013-10-23 07:55:17 +02:00
Sebastian Grewe
acfa8f246e [IMPROVED] Only display user contributions > 0 2013-10-23 07:37:10 +02:00
Sebastian Grewe
a97fd7341f [IMPROVED] User real account name for contributor lists 2013-10-23 07:36:29 +02:00
obigal
c2169576ee round stats fixes 2013-10-23 00:28:24 -04:00
Sebastian Grewe
bbb2290dcc [IMPROVED] Look & Feel of basic Dashboard info
* [ADDED] Pool Workers live Update!
* [IMPROVED] PPLNS and PPS dashboard data
* [IMPROVED] Adjusted all dashboard to look alike
2013-10-22 21:01:34 +02:00
Sebastian Grewe
3451f481f6 Merge branch 'next' of github.com:TheSerapher/php-mpos into next 2013-10-22 20:29:40 +02:00
Sebastian Grewe
813ad615d4 [FIX] Messed up getIdleWorkers name 2013-10-22 20:29:27 +02:00
Sebastian Grewe
bdfd54e9b9 Merge pull request #749 from TheSerapher/issue-745
Issue 745
2013-10-22 08:54:01 -07:00
Sebastian Grewe
da5c066312 Merge pull request #748 from TheSerapher/issue-734
Issue 734
2013-10-22 08:53:20 -07:00
Sebastian Grewe
f4c68d721b Revert "[FIX] Next attempt to fix #745"
This reverts commit d3d183cfe0.
2013-10-22 16:45:53 +02:00
Sebastian Grewe
d3d183cfe0 [FIX] Next attempt to fix #745 2013-10-22 16:27:37 +02:00
Sebastian Grewe
f42d420561 [FIX] Contirbutor detection
Fixes #745 once merged.
2013-10-22 16:17:12 +02:00
Sebastian Grewe
bbbd5eda52 [IMPROVE] 404 handling
* [ADDED] Error/404 templates to mmcFE & mobile themes
* [IMPROVED] Make 404 default error with unknown page parameter
2013-10-22 16:05:55 +02:00
Sebastian Grewe
35e7c04386 Merge pull request #747 from TheSerapher/issue-739
[FIX] Honor top share contributors limits
2013-10-22 06:55:31 -07:00
Sebastian Grewe
c04bf347fb Merge pull request #746 from TheSerapher/issue-740
[FIX] Active worker count method
2013-10-22 06:54:14 -07:00
obigal
7e49e7c254 pplns-stats, block-stats paging, dynamic and reverse payout 2013-10-22 09:07:31 -04:00
Sebastian Grewe
38d3140829 [FIX] Added admin check to all templates
Fixes #737
2013-10-21 17:32:26 +02:00
Sebastian Grewe
a5c4b0e8c9 [IMPROVED] Show usernames in contrib lists if admin
Addresses #737
2013-10-21 17:13:08 +02:00
Sebastian Grewe
3f99e48360 [FIX] Active worker count method
* Mmodified Query to properly return total active workers

Fixes #740 once merged.
2013-10-21 16:44:13 +02:00
Sebastian Grewe
59a46dd48c [FIX] Honor top share contributors limits 2013-10-21 16:33:06 +02:00
Sebastian Grewe
1bb5ca3c2d [FIX] Fix donors, missing closing th tag 2013-10-21 15:55:59 +02:00
Sebastian Grewe
13c06715fc [IMPROVED] Adding customizable error page to MPOS
* `.htaccess` is used to re-define the error documents
* redirects to `index.php?page=error&action=<code>`
* does not work for MPOS inside subfolders yet

Addresses #734. If this works we can add this to all the other themes.
2013-10-19 09:16:57 +02:00
Sebastian Grewe
c89831943b [FIX] Fixed issues with uncached user shares data 2013-10-19 09:02:15 +02:00
Sebastian Grewe
0c65c4de1e [FIX] Removed uneeded shares data 2013-10-18 19:38:34 +02:00
Sebastian Grewe
8786a99382 [FIX] Fix sending mails even though diabled
Fixes #732
2013-10-18 07:21:51 +02:00
Sebastian Grewe
668f6abf78 [FIX] Method argument order fixed 2013-10-16 12:00:29 +02:00
Sebastian Grewe
50fb5218b1 [FIX] Use existing getDonatePercent 2013-10-16 11:54:59 +02:00
Sebastian Grewe
aedb37aa3d [IMPROVED] Added getUserEstimates method 2013-10-16 11:34:59 +02:00
Sebastian Grewe
899c92ee7e Merge pull request #728 from nrpatten/issue-703
[FIX] Graphs not rendering properly
2013-10-16 00:45:41 -07:00
Sebastian Grewe
f636e4fc99 [FIX] Return 0 data not NULL if cache-key missing 2013-10-16 09:35:12 +02:00
nrpatten
bee2d3a1cc [FIX] Graphs not rendering properly
Update jquery.visualize.js to fix graphs not working for Pool, Both.
2013-10-16 16:31:53 +11:00
andy
35303fd1a1 [FIX] Fixes Issue #722 Firefox wrapping Pool name on long names 2013-10-15 13:25:18 -07:00
Sebastian Grewe
1c15884faa Merge pull request #723 from nicoschtein/patch-7
Added space after Pool Title on MPOS Theme
2013-10-14 11:50:58 -07:00
nicoschtein
568bb1811f Added space after Pool Title on MPOS Theme 2013-10-13 20:17:01 -03:00
Sebastian Grewe
7b2adf27d1 Merge pull request #711 from TheSerapher/issue-709
[IMPROVED] Added case-insensitive login
2013-10-13 08:18:20 -07:00
Sebastian Grewe
15d7b6d1fa [IMPROVED] Detect potential dual payout situations 2013-10-12 19:28:56 +02:00
nicoschtein
c31cb95d20 Aligned API Key on Edit Account
Could be done better, but setting style on <a> should be enough.
2013-10-12 04:32:19 -03:00
nicoschtein
fdba2340eb Better set the Pool Name to auto adjust width pushing Section Title
Better set the "display: inline-block;" much like breadcrumbs does.
So we get just the right width to fit the Pool Name, followed by the nice shadow and then the Section Name
2013-10-12 04:12:38 -03:00
nicoschtein
95f217f32d Increased width % for Pool Name header on MPOS Theme
This way longer pool name can fit, and it wont affect section_title as it is one or two words long.
2013-10-12 04:03:12 -03:00
nicoschtein
d5620fd61c Increased width % for News title to fit longer text on MPOS Theme 2013-10-12 03:56:11 -03:00
nicoschtein
cea3b29d08 [FIX] Disable Block Explorer Link on Mobile Theme 2013-10-11 21:13:29 -03:00
Sebastian Grewe
a06d64e1fb [IMPROVED] Added case-insensitive login
* [IMPROVED] Added Username/Email password reset

Fixes #709
2013-10-10 17:06:01 +02:00
Sebastian Grewe
628dabacb5 [CHANGE] Updated mobile theme 2013-10-09 11:15:11 +02:00
Sebastian Grewe
21245eac92 [CHANGE] Modified some page templates 2013-10-09 10:16:47 +02:00
Sebastian Grewe
4add80328d Merge pull request #696 from nicoschtein/patch-4
[FIX] Disable Block Explorer and Chain Info Link, Hashrate modifier on mmcFE Theme
2013-10-08 23:52:30 -07:00
Sebastian Grewe
b7ae212d55 Merge pull request #697 from nicoschtein/patch-5
[FIX] Website Title instead of Website Name on <title>, MPOS Theme
2013-10-08 23:52:09 -07:00
nrpatten
f1859d7a8e Update contactform.inc.php
[FIX] php error and no message. not sure how this was broken.
2013-10-09 16:11:32 +11:00
nrpatten
8109c17051 Update contactform.inc.php
[FIX] Recaptcha php error
2013-10-09 16:02:58 +11:00
nicoschtein
7112e9d643 [FIX] Website Title instead of Website Name on <title>, MPOS Theme 2013-10-08 23:38:33 -03:00
nicoschtein
98bcabc362 [FIX] Disable Block Explorer Link on mmcFE Theme
Last Block Found
Next Network Block
2013-10-08 12:28:02 -03:00
nicoschtein
c8150a7021 [FIX] Disable Block Explorer Link and Chain Info on mmcFE Theme 2013-10-08 12:17:41 -03:00
nicoschtein
8feadc59a2 [FIX] Honor Pool Hashrate modifier with unit. 2013-10-08 12:08:11 -03:00
Sebastian Grewe
1b99096a5b Merge pull request #694 from TheSerapher/issue-691
[FIX] PPLNS Target Display, PHP Notice
2013-10-07 22:19:21 -07:00
Sebastian Grewe
bf627a320e [FIX] PPLNS Target Display, PHP Notice
Fixes #691 and #687
2013-10-08 07:18:39 +02:00
Sebastian Grewe
1ec0b25bb4 Merge pull request #693 from TheSerapher/issue-692
[FIX] Worker Difficulty on mobile worker page

Fixes #692.
2013-10-07 22:13:57 -07:00
Sebastian Grewe
91158bc755 [FIX] Worker Difficulty on mobile worker page 2013-10-08 07:13:37 +02:00
nicoschtein
93f713b665 [FIX] Disable Block Explorer Link on MPOS Theme 2013-10-07 18:58:04 -03:00
Sebastian Grewe
0dca798f5c [FIX] Do not notify on missing cache entry 2013-10-07 13:48:48 +02:00
Sebastian Grewe
02c9be54ed [MAJOR] Changing project name to MPOS
* Adjusted mmcfe-ng occurences in code
* Adjusted Database strucutre to only supply the full structure
* Adjusted default template to MPOS

Addresses #643
2013-10-07 10:10:49 +02:00
nrpatten
7a074f852b Update layout.css
Resize fix: Test 1 and h2.section_title back to left it is hidden when not logged in and text-transform: uppercase; looks better in the title for some page links.
2013-10-07 12:45:49 +11:00
nrpatten
dfba48051b Update layout.css
Resize fix: test 1
2013-10-07 11:34:24 +11:00
Sebastian Grewe
1dfb7e9702 Merge pull request #673 from TheSerapher/issue-444-theserapher
Issue 444 theserapher
2013-10-04 02:27:28 -07:00
Sebastian Grewe
de9220ebc4 [FIX] User password field for PW reset 2013-10-03 12:20:44 +02: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
b4b2ff2218 [FIX] Display worker difficulty 2013-09-30 13:39:55 +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
52db8bc682 [FIX] My name in footer :/ 2013-09-29 21:01:18 +02:00
Sebastian Grewe
8c5f8df07e Merge branch 'next' into issue-444-theserapher 2013-09-25 11:40:06 +02:00
Sebastian Grewe
928385c00c Fix PHP notice with 0 difficulty 2013-09-25 11:39:56 +02: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
d23916f6bd Fixed PHP Notice on Contributor Hashrates 2013-09-25 10:38:43 +02:00
Sebastian Grewe
6c3d2d1e96 Allow Public ACL for all round transactions 2013-09-25 10:34:36 +02:00
Sebastian Grewe
bb924f82fe adding new round stats icon 2013-09-25 10:19:30 +02:00
Sebastian Grewe
7a596c65e2 Added donation indicator to pool stats for accounts 2013-09-25 10:14:39 +02:00
Sebastian Grewe
e68ea2b1a4 Added donation info to account dashboard 2013-09-25 09:53:45 +02:00
Sebastian Grewe
29edf83083 Display pool fee in dashboard 2013-09-25 09:49:51 +02:00
Sebastian Grewe
716e118041 Update statistics.class.php
Fixes #664
2013-09-23 07:11:43 +02:00
Sebastian Grewe
e58e9bcfb9 fix display of pool hashrate 2013-09-20 19:40:46 +02:00
Sebastian Grewe
fdfc82476a Re-added username in getuserstatus
Upon popular demand *cough* @WKNiGHT- *cough* this is now available in
the data JSON array.
2013-09-20 18:14:06 +02:00
Sebastian Grewe
c85b5f0207 skip Smarty Globals for API pages 2013-09-20 18:13:47 +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
d7deac370a [FIX] Fieldset Textarea box size 2013-09-19 15:09:31 +02:00
Sebastian Grewe
0aac4289a9 [IMPROVEMENT] Better site layout 2013-09-19 14:33:02 +02:00
Sebastian Grewe
515af18ea5 [FIX] Display Pool Hashrate on Pool Stats 2013-09-19 11:54:39 +02:00
Sebastian Grewe
a345175ec5 [FIX] Link to round on general pool stats 2013-09-19 10:46:20 +02:00
Sebastian Grewe
442fcb015a adding FTC address for donations 2013-09-19 10:41:23 +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
326397b48f [IMPROVEMENT] Website Layout
* [FEATURE] Added footer, thanks @nrpatten for the idea and sample
* [IMPROVEMENT] Sidebar smaller and min width added
* [IMPROVEMENT] Properly format debug console
* [IMRPOVEMENT] Moved all custom CSS into own file
2013-09-19 08:19:01 +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
88b2a35a7a [BUG] Fixed PHP notice 2013-09-18 16:19:42 +02:00
Sebastian Grewe
0f8df566f3 Merge branch 'issue-444-theserapher' of github.com:TheSerapher/php-mmcfe-ng into issue-444-theserapher 2013-09-18 15:52:11 +02:00
Sebastian Grewe
822c643d88 Merge branch 'issue-444-theserapher' of https://github.com/TheSerapher/php-mmcfe-ng into issue-444-theserapher 2013-09-18 15:51:53 +02:00
Sebastian Grewe
8224f6148e [IMPROVEMENT] @nrpatten supplied better quicklogin
* Needs to be fixed to properly use fieldset tags
2013-09-18 15:50:49 +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
f41ea296df [IMPROVEMENT] Fixed notification table layout and icons 2013-09-18 12:50:09 +02:00
Sebastian Grewe
ec4931bbc8 [IMPROVEMENT] Using fontello icons instead of theme icons 2013-09-18 12:38:45 +02:00
Sebastian Grewe
20fe936feb [IMPROVEMENT] Added round statistics link to transaction blocks 2013-09-18 12:38:26 +02:00
Sebastian Grewe
6ae6b3febd adding Fontello config to expand icons as needed 2013-09-18 12:37:57 +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
7aace8be26 [IMPROVEMENT] Added secondary login box in header 2013-09-18 07:42:54 +02:00
Sebastian Grewe
f05a9c2b25 [FIX] Properly prompt for user or email at login 2013-09-18 07:34:55 +02:00
Sebastian Grewe
05f6f03424 removing unused template 2013-09-18 07:34:29 +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
3930285521 fixing website name in breadcrumbs 2013-09-17 17:14:06 +02:00
Sebastian Grewe
49b6ebe62f Also show negative cold coins
Fixes #660
2013-09-17 16:49:11 +02:00
Sebastian Grewe
e7f62134f1 adding cold wallet coin display and setting 2013-09-17 16:15:18 +02:00
Sebastian Grewe
022054140e removin accidentally added files 2013-09-17 15:23:08 +02:00
Sebastian Grewe
cdf71cbfba adding account balance to new dashboard via Ajax 2013-09-17 14:27:46 +02:00
Sebastian Grewe
59b82c72e1 fixing PHP notice when blocks table empty on blockstats 2013-09-17 12:56:30 +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
b89660ae32 re-adjusting old sidebar info 2013-09-16 18:00:38 +02:00
Sebastian Grewe
0af26e7647 moving templates for old themes 2013-09-16 17:53:50 +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
2b8fff3a9b New graph for round shares
* [FEATURE] Adding bar graph for round shares
 * Graph auto-updates via Ajax from getdashboarddata
* [IMPROVEMENT] Minor improvements to the JS template
2013-09-16 16:22:23 +02:00
Sebastian Grewe
9ad04e9b92 removing unsed graphics in CSS 2013-09-16 16:21:51 +02:00
Sebastian Grewe
29246a1f11 add cached share information to dashboard data API 2013-09-16 16:21:23 +02:00
Sebastian Grewe
e1ec8ed9da removing unused template 2013-09-16 16:20:33 +02:00
Sebastian Grewe
373c25366f minor userinfo update 2013-09-16 16:20:13 +02:00
Sebastian Grewe
8ad5a234c0 fixing website name in pub api 2013-09-16 15:41:23 +02:00
Sebastian Grewe
4bbe40068a Improved dashboard overview graphs and gauges 2013-09-16 11:36:20 +02:00
Sebastian Grewe
6a7d34181a Adding share rate graph
* [FEATURE] Adding share rate to graph
2013-09-16 11:04:14 +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
27a76509f6 disabled JS console output 2013-09-15 17:52:49 +02:00
Sebastian Grewe
0b0483f679 re-enabled jqplot plugins 2013-09-15 17:49:41 +02:00
Sebastian Grewe
286c1d5110 Fixed refresh interval functions and memory leaks
* [FIX] Memory leak fixed in Hashrate Graph
* [FIX] Potential memory leak in Gauges
* [FIX] Properly refresh data via setTimeout
 * Ensures Ajax calls are completed before re-calling them
2013-09-15 17:40:24 +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
0c3713284f removing JS console output 2013-09-15 14:23:31 +02:00
Sebastian Grewe
4aea28cb9c remove graph min/max, adding padding 2013-09-15 01:45:24 +02:00
Sebastian Grewe
8193860bd9 Do not store that many data points 2013-09-15 01:42:25 +02:00
Sebastian Grewe
917aeace49 Better visualize our hashrate graph
* Do not pre-init the data graph
* Fill with new data as it arrives
2013-09-15 01:38:42 +02:00
Sebastian Grewe
8add7f75c4 Adjusted graph colors
* Matching the existing visualize plugin closely
2013-09-15 00:17:35 +02:00
Sebastian Grewe
7471e505f9 Graph line update
* Removed data points from display
* Hover to see data point information
* Fill area under the line
2013-09-14 23:43:32 +02:00
Sebastian Grewe
0eebc89fe7 Added more graph options
* [FEATURE] Added graph trendline (average)
* [FEATURE] Added graph labels
2013-09-14 23:23:36 +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
69ed2ab768 load initial Gauges data via Ajax 2013-09-14 19:08:19 +02:00
Sebastian Grewe
9b50e9d842 removed debug output 2013-09-14 18:52:22 +02:00
Sebastian Grewe
de560ea422 ajax calls interval 10s 2013-09-14 18:43:19 +02:00
Sebastian Grewe
2ba96b6a2f make async ajax calls 2013-09-14 18:01:35 +02:00
Sebastian Grewe
4df57f612e make async ajax calls 2013-09-14 18:00:43 +02:00
Sebastian Grewe
4303ccc42f added query time as gauge 2013-09-14 17:59:13 +02:00
Sebastian Grewe
1fab736eb6 new graph location 2013-09-14 17:59:01 +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
nrpatten
35f042dd7b Update default.tpl
Add center span
2013-09-14 09:44:38 +10:00
nrpatten
af94ba00fd Update default.tpl
add center span
2013-09-14 09:41:28 +10:00
nrpatten
805fca23a1 Update default.tpl
Add center span
2013-09-14 09:38:27 +10:00
nrpatten
18c4ff60aa Update custom.css
Add span to center switches
2013-09-14 09:36:57 +10: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
nrpatten
e691c5cd8b Update default.tpl 2013-09-13 22:16:46 +10:00
nrpatten
25027c09b5 Update default.tpl
Update Toggle Switch Test
2013-09-13 22:13:30 +10:00
nrpatten
48e89d78cb Update default.tpl
Toggle Switch Test
2013-09-13 22:05:26 +10:00
nrpatten
aeb3827b4d Update default.tpl
Toggle Switch Test
2013-09-13 22:01:05 +10:00
nrpatten
ca780ba164 Update default.tpl
Toggle Switch Test
2013-09-13 21:58:12 +10:00
nrpatten
5e873c3d8a Update default.tpl
Toggle Switch test
2013-09-13 21:56:38 +10:00
nrpatten
29a99edf57 Update custom.css 2013-09-13 21:48:56 +10: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
6d0854149b adding pool and net hashrate gauges 2013-09-13 10:28:23 +02:00
Sebastian Grewe
f35c7cedc8 adding network hashrate to poolstatus 2013-09-13 10:28:12 +02:00
Sebastian Grewe
522e37717b adding Ajax refresh for Gauges 2013-09-13 09:35:30 +02:00
Sebastian Grewe
5e09208f54 adding share-rate to getuserstatus API 2013-09-13 09:35:14 +02:00
Sebastian Grewe
e0b1db19db adding missing master template 2013-09-13 08:40:35 +02:00
Sebastian Grewe
5176da94a4 adding missing JS files 2013-09-13 08:40:06 +02:00
Sebastian Grewe
c8f7163fa8 adding sample gauges with static data for now 2013-09-13 08:39:17 +02:00
Sebastian Grewe
03fca51af0 minor update to contactform layout 2013-09-12 18:37:06 +02:00
Sebastian Grewe
23bc5295f9 adding fieldset to transaction filters 2013-09-12 18:31:48 +02:00
Sebastian Grewe
6de81c8b78 admin settings via fieldset 2013-09-12 18:25:40 +02:00
Sebastian Grewe
493db31dcc adding better colors for confirms/orphans/... 2013-09-12 17:56:41 +02:00
Sebastian Grewe
5e1c3ae372 fixing issue mentioned in #145 with payouts 2013-09-12 13:22:39 +02:00
Sebastian Grewe
c99c98866f fixing PHP notice on navbar 2013-09-12 12:49:20 +02:00
Sebastian Grewe
cca0610cd3 minor donors update 2013-09-12 12:45:19 +02:00
nrpatten
32e789b8e6 Update navigation.tpl 2013-09-12 20:19:49 +10:00
nrpatten
962079b97c Update navigation.tpl 2013-09-12 20:12:40 +10:00
nrpatten
3176363b24 Create body.tpl 2013-09-12 20:06:16 +10: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
nrpatten
233cc96ea2 Create default.tpl 2013-09-12 19:52:10 +10:00
nrpatten
ae7e19c5f6 Create default.tpl 2013-09-12 19:51:36 +10:00
nrpatten
84173e225c Create disabled.tpl 2013-09-12 19:46:37 +10:00
nrpatten
2c1a560e82 Update navigation.tpl 2013-09-12 19:43:59 +10:00
nrpatten
4e36a25c81 Create default.tpl 2013-09-12 19:30:17 +10:00
nrpatten
72e3a75a1e Create default.tpl 2013-09-12 19:29:06 +10:00
nrpatten
2e7187faba Create default.tpl 2013-09-12 19:26:38 +10:00
nrpatten
25ec8f3ec6 Create default.tpl 2013-09-12 19:23:54 +10:00
nrpatten
acecc5ea1d Create default.tpl 2013-09-12 19:22:56 +10:00
nrpatten
18e977e12d Create default.tpl 2013-09-12 19:21:57 +10:00
nrpatten
b2ae8efbd0 Create default.tpl 2013-09-12 19:20:54 +10:00
Sebastian Grewe
e57e82466b adding missing icons to news admin 2013-09-12 10:14:24 +02:00
Sebastian Grewe
0bd21a0873 fixing pagination/pagesort conflicts 2013-09-12 10:02:48 +02:00
Sebastian Grewe
f3ce2cb812 [FEATURE] Added new icons, added pagination
This commit uses the class icons instead of actual images. Also changed
the layout a slight bit to give room for data in the header just as used
in the tab involved version.
2013-09-12 09:48:56 +02:00
Sebastian Grewe
39eddd979d Merge branch 'issue-444-theserapher' of https://github.com/TheSerapher/php-mmcfe-ng into issue-444-theserapher 2013-09-12 08:50:08 +02:00
Sebastian Grewe
e203f31ba9 adding login icon 2013-09-12 08:49:57 +02:00
Sebastian Grewe
00c6955680 removing unpaid shares, not used 2013-09-12 08:45:26 +02:00
Sebastian Grewe
85fa71136f adding placeholder dashboards and missing image 2013-09-12 08:43:01 +02: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
b05aac4678 @nrpatten: Updated dashboard for prop 2013-09-09 16:03:54 +02:00
Sebastian Grewe
62c0641131 Merge branch 'next' into issue-145 2013-09-09 14:53:42 +02:00
Sebastian Grewe
a128ca3ba0 minor fix to contrib hashrates 2013-09-09 14:44:17 +02:00
Sebastian Grewe
823ba4d844 minor changes to account-edit 2013-09-09 14:41:44 +02:00
Sebastian Grewe
eb20c0304e adding hide button to admin panel 2013-09-09 09:53:54 +02:00
Sebastian Grewe
4b9105b84b small update to account-workers 2013-09-09 09:52:44 +02:00
Sebastian Grewe
2235f8e15a adding missing JS lib 2013-09-09 09:52:27 +02:00
Sebastian Grewe
31fe769091 adding API qrcode in account 2013-09-09 09:52:05 +02:00
Sebastian Grewe
6fa46137f5 adding account invitations 2013-09-09 09:47:28 +02:00
Sebastian Grewe
8e05ab71a6 adding notification account view 2013-09-09 09:37:59 +02:00
Sebastian Grewe
fb9fb9cdb2 adding account transaction view 2013-09-09 09:27:42 +02:00
Sebastian Grewe
ab7360d187 adding account edit page 2013-09-09 09:24:26 +02:00
Sebastian Grewe
f7ced8f80d added registration templates 2013-09-09 07:46:52 +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
3c7bb41f81 stats template changes 2013-09-09 07:45:35 +02:00
Sebastian Grewe
b4ed4ed06a fixing PHP warning 2013-09-08 00:23:00 +02:00
Sebastian Grewe
a19b3f5e31 Adding round statistics 2013-09-08 00:22:02 +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
ecfbeec01c adding new icon set 2013-09-02 12:55:33 +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
75d0dfe5f7 adding share rate to all sidebars 2013-08-22 14:18:04 +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
eacb8dff03 updated templates 2013-08-22 11:30:27 +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
36d64b27fd adding share rate to prop sidebar 2013-08-22 11:28:01 +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
2e4a94ff8c Merge pull request #615 from TheSerapher/issue-612
Removing IRC reference
2013-08-19 00:40:10 -07:00
Sebastian Grewe
f8f50fdc05 Removing IRC reference
Fixes #612
2013-08-19 09:39:45 +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
ad6ceed77e fixing worker activity on mobile template 2013-08-14 11:47:46 +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
e5cb4d0886 Fixing combined hashrate graph
This shouuld fix #598 with graphs being completely off
2013-08-14 11:23:14 +02:00
Sebastian Grewe
184ad5d58b fixing color of total percentage again 2013-08-14 11:15:49 +02:00
Sebastian Grewe
567b8e1655 Fix rounding issues on total row
* Use actual percentages to calculate the total to ensure
  the rows average matches the totals average

Fixes #596
2013-08-14 11:10:58 +02:00
Sebastian Grewe
0679601fbd Initilize totals with 0 values
Addresses #596
2013-08-14 11:03:56 +02:00
Sebastian Grewe
0833bc3a3e Merge branch 'next' of github.com:TheSerapher/php-mmcfe-ng into next 2013-08-14 11:00:06 +02:00
Sebastian Grewe
c0e8459519 fix coloring of total percentage 2013-08-14 10:59:50 +02:00
Sebastian Grewe
0b701d7d06 Merge pull request #593 from TheSerapher/issue-585
Fixing round estimates on public stats page
2013-08-13 00:21:12 -07: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
85e22bc02f Adding totals to block statistics
* Total expected shares
* Total actual shares
* Average Percentage
2013-08-12 10:07:19 +02:00
Sebastian Grewe
7214d27d9e make blocks list sortable 2013-08-09 14:58:46 +02:00
Sebastian Grewe
71abaf29f3 Merge pull request #583 from TheSerapher/issue-581
Issue 581
2013-08-09 05:58:12 -07:00
Sebastian Grewe
d42b66d94e removing useless strings 2013-08-08 12:09:50 +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
92623902b2 adding round shares back to PPS sidebar 2013-08-08 10:03:33 +02:00
Sebastian Grewe
c568683152 Adding empty example for round stat integration
Addresses #543
2013-08-08 10:01:33 +02:00
Sebastian Grewe
aad8271a13 Fix blockexplorer links to use blockhash not height
Fixes #571
2013-08-08 09:42:10 +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
2dbf2a231e Merge pull request #575 from TheSerapher/issue-535
Honor anonymous flag on mobile template
2013-08-07 21:46:12 -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
45d5db65c8 Update default.tpl 2013-08-07 09:34:55 +02:00
obigal
86d4ec18cd Update authenticated.tpl 2013-08-07 09:34:01 +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
2d2f480888 Update default.tpl 2013-08-07 09:29:48 +02:00
obigal
2b1c628238 Update authenticated.tpl 2013-08-07 09:29:47 +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
fafd75d994 Honor anonymous flag on mobile template
Fixes #535
2013-08-07 08:59:22 +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
680fa46013 Merge pull request #555 from TheSerapher/issue-545
Adding Admin MOTD
2013-08-05 00:20:26 -07:00
Sebastian Grewe
d59b8ef563 Make block count on stats page configurable
Fixes #549
2013-08-05 09:18:52 +02:00
Sebastian Grewe
0c35a046e0 Merge pull request #554 from TheSerapher/issue-553
Adding jQuery Mobile 1.3.2
2013-08-04 12:57:15 -07:00
Sebastian Grewe
fa0e7379a6 Adding jQuery Mobile 1.3.2
* Adding new CSS and JS files
* Adding missing images
* Removing old version
* Updated master template

Fixes #553
2013-08-04 21:53:36 +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
Sebastian Grewe
3c57d5bd0a fixing missing template warnings 2013-08-01 11:29:16 +02:00
Sebastian Grewe
4eb6c59cb3 Refactored getTransactions, unified admin/user view
* Removed getAllTransactions method
* Unified getTransactions for users and admins
* Added filter abilities to user transaction view

This should speed up things a fair bit for transaction heavy pools.

Addresses #536
2013-08-01 11:00:54 +02:00
Sebastian Grewe
52f58807b0 Refactored admin transactions
* Properly generate the bind_params statement
* Extended from Base Class
* Added methods to Base Class

Addresses #536
2013-08-01 10:40:49 +02:00
Sebastian Grewe
4b3534ce61 Fixing WHERE clause for getBalance call
Addresses #536
2013-08-01 10:38:20 +02:00
Sebastian Grewe
9e1f424742 Great performance increase on transaction queries
This will address an issue with database including a lot of
transactions. No more nested queries that put unwanted strain on a DB.

Address #536
2013-08-01 10:38:20 +02:00
Sebastian Grewe
60bf687d1c increased limit back to 30 2013-07-31 17:11:26 +02:00
Sebastian Grewe
68c8d29a01 removed line by accident 2013-07-31 17:10:26 +02:00
Sebastian Grewe
4c37ab4950 Find actual row count without LIMITs applied
Addresses #542
2013-07-31 17:09:30 +02:00
Sebastian Grewe
fd8b07f02a Removing orphaned credits from Sidebars
This will remove some confusion for users.

Addresses #524
2013-07-31 08:59:02 +02:00
Nicolas Schteinschraber
5a377d6106 Issue #537 2013-07-31 03:44:49 -03:00
Sebastian Grewe
86633e1603 Adding JS/CSS code to project
Instead of calling remote sites, deploy the JS and CSS locally. Will
allow HTTPs sites to work properly.

Fixes #521
2013-07-24 16:37:22 +02:00
Sebastian Grewe
c0b0d438b8 Catch errors on missing templates
Pages that are missing a template will cause a error 500. We now catch
this and display a default string.

Fixes #513
2013-07-24 14:56:34 +02:00
Sebastian Grewe
dcc0596c8f Merge pull request #519 from TheSerapher/issue-511
Display network hashrate in public API
2013-07-24 04:28:35 -07:00
Sebastian Grewe
b5eca59e58 Fixing alignment in mobile template
Addresses #514
2013-07-24 11:41:12 +02:00
Sebastian Grewe
e760cbdc03 Fixing mobile templates
Addresses #514
2013-07-24 11:39:59 +02:00
Sebastian Grewe
3f62612af9 Fixing mobile templates too 2013-07-24 11:30:16 +02:00
Sebastian Grewe
eca77d551c Changed percentages for invalids, pool efficiency
This should address #514 with negative efficiencies. Formulas were
wrong.

Will fix #514 when merged.
2013-07-24 10:00:27 +02:00
Sebastian Grewe
c7f952a27a Display network hashrate in public API
Instead of 0 show the actual hashrate, still shows 0 if unable to
connect to RPC server.

Fixes #511
2013-07-24 09:12:29 +02:00
Sebastian Grewe
777e160cf3 cleaning PHP Notice from log 2013-07-23 16:55:05 +02:00
Sebastian Grewe
c6a4df2975 Check coin address when updating account
This will fix #506 and ensures valid addresses are added when updating
the account.
2013-07-23 14:37:58 +02:00
Sebastian Grewe
35d1f5fa92 Merge pull request #498 from TheSerapher/manual-payout-cron
Adding manual payout cron
2013-07-23 05:36:49 -07:00
Sebastian Grewe
7209f570f4 properly fetch account balance 2013-07-23 14:16:20 +02:00
Sebastian Grewe
4f46e9f781 remove worker monitoring if notifications are disabled 2013-07-23 13:11:39 +02:00
Sebastian Grewe
760f1a679e Allow admin to disable notification system
This addresses #497 and allows the admins to disable notifications
through the admin panel. Might be used by those relying on clients using
the API instead.

Once merged it will fix #497.
2013-07-23 13:06:38 +02:00
Sebastian Grewe
a6c8d507dc Merge pull request #501 from TheSerapher/issue-260
Issue 260
2013-07-23 03:55:20 -07:00
Sebastian Grewe
9cb80c6fd9 Properly filter Debit transactions 2013-07-23 12:36:16 +02:00
Sebastian Grewe
9c2cefd2c3 adding blockexplorer link if URL configured 2013-07-23 12:10:32 +02:00
Sebastian Grewe
24a277312c fixing TXFee display and filter 2013-07-23 12:01:45 +02:00
Sebastian Grewe
fb24ad81ae fixing php warning 2013-07-23 11:52:01 +02:00
Sebastian Grewe
9899507839 Fix some reported issues in #260 2013-07-23 11:05:45 +02:00
Sebastian Grewe
63b942a7e1 Adding No Fee option to admin panel
Admins can disable a users fee via admin panel now.

Fixes #260
2013-07-23 10:56:45 +02:00
Sebastian Grewe
3cfef93580 WiP to disable fees for specific accounts
* added new account table column: `no_fee`
* honor `no_fee` flag during payout process
* added upgrade SQL file for this feature

Address #260
2013-07-23 10:56:45 +02:00
Sebastian Grewe
330169ae58 more fixes and log cleanup 2013-07-23 10:53:47 +02:00
Sebastian Grewe
ed259a5b44 properly deal with Fee_PPS and Donation_PPS 2013-07-23 09:21:11 +02:00
Sebastian Grewe
61cea524d1 properly use limit for pagination 2013-07-23 09:18:50 +02:00
Sebastian Grewe
728bfe8c9d properly filter Credit_PPS as confirmed 2013-07-23 09:18:04 +02:00
Sebastian Grewe
1a5d216b7a Allow adjusting the tx row limit 2013-07-23 09:08:57 +02:00
Sebastian Grewe
1d6cbd44a6 Adding new admin transaction view
* Added transaction filters
* Added proper paging support
* Removed the tabs that caused confusion
* Added transaction status column

Fixes #404
2013-07-23 09:03:36 +02:00
Sebastian Grewe
2c3eac1f67 proper coloring for start/end times 2013-07-22 16:47:50 +02:00
Sebastian Grewe
4b6582ac35 More colorful monitoring output
* Added colorized start/end times
* Added Success/Error image for Active status
* Added color to runtime status
2013-07-22 16:42:23 +02:00
Sebastian Grewe
ee5e2c46c6 Adding manual payout cron
This will avoid double payouts via the website. Payouts will be
requested by users and processed by a cron. If, for whatever reason,
users do add two requests (it is checked if a payout exists) they would
only have one successful payout until their account balance is back up
to a save value to trigger the payout.

This should fix any issues with manual payouts being exploited through
the website. Will require some testing by others to ensure things work
as expected.
2013-07-22 16:14:22 +02:00
Sebastian Grewe
44c31fe630 Merge pull request #500 from TheSerapher/issue-488
Admin Panel Setting to disable/enable AP/MP
2013-07-22 05:55:12 -07:00
Sebastian Grewe
00f7f3fadf Merge branch 'next' of github.com:TheSerapher/php-mmcfe-ng into next 2013-07-22 10:41:56 +02:00
obigal
93e36a8259 Cryptsy api support 2013-07-21 14:15:34 -04:00
obigal
ee2c90525c Cryptsy api support 2013-07-21 14:14:12 -04:00
Sebastian Grewe
1086d81f09 Merge pull request #495 from TheSerapher/issue-490
Issue 490
2013-07-21 10:26:05 -07:00
Sebastian Grewe
36a74b0bbf Fix transaction table, adjust transaction class
* Ensure we also check newly added blocks for unconfirmed tx
* Only list orphaned transactions in the orphaned tab

Fixes #490
2013-07-21 17:25:09 +02:00
Sebastian Grewe
c94c1be7be Using proper SQL query by @CaptainAK
Proposed fix did not work, using proper Query now.
Thank @CaptainAK for the fix!

Fixes #492
2013-07-21 08:35:57 +02:00
Sebastian Grewe
7d801a561c Fixing Orphan showing as unconfirmed
* Fixes orphaned transactions showing as unconfirmed too
* Fixes transaction tables to show orphaned credits in green, not red

Fixes #490
2013-07-21 08:20:53 +02:00
Sebastian Grewe
440ca027a2 Fixing PPLNS target calculation on blockavg
This will fix #492 with PPLNS targets not taking the blocks in proper
order.
2013-07-21 08:12:40 +02:00
Sebastian Grewe
7fce187ab0 Admin Panel Setting to disable/enable AP/MP
This will allow admins to temporarily or permanantly enable and disable
auto and manual payout processing.

Fixes #488
2013-07-19 11:12:28 +02:00
Sebastian Grewe
43923fe4e9 only fetch blockhash for valid blocks 2013-07-19 09:49:48 +02:00
Sebastian Grewe
5f161cdbb0 Merge pull request #487 from TheSerapher/issue-486
Adding notifications and start/end times
2013-07-18 06:42:15 -07:00
Sebastian Grewe
6641cf7f5c Adding notifications and start/end times
Fixes #486
2013-07-18 15:41:52 +02:00
Sebastian Grewe
7cf3ff3d88 Fix anonymous detection in share contributors list
Fixes #484
2013-07-18 13:55:05 +02:00
Sebastian Grewe
1cd39099ee Merge pull request #483 from TheSerapher/issue-446
Issue 446
2013-07-18 02:05:45 -07:00
Sebastian Grewe
a655abddbf fixing mobile template 2013-07-18 11:05:09 +02:00
Sebastian Grewe
33a058dc4b Merge pull request #482 from TheSerapher/issue-467
Issue 467
2013-07-18 01:49:47 -07:00
Sebastian Grewe
b57f6b59a1 Disable API on mobile theme if disabled 2013-07-18 10:49:16 +02:00
Sebastian Grewe
6d379e8e58 Removing debug output 2013-07-18 09:45:20 +02:00
Sebastian Grewe
73ec707381 Adds blockhash to blockexplorer URL
* Changed blockexplorer URL to use Blockhash instead of height
* Added calls to find current networks blocks blockhash
* Propagated changes onto temmplate
* Added new dist configuration for new blockexplorer URL

Fixes #446
2013-07-18 09:43:16 +02:00
Sebastian Grewe
72ed08c92c Adding tooltip help for anonymous account flag
Fixes #459
2013-07-18 09:30:44 +02:00
Sebastian Grewe
8393053641 Disabel API references if API disabled
This will turn off displaying any API references and links when API was
turned off in the configuration.

Fixes #467
2013-07-18 09:04:59 +02:00
Sebastian Grewe
d492b532b7 Adding ability to disable the sites API functions
Addresses #467 and will fix upon merge.
2013-07-17 09:43:02 +02:00
Sebastian Grewe
a12499ecd9 Fixing negative time since last block
This will fix #466 if approved by reporter.
2013-07-16 21:55:52 +02:00
Sebastian Grewe
b7ffbd0bfd fixing issue for first created admin user 2013-07-16 16:02:52 +02:00
Sebastian Grewe
41ec58ea16 Adding inline docuemtation to invitation class
Adding proper inline documentation to invitation class.
2013-07-15 16:28:22 +02:00
Sebastian Grewe
7b929ed3e4 Fixing PHP Warning on resetting failed login count
Addresses #330 and further cleans PHP Log
2013-07-15 16:16:40 +02:00
Sebastian Grewe
501f369b4e Further fixes to PHP warnings
Addresses #330 and further cleans up the PHP log.
2013-07-15 15:31:18 +02:00
Sebastian Grewe
525c0ab009 Fixing PHP Warning on unsert token on register
Addresses #330 and cleans up PHP Log
2013-07-15 14:28:54 +02:00
Sebastian Grewe
0f00f7d322 Another fix for registration issues
Addresses #330
2013-07-15 13:46:20 +02:00
Sebastian Grewe
8f72062558 Fixing issue with registration disabled and invitations
This will fix an issue with certain combinations of registration and/or
invitations being enabled or disabled.

Addresses #330
2013-07-15 13:44:22 +02:00
Sebastian Grewe
bf3cd25326 removing unused token methods 2013-07-15 12:52:55 +02:00
Sebastian Grewe
7f4f5cd343 Make invitations configurable via admin panel
Invitations can now be configured through admin panel settings. By
default, invitations are enabled. Invitation system is also available if
registrations are disabled. To completely remove the ability of new
users to sign up, disable both registration and invitations.

Fixes #330
2013-07-15 12:43:29 +02:00
Sebastian Grewe
bd32dfa9f8 Adding invitation system to mmcfe-ng core
This will allow users to send invitations to other people via email.
Each account will still need to confirm the email address if the option
is enabled.

Addresses #330, will need to allow pool operators to enable this feature
even with registrations turned off.
2013-07-15 12:26:31 +02:00
Sebastian Grewe
7cc1e2543c fixing syntax error 2013-07-15 12:26:31 +02:00
Sebastian Grewe
be9a8d3fda Go through activiation even for admin accounts
Fixes an issue with accounts being locked after trying to activate it.

Addresses #330
2013-07-15 12:26:31 +02:00
Sebastian Grewe
0ede05a6fd Adding email verification
* Adding mail verification during account registration
* Added new dist file option for mail verification
* Added account confirmation page using tokens
* Added mail class into user class for password resets
* Moved password reset template
* Adjusted account registration page
* Adjusted user class for email confirmation

Also fixed a bug with smarty_cache_key not being used properly if smarty
is disabled. Key still needs to be available even if caching is disabled

Addresses #330 and prepare the ticket for invitation only system.
2013-07-15 12:26:31 +02:00
Sebastian Grewe
29d5d36a7e WiP for one time tokens
* Added token type class
* Storing Token Type as ID not varchar
* Added new system to user class and fixed issues with it
* Started on mail verification process in user class
* Updated autoloader
* Updated change password template

Addresses #330
2013-07-15 12:26:31 +02:00
Sebastian Grewe
253d6e8a47 Fixing username regexp during registration
Fixes wrong regext of #453
2013-07-14 21:08:03 +02:00
Sebastian Grewe
15753f5eca Merge pull request #455 from typal/issue-452
fucked up...
2013-07-14 01:15:21 -07:00
typ
ed5e320ff6 fucked up... 2013-07-14 02:43:44 +02:00
Sebastian Grewe
d190866315 Merge pull request #454 from TheSerapher/issue-419
Adding anonymous account support
2013-07-13 10:43:21 -07:00
typ
0775eaf8c1 add check for non alpa/-/_ chars 2013-07-13 16:41:51 +02:00
Sebastian Grewe
8ec1d2cab3 Adding anonymous account support
* Added anonymous flag to accounts table
* Added checkbox for anonymous flag in edit account page
* Updated user class to support new flag
* Updated statistics class to support anonymous and donations
* Updated all templates showing usernames to show anonymous instead
* Added new SQL `ALTER TABLE` file for upgrading the table

Fixes #419 once merged.
2013-07-12 10:33:42 +02:00
Sebastian Grewe
ab620f1fe0 Merge pull request #443 from TheSerapher/issue-432
Get rid of Orphan transaction types
2013-07-12 00:46:45 -07:00
Sebastian Grewe
dca14886de Merge pull request #448 from IainKay/Issue-447
Issue 447
2013-07-11 21:42:10 -07:00
Iain Kay
4a693e1bd9 Fix bug in sessions where the duration did not increase as user actively browsed site. 2013-07-11 20:40:14 +00:00
Iain Kay
3e2608fcef Removed unnecessary cookie name variable that was not used. 2013-07-11 20:30:39 +00:00
Sebastian Grewe
a9ae72cd50 Merge pull request #445 from IainKay/issue-434
Issue 434
2013-07-11 13:06:41 -07:00
Iain Kay
a635d2163c Added note about php.ini session.gc_maxlifetime value - Important to stop garbage collection removing cookies that should be valid. 2013-07-11 19:56:10 +00:00
Iain Kay
dfbaf621de When destroying a users session on the server we now also remove all session data immediately, rather than relying on garbage collection, and we destroy the cookie on the users browser. 2013-07-11 19:41:50 +00:00
Iain Kay
aac202da2b Pull cookie session params from include/config/global.inc.php before session_start() 2013-07-11 19:34:58 +00:00
Iain Kay
9f4789c707 In order to read the cookie configuration from include/config/globa.inc.php the session must begin after this has been included. 2013-07-11 19:29:24 +00:00
Iain Kay
d2bbc366d1 Changed the Cookie Explanation in global.inc.php to be more in line with the rest of the structure. 2013-07-11 19:26:09 +00:00
Iain Kay
638b8387c3 Updated global.inc.php to reflect the new values required for cookie configuration and documented each of the options. 2013-07-11 19:17:49 +00:00
Sebastian Grewe
aa05a9e0b0 Merge pull request #441 from ilya-stromberg/issue-409-switch-off-memcached-via-comfig
(#409) Do not use Memcached if it switched off via config
2013-07-11 09:55:30 -07:00
Ilya Stromberg
521bcc8022 Fix built-in documentation 2013-07-11 20:19:35 +04:00
Sebastian Grewe
5bf2cd0202 Merge pull request #442 from TheSerapher/issue-430
Issue 430
2013-07-11 08:56:50 -07:00
Ilya Stromberg
8f4b4ed970 Fix code style 2013-07-11 19:35:23 +04:00
Ilya Stromberg
15e89ad4d3 (#409) Do not use Memcached if it switched off via config 2013-07-11 19:11:03 +04:00
Sebastian Grewe
09c0087775 Add tickerupdate to cron monitoring
Fixes #439
2013-07-11 16:50:24 +02:00
Sebastian Grewe
e0d43141b5 Merge pull request #438 from TheSerapher/issue-431
Adding last runtime to monitoring page
2013-07-11 07:45:38 -07:00
Sebastian Grewe
5c0d992134 fixing smarty cache key generation 2013-07-11 15:58:30 +02:00
Sebastian Grewe
7466689b50 further escapes on templates 2013-07-11 15:55:32 +02:00
Sebastian Grewe
08359c0d19 Further escaping of user inputs 2013-07-11 15:53:38 +02:00
Sebastian Grewe
5b50422675 Fixing XSS for user registration 2013-07-11 15:49:08 +02:00
Sebastian Grewe
dfde017267 Get rid of Orphan transaction types
This fixes #432 and puts orphans on the same system as unconfirmed
transactions.
2013-07-11 14:26:53 +02:00
Sebastian Grewe
739bd9c7b6 Properly cache on a per-user basis
This will fix an issue with templates of other users being applied to
different users logged in. Basically the first cached page would be
displayed for all users.

Created a new cache key for smarty to allow the user ID to be reference
in the cache key. Hence each user has their own cached file which will
be used.

Improved caching by creating subdirectories for cached files. This way
we won't run into a file limit per directory with a lot of cached files.

This fixes #430 and the mentioned issue in that report.
2013-07-11 13:45:54 +02:00
Sebastian Grewe
875572813b Adding last runtime to monitoring page
Displays the date/time of the last successful run.

Fixes #431
2013-07-11 13:25:22 +02:00
Sebastian Grewe
ed573e6e46 Merge pull request #428 from TheSerapher/issue-418
Issue 418
2013-07-11 03:35:50 -07:00
Sebastian Grewe
1344f39f96 Ensure we set workers to 0
If no workers are found false is returned. Smarty is not able to set a
default on `false` values so we have to set it to 0 if the query failed.

Fixes #418
2013-07-11 11:43:48 +02:00
Sebastian Grewe
83c979b260 Merge pull request #427 from TheSerapher/issue-309
Issue 309
2013-07-11 02:35:24 -07:00
Sebastian Grewe
25b12d204a Better description what type uses what for PPLNS
Fixes #422
2013-07-11 09:19:30 +02:00
Sebastian Grewe
72d91ff6c3 adding proper account balance warning back in 2013-07-11 09:16:31 +02:00
Sebastian Grewe
39cfdc78e0 onliner security check 2013-07-11 09:15:36 +02:00
Sebastian Grewe
17829cfd4a always assign default content 2013-07-11 09:13:50 +02:00
Sebastian Grewe
09efdfc172 fixing merge commit with origin 2013-07-11 09:05:41 +02:00
Sebastian Grewe
65c6318b02 fixing empty variable when using cache 2013-07-11 09:03:47 +02:00
Sebastian Grewe
e0275566ae disable smarty cache by default in dist 2013-07-11 09:02:34 +02:00
Sebastian Grewe
bffeea07c9 Adding cache detection to many pages
This will allow pages to skip loading data from backends like the
database or the wallet RPC server. If a cached page is detected and
valid, all dynamic content generation will be skipped completely.

Other pages that have not been adjusted in this commit will still fetch
backend data all the time. This will ensure clients always see the most
recent data, like worker information or account changes.

This should fix #309 completely but needs some testing.
2013-07-11 09:02:34 +02:00
Sebastian Grewe
3c426e913b Adding {nocache} flags for dynamic content
This will update content instantly once the user changes it and not load
a cached version from the smarty cache.

Addresses #309
2013-07-11 08:58:19 +02:00
Sebastian Grewe
0e6edc562c Add detailed smarty cache documentation to config
Instead of just making it availble document the smarty cache feature.

It might work for users, but it's advised to rely on the memcache
instead.

Fixes #309
2013-07-11 08:58:19 +02:00
Sebastian Grewe
426268f71d adjust smarty configurations 2013-07-11 08:58:19 +02:00
Sebastian Grewe
e9311f08a5 Adding cache lifetime option to smarty config
* Renamed configuration array to `smarty` => `cache`
* Added `smarty` => `cache_lifetime` to expire cache files properly

This should be safe to use, be aware that each page request is cached!
That includes any POST/GET calls to the site.

It does help in speeding up the site, up to 100% on some requests. For a
high traffic site it probably makes sense to enable this option with a
low cache lifetime to ensure most recent data.

Addresses #309
2013-07-11 08:58:19 +02:00
Sebastian Grewe
6632920fa1 Add detailed smarty cache documentation to config
Instead of just making it availble document the smarty cache feature.

It might work for users, but it's advised to rely on the memcache
instead.

Fixes #309
2013-07-11 08:58:19 +02:00
Sebastian Grewe
aace0dd014 More descriptive PPLNS options
Fixes #421 and #422
2013-07-11 08:57:11 +02:00
Sebastian Grewe
39d1193e6a Add default value for active pool workers
Fixes #418
2013-07-11 08:51:40 +02:00
Sebastian Grewe
fdf97c8832 fixing config access in share class for archive purge 2013-07-10 14:24:15 +02:00
Sebastian Grewe
993ddaf3bc fixing 24h shares retention in dist config 2013-07-10 14:17:20 +02:00
Sebastian Grewe
271f7f8381 Better monitoring layout 2013-07-10 11:39:16 +02:00
Sebastian Grewe
ceeed45bb3 Adding statistics cron to monitoring
Useful to trace cron runtimes in order to adjust caching times for long
rounds.

Addresses #145 and adds a new cron to monitoring page
2013-07-10 11:26:06 +02:00
Sebastian Grewe
a6d752a096 adding some defaults on template 2013-07-10 10:45:10 +02:00
Sebastian Grewe
0c014da726 unknown index PHP warning fix 2013-07-10 10:44:10 +02:00
Sebastian Grewe
94d9c1eb4c Added cronjob monitoring to admin panel
* Added monitoring class to deal with monitoring events
* Added event calls to all important cronjobs
* Added cron_end include file for monitoring cleanups on successful runs
* Added Monitoring to autoloader
* Modified account page to check for running auto_payout in monitoring
* Added monitoring to Navigation bar
* Added monitoring controller page

Fixes #415
2013-07-10 10:40:11 +02:00
Sebastian Grewe
223195c08a Merge pull request #414 from TheSerapher/issue-409
Ensure people know what the memcache setting does
2013-07-09 14:23:10 -07:00
Sebastian Grewe
70644b4299 Merge pull request #413 from TheSerapher/issue-408
Issue 408
2013-07-09 14:22:33 -07:00
Sebastian Grewe
b4b6b118bf Ensure to return 0 if no valid/invalid shares are found 2013-07-09 23:19:36 +02:00
Sebastian Grewe
ecf3db3a5b Removed BETWEEN call for round shares
Now shares are calculated proper with

`id > ? AND id <= ?`

as boundaries. This will ensure the upstream result is also calculated
for the round.

Addresses #143
2013-07-09 22:41:21 +02:00
Sebastian Grewe
8808913ca5 Fixing Sidebar estimations on PPLNS
This will address a new issue in #143, estimates where not displayed
properly when pplns was active.

Fixes #143
2013-07-09 22:02:12 +02:00
Sebastian Grewe
ba240000ab Latest version for PPLNS payouts
* Rebased with next to add logging functions
* Added block method to fetch specific block
* Modified getArchive shares method to be more constistent
* Added new global configuration
* Adjusted smarty globals with new configuration
* More verbose pplns cron with logging
* Re-target the round in case of PPLNS not being matched by archive

Fixes #143
2013-07-09 21:59:44 +02:00
Sebastian Grewe
2f2acdad6d First working version of PPLNS payouts
* Based PPLNS on Prop Payout script
* Using defaults from prop payout, no class adjustments
* Added more methods required for PPLNS
* Added block methods for dynamic payout calculations
* Added PPLNS Sidebar that also displays the PPLNS Target
 * Shares beyond this target will not be included in payouts
 * Shares missing to this target will be added from archives
* Enabled archiving by default for PPLNS
* Added configuration options for PPLNS
 * Documented the usage for PPLNS, defaults are sane
* Added pplns_payout to run-crons

Addresses #143 and if accepted will fix it
2013-07-09 21:59:44 +02:00
Sebastian Grewe
dc51d874a7 Adding block height to blockupdate output
This should make tracing block updates easier.
2013-07-09 21:26:06 +02:00
Sebastian Grewe
da1649f319 Merge pull request #411 from TheSerapher/issue-405
Issue 405
2013-07-09 12:18:21 -07:00
Sebastian Grewe
9e878b06d5 Ensure people know what the memcache setting does
Even though memcache can be disabled, the memcache library is a
requirement as listed in the README.md. I clarified that in the
configuration file itself to ensure people install it even though they
might be disabling it for debugging purpose.

Fixes #409
2013-07-09 16:29:00 +02:00
Sebastian Grewe
5acebc37d3 Allow guest access to pages with config options
This will allow pool owners to make certain pages public accessible
without user registration or login. Please check the config dist file
for details.

Fixes #408
2013-07-09 16:13:43 +02:00
Sebastian Grewe
b33f572774 adding missing PHP closing tag 2013-07-09 16:13:30 +02:00
Sebastian Grewe
52e02a545b fixing issue with upstream shares not being found 2013-07-09 15:43:42 +02:00
Sebastian Grewe
abef09b08c Added blockhash solution checking
Stratum of @moopless supports blockhash as a solution. Check for that
one first.

Addresses #405
2013-07-09 14:50:23 +02:00
Sebastian Grewe
7f759708c8 Adding share type to log output
This will display which detection mechanism caught the share.
Fixed stratum detection

Fixes #405
2013-07-09 11:43:12 +02:00
Sebastian Grewe
e4f8537165 removing debug output 2013-07-09 11:34:49 +02:00
Sebastian Grewe
f6b350370d Adding solution detections for blocks
This will finally fix all block finding issues with a 4 way detection.
The find upstream method will continue to try other ways to find a
proper share until they are all exhausted or a match was found.

* Use stratum solution, create scrypt hash from block header
* Use pushpoold solution, create solution string from block header
* Use first available upstream share in timerange of block time
* Use *any* first available valid share older than time of block

This will fix #405 - no more unknown blocks. Ever.
2013-07-09 11:27:20 +02:00
Sebastian Grewe
7f32bbb7ba Adding more descriptive message for txfee
Fixes #400
2013-07-09 08:58:46 +02:00
Sebastian Grewe
4c531360c1 fixing empty variable when using cache 2013-07-09 08:54:20 +02:00
Sebastian Grewe
0f69032fd3 Adding 3rd party Scrypt library
This will allow us to start checking a blockhash against a solution
submitted to the database.

Details on this in the ticket. Just a WIP to save file states.

Addresses #405
2013-07-08 17:10:58 +02:00
Sebastian Grewe
3da5a226e1 Better number format for est. shares 2013-07-08 15:42:23 +02:00
Sebastian Grewe
308b01c700 Better number format for block percentages 2013-07-08 15:40:21 +02:00
Sebastian Grewe
d25387f0b5 Disable caching check on Smarty globals
This will ensure data is available for those pages relying on global
data. A better step might be to load template specific data always on
the pages that require the data instead of relying on global data to be
available.

Fixes #309
2013-07-08 14:41:52 +02:00
Sebastian Grewe
bb0e9dff39 disable smarty cache by default in dist 2013-07-08 14:41:52 +02:00
Sebastian Grewe
4ea33a5e50 Adding cache detection to many pages
This will allow pages to skip loading data from backends like the
database or the wallet RPC server. If a cached page is detected and
valid, all dynamic content generation will be skipped completely.

Other pages that have not been adjusted in this commit will still fetch
backend data all the time. This will ensure clients always see the most
recent data, like worker information or account changes.

This should fix #309 completely but needs some testing.
2013-07-08 14:41:52 +02:00
Sebastian Grewe
9aeb005201 Adding {nocache} flags for dynamic content
This will update content instantly once the user changes it and not load
a cached version from the smarty cache.

Addresses #309
2013-07-08 14:40:10 +02:00
Sebastian Grewe
87ecfc5598 Add detailed smarty cache documentation to config
Instead of just making it availble document the smarty cache feature.

It might work for users, but it's advised to rely on the memcache
instead.

Fixes #309
2013-07-08 14:39:22 +02:00
Sebastian Grewe
da0ab75d5d adjust smarty configurations 2013-07-08 14:39:06 +02:00
Sebastian Grewe
3449d5c29c Adding cache lifetime option to smarty config
* Renamed configuration array to `smarty` => `cache`
* Added `smarty` => `cache_lifetime` to expire cache files properly

This should be safe to use, be aware that each page request is cached!
That includes any POST/GET calls to the site.

It does help in speeding up the site, up to 100% on some requests. For a
high traffic site it probably makes sense to enable this option with a
low cache lifetime to ensure most recent data.

Addresses #309
2013-07-08 14:39:06 +02:00
Sebastian Grewe
420ae332b5 Add detailed smarty cache documentation to config
Instead of just making it availble document the smarty cache feature.

It might work for users, but it's advised to rely on the memcache
instead.

Fixes #309
2013-07-08 14:38:45 +02:00
Sebastian Grewe
715680e7dc Merge pull request #403 from TheSerapher/issue-312-piechart
Issue 312 piechart
2013-07-08 05:30:46 -07:00
Sebastian Grewe
1c2891cc78 Removed piechart, removed no shares notification
* Removed broken piechart for now
* Do not display message if no shares are found for calculations to
  avoid cross-tabe error messages

Fixes #312
2013-07-08 08:54:17 +02:00
Sebastian Grewe
c9df482683 Merge branch 'next' into issue-392 2013-07-08 08:47:35 +02:00
Sebastian Grewe
6193604598 Fallback call if upstream share not found properly
Implemented a fallback method in case no upstream share can be found for
a block. This will result in same strange behaviour especially if a
later block has properly added a valid share and this will be used for a
previous block. At least now even the last block will be properly found
and marked as discovered by a user, even though no actual upstream share
was involved in this.

This is a dirty workaround for pools having payout issues. After all
blocks are processed and assuming upstream shares continue to work as
expected, this will *skip* broken blocks/shares.

Workaround fix for #392
2013-07-07 22:24:52 +02:00
Sebastian Grewe
952c8732b1 Properly display piechart, first attempt
Should further address #312
2013-07-07 22:15:40 +02:00
Sebastian Grewe
6dc795fd77 Improved cron logging via logfiles
* Added 3rd party logger library KLogger
* Adjusted all cronjobs from verbose output to logging
* Added new logs folder for crons to write to
* Added new .gitignore for logs folder data
* Updated blocks class to only fetch blocks with no share_id
* Adjusted findblocks to use no blocks class method
2013-07-07 22:04:43 +02:00
Sebastian Grewe
6f3c5bb95e Merge pull request #398 from TheSerapher/issue-312-24h-hashrates
Issue 312 24h hashrates
2013-07-07 11:54:26 -07:00
Sebastian Grewe
2586aca34e Revert "Fixing issue with delayed inserts for shares"
This reverts commit 752b3e810f.
2013-07-07 19:52:24 +02:00
Sebastian Grewe
103dd51d42 Merge pull request #397 from TheSerapher/issue-388
More descriptive error message exceeding LTC threshold
2013-07-07 10:41:37 -07:00
Sebastian Grewe
9adcd767e3 Merge pull request #396 from TheSerapher/issue-375
Fixing PHP warning message for empty price var
2013-07-07 10:41:16 -07:00
Sebastian Grewe
748b63d908 Merge pull request #395 from TheSerapher/issue-389
Enforce unique account emails

Fixes #389
2013-07-07 10:40:47 -07:00
Sebastian Grewe
9d50c9a222 User proper archive table for union
Addresses #312
2013-07-07 19:39:58 +02:00
Sebastian Grewe
752b3e810f Fixing issue with delayed inserts for shares
When shares are inserted with a delay for performance optimizations,
this will cause block timestamps to be completely off with share
timestamps. Hence the timestamp limited search is now removed, it would
cause too many issues for Stratum users/pools.

Addresses #392
2013-07-06 23:11:28 +02:00
Sebastian Grewe
32d764127e More descriptive error message exceeding LTC threshold
Fixes #388
2013-07-06 18:56:35 +02:00
Sebastian Grewe
fdb562b078 Fixing PHP warning message for empty price var
Fixes #375
2013-07-06 17:57:37 +02:00
Sebastian Grewe
307c7ee23f Enforce unique account emails
* display an error if user tries to re-use an email address
* moved SQL files to indicate the order of SQL import
* added unique email index SQL file

This will address #389, still needs email validation.
2013-07-06 17:47:50 +02:00
Sebastian Grewe
9412107b53 Hard coded block limit for pool statistics
This should fix a potential DoS like attack when fetching a random
amount of blocks continously.

Fixes #387
2013-07-06 17:38:23 +02:00
Sebastian Grewe
a6c7d5eaa9 Merge pull request #390 from TheSerapher/issue-383
Fixing PHP Warning on admin->user panel
2013-07-06 08:34:52 -07:00