From deacdb972ba8378f2df56f0a6ddb391ca0bf9b24 Mon Sep 17 00:00:00 2001
From: Robert Goldmann <deadlocker@gmx.de>
Date: Sat, 12 Jan 2019 10:53:38 +0100
Subject: [PATCH] settings now allows to choose between mysql and postgres

---
 php/admin/admin-edit-milestone.php          | 2 +-
 php/admin/admin-edit-roadmap.php            | 2 +-
 php/admin/admin-edit-subtask.php            | 2 +-
 php/admin/admin-edit-task.php               | 2 +-
 php/admin/admin-milestones.php              | 2 +-
 php/admin/admin-roadmaps.php                | 2 +-
 php/admin/admin-subtasks.php                | 2 +-
 php/admin/admin-tasks.php                   | 2 +-
 php/admin/helper/delete-milestone.php       | 2 +-
 php/admin/helper/delete-roadmap.php         | 2 +-
 php/admin/helper/delete-subtask.php         | 2 +-
 php/admin/helper/delete-task.php            | 2 +-
 php/admin/helper/edit-milestone.php         | 2 +-
 php/admin/helper/edit-roadmap.php           | 2 +-
 php/admin/helper/edit-subtask.php           | 2 +-
 php/admin/helper/edit-task.php              | 2 +-
 php/admin/helper/mark-all-tasks-as-done.php | 2 +-
 php/admin/helper/settings-template.php      | 5 ++++-
 php/admin/login.php                         | 2 +-
 php/api.php                                 | 2 +-
 php/database.php                            | 4 ++++
 php/index.php                               | 2 +-
 php/mysql.php                               | 2 +-
 php/overview.php                            | 2 +-
 php/{psql.php => pgsql.php}                 | 2 +-
 25 files changed, 31 insertions(+), 24 deletions(-)
 create mode 100644 php/database.php
 rename php/{psql.php => pgsql.php} (99%)

diff --git a/php/admin/admin-edit-milestone.php b/php/admin/admin-edit-milestone.php
index 2bbf2d4..b03446f 100644
--- a/php/admin/admin-edit-milestone.php
+++ b/php/admin/admin-edit-milestone.php
@@ -11,7 +11,7 @@ if(!isset($_SESSION['loggedIn']))
 }
 
 include_once('../getLanguageJSON.php');
-include_once('../mysql.php');
+include_once('../database.php');
 
 if(!isset($_GET['roadmapID']))
 {
diff --git a/php/admin/admin-edit-roadmap.php b/php/admin/admin-edit-roadmap.php
index 617948d..c372baf 100644
--- a/php/admin/admin-edit-roadmap.php
+++ b/php/admin/admin-edit-roadmap.php
@@ -11,7 +11,7 @@ if(!isset($_SESSION['loggedIn']))
 }
 
 include_once('../getLanguageJSON.php');
-include_once('../mysql.php');
+include_once('../database.php');
 
 if(!isset($_GET['edit']))
 {
diff --git a/php/admin/admin-edit-subtask.php b/php/admin/admin-edit-subtask.php
index b7c7310..8edd018 100644
--- a/php/admin/admin-edit-subtask.php
+++ b/php/admin/admin-edit-subtask.php
@@ -11,7 +11,7 @@ if(!isset($_SESSION['loggedIn']))
 }
 
 include_once('../getLanguageJSON.php');
-include_once('../mysql.php');
+include_once('../database.php');
 
 if(!isset($_GET['taskID']))
 {
diff --git a/php/admin/admin-edit-task.php b/php/admin/admin-edit-task.php
index 49939c2..d26ccce 100644
--- a/php/admin/admin-edit-task.php
+++ b/php/admin/admin-edit-task.php
@@ -11,7 +11,7 @@ if(!isset($_SESSION['loggedIn']))
 }
 
 include_once('../getLanguageJSON.php');
-include_once('../mysql.php');
+include_once('../database.php');
 
 if(!isset($_GET['milestoneID']))
 {
diff --git a/php/admin/admin-milestones.php b/php/admin/admin-milestones.php
index 3ab22fa..8e880c9 100644
--- a/php/admin/admin-milestones.php
+++ b/php/admin/admin-milestones.php
@@ -11,7 +11,7 @@ if(!isset($_SESSION['loggedIn']))
 }
 
 include_once('../getLanguageJSON.php');
