From 2a4cf9d7e82e28b023d5a7396d44b2d9a0a5032d Mon Sep 17 00:00:00 2001
From: rylon <rylon@web.de>
Date: Mon, 18 May 2015 10:22:47 +0200
Subject: [PATCH] updated slingit

---
 api.php    |  8 ++++----
 config.php | 15 ---------------
 index.php  |  6 +++---
 sai.php    |  6 +++---
 4 files changed, 10 insertions(+), 25 deletions(-)
 delete mode 100644 config.php

diff --git a/api.php b/api.php
index b695053..8eeff2f 100644
--- a/api.php
+++ b/api.php
@@ -1,9 +1,9 @@
 <?php
-require_once 'lib/system/autoload.inc';                                      //SYSTEM Classes
-require_once 'slingit/autoload.inc';                                       //Project Classes
+require_once 'lib/system/autoload.inc';                                         //SYSTEM Classes
+require_once 'slingit/autoload.inc';                                            //Project Classes
+require_once '/home/web/web/config/get_config.php';
 
-require_once 'config.php';
-SYSTEM\system::start($slingit_config);
+\SYSTEM\system::start(\WEBCRAFT\get_config(dirname(__FILE__)));
 \SYSTEM\system::include_ExceptionShortcut();
 \SYSTEM\system::include_ResultShortcut();
 \SYSTEM\system::register_errorhandler_dbwriter();
diff --git a/config.php b/config.php
deleted file mode 100644
index 574c025..0000000
--- a/config.php
+++ /dev/null
@@ -1,15 +0,0 @@
-<?php
-$slingit_config=array(array(\SYSTEM\CONFIG\config_ids::SYS_CONFIG_ERRORREPORTING,               E_ALL | E_STRICT),
-                            array(\SYSTEM\CONFIG\config_ids::SYS_CONFIG_PATH_BASEURL,          'http://www.slingit.org/'),
-                            array(\SYSTEM\CONFIG\config_ids::SYS_CONFIG_PATH_BASEPATH,         '/home/web/webdir/slingit/'),
-                            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,               ''),
-                            array(\SYSTEM\CONFIG\config_ids::SYS_CONFIG_DB_USER,               'mojotrolls_mysql'),
-                            array(\SYSTEM\CONFIG\config_ids::SYS_CONFIG_DB_PASSWORD,           'dajsabeaisvd345'),
-                            array(\SYSTEM\CONFIG\config_ids::SYS_CONFIG_DB_DBNAME,             'host_slingit'),
-                            array(\SYSTEM\CONFIG\config_ids::SYS_SAI_CONFIG_PROJECT,           'slingit'),
-                            array(\SYSTEM\CONFIG\config_ids::SYS_CONFIG_PATH_SYSTEMPATHREL,    'lib/system/'),
-                            array(\SYSTEM\CONFIG\config_ids::SYS_CONFIG_LANGS,                 array('deDE','enUS', 'frFR', 'esES', 'trTR', 'jaJA')),
-                            array(\SYSTEM\CONFIG\config_ids::SYS_CONFIG_DEFAULT_LANG,          'enUS'),
-                            array(\SYSTEM\CONFIG\config_ids::SYS_CRON_LOG2SQLITE_PATH,         '/home/web/webdir/slingit/slingit/files/log/'));   
\ No newline at end of file
diff --git a/index.php b/index.php
index 4fbbdbd..8264fa2 100644
--- a/index.php
+++ b/index.php
@@ -1,9 +1,9 @@
 <?php
 require_once 'lib/system/autoload.inc';                                         //SYSTEM Classes
-require_once 'slingit/autoload.inc';                                           //Project Classes
+require_once 'slingit/autoload.inc';                                            //Project Classes
+require_once '/home/web/web/config/get_config.php';
 
-require_once 'config.php';
-\SYSTEM\system::start($slingit_config);
+\SYSTEM\system::start(\WEBCRAFT\get_config(dirname(__FILE__)));
 \SYSTEM\system::include_ExceptionShortcut();
 \SYSTEM\system::include_ResultShortcut();
 \SYSTEM\system::register_errorhandler_dbwriter();
diff --git a/sai.php b/sai.php
index 8ffebbe..5270a05 100644
--- a/sai.php
+++ b/sai.php
@@ -1,9 +1,9 @@
 <?php
 require_once 'lib/system/autoload.inc';                                         //SYSTEM Classes
-require_once 'slingit/autoload.inc';                                        //Project Classes
+require_once 'slingit/autoload.inc';                                            //Project Classes
+require_once '/home/web/web/config/get_config.php';
 
-require_once 'config.php';                                                      //Server config
-SYSTEM\system::start($slingit_config);                                          //Start System time + config
+\SYSTEM\system::start(\WEBCRAFT\get_config(dirname(__FILE__)));
 SYSTEM\system::include_ExceptionShortcut();                                     //allow ERROR() instead of \SYSTEM\LOG\ERROR()
 SYSTEM\system::include_ResultShortcut();                                        //allow JsonResult() instead of \SYSTEM\LOG\JsonResult()
 SYSTEM\system::register_errorhandler_dbwriter();                                //write errors to database (must be first errorhandler to register)