From bd561ff465cd0e89ad632da5c70b04ca5f364e61 Mon Sep 17 00:00:00 2001 From: Sebastian Grewe Date: Sat, 15 Feb 2014 09:27:38 +0100 Subject: [PATCH] [FIX] Statistics Graphs ACL Fixes #1760 --- public/include/config/admin_settings.inc.php | 7 +++++++ public/include/pages/statistics/graphs.inc.php | 15 ++++++++++++++- public/include/smarty_globals.inc.php | 1 + public/templates/mpos/global/navigation.tpl | 1 + 4 files changed, 23 insertions(+), 1 deletion(-) diff --git a/public/include/config/admin_settings.inc.php b/public/include/config/admin_settings.inc.php index d4277160..9e41bbd6 100644 --- a/public/include/config/admin_settings.inc.php +++ b/public/include/config/admin_settings.inc.php @@ -222,6 +222,13 @@ $aSettings['acl'][] = array( 'name' => 'acl_uptime_statistics', 'value' => $setting->getValue('acl_uptime_statistics'), 'tooltip' => 'Make the uptime statistics page private (users only) or public.' ); +$aSettings['acl'][] = array( + 'display' => 'Graphs', 'type' => 'select', + 'options' => array( 0 => 'Private', 1 => 'Public', 2 => 'Disabled' ), + 'default' => 1, + 'name' => 'acl_graphs_statistics', 'value' => $setting->getValue('acl_graphs_statistics'), + 'tooltip' => 'Make the graphs statistics page private (users only) or public.' +); $aSettings['acl'][] = array( 'display' => 'Donors Page', 'type' => 'select', 'options' => array( 0 => 'Private', 1 => 'Public', 2 => 'Disabled' ), diff --git a/public/include/pages/statistics/graphs.inc.php b/public/include/pages/statistics/graphs.inc.php index b6bfec8f..517532a3 100644 --- a/public/include/pages/statistics/graphs.inc.php +++ b/public/include/pages/statistics/graphs.inc.php @@ -13,5 +13,18 @@ if (!$smarty->isCached('master.tpl', $smarty_cache_key)) { $debug->append('Using cached page', 3); } -$smarty->assign("CONTENT", "default.tpl"); +switch($setting->getValue('acl_graphs_statistics', 1)) { +case '0': + if ($user->isAuthenticated()) { + $smarty->assign("CONTENT", "default.tpl"); + } + break; +case '1': + $smarty->assign("CONTENT", "default.tpl"); + break; +case '2': + $_SESSION['POPUP'][] = array('CONTENT' => 'Page currently disabled. Please try again later.', 'TYPE' => 'errormsg'); + $smarty->assign("CONTENT", ""); + break; +} ?> diff --git a/public/include/smarty_globals.inc.php b/public/include/smarty_globals.inc.php index b2e83486..8a011b5d 100644 --- a/public/include/smarty_globals.inc.php +++ b/public/include/smarty_globals.inc.php @@ -120,6 +120,7 @@ $aGlobal['acl']['block']['statistics'] = $setting->getValue('acl_block_statistic $aGlobal['acl']['round']['statistics'] = $setting->getValue('acl_round_statistics'); $aGlobal['acl']['blockfinder']['statistics'] = $setting->getValue('acl_blockfinder_statistics'); $aGlobal['acl']['uptime']['statistics'] = $setting->getValue('acl_uptime_statistics'); +$aGlobal['acl']['graphs']['statistics'] = $setting->getValue('acl_graphs_statistics'); $aGlobal['acl']['donors']['page'] = $setting->getValue('acl_donors_page'); $aGlobal['acl']['about']['page'] = $setting->getValue('acl_about_page'); $aGlobal['acl']['contactform'] = $setting->getValue('acl_contactform'); diff --git a/public/templates/mpos/global/navigation.tpl b/public/templates/mpos/global/navigation.tpl index b44c15cc..d4666450 100644 --- a/public/templates/mpos/global/navigation.tpl +++ b/public/templates/mpos/global/navigation.tpl @@ -35,6 +35,7 @@ {acl_check icon='icon-chart' page='statistics' action='round' name='Round' acl=$GLOBAL.acl.round.statistics} {acl_check icon='icon-search' page='statistics' action='blockfinder' name='Blockfinder' acl=$GLOBAL.acl.blockfinder.statistics} {acl_check icon='icon-bell' page='statistics' action='uptime' name='Uptime' acl=$GLOBAL.acl.uptime.statistics} + {acl_check icon='icon-chart' page='statistics' action='graphs' name='Graphs' acl=$GLOBAL.acl.graphs.statistics}

Help