-include_once('../mysql.php');
+include_once('../database.php');
 
 if(!isset($_GET['id']))
 {
diff --git a/php/admin/admin-roadmaps.php b/php/admin/admin-roadmaps.php
index db14b09..29671ba 100644
--- a/php/admin/admin-roadmaps.php
+++ b/php/admin/admin-roadmaps.php
@@ -11,7 +11,7 @@ if(!isset($_SESSION['loggedIn']))
 }
 
 include_once('../getLanguageJSON.php');
-include_once('../mysql.php');
+include_once('../database.php');
 
 $db = new DB();
 $db->createTables();
diff --git a/php/admin/admin-subtasks.php b/php/admin/admin-subtasks.php
index 59ea57f..6a413f6 100644
--- a/php/admin/admin-subtasks.php
+++ b/php/admin/admin-subtasks.php
@@ -11,7 +11,7 @@ if(!isset($_SESSION['loggedIn']))
 }
 
 include_once('../getLanguageJSON.php');
-include_once('../mysql.php');
+include_once('../database.php');
 
 if(!isset($_GET['id']))
 {
diff --git a/php/admin/admin-tasks.php b/php/admin/admin-tasks.php
index f069042..753a84b 100644
--- a/php/admin/admin-tasks.php
+++ b/php/admin/admin-tasks.php
@@ -11,7 +11,7 @@ if(!isset($_SESSION['loggedIn']))
 }
 
 include_once('../getLanguageJSON.php');
