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

all sai mods request now their own tag in the text db, cleanup

Browse Source
This commit is contained in:
Ulf Gebhardt 2015-04-17 19:35:16 +02:00
parent b527b74587
commit 6093852793
30 changed files with 158 additions and 202 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
config/config_ids.php
View File

@ -26,7 +26,5 @@ class config_ids {
const SYS_CRON_LOG2SQLITE_PATH = 30;
const SYS_SAI_CONFIG_TITLE = 52;
const SYS_SAI_CONFIG_COPYRIGHT = 53;
const SYS_SAI_CONFIG_PROJECT = 54;
}

26
dbd/tbl/system_text.php
View File

@ -9,13 +9,23 @@ class system_text {
const FIELD_ID = 'id';
const FIELD_TEXT = 'text';
//todo rename shit
const VALUE_CATEGORY_BASIC = 1;
const VALUE_CATEGORY_SYSTEM = 10;
const VALUE_CATEGORY_SYSTEM_ERROR = 11;
const VALUE_CATEGORY_SYSTEM_SAI = 42;
const VALUE_CATEGORY_SYSTEM_SAI_ERROR = 43;
const TAG_BASIC = 'basic';
const TAG_SAI = 'sai';
const TAG_SAI_DEFAULT = 'sai_default';
const TAG_SAI_START = 'sai_start';
const TAG_SAI_API = 'sai_api';
const TAG_SAI_CACHE = 'sai_cache';
const TAG_SAI_CONFIG = 'sai_config';
const TAG_SAI_CRON = 'sai_cron';
const TAG_SAI_DOCU = 'sai_docu';
const TAG_SAI_FILES = 'sai_files';
const TAG_SAI_LANGSWITCHER = 'sai_langswitcher';
const TAG_SAI_LOG = 'sai_log';
const TAG_SAI_LOGIN = 'sai_login';
const TAG_SAI_MOD = 'sai_mod';
const TAG_SAI_PAGE = 'sai_page';
const TAG_SAI_SECURITY = 'sai_security';
const TAG_SAI_TEXT = 'sai_text';
const TAG_SAI_TODO = 'sai_todo';
const VALUE_CATEGORY_SYSTEM_ENDCAT = 99;
}

10
sai/modules/saimod_sys_api/saimod_sys_api.php
View File

