Minor changes Re: isDataPurgeSettingsEnabled

matomo-org · Jan 7, 2014 · 546ef83 · 546ef83
1 parent 4170bbd
commit 546ef83
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 7 deletions.
diff --git a/core/Plugin/ControllerAdmin.php b/core/Plugin/ControllerAdmin.php
@@ -11,6 +11,7 @@
 namespace Piwik\Plugin;
 
 use Piwik\Config as PiwikConfig;
+use Piwik\Config;
 use Piwik\Menu\MenuAdmin;
 use Piwik\Menu\MenuTop;
 use Piwik\Notification;
@@ -129,6 +130,7 @@ static public function setBasicVariablesAdminView(View $view)
         $view->topMenu = MenuTop::getInstance()->getMenu();
         $view->currentAdminMenuName = MenuAdmin::getInstance()->getCurrentAdminMenuName();
 
+        $view->isDataPurgeSettingsEnabled = self::isDataPurgeSettingsEnabled();
         $view->enableFrames = PiwikConfig::getInstance()->General['enable_framed_settings'];
         if (!$view->enableFrames) {
             $view->setXFrameOptions('sameorigin');
@@ -147,6 +149,10 @@ static public function setBasicVariablesAdminView(View $view)
         NotificationManager::cancelAllNonPersistent();
     }
 
+    static protected function isDataPurgeSettingsEnabled()
+    {
+        return (bool) Config::getInstance()->General['enable_delete_old_data_settings_admin'];
+    }
 
     static protected function getPiwikVersion()
     {

diff --git a/plugins/CoreAdminHome/templates/generalSettings.twig b/plugins/CoreAdminHome/templates/generalSettings.twig
@@ -234,6 +234,8 @@
     <input type="submit" value="{{ 'General_Save'|translate }}" id="generalSettingsSubmit" class="submit"/>
     <br/>
     <br/>
+
+    {% if isDataPurgeSettingsEnabled %}
     {% set clickDeleteLogSettings %}{{ 'PrivacyManager_DeleteDataSettings'|translate }}{% endset %}
     <h2>{{ 'PrivacyManager_DeleteDataSettings'|translate }}</h2>
     <p>
@@ -243,6 +245,7 @@
             {{ 'PrivacyManager_ClickHereSettings'|translate("'" ~ clickDeleteLogSettings ~ "'") }}
         </a>
     </p>
+    {% endif %}
 {% endif %}
 <h2>{{ 'CoreAdminHome_OptOutForYourVisitors'|translate }}</h2>
 

diff --git a/plugins/PrivacyManager/Controller.php b/plugins/PrivacyManager/Controller.php
@@ -69,16 +69,11 @@ public function saveSettings()
 
     private function checkDataPurgeAdminSettingsIsEnabled()
     {
-        if (!$this->isDataPurgeSettingsEnabled()) {
+        if (!self::isDataPurgeSettingsEnabled()) {
             throw new \Exception("Configuring deleting log data and report data has been disabled by Piwik admins.");
         }
     }
 
-    private function isDataPurgeSettingsEnabled()
-    {
-        return (bool) Config::getInstance()->General['enable_delete_old_data_settings_admin'];
-    }
-
     /**
      * Utility function. Gets the delete logs/reports settings from the request and uses
      * them to populate config arrays.
@@ -144,7 +139,6 @@ public function privacySettings()
         $view = new View('@PrivacyManager/privacySettings');
 
         if (Piwik::isUserIsSuperUser()) {
-            $view->isDataPurgeSettingsEnabled = $this->isDataPurgeSettingsEnabled();
             $view->deleteData = $this->getDeleteDataInfo();
             $view->anonymizeIP = $this->getAnonymizeIPInfo();
             $view->dntSupport = self::isDntSupported();
@@ -189,6 +183,8 @@ public function executeDataPurge()
 
     protected function getDeleteDBSizeEstimate($getSettingsFromQuery = false, $forceEstimate = false)
     {
+        $this->checkDataPurgeAdminSettingsIsEnabled();
+
         // get the purging settings & create two purger instances
         if ($getSettingsFromQuery) {
             $settings = $this->getPurgeSettingsFromRequest();