Commit Graph

178 Commits

Author SHA1 Message Date
nicoschtein
f3a2812cac Added txfee_manual and txfee_auto to smary_globals config array
removed txfee
2014-01-14 19:15:08 -02: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
4026eec570 Merge pull request #1187 from TheSerapher/issue-1159-dashboardsplit
[IMPROVED]
2013-12-31 07:19:11 -08: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
3b980cbf5d [IMPROVMENT] Added option to link transaction-ids to transaction on blockchainwebsite 2013-12-31 04:25:47 +01:00
Sebastian Grewe
8e4c56d597 [IMPROVED]
Splitting dashboard calls up instead of using one single API call:

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

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

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

Address #1159
2013-12-30 19:23:27 +01:00
Sebastian Grewe
96d096f669 [MERGE] Fix merge conflict 2013-12-30 08:19:13 +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
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
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
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
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
ahmedbodi
810b9e3987 Fixed Config Array 2013-11-29 10:02:47 +00:00
ahmedbodi
297fbd1d6b Added Algorithm to Globals
Added Algorithm to Globals for Getting Started Guide
2013-11-29 09:56:11 +00:00
Sebastian Grewe
6063a3498b [FIX] Proper estimates on changed personal modifier 2013-11-27 13:43:59 +01:00
root
510c076452 [FEATURE] blockfinder statistics 2013-11-18 12:43:17 +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
629dfb58ed [FIX] Name of Uptime Robot Setting 2013-11-11 12:30:36 +01:00
root
be3421fa3b [FIX] removed from acl, placed under system 2013-11-10 14:07:36 +01:00
root
4fea5de341 [SETTINGS] show/hide donors and about page 2013-11-10 11:06:20 +01:00
Sebastian Grewe
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
8e5dc78df4 Merge pull request #815 from iAmShorty/google-analytics
[FEATURE] Added Google Analytics
2013-11-04 00:15:11 -08:00
root
84781763b0 [FIX] small style changes and smarty default value 2013-11-03 17:31:02 +01:00
root
f14af44d4c [FIX] Placed under Statistics 2013-11-03 16:48:47 +01:00
Sebastian Grewe
70d59d4900 [IMPROVED] Hide uptime status if no API keys set 2013-11-03 15:23:35 +01:00
root
505d242cbd [FEATURE] Added Google Analytics 2013-11-03 15:08:46 +01:00
Sebastian Grewe
88a2a29b3b [UPDATE] Adding missing files 2013-10-29 09:23:52 +01: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
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
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
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
668f6abf78 [FIX] Method argument order fixed 2013-10-16 12:00:29 +02:00
Sebastian Grewe
aedb37aa3d [IMPROVED] Added getUserEstimates method 2013-10-16 11:34:59 +02:00
Sebastian Grewe
bf627a320e [FIX] PPLNS Target Display, PHP Notice
Fixes #691 and #687
2013-10-08 07:18:39 +02:00
Sebastian Grewe
1dfb7e9702 Merge pull request #673 from TheSerapher/issue-444-theserapher
Issue 444 theserapher
2013-10-04 02:27:28 -07: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
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
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
1387bbdf44 [MERGE] Merge conflict NEXT 2013-09-18 16:34:52 +02:00
Sebastian Grewe
5d19964321 adding DEBUG console 2013-09-18 08:06:22 +02:00
Sebastian Grewe
e88d80cd02 Merge branch 'next' into issue-444-theserapher 2013-09-17 09:42:56 +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
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
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
f87a7fc380 Merge branch 'next' into issue-145 2013-09-06 10:55:31 +02:00
Sebastian Grewe
ab6a4f57d3 further implemetation into mmcfe-ng 2013-09-06 10:29:42 +02:00
Sebastian Grewe
6522fb2747 fixing merge conflicts 2013-08-22 11:54:17 +02:00
Sebastian Grewe
d28e728d6c minor cleanup 2013-08-22 11:28:18 +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
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
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
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
obigal
1819a47bf4 Vardiff/pushpool and pps payout support 2013-08-07 09:44:11 +02:00
obigal
99bb4470f3 Update smarty_globals.inc.php 2013-08-07 09:40:25 +02:00
obigal
a7278401b0 Update smarty_globals.inc.php 2013-08-07 09:34:55 +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
f7a95d9f26 Update smarty_globals.inc.php 2013-08-07 09:29:48 +02:00
obigal
31e10bfa2f Update smarty_globals.inc.php 2013-08-07 09:29:48 +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
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
9899507839 Fix some reported issues in #260 2013-07-23 11:05:45 +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
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
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
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
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
09efdfc172 fixing merge commit with origin 2013-07-11 09:05:41 +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
70644b4299 Merge pull request #413 from TheSerapher/issue-408
Issue 408
2013-07-09 14:22:33 -07: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
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
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
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
32d764127e More descriptive error message exceeding LTC threshold
Fixes #388
2013-07-06 18:56:35 +02:00
Sebastian Grewe
7099b2cc04 Use poolhash rate if nethash is smaller
This should avoid some confusion for coins where the network hashrate
drops under the pool hashrate due to slow block finding rates.

