From ba8b16d5ede9f5e678f2fdf10830bbbcdcd91b14 Mon Sep 17 00:00:00 2001
From: Cyril <cyril@joshfire.com>
Date: Mon, 14 Oct 2019 12:39:58 +0200
Subject: [PATCH] Improve some error messages, add missing "use"

---
 Core/Frameworks/Baikal/Model/User.php | 4 +++-
 Core/Frameworks/Flake/Framework.php   | 8 ++++----
 Makefile                              | 2 +-
 3 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/Core/Frameworks/Baikal/Model/User.php b/Core/Frameworks/Baikal/Model/User.php
index 2988622..66a5d30 100644
--- a/Core/Frameworks/Baikal/Model/User.php
+++ b/Core/Frameworks/Baikal/Model/User.php
@@ -27,6 +27,8 @@
 
 namespace Baikal\Model;
 
+use Symfony\Component\Yaml\Yaml;
+
 class User extends \Flake\Core\Model\Db {
     const DATATABLE = "users";
     const PRIMARYKEY = "id";
@@ -281,7 +283,7 @@ class User extends \Flake\Core\Model\Db {
     function getPasswordHashForPassword($sPassword) {
 
         try {
-            $config = Yaml::parseFile(PROJECT_PATH_CONFIG . "system.yaml");
+            $config = Yaml::parseFile(PROJECT_PATH_CONFIG . "config.yaml");
         } catch(\Exception $e) {}
 
         return md5($this->get("username") . ':' . $config['parameters']['BAIKAL_AUTH_REALM'] . ':' . $sPassword);
diff --git a/Core/Frameworks/Flake/Framework.php b/Core/Frameworks/Flake/Framework.php
index e28feaa..a2d125d 100644
--- a/Core/Frameworks/Flake/Framework.php
+++ b/Core/Frameworks/Flake/Framework.php
@@ -257,19 +257,19 @@ class Framework extends \Flake\Core\Framework {
     protected static function initDbMysql(array $config) {
 
         if (!$config['parameters']['PROJECT_DB_MYSQL_HOST']) {
-            die("<h3>The constant PROJECT_DB_MYSQL_HOST, containing the MySQL host name, is not set.<br />You should set it in Specific/config.system.php</h3>");
+            die("<h3>The constant PROJECT_DB_MYSQL_HOST, containing the MySQL host name, is not set.<br />You should set it in config/system.yaml</h3>");
         }
 
         if (!$config['parameters']['PROJECT_DB_MYSQL_DBNAME']) {
-            die("<h3>The constant PROJECT_DB_MYSQL_DBNAME, containing the MySQL database name, is not set.<br />You should set it in Specific/config.system.php</h3>");
+            die("<h3>The constant PROJECT_DB_MYSQL_DBNAME, containing the MySQL database name, is not set.<br />You should set it in config/system.yaml</h3>");
         }
 
         if (!$config['parameters']['PROJECT_DB_MYSQL_USERNAME']) {
-            die("<h3>The constant PROJECT_DB_MYSQL_USERNAME, containing the MySQL database username, is not set.<br />You should set it in Specific/config.system.php</h3>");
+            die("<h3>The constant PROJECT_DB_MYSQL_USERNAME, containing the MySQL database username, is not set.<br />You should set it in config/system.yaml</h3>");
         }
 
         if (!$config['parameters']['PROJECT_DB_MYSQL_PASSWORD']) {
-            die("<h3>The constant PROJECT_DB_MYSQL_PASSWORD, containing the MySQL database password, is not set.<br />You should set it in Specific/config.system.php</h3>");
+            die("<h3>The constant PROJECT_DB_MYSQL_PASSWORD, containing the MySQL database password, is not set.<br />You should set it in config/system.yaml</h3>");
         }
 
         try {
diff --git a/Makefile b/Makefile
index 2332554..912f73c 100644
--- a/Makefile
+++ b/Makefile
@@ -31,4 +31,4 @@ composer.lock: composer.json
 
 clean:
 	# Wipe out all local data, and go back to a clean install
-	rm Specific/config.php Specific/config.system.php Specific/db/db.sqlite; true
+	rm config/config.yaml config/system.yaml Specific/db/db.sqlite; true