From be3421fa3b2c562309cd92b31e1bf925a883b06a Mon Sep 17 00:00:00 2001 From: root Date: Sun, 10 Nov 2013 14:07:36 +0100 Subject: [PATCH] [FIX] removed from acl, placed under system --- public/include/config/admin_settings.inc.php | 28 ++++++++++---------- public/include/smarty_globals.inc.php | 4 +-- public/templates/mmcFE/global/navigation.tpl | 4 +-- public/templates/mpos/global/navigation.tpl | 4 +-- 4 files changed, 20 insertions(+), 20 deletions(-) diff --git a/public/include/config/admin_settings.inc.php b/public/include/config/admin_settings.inc.php index 8c8800d0..11afa763 100644 --- a/public/include/config/admin_settings.inc.php +++ b/public/include/config/admin_settings.inc.php @@ -194,20 +194,6 @@ $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' => 'Donors Page', 'type' => 'select', - 'options' => array( 0 => 'Hide', 1 => 'Show'), - 'default' => 1, - 'name' => 'acl_donors_page', 'value' => $setting->getValue('acl_donors_page'), - 'tooltip' => 'Showing Donors page in Navigation.' -); -$aSettings['acl'][] = array( - 'display' => 'About Page', 'type' => 'select', - 'options' => array( 0 => 'Hide', 1 => 'Show'), - 'default' => 1, - 'name' => 'acl_about_page', 'value' => $setting->getValue('acl_about_page'), - 'tooltip' => 'Showing About page in Navigation.' -); $aSettings['system'][] = array( 'display' => 'E-mail address for system error notifications', 'type' => 'text', 'size' => 25, @@ -271,6 +257,20 @@ $aSettings['system'][] = array( 'name' => 'disable_contactform', 'value' => $setting->getValue('disable_contactform'), 'tooltip' => 'Enable or Disable Contactform. Users will not be able to use the contact form.' ); +$aSettings['system'][] = array( + 'display' => 'Disable Donors Page', 'type' => 'select', + 'options' => array( 0 => 'No', 1 => 'Yes'), + 'default' => 1, + 'name' => 'disable_donors', 'value' => $setting->getValue('disable_donors'), + 'tooltip' => 'Showing Donors page in Navigation.' +); +$aSettings['system'][] = array( + 'display' => 'Disable About Page', 'type' => 'select', + 'options' => array( 0 => 'No', 1 => 'Yes'), + 'default' => 1, + 'name' => 'disable_about', 'value' => $setting->getValue('disable_about'), + 'tooltip' => 'Showing About page in Navigation.' +); $aSettings['recaptcha'][] = array( 'display' => 'Enable re-Captcha', 'type' => 'select', 'options' => array( 0 => 'No', 1 => 'Yes' ), diff --git a/public/include/smarty_globals.inc.php b/public/include/smarty_globals.inc.php index 0fa02ca9..40223e2a 100644 --- a/public/include/smarty_globals.inc.php +++ b/public/include/smarty_globals.inc.php @@ -91,6 +91,8 @@ $aGlobal['website']['email'] = $setting->getValue('website_email'); $aGlobal['website']['api']['disabled'] = $setting->getValue('disable_api'); $aGlobal['website']['blockexplorer']['disabled'] = $setting->getValue('website_blockexplorer_disabled'); $aGlobal['website']['chaininfo']['disabled'] = $setting->getValue('website_chaininfo_disabled'); +$aGlobal['website']['donors']['disabled'] = $setting->getValue('disable_donors'); +$aGlobal['website']['about']['disabled'] = $setting->getValue('disable_about'); $setting->getValue('website_blockexplorer_url') ? $aGlobal['website']['blockexplorer']['url'] = $setting->getValue('website_blockexplorer_url') : $aGlobal['website']['blockexplorer']['url'] = 'http://explorer.litecoin.net/block/'; $setting->getValue('website_chaininfo_url') ? $aGlobal['website']['chaininfo']['url'] = $setting->getValue('website_chaininfo_url') : $aGlobal['website']['chaininfo']['url'] = 'http://allchains.info'; @@ -103,8 +105,6 @@ $aGlobal['acl']['pool']['statistics'] = $setting->getValue('acl_pool_statistics' $aGlobal['acl']['block']['statistics'] = $setting->getValue('acl_block_statistics'); $aGlobal['acl']['round']['statistics'] = $setting->getValue('acl_round_statistics'); $aGlobal['acl']['uptime']['statistics'] = $setting->getValue('acl_uptime_statistics'); -$aGlobal['acl']['navigation']['donors'] = $setting->getValue('acl_donors_page'); -$aGlobal['acl']['navigation']['about'] = $setting->getValue('acl_about_page'); // We don't want these session infos cached if (@$_SESSION['USERDATA']['id']) { diff --git a/public/templates/mmcFE/global/navigation.tpl b/public/templates/mmcFE/global/navigation.tpl index e2b71329..3fff86a0 100644 --- a/public/templates/mmcFE/global/navigation.tpl +++ b/public/templates/mmcFE/global/navigation.tpl @@ -55,13 +55,13 @@ {/if}
  • Getting Started
  • Support
    • - {if $GLOBAL.acl.navigation.about} + {if !$GLOBAL.website.about.disabled}
  • About {/if}
    • {if $smarty.session.AUTHENTICATED|default == 1}
  • Logout
    • {else}
  • Register
    • {/if} diff --git a/public/templates/mpos/global/navigation.tpl b/public/templates/mpos/global/navigation.tpl index d1d0bab3..5086000c 100644 --- a/public/templates/mpos/global/navigation.tpl +++ b/public/templates/mpos/global/navigation.tpl @@ -57,10 +57,10 @@

    Help