diff --git a/dbd/sql/mysql/data/sai_api.sql b/dbd/sql/mysql/data/sai_api.sql index e6c3f60..ef79236 100644 --- a/dbd/sql/mysql/data/sai_api.sql +++ b/dbd/sql/mysql/data/sai_api.sql @@ -78,6 +78,8 @@ INSERT INTO `system_api` (`ID`, `group`, `type`, `parentID`, `parentValue`, `nam INSERT INTO `system_api` (`ID`, `group`, `type`, `parentID`, `parentValue`, `name`, `verify`) VALUES (605, 42, 2, 600, 'addcall', 'parentValue', 'STRING'); INSERT INTO `system_api` (`ID`, `group`, `type`, `parentID`, `parentValue`, `name`, `verify`) VALUES (606, 42, 2, 600, 'addcall', 'name', 'STRING'); INSERT INTO `system_api` (`ID`, `group`, `type`, `parentID`, `parentValue`, `name`, `verify`) VALUES (607, 42, 2, 600, 'addcall', 'verify', 'ALL'); +INSERT INTO `system_api` (`ID`, `group`, `type`, `parentID`, `parentValue`, `name`, `verify`) VALUES (608, 42, 2, 600, 'deletecall', 'ID', 'INT'); +INSERT INTO `system_api` (`ID`, `group`, `type`, `parentID`, `parentValue`, `name`, `verify`) VALUES (609, 42, 2, 600, 'deletedialog', 'ID', 'INT'); INSERT INTO `system_api` (`ID`, `group`, `type`, `parentID`, `parentValue`, `name`, `verify`) VALUES (700, 42, 0, 0, '_SYSTEM_SAI_saimod_sys_locale', 'action', NULL); diff --git a/sai/modules/saimod_sys_locale/saimod_sys_locale.php b/sai/modules/saimod_sys_locale/saimod_sys_locale.php index 9121626..ac52139 100644 --- a/sai/modules/saimod_sys_locale/saimod_sys_locale.php +++ b/sai/modules/saimod_sys_locale/saimod_sys_locale.php @@ -34,7 +34,7 @@ class saimod_sys_locale extends \SYSTEM\SAI\SaiModule { public static function sai_mod__SYSTEM_SAI_saimod_sys_locale_action_load($lang, $group){ $con = new \SYSTEM\DB\Connection(); - $query = 'SELECT id, "'.$lang.'" FROM '.(\SYSTEM\system::isSystemDbInfoPG() ? \SYSTEM\DBD\system_locale_string::NAME_PG : \SYSTEM\DBD\system_locale_string::NAME_MYS).' WHERE category='.$group.' ORDER BY category ASC;'; + $query = 'SELECT id, '.$lang.' FROM '.\SYSTEM\DBD\system_locale_string::NAME_MYS.' WHERE category='.$group.' ORDER BY category ASC;'; $res = $con->query($query); $entries = ''; $temparr = array(); @@ -49,7 +49,7 @@ class saimod_sys_locale extends \SYSTEM\SAI\SaiModule { public static function sai_mod__SYSTEM_SAI_saimod_sys_locale_action_singleload($id, $lang){ $con = new \SYSTEM\DB\Connection(); $result = ""; - $query = 'SELECT "'.$lang.'" FROM '.(\SYSTEM\system::isSystemDbInfoPG() ? \SYSTEM\DBD\system_locale_string::NAME_PG : \SYSTEM\DBD\system_locale_string::NAME_MYS).' WHERE id=\''.$id.'\' ORDER BY category ASC;'; + $query = 'SELECT '.$lang.' FROM `'.\SYSTEM\DBD\system_locale_string::NAME_MYS.'` WHERE id=\''.$id.'\' ORDER BY category ASC;'; new \SYSTEM\LOG\WARNING($query); $res = $con->query($query); $entries = ''; @@ -65,9 +65,9 @@ class saimod_sys_locale extends \SYSTEM\SAI\SaiModule { $con = new \SYSTEM\DB\Connection(\SYSTEM\system::getSystemDBInfo()); $res = null; if(\SYSTEM\system::isSystemDbInfoPG()){ - $res = $con->prepare('newText' ,'UPDATE '.(\SYSTEM\system::isSystemDbInfoPG() ? \SYSTEM\DBD\system_locale_string::NAME_PG : \SYSTEM\DBD\system_locale_string::NAME_MYS).' SET "'.$lang.'"=$1 WHERE category = $1 AND id=$2;', array($newtext, $category, $id)); + $res = $con->prepare('newText' ,'UPDATE '.\SYSTEM\DBD\system_locale_string::NAME_PG.' SET "'.$lang.'"=$1 WHERE category = $1 AND id=$2;', array($newtext, $category, $id)); } else { - $res = $con->prepare('newText' ,'UPDATE '.(\SYSTEM\system::isSystemDbInfoPG() ? \SYSTEM\DBD\system_locale_string::NAME_PG : \SYSTEM\DBD\system_locale_string::NAME_MYS).' SET '.$lang.'=? WHERE category = ? AND id=?;', array($newtext, $category, $id)); + $res = $con->prepare('newText' ,'UPDATE '.\SYSTEM\DBD\system_locale_string::NAME_MYS.' SET '.$lang.'=? WHERE category = ? AND id=?;', array($newtext, $category, $id)); } return $res->affectedRows() == 0 ? \SYSTEM\LOG\JsonResult::error(new \SYSTEM\LOG\WARNING("no rows affected")) : \SYSTEM\LOG\JsonResult::ok(); } diff --git a/sai/modules/saistart_sys_sai/login.tpl b/sai/modules/saistart_sys_sai/login.tpl index b022299..7682d4c 100644 --- a/sai/modules/saistart_sys_sai/login.tpl +++ b/sai/modules/saistart_sys_sai/login.tpl @@ -9,7 +9,7 @@ ${basic_text_login} size="30" style="margin-bottom: 15px;" id="bt_login_user" - placeholder="${sai_placeholder_username}" + placeholder="${basic_placeholder_username}" minlength="3" data-validation-minlength-message="${sai_error_username_short}" maxlength="16" data-validation-maxlength-message="${sai_error_username_long}" required data-validation-required-message="${sai_error_username_miss}"/> @@ -19,7 +19,7 @@ ${basic_text_login} size="30" style="margin-bottom: 15px;" id="bt_login_password" - placeholder="${sai_placeholder_password}" + placeholder="${basic_placeholder_password}" minlength="5" data-validation-minlength-message="${sai_error_password_short}" maxlength="16" data-validation-maxlength-message="${sai_error_password_long}" required data-validation-required-message="${sai_error_password_miss}"/>