From b1f513026a224b2ab604f8ab216558864c473204 Mon Sep 17 00:00:00 2001
From: Ulf Gebhardt <ulf.gebhardt@webcraft-media.de>
Date: Tue, 20 Aug 2019 15:55:03 +0200
Subject: [PATCH] use a common index.inc to include stuff, updated
 config.php.dist (now takes the root path as parameter)

---
 api.php                        | 8 ++------
 config.dist => config.php.dist | 8 ++++----
 index.inc                      | 7 +++++++
 index.php                      | 8 ++------
 sai.php                        | 8 ++------
 setup.php                      | 6 +-----
 6 files changed, 18 insertions(+), 27 deletions(-)
 rename config.dist => config.php.dist (88%)
 create mode 100644 index.inc

diff --git a/api.php b/api.php
index e8ce4b4..916f546 100644
--- a/api.php
+++ b/api.php
@@ -1,9 +1,5 @@
 <?php
-require_once 'lib/autoload.inc';                                                //SYSTEM Classes
-require_once 'demo_basic/autoload.inc';                                         //Project Classes
-require_once '/home/web/web/config/get_config.php';
+require_once 'index.inc';
 
-\SYSTEM\system::start(\WEBCRAFT\get_config(dirname(__FILE__)));
-
-echo \SYSTEM\API\api::run('\SYSTEM\API\verify','api_demo_basic',array_merge($_POST,$_GET));
+echo \SYSTEM\API\api::run(\SYSTEM\API\verify::class,api_demo_basic::class,array_merge($_POST,$_GET));
 new \SYSTEM\LOG\COUNTER("API was called sucessfully.");
\ No newline at end of file
diff --git a/config.dist b/config.php.dist
similarity index 88%
rename from config.dist
rename to config.php.dist
index 50217b6..81ff7df 100644
--- a/config.dist
+++ b/config.php.dist
@@ -1,9 +1,9 @@
 <?php
 namespace WEBCRAFT;
-function basic_config(){
+function config($basepath){
     return array(   array(\SYSTEM\CONFIG\config_ids::SYS_CONFIG_ERRORREPORTING,        E_ALL | E_STRICT),
                     array(\SYSTEM\CONFIG\config_ids::SYS_CONFIG_PATH_BASEURL,          'http://www.url.to/project/'),
-                    array(\SYSTEM\CONFIG\config_ids::SYS_CONFIG_PATH_BASEPATH,         '/server/path/to/project/'),
+                    array(\SYSTEM\CONFIG\config_ids::SYS_CONFIG_PATH_BASEPATH,         $basepath.'/'),
                     array(\SYSTEM\CONFIG\config_ids::SYS_CONFIG_DB_TYPE,               \SYSTEM\CONFIG\config_ids::SYS_CONFIG_DB_TYPE_MYS),
                     array(\SYSTEM\CONFIG\config_ids::SYS_CONFIG_DB_HOST,               '127.0.0.1'),
                     array(\SYSTEM\CONFIG\config_ids::SYS_CONFIG_DB_PORT,               ''),
@@ -12,8 +12,8 @@ function basic_config(){
                     array(\SYSTEM\CONFIG\config_ids::SYS_CONFIG_DB_DBNAME,             'db_name'),
                     array(\SYSTEM\CONFIG\config_ids::SYS_SAI_CONFIG_PROJECT,           'demo_basic'),
                     array(\SYSTEM\CONFIG\config_ids::SYS_CONFIG_PATH_SYSTEMPATHREL,    'lib/system/'),
-					array(\SYSTEM\CONFIG\config_ids::SYS_CONFIG_PATH_CACHE,    	       '/server/path/to/demo_basic/files/cache/'),
+					array(\SYSTEM\CONFIG\config_ids::SYS_CONFIG_PATH_CACHE,    	       $basepath.'/cache/'),
                     array(\SYSTEM\CONFIG\config_ids::SYS_CONFIG_LANGS,                 array('deDE','enUS')),
                     array(\SYSTEM\CONFIG\config_ids::SYS_CONFIG_DEFAULT_LANG,          'deDE'),
-                    array(\SYSTEM\CONFIG\config_ids::SYS_CRON_LOG2SQLITE_PATH,         '/server/path/to/projectlogextraction/'));
+                    array(\SYSTEM\CONFIG\config_ids::SYS_CRON_LOG2SQLITE_PATH,         $basepath.'/log/'));
 }
\ No newline at end of file
diff --git a/index.inc b/index.inc
new file mode 100644
index 0000000..7f5f3ef
--- /dev/null
+++ b/index.inc
@@ -0,0 +1,7 @@
+<?php
+require_once 'lib/autoload.inc';                                                //SYSTEM Classes
+require_once 'demo_basic/autoload.inc';                                         //Project Classes
+require_once 'config.php';
+
+// Start SYSTEM
+\SYSTEM\system::start(\WEBCRAFT\config(dirname(__FILE__)));
\ No newline at end of file
diff --git a/index.php b/index.php
index da3b945..dec0df2 100644
--- a/index.php
+++ b/index.php
@@ -1,9 +1,5 @@
 <?php
-require_once 'lib/autoload.inc';                                                //SYSTEM Classes
-require_once 'demo_basic/autoload.inc';                                         //Project Classes
-require_once '/home/web/web/config/get_config.php';
+include 'index.inc';
 
-\SYSTEM\system::start(\WEBCRAFT\get_config(dirname(__FILE__)));
-
-echo \SYSTEM\API\api::run('\SYSTEM\API\verify', 'page_demo_basic', array_merge($_POST,$_GET), 1, false, true);
+echo \SYSTEM\API\api::run('\SYSTEM\API\verify', page_demo_basic::class, array_merge($_POST,$_GET), 1, false, true);
 new \SYSTEM\LOG\COUNTER("Page was called sucessfully.");
\ No newline at end of file
diff --git a/sai.php b/sai.php
index 5a089c2..3c323f7 100644
--- a/sai.php
+++ b/sai.php
@@ -1,8 +1,4 @@
 <?php
-require_once 'lib/autoload.inc';                                                //SYSTEM Classes
-require_once 'demo_basic/autoload.inc';                                         //Project Classes
-require_once '/home/web/web/config/get_config.php';
+include 'index.inc';
 
-\SYSTEM\system::start(\WEBCRAFT\get_config(dirname(__FILE__)));
-
-echo (new SYSTEM\SAI\saigui())->html();
\ No newline at end of file
+echo (new \SYSTEM\SAI\sai_gui())->html();
\ No newline at end of file
diff --git a/setup.php b/setup.php
index 61087c1..fcbbef3 100644
--- a/setup.php
+++ b/setup.php
@@ -1,8 +1,4 @@
 <?php
-require_once 'lib/autoload.inc';                                                //SYSTEM Classes
-require_once 'demo_basic/autoload.inc';                                         //Project Classes
-require_once '/home/web/web/config/get_config.php';
-
-\SYSTEM\system::start(\WEBCRAFT\get_config(dirname(__FILE__)));
+include 'index.inc';
 
 echo \SYSTEM\SQL\setup::install();
\ No newline at end of file