From fe6790df08db2631ae9c3e6a3d23245c01b62924 Mon Sep 17 00:00:00 2001 From: rylon Date: Thu, 19 Dec 2013 23:56:04 +0100 Subject: [PATCH] config fixes, sai config mod fixes --- config/config_ids.php | 40 ++++++++++--------- log/result/JsonResult.php | 12 +++--- .../saimod_sys_config/saimod_sys_config.php | 14 ++++--- 3 files changed, 36 insertions(+), 30 deletions(-) diff --git a/config/config_ids.php b/config/config_ids.php index c403170..61848f5 100644 --- a/config/config_ids.php +++ b/config/config_ids.php @@ -4,26 +4,28 @@ namespace SYSTEM\CONFIG; class config_ids { - const SYS_CONFIG_ERRORREPORTING = 1; - const SYS_CONFIG_PATH_BASEURL = 2; - const SYS_CONFIG_PATH_BASEPATH = 3; - const SYS_CONFIG_PATH_SYSTEMPATHREL = 4; - const SYS_CONFIG_DEFAULT_RESULT = 5; + const SYS_CONFIG_ERRORREPORTING = 1; + const SYS_CONFIG_PATH_BASEURL = 2; + const SYS_CONFIG_PATH_BASEPATH = 3; + const SYS_CONFIG_PATH_SYSTEMPATHREL = 4; + const SYS_CONFIG_DEFAULT_RESULT = 5; + const SYS_CONFIG_DEFAULT_RESULT_JSON = 'json'; + const SYS_CONFIG_DEFAULT_RESULT_MSGPACK = 'msgpack'; - const SYS_CONFIG_DB_TYPE = 11; //mys = 1 pg = 2 - const SYS_CONFIG_DB_TYPE_MYS= 1; - const SYS_CONFIG_DB_TYPE_PG = 2; - const SYS_CONFIG_DB_HOST = 12; - const SYS_CONFIG_DB_PORT = 13; - const SYS_CONFIG_DB_USER = 14; - const SYS_CONFIG_DB_PASSWORD = 15; - const SYS_CONFIG_DB_DBNAME = 16; + const SYS_CONFIG_DB_TYPE = 11; + const SYS_CONFIG_DB_TYPE_MYS = 'mysql'; + const SYS_CONFIG_DB_TYPE_PG = 'postgresql'; + const SYS_CONFIG_DB_HOST = 12; + const SYS_CONFIG_DB_PORT = 13; + const SYS_CONFIG_DB_USER = 14; + const SYS_CONFIG_DB_PASSWORD = 15; + const SYS_CONFIG_DB_DBNAME = 16; - const SYS_CONFIG_LANGS = 21; - const SYS_CONFIG_DEFAULT_LANG = 22; + const SYS_CONFIG_LANGS = 21; + const SYS_CONFIG_DEFAULT_LANG = 22; - const SYS_SAI_CONFIG_BASEURL = 50; - const SYS_SAI_CONFIG_NAVIMG = 51; - const SYS_SAI_CONFIG_TITLE = 52; - const SYS_SAI_CONFIG_COPYRIGHT = 53; + const SYS_SAI_CONFIG_BASEURL = 50; + const SYS_SAI_CONFIG_NAVIMG = 51; + const SYS_SAI_CONFIG_TITLE = 52; + const SYS_SAI_CONFIG_COPYRIGHT = 53; } \ No newline at end of file diff --git a/log/result/JsonResult.php b/log/result/JsonResult.php index 22f3cac..f40aefe 100644 --- a/log/result/JsonResult.php +++ b/log/result/JsonResult.php @@ -17,16 +17,16 @@ class JsonResult extends \SYSTEM\LOG\AbstractResult { $json['status'] = $status; $json['result'] = $json_array; - if(\SYSTEM\CONFIG\config::get(\SYSTEM\CONFIG\config_ids::SYS_CONFIG_DEFAULT_RESULT) == 'json'){ + if(\SYSTEM\CONFIG\config::get(\SYSTEM\CONFIG\config_ids::SYS_CONFIG_DEFAULT_RESULT) == \SYSTEM\CONFIG\config_ids::SYS_CONFIG_DEFAULT_RESULT_MSGPACK){ + //send Header + \SYSTEM\HEADER::JSON(); + + return msgpack_pack($json); + } else { //send Header \SYSTEM\HEADER::JSON(); return json_encode($json); - } else { - //send Header - \SYSTEM\HEADER::JSON(); - - return msgpack_pack($json); } } diff --git a/sai/modules/saimod_sys_config/saimod_sys_config.php b/sai/modules/saimod_sys_config/saimod_sys_config.php index fef116e..d82aeeb 100644 --- a/sai/modules/saimod_sys_config/saimod_sys_config.php +++ b/sai/modules/saimod_sys_config/saimod_sys_config.php @@ -6,23 +6,27 @@ class saimod_sys_config extends \SYSTEM\SAI\SaiModule { $result = '

Sys Config

'. ''. ''.''.''.''.''; - + + $result .= ''.''.''.''; $result .= ''.''.''.''.''; $result .= ''.''.''.''.''; $result .= ''.''.''.''.''; $result .= ''.''.''.''.''; - $result .= ''.''.''.''.''; + $result .= ''.''.''.''.''; + $result .= ''.''.''.''.''; + $result .= ''.''.''.''.''; + $result .= ''.''.''.''; + $result .= ''.''.''.''.''; $result .= ''.''.''.''.''; $result .= ''.''.''.''.''; $result .= ''.''.''.''.''; $result .= ''.''.''.''.''; $result .= ''.''.''.''.''; + $result .= ''.''.''.''; $result .= ''.''.''.''.''; $result .= ''.''.''.''.''; $result .= ''.''.''.''.''; - $result .= ''.''.''.''.''; - $result .= ''.''.''.''.''; - $result .= ''.''.''.''.''; + $result .= ''.''.''.''.''; $result .= '
'.'Config ID'.''.'Config Name'.''.'Value'.'
Basics
'.\SYSTEM\CONFIG\config_ids::SYS_CONFIG_ERRORREPORTING. ''.'\SYSTEM\CONFIG\config_ids::SYS_CONFIG_ERRORREPORTING'. ''.\SYSTEM\CONFIG\config::get(\SYSTEM\CONFIG\config_ids::SYS_CONFIG_ERRORREPORTING). '
'.\SYSTEM\CONFIG\config_ids::SYS_CONFIG_PATH_BASEURL. ''.'\SYSTEM\CONFIG\config_ids::SYS_CONFIG_PATH_BASEURL'. ''.\SYSTEM\CONFIG\config::get(\SYSTEM\CONFIG\config_ids::SYS_CONFIG_PATH_BASEURL). '
'.\SYSTEM\CONFIG\config_ids::SYS_CONFIG_PATH_BASEPATH. ''.'\SYSTEM\CONFIG\config_ids::SYS_CONFIG_PATH_BASEPATH'. ''.\SYSTEM\CONFIG\config::get(\SYSTEM\CONFIG\config_ids::SYS_CONFIG_PATH_BASEPATH). '
'.\SYSTEM\CONFIG\config_ids::SYS_CONFIG_PATH_SYSTEMPATHREL. ''.'\SYSTEM\CONFIG\config_ids::SYS_CONFIG_PATH_SYSTEMPATHREL'. ''.\SYSTEM\CONFIG\config::get(\SYSTEM\CONFIG\config_ids::SYS_CONFIG_PATH_SYSTEMPATHREL). '
'.\SYSTEM\CONFIG\config_ids::SYS_CONFIG_DB_TYPE. ''.'\SYSTEM\CONFIG\config_ids::SYS_CONFIG_DB_TYPE'. ''.(\SYSTEM\CONFIG\config::get(\SYSTEM\CONFIG\config_ids::SYS_CONFIG_DB_TYPE) == 1 ? 'mysql' : 'postgres'). '
'.\SYSTEM\CONFIG\config_ids::SYS_CONFIG_DEFAULT_RESULT. ''.'\SYSTEM\CONFIG\config_ids::SYS_CONFIG_DEFAULT_RESULT'. ''.\SYSTEM\CONFIG\config::get(\SYSTEM\CONFIG\config_ids::SYS_CONFIG_DEFAULT_RESULT). '
'.\SYSTEM\CONFIG\config_ids::SYS_CONFIG_LANGS. ''.'\SYSTEM\CONFIG\config_ids::SYS_CONFIG_LANGS'. ''.implode(',',\SYSTEM\CONFIG\config::get(\SYSTEM\CONFIG\config_ids::SYS_CONFIG_LANGS)). '
'.\SYSTEM\CONFIG\config_ids::SYS_CONFIG_DEFAULT_LANG. ''.'\SYSTEM\CONFIG\config_ids::SYS_CONFIG_DEFAULT_LANG'. ''.\SYSTEM\CONFIG\config::get(\SYSTEM\CONFIG\config_ids::SYS_CONFIG_DEFAULT_LANG). '
Database
'.\SYSTEM\CONFIG\config_ids::SYS_CONFIG_DB_TYPE. ''.'\SYSTEM\CONFIG\config_ids::SYS_CONFIG_DB_TYPE'. ''.\SYSTEM\CONFIG\config::get(\SYSTEM\CONFIG\config_ids::SYS_CONFIG_DB_TYPE). '
'.\SYSTEM\CONFIG\config_ids::SYS_CONFIG_DB_HOST. ''.'\SYSTEM\CONFIG\config_ids::SYS_CONFIG_DB_HOST'. ''.\SYSTEM\CONFIG\config::get(\SYSTEM\CONFIG\config_ids::SYS_CONFIG_DB_HOST). '
'.\SYSTEM\CONFIG\config_ids::SYS_CONFIG_DB_PORT. ''.'\SYSTEM\CONFIG\config_ids::SYS_CONFIG_DB_PORT'. ''.\SYSTEM\CONFIG\config::get(\SYSTEM\CONFIG\config_ids::SYS_CONFIG_DB_PORT). '
'.\SYSTEM\CONFIG\config_ids::SYS_CONFIG_DB_USER. ''.'\SYSTEM\CONFIG\config_ids::SYS_CONFIG_DB_USER'. ''.\SYSTEM\CONFIG\config::get(\SYSTEM\CONFIG\config_ids::SYS_CONFIG_DB_USER). '
'.\SYSTEM\CONFIG\config_ids::SYS_CONFIG_DB_PASSWORD. ''.'\SYSTEM\CONFIG\config_ids::SYS_CONFIG_DB_PASSWORD'. ''.'<hidden>'. '
'.\SYSTEM\CONFIG\config_ids::SYS_CONFIG_DB_DBNAME. ''.'\SYSTEM\CONFIG\config_ids::SYS_CONFIG_DB_DBNAME'. ''.\SYSTEM\CONFIG\config::get(\SYSTEM\CONFIG\config_ids::SYS_CONFIG_DB_DBNAME). '
System Admin Interface
'.\SYSTEM\CONFIG\config_ids::SYS_SAI_CONFIG_BASEURL. ''.'\SYSTEM\CONFIG\config_ids::SYS_SAI_CONFIG_BASEURL'. ''.\SYSTEM\CONFIG\config::get(\SYSTEM\CONFIG\config_ids::SYS_SAI_CONFIG_BASEURL). '
'.\SYSTEM\CONFIG\config_ids::SYS_SAI_CONFIG_NAVIMG. ''.'\SYSTEM\CONFIG\config_ids::SYS_SAI_CONFIG_NAVIMG'. ''.\SYSTEM\CONFIG\config::get(\SYSTEM\CONFIG\config_ids::SYS_SAI_CONFIG_NAVIMG). '
'.\SYSTEM\CONFIG\config_ids::SYS_SAI_CONFIG_COPYRIGHT. ''.'\SYSTEM\CONFIG\config_ids::SYS_SAI_CONFIG_COPYRIGHT'. ''.\SYSTEM\CONFIG\config::get(\SYSTEM\CONFIG\config_ids::SYS_SAI_CONFIG_COPYRIGHT). '
'.\SYSTEM\CONFIG\config_ids::SYS_SAI_CONFIG_TITLE. ''.'\SYSTEM\CONFIG\config_ids::SYS_SAI_CONFIG_TITLE'. ''.\SYSTEM\CONFIG\config::get(\SYSTEM\CONFIG\config_ids::SYS_SAI_CONFIG_TITLE). '
'.\SYSTEM\CONFIG\config_ids::SYS_CONFIG_LANGS. ''.'\SYSTEM\CONFIG\config_ids::SYS_CONFIG_LANGS'. ''.implode(',',\SYSTEM\CONFIG\config::get(\SYSTEM\CONFIG\config_ids::SYS_CONFIG_LANGS)). '
'.\SYSTEM\CONFIG\config_ids::SYS_CONFIG_DEFAULT_LANG. ''.'\SYSTEM\CONFIG\config_ids::SYS_CONFIG_DEFAULT_LANG'. ''.\SYSTEM\CONFIG\config::get(\SYSTEM\CONFIG\config_ids::SYS_CONFIG_DEFAULT_LANG). '
'.\SYSTEM\CONFIG\config_ids::SYS_SAI_CONFIG_TITLE. ''.'\SYSTEM\CONFIG\config_ids::SYS_SAI_CONFIG_TITLE'. ''.\SYSTEM\CONFIG\config::get(\SYSTEM\CONFIG\config_ids::SYS_SAI_CONFIG_TITLE). '
';