From aee5b23e39c11cb7dc650302fe382414012a8782 Mon Sep 17 00:00:00 2001 From: Ulf Gebhardt Date: Mon, 24 Jul 2017 03:56:13 +0200 Subject: [PATCH] #322 search in log url, fixed sai file name, replaced picpath variable, state urlencode for variables --- files/autoload.inc | 2 +- .../img => files/sai}/ajax-loader.gif | Bin files/{saistart_sys_sai => sai}/flag_deDE.png | Bin files/{saistart_sys_sai => sai}/flag_enUS.png | Bin files/{saistart_sys_sai => sai}/flag_esES.png | Bin files/{saistart_sys_sai => sai}/flag_frFR.png | Bin files/{saistart_sys_sai => sai}/flag_huHU.png | Bin files/{saistart_sys_sai => sai}/flag_jaJA.png | Bin files/{saistart_sys_sai => sai}/flag_trTR.png | Bin files/{saistart_sys_sai => sai}/logo.png | Bin files/{saistart_sys_sai => sai}/logo_large.png | Bin files/{saistart_sys_sai => sai}/logo_sai.png | Bin .../sai_loggedout_gallery_1.png | Bin page/State.php | 2 +- .../saimod_sys_files/js/saimod_sys_files.js | 4 ++-- sai/modules/saimod_sys_files/saimod_sys_files.php | 4 ++-- .../tpl/saimod_sys_files_list_entry.tpl | 2 +- sai/modules/saimod_sys_log/js/saimod_sys_log.js | 2 +- .../saimod_sys_log/qq/SYS_SAIMOD_LOG_FILTER.php | 10 ++++++++-- .../qq/SYS_SAIMOD_LOG_FILTER_COUNT.php | 10 ++++++++-- sai/modules/saimod_sys_log/saimod_sys_log.php | 13 ++++++------- sai/modules/saimod_sys_log/tpl/saimod_sys_log.tpl | 2 +- .../tpl/saimod_sys_log_error_filter.tpl | 2 +- .../saimod_sys_log/tpl/saimod_sys_log_filter.tpl | 6 +++--- .../saimod_sys_security/saimod_sys_security.php | 1 - .../tpl/saimod_sys_security.tpl | 2 +- sai/modules/saimod_sys_todo/saimod_sys_todo.php | 1 - .../saimod_sys_todo/tpl/saimod_sys_todo.tpl | 2 +- sai/page/tpl/language.tpl | 2 +- sai/page/tpl/sai.tpl | 2 +- 30 files changed, 39 insertions(+), 30 deletions(-) rename {sai/modules/saimod_sys_log/img => files/sai}/ajax-loader.gif (100%) rename files/{saistart_sys_sai => sai}/flag_deDE.png (100%) rename files/{saistart_sys_sai => sai}/flag_enUS.png (100%) rename files/{saistart_sys_sai => sai}/flag_esES.png (100%) rename files/{saistart_sys_sai => sai}/flag_frFR.png (100%) rename files/{saistart_sys_sai => sai}/flag_huHU.png (100%) rename files/{saistart_sys_sai => sai}/flag_jaJA.png (100%) rename files/{saistart_sys_sai => sai}/flag_trTR.png (100%) rename files/{saistart_sys_sai => sai}/logo.png (100%) rename files/{saistart_sys_sai => sai}/logo_large.png (100%) rename files/{saistart_sys_sai => sai}/logo_sai.png (100%) rename files/{saistart_sys_sai => sai}/sai_loggedout_gallery_1.png (100%) diff --git a/files/autoload.inc b/files/autoload.inc index 46ced83..50b312a 100644 --- a/files/autoload.inc +++ b/files/autoload.inc @@ -1,3 +1,3 @@ next()){ diff --git a/sai/modules/saimod_sys_files/js/saimod_sys_files.js b/sai/modules/saimod_sys_files/js/saimod_sys_files.js index 4e20109..c9d8638 100644 --- a/sai/modules/saimod_sys_files/js/saimod_sys_files.js +++ b/sai/modules/saimod_sys_files/js/saimod_sys_files.js @@ -77,9 +77,9 @@ function files_menu(){ if($('#menu_folder_'+system.cur_state().split('.')[1]).length){ $('#menu_folder_'+system.cur_state().split('.')[1]).parent().addClass('active'); } else { - $('#menu_folder_saistart_sys_sai').parent().addClass('active');} + $('#menu_folder_sai').parent().addClass('active');} } function saimod_sys_files_tooltip(elementId, pictureId, pictureCategory) { - $( "#elementId" ).tooltip({ content: '' }); + $( "#"+elementId ).tooltip({ content: '' }); } \ No newline at end of file diff --git a/sai/modules/saimod_sys_files/saimod_sys_files.php b/sai/modules/saimod_sys_files/saimod_sys_files.php index ba80ae5..84d82ce 100644 --- a/sai/modules/saimod_sys_files/saimod_sys_files.php +++ b/sai/modules/saimod_sys_files/saimod_sys_files.php @@ -78,12 +78,12 @@ class saimod_sys_files extends \SYSTEM\SAI\SaiModule { * @param string $name Name of the Files Directory * @return string Returns HTML */ - public static function sai_mod__SYSTEM_SAI_saimod_sys_files_action_tab($name = 'saistart_sys_sai'){ + public static function sai_mod__SYSTEM_SAI_saimod_sys_files_action_tab($name = 'sai'){ $result = ''; $cat = \SYSTEM\FILES\files::get($name); $i = 0; foreach($cat as $file){ - $result .= \SYSTEM\PAGE\replace::replaceFile((new \SYSTEM\PSAI('modules/saimod_sys_files/tpl/saimod_sys_files_list_entry.tpl'))->SERVERPATH(), array('i' => $i++, 'cat' => $name, 'name' => $file, 'extension' => substr($file,-3,3), 'url' => 'api.php?call=files&cat='.$name.'&id='.$file));} + $result .= \SYSTEM\PAGE\replace::replaceFile((new \SYSTEM\PSAI('modules/saimod_sys_files/tpl/saimod_sys_files_list_entry.tpl'))->SERVERPATH(), array('i' => $i++, 'cat' => $name, 'name' => $file, 'extension' => substr($file,-3,3), 'url' => './files/'.$name.'/'.$file));} $vars['cat'] = $name; $vars['content'] = $result; $vars = array_merge($vars, \SYSTEM\PAGE\text::tag(\SYSTEM\SQL\system_text::TAG_SAI_FILES)); diff --git a/sai/modules/saimod_sys_files/tpl/saimod_sys_files_list_entry.tpl b/sai/modules/saimod_sys_files/tpl/saimod_sys_files_list_entry.tpl index 58adbb2..25f5618 100644 --- a/sai/modules/saimod_sys_files/tpl/saimod_sys_files_list_entry.tpl +++ b/sai/modules/saimod_sys_files/tpl/saimod_sys_files_list_entry.tpl @@ -2,7 +2,7 @@ ${name} ${extension} - ${url} + ${url} diff --git a/sai/modules/saimod_sys_log/js/saimod_sys_log.js b/sai/modules/saimod_sys_log/js/saimod_sys_log.js index 2c47256..70742d2 100644 --- a/sai/modules/saimod_sys_log/js/saimod_sys_log.js +++ b/sai/modules/saimod_sys_log/js/saimod_sys_log.js @@ -10,7 +10,7 @@ function init_saimod_sys_log() { function register_search(){ $('#btn_search_log').click(function(){ - system.load($(this).attr('state')+$('#input_search_log').val(),true); + system.load($(this).attr('state')+encodeURIComponent($('#input_search_log').val()),true); }); } diff --git a/sai/modules/saimod_sys_log/qq/SYS_SAIMOD_LOG_FILTER.php b/sai/modules/saimod_sys_log/qq/SYS_SAIMOD_LOG_FILTER.php index f0980f0..a578b6d 100644 --- a/sai/modules/saimod_sys_log/qq/SYS_SAIMOD_LOG_FILTER.php +++ b/sai/modules/saimod_sys_log/qq/SYS_SAIMOD_LOG_FILTER.php @@ -33,7 +33,10 @@ class SYS_SAIMOD_LOG_FILTER extends \SYSTEM\DB\QP { ' ON '.\SYSTEM\SQL\system_log::NAME_PG.'.'.\SYSTEM\SQL\system_log::FIELD_USER. ' = '.\SYSTEM\SQL\system_user::NAME_PG.'.'.\SYSTEM\SQL\system_user::FIELD_ID. ' WHERE '.\SYSTEM\SQL\system_log::FIELD_CLASS.' LIKE $1'. -' AND ('.\SYSTEM\SQL\system_log::FIELD_MESSAGE.' LIKE $2 OR '.\SYSTEM\SQL\system_log::FIELD_FILE.' LIKE $3 OR '.\SYSTEM\SQL\system_log::FIELD_IP.' LIKE $4)'. +' AND ('.\SYSTEM\SQL\system_log::FIELD_MESSAGE.' LIKE $2'. +' OR '.\SYSTEM\SQL\system_log::FIELD_FILE.' LIKE $3'. +' OR '.\SYSTEM\SQL\system_log::FIELD_IP.' LIKE $4'. +' OR '.\SYSTEM\SQL\system_log::FIELD_REQUEST_URI.' LIKE $5'.')'. ' ORDER BY '.\SYSTEM\SQL\system_log::FIELD_TIME.' DESC, '.\SYSTEM\SQL\system_log::NAME_PG.'."'.\SYSTEM\SQL\system_log::FIELD_ID.'" DESC;'; } @@ -48,7 +51,10 @@ class SYS_SAIMOD_LOG_FILTER extends \SYSTEM\DB\QP { ' ON '.\SYSTEM\SQL\system_log::NAME_MYS.'.'.\SYSTEM\SQL\system_log::FIELD_USER. ' = '.\SYSTEM\SQL\system_user::NAME_MYS.'.'.\SYSTEM\SQL\system_user::FIELD_ID. ' WHERE '.\SYSTEM\SQL\system_log::FIELD_CLASS.' LIKE ?'. -' AND ('.\SYSTEM\SQL\system_log::FIELD_MESSAGE.' LIKE ? OR '.\SYSTEM\SQL\system_log::FIELD_FILE.' LIKE ? OR '.\SYSTEM\SQL\system_log::FIELD_IP.' LIKE ?)'. +' AND ('.\SYSTEM\SQL\system_log::FIELD_MESSAGE.' LIKE ?'. +' OR '.\SYSTEM\SQL\system_log::FIELD_FILE.' LIKE ?'. +' OR '.\SYSTEM\SQL\system_log::FIELD_IP.' LIKE ?'. +' OR '.\SYSTEM\SQL\system_log::FIELD_REQUEST_URI.' LIKE ?'.')'. ' ORDER BY '.\SYSTEM\SQL\system_log::FIELD_TIME.' DESC, '.\SYSTEM\SQL\system_log::NAME_MYS.'.'.\SYSTEM\SQL\system_log::FIELD_ID.' DESC;'; } } \ No newline at end of file diff --git a/sai/modules/saimod_sys_log/qq/SYS_SAIMOD_LOG_FILTER_COUNT.php b/sai/modules/saimod_sys_log/qq/SYS_SAIMOD_LOG_FILTER_COUNT.php index 6e8d333..5290a32 100644 --- a/sai/modules/saimod_sys_log/qq/SYS_SAIMOD_LOG_FILTER_COUNT.php +++ b/sai/modules/saimod_sys_log/qq/SYS_SAIMOD_LOG_FILTER_COUNT.php @@ -31,7 +31,10 @@ class SYS_SAIMOD_LOG_FILTER_COUNT extends \SYSTEM\DB\QP { 'SELECT COUNT(*) as count'. ' FROM '.\SYSTEM\SQL\system_log::NAME_PG. ' WHERE '.\SYSTEM\SQL\system_log::FIELD_CLASS.' LIKE $1'. -' AND ('.\SYSTEM\SQL\system_log::FIELD_MESSAGE.' LIKE $2 OR '.\SYSTEM\SQL\system_log::FIELD_FILE.' LIKE $3 OR '.\SYSTEM\SQL\system_log::FIELD_IP.' LIKE $4);'; +' AND ('.\SYSTEM\SQL\system_log::FIELD_MESSAGE.' LIKE $2'. +' OR '.\SYSTEM\SQL\system_log::FIELD_FILE.' LIKE $3'. +' OR '.\SYSTEM\SQL\system_log::FIELD_IP.' LIKE $4'. +' OR '.\SYSTEM\SQL\system_log::FIELD_REQUEST_URI.' LIKE $5'.');'; } /** @@ -43,6 +46,9 @@ class SYS_SAIMOD_LOG_FILTER_COUNT extends \SYSTEM\DB\QP { 'SELECT COUNT(*) as count'. ' FROM '.\SYSTEM\SQL\system_log::NAME_MYS. ' WHERE '.\SYSTEM\SQL\system_log::FIELD_CLASS.' LIKE ?'. -' AND ('.\SYSTEM\SQL\system_log::FIELD_MESSAGE.' LIKE ? OR '.\SYSTEM\SQL\system_log::FIELD_FILE.' LIKE ? OR '.\SYSTEM\SQL\system_log::FIELD_IP.' LIKE ?);'; +' AND ('.\SYSTEM\SQL\system_log::FIELD_MESSAGE.' LIKE ?'. +' OR '.\SYSTEM\SQL\system_log::FIELD_FILE.' LIKE ?'. +' OR '.\SYSTEM\SQL\system_log::FIELD_IP.' LIKE ?'. +' OR '.\SYSTEM\SQL\system_log::FIELD_REQUEST_URI.' LIKE ?'.');'; } } \ No newline at end of file diff --git a/sai/modules/saimod_sys_log/saimod_sys_log.php b/sai/modules/saimod_sys_log/saimod_sys_log.php index 239db84..70cc954 100644 --- a/sai/modules/saimod_sys_log/saimod_sys_log.php +++ b/sai/modules/saimod_sys_log/saimod_sys_log.php @@ -407,13 +407,13 @@ class saimod_sys_log extends \SYSTEM\SAI\SaiModule { * @return string Returns HTML */ public static function sai_mod__SYSTEM_SAI_saimod_sys_log_action_filter($filter = "%",$search="%",$page=0){ - $filter = str_replace('\\', '\\\\', $filter); - $count = \SYSTEM\SQL\SYS_SAIMOD_LOG_FILTER_COUNT::Q1(array($filter,$search,$search,$search))['count']; + $count = \SYSTEM\SQL\SYS_SAIMOD_LOG_FILTER_COUNT::Q1(array(str_replace('\\', '\\\\', $filter),$search,$search,$search,$search))['count']; $vars = array(); $vars['filter'] = $filter; $vars['search'] = $search; + $vars['search_encoded'] = \urlencode($search); $vars['page'] = $page; - $res = \SYSTEM\SQL\SYS_SAIMOD_LOG_FILTER::QQ(array($filter,$search,$search,$search)); + $res = \SYSTEM\SQL\SYS_SAIMOD_LOG_FILTER::QQ(array(str_replace('\\', '\\\\', $filter),$search,$search,$search,$search)); $vars['table'] = ''; $count_filtered = 0; $res->seek(100*$page); @@ -426,16 +426,16 @@ class saimod_sys_log extends \SYSTEM\SAI\SaiModule { $count_filtered++; } $vars['pagination'] = ''; - $vars['page_last'] = ceil($count/100)-1; + $vars['page_last'] = floor($count/100); for($i=0;$i < ceil($count/100);$i++){ - $data = array('page' => $i,'search' => $search, 'filter' => $filter, 'active' => ($i == $page) ? 'active' : ''); + $data = array('page' => $i,'search' => $vars['search_encoded'], 'filter' => $filter, 'active' => ($i == $page) ? 'active' : ''); $vars['pagination'] .= \SYSTEM\PAGE\replace::replaceFile((new \SYSTEM\PSAI('modules/saimod_sys_log/tpl/saimod_sys_log_pagination.tpl'))->SERVERPATH(), $data); } $vars['count'] = $count_filtered.'/'.$count; $vars['error_filter'] = ''; $res = \SYSTEM\SQL\SYS_SAIMOD_LOG_FILTERS::QQ(); while($row = $res->next()){ - $data = array('active' => ($filter == $row['class'] ? 'active' : ''), 'filter' => $row['class'], 'search' => $search); + $data = array('active' => ($filter == $row['class'] ? 'active' : ''), 'filter' => $row['class'], 'search_encoded' => $vars['search_encoded']); $vars['error_filter'] .= \SYSTEM\PAGE\replace::replaceFile((new \SYSTEM\PSAI('modules/saimod_sys_log/tpl/saimod_sys_log_error_filter.tpl'))->SERVERPATH(),$data);} $vars['active'] = ($filter == '%' ? 'active' : ''); $vars = array_merge($vars, \SYSTEM\PAGE\text::tag(\SYSTEM\SQL\system_text::TAG_SAI_LOG)); @@ -449,7 +449,6 @@ class saimod_sys_log extends \SYSTEM\SAI\SaiModule { */ public static function sai_mod__SYSTEM_SAI_saimod_sys_log(){ $vars = \SYSTEM\PAGE\text::tag(\SYSTEM\SQL\system_text::TAG_SAI_LOG); - $vars['PICPATH'] = (new \SYSTEM\PSAI('modules/saimod_sys_log/img/'))->WEBPATH(false); return \SYSTEM\PAGE\replace::replaceFile((new \SYSTEM\PSAI('modules/saimod_sys_log/tpl/saimod_sys_log.tpl'))->SERVERPATH(), $vars); } diff --git a/sai/modules/saimod_sys_log/tpl/saimod_sys_log.tpl b/sai/modules/saimod_sys_log/tpl/saimod_sys_log.tpl index 69f08f4..7ee3059 100644 --- a/sai/modules/saimod_sys_log/tpl/saimod_sys_log.tpl +++ b/sai/modules/saimod_sys_log/tpl/saimod_sys_log.tpl @@ -4,7 +4,7 @@
diff --git a/sai/modules/saimod_sys_log/tpl/saimod_sys_log_error_filter.tpl b/sai/modules/saimod_sys_log/tpl/saimod_sys_log_error_filter.tpl index e0322b9..1a0056d 100644 --- a/sai/modules/saimod_sys_log/tpl/saimod_sys_log_error_filter.tpl +++ b/sai/modules/saimod_sys_log/tpl/saimod_sys_log_error_filter.tpl @@ -1 +1 @@ -
  • ${filter}
    • \ No newline at end of file +
  • ${filter}
    • \ No newline at end of file diff --git a/sai/modules/saimod_sys_log/tpl/saimod_sys_log_filter.tpl b/sai/modules/saimod_sys_log/tpl/saimod_sys_log_filter.tpl index 3b28257..da48f5a 100644 --- a/sai/modules/saimod_sys_log/tpl/saimod_sys_log_filter.tpl +++ b/sai/modules/saimod_sys_log/tpl/saimod_sys_log_filter.tpl @@ -1,5 +1,5 @@
    \ No newline at end of file diff --git a/sai/modules/saimod_sys_security/saimod_sys_security.php b/sai/modules/saimod_sys_security/saimod_sys_security.php index c240808..5be5941 100644 --- a/sai/modules/saimod_sys_security/saimod_sys_security.php +++ b/sai/modules/saimod_sys_security/saimod_sys_security.php @@ -251,7 +251,6 @@ class saimod_sys_security extends \SYSTEM\SAI\SaiModule { */ public static function sai_mod__SYSTEM_SAI_saimod_sys_security(){ $vars = \SYSTEM\PAGE\text::tag(\SYSTEM\SQL\system_text::TAG_SAI_SECURITY); - $vars['PICPATH'] = (new \SYSTEM\PSAI('modules/saimod_sys_log/img/'))->WEBPATH(false); return \SYSTEM\PAGE\replace::replaceFile((new \SYSTEM\PSAI('modules/saimod_sys_security/tpl/saimod_sys_security.tpl'))->SERVERPATH(), $vars);} /** diff --git a/sai/modules/saimod_sys_security/tpl/saimod_sys_security.tpl b/sai/modules/saimod_sys_security/tpl/saimod_sys_security.tpl index c82cb83..c37f7ca 100644 --- a/sai/modules/saimod_sys_security/tpl/saimod_sys_security.tpl +++ b/sai/modules/saimod_sys_security/tpl/saimod_sys_security.tpl @@ -4,7 +4,7 @@
    diff --git a/sai/modules/saimod_sys_todo/saimod_sys_todo.php b/sai/modules/saimod_sys_todo/saimod_sys_todo.php index 1e0fa1c..38c3ab8 100644 --- a/sai/modules/saimod_sys_todo/saimod_sys_todo.php +++ b/sai/modules/saimod_sys_todo/saimod_sys_todo.php @@ -119,7 +119,6 @@ class saimod_sys_todo extends \SYSTEM\SAI\SaiModule { */ public static function sai_mod__SYSTEM_SAI_saimod_sys_todo(){ $vars = \SYSTEM\PAGE\text::tag(\SYSTEM\SQL\system_text::TAG_SAI_TODO); - $vars['PICPATH'] = (new \SYSTEM\PSAI('modules/saimod_sys_log/img/'))->WEBPATH(false); return \SYSTEM\PAGE\replace::replaceFile((new \SYSTEM\PSAI('modules/saimod_sys_todo/tpl/saimod_sys_todo.tpl'))->SERVERPATH(), $vars); } diff --git a/sai/modules/saimod_sys_todo/tpl/saimod_sys_todo.tpl b/sai/modules/saimod_sys_todo/tpl/saimod_sys_todo.tpl index 21993ae..b7fabf7 100644 --- a/sai/modules/saimod_sys_todo/tpl/saimod_sys_todo.tpl +++ b/sai/modules/saimod_sys_todo/tpl/saimod_sys_todo.tpl @@ -5,7 +5,7 @@
  • ToDo
  • DoTo
  • Statistics
    • - + diff --git a/sai/page/tpl/language.tpl b/sai/page/tpl/language.tpl index 07810a6..f89dcd1 100644 --- a/sai/page/tpl/language.tpl +++ b/sai/page/tpl/language.tpl @@ -1 +1 @@ -${lang}  \ No newline at end of file +${lang}  \ No newline at end of file diff --git a/sai/page/tpl/sai.tpl b/sai/page/tpl/sai.tpl index 1f05e33..f254154 100644 --- a/sai/page/tpl/sai.tpl +++ b/sai/page/tpl/sai.tpl @@ -4,7 +4,7 @@ ${sai_title} - + ${css} ${js}