From fab37f47bb9005ea0e404b9199845f6185bbc735 Mon Sep 17 00:00:00 2001 From: Eirik Th S Date: Sun, 18 Apr 2021 21:02:22 +0200 Subject: [PATCH] rework config-file --- .gitignore | 2 +- webdata/config.php.sample | 10 ++++++++++ webdata/connection.php | 3 --- webdata/init.php | 16 +++++++++++++--- 4 files changed, 24 insertions(+), 7 deletions(-) create mode 100644 webdata/config.php.sample delete mode 100644 webdata/connection.php diff --git a/.gitignore b/.gitignore index e4d967c..d11b6b7 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,2 @@ -webdata/connection.php +webdata/config.php temp/ \ No newline at end of file diff --git a/webdata/config.php.sample b/webdata/config.php.sample new file mode 100644 index 0000000..e25d800 --- /dev/null +++ b/webdata/config.php.sample @@ -0,0 +1,10 @@ + \ No newline at end of file diff --git a/webdata/connection.php b/webdata/connection.php deleted file mode 100644 index c7901c6..0000000 --- a/webdata/connection.php +++ /dev/null @@ -1,3 +0,0 @@ - \ No newline at end of file diff --git a/webdata/init.php b/webdata/init.php index 904268e..acdce0d 100644 --- a/webdata/init.php +++ b/webdata/init.php @@ -4,12 +4,22 @@ ini_set('display_startup_errors', 1); error_reporting(E_ALL); +require_once 'config.php'; + +$projectRoot = $config["general"]["projectRoot"]; + function database(){ - require 'connection.php'; - + global $config; + + $db = new mysqli($config["db"]["host"], $config["db"]["user"], $config["db"]["pass"], $config["db"]["database"]); + if($db->connect_error){ - die("Connection failed: " . $blogdb->connect_error); + die("Connection failed: " . $db->connect_error); } return $db; } + +function checkLogin(){ + +} \ No newline at end of file