diff --git a/public/include/config/admin_settings.inc.php b/public/include/config/admin_settings.inc.php index 178e90a6..07d41405 100644 --- a/public/include/config/admin_settings.inc.php +++ b/public/include/config/admin_settings.inc.php @@ -102,6 +102,13 @@ $aSettings['statistics'][] = array( 'name' => 'statistics_ajax_refresh_interval', 'value' => $setting->getValue('statistics_ajax_refresh_interval'), 'tooltip' => 'How often to refresh data via ajax in seconds.' ); +$aSettings['statistics'][] = array( + 'display' => 'Ajax Data Interval', 'type' => 'select', + 'options' => array('60' => '1', '300' => '5', '600' => '10'), + 'default' => 300, + 'name' => 'statistics_ajax_data_interval', 'value' => $setting->getValue('statistics_ajax_data_interval'), + 'tooltip' => 'Time in minutes, interval for hashrate and sharerate calculations. Higher intervals allow for better accuracy at a higer server load.' +); $aSettings['statistics'][] = array( 'display' => 'Block Statistics Count', 'type' => 'text', 'size' => 25, diff --git a/public/include/pages/api/getdashboarddata.inc.php b/public/include/pages/api/getdashboarddata.inc.php index a36b4bb2..4d8fef48 100644 --- a/public/include/pages/api/getdashboarddata.inc.php +++ b/public/include/pages/api/getdashboarddata.inc.php @@ -36,7 +36,7 @@ $bitcoin->can_connect() === true ? $dNetworkHashrate = $bitcoin->query('getnetwo // Some settings $start = microtime(true); -$interval = 300; +if ( ! $interval = $setting->getValue('statistics_ajax_data_interval')) $interval = 300; if ( ! $dPoolHashrateModifier = $setting->getValue('statistics_pool_hashrate_modifier') ) $dPoolHashrateModifier = 1; if ( ! $dPersonalHashrateModifier = $setting->getValue('statistics_personal_hashrate_modifier') ) $dPersonalHashrateModifier = 1; if ( ! $dNetworkHashrateModifier = $setting->getValue('statistics_network_hashrate_modifier') ) $dNetworkHashrateModifier = 1; diff --git a/public/include/pages/dashboard.inc.php b/public/include/pages/dashboard.inc.php index 5ab39251..22a4edec 100644 --- a/public/include/pages/dashboard.inc.php +++ b/public/include/pages/dashboard.inc.php @@ -4,6 +4,7 @@ if (!defined('SECURITY')) die('Hacking attempt'); if ($user->isAuthenticated()) { + if (! $interval = $setting->getValue('statistics_ajax_data_interval')) $interval = 300; // Defaults to get rid of PHP Notice warnings $dDifficulty = 1; $aRoundShares = 1; @@ -42,6 +43,7 @@ if ($user->isAuthenticated()) { if ($iCurrentPoolHashrate > $dNetworkHashrate) $dNetworkHashrate = $iCurrentPoolHashrate; // Make it available in Smarty + $smarty->assign('INTERVAL', $interval / 60); $smarty->assign('CONTENT', 'default.tpl'); } diff --git a/public/templates/test/dashboard/gauges.tpl b/public/templates/test/dashboard/gauges.tpl index 6bdc6723..210b4228 100644 --- a/public/templates/test/dashboard/gauges.tpl +++ b/public/templates/test/dashboard/gauges.tpl @@ -9,7 +9,7 @@
- +