@ -2,7 +2,7 @@
namespace SYSTEM\SAI;
class saimod_sys_api extends \SYSTEM\SAI\SaiModule {
public static function sai_mod__SYSTEM_SAI_saimod_sys_api(){
$vars = array();
$vars = \SYSTEM\PAGE\text::tag(\SYSTEM\DBD\system_text::TAG_SAI_API);
$vars['tabopts'] = '';
$res = \SYSTEM\DBD\SYS_SAIMOD_API_GROUPS::QQ();
@ -22,16 +22,18 @@ class saimod_sys_api extends \SYSTEM\SAI\SaiModule {
$r['tr_class'] = self::tablerow_class($r['type']);
$r['type'] = self::type_names($r['type']);
$tab['content'] .= \SYSTEM\PAGE\replace::replaceFile(\SYSTEM\SERVERPATH(new \SYSTEM\PSAI(),'modules/saimod_sys_api/tpl/list_entry.tpl'), $r);
}
}
$tab = array_merge($tab,\SYSTEM\PAGE\text::tag(\SYSTEM\DBD\system_text::TAG_SAI_API));
return \SYSTEM\PAGE\replace::replaceFile(\SYSTEM\SERVERPATH(new \SYSTEM\PSAI(),'modules/saimod_sys_api/tpl/saimod_sys_api_list.tpl'), $tab);
}
public static function sai_mod__system_sai_saimod_sys_api_action_deletedialog($ID,$group){
$res = \SYSTEM\DBD\SYS_SAIMOD_API_SINGLE_SELECT::Q1(array($ID,$group));
$res = array_merge($res,\SYSTEM\PAGE\text::tag(\SYSTEM\DBD\system_text::TAG_SAI_API));
return \SYSTEM\PAGE\replace::replaceFile(\SYSTEM\SERVERPATH(new \SYSTEM\PSAI(),'modules/saimod_sys_api/tpl/delete_dialog.tpl'), $res);
}
public static function sai_mod__system_sai_saimod_sys_api_action_newdialog(){
return \SYSTEM\PAGE\replace::replaceFile(\SYSTEM\SERVERPATH(new \SYSTEM\PSAI(),'modules/saimod_sys_api/tpl/new_dialog.tpl'));}
return \SYSTEM\PAGE\replace::replaceFile(\SYSTEM\SERVERPATH(new \SYSTEM\PSAI(),'modules/saimod_sys_api/tpl/new_dialog.tpl'),\SYSTEM\PAGE\text::tag(\SYSTEM\DBD\system_text::TAG_SAI_API));}
public static function sai_mod__system_sai_saimod_sys_api_action_addcall($ID,$group,$type,$parentID,$parentValue,$name,$verify){
if(!\SYSTEM\SECURITY\Security::check(\SYSTEM\SECURITY\RIGHTS::SYS_SAI_API)){
@ -69,7 +71,7 @@ class saimod_sys_api extends \SYSTEM\SAI\SaiModule {
}
}
public static function html_li_menu(){return '<li><a id="menu_api" href="#!api">API</a></li>';}
public static function html_li_menu(){return '<li><a id="menu_api" href="#!api">${sai_menu_api}</a></li>';}
public static function right_public(){return false;}
public static function right_right(){return \SYSTEM\SECURITY\Security::check(\SYSTEM\SECURITY\RIGHTS::SYS_SAI) && \SYSTEM\SECURITY\Security::check(\SYSTEM\SECURITY\RIGHTS::SYS_SAI_API);}

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

@ -1,4 +1,4 @@
<h4>System API</h4>
<h4>${sai_api_title}</h4>
<hr>
<div class="tabbable">
<ul class="nav nav-tabs" id="tabs_api">

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

@ -39,7 +39,7 @@ class saimod_sys_cache extends \SYSTEM\SAI\SaiModule {
return 'success';
}
public static function html_li_menu(){return '<li><a id="menu_cache" href="#!cache">Cache</a></li>';}
public static function html_li_menu(){return '<li><a id="menu_cache" href="#!cache">${sai_menu_cache}</a></li>';}
public static function right_public(){return false;}
public static function right_right(){return \SYSTEM\SECURITY\Security::check(\SYSTEM\SECURITY\RIGHTS::SYS_SAI);}

12
sai/modules/saimod_sys_config/saimod_sys_config.php
View File

@ -2,7 +2,7 @@
namespace SYSTEM\SAI;
class saimod_sys_config extends \SYSTEM\SAI\SaiModule {
public static function sai_mod__SYSTEM_SAI_saimod_sys_config(){
$vars = array();
$vars = \SYSTEM\PAGE\text::tag(\SYSTEM\DBD\system_text::TAG_SAI_CONFIG);
$vars['basics'] = $vars['database'] = $vars['sai'] = '';
$vars['basics'] .= \SYSTEM\PAGE\replace::replaceFile(\SYSTEM\SERVERPATH(new \SYSTEM\PSAI(),'modules/saimod_sys_config/tpl/config_tr.tpl'),
array( 'id' =>\SYSTEM\CONFIG\config_ids::SYS_CONFIG_ERRORREPORTING,
@ -62,17 +62,9 @@ class saimod_sys_config extends \SYSTEM\SAI\SaiModule {
array( 'id' =>\SYSTEM\CONFIG\config_ids::SYS_SAI_CONFIG_PROJECT,
'name' =>'\SYSTEM\CONFIG\config_ids::SYS_SAI_CONFIG_PROJECT',
'value' =>\SYSTEM\CONFIG\config::get(\SYSTEM\CONFIG\config_ids::SYS_SAI_CONFIG_PROJECT)));
$vars['sai'] .= \SYSTEM\PAGE\replace::replaceFile(\SYSTEM\SERVERPATH(new \SYSTEM\PSAI(),'modules/saimod_sys_config/tpl/config_tr.tpl'),
array( 'id' =>\SYSTEM\CONFIG\config_ids::SYS_SAI_CONFIG_COPYRIGHT,
'name' =>'\SYSTEM\CONFIG\config_ids::SYS_SAI_CONFIG_COPYRIGHT',
'value' =>\SYSTEM\CONFIG\config::get(\SYSTEM\CONFIG\config_ids::SYS_SAI_CONFIG_COPYRIGHT)));
$vars['sai'] .= \SYSTEM\PAGE\replace::replaceFile(\SYSTEM\SERVERPATH(new \SYSTEM\PSAI(),'modules/saimod_sys_config/tpl/config_tr.tpl'),
array( 'id' =>\SYSTEM\CONFIG\config_ids::SYS_SAI_CONFIG_TITLE,
'name' =>'\SYSTEM\CONFIG\config_ids::SYS_SAI_CONFIG_TITLE',
'value' =>\SYSTEM\CONFIG\config::get(\SYSTEM\CONFIG\config_ids::SYS_SAI_CONFIG_TITLE)));
return \SYSTEM\PAGE\replace::replaceFile(\SYSTEM\SERVERPATH(new \SYSTEM\PSAI(),'modules/saimod_sys_config/tpl/config.tpl'),$vars);
}
public static function html_li_menu(){return '<li><a id="menu_config" href="#!config">Config</a></li>';}
public static function html_li_menu(){return '<li><a id="menu_config" href="#!config">${sai_menu_config}</a></li>';}
public static function right_public(){return false;}
public static function right_right(){return \SYSTEM\SECURITY\Security::check(\SYSTEM\SECURITY\RIGHTS::SYS_SAI);}

2
sai/modules/saimod_sys_config/tpl/config.tpl
View File

@ -1,4 +1,4 @@
<h4>System Config</h4>
<h4>${sai_config_title}</h4>
<hr>
<table class="table table-hover table-condensed sai_table" style="overflow: auto;">
<tr>

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

@ -3,7 +3,7 @@ namespace SYSTEM\SAI;
class saimod_sys_cron extends \SYSTEM\SAI\SaiModule {
public static function sai_mod__SYSTEM_SAI_saimod_sys_cron(){
$vars = array();
$vars = \SYSTEM\PAGE\text::tag(\SYSTEM\DBD\system_text::TAG_SAI_CRON);
$vars['content'] = '';
$vars['last_visit'] = \SYSTEM\CRON\cron::last_visit();
$res = \SYSTEM\DBD\SYS_SAIMOD_CRON::QQ();
@ -39,7 +39,7 @@ class saimod_sys_cron extends \SYSTEM\SAI\SaiModule {
\SYSTEM\DBD\SYS_SAIMOD_CRON_DEL::QI(array($cls));
return \SYSTEM\LOG\JsonResult::ok();}
public static function html_li_menu(){return '<li><a id="menu_cron" href="#!cron">Cron</a></li>';}
public static function html_li_menu(){return '<li><a id="menu_cron" href="#!cron">${sai_menu_cron}</a></li>';}
public static function right_public(){return false;}
public static function right_right(){return \SYSTEM\SECURITY\Security::check(\SYSTEM\SECURITY\RIGHTS::SYS_SAI_CRON);}

66
sai/modules/saimod_sys_cron/tpl/tabs.tpl
View File

@ -1,35 +1,33 @@
<div id="cron_wrapper">
<h4>System Cron</h4>
<hr>
Last Visit: ${last_visit}<br/>
<a href="./sai.php?call=cron" target="_blank">Start Cron</a>
<div id="cron_content">
<table class="table table-hover table-condensed sai_table" style="overflow: auto;">
<tr>
<th>class</th>
<th>min</th>
<th>hour</th>
<th>day</th>
<th>day_week</th>
<th>month</th>
<th>last_run</th>
<th>next_run</th>
<th>status</th>
<th>action</th>
</tr>
${content}
<tr>
<td><input type="text" id="input_cron_class" placeholder="class" style="width: 200px;"></td>
<td><input type="text" id="input_cron_min" placeholder="min" value="0" style="width: 40px;"></td>
<td><input type="text" id="input_cron_hour" placeholder="hour" value="0" style="width: 40px;"></td>
<td><input type="text" id="input_cron_day" placeholder="day" value="0" style="width: 40px;"></td>
<td><input type="text" id="input_cron_day_week" placeholder="day_week" value="0" style="width: 40px;"></td>
<td><input type="text" id="input_cron_month" placeholder="month" value="0" style="width: 40px;"></td>
<td></td>
<td></td>
<td></td>
<td><button type="button" class="btn-small btn-success" id="btn_cron_add">Add</button></td>
</tr>
</table>
</div>
<h4>${sai_cron_title}</h4>
<hr>
Last Visit: ${last_visit}<br/>
<a href="./sai.php?call=cron" target="_blank">Start Cron</a>
<div id="cron_content">
<table class="table table-hover table-condensed sai_table" style="overflow: auto;">
<tr>
<th>class</th>
<th>min</th>
<th>hour</th>
<th>day</th>
<th>day_week</th>
<th>month</th>
<th>last_run</th>
<th>next_run</th>
<th>status</th>
<th>action</th>
</tr>
${content}
<tr>
<td><input type="text" id="input_cron_class" placeholder="class" style="width: 200px;"></td>
<td><input type="text" id="input_cron_min" placeholder="min" value="0" style="width: 40px;"></td>
<td><input type="text" id="input_cron_hour" placeholder="hour" value="0" style="width: 40px;"></td>
<td><input type="text" id="input_cron_day" placeholder="day" value="0" style="width: 40px;"></td>
<td><input type="text" id="input_cron_day_week" placeholder="day_week" value="0" style="width: 40px;"></td>
<td><input type="text" id="input_cron_month" placeholder="month" value="0" style="width: 40px;"></td>
<td></td>
<td></td>
<td></td>
<td><button type="button" class="btn-small btn-success" id="btn_cron_add">Add</button></td>
</tr>
</table>
</div>

6
sai/modules/saimod_sys_docu/saimod_sys_docu.php
View File

@ -4,7 +4,7 @@ namespace SYSTEM\SAI;
class saimod_sys_docu extends \SYSTEM\SAI\SaiModule {
public static function sai_mod__SYSTEM_SAI_saimod_sys_docu(){
$documents = \SYSTEM\DOCU\docu::getDocuments();
$vars = array();
$vars = \SYSTEM\PAGE\text::tag(\SYSTEM\DBD\system_text::TAG_SAI_DOCU);
$vars['tabopts'] = '';
foreach($documents as $cat => $docs){
$vars['tabopts'] .= \SYSTEM\PAGE\replace::replaceFile(\SYSTEM\SERVERPATH(new \SYSTEM\PSAI(),'modules/saimod_sys_docu/tpl/tabopt.tpl'), array( 'tab_id' => str_replace(' ', '_', $cat),'tab_id_pretty' => $cat));}
@ -13,7 +13,7 @@ class saimod_sys_docu extends \SYSTEM\SAI\SaiModule {
public static function sai_mod__SYSTEM_SAI_saimod_sys_docu_action_cat($cat = 'System'){
$documents = \SYSTEM\DOCU\docu::getDocuments()[$cat];
$vars = array();
$vars = \SYSTEM\PAGE\text::tag(\SYSTEM\DBD\system_text::TAG_SAI_DOCU);
$vars['tabopts'] = '';
foreach($documents as $doc){
$vars['tabopts'] .= \SYSTEM\PAGE\replace::replaceFile(\SYSTEM\SERVERPATH(new \SYSTEM\PSAI(),'modules/saimod_sys_docu/tpl/tabopt2.tpl'),
@ -33,7 +33,7 @@ class saimod_sys_docu extends \SYSTEM\SAI\SaiModule {
return 'not found';
}
public static function html_li_menu(){return '<li><a id="menu_docu" href="#!docu">Docu</a></li>';}
public static function html_li_menu(){return '<li><a id="menu_docu" href="#!docu">${sai_menu_docu}</a></li>';}
public static function right_public(){return false;}
public static function right_right(){return \SYSTEM\SECURITY\Security::check(\SYSTEM\SECURITY\RIGHTS::SYS_SAI);}

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

@ -1,4 +1,4 @@
<h4>System Documentation</h4>
<h4>${sai_docu_title}</h4>
<hr>
<div class="tabbable">
<ul class="nav nav-tabs" id="tabs_docu">

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

@ -23,16 +23,7 @@ class saimod_sys_files extends \SYSTEM\SAI\SaiModule {
return \SYSTEM\LOG\JsonResult::ok();
}
public static function sai_mod__SYSTEM_SAI_saimod_sys_files(){
/*$result = array('tabopts' => '', 'tabs' => '');
$file_folders = \SYSTEM\FILES\files::get();
$first = true;
foreach($file_folders as $name=>$folder){
$result['tabopts'] .= \SYSTEM\PAGE\replace::replaceFile(\SYSTEM\SERVERPATH(new \SYSTEM\PSAI(),'modules/saimod_sys_files/tpl/saimod_sys_files_tabopt.tpl'),array('name' => $name, 'active' => $first ? 'active' : ''));
$result['tabs'] .= \SYSTEM\PAGE\replace::replaceFile(\SYSTEM\SERVERPATH(new \SYSTEM\PSAI(),'modules/saimod_sys_files/tpl/saimod_sys_files_tab.tpl'),array('name' => $name, 'active' => $first ? 'active' : '', 'content' => $first ? self::sai_mod__SYSTEM_SAI_saimod_sys_files_action_tab($name) : ''));
$first = false;
}
return \SYSTEM\PAGE\replace::replaceFile(\SYSTEM\SERVERPATH(new \SYSTEM\PSAI(),'modules/saimod_sys_files/tpl/saimod_sys_files.tpl'),$result);*/
$vars = array();
$vars = \SYSTEM\PAGE\text::tag(\SYSTEM\DBD\system_text::TAG_SAI_FILES);
$vars['tabopts'] = '';
$res = \SYSTEM\FILES\files::get();
@ -47,9 +38,12 @@ class saimod_sys_files extends \SYSTEM\SAI\SaiModule {
$i = 0;
foreach($cat as $file){
$result .= \SYSTEM\PAGE\replace::replaceFile(\SYSTEM\SERVERPATH(new \SYSTEM\PSAI(),'modules/saimod_sys_files/tpl/saimod_sys_files_list_entry.tpl'), array('i' => $i++, 'cat' => $name, 'name' => $file, 'extension' => substr($file,-3,3), 'url' => 'api.php?call=files&cat='.$name.'&id='.$file));}
return \SYSTEM\PAGE\replace::replaceFile(\SYSTEM\SERVERPATH(new \SYSTEM\PSAI(),'modules/saimod_sys_files/tpl/saimod_sys_files_list.tpl'), array('cat' => $name, 'content' => $result));}
$vars = \SYSTEM\PAGE\text::tag(\SYSTEM\DBD\system_text::TAG_SAI_FILES);
$vars['cat'] = $name;
$vars['content'] = $result;
return \SYSTEM\PAGE\replace::replaceFile(\SYSTEM\SERVERPATH(new \SYSTEM\PSAI(),'modules/saimod_sys_files/tpl/saimod_sys_files_list.tpl'), $vars);}
public static function html_li_menu(){return '<li><a id="menu_files" href="#!files">Files</a></li>';}
public static function html_li_menu(){return '<li><a id="menu_files" href="#!files">${sai_menu_files}</a></li>';}
public static function right_public(){return false;}
public static function right_right(){return \SYSTEM\SECURITY\Security::check(\SYSTEM\SECURITY\RIGHTS::SYS_SAI) && \SYSTEM\SECURITY\Security::check(\SYSTEM\SECURITY\RIGHTS::SYS_SAI_FILES);}

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

@ -1,4 +1,4 @@
<h4>System Files</h4>
<h4>${sai_files_title}</h4>
<hr>
<div class="tabbable">
<ul class="nav nav-tabs" id="tabs_files">

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

@ -26,7 +26,7 @@ class saimod_sys_log extends \SYSTEM\SAI\SaiModule {
}
public static function sai_mod__SYSTEM_SAI_saimod_sys_log_action_stats(){
$vars = array();
$vars = \SYSTEM\PAGE\text::tag(\SYSTEM\DBD\system_text::TAG_SAI_LOG);
$vars['dbfile_entries'] = '';
if(\SYSTEM\CONFIG\config::get(\SYSTEM\CONFIG\config_ids::SYS_CRON_LOG2SQLITE_PATH)){
$scanned_directory = array_diff(scandir(\SYSTEM\CONFIG\config::get(\SYSTEM\CONFIG\config_ids::SYS_CRON_LOG2SQLITE_PATH)), array('..', '.'));
@ -287,6 +287,7 @@ class saimod_sys_log extends \SYSTEM\SAI\SaiModule {
public static function sai_mod__SYSTEM_SAI_saimod_sys_log_action_error($error){
$vars = \SYSTEM\DBD\SYS_SAIMOD_LOG_ERROR::QQ(array($error))->next();
$vars['trace'] = implode('</br>', array_slice(explode('#', $vars['trace']), 1, -1));
$vars = array_merge($vars,\SYSTEM\PAGE\text::tag(\SYSTEM\DBD\system_text::TAG_SAI_LOG));
return \SYSTEM\PAGE\replace::replaceFile(\SYSTEM\SERVERPATH(new \SYSTEM\PSAI(),'modules/saimod_sys_log/tpl/saimod_sys_log_error.tpl'), $vars);}
public static function sai_mod__SYSTEM_SAI_saimod_sys_log_action_filter($filter = "%"){
@ -303,7 +304,7 @@ class saimod_sys_log extends \SYSTEM\SAI\SaiModule {
$r['request_uri'] = htmlspecialchars($r['request_uri']);
$table .= \SYSTEM\PAGE\replace::replaceFile(\SYSTEM\SERVERPATH(new \SYSTEM\PSAI(),'modules/saimod_sys_log/tpl/saimod_sys_log_table_row.tpl'),$r);
}
$vars = array();
$vars = \SYSTEM\PAGE\text::tag(\SYSTEM\DBD\system_text::TAG_SAI_LOG);
$vars['count'] = $count['count'];
$vars['table'] = $table;
return \SYSTEM\PAGE\replace::replaceFile(\SYSTEM\SERVERPATH(new \SYSTEM\PSAI(),'modules/saimod_sys_log/tpl/saimod_sys_log_filter.tpl'),
@ -341,10 +342,8 @@ class saimod_sys_log extends \SYSTEM\SAI\SaiModule {
}
public static function sai_mod__SYSTEM_SAI_saimod_sys_log(){
$vars = array();
$vars = \SYSTEM\PAGE\text::tag('basic');
$vars = \SYSTEM\PAGE\text::tag(\SYSTEM\DBD\system_text::TAG_SAI_LOG);
$vars['PICPATH'] = \SYSTEM\WEBPATH(new \SYSTEM\PSAI(), 'modules/saimod_sys_log/img/');
$vars = array_merge($vars, \SYSTEM\PAGE\text::tag('basic'),\SYSTEM\PAGE\text::tag('sai'));
return \SYSTEM\PAGE\replace::replaceFile(\SYSTEM\SERVERPATH(new \SYSTEM\PSAI(),'modules/saimod_sys_log/tpl/saimod_sys_log.tpl'), $vars);
}
@ -364,7 +363,7 @@ class saimod_sys_log extends \SYSTEM\SAI\SaiModule {
}
}
public static function html_li_menu(){return '<li><a id="menu_log" href="#!log">Log</a></li>';}
public static function html_li_menu(){return '<li><a id="menu_log" href="#!log">${sai_menu_log}</a></li>';}
public static function right_public(){return false;}
public static function right_right(){return \SYSTEM\SECURITY\Security::check(\SYSTEM\SECURITY\RIGHTS::SYS_SAI);}

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

@ -1,3 +1,5 @@
<h4>${sai_log_title}</h4>
<hr>
<div class="tabbable">
<ul class="nav nav-tabs" id="tabs_log">
<li class="active"><a href="#!log" id="menu_loglist">${basic_log}</a></li>

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

@ -2,7 +2,7 @@
namespace SYSTEM\SAI;
class saimod_sys_login extends \SYSTEM\SAI\SaiModule {
public static function sai_mod__SYSTEM_SAI_saimod_sys_login(){
$vars = array();
$vars = \SYSTEM\PAGE\text::tag(\SYSTEM\DBD\system_text::TAG_SAI_LOGIN);
$vars['login'] = 'Login';
$vars['logout'] = 'Logout';
$vars['loginUsername'] = 'Username';
@ -10,9 +10,6 @@ class saimod_sys_login extends \SYSTEM\SAI\SaiModule {
$vars['login_username_too_short'] = 'Username to short.';
$vars['login_password_too_short'] = 'Password to short.';
$vars['isadmin'] = \SYSTEM\SECURITY\Security::check(\SYSTEM\SECURITY\RIGHTS::SYS_SAI) ? "yes" : "no";
$vars = array_merge($vars,
\SYSTEM\PAGE\text::tag('basic'),
\SYSTEM\PAGE\text::tag('sys_sai'));
if(\SYSTEM\SECURITY\Security::isLoggedIn()){
return \SYSTEM\PAGE\replace::replaceFile(\SYSTEM\WEBPATH(new \SYSTEM\PSAI(),'modules/saimod_sys_login/tpl/logout.tpl'), $vars);
@ -38,11 +35,10 @@ class saimod_sys_login extends \SYSTEM\SAI\SaiModule {
}
public static function sai_mod__SYSTEM_SAI_saimod_sys_login_action_registerform(){
$vars = array_merge(\SYSTEM\PAGE\text::tag('basic'),
\SYSTEM\PAGE\text::tag('sys_sai'));
$vars = \SYSTEM\PAGE\text::tag(\SYSTEM\DBD\system_text::TAG_SAI_LOGIN);
return \SYSTEM\PAGE\replace::replaceFile(\SYSTEM\WEBPATH(new \SYSTEM\PSAI(),'modules/saimod_sys_login/tpl/register.tpl'), $vars);}
public static function html_li_menu(){return '</ul><ul class="nav pull-right"><li><a id="menu_login" href="#!login">'.(\SYSTEM\SECURITY\Security::isLoggedIn() ? 'Logout' : 'Login').'</a></li>';}
public static function html_li_menu(){return '</ul><ul class="nav pull-right"><li><a id="menu_login" href="#!login">'.(\SYSTEM\SECURITY\Security::isLoggedIn() ? '${sai_menu_logout}' : '${sai_menu_login}').'</a></li>';}
public static function right_public(){return true;}
public static function right_right(){return true;}

10
sai/modules/saimod_sys_mod/saimod_sys_mod.php
View File

@ -3,7 +3,8 @@ namespace SYSTEM\SAI;
class saimod_sys_mod extends \SYSTEM\SAI\SaiModule {
public static function sai_mod__SYSTEM_SAI_saimod_sys_mod_action_system(){
$vars = array('entries' => '');
$vars = \SYSTEM\PAGE\text::tag(\SYSTEM\DBD\system_text::TAG_SAI_MOD);
$vars['entries'] = '';
$sys_mods = \SYSTEM\SAI\sai::getSysModules();
foreach($sys_mods as $mod){
$v = array();
@ -16,7 +17,8 @@ class saimod_sys_mod extends \SYSTEM\SAI\SaiModule {
}
public static function sai_mod__SYSTEM_SAI_saimod_sys_mod_action_project(){
$vars = array('entries' => '');
$vars = \SYSTEM\PAGE\text::tag(\SYSTEM\DBD\system_text::TAG_SAI_MOD);
$vars['entries'] = '';
$mods = \SYSTEM\SAI\sai::getModules();
foreach($mods as $mod){
$v = array();
@ -28,9 +30,9 @@ class saimod_sys_mod extends \SYSTEM\SAI\SaiModule {
return \SYSTEM\PAGE\replace::replaceFile(\SYSTEM\SERVERPATH(new \SYSTEM\PSAI(),'modules/saimod_sys_mod/tpl/mod_table.tpl'),$vars);
}
public static function sai_mod__SYSTEM_SAI_saimod_sys_mod(){
return \SYSTEM\PAGE\replace::replaceFile(\SYSTEM\SERVERPATH(new \SYSTEM\PSAI(),'modules/saimod_sys_mod/tpl/mods.tpl'));}
return \SYSTEM\PAGE\replace::replaceFile(\SYSTEM\SERVERPATH(new \SYSTEM\PSAI(),'modules/saimod_sys_mod/tpl/mods.tpl'),\SYSTEM\PAGE\text::tag(\SYSTEM\DBD\system_text::TAG_SAI_MOD));}
public static function html_li_menu(){return '<li><a id="menu_mod" href="#!mod">SAI Mods</a></li>';}
public static function html_li_menu(){return '<li><a id="menu_mod" href="#!mod">${sai_menu_mod}</a></li>';}
public static function right_public(){return false;}
public static function right_right(){return \SYSTEM\SECURITY\Security::check(\SYSTEM\SECURITY\RIGHTS::SYS_SAI);}

2
sai/modules/saimod_sys_mod/tpl/mods.tpl
View File

@ -1,4 +1,4 @@
<h4>System Admin Interface Mods</h4>
<h4>${sai_mod_title}</h4>
<hr>
<div class="tabbable">
<ul class="nav nav-tabs" id="tabs_mod">

11
sai/modules/saimod_sys_page/saimod_sys_page.php
View File

@ -2,11 +2,10 @@
namespace SYSTEM\SAI;
class saimod_sys_page extends \SYSTEM\SAI\SaiModule {
public static function sai_mod__SYSTEM_SAI_saimod_sys_page(){
$vars = array();
$vars = \SYSTEM\PAGE\text::tag(\SYSTEM\DBD\system_text::TAG_SAI_PAGE);
$vars['tabopts'] = '';
$res = \SYSTEM\DBD\SYS_SAIMOD_PAGE_GROUPS::QQ();
while($r = $res->next()){
$vars['tabopts'] .= \SYSTEM\PAGE\replace::replaceFile(\SYSTEM\SERVERPATH(new \SYSTEM\PSAI(),'modules/saimod_sys_page/tpl/tabopt.tpl'), array( 'tab_id' => $r['group']));}
return \SYSTEM\PAGE\replace::replaceFile(\SYSTEM\SERVERPATH(new \SYSTEM\PSAI(),'modules/saimod_sys_page/tpl/saimod_sys_page.tpl'), $vars);
@ -14,7 +13,8 @@ class saimod_sys_page extends \SYSTEM\SAI\SaiModule {
public static function sai_mod__system_sai_saimod_sys_page_action_list($group=null){
$res = \SYSTEM\DBD\SYS_SAIMOD_PAGE_GET::QQ();
$tab = array('content' => '');
$tab = \SYSTEM\PAGE\text::tag(\SYSTEM\DBD\system_text::TAG_SAI_PAGE);
$tab['content'] = '';
while($r = $res->next()){
if($group != null && $r['group'] != $group){
continue;}
@ -28,10 +28,11 @@ class saimod_sys_page extends \SYSTEM\SAI\SaiModule {
public static function sai_mod__system_sai_saimod_sys_page_action_deletedialog($ID,$group){
$res = \SYSTEM\DBD\SYS_SAIMOD_PAGE_SINGLE_SELECT::Q1(array($ID,$group));
$res = array_merge($res,\SYSTEM\PAGE\text::tag(\SYSTEM\DBD\system_text::TAG_SAI_PAGE));
return \SYSTEM\PAGE\replace::replaceFile(\SYSTEM\SERVERPATH(new \SYSTEM\PSAI(),'modules/saimod_sys_page/tpl/delete_dialog.tpl'), $res);
}
public static function sai_mod__system_sai_saimod_sys_page_action_newdialog(){
return \SYSTEM\PAGE\replace::replaceFile(\SYSTEM\SERVERPATH(new \SYSTEM\PSAI(),'modules/saimod_sys_page/tpl/new_dialog.tpl'));}
return \SYSTEM\PAGE\replace::replaceFile(\SYSTEM\SERVERPATH(new \SYSTEM\PSAI(),'modules/saimod_sys_page/tpl/new_dialog.tpl'),\SYSTEM\PAGE\text::tag(\SYSTEM\DBD\system_text::TAG_SAI_PAGE));}
public static function sai_mod__system_sai_saimod_sys_page_action_addcall($ID,$group,$type,$parentID,$parentValue,$name,$verify){
if(!\SYSTEM\SECURITY\Security::check(\SYSTEM\SECURITY\RIGHTS::SYS_SAI_API)){
@ -65,7 +66,7 @@ class saimod_sys_page extends \SYSTEM\SAI\SaiModule {
}
}
public static function html_li_menu(){return '<li><a id="menu_page" href="#!page">Page</a></li>';}
public static function html_li_menu(){return '<li><a id="menu_page" href="#!page">${sai_menu_page}</a></li>';}
public static function right_public(){return false;}
public static function right_right(){return \SYSTEM\SECURITY\Security::check(\SYSTEM\SECURITY\RIGHTS::SYS_SAI) && \SYSTEM\SECURITY\Security::check(\SYSTEM\SECURITY\RIGHTS::SYS_SAI_API);}

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

@ -1,4 +1,4 @@
<h4>System Page</h4>
<h4>${sai_page_title}</h4>
<hr>
<div class="tabbable">
<ul class="nav nav-tabs" id="tabs_page">

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

@ -4,13 +4,13 @@ namespace SYSTEM\SAI;
class saimod_sys_security extends \SYSTEM\SAI\SaiModule {
public static function sai_mod__SYSTEM_SAI_saimod_sys_security_action_groups(){
return \SYSTEM\PAGE\replace::replaceFile(\SYSTEM\SERVERPATH(new \SYSTEM\PSAI(),'modules/saimod_sys_security/tpl/saimod_sys_security_groups.tpl'),array());}
return \SYSTEM\PAGE\replace::replaceFile(\SYSTEM\SERVERPATH(new \SYSTEM\PSAI(),'modules/saimod_sys_security/tpl/saimod_sys_security_groups.tpl'),\SYSTEM\PAGE\text::tag(\SYSTEM\DBD\system_text::TAG_SAI_SECURITY));}
public static function sai_mod__SYSTEM_SAI_saimod_sys_security_action_newright(){
return \SYSTEM\PAGE\replace::replaceFile(\SYSTEM\SERVERPATH(new \SYSTEM\PSAI(),'modules/saimod_sys_security/tpl/saimod_sys_security_newright.tpl'),array());}
return \SYSTEM\PAGE\replace::replaceFile(\SYSTEM\SERVERPATH(new \SYSTEM\PSAI(),'modules/saimod_sys_security/tpl/saimod_sys_security_newright.tpl'),\SYSTEM\PAGE\text::tag(\SYSTEM\DBD\system_text::TAG_SAI_SECURITY));}
public static function sai_mod__SYSTEM_SAI_saimod_sys_security_action_rights(){
$vars = array();
$vars = \SYSTEM\PAGE\text::tag(\SYSTEM\DBD\system_text::TAG_SAI_SECURITY);
$rows = '';
$res = \SYSTEM\DBD\SYS_SAIMOD_SECURITY_RIGHTS::QQ();
while($r = $res->next()){
@ -67,14 +67,14 @@ class saimod_sys_security extends \SYSTEM\SAI\SaiModule {
$r['message'] = substr($r['message'],0,255);
$table .= \SYSTEM\PAGE\replace::replaceFile(\SYSTEM\SERVERPATH(new \SYSTEM\PSAI(),'modules/saimod_sys_log/tpl/saimod_sys_log_table_row.tpl'),$r);
}
$vars = array();
$vars = \SYSTEM\PAGE\text::tag(\SYSTEM\DBD\system_text::TAG_SAI_SECURITY);
$vars['count'] = $count['count'];
$vars['table'] = $table;
return \SYSTEM\PAGE\replace::replaceFile(\SYSTEM\SERVERPATH(new \SYSTEM\PSAI(),'modules/saimod_sys_log/tpl/saimod_sys_log_table.tpl'), $vars);
}
private static function user_rights($userid){
$vars = array();
$vars = \SYSTEM\PAGE\text::tag(\SYSTEM\DBD\system_text::TAG_SAI_SECURITY);
$vars['user_rights_table'] = '';
$res = \SYSTEM\DBD\SYS_SAIMOD_SECURITY_USER_RIGHTS::QQ(array($userid));
@ -104,7 +104,7 @@ class saimod_sys_security extends \SYSTEM\SAI\SaiModule {
return \SYSTEM\PAGE\replace::replaceFile(\SYSTEM\SERVERPATH(new \SYSTEM\PSAI(),'modules/saimod_sys_security/tpl/saimod_sys_security_user_rights.tpl'), $vars);}
public static function sai_mod__SYSTEM_SAI_saimod_sys_security_action_stats(){
return \SYSTEM\PAGE\replace::replaceFile(\SYSTEM\SERVERPATH(new \SYSTEM\PSAI(),'modules/saimod_sys_security/tpl/saimod_sys_security_stats.tpl'),array());
return \SYSTEM\PAGE\replace::replaceFile(\SYSTEM\SERVERPATH(new \SYSTEM\PSAI(),'modules/saimod_sys_security/tpl/saimod_sys_security_stats.tpl'),\SYSTEM\PAGE\text::tag(\SYSTEM\DBD\system_text::TAG_SAI_SECURITY));
}
public static function sai_mod__SYSTEM_SAI_saimod_sys_security_action_user($username){
@ -112,6 +112,7 @@ class saimod_sys_security extends \SYSTEM\SAI\SaiModule {
$vars['time_elapsed'] = self::time_elapsed_string($vars['last_active']);
$vars['user_rights'] = array_key_exists('id', $vars) ? self::user_rights($vars['id']) : '';
$vars['user_actions'] = array_key_exists('id', $vars) ? self::user_actions($vars['id']) : '';
$vars = array_merge($vars,\SYSTEM\PAGE\text::tag(\SYSTEM\DBD\system_text::TAG_SAI_SECURITY));
return \SYSTEM\PAGE\replace::replaceFile(\SYSTEM\SERVERPATH(new \SYSTEM\PSAI(),'modules/saimod_sys_security/tpl/saimod_sys_security_user_view.tpl'),$vars);
}
@ -124,12 +125,15 @@ class saimod_sys_security extends \SYSTEM\SAI\SaiModule {
$r['class'] = self::tablerow_class($r['last_active']);
$r['time_elapsed'] = self::time_elapsed_string($r['last_active']);
$rows .= \SYSTEM\PAGE\replace::replaceFile(\SYSTEM\SERVERPATH(new \SYSTEM\PSAI(),'modules/saimod_sys_security/tpl/saimod_sys_security_user.tpl'),$r);
}
return \SYSTEM\PAGE\replace::replaceFile(\SYSTEM\SERVERPATH(new \SYSTEM\PSAI(),'modules/saimod_sys_security/tpl/saimod_sys_security_users.tpl'),array('rows' => $rows, 'count' => $count['count']));
}
$vars = \SYSTEM\PAGE\text::tag(\SYSTEM\DBD\system_text::TAG_SAI_SECURITY);
$vars['rows'] = $rows;
$vars['count'] = $count['count'];
return \SYSTEM\PAGE\replace::replaceFile(\SYSTEM\SERVERPATH(new \SYSTEM\PSAI(),'modules/saimod_sys_security/tpl/saimod_sys_security_users.tpl'),$vars);
}
public static function sai_mod__SYSTEM_SAI_saimod_sys_security(){
$vars = array();
$vars = \SYSTEM\PAGE\text::tag(\SYSTEM\DBD\system_text::TAG_SAI_SECURITY);
$vars['PICPATH'] = \SYSTEM\WEBPATH(new \SYSTEM\PSAI(), 'modules/saimod_sys_log/img/');
return \SYSTEM\PAGE\replace::replaceFile(\SYSTEM\SERVERPATH(new \SYSTEM\PSAI(),'modules/saimod_sys_security/tpl/saimod_sys_security.tpl'), $vars);}
@ -174,7 +178,7 @@ class saimod_sys_security extends \SYSTEM\SAI\SaiModule {
}
}
public static function html_li_menu(){return '<li><a id="menu_security" href="#!security">Security</a></li>';}
public static function html_li_menu(){return '<li><a id="menu_security" href="#!security">${sai_menu_security}</a></li>';}
public static function right_public(){return false;}
public static function right_right(){return \SYSTEM\SECURITY\Security::check(\SYSTEM\SECURITY\RIGHTS::SYS_SAI) && \SYSTEM\SECURITY\Security::check(\SYSTEM\SECURITY\RIGHTS::SYS_SAI_SECURITY);}

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

@ -1,4 +1,4 @@
<h4>System Security</h4>
<h4>${sai_security_title}</h4>
<hr>
<div class="tabbable">
<ul class="nav nav-tabs" id="securitytab">

16
sai/modules/saimod_sys_text/saimod_sys_text.php
View File

@ -2,7 +2,7 @@
namespace SYSTEM\SAI;
class saimod_sys_text extends \SYSTEM\SAI\SaiModule {
public static function sai_mod__SYSTEM_SAI_saimod_sys_text(){
$vars = array();
$vars = \SYSTEM\PAGE\text::tag(\SYSTEM\DBD\system_text::TAG_SAI_TEXT);
$vars['tabopts'] = '';
$res = \SYSTEM\DBD\SYS_SAIMOD_TEXT_TAGS::QQ();
$vars['new_id'] = \SYSTEM\PAGE\text::NEW_ENTRY;
@ -18,7 +18,9 @@ class saimod_sys_text extends \SYSTEM\SAI\SaiModule {
while($r = $res->next()){
$entries .= \SYSTEM\PAGE\replace::replaceFile(\SYSTEM\SERVERPATH(new \SYSTEM\PSAI(),'modules/saimod_sys_text/tpl/saimod_sys_text_list_entry.tpl'), $r);
}
return \SYSTEM\PAGE\replace::replaceFile(\SYSTEM\SERVERPATH(new \SYSTEM\PSAI(),'modules/saimod_sys_text/tpl/saimod_sys_text_list.tpl'), array('entries' => $entries));
$vars = \SYSTEM\PAGE\text::tag(\SYSTEM\DBD\system_text::TAG_SAI_TEXT);
$vars['entries'] = $entries;
return \SYSTEM\PAGE\replace::replaceFile(\SYSTEM\SERVERPATH(new \SYSTEM\PSAI(),'modules/saimod_sys_text/tpl/saimod_sys_text_list.tpl'), $vars);
}
public static function sai_mod__SYSTEM_SAI_saimod_sys_text_action_tag($tag = null){
@ -31,12 +33,14 @@ class saimod_sys_text extends \SYSTEM\SAI\SaiModule {
while($r = $res->next()){
$entries .= \SYSTEM\PAGE\replace::replaceFile(\SYSTEM\SERVERPATH(new \SYSTEM\PSAI(),'modules/saimod_sys_text/tpl/saimod_sys_text_list_entry.tpl'), $r);
}
return \SYSTEM\PAGE\replace::replaceFile(\SYSTEM\SERVERPATH(new \SYSTEM\PSAI(),'modules/saimod_sys_text/tpl/saimod_sys_text_list.tpl'), array('entries' => $entries));
$vars = \SYSTEM\PAGE\text::tag(\SYSTEM\DBD\system_text::TAG_SAI_TEXT);
$vars['entries'] = $entries;
return \SYSTEM\PAGE\replace::replaceFile(\SYSTEM\SERVERPATH(new \SYSTEM\PSAI(),'modules/saimod_sys_text/tpl/saimod_sys_text_list.tpl'), $vars);
}
public static function sai_mod__SYSTEM_SAI_saimod_sys_text_action_edittext($lang,$id){
$langs = \SYSTEM\CONFIG\config::get(\SYSTEM\CONFIG\config_ids::SYS_CONFIG_LANGS);
$vars = array();
$vars = \SYSTEM\PAGE\text::tag(\SYSTEM\DBD\system_text::TAG_SAI_TEXT);
$vars['tabopts'] = '';
foreach($langs as $l){
$vars2 = array();
@ -49,7 +53,7 @@ class saimod_sys_text extends \SYSTEM\SAI\SaiModule {
}
public static function sai_mod__SYSTEM_SAI_saimod_sys_text_action_editor($id, $lang){
$vars = array();
$vars = \SYSTEM\PAGE\text::tag(\SYSTEM\DBD\system_text::TAG_SAI_TEXT);
$vars['id'] = $id;
$vars['lang'] = $lang;
$vars['content'] = \SYSTEM\PAGE\text::get($id,$lang,false);
@ -67,7 +71,7 @@ class saimod_sys_text extends \SYSTEM\SAI\SaiModule {
public static function sai_mod__SYSTEM_SAI_saimod_sys_text_action_delete($id, $lang = null){
return \SYSTEM\PAGE\text::delete($id, $lang) ? \SYSTEM\LOG\JsonResult::ok() : \SYSTEM\LOG\JsonResult::fail();}
public static function html_li_menu(){return '<li><a id="menu_text" href="#!text">Text</a></li>';}
public static function html_li_menu(){return '<li><a id="menu_text" href="#!text">${sai_menu_text}</a></li>';}
public static function right_public(){return false;}
public static function right_right(){return \SYSTEM\SECURITY\Security::check(\SYSTEM\SECURITY\RIGHTS::SYS_SAI) && \SYSTEM\SECURITY\Security::check(\SYSTEM\SECURITY\RIGHTS::SYS_SAI_LOCALE);}

24
sai/modules/saimod_sys_text/tpl/saimod_sys_text.tpl
View File

@ -1,13 +1,11 @@
<div class="saimodule_container">
<h4>System Texts</h4>
<hr>
<div class="tabbable">
<ul class="nav nav-tabs" id="tabs_text">
<li><a href="#!text" id="menu_tag_all">All</a></li>
<li><a href="#!text(notag)" id="menu_tag_notag">No Tag</a></li>
${tabopts}
<input type="submit" value="Add" class="btn-small btn-success content_add" onClick="system.load('text(edittext(editor));id.${new_id};lang.${new_lang}');" style="margin-left: 15px; float: right;">
</ul>
<div class="tab-content" id="tab_content"></div>
</div>
</div>
<h4>${sai_text_title}</h4>
<hr>
<div class="tabbable">
<ul class="nav nav-tabs" id="tabs_text">
<li><a href="#!text" id="menu_tag_all">All</a></li>
<li><a href="#!text(notag)" id="menu_tag_notag">No Tag</a></li>
${tabopts}
<input type="submit" value="Add" class="btn-small btn-success content_add" onClick="system.load('text(edittext(editor));id.${new_id};lang.${new_lang}');" style="margin-left: 15px; float: right;">
</ul>
<div class="tab-content" id="tab_content"></div>
</div>

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

@ -27,13 +27,13 @@ class saimod_sys_todo extends \SYSTEM\SAI\SaiModule {
return \SYSTEM\LOG\JsonResult::ok();}
public static function sai_mod__SYSTEM_SAI_saimod_sys_todo(){
$vars = array();
$vars = \SYSTEM\PAGE\text::tag(\SYSTEM\DBD\system_text::TAG_SAI_TODO);
$vars['PICPATH'] = \SYSTEM\WEBPATH(new \SYSTEM\PSAI(), 'modules/saimod_sys_log/img/');
return \SYSTEM\PAGE\replace::replaceFile(\SYSTEM\SERVERPATH(new \SYSTEM\PSAI(),'modules/saimod_sys_todo/tpl/saimod_sys_todo.tpl'), $vars);
}
public static function sai_mod__SYSTEM_SAI_saimod_sys_todo_action_new(){
$vars = array();
$vars = \SYSTEM\PAGE\text::tag(\SYSTEM\DBD\system_text::TAG_SAI_TODO);
return \SYSTEM\PAGE\replace::replaceFile(\SYSTEM\SERVERPATH(new \SYSTEM\PSAI(),'modules/saimod_sys_todo/tpl/saimod_sys_todo_new.tpl'), $vars);
}
@ -55,8 +55,13 @@ class saimod_sys_todo extends \SYSTEM\SAI\SaiModule {
$result_user .= \SYSTEM\PAGE\replace::replaceFile(\SYSTEM\SERVERPATH(new \SYSTEM\PSAI(),'modules/saimod_sys_todo/tpl/todo_user_list_element.tpl'), $row);
} else {
$result .= \SYSTEM\PAGE\replace::replaceFile(\SYSTEM\SERVERPATH(new \SYSTEM\PSAI(),'modules/saimod_sys_todo/tpl/todo_list_element.tpl'), $row);
}}
return \SYSTEM\PAGE\replace::replaceFile(\SYSTEM\SERVERPATH(new \SYSTEM\PSAI(),'modules/saimod_sys_todo/tpl/todo_list.tpl'), array('todo_user_list_elements' => $result_user,'todo_list_elements' => $result, 'count' => $count));
}
}
$vars = \SYSTEM\PAGE\text::tag(\SYSTEM\DBD\system_text::TAG_SAI_TODO);
$vars['todo_user_list_elements'] = $result_user;
$vars['todo_list_elements'] = $result;
$vars['count'] = $count;
return \SYSTEM\PAGE\replace::replaceFile(\SYSTEM\SERVERPATH(new \SYSTEM\PSAI(),'modules/saimod_sys_todo/tpl/todo_list.tpl'), $vars);
}
public static function sai_mod__SYSTEM_SAI_saimod_sys_todo_action_dotolist(){
@ -78,7 +83,11 @@ class saimod_sys_todo extends \SYSTEM\SAI\SaiModule {
$result .= \SYSTEM\PAGE\replace::replaceFile(\SYSTEM\SERVERPATH(new \SYSTEM\PSAI(),'modules/saimod_sys_todo/tpl/todo_list_element.tpl'), $row);
}
}
return \SYSTEM\PAGE\replace::replaceFile(\SYSTEM\SERVERPATH(new \SYSTEM\PSAI(),'modules/saimod_sys_todo/tpl/todo_list.tpl'), array('todo_user_list_elements' => $result_user,'todo_list_elements' => $result, 'count' => $count));
$vars = \SYSTEM\PAGE\text::tag(\SYSTEM\DBD\system_text::TAG_SAI_TODO);
$vars['todo_user_list_elements'] = $result_user;
$vars['todo_list_elements'] = $result;
$vars['count'] = $count;
return \SYSTEM\PAGE\replace::replaceFile(\SYSTEM\SERVERPATH(new \SYSTEM\PSAI(),'modules/saimod_sys_todo/tpl/todo_list.tpl'), $vars);
}
public static function statistics(){
@ -100,6 +109,7 @@ class saimod_sys_todo extends \SYSTEM\SAI\SaiModule {
public static function sai_mod__SYSTEM_SAI_saimod_sys_todo_action_stats(){
$vars = self::statistics();
$vars = array_merge($vars,\SYSTEM\PAGE\text::tag(\SYSTEM\DBD\system_text::TAG_SAI_TODO));
$vars['entries'] = '';
foreach($vars['data'] as $stat){
$vars['entries'] .= \SYSTEM\PAGE\replace::replaceFile(\SYSTEM\SERVERPATH(new \SYSTEM\PSAI(),'modules/saimod_sys_todo/tpl/todo_stats_entry.tpl'), $stat);
@ -172,12 +182,13 @@ class saimod_sys_todo extends \SYSTEM\SAI\SaiModule {
public static function sai_mod__SYSTEM_SAI_saimod_sys_todo_action_todo($todo){
$vars = \SYSTEM\DBD\SYS_SAIMOD_TODO_TODO::Q1(array($todo));
$vars = array_merge($vars,\SYSTEM\PAGE\text::tag(\SYSTEM\DBD\system_text::TAG_SAI_TODO));
$vars['trace'] = implode('</br>', array_slice(explode('#', $vars['trace']), 1, -1));
return $vars[\SYSTEM\DBD\system_todo::FIELD_TYPE] == \SYSTEM\DBD\system_todo::FIELD_TYPE_USER ?
\SYSTEM\PAGE\replace::replaceFile(\SYSTEM\SERVERPATH(new \SYSTEM\PSAI(),'modules/saimod_sys_todo/tpl/saimod_sys_todo_todo_user.tpl'), $vars) :
\SYSTEM\PAGE\replace::replaceFile(\SYSTEM\SERVERPATH(new \SYSTEM\PSAI(),'modules/saimod_sys_todo/tpl/saimod_sys_todo_todo.tpl'), $vars);}
public static function html_li_menu(){return '<li><a id="menu_todo" href="#!todo">ToDo</a></li>';}
public static function html_li_menu(){return '<li><a id="menu_todo" href="#!todo">${sai_menu_todo}</a></li>';}
public static function right_public(){return false;}
public static function right_right(){return \SYSTEM\SECURITY\Security::check(\SYSTEM\SECURITY\RIGHTS::SYS_SAI);}

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

@ -1,4 +1,4 @@
<h4>System ToDo</h4>
<h4>${sai_todo_title}</h4>
<hr>
<div class="tabbable">
<ul class="nav nav-tabs" id="tabs_todo">

6
sai/modules/saistart_sys_sai/saistart_sys_sai.php
View File

@ -4,9 +4,9 @@ namespace SYSTEM\SAI;
class saistart_sys_sai extends \SYSTEM\SAI\SaiModule {
public static function sai_mod__SYSTEM_SAI_saistart_sys_sai(){
$vars = array_merge(array( 'content' => self::html_content()),
\SYSTEM\PAGE\text::tag('sai_start'));
\SYSTEM\PAGE\text::tag(\SYSTEM\DBD\system_text::TAG_SAI_START));
return \SYSTEM\PAGE\replace::replaceFile( \SYSTEM\WEBPATH(new \SYSTEM\PSAI(),'modules/saistart_sys_sai/tpl/saistart.tpl'),$vars);}
public static function html_li_menu(){return '<li class="active"><a id="menu_start" href="#">'.\SYSTEM\CONFIG\config::get(\SYSTEM\CONFIG\config_ids::SYS_SAI_CONFIG_TITLE).'</a></li>';}
public static function html_li_menu(){return '<li class="active"><a id="menu_start" href="#">${sai_menu_start}</a></li>';}
public static function right_public(){return true;}
public static function right_right(){return true;}
@ -34,7 +34,7 @@ class saistart_sys_sai extends \SYSTEM\SAI\SaiModule {
$vars['isadmin'] = \SYSTEM\SECURITY\Security::check(\SYSTEM\SECURITY\RIGHTS::SYS_SAI) ? "yes" : "no";
$vars = array_merge( $vars,
\SYSTEM\SAI\saimod_sys_todo::statistics(),
\SYSTEM\PAGE\text::tag('sai_start'));
\SYSTEM\PAGE\text::tag(\SYSTEM\DBD\system_text::TAG_SAI_START));
return \SYSTEM\PAGE\replace::replaceFile(\SYSTEM\WEBPATH(new \SYSTEM\PSAI(),'modules/saistart_sys_sai/tpl/content_loggedin.tpl'), $vars);
}
}

5
sai/page/default_page.php
View File

@ -58,10 +58,7 @@ class default_page extends \SYSTEM\PAGE\Page {
$vars['menu_start'] = self::menu_start();
$vars['menu_sys'] = self::menu_sys();
$vars['menu_proj'] = self::menu_proj();
$vars['title'] = \SYSTEM\CONFIG\config::get(\SYSTEM\CONFIG\config_ids::SYS_SAI_CONFIG_TITLE);
$vars['copyright'] = \SYSTEM\CONFIG\config::get(\SYSTEM\CONFIG\config_ids::SYS_SAI_CONFIG_COPYRIGHT);
$vars = array_merge($vars,\SYSTEM\PAGE\text::tag('basic'),\SYSTEM\PAGE\text::tag('sai'));
$vars = array_merge($vars,\SYSTEM\PAGE\text::tag(\SYSTEM\DBD\system_text::TAG_SAI_DEFAULT));
return \SYSTEM\PAGE\replace::replaceFile(\SYSTEM\SERVERPATH(new \SYSTEM\PSAI(),'page/tpl/sai.tpl'), $vars);
}
}

4
sai/page/tpl/sai.tpl
View File

@ -1,7 +1,7 @@
<!DOCTYPE html>
<html>
<head>
<title>${title}</title>
<title>${sai_title}</title>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
<meta name="fragment" content="!start">
<link rel="icon" type="image/png" href="./sai.php?call=files&amp;cat=saistart_sys_sai&amp;id=logo.png"/>
@ -29,7 +29,7 @@
<div id="content-wrapper">
<div id="content"></div>
<hr>
<div id="footer"><p>${copyright}</p></div>
<div id="footer"><p>${sai_copyright}</p></div>
</div>
</body>
</html>

52
system/locale.php
View File

@ -31,56 +31,4 @@ class locale {
return false;}
return true;
}
/* Searches the database locale_string
* $request = either int for category search or array with string ids for stringid search
* $lang is either one of the defined lang strings LANGS or null to use the useselected or default lang of the page.
*
* returns array or throws exception
*/
/*public static function getStrings($request, $lang = NULL) {
if($lang == NULL){
$lang = self::get();}
if(!self::isLang($lang)){
throw new \Exception("The requested language is not supported: ".$lang);}
$q = \SYSTEM\system::isSystemDbInfoPG() ? '"' : '`';
if(\is_array($request)){
$where = '';
foreach($request as $strid){
if(!\preg_match("^[a-zA-Z0-9_]+$^", $strid) != 0){
throw new \Exception("Requested id contains inpropper symbols: ".$strid);}
$where .= 'OR '.$q.\SYSTEM\DBD\system_locale_string::FIELD_ID.$q.' = $1 ';
}
$where = substr($where,2);
//those querys cant be done with qq, since they are dynamic
//they sql string is generated and prepare does not cover all the required parameterization
//hence qq cant be used on this purpose!
$con = new \SYSTEM\DB\Connection(\SYSTEM\system::getSystemDBInfo());
$res = $con->prepare( 'localeArrStmt', 'SELECT '.$q.$lang.$q.','.$q.\SYSTEM\DBD\system_locale_string::FIELD_ID.$q.' FROM '.(\SYSTEM\system::isSystemDbInfoPG() ? \SYSTEM\DBD\system_locale_string::NAME_PG : \SYSTEM\DBD\sytem_locale_string::NAME_MYS).' WHERE '.$where,
$request);
$result = array();
while($r = $res->next()){
$result[$r[\SYSTEM\DBD\system_locale_string::FIELD_ID]] = $r[$lang];}
return $result;
} else if(\intval($request)){
$cat = \intval($request);
$con = new \SYSTEM\DB\Connection( \SYSTEM\system::getSystemDBInfo());
$res = $con->prepare( 'localeStmt', 'SELECT '.$q.$lang.$q.','.$q.\SYSTEM\DBD\system_locale_string::FIELD_ID.$q.' FROM '.(\SYSTEM\system::isSystemDbInfoPG() ? \SYSTEM\DBD\system_locale_string::NAME_PG : \SYSTEM\DBD\system_locale_string::NAME_MYS).' WHERE '.\SYSTEM\DBD\system_locale_string::FIELD_CATEGORY.' = '.(\SYSTEM\system::isSystemDbInfoPG() ? '$1' : '?').';',
array($cat));
$result = array();
while($r = $res->next()){
$result[$r[\SYSTEM\DBD\system_locale_string::FIELD_ID]] = $r[$lang];}
return $result;
}
throw new \Exception("Could not understand given request: ".$request);
}*/
}