-include_once('../mysql.php');
+include_once('../database.php');
 
 if(!isset($_GET['id']))
 {
diff --git a/php/admin/helper/delete-milestone.php b/php/admin/helper/delete-milestone.php
index bb37078..3f13922 100644
--- a/php/admin/helper/delete-milestone.php
+++ b/php/admin/helper/delete-milestone.php
@@ -1,5 +1,5 @@
 <?php
-include_once('../../mysql.php');
+include_once('../../database.php');
 
 if($_SERVER['REQUEST_METHOD'] == 'POST')
 {
diff --git a/php/admin/helper/delete-roadmap.php b/php/admin/helper/delete-roadmap.php
index c90ae65..5458faa 100644
--- a/php/admin/helper/delete-roadmap.php
+++ b/php/admin/helper/delete-roadmap.php
@@ -1,5 +1,5 @@
 <?php
-include_once('../../mysql.php');
+include_once('../../database.php');
 
 if($_SERVER['REQUEST_METHOD'] == 'POST')
 {
diff --git a/php/admin/helper/delete-subtask.php b/php/admin/helper/delete-subtask.php
index fc66551..0e15489 100644
--- a/php/admin/helper/delete-subtask.php
+++ b/php/admin/helper/delete-subtask.php
@@ -1,5 +1,5 @@
 <?php
-include_once('../../mysql.php');
+include_once('../../database.php');
 
 if($_SERVER['REQUEST_METHOD'] == 'POST')
 {
diff --git a/php/admin/helper/delete-task.php b/php/admin/helper/delete-task.php
index 59013ec..181dbb9 100644
--- a/php/admin/helper/delete-task.php
+++ b/php/admin/helper/delete-task.php
@@ -1,5 +1,5 @@
 <?php
-include_once('../../mysql.php');
+include_once('../../database.php');
 
 if($_SERVER['REQUEST_METHOD'] == 'POST')
 {
diff --git a/php/admin/helper/edit-milestone.php b/php/admin/helper/edit-milestone.php
index 7729f8d..55eed60 100644
--- a/php/admin/helper/edit-milestone.php
+++ b/php/admin/helper/edit-milestone.php
@@ -1,5 +1,5 @@
 <?php
-include_once('../../mysql.php');
+include_once('../../database.php');
 
 if($_SERVER['REQUEST_METHOD'] == 'POST')
 {
diff --git a/php/admin/helper/edit-roadmap.php b/php/admin/helper/edit-roadmap.php
index 32b2a14..3c74d7a 100644
--- a/php/admin/helper/edit-roadmap.php
+++ b/php/admin/helper/edit-roadmap.php
@@ -1,5 +1,5 @@
 <?php
-include_once('../../mysql.php');
+include_once('../../database.php');
 
 if($_SERVER['REQUEST_METHOD'] == 'POST')
 {
diff --git a/php/admin/helper/edit-subtask.php b/php/admin/helper/edit-subtask.php
index 96d64f9..2be94bb 100644
--- a/php/admin/helper/edit-subtask.php
+++ b/php/admin/helper/edit-subtask.php
@@ -1,5 +1,5 @@
 <?php
-include_once('../../mysql.php');
+include_once('../../database.php');
 
 if($_SERVER['REQUEST_METHOD'] == 'POST')
 {
diff --git a/php/admin/helper/edit-task.php b/php/admin/helper/edit-task.php
index 0a4fc50..9e9922c 100644
--- a/php/admin/helper/edit-task.php
+++ b/php/admin/helper/edit-task.php
@@ -1,5 +1,5 @@
 <?php
-include_once('../../mysql.php');
+include_once('../../database.php');
 
 if($_SERVER['REQUEST_METHOD'] == 'POST')
 {
diff --git a/php/admin/helper/mark-all-tasks-as-done.php b/php/admin/helper/mark-all-tasks-as-done.php
index 35309a0..1a56e44 100644
--- a/php/admin/helper/mark-all-tasks-as-done.php
+++ b/php/admin/helper/mark-all-tasks-as-done.php
@@ -1,5 +1,5 @@
 <?php
-include_once('../../mysql.php');
+include_once('../../database.php');
 
 if($_SERVER['REQUEST_METHOD'] == 'POST')
 {
diff --git a/php/admin/helper/settings-template.php b/php/admin/helper/settings-template.php
index 5742e2f..1e8bfe8 100644
--- a/php/admin/helper/settings-template.php
+++ b/php/admin/helper/settings-template.php
@@ -1,6 +1,9 @@
 <?php
+// mysql or pgsql
+$database_type = "mysql";
 $database_name="";
 $database_user="";
 $database_password="";
 
-$admin_password="123";
\ No newline at end of file
+$admin_password="123";
+
diff --git a/php/admin/login.php b/php/admin/login.php
index 2a17393..f690b69 100644
--- a/php/admin/login.php
+++ b/php/admin/login.php
@@ -2,7 +2,7 @@
 
 <?php
 include_once('../getLanguageJSON.php');
-include_once('../mysql.php');
+include_once('../database.php');
 ?>
 <html xmlns="http://www.w3.org/1999/html">
 	<head>
diff --git a/php/api.php b/php/api.php
index 01e4bc4..861e9f9 100644
--- a/php/api.php
+++ b/php/api.php
@@ -1,5 +1,5 @@
 <?php
-include_once('mysql.php');
+include_once('database.php');
 
 $result = new stdClass();;
 if(!isset($_GET['id']))
diff --git a/php/database.php b/php/database.php
new file mode 100644
index 0000000..3f0b0ff
--- /dev/null
+++ b/php/database.php
@@ -0,0 +1,4 @@
+<?php
+include(dirname(__FILE__)."/admin/helper/settings.php");
+
+include(dirname(__FILE__)."/".$database_type.".php");
\ No newline at end of file
diff --git a/php/index.php b/php/index.php
index 0e5db36..7504b36 100644
--- a/php/index.php
+++ b/php/index.php
@@ -2,7 +2,7 @@
 
 <?php
 include_once('getLanguageJSON.php');
-include_once('mysql.php');
+include_once('database.php');
 
 if(!isset($_GET['id']))
 {
diff --git a/php/mysql.php b/php/mysql.php
index 3c653f5..adeb665 100644
--- a/php/mysql.php
+++ b/php/mysql.php
@@ -8,7 +8,7 @@ class DB
 	{
 		try
 		{
-            require_once('admin/helper/settings.php');
+            include(dirname(__FILE__)."/admin/helper/settings.php");
 			self::$db = new PDO(
 				"mysql:host=localhost;dbname=" . $database_name,
 				$database_user,
diff --git a/php/overview.php b/php/overview.php
index 8c6119f..616b240 100644
--- a/php/overview.php
+++ b/php/overview.php
@@ -2,7 +2,7 @@
 
 <?php
 include_once('getLanguageJSON.php');
-include_once('mysql.php');
+include_once('database.php');
 
 $db = new DB();
 $db->createTables();
diff --git a/php/psql.php b/php/pgsql.php
similarity index 99%
rename from php/psql.php
rename to php/pgsql.php
index 5b8d4f4..21c6773 100644
--- a/php/psql.php
+++ b/php/pgsql.php
@@ -8,7 +8,7 @@ class DB
     {
         try
         {
-            require_once('admin/helper/settings.php');
+            include(dirname(__FILE__)."/admin/helper/settings.php");
             self::$db = new PDO(
                 "pgsql:host=localhost;dbname=" . $database_name,
                 $database_user,
-- 
GitLab