Fixes #4046 Not checking for config/config.ini.php in the system check since it's not required (and we display warning on other screens that need config writable)

Also fixing install process regression and removing config.ini.sample.php

5 files changed, 48 insertions, 22 deletions

diff --git a/plugins/CoreUpdater/Controller.php b/plugins/CoreUpdater/Controller.php
index 7aa65bc2b4..f60e2041a8 100644
--- a/plugins/CoreUpdater/Controller.php
+++ b/plugins/CoreUpdater/Controller.php
@@ -107,7 +107,7 @@ class Piwik_CoreUpdater_Controller extends Piwik_Controller
     private function oneClick_Download()
     {
         $this->pathPiwikZip = PIWIK_USER_PATH . self::PATH_TO_EXTRACT_LATEST_VERSION . 'latest.zip';
-        Piwik::checkDirectoriesWritableOrDie(array(self::PATH_TO_EXTRACT_LATEST_VERSION));
+        Piwik::dieIfDirectoriesNotWritable(array(self::PATH_TO_EXTRACT_LATEST_VERSION));
 
         // we catch exceptions in the caller (i.e., oneClickUpdate)
         $url = self::getLatestZipUrl($this->newVersion) . '?cb=' . $this->newVersion;
diff --git a/plugins/Installation/Controller.php b/plugins/Installation/Controller.php
index e257d47635..33760871fb 100644
--- a/plugins/Installation/Controller.php
+++ b/plugins/Installation/Controller.php
@@ -495,7 +495,6 @@ class Piwik_Installation_Controller extends Piwik_Controller_Admin
         // connect to the database using the DB infos currently in the session
         $this->createDbFromSessionInformation();
 
-        Piwik::createAccessObject();
         Piwik::setUserIsSuperUser();
         Piwik::createLogObject();
     }
@@ -675,7 +674,26 @@ class Piwik_Installation_Controller extends Piwik_Controller_Admin
         $infos = array();
 
         $infos['general_infos'] = array();
-        $infos['directories'] = Piwik::checkDirectoriesWritable();
+
+        $directoriesToCheck = array();
+
+        if(!Piwik::isInstalled()) {
+            // at install, need /config to be writable (so we can create config.ini.php)
+            $directoriesToCheck[] = '/config/';
+        }
+
+        $directoriesToCheck = array_merge($directoriesToCheck, array(
+                                    '/tmp/',
+                                    '/tmp/templates_c/',
+                                    '/tmp/cache/',
+                                    '/tmp/assets/',
+                                    '/tmp/latest/',
+                                    '/tmp/tcpdf/',
+                                    '/tmp/sessions/',
+        ));
+
+        $infos['directories'] = Piwik::checkDirectoriesWritable($directoriesToCheck);
+
         $infos['can_auto_update'] = Piwik::canAutoUpdate();
 
         if (Piwik_Common::isIIS()) {
diff --git a/plugins/Installation/FormDatabaseSetup.php b/plugins/Installation/FormDatabaseSetup.php
index 936aa9ad86..05462d5f8e 100644
--- a/plugins/Installation/FormDatabaseSetup.php
+++ b/plugins/Installation/FormDatabaseSetup.php
@@ -296,7 +296,9 @@ class Piwik_Installation_FormDatabaseSetup_Rule_checkValidFilename extends HTML_
 {
     function validateOwner()
     {
-        return Piwik_Common::isValidFilename($this->owner->getValue());
+        $prefix = $this->owner->getValue();
+        return empty($prefix)
+            || Piwik_Common::isValidFilename($prefix);
     }
 }
 
diff --git a/plugins/Installation/templates/_systemCheckSection.twig b/plugins/Installation/templates/_systemCheckSection.twig
index 260dbeda06..454f19579d 100755
--- a/plugins/Installation/templates/_systemCheckSection.twig
+++ b/plugins/Installation/templates/_systemCheckSection.twig
@@ -274,6 +274,23 @@
             {% endfor %}
         </td>
     </tr>
+    <tr>
+        <td class="label">{{ 'Installation_Filesystem'|translate }}</td>
+        <td>
+            {% if not infos.is_nfs %}
+                {{ ok }} {{ 'General_Ok'|translate }}
+                <br/>
+            {% else %}
+                {{ warning }}
+                <span class="warn">{{ 'Installation_NfsFilesystemWarning'|translate }}</span>
+                {% if duringInstall is not empty %}
+                    <p>{{ 'Installation_NfsFilesystemWarningSuffixInstall'|translate }}</p>
+                {% else %}
+                    <p>{{ 'Installation_NfsFilesystemWarningSuffixAdmin'|translate }}</p>
+                {% endif %}
+            {% endif %}
+        </td>
+    </tr>
     {% if infos.general_infos.assume_secure_protocol is defined %}
         <tr>
             <td class="label">{{ 'Installation_SystemCheckSecureProtocol'|translate }}</td>
@@ -308,23 +325,7 @@
             </td>
         </tr>
     {% endif %}
-    <tr>
-        <td class="label">{{ 'Installation_Filesystem'|translate }}</td>
-        <td>
-            {% if not infos.is_nfs %}
-                {{ ok }} {{ 'General_Ok'|translate }}
-                <br/>
-            {% else %}
-                {{ warning }}
-                <span class="warn">{{ 'Installation_NfsFilesystemWarning'|translate }}</span>
-                {% if duringInstall is not empty %}
-                    <p>{{ 'Installation_NfsFilesystemWarningSuffixInstall'|translate }}</p>
-                {% else %}
-                    <p>{{ 'Installation_NfsFilesystemWarningSuffixAdmin'|translate }}</p>
-                {% endif %}
-            {% endif %}
-        </td>
-    </tr>
+
 </table>
 
 {% include "@Installation/_integrityDetails.twig" %}
\ No newline at end of file
diff --git a/plugins/SitesManager/API.php b/plugins/SitesManager/API.php
index d5d26a627d..c69f468b36 100644
--- a/plugins/SitesManager/API.php
+++ b/plugins/SitesManager/API.php
@@ -198,7 +198,12 @@ class Piwik_SitesManager_API
     public function getAllSitesId()
     {
         Piwik::checkUserIsSuperUser();
-        return Piwik_SitesManager_API::getInstance()->getSitesId();
+        try {
+            return Piwik_SitesManager_API::getInstance()->getSitesId();
+        } catch(Exception $e) {
+            // can be called before Piwik tables are created so return empty
+            return array();
+        }
     }
 
     /**