diff --git a/log/exceptions/TranslatableError.php b/log/exceptions/TranslatableError.php index 5e24459..b2537bd 100644 --- a/log/exceptions/TranslatableError.php +++ b/log/exceptions/TranslatableError.php @@ -3,11 +3,11 @@ namespace SYSTEM\LOG; class TranslatableError extends \SYSTEM\LOG\ERROR { public function __construct($string_id, $code = 0, $previous = NULL , $locale = NULL){ - $message = \SYSTEM\locale::getStrings(array($string_id), $locale); + $message = \SYSTEM\PAGE\text::get($string_id, $locale); - if(!isset($message[$string_id])){ + if(!$message){ throw new \SYSTEM\LOG\ERROR("Could not retrive Errortranslation: ".$string_id);} - parent::__construct($message[$string_id], $code, $previous); + parent::__construct($message, $code, $previous); } } diff --git a/sai/modules/saimod_sys_login/saimod_sys_login.php b/sai/modules/saimod_sys_login/saimod_sys_login.php index 2029658..8adb2fe 100644 --- a/sai/modules/saimod_sys_login/saimod_sys_login.php +++ b/sai/modules/saimod_sys_login/saimod_sys_login.php @@ -36,7 +36,7 @@ class saimod_sys_login extends \SYSTEM\SAI\SaiModule { public static function sai_mod__SYSTEM_SAI_saimod_sys_login_action_registerform(){ $vars = \SYSTEM\PAGE\text::tag(\SYSTEM\SQL\system_text::TAG_SAI_LOGIN); - return \SYSTEM\PAGE\replace::replaceFile(\SYSTEM\WEBPATH(new \SYSTEM\PSAI(),'modules/saimod_sys_login/tpl/register.tpl'), $vars);} + return \SYSTEM\PAGE\replace::replaceFile((new \SYSTEM\PSAI('modules/saimod_sys_login/tpl/register.tpl'))->SERVERPATH(), $vars);} public static function html_li_menu(){return '
  • '.(\SYSTEM\SECURITY\Security::isLoggedIn() ? '' : '').'
  • ';} public static function right_public(){return true;} diff --git a/sai/modules/saimod_sys_security/js/saimod_sys_security.js b/sai/modules/saimod_sys_security/js/saimod_sys_security.js index 4f52573..a0ebbe1 100644 --- a/sai/modules/saimod_sys_security/js/saimod_sys_security.js +++ b/sai/modules/saimod_sys_security/js/saimod_sys_security.js @@ -28,7 +28,7 @@ function init_saimod_sys_security_user() { $.get( './sai.php?sai_mod=.SYSTEM.SAI.saimod_sys_security&action=deleterightuser&rightid='+$(this).attr('right_id')+ '&userid='+$(this).attr('user_id'),function(data){ if(data==1){ - alert('sucess'); + system.reload(); } else { alert('fail'); } @@ -38,7 +38,7 @@ function init_saimod_sys_security_user() { $.get( './sai.php?sai_mod=.SYSTEM.SAI.saimod_sys_security&action=addrightuser&rightid='+$('#adduserright_rightid').val()+ '&userid='+$(this).attr('user_id'),function(data){ if(data==1){ - alert('sucess'); + system.reload(); } else { alert('fail'); } diff --git a/sai/modules/saimod_sys_security/saimod_sys_security.php b/sai/modules/saimod_sys_security/saimod_sys_security.php index 3f6604c..1763ee6 100644 --- a/sai/modules/saimod_sys_security/saimod_sys_security.php +++ b/sai/modules/saimod_sys_security/saimod_sys_security.php @@ -80,7 +80,7 @@ class saimod_sys_security extends \SYSTEM\SAI\SaiModule { while($r = $res->next()){ $r['user_id'] = $userid; $r['remove_btn'] = \SYSTEM\SECURITY\Security::check(\SYSTEM\SECURITY\RIGHTS::SYS_SAI_SECURITY_RIGHTS_EDIT) ? - \SYSTEM\PAGE\replace::replaceFile((new \SYSTEM\PSAI('modules/saimod_sys_security/tpl/right_remove.tpl'))->SERVERPATH(),array('id' => $r['ID'])) : + \SYSTEM\PAGE\replace::replaceFile((new \SYSTEM\PSAI('modules/saimod_sys_security/tpl/right_remove.tpl'))->SERVERPATH(),array('id' => $r['ID'], 'userid' => $userid)) : \SYSTEM\PAGE\replace::replaceFile((new \SYSTEM\PSAI('modules/saimod_sys_security/tpl/missing_edit_right.tpl'))->SERVERPATH()); $vars['user_rights_table'] .= \SYSTEM\PAGE\replace::replaceFile((new \SYSTEM\PSAI('modules/saimod_sys_security/tpl/saimod_sys_security_user_right.tpl'))->SERVERPATH(), $r);} diff --git a/sai/modules/saimod_sys_security/tpl/right_remove.tpl b/sai/modules/saimod_sys_security/tpl/right_remove.tpl index d11cce0..8adbc27 100644 --- a/sai/modules/saimod_sys_security/tpl/right_remove.tpl +++ b/sai/modules/saimod_sys_security/tpl/right_remove.tpl @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/security/qq/SYS_SECURITY_AVAILABLE.php b/security/qq/SYS_SECURITY_AVAILABLE.php index 03cacaa..5539cb4 100644 --- a/security/qq/SYS_SECURITY_AVAILABLE.php +++ b/security/qq/SYS_SECURITY_AVAILABLE.php @@ -2,7 +2,7 @@ namespace SYSTEM\SQL; class SYS_SECURITY_AVAILABLE extends \SYSTEM\DB\QP { public static function get_class(){return \get_class();} - public static function pqsql(){return + public static function pgsql(){return 'SELECT COUNT(*) as count FROM '.\SYSTEM\SQL\system_user::NAME_PG. ' WHERE lower('.\SYSTEM\SQL\system_user::FIELD_USERNAME.') like lower($1);'; } diff --git a/security/qq/SYS_SECURITY_CREATE.php b/security/qq/SYS_SECURITY_CREATE.php index 93a35bd..a23811b 100644 --- a/security/qq/SYS_SECURITY_CREATE.php +++ b/security/qq/SYS_SECURITY_CREATE.php @@ -2,7 +2,7 @@ namespace SYSTEM\SQL; class SYS_SECURITY_CREATE extends \SYSTEM\DB\QP { public static function get_class(){return \get_class();} - public static function pqsql(){return + public static function pgsql(){return 'INSERT INTO '.\SYSTEM\SQL\system_user::NAME_PG. ' ('.\SYSTEM\SQL\system_user::FIELD_USERNAME.','.\SYSTEM\SQL\system_user::FIELD_PASSWORD_SHA.',' .\SYSTEM\SQL\system_user::FIELD_EMAIL.','.\SYSTEM\SQL\system_user::FIELD_LOCALE.','.\SYSTEM\SQL\system_user::FIELD_ACCOUNT_FLAG.')'. diff --git a/sql/qt/pgsql/data/system_sai_api.sql b/sql/qt/pgsql/data/system_sai_api.sql index 39fbbcb..c7fdbc4 100644 --- a/sql/qt/pgsql/data/system_sai_api.sql +++ b/sql/qt/pgsql/data/system_sai_api.sql @@ -138,7 +138,7 @@ INSERT INTO system.api ("ID", "group", "type", "parentID", "parentValue", "name" INSERT INTO system.api ("ID", "group", "type", "parentID", "parentValue", "name", "verify") VALUES (830, 42, 3, 800, 'tab', 'name', 'STRING'); --- INSERT INTO system.api ("ID", "group", "type", "parentID", "parentValue", "name", "verify") VALUES (900, 42, 0, 0, '_SYSTEM_SAI_saimod_sys_cache', 'action', NULL); +INSERT INTO system.api ("ID", "group", "type", "parentID", "parentValue", "name", "verify") VALUES (900, 42, 0, 0, '_SYSTEM_SAI_saimod_sys_cache', 'action', NULL); INSERT INTO system.api ("ID", "group", "type", "parentID", "parentValue", "name", "verify") VALUES (1000, 42, 0, 0, '_SYSTEM_SAI_saimod_sys_todo', 'action', NULL);