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

#322 search in log url, fixed sai file name, replaced picpath variable, state urlencode for variables

Browse Source
This commit is contained in:
Ulf Gebhardt 2017-07-24 03:56:13 +02:00
parent 55c410a5a5
commit aee5b23e39
30 changed files with 39 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
files/autoload.inc
View File

@ -1,3 +1,3 @@
<?php
\SYSTEM\autoload::registerFolder(dirname(__FILE__),'SYSTEM\FILES');
\SYSTEM\FILES\files::registerFolder(dirname(__FILE__).'/saistart_sys_sai/','saistart_sys_sai');
\SYSTEM\FILES\files::registerFolder(dirname(__FILE__).'/sai/','sai');

0
sai/modules/saimod_sys_log/img/ajax-loader.gif → files/sai/ajax-loader.gif
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 723 B

After

Width:  |  Height:  |  Size: 723 B

0
files/saistart_sys_sai/flag_deDE.png → files/sai/flag_deDE.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 545 B

After

Width:  |  Height:  |  Size: 545 B

0
files/saistart_sys_sai/flag_enUS.png → files/sai/flag_enUS.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 609 B

After

Width:  |  Height:  |  Size: 609 B

0
files/saistart_sys_sai/flag_esES.png → files/sai/flag_esES.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 469 B

After

Width:  |  Height:  |  Size: 469 B

0
files/saistart_sys_sai/flag_frFR.png → files/sai/flag_frFR.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 545 B

After

Width:  |  Height:  |  Size: 545 B

0
files/saistart_sys_sai/flag_huHU.png → files/sai/flag_huHU.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 615 B

After

Width:  |  Height:  |  Size: 615 B

0
files/saistart_sys_sai/flag_jaJA.png → files/sai/flag_jaJA.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 420 B

After

Width:  |  Height:  |  Size: 420 B

0
files/saistart_sys_sai/flag_trTR.png → files/sai/flag_trTR.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 492 B

After

Width:  |  Height:  |  Size: 492 B

0
files/saistart_sys_sai/logo.png → files/sai/logo.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 16 KiB

After

Width:  |  Height:  |  Size: 16 KiB

0
files/saistart_sys_sai/logo_large.png → files/sai/logo_large.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 18 KiB

After

Width:  |  Height:  |  Size: 18 KiB

0
files/saistart_sys_sai/logo_sai.png → files/sai/logo_sai.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 115 KiB

After

Width:  |  Height:  |  Size: 115 KiB

0
files/saistart_sys_sai/sai_loggedout_gallery_1.png → files/sai/sai_loggedout_gallery_1.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 74 KiB

After

Width:  |  Height:  |  Size: 74 KiB

2
page/State.php
View File

@ -35,7 +35,7 @@ class State {
$vars = array();
for($i=1;$i<count($state_vars);$i++){
$var = \explode('.',$state_vars[$i]);
$vars[$var[0]] = $var[1];}
$vars[$var[0]] = \urlencode($var[1]);}
$result = array();
$res = \SYSTEM\SQL\SYS_PAGE_GROUP::QQ(array($group,$state_name));
while($row = $res->next()){

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

@ -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: '<img src="http://www.mojotrollz.eu/web/test/mojotrollz/api.php?call=files&cat'+pictureCategory+'=&id='+pictureId+'.gif" />' });
$( "#"+elementId ).tooltip({ content: '<img src="./files/'+pictureCategory+'/'+pictureId+'" />' });
}

4
sai/modules/saimod_sys_files/saimod_sys_files.php
View File

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

2
sai/modules/saimod_sys_files/tpl/saimod_sys_files_list_entry.tpl
View File

@ -2,7 +2,7 @@
<td>${name}</td>
<td>${extension}</td>
<td>
<a href="${url}" target="_blank" id="tooltip_${cat}_${i}" onmouseover="saimod_sys_files_tooltip('tooltip_${cat}_${i}',${name},${cat})">${url}</a>
<a href="${url}" target="_blank" id="tooltip_${cat}_${i}" onmouseover="saimod_sys_files_tooltip('tooltip_${cat}_${i}','${name}','${cat}')">${url}</a>
</td>
<td>
<button type="submit" class="btn-warning btn btn-sm imgrnbtn" style="margin: 1px;;" cat="${cat}" id="${name}" textfield="#renametext_${cat}_${i}"><span class="glyphicon glyphicon-pencil" aria-hidden="true"></span></button>

2
sai/modules/saimod_sys_log/js/saimod_sys_log.js
View File

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

10
sai/modules/saimod_sys_log/qq/SYS_SAIMOD_LOG_FILTER.php
View File

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

10
sai/modules/saimod_sys_log/qq/SYS_SAIMOD_LOG_FILTER_COUNT.php
View File

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

13
sai/modules/saimod_sys_log/saimod_sys_log.php
View File

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

2
sai/modules/saimod_sys_log/tpl/saimod_sys_log.tpl
View File

