From 4852f06ed4a594ddd858fba7002d5b21d6d1a721 Mon Sep 17 00:00:00 2001
From: Cyril <cyril@joshfire.com>
Date: Mon, 14 Oct 2019 14:46:22 +0200
Subject: [PATCH] Correct more labels, use System instead of Database for
 settings

---
 Core/Frameworks/BaikalAdmin/Controller/Install/Database.php   | 4 ++--
 Core/Frameworks/BaikalAdmin/Controller/Install/Initialize.php | 4 ++--
 Core/Frameworks/Flake/Framework.php                           | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/Core/Frameworks/BaikalAdmin/Controller/Install/Database.php b/Core/Frameworks/BaikalAdmin/Controller/Install/Database.php
index 418b14e..2ceadad 100644
--- a/Core/Frameworks/BaikalAdmin/Controller/Install/Database.php
+++ b/Core/Frameworks/BaikalAdmin/Controller/Install/Database.php
@@ -36,7 +36,7 @@ class Database extends \Flake\Core\Controller {
     protected $oForm;    # \Formal\Form
 
     function execute() {
-        $this->oModel = new \Baikal\Model\Config\Database(PROJECT_PATH_CONFIG . "system.yaml");
+        $this->oModel = new \Baikal\Model\Config\System(PROJECT_PATH_CONFIG . "system.yaml");
 
         $this->oForm = $this->oModel->formForThisModelInstance([
             "close"           => false,
@@ -62,7 +62,7 @@ class Database extends \Flake\Core\Controller {
 
         if ($this->oForm->persisted()) {
 
-            $sMessage = "<p>Baïkal is now installed, and it's database properly configured. <strong>For security reasons, this installation wizard is now disabled.</strong></p>";
+            $sMessage = "<p>Baïkal is now installed, and its database properly configured. <strong>For security reasons, this installation wizard is now disabled.</strong></p>";
             $sMessage . "<p>&nbsp;</p>";
             $sMessage .= "<p><a class='btn btn-success' href='" . PROJECT_URI . "admin/'>Start using Baïkal</a></p>";
             $sForm = "";
diff --git a/Core/Frameworks/BaikalAdmin/Controller/Install/Initialize.php b/Core/Frameworks/BaikalAdmin/Controller/Install/Initialize.php
index cf9fae3..c639631 100644
--- a/Core/Frameworks/BaikalAdmin/Controller/Install/Initialize.php
+++ b/Core/Frameworks/BaikalAdmin/Controller/Install/Initialize.php
@@ -36,9 +36,9 @@ class Initialize extends \Flake\Core\Controller {
     function execute() {
         # Assert that /Specific is writable
 
-        if (!file_exists(PROJECT_PATH_SPECIFIC) || !is_dir(PROJECT_PATH_SPECIFIC) || !is_writable(PROJECT_PATH_SPECIFIC)) {
+        if (!file_exists(PROJECT_PATH_SPECIFIC) || !is_dir(PROJECT_PATH_SPECIFIC) || !is_writable(PROJECT_PATH_SPECIFIC) || !file_exists(PROJECT_PATH_CONFIG) || !is_dir(PROJECT_PATH_CONFIG) || !is_writable(PROJECT_PATH_CONFIG)) {
             $message = "<h1>Error - Insufficient  permissions on the <span style='background-color: yellow;'>Specific/</span> folder</h1><p>";
-            $message .= "<p>In order to work properly, Baïkal needs to have write permissions in the <strong>Specific/</strong> folder.</p>";
+            $message .= "<p>In order to work properly, Baïkal needs to have write permissions in the <strong>Specific/</strong> and <strong>config/</strong> folder.</p>";
 
             die($message);
         }
diff --git a/Core/Frameworks/Flake/Framework.php b/Core/Frameworks/Flake/Framework.php
index a2d125d..00662cc 100644
--- a/Core/Frameworks/Flake/Framework.php
+++ b/Core/Frameworks/Flake/Framework.php
@@ -283,7 +283,7 @@ class Framework extends \Flake\Core\Framework {
             # We now setup t6he connexion to use UTF8
             $GLOBALS["DB"]->query("SET NAMES UTF8");
         } catch (\Exception $e) {
-            die("<h3>Baïkal was not able to establish a connexion to the configured MySQL database (as configured in Specific/config.system.php).</h3>");
+            die("<h3>Baïkal was not able to establish a connexion to the configured MySQL database (as configured in config/system.yaml).</h3>");
         }
 
         return true;