diff --git a/config/config_ids.php b/config/config_ids.php index 5767e80..5ef336d 100644 --- a/config/config_ids.php +++ b/config/config_ids.php @@ -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; } \ No newline at end of file diff --git a/dbd/tbl/system_text.php b/dbd/tbl/system_text.php index 0821c91..65d9101 100644 --- a/dbd/tbl/system_text.php +++ b/dbd/tbl/system_text.php @@ -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; } \ No newline at end of file diff --git a/sai/modules/saimod_sys_api/saimod_sys_api.php b/sai/modules/saimod_sys_api/saimod_sys_api.php index c0cc685..4ed564f 100644 --- a/sai/modules/saimod_sys_api/saimod_sys_api.php +++ b/sai/modules/saimod_sys_api/saimod_sys_api.php @@ -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 '
  • API
    • ';} + public static function html_li_menu(){return '
  • ${sai_menu_api}
    • ';} 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);} diff --git a/sai/modules/saimod_sys_api/tpl/saimod_sys_api.tpl b/sai/modules/saimod_sys_api/tpl/saimod_sys_api.tpl index 41d4a58..5d91ff0 100644 --- a/sai/modules/saimod_sys_api/tpl/saimod_sys_api.tpl +++ b/sai/modules/saimod_sys_api/tpl/saimod_sys_api.tpl @@ -1,4 +1,4 @@ -

    System API

    +

    ${sai_api_title}

    +

    ${sai_cron_title}

    +
    +Last Visit: ${last_visit}
    +Start Cron +
    + + + + + + + + + + + + + + ${content} + + + + + + + + + + + + +
    classminhourdayday_weekmonthlast_runnext_runstatusaction
    diff --git a/sai/modules/saimod_sys_docu/saimod_sys_docu.php b/sai/modules/saimod_sys_docu/saimod_sys_docu.php index 72c6df4..7c7c4c1 100644 --- a/sai/modules/saimod_sys_docu/saimod_sys_docu.php +++ b/sai/modules/saimod_sys_docu/saimod_sys_docu.php @@ -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 '
  • Docu
    • ';} + public static function html_li_menu(){return '
  • ${sai_menu_docu}
    • ';} public static function right_public(){return false;} public static function right_right(){return \SYSTEM\SECURITY\Security::check(\SYSTEM\SECURITY\RIGHTS::SYS_SAI);} diff --git a/sai/modules/saimod_sys_docu/tpl/saimod_sys_docu.tpl b/sai/modules/saimod_sys_docu/tpl/saimod_sys_docu.tpl index 7c25905..206cd82 100644 --- a/sai/modules/saimod_sys_docu/tpl/saimod_sys_docu.tpl +++ b/sai/modules/saimod_sys_docu/tpl/saimod_sys_docu.tpl @@ -1,4 +1,4 @@ -

    System Documentation

    +

    ${sai_docu_title}