diff --git a/dbd/tbl/locale_string.php b/dbd/tbl/locale_string.php index de065b9..13425d8 100644 --- a/dbd/tbl/locale_string.php +++ b/dbd/tbl/locale_string.php @@ -16,6 +16,7 @@ class locale_string { const VALUE_CATEGORY_SYSTEM = 10; const VALUE_CATEGORY_SYSTEM_ERROR = 11; + const VALUE_CATEGORY_SYSTEM_SAI = 12; const VALUE_CATEGORY_SYSTEM_ENDCAT = 99; } \ No newline at end of file diff --git a/sai/modules/saimod_sys_calls/saimod_sys_calls.php b/sai/modules/saimod_sys_calls/saimod_sys_calls.php index b3e0bef..2171ba1 100644 --- a/sai/modules/saimod_sys_calls/saimod_sys_calls.php +++ b/sai/modules/saimod_sys_calls/saimod_sys_calls.php @@ -9,7 +9,7 @@ class saimod_sys_calls extends \SYSTEM\SAI\SaiModule { if(\SYSTEM\system::isSystemDbInfoPG()){ $res = $con->query('SELECT * FROM system.api ORDER BY "group", "ID" ASC;'); } else { - $res = $con->query('SELECT * FROM system_api ORDER BY group, ID ASC;'); + $res = $con->query('SELECT * FROM system_api ORDER BY `group`, `ID` ASC;'); } $result = ""; diff --git a/sai/modules/saimod_sys_login/saimod_sys_login.php b/sai/modules/saimod_sys_login/saimod_sys_login.php index 4ecba1f..2e504cd 100644 --- a/sai/modules/saimod_sys_login/saimod_sys_login.php +++ b/sai/modules/saimod_sys_login/saimod_sys_login.php @@ -12,7 +12,7 @@ class saimod_sys_login extends \SYSTEM\SAI\SaiModule { $vars['login_username_too_short'] = 'Username to short.'; $vars['login_password_too_short'] = 'Password to short.'; $vars['isadmin'] = \SYSTEM\SECURITY\Security::check(\SYSTEM\SECURITY\RIGHTS::SYS_SAI) ? "yes" : "no"; - $vars = array_merge($vars, \SYSTEM\locale::getStrings(\DBD\locale_string::VALUE_CATEGORY_DASENSE_USERSTATISTICS)); + $vars = array_merge($vars, \SYSTEM\locale::getStrings(\SYSTEM\DBD\locale_string::VALUE_CATEGORY_SYSTEM_SAI)); if(\SYSTEM\SECURITY\Security::isLoggedIn()){ return \SYSTEM\PAGE\replace::replaceFile(\SYSTEM\WEBPATH(new \SYSTEM\PSAI(),'modules/saimod_sys_login/logout.tpl'), $vars); @@ -38,7 +38,7 @@ class saimod_sys_login extends \SYSTEM\SAI\SaiModule { } public static function sai_mod__SYSTEM_SAI_saimod_sys_login_action_registerform(){ - $vars = \SYSTEM\locale::getStrings(\DBD\locale_string::VALUE_CATEGORY_DASENSE); + $vars = \SYSTEM\locale::getStrings(\SYSTEM\DBD\locale_string::VALUE_CATEGORY_SYSTEM_SAI); return \SYSTEM\PAGE\replace::replaceFile(\SYSTEM\WEBPATH(new \SYSTEM\PSAI(),'modules/saimod_sys_login/register.tpl'), $vars);} public static function html_li_menu(){return '
  • Login
  • ';}