@ -4,7 +4,7 @@
<ul class="nav nav-tabs" id="tabs_log">
<li class="active"><a href="#!log" id="menu_loglist">${basic_log}</a></li>
<li><a href="#!log(stats)" id="menu_stats">${basic_analytics}</a></li>
<img id="loader" src="${PICPATH}ajax-loader.gif" style="margin-left: 10px; margin-top: 10px; display: none; float: left"/>
<img id="loader" src="./files/sai/ajax-loader.gif" style="margin-left: 10px; margin-top: 10px; display: none; float: left"/>
<button onClick="system.load('log',true);" class="btn-success btn btn-sm" style="margin-right: 15px; height: 32px; font-size: 13px; float: right;"><span class="glyphicon glyphicon-refresh" aria-hidden="true"></span>&nbsp;${basic_refresh}</button>
</ul><br>
<div class="tab-content">

2
sai/modules/saimod_sys_log/tpl/saimod_sys_log_error_filter.tpl
View File

@ -1 +1 @@
<li class="${active}"><a href="#!log;filter.${filter};search.${search}">${filter}</a></li>
<li class="${active}"><a href="#!log;filter.${filter};search.${search_encoded}">${filter}</a></li>

6
sai/modules/saimod_sys_log/tpl/saimod_sys_log_filter.tpl
View File

@ -1,5 +1,5 @@
<ul class="nav nav-pills" id="error_filter">
<li class="${active}"><a href="#!log;filter.%;search.${search}">${basic_all}</a></li>
<li class="${active}"><a href="#!log;filter.%;search.${search_encoded}">${basic_all}</a></li>
${error_filter}
<button class="btn-sm btn btn-success" state="log;filter.${filter};search." id="btn_search_log" type="submit" style="float: right; margin-left: 10px;"><span class="glyphicon glyphicon-search" aria-hidden="true"></span> ${basic_search}</button>
<input class="input-medium search-query action-control" id="input_search_log" type="text" placeholder="${basic_placeholder_search}" size="20" style="float: right;" value="${search}"/>
@ -21,8 +21,8 @@
${table}
</table>
<ul class="pagination">
<li><a href="#!log;filter.${filter};search.${search};page.0">&laquo;</a></li>
<li><a href="#!log;filter.${filter};search.${search_encoded};page.0">&laquo;</a></li>
${pagination}
<li><a href="#!log;filter.${filter};search.${search};page.${page_last}">&raquo;</a></li>
<li><a href="#!log;filter.${filter};search.${search_encoded};page.${page_last}">&raquo;</a></li>
</ul>
</div>

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

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

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

@ -4,7 +4,7 @@
<ul class="nav nav-tabs" id="securitytab">
<li class="active"><a href="#!security" id="menu_users">Users</a></li>
<li><a href="#!security(rights)" id="menu_rights">Rights</a></li>
<img id="loader" src="${PICPATH}ajax-loader.gif" style="margin-left: 10px; margin-top: 10px; display: none; float: left"/>
<img id="loader" src="./files/sai/ajax-loader.gif" style="margin-left: 10px; margin-top: 10px; display: none; float: left"/>
</ul>
<div class="tab-content">
<div class="tab-pane active" id="tab_security"></div>

1
sai/modules/saimod_sys_todo/saimod_sys_todo.php
View File

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

2
sai/modules/saimod_sys_todo/tpl/saimod_sys_todo.tpl
View File

@ -5,7 +5,7 @@
<li class="active"><a href="#!todo" id="menu_todolist">ToDo</a></li>
<li><a href="#!todo(doto)" id="menu_doto">DoTo</a></li>
<li><a href="#!todo(stats)" id="menu_stats">Statistics</a></li>
<img id="img_loader" src="${PICPATH}ajax-loader.gif" style="margin-left: 10px; margin-top: 10px; display: none; float: left"/>
<img id="img_loader" src="./files/sai/ajax-loader.gif" style="margin-left: 10px; margin-top: 10px; display: none; float: left"/>
<button id="btn_refresh" class="btn-primary btn btn-sm" onClick="system.load('todo',true);" style="margin-right: 15px; height: 32px; font-size: 13px; float: right;"><span class="glyphicon glyphicon-refresh" aria-hidden="true"></span> ${basic_refresh}</button>
<button id="btn_close_all" class="btn-danger btn btn-sm" style="margin-right: 15px; height: 32px; font-size: 13px; float: right;"><span class="glyphicon glyphicon-minus-sign" aria-hidden="true"></span> ${basic_close_all}</button>
<button id="btn_new" class="btn-success btn btn-sm" onClick="system.load('todo(new)');" style="margin-right: 15px; height: 32px; font-size: 13px; float: right;"><span class="glyphicon glyphicon-plus" aria-hidden="true"></span> ${basic_add}</button>

2
sai/page/tpl/language.tpl
View File

@ -1 +1 @@
<a href="javascript:system.language('${lang}');"><img src="./files/saistart_sys_sai/flag_${lang}.png" alt="${lang}" width="16" height="11"></a>&nbsp;
<a href="javascript:system.language('${lang}');"><img src="./files/sai/flag_${lang}.png" alt="${lang}" width="16" height="11"></a>&nbsp;

2
sai/page/tpl/sai.tpl
View File

@ -4,7 +4,7 @@
<title>${sai_title}</title>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
<meta name="fragment" content="!">
<link rel="icon" type="image/png" href="./files/saistart_sys_sai/logo_sai.png"/>
<link rel="icon" type="image/png" href="./files/sai/logo_sai.png"/>
${css}
${js}
</head>