From ccaf532b585b072f57d9c081f6e750a4ee8f2e6b Mon Sep 17 00:00:00 2001 From: rylon Date: Mon, 5 Jan 2015 16:04:50 +0100 Subject: [PATCH] updated system reference, required adjustments --- config.php | 3 ++- rhein/files/log/dummy | 0 rhein/sai/saistart_rhein_sai/saistart_rhein_sai.php | 4 ++-- system | 2 +- 4 files changed, 5 insertions(+), 4 deletions(-) create mode 100644 rhein/files/log/dummy diff --git a/config.php b/config.php index 6d638c4..200bbb0 100644 --- a/config.php +++ b/config.php @@ -15,4 +15,5 @@ $rhein_config = array( array(config_ids::SYS_CONFIG_ERRORREPORTING, array(config_ids::SYS_CONFIG_PATH_SYSTEMPATHREL, 'system/'), array(config_ids::SYS_CONFIG_LANGS, array('deDE')), array(config_ids::SYS_CONFIG_DEFAULT_LANG, 'deDE'), - array(config_ids::WEBCRAFT_BILLING_TOKEN, 'RHEINadasdbcahdscjhd213')); \ No newline at end of file + array(config_ids::WEBCRAFT_BILLING_TOKEN, 'RHEINadasdbcahdscjhd213'), + array(config_ids::SYS_CRON_LOG2SQLITE_PATH, '/home/web/webdir/rhein/rhein/files/log/')); \ No newline at end of file diff --git a/rhein/files/log/dummy b/rhein/files/log/dummy new file mode 100644 index 0000000..e69de29 diff --git a/rhein/sai/saistart_rhein_sai/saistart_rhein_sai.php b/rhein/sai/saistart_rhein_sai/saistart_rhein_sai.php index 6457076..868e0e3 100644 --- a/rhein/sai/saistart_rhein_sai/saistart_rhein_sai.php +++ b/rhein/sai/saistart_rhein_sai/saistart_rhein_sai.php @@ -9,7 +9,7 @@ class saistart_rhein_sai extends \SYSTEM\SAI\saistart_sys_sai { $vars = array_merge($vars, \SYSTEM\locale::getStrings(\SYSTEM\DBD\system_locale_string::VALUE_CATEGORY_BASIC), \SYSTEM\locale::getStrings(\SYSTEM\DBD\system_locale_string::VALUE_CATEGORY_SYSTEM_SAI), \SYSTEM\locale::getStrings(\SYSTEM\DBD\system_locale_string::VALUE_CATEGORY_SYSTEM_SAI_ERROR)); - return \SYSTEM\PAGE\replace::replaceFile( \SYSTEM\WEBPATH(new \SYSTEM\PSAI(),'modules/saistart_sys_sai/saistart.tpl'),$vars);} + return \SYSTEM\PAGE\replace::replaceFile( \SYSTEM\WEBPATH(new \SYSTEM\PSAI(),'modules/saistart_sys_sai/tpl/saistart.tpl'),$vars);} public static function html_li_menu(){return '
  • '.\SYSTEM\CONFIG\config::get(\SYSTEM\CONFIG\config_ids::SYS_SAI_CONFIG_TITLE).'
  • ';} public static function right_public(){return true;} public static function right_right(){return true;} @@ -25,5 +25,5 @@ class saistart_rhein_sai extends \SYSTEM\SAI\saistart_sys_sai { ));} protected static function html_login(){ - return \SYSTEM\SECURITY\Security::isLoggedIn() ? \SYSTEM\PAGE\replace::replaceFile(\SYSTEM\WEBPATH(new \SYSTEM\PSAI(),'modules/saistart_sys_sai/logout.tpl'), array()) : \SYSTEM\PAGE\replace::replaceFile(\SYSTEM\WEBPATH(new \SYSTEM\PSAI(),'modules/saistart_sys_sai/login.tpl'), array());} + return \SYSTEM\SECURITY\Security::isLoggedIn() ? \SYSTEM\PAGE\replace::replaceFile(\SYSTEM\SERVERPATH(new \SYSTEM\PSAI(),'modules/saistart_sys_sai/tpl/logout.tpl'), array()) : \SYSTEM\PAGE\replace::replaceFile(\SYSTEM\SERVERPATH(new \SYSTEM\PSAI(),'modules/saistart_sys_sai/tpl/login.tpl'), array());} } \ No newline at end of file diff --git a/system b/system index c2f2953..bde461b 160000 --- a/system +++ b/system @@ -1 +1 @@ -Subproject commit c2f295374bcd0bc149d608534032e786285af799 +Subproject commit bde461ba8c7fed6ab4786bc0429d8b17bc0efca2