forks/baikal
1
0
Fork 0
Code Releases Activity

Correct more labels, use System instead of Database for settings

Browse source
This commit is contained in:
Cyril 2019-10-14 14:46:22 +02:00
parent ba8b16d5ed
commit 4852f06ed4
3 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
Core/Frameworks/BaikalAdmin/Controller/Install/Database.php
View file

@ -36,7 +36,7 @@ class Database extends \Flake\Core\Controller {
protected $oForm; # \Formal\Form protected $oForm; # \Formal\Form
function execute() { 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([ $this->oForm = $this->oModel->formForThisModelInstance([
"close" => false, "close" => false,
@ -62,7 +62,7 @@ class Database extends \Flake\Core\Controller {
if ($this->oForm->persisted()) { 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>&nbsp;</p>";
$sMessage .= "<p><a class='btn btn-success' href='" . PROJECT_URI . "admin/'>Start using Baïkal</a></p>"; $sMessage .= "<p><a class='btn btn-success' href='" . PROJECT_URI . "admin/'>Start using Baïkal</a></p>";
$sForm = ""; $sForm = "";

4
Core/Frameworks/BaikalAdmin/Controller/Install/Initialize.php
View file

@ -36,9 +36,9 @@ class Initialize extends \Flake\Core\Controller {
function execute() { function execute() {
# Assert that /Specific is writable # 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 = "<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); die($message);
} }

2
Core/Frameworks/Flake/Framework.php
View file

@ -283,7 +283,7 @@ class Framework extends \Flake\Core\Framework {
# We now setup t6he connexion to use UTF8 # We now setup t6he connexion to use UTF8
$GLOBALS["DB"]->query("SET NAMES UTF8"); $GLOBALS["DB"]->query("SET NAMES UTF8");
} catch (\Exception $e) { } 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; return true;