Fixes #378
2013-07-05 22:02:16 +02:00
Sebastian Grewe
a012fc2ee5 catch PHP warning 2013-07-04 16:06:59 +02:00
Sebastian Grewe
f3dd9caa2c Added 8 digit estimates precision and balance
This expands the prevision for LTC estimates to 8 digits. Since the
sidebar was widened, they should fit for most resolutions.
2013-07-04 12:17:09 +02:00
Sebastian Grewe
3ab9d5252f Merge pull request #341 from TheSerapher/issue-308
Adding dynamic block value support in PPS
2013-07-03 23:53:24 -07:00
Sebastian Grewe
9e306bf06e Potential fix for PHP Warning
This should fix #327
2013-07-02 09:00:01 +02:00
Sebastian Grewe
c157a76551 Adding network hashrate to ministats header
Fixes #325
2013-07-01 18:41:18 +02:00
Sebastian Grewe
cb7f114cbc Adding dynamic block value support in PPS
This will add the block reward typw to PPS systems. Prior to this, each
PPS value was hard coded to 50. Not only are other coins not based on
this but changing it would require code. Changed it that

* Default for fixed type is config reward
* Default for block type is **previous** blocks amount
** Fallback for first round is the fixed reward value

See in-line documentation of dist configuration. This should help new
pool owners to get setup and clarify things.

Fixes #308
2013-07-01 17:45:23 +02:00
Sebastian Grewe
31d898cbc1 Adding configurable website title
Fixes #310
2013-07-01 17:21:12 +02:00
Sebastian Grewe
f333982698 Merge pull request #304 from TheSerapher/issue-275-pos-support
Issue 275 pos support
2013-07-01 01:38:34 -07:00
Sebastian Grewe
01afd2f02f Properly display estimates on 0 valid shares
If pool has no valid shares, display 0 as the estimated payout. This
will avoid a PHP Warning devision by zero.

Fixes #296, do not run into Divide by zero error when missing round
shares
2013-07-01 01:55:29 +02:00
Sebastian Grewe
4be963d7be Detect if we use POS difficulties or not
Fixes #275
2013-06-30 19:35:49 +02:00
Sebastian Grewe
af70a194c9 Adding support for POS coin
This will fix #275 and add proper support for a different implementation
of network difficulty.
2013-06-30 19:35:49 +02:00
Sebastian Grewe
7390ca38e5 Enable or Disable maintenance and registrations
This will allow any admin to enable or disable a pool maintenance mode.
Regular users that are still logged in will not be kicked out (yet). New
users that are trying to login and are not admins will be denied access.

Also added registration option to Admin Settings via WebUI. You can now
disable new accounts via web option or configuration setting.

Fixes #259 but also adds an additional feature.
2013-06-30 12:03:46 +02:00
Sebastian Grewe
d630329055 Display error message to user on failed logins
Warn a user with an error that there have been failed login attempts
for their account. Login errors can be cleared by clicking on the URL in
the message itself.

Fixes #240
2013-06-23 20:58:42 +02:00
Sebastian Grewe
7bcc29c6a8 Adding warning if user exceeds balance thresholds
* Warn user if they exceeded the configured AP max thresholds for their
  account balance

This will address #220. There does not seem a perfect solution for this
but this should help.
2013-06-20 09:18:24 +02:00
Sebastian Grewe
82f6961645 Adding PPS specific sidebar
* Adding PPS sidebar to seperate the HTML code
* Added PPS specific globals section if need be some day
* Added payout detection to master template for sidebar
* Added 7 days and 14 days estimates

Fixes #160
2013-06-18 10:22:43 +02:00