diff --git a/sai/modules/autoload.inc b/sai/modules/autoload.inc index b844961..be96b0d 100644 --- a/sai/modules/autoload.inc +++ b/sai/modules/autoload.inc @@ -6,13 +6,13 @@ require_once dirname(__FILE__).'/saistart_sys_sai/autoload.inc'; require_once dirname(__FILE__).'/saimod_sys_analytics/autoload.inc'; require_once dirname(__FILE__).'/saimod_sys_log/autoload.inc'; require_once dirname(__FILE__).'/saimod_sys_security/autoload.inc'; -//require_once dirname(__FILE__).'/saimod_sys_mod/autoload.inc'; +require_once dirname(__FILE__).'/saimod_sys_mod/autoload.inc'; require_once dirname(__FILE__).'/saimod_sys_config/autoload.inc'; //require_once dirname(__FILE__).'/saimod_sys_api/autoload.inc'; //require_once dirname(__FILE__).'/saimod_sys_page/autoload.inc'; require_once dirname(__FILE__).'/saimod_sys_text/autoload.inc'; require_once dirname(__FILE__).'/saimod_sys_files/autoload.inc'; -//require_once dirname(__FILE__).'/saimod_sys_cache/autoload.inc'; +require_once dirname(__FILE__).'/saimod_sys_cache/autoload.inc'; require_once dirname(__FILE__).'/saimod_sys_cron/autoload.inc'; require_once dirname(__FILE__).'/saimod_sys_todo/autoload.inc'; require_once dirname(__FILE__).'/saimod_sys_git/autoload.inc'; diff --git a/sai/modules/saimod_sys_api/autoload.inc b/sai/modules/saimod_sys_api/autoload.inc index fea9aa8..9f5ee17 100644 --- a/sai/modules/saimod_sys_api/autoload.inc +++ b/sai/modules/saimod_sys_api/autoload.inc @@ -2,4 +2,4 @@ \SYSTEM\autoload::registerFolder(dirname(__FILE__),'SYSTEM\SAI'); \SYSTEM\autoload::registerFolder(dirname(__FILE__).'/qq/','SYSTEM\SQL'); -\SYSTEM\SAI\sai::register_sys('\SYSTEM\SAI\saimod_sys_api'); \ No newline at end of file +\SYSTEM\SAI\sai::register('\SYSTEM\SAI\saimod_sys_api'); \ No newline at end of file diff --git a/sai/modules/saimod_sys_cache/autoload.inc b/sai/modules/saimod_sys_cache/autoload.inc index f027232..a55795a 100644 --- a/sai/modules/saimod_sys_cache/autoload.inc +++ b/sai/modules/saimod_sys_cache/autoload.inc @@ -2,4 +2,4 @@ \SYSTEM\autoload::registerFolder(dirname(__FILE__),'SYSTEM\SAI'); \SYSTEM\autoload::registerFolder(dirname(__FILE__).'/qq/','SYSTEM\SQL'); -\SYSTEM\SAI\sai::register_sys('\SYSTEM\SAI\saimod_sys_cache'); \ No newline at end of file +\SYSTEM\SAI\sai::register('\SYSTEM\SAI\saimod_sys_cache'); \ No newline at end of file diff --git a/sai/modules/saimod_sys_cache/saimod_sys_cache.php b/sai/modules/saimod_sys_cache/saimod_sys_cache.php index e0966db..7a074bf 100644 --- a/sai/modules/saimod_sys_cache/saimod_sys_cache.php +++ b/sai/modules/saimod_sys_cache/saimod_sys_cache.php @@ -14,7 +14,7 @@ namespace SYSTEM\SAI; /** * saimod_sys_cache Class provided by System as saimod to manage the system_cache table */ -class saimod_sys_cache extends \SYSTEM\SAI\SaiModule { +class saimod_sys_cache extends \SYSTEM\SAI\sai_module { /** * Generate the HTML for the Saimods startpage * @@ -56,7 +56,11 @@ class saimod_sys_cache extends \SYSTEM\SAI\SaiModule { * * @return string Returns
  • Menu for the Saimod */ - public static function html_li_menu(){return \SYSTEM\PAGE\replace::replaceFile((new \SYSTEM\PSAI('modules/saimod_sys_cache/tpl/menu.tpl'))->SERVERPATH());} + public static function menu(){ + return new sai_module_menu( 10, + sai_module_menu::POISITION_LEFT, + sai_module_menu::DIVIDER_NONE, + \SYSTEM\PAGE\replace::replaceFile((new \SYSTEM\PSAI('modules/saimod_sys_cache/tpl/menu.tpl'))->SERVERPATH()));} /** * Returns if the Saimod is public(access for everyone) diff --git a/sai/modules/saimod_sys_cache/tpl/menu.tpl b/sai/modules/saimod_sys_cache/tpl/menu.tpl index dfd44e1..53e3f46 100644 --- a/sai/modules/saimod_sys_cache/tpl/menu.tpl +++ b/sai/modules/saimod_sys_cache/tpl/menu.tpl @@ -1,5 +1,6 @@
  • +   ${sai_menu_cache} diff --git a/sai/modules/saimod_sys_cache/tpl/saimod_sys_cache.tpl b/sai/modules/saimod_sys_cache/tpl/saimod_sys_cache.tpl index 4718ad6..bfaa2da 100644 --- a/sai/modules/saimod_sys_cache/tpl/saimod_sys_cache.tpl +++ b/sai/modules/saimod_sys_cache/tpl/saimod_sys_cache.tpl @@ -1,23 +1,15 @@ -
    -
    -

       ${sai_cache_title}

    +
    +
    +

       ${sai_cache_title}

    -
    -
    -
    -
    -
    -
    -
    -
    -  Entries: ${count} showing 100 - -

    -
    -
    -
    -
    +
    + + + 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 1315254..46e7e1b 100644 --- a/sai/modules/saimod_sys_docu/tpl/saimod_sys_docu.tpl +++ b/sai/modules/saimod_sys_docu/tpl/saimod_sys_docu.tpl @@ -1,26 +1,15 @@ -
    -
    -

       ${sai_docu_title}

    +
    +
    +

       ${sai_docu_title}

    -
    -
    -
    -
    +
    +
    -
    -
    -
    -
    - -
    -
    - -
    -
    -
    +
    +
    \ No newline at end of file diff --git a/sai/modules/saimod_sys_git/tpl/saimod_sys_git.tpl b/sai/modules/saimod_sys_git/tpl/saimod_sys_git.tpl index 5e9e65b..233e0b1 100644 --- a/sai/modules/saimod_sys_git/tpl/saimod_sys_git.tpl +++ b/sai/modules/saimod_sys_git/tpl/saimod_sys_git.tpl @@ -1,13 +1,10 @@ -
    -
    -

       ${sai_git_title}

    +
    +
    +

       ${sai_git_title}

    -
    -
    -
    -
    +
    +
    + ${panels} +
    -
    -
    - ${panels}
    \ No newline at end of file diff --git a/sai/modules/saimod_sys_login/tpl/logout.tpl b/sai/modules/saimod_sys_login/tpl/logout.tpl index a56e8d2..cbefaca 100644 --- a/sai/modules/saimod_sys_login/tpl/logout.tpl +++ b/sai/modules/saimod_sys_login/tpl/logout.tpl @@ -1,102 +1,102 @@ -
    -

    ${basic_logout}

    -

    ${basic_state_login}

    -
    -
    -
    +  Entries: ${count} showing max 100 + +
    Cache Ident
    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
    ${basic_username}
    ${basic_email} - - -
    ${basic_password} - **** - -
    ${basic_last_active}
    ${basic_join_date}
    ${basic_locale} - - -
    ${basic_admin_rights}${isadmin}
    -
    -
    -
    -
    - - +
    +
    +

       ${basic_state_login}

    - - +
    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    ${basic_username}
    ${basic_email} + + +
    ${basic_password} + **** + +
    ${basic_last_active}
    ${basic_join_date}
    ${basic_locale} + + +
    ${basic_admin_rights}${isadmin}
    +
    +
    +
    + + +
    +
    +
    +
    \ No newline at end of file diff --git a/sai/modules/saimod_sys_mod/autoload.inc b/sai/modules/saimod_sys_mod/autoload.inc index 8991bad..7ae5529 100644 --- a/sai/modules/saimod_sys_mod/autoload.inc +++ b/sai/modules/saimod_sys_mod/autoload.inc @@ -1,5 +1,4 @@ ' : ''; - $v['you'] = \call_user_func(array($mod, 'right_right')) ? '' : ''; + $v['public'] = \call_user_func(array($mod, 'right_public')) ? '' : ''; + $v['you'] = \call_user_func(array($mod, 'right_right')) ? '' : ''; $vars['entries'] .= \SYSTEM\PAGE\replace::replaceFile((new \SYSTEM\PSAI('modules/saimod_sys_mod/tpl/mod_tr.tpl'))->SERVERPATH(),$v); } $mod = \SYSTEM\SAI\sai::getStartModule(); $start = array(); $start['start_class'] = $mod; - $start['start_public'] = \call_user_func(array($mod, 'right_public')) ? '' : ''; - $start['start_access'] = \call_user_func(array($mod, 'right_right')) ? '' : ''; + $start['start_public'] = \call_user_func(array($mod, 'right_public')) ? '' : ''; + $start['start_access'] = \call_user_func(array($mod, 'right_right')) ? '' : ''; $vars['saistart'] = \SYSTEM\PAGE\replace::replaceFile((new \SYSTEM\PSAI('modules/saimod_sys_mod/tpl/saistart.tpl'))->SERVERPATH(),$start); return \SYSTEM\PAGE\replace::replaceFile((new \SYSTEM\PSAI('modules/saimod_sys_mod/tpl/mod_table.tpl'))->SERVERPATH(),$vars); } - /** - * Generate the HTML for the Project Page - * - * @return string Returns HTML - */ - public static function sai_mod__SYSTEM_SAI_saimod_sys_mod_action_project(){ - $vars = \SYSTEM\PAGE\text::tag(\SYSTEM\SQL\system_text::TAG_SAI_MOD); - $vars['entries'] = $vars['saistart'] = ''; - $mods = \SYSTEM\SAI\sai::getModules(); - foreach($mods as $mod){ - $v = array(); - $v['mod'] = $mod; - $v['public'] = \call_user_func(array($mod, 'right_public')) ? '' : ''; - $v['you'] = \call_user_func(array($mod, 'right_right')) ? '' : ''; - $vars['entries'] .= \SYSTEM\PAGE\replace::replaceFile((new \SYSTEM\PSAI('modules/saimod_sys_mod/tpl/mod_tr.tpl'))->SERVERPATH(),$v); - } - return \SYSTEM\PAGE\replace::replaceFile((new \SYSTEM\PSAI('modules/saimod_sys_mod/tpl/mod_table.tpl'))->SERVERPATH(),$vars); - } - /** * Generate the HTML for the Lib Page * @@ -96,7 +77,11 @@ class saimod_sys_mod extends \SYSTEM\SAI\SaiModule { * * @return string Returns
  • Menu for the Saimod */ - public static function html_li_menu(){return \SYSTEM\PAGE\replace::replaceFile((new \SYSTEM\PSAI('modules/saimod_sys_mod/tpl/menu.tpl'))->SERVERPATH());} + public static function menu(){ + return new sai_module_menu( 10, + sai_module_menu::POISITION_LEFT, + sai_module_menu::DIVIDER_NONE, + \SYSTEM\PAGE\replace::replaceFile((new \SYSTEM\PSAI('modules/saimod_sys_mod/tpl/menu.tpl'))->SERVERPATH()));} /** * Returns if the Saimod is public(access for everyone) diff --git a/sai/modules/saimod_sys_mod/tpl/lib_table.tpl b/sai/modules/saimod_sys_mod/tpl/lib_table.tpl index 204f4b9..5b2efe6 100644 --- a/sai/modules/saimod_sys_mod/tpl/lib_table.tpl +++ b/sai/modules/saimod_sys_mod/tpl/lib_table.tpl @@ -1,4 +1,4 @@ - +
    diff --git a/sai/modules/saimod_sys_mod/tpl/menu.tpl b/sai/modules/saimod_sys_mod/tpl/menu.tpl index 7d972c7..4de2a63 100644 --- a/sai/modules/saimod_sys_mod/tpl/menu.tpl +++ b/sai/modules/saimod_sys_mod/tpl/menu.tpl @@ -1,5 +1,6 @@
  • +   ${sai_menu_mod} diff --git a/sai/modules/saimod_sys_mod/tpl/mod_table.tpl b/sai/modules/saimod_sys_mod/tpl/mod_table.tpl index 5a9779f..4378bf0 100644 --- a/sai/modules/saimod_sys_mod/tpl/mod_table.tpl +++ b/sai/modules/saimod_sys_mod/tpl/mod_table.tpl @@ -1,4 +1,4 @@ -
    • ${table_class}
    +
    diff --git a/sai/modules/saimod_sys_mod/tpl/saimod_sys_mod.tpl b/sai/modules/saimod_sys_mod/tpl/saimod_sys_mod.tpl index 91aab1d..33231fc 100644 --- a/sai/modules/saimod_sys_mod/tpl/saimod_sys_mod.tpl +++ b/sai/modules/saimod_sys_mod/tpl/saimod_sys_mod.tpl @@ -1,24 +1,12 @@ -
    -
    -

       ${sai_mod_title}

    +
    +
    +

       ${sai_mod_title}

    -
    -
    -
    -
    -
    -
    -
    -
    -
    - -
    -
    -
    -
    +
    +
    +
    \ No newline at end of file diff --git a/sai/page/tpl/sai.tpl b/sai/page/tpl/sai.tpl index e12463f..71aee44 100644 --- a/sai/page/tpl/sai.tpl +++ b/sai/page/tpl/sai.tpl @@ -59,7 +59,7 @@ table.tablesorter thead tr th.tablesorter-headerDesc:after {
      ${menu_left}
    -
      +
      • diff --git a/sql/mysql/data/system_page.sql b/sql/mysql/data/system_page.sql index 6ec5552..1dba2a8 100644 --- a/sql/mysql/data/system_page.sql +++ b/sql/mysql/data/system_page.sql @@ -33,8 +33,8 @@ REPLACE INTO `system_page` (`id`, `group`, `name`, `state`, `parent_id`, `login` REPLACE INTO `system_page` (`id`, `group`, `name`, `state`, `parent_id`, `login`, `type`, `div`, `url`, `func`, `php_class`) VALUES (82, 42, 'resetpassword', 'login', 80, 0, 1, '#content', './sai.php?sai_mod=.SYSTEM.SAI.saimod_sys_login&action=resetpassword', 'init_saimod_sys_resetpassword', '\\SYSTEM\\SAI\\saimod_sys_login'); REPLACE INTO `system_page` (`id`, `group`, `name`, `state`, `parent_id`, `login`, `type`, `div`, `url`, `func`, `php_class`) VALUES (90, 42, 'mod', 'mod', -1, 0, 0, '#content', './sai.php?sai_mod=.SYSTEM.SAI.saimod_sys_mod', 'init_saimod_sys_mod', '\\SYSTEM\\SAI\\saimod_sys_mod'); -REPLACE INTO `system_page` (`id`, `group`, `name`, `state`, `parent_id`, `login`, `type`, `div`, `url`, `func`, `php_class`) VALUES (91, 42, 'system', 'mod', 90, 0, 0, '#tab_mod', './sai.php?sai_mod=.SYSTEM.SAI.saimod_sys_mod&action=system', 'init_saimod_sys_mod_system', '\\SYSTEM\\SAI\\saimod_sys_mod'); -REPLACE INTO `system_page` (`id`, `group`, `name`, `state`, `parent_id`, `login`, `type`, `div`, `url`, `func`, `php_class`) VALUES (92, 42, 'project', 'mod', 90, 0, 1, '#tab_mod', './sai.php?sai_mod=.SYSTEM.SAI.saimod_sys_mod&action=project', 'init_saimod_sys_mod_project', '\\SYSTEM\\SAI\\saimod_sys_mod'); +-- REPLACE INTO `system_page` (`id`, `group`, `name`, `state`, `parent_id`, `login`, `type`, `div`, `url`, `func`, `php_class`) VALUES (91, 42, 'system', 'mod', 90, 0, 0, '#tab_mod', './sai.php?sai_mod=.SYSTEM.SAI.saimod_sys_mod&action=system', 'init_saimod_sys_mod_system', '\\SYSTEM\\SAI\\saimod_sys_mod'); +-- REPLACE INTO `system_page` (`id`, `group`, `name`, `state`, `parent_id`, `login`, `type`, `div`, `url`, `func`, `php_class`) VALUES (92, 42, 'project', 'mod', 90, 0, 1, '#tab_mod', './sai.php?sai_mod=.SYSTEM.SAI.saimod_sys_mod&action=project', 'init_saimod_sys_mod_project', '\\SYSTEM\\SAI\\saimod_sys_mod'); REPLACE INTO `system_page` (`id`, `group`, `name`, `state`, `parent_id`, `login`, `type`, `div`, `url`, `func`, `php_class`) VALUES (93, 42, 'lib', 'mod', 90, 0, 1, '#tab_mod', './sai.php?sai_mod=.SYSTEM.SAI.saimod_sys_mod&action=lib', 'init_saimod_sys_mod_lib', '\\SYSTEM\\SAI\\saimod_sys_mod'); REPLACE INTO `system_page` (`id`, `group`, `name`, `state`, `parent_id`, `login`, `type`, `div`, `url`, `func`, `php_class`) VALUES (100, 42, 'security', 'security', -1, 0, 0, '#content', './sai.php?sai_mod=.SYSTEM.SAI.saimod_sys_security', 'init_saimod_sys_security', '\\SYSTEM\\SAI\\saimod_sys_security');
    Classname