different check when civi is already installed

civicrm · Sep 24, 2020 · 2665ff8 · 2665ff8
1 parent 55d30ed
commit 2665ff8
Showing 1 changed file with 15 additions and 2 deletions.
diff --git a/setup/plugins/installFiles/InstallSettingsFile.civi-setup.php b/setup/plugins/installFiles/InstallSettingsFile.civi-setup.php
@@ -21,6 +21,9 @@
      */
     $m = $e->getModel();
 
+    $installed = \Civi\Setup::instance()->checkInstalled();
+    $alreadyInstalled = $installed->isSettingInstalled() || $installed->isDatabaseInstalled();
+
     if (empty($m->settingsPath)) {
       $e->addError('system', 'settingsPath', sprintf('The settingsPath is undefined.'));
     }
@@ -29,10 +32,20 @@
     }
 
     if (!\Civi\Setup\FileUtil::isCreateable($m->settingsPath)) {
-      $e->addError('system', 'settingsWritable', sprintf('The settings file "%s" cannot be created. Ensure the parent folder is writable.', $m->settingsPath));
+      if ($alreadyInstalled) {
+        $e->addInfo('system', 'settingsWritable', sprintf('The settings file "%s" is protected from writing.', $m->settingsPath));
+      }
+      else {
+        $e->addError('system', 'settingsWritable', sprintf('The settings file "%s" cannot be created. Ensure the parent folder is writable.', $m->settingsPath));
+      }
     }
     else {
-      $e->addInfo('system', 'settingsWritable', sprintf('The settings file "%s" can be created.', $m->settingsPath));
+      if ($alreadyInstalled) {
+        $e->addWarning('system', 'settingsWritable', sprintf('The settings file "%s" should not be writable.', $m->settingsPath));
+      }
+      else {
+        $e->addInfo('system', 'settingsWritable', sprintf('The settings file "%s" can be created.', $m->settingsPath));
+      }
     }
   });