webcraftmedia/system
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

saimod security js fix, pgsql sql fixes, fixed translatable error

Browse Source
This commit is contained in:
Ulf Gebhardt 2016-02-11 14:45:49 +01:00
parent afc1b6e2da
commit f812dc3762
8 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
log/exceptions/TranslatableError.php
View File

@ -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);
}
}

2
sai/modules/saimod_sys_login/saimod_sys_login.php
View File

@ -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 '<li class="sai_divider_left"><a id="menu_login" data-toggle="tooltip" data-placement="bottom" title="${sai_menu_login}" href="#!login">'.(\SYSTEM\SECURITY\Security::isLoggedIn() ? '<span class="glyphicon glyphicon-log-out" aria-hidden="true"></span>' : '<span class="glyphicon glyphicon-log-in" aria-hidden="true"></span>').'</a></li>';}
public static function right_public(){return true;}

4
sai/modules/saimod_sys_security/js/saimod_sys_security.js
View File

@ -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');
}

2
sai/modules/saimod_sys_security/saimod_sys_security.php
View File

@ -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);}

2
sai/modules/saimod_sys_security/tpl/right_remove.tpl
View File

@ -1 +1 @@
<button type="submit" class="btn btn-sm btn-danger deleteuserright" right_id="${id}" user_id="'.$userid.'"><span class="glyphicon glyphicon-trash" aria-hidden="true"></span> ${basic_delete}</button>
<button type="submit" class="btn btn-sm btn-danger deleteuserright" right_id="${id}" user_id="${userid}"><span class="glyphicon glyphicon-trash" aria-hidden="true"></span> ${basic_delete}</button>

2
security/qq/SYS_SECURITY_AVAILABLE.php
View File

@ -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);';
}

2
security/qq/SYS_SECURITY_CREATE.php
View File

@ -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.')'.

2
sql/qt/pgsql/data/system_sai_api.sql
View File

@ -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);