Refs #5005 Delete the config file when it is found, during installati…

…on, to prevent unexpected bugs
matomo-org · May 2, 2014 · 7192213 · 7192213
1 parent c913ce3
commit 7192213
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 19 deletions.
diff --git a/core/Config.php b/core/Config.php
@@ -332,6 +332,12 @@ public function existsLocalConfig()
         return is_readable($this->pathLocal);
     }
 
+    public function deleteLocalConfig()
+    {
+        $configLocal = $this->getLocalPath();
+        unlink($configLocal);
+    }
+
     public function checkLocalConfigFound()
     {
         if (!$this->existsLocalConfig()) {

diff --git a/plugins/Installation/Controller.php b/plugins/Installation/Controller.php
@@ -30,6 +30,7 @@
 use Piwik\Plugins\UsersManager\API as APIUsersManager;
 use Piwik\ProxyHeaders;
 use Piwik\Session\SessionNamespace;
+use Piwik\SettingsPiwik;
 use Piwik\SettingsServer;
 use Piwik\Updater;
 use Piwik\UpdaterErrorException;
@@ -192,7 +193,8 @@ function databaseSetup()
                 DbHelper::checkDatabaseVersion();
                 $this->session->databaseVersionOk = true;
 
-                $this->createConfigFileIfNeeded($dbInfos);
+                $this->deleteConfigFileIfNeeded();
+                $this->createConfigFile($dbInfos);
 
                 $this->redirectToNextStep(__FUNCTION__);
             } catch (Exception $e) {
@@ -278,7 +280,6 @@ function tablesCreation()
             $view->existingTablesDeleted = true;
 
             // when the user decides to drop the tables then we dont skip the next steps anymore
-            // workaround ZF-1743
             $tmp = $this->session->skipThisStep;
             $tmp['firstWebsiteSetup'] = false;
             $tmp['trackingCode'] = false;
@@ -302,7 +303,6 @@ function tablesCreation()
             ) {
                 $view->showReuseExistingTables = true;
                 // when the user reuses the same tables we skip the website creation step
-                // workaround ZF-1743
                 $tmp = $this->session->skipThisStep;
                 $tmp['firstWebsiteSetup'] = true;
                 $tmp['trackingCode'] = true;
@@ -569,21 +569,11 @@ protected function initObjectsToCallAPI()
     /**
      * Write configuration file from session-store
      */
-    protected function createConfigFileIfNeeded($dbInfos)
+    protected function createConfigFile($dbInfos)
     {
         $config = Config::getInstance();
 
-        try {
-            // expect exception since config.ini.php doesn't exist yet
-            $config->checkLocalConfigFound();
-
-        } catch (Exception $e) {
-
-            if (!empty($this->session->general_infos)) {
-                $config->General = $this->session->general_infos;
-            }
-        }
-
+        $config->General = $this->session->general_infos;
         $config->General['installation_in_progress'] = 1;
         $config->database = $dbInfos;
         $config->forceSave();
@@ -920,7 +910,6 @@ public static function getSystemInformation()
         return $infos;
     }
 
-
     /**
      * @param $infos
      * @return mixed
@@ -1090,9 +1079,7 @@ private function createSuperUser($login, $password, $email)
 
     private function isFinishedInstallation()
     {
-        $isConfigFileFound = file_exists(Config::getInstance()->getLocalPath());
-
-        if (!$isConfigFileFound) {
+        if (!SettingsPiwik::isPiwikInstalled()) {
             return false;
         }
 
@@ -1119,4 +1106,12 @@ private function hasEnoughTablesToReuseDb($tablesInstalled)
         return $baseTablesInstalled >= $minimumCountPiwikTables;
     }
 
+    protected function deleteConfigFileIfNeeded()
+    {
+        $config = Config::getInstance();
+        if($config->existsLocalConfig()) {
+            $config->deleteLocalConfig();
+        }
+    }
+
 }