From 3f12f77ee000a0eba0aaaccdfff6066b5eddcec9 Mon Sep 17 00:00:00 2001 From: Ulf Gebhardt Date: Thu, 31 May 2018 02:36:57 +0200 Subject: [PATCH] reincluded saimod files & cron --- sai/modules/autoload.inc | 4 +-- sai/modules/saimod_sys_cron/autoload.inc | 2 +- .../saimod_sys_cron/saimod_sys_cron.php | 8 ++++-- sai/modules/saimod_sys_cron/tpl/menu.tpl | 1 + .../saimod_sys_cron/tpl/saimod_sys_cron.tpl | 21 +++++++------- sai/modules/saimod_sys_files/autoload.inc | 3 +- .../saimod_sys_files/saimod_sys_files.php | 8 ++++-- sai/modules/saimod_sys_files/tpl/menu.tpl | 1 + .../saimod_sys_files/tpl/saimod_sys_files.tpl | 28 ++++++------------- .../tpl/saimod_sys_files_list.tpl | 1 - .../tpl/saimod_sys_files_tabopt.tpl | 2 +- 11 files changed, 38 insertions(+), 41 deletions(-) diff --git a/sai/modules/autoload.inc b/sai/modules/autoload.inc index 65f0dce..3fd80d5 100644 --- a/sai/modules/autoload.inc +++ b/sai/modules/autoload.inc @@ -11,9 +11,9 @@ 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_files/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_cron/autoload.inc'; require_once dirname(__FILE__).'/saimod_sys_todo/autoload.inc'; require_once dirname(__FILE__).'/saimod_sys_git/autoload.inc'; require_once dirname(__FILE__).'/saimod_sys_docu/autoload.inc'; diff --git a/sai/modules/saimod_sys_cron/autoload.inc b/sai/modules/saimod_sys_cron/autoload.inc index fc4e5c6..252c7af 100644 --- a/sai/modules/saimod_sys_cron/autoload.inc +++ b/sai/modules/saimod_sys_cron/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_cron'); \ No newline at end of file +\SYSTEM\SAI\sai::register('\SYSTEM\SAI\saimod_sys_cron'); \ No newline at end of file diff --git a/sai/modules/saimod_sys_cron/saimod_sys_cron.php b/sai/modules/saimod_sys_cron/saimod_sys_cron.php index 4070349..e2e2b3b 100644 --- a/sai/modules/saimod_sys_cron/saimod_sys_cron.php +++ b/sai/modules/saimod_sys_cron/saimod_sys_cron.php @@ -14,7 +14,7 @@ namespace SYSTEM\SAI; /** * saimod_sys_cron Class provided by System as saimod to manage the system_cron table */ -class saimod_sys_cron extends \SYSTEM\SAI\SaiModule { +class saimod_sys_cron extends \SYSTEM\SAI\sai_module { /** * Generate the HTML for the Saimods startpage * @@ -99,7 +99,11 @@ class saimod_sys_cron 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_cron/tpl/menu.tpl'))->SERVERPATH());} + public static function menu(){ + return new sai_module_menu( 5, + sai_module_menu::POISITION_LEFT, + sai_module_menu::DIVIDER_NONE, + \SYSTEM\PAGE\replace::replaceFile((new \SYSTEM\PSAI('modules/saimod_sys_cron/tpl/menu.tpl'))->SERVERPATH()));} /** * Returns if the Saimod is public(access for everyone) diff --git a/sai/modules/saimod_sys_cron/tpl/menu.tpl b/sai/modules/saimod_sys_cron/tpl/menu.tpl index 017eca0..e62df72 100644 --- a/sai/modules/saimod_sys_cron/tpl/menu.tpl +++ b/sai/modules/saimod_sys_cron/tpl/menu.tpl @@ -1,5 +1,6 @@
  • +   ${sai_menu_cron} diff --git a/sai/modules/saimod_sys_cron/tpl/saimod_sys_cron.tpl b/sai/modules/saimod_sys_cron/tpl/saimod_sys_cron.tpl index 5854e30..d801a6e 100644 --- a/sai/modules/saimod_sys_cron/tpl/saimod_sys_cron.tpl +++ b/sai/modules/saimod_sys_cron/tpl/saimod_sys_cron.tpl @@ -1,17 +1,12 @@ -
    -
    -

       ${sai_cron_title}

    +
    +
    +

       ${sai_cron_title}

    -
    -
    -
    -
    -
    -
    -
     Last Visit: ${last_visit}
     Start Cron +
    +
    @@ -47,3 +42,9 @@ + +
    +
    + +
    +
    diff --git a/sai/modules/saimod_sys_files/autoload.inc b/sai/modules/saimod_sys_files/autoload.inc index c1ca53a..d1a096b 100644 --- a/sai/modules/saimod_sys_files/autoload.inc +++ b/sai/modules/saimod_sys_files/autoload.inc @@ -1,5 +1,4 @@ Menu for the Saimod */ - public static function html_li_menu(){return \SYSTEM\PAGE\replace::replaceFile((new \SYSTEM\PSAI('modules/saimod_sys_files/tpl/menu.tpl'))->SERVERPATH());} + public static function menu(){ + return new sai_module_menu( 2, + sai_module_menu::POISITION_LEFT, + sai_module_menu::DIVIDER_NONE, + \SYSTEM\PAGE\replace::replaceFile((new \SYSTEM\PSAI('modules/saimod_sys_files/tpl/menu.tpl'))->SERVERPATH()));} /** * Returns if the Saimod is public(access for everyone) diff --git a/sai/modules/saimod_sys_files/tpl/menu.tpl b/sai/modules/saimod_sys_files/tpl/menu.tpl index c868f61..4c6aab7 100644 --- a/sai/modules/saimod_sys_files/tpl/menu.tpl +++ b/sai/modules/saimod_sys_files/tpl/menu.tpl @@ -1,5 +1,6 @@
  • +   ${sai_menu_files} diff --git a/sai/modules/saimod_sys_files/tpl/saimod_sys_files.tpl b/sai/modules/saimod_sys_files/tpl/saimod_sys_files.tpl index f975dc4..e23fbf6 100644 --- a/sai/modules/saimod_sys_files/tpl/saimod_sys_files.tpl +++ b/sai/modules/saimod_sys_files/tpl/saimod_sys_files.tpl @@ -1,23 +1,11 @@ -
    -
    -

       ${sai_files_title}

    -
     ${sai_files_title_warning}
    +
    +
    +

       ${sai_files_title}

    -
    -
    -
    -
    -
    -
    -
    -
    -
    - -
    -
    -
    -
    +
    +
    +
    \ No newline at end of file diff --git a/sai/modules/saimod_sys_files/tpl/saimod_sys_files_list.tpl b/sai/modules/saimod_sys_files/tpl/saimod_sys_files_list.tpl index 5503867..70bdc1c 100644 --- a/sai/modules/saimod_sys_files/tpl/saimod_sys_files_list.tpl +++ b/sai/modules/saimod_sys_files/tpl/saimod_sys_files_list.tpl @@ -13,7 +13,6 @@ ${content}
    • -
    diff --git a/sai/modules/saimod_sys_files/tpl/saimod_sys_files_tabopt.tpl b/sai/modules/saimod_sys_files/tpl/saimod_sys_files_tabopt.tpl index cdd0fb4..e2a950b 100644 --- a/sai/modules/saimod_sys_files/tpl/saimod_sys_files_tabopt.tpl +++ b/sai/modules/saimod_sys_files/tpl/saimod_sys_files_tabopt.tpl @@ -1 +1 @@ -
  • ${name}
    • \ No newline at end of file +
  • ${name}
    • \ No newline at end of file