diff --git a/cache/cache_js.php b/cache/cache_js.php index 240c0c7..8b87cb4 100644 --- a/cache/cache_js.php +++ b/cache/cache_js.php @@ -47,7 +47,7 @@ class cache_js { public static function ident($files){ $ident = ''; foreach($files as $f){ - $ident .= $f->SERVERPATH().';';} + $ident .= $f->SERVERPATH().';'.filemtime($f->SERVERPATH()).';';} return sha1($ident); } diff --git a/lib/system/lib/system.css b/lib/system/lib/system.css index 59d53c2..60f40c1 100644 --- a/lib/system/lib/system.css +++ b/lib/system/lib/system.css @@ -7,18 +7,13 @@ table.sai_table tr:nth-child(odd) { table.sai_table tr:hover { background-color: #FFEFD5; } -table.sai_table { - word-break: break-all; -} a.active{ background-color: #e7e7e7; } #menu_start { - height: 50px; font-size: 20px; - padding-top: 12px; padding-left: 15px; padding-right: 15px; display: block; diff --git a/log/error_handler/error_handler_dbwriter.php b/log/error_handler/error_handler_dbwriter.php index 41c6ceb..3804ecb 100644 --- a/log/error_handler/error_handler_dbwriter.php +++ b/log/error_handler/error_handler_dbwriter.php @@ -33,10 +33,35 @@ class error_handler_dbwriter implements \SYSTEM\LOG\error_handler { array_key_exists('HTTP_USER_AGENT',$_SERVER) ? $_SERVER['HTTP_USER_AGENT'] : null, ($user = \SYSTEM\SECURITY\security::getUser()) ? $user->id : null,$thrown ? 1 : 0)); if(!\property_exists(get_class($E), 'do_not_todo_log')){ - \SYSTEM\SAI\saimod_sys_todo::exception($E,false);} + self::todo_exception($E,false);} } catch (\Exception $E){ return false;} //Error -> Ignore return false; //We just log and do not handle the error! - } + } + + /** + * Save a Exception as ToDo in the Database + * This is used as Errorhandler in some form. + * + * @param \Exception $E Exception to be saved + * @param bool $thrown Was the Exception thrown? + * @param int $type Type of the Todo(Exception) + * @return bool Returns false + */ + public static function todo_exception(\Exception $E, $thrown, $type = \SYSTEM\SQL\system_todo::FIELD_TYPE_EXCEPTION){ + try{ + if(\property_exists(get_class($E), 'todo_logged') && $E->todo_logged){ + return false;} //alrdy logged(this prevents proper thrown value for every system exception) + \SYSTEM\SQL\SYS_LOG_TODO_INSERT::Q1(array( get_class($E), $E->getMessage(), $E->getCode(), $E->getFile(), $E->getLine(), $E->getTraceAsString(), + getenv('REMOTE_ADDR'),round(microtime(true) - \SYSTEM\time::getStartTime(),5),date('Y-m-d H:i:s', microtime(true)), + $_SERVER["SERVER_NAME"],$_SERVER["SERVER_PORT"],$_SERVER['REQUEST_URI'], serialize($_POST), + array_key_exists('HTTP_REFERER', $_SERVER) ? $_SERVER['HTTP_REFERER'] : null, + array_key_exists('HTTP_USER_AGENT',$_SERVER) ? $_SERVER['HTTP_USER_AGENT'] : null, + ($user = \SYSTEM\SECURITY\security::getUser()) ? $user->id : null,$thrown ? 1 : 0,$E->getMessage(),$type)); + if(\property_exists(get_class($E), 'logged')){ + $E->todo_logged = true;} //we just did log + } catch (\Exception $E){return false;} //Error -> Ignore + return false; //We just log and do not handle the error! + } } \ No newline at end of file diff --git a/sai/modules/saimod_sys_todo/qq/SYS_SAIMOD_TODO_EXCEPTION_INSERT.php b/log/qq/SYS_LOG_TODO_INSERT.php similarity index 98% rename from sai/modules/saimod_sys_todo/qq/SYS_SAIMOD_TODO_EXCEPTION_INSERT.php rename to log/qq/SYS_LOG_TODO_INSERT.php index 569a28d..7e5544b 100644 --- a/sai/modules/saimod_sys_todo/qq/SYS_SAIMOD_TODO_EXCEPTION_INSERT.php +++ b/log/qq/SYS_LOG_TODO_INSERT.php @@ -14,7 +14,7 @@ namespace SYSTEM\SQL; /** * QQ to log a execption to system_todo */ -class SYS_SAIMOD_TODO_EXCEPTION_INSERT extends \SYSTEM\DB\QP { +class SYS_LOG_TODO_INSERT extends \SYSTEM\DB\QP { /** * Get Classname of the QQ * diff --git a/sai/modules/autoload.inc b/sai/modules/autoload.inc index 0f10e62..9f7db1b 100644 --- a/sai/modules/autoload.inc +++ b/sai/modules/autoload.inc @@ -4,15 +4,15 @@ SYSTEM\autoload::registerFolder(dirname(__FILE__),'SYSTEM\SAI'); require_once dirname(__FILE__).'/saistart_sys_sai/autoload.inc'; //System Mod 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_security/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_cron/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_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_api/tpl/menu.tpl b/sai/modules/saimod_sys_api/tpl/menu.tpl index 9f500e8..1b3dc7e 100644 --- a/sai/modules/saimod_sys_api/tpl/menu.tpl +++ b/sai/modules/saimod_sys_api/tpl/menu.tpl @@ -1,6 +1,6 @@ -
  • + + +   ${sai_menu_api}
    • \ No newline at end of file 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 d42ac6c..3d47306 100644 --- a/sai/modules/saimod_sys_api/tpl/saimod_sys_api.tpl +++ b/sai/modules/saimod_sys_api/tpl/saimod_sys_api.tpl @@ -1,6 +1,6 @@
    -

       ${sai_api_title}

    +

       ${sai_api_title}

    @@ -12,9 +12,9 @@
    diff --git a/sai/modules/saimod_sys_api/tpl/tabopt.tpl b/sai/modules/saimod_sys_api/tpl/tabopt.tpl index 04f8d55..fc46dbf 100644 --- a/sai/modules/saimod_sys_api/tpl/tabopt.tpl +++ b/sai/modules/saimod_sys_api/tpl/tabopt.tpl @@ -1 +1 @@ -
  • Group ${tab_id}
    • \ No newline at end of file +
  • Group ${tab_id}
    • \ No newline at end of file diff --git a/sai/modules/saimod_sys_cache/tpl/menu.tpl b/sai/modules/saimod_sys_cache/tpl/menu.tpl index 6820f8c..62c05bb 100644 --- a/sai/modules/saimod_sys_cache/tpl/menu.tpl +++ b/sai/modules/saimod_sys_cache/tpl/menu.tpl @@ -1,6 +1,6 @@ -
  • + + +   ${sai_menu_cache}
    • \ No newline at end of file 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 651d2bf..4718ad6 100644 --- a/sai/modules/saimod_sys_cache/tpl/saimod_sys_cache.tpl +++ b/sai/modules/saimod_sys_cache/tpl/saimod_sys_cache.tpl @@ -1,6 +1,6 @@
    -

       ${sai_cache_title}

    +

       ${sai_cache_title}

    @@ -11,7 +11,7 @@
     Entries: ${count} showing 100 - +

    diff --git a/sai/modules/saimod_sys_config/autoload.inc b/sai/modules/saimod_sys_config/autoload.inc index 6ff1d6a..2d4803a 100644 --- a/sai/modules/saimod_sys_config/autoload.inc +++ b/sai/modules/saimod_sys_config/autoload.inc @@ -1,5 +1,4 @@ SERVERPATH(), - array( 'id' =>\SYSTEM\CONFIG\config_ids::SYS_CONFIG_ERRORREPORTING, - 'name' =>'\SYSTEM\CONFIG\config_ids::SYS_CONFIG_ERRORREPORTING', - 'value' =>\SYSTEM\CONFIG\config::get(\SYSTEM\CONFIG\config_ids::SYS_CONFIG_ERRORREPORTING))); - $vars['basics'] .= \SYSTEM\PAGE\replace::replaceFile((new \SYSTEM\PSAI('modules/saimod_sys_config/tpl/config_tr.tpl'))->SERVERPATH(), - array( 'id' =>\SYSTEM\CONFIG\config_ids::SYS_CONFIG_PATH_BASEURL, - 'name' =>'\SYSTEM\CONFIG\config_ids::SYS_CONFIG_PATH_BASEURL', - 'value' =>\SYSTEM\CONFIG\config::get(\SYSTEM\CONFIG\config_ids::SYS_CONFIG_PATH_BASEURL))); - $vars['basics'] .= \SYSTEM\PAGE\replace::replaceFile((new \SYSTEM\PSAI('modules/saimod_sys_config/tpl/config_tr.tpl'))->SERVERPATH(), - array( 'id' =>\SYSTEM\CONFIG\config_ids::SYS_CONFIG_PATH_BASEPATH, - 'name' =>'\SYSTEM\CONFIG\config_ids::SYS_CONFIG_PATH_BASEPATH', - 'value' =>\SYSTEM\CONFIG\config::get(\SYSTEM\CONFIG\config_ids::SYS_CONFIG_PATH_BASEPATH))); - $vars['basics'] .= \SYSTEM\PAGE\replace::replaceFile((new \SYSTEM\PSAI('modules/saimod_sys_config/tpl/config_tr.tpl'))->SERVERPATH(), - array( 'id' =>\SYSTEM\CONFIG\config_ids::SYS_CONFIG_PATH_SYSTEMPATHREL, - 'name' =>'\SYSTEM\CONFIG\config_ids::SYS_CONFIG_PATH_SYSTEMPATHREL', - 'value' =>\SYSTEM\CONFIG\config::get(\SYSTEM\CONFIG\config_ids::SYS_CONFIG_PATH_SYSTEMPATHREL))); - $vars['basics'] .= \SYSTEM\PAGE\replace::replaceFile((new \SYSTEM\PSAI('modules/saimod_sys_config/tpl/config_tr.tpl'))->SERVERPATH(), - array( 'id' =>\SYSTEM\CONFIG\config_ids::SYS_CONFIG_DEFAULT_RESULT, - 'name' =>'\SYSTEM\CONFIG\config_ids::SYS_CONFIG_DEFAULT_RESULT', - 'value' =>\SYSTEM\CONFIG\config::get(\SYSTEM\CONFIG\config_ids::SYS_CONFIG_DEFAULT_RESULT))); - $vars['basics'] .= \SYSTEM\PAGE\replace::replaceFile((new \SYSTEM\PSAI('modules/saimod_sys_config/tpl/config_tr.tpl'))->SERVERPATH(), - array( 'id' =>\SYSTEM\CONFIG\config_ids::SYS_CONFIG_LANGS, - 'name' =>'\SYSTEM\CONFIG\config_ids::SYS_CONFIG_LANGS', - 'value' =>implode(',',\SYSTEM\CONFIG\config::get(\SYSTEM\CONFIG\config_ids::SYS_CONFIG_LANGS)))); - $vars['basics'] .= \SYSTEM\PAGE\replace::replaceFile((new \SYSTEM\PSAI('modules/saimod_sys_config/tpl/config_tr.tpl'))->SERVERPATH(), - array( 'id' =>\SYSTEM\CONFIG\config_ids::SYS_CONFIG_DEFAULT_LANG, - 'name' =>'\SYSTEM\CONFIG\config_ids::SYS_CONFIG_DEFAULT_LANG', - 'value' =>\SYSTEM\CONFIG\config::get(\SYSTEM\CONFIG\config_ids::SYS_CONFIG_DEFAULT_LANG))); - - $vars['database'] .=\SYSTEM\PAGE\replace::replaceFile((new \SYSTEM\PSAI('modules/saimod_sys_config/tpl/config_tr.tpl'))->SERVERPATH(), - array( 'id' =>\SYSTEM\CONFIG\config_ids::SYS_CONFIG_DB_TYPE, - 'name' =>'\SYSTEM\CONFIG\config_ids::SYS_CONFIG_DB_TYPE', - 'value' =>\SYSTEM\CONFIG\config::get(\SYSTEM\CONFIG\config_ids::SYS_CONFIG_DB_TYPE))); - $vars['database'] .=\SYSTEM\PAGE\replace::replaceFile((new \SYSTEM\PSAI('modules/saimod_sys_config/tpl/config_tr.tpl'))->SERVERPATH(), - array( 'id' =>\SYSTEM\CONFIG\config_ids::SYS_CONFIG_DB_HOST, - 'name' =>'\SYSTEM\CONFIG\config_ids::SYS_CONFIG_DB_HOST', - 'value' =>\SYSTEM\CONFIG\config::get(\SYSTEM\CONFIG\config_ids::SYS_CONFIG_DB_HOST))); - $vars['database'] .=\SYSTEM\PAGE\replace::replaceFile((new \SYSTEM\PSAI('modules/saimod_sys_config/tpl/config_tr.tpl'))->SERVERPATH(), - array( 'id' =>\SYSTEM\CONFIG\config_ids::SYS_CONFIG_DB_PORT, - 'name' =>'\SYSTEM\CONFIG\config_ids::SYS_CONFIG_DB_PORT', - 'value' =>\SYSTEM\CONFIG\config::get(\SYSTEM\CONFIG\config_ids::SYS_CONFIG_DB_PORT))); - $vars['database'] .=\SYSTEM\PAGE\replace::replaceFile((new \SYSTEM\PSAI('modules/saimod_sys_config/tpl/config_tr.tpl'))->SERVERPATH(), - array( 'id' =>\SYSTEM\CONFIG\config_ids::SYS_CONFIG_DB_USER, - 'name' =>'\SYSTEM\CONFIG\config_ids::SYS_CONFIG_DB_USER', - 'value' =>\SYSTEM\CONFIG\config::get(\SYSTEM\CONFIG\config_ids::SYS_CONFIG_DB_USER))); - $vars['database'] .=\SYSTEM\PAGE\replace::replaceFile((new \SYSTEM\PSAI('modules/saimod_sys_config/tpl/config_tr.tpl'))->SERVERPATH(), - array( 'id' =>\SYSTEM\CONFIG\config_ids::SYS_CONFIG_DB_PASSWORD, - 'name' =>'\SYSTEM\CONFIG\config_ids::SYS_CONFIG_DB_PASSWORD', - 'value' =>'<hidden>')); - $vars['database'] .=\SYSTEM\PAGE\replace::replaceFile((new \SYSTEM\PSAI('modules/saimod_sys_config/tpl/config_tr.tpl'))->SERVERPATH(), - array( 'id' =>\SYSTEM\CONFIG\config_ids::SYS_CONFIG_DB_DBNAME, - 'name' =>'\SYSTEM\CONFIG\config_ids::SYS_CONFIG_DB_DBNAME', - 'value' =>\SYSTEM\CONFIG\config::get(\SYSTEM\CONFIG\config_ids::SYS_CONFIG_DB_DBNAME))); - - $vars['sai'] .= \SYSTEM\PAGE\replace::replaceFile((new \SYSTEM\PSAI('modules/saimod_sys_config/tpl/config_tr.tpl'))->SERVERPATH(), - 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))); return \SYSTEM\PAGE\replace::replaceFile((new \SYSTEM\PSAI('modules/saimod_sys_config/tpl/saimod_sys_config.tpl'))->SERVERPATH(),$vars); } @@ -90,38 +31,37 @@ class saimod_sys_config extends \SYSTEM\SAI\SaiModule { * @return string Returns HTML */ public static function sai_mod__SYSTEM_SAI_saimod_sys_config_action_basics(){ - $vars = \SYSTEM\PAGE\text::tag(\SYSTEM\SQL\system_text::TAG_SAI_CONFIG); - $vars['basics'] = $vars['database'] = $vars['sai'] = ''; - $vars['basics'] .= \SYSTEM\PAGE\replace::replaceFile((new \SYSTEM\PSAI('modules/saimod_sys_config/tpl/config_tr.tpl'))->SERVERPATH(), + $result = ''; + $result .= \SYSTEM\PAGE\replace::replaceFile((new \SYSTEM\PSAI('modules/saimod_sys_config/tpl/config_tr.tpl'))->SERVERPATH(), array( 'id' =>\SYSTEM\CONFIG\config_ids::SYS_CONFIG_ERRORREPORTING, 'name' =>'\SYSTEM\CONFIG\config_ids::SYS_CONFIG_ERRORREPORTING', 'value' =>\SYSTEM\CONFIG\config::get(\SYSTEM\CONFIG\config_ids::SYS_CONFIG_ERRORREPORTING))); - $vars['basics'] .= \SYSTEM\PAGE\replace::replaceFile((new \SYSTEM\PSAI('modules/saimod_sys_config/tpl/config_tr.tpl'))->SERVERPATH(), + $result .= \SYSTEM\PAGE\replace::replaceFile((new \SYSTEM\PSAI('modules/saimod_sys_config/tpl/config_tr.tpl'))->SERVERPATH(), array( 'id' =>\SYSTEM\CONFIG\config_ids::SYS_CONFIG_PATH_BASEURL, 'name' =>'\SYSTEM\CONFIG\config_ids::SYS_CONFIG_PATH_BASEURL', 'value' =>\SYSTEM\CONFIG\config::get(\SYSTEM\CONFIG\config_ids::SYS_CONFIG_PATH_BASEURL))); - $vars['basics'] .= \SYSTEM\PAGE\replace::replaceFile((new \SYSTEM\PSAI('modules/saimod_sys_config/tpl/config_tr.tpl'))->SERVERPATH(), + $result .= \SYSTEM\PAGE\replace::replaceFile((new \SYSTEM\PSAI('modules/saimod_sys_config/tpl/config_tr.tpl'))->SERVERPATH(), array( 'id' =>\SYSTEM\CONFIG\config_ids::SYS_CONFIG_PATH_BASEPATH, 'name' =>'\SYSTEM\CONFIG\config_ids::SYS_CONFIG_PATH_BASEPATH', 'value' =>\SYSTEM\CONFIG\config::get(\SYSTEM\CONFIG\config_ids::SYS_CONFIG_PATH_BASEPATH))); - $vars['basics'] .= \SYSTEM\PAGE\replace::replaceFile((new \SYSTEM\PSAI('modules/saimod_sys_config/tpl/config_tr.tpl'))->SERVERPATH(), + $result .= \SYSTEM\PAGE\replace::replaceFile((new \SYSTEM\PSAI('modules/saimod_sys_config/tpl/config_tr.tpl'))->SERVERPATH(), array( 'id' =>\SYSTEM\CONFIG\config_ids::SYS_CONFIG_PATH_SYSTEMPATHREL, 'name' =>'\SYSTEM\CONFIG\config_ids::SYS_CONFIG_PATH_SYSTEMPATHREL', 'value' =>\SYSTEM\CONFIG\config::get(\SYSTEM\CONFIG\config_ids::SYS_CONFIG_PATH_SYSTEMPATHREL))); - $vars['basics'] .= \SYSTEM\PAGE\replace::replaceFile((new \SYSTEM\PSAI('modules/saimod_sys_config/tpl/config_tr.tpl'))->SERVERPATH(), + $result .= \SYSTEM\PAGE\replace::replaceFile((new \SYSTEM\PSAI('modules/saimod_sys_config/tpl/config_tr.tpl'))->SERVERPATH(), array( 'id' =>\SYSTEM\CONFIG\config_ids::SYS_CONFIG_DEFAULT_RESULT, 'name' =>'\SYSTEM\CONFIG\config_ids::SYS_CONFIG_DEFAULT_RESULT', 'value' =>\SYSTEM\CONFIG\config::get(\SYSTEM\CONFIG\config_ids::SYS_CONFIG_DEFAULT_RESULT))); - $vars['basics'] .= \SYSTEM\PAGE\replace::replaceFile((new \SYSTEM\PSAI('modules/saimod_sys_config/tpl/config_tr.tpl'))->SERVERPATH(), + $result .= \SYSTEM\PAGE\replace::replaceFile((new \SYSTEM\PSAI('modules/saimod_sys_config/tpl/config_tr.tpl'))->SERVERPATH(), array( 'id' =>\SYSTEM\CONFIG\config_ids::SYS_CONFIG_LANGS, 'name' =>'\SYSTEM\CONFIG\config_ids::SYS_CONFIG_LANGS', 'value' =>implode(',',\SYSTEM\CONFIG\config::get(\SYSTEM\CONFIG\config_ids::SYS_CONFIG_LANGS)))); - $vars['basics'] .= \SYSTEM\PAGE\replace::replaceFile((new \SYSTEM\PSAI('modules/saimod_sys_config/tpl/config_tr.tpl'))->SERVERPATH(), + $result .= \SYSTEM\PAGE\replace::replaceFile((new \SYSTEM\PSAI('modules/saimod_sys_config/tpl/config_tr.tpl'))->SERVERPATH(), array( 'id' =>\SYSTEM\CONFIG\config_ids::SYS_CONFIG_DEFAULT_LANG, 'name' =>'\SYSTEM\CONFIG\config_ids::SYS_CONFIG_DEFAULT_LANG', 'value' =>\SYSTEM\CONFIG\config::get(\SYSTEM\CONFIG\config_ids::SYS_CONFIG_DEFAULT_LANG))); - return \SYSTEM\PAGE\replace::replaceFile((new \SYSTEM\PSAI('modules/saimod_sys_config/tpl/config_basics.tpl'))->SERVERPATH(),$vars); + return $result; } /** @@ -130,34 +70,33 @@ class saimod_sys_config extends \SYSTEM\SAI\SaiModule { * @return string Returns HTML */ public static function sai_mod__SYSTEM_SAI_saimod_sys_config_action_database(){ - $vars = \SYSTEM\PAGE\text::tag(\SYSTEM\SQL\system_text::TAG_SAI_CONFIG); - $vars['database'] = ''; - $vars['database'] .=\SYSTEM\PAGE\replace::replaceFile((new \SYSTEM\PSAI('modules/saimod_sys_config/tpl/config_tr.tpl'))->SERVERPATH(), + $result = ''; + $result .=\SYSTEM\PAGE\replace::replaceFile((new \SYSTEM\PSAI('modules/saimod_sys_config/tpl/config_tr.tpl'))->SERVERPATH(), array( 'id' =>\SYSTEM\CONFIG\config_ids::SYS_CONFIG_DB_TYPE, 'name' =>'\SYSTEM\CONFIG\config_ids::SYS_CONFIG_DB_TYPE', 'value' =>\SYSTEM\CONFIG\config::get(\SYSTEM\CONFIG\config_ids::SYS_CONFIG_DB_TYPE))); - $vars['database'] .=\SYSTEM\PAGE\replace::replaceFile((new \SYSTEM\PSAI('modules/saimod_sys_config/tpl/config_tr.tpl'))->SERVERPATH(), + $result .=\SYSTEM\PAGE\replace::replaceFile((new \SYSTEM\PSAI('modules/saimod_sys_config/tpl/config_tr.tpl'))->SERVERPATH(), array( 'id' =>\SYSTEM\CONFIG\config_ids::SYS_CONFIG_DB_HOST, 'name' =>'\SYSTEM\CONFIG\config_ids::SYS_CONFIG_DB_HOST', 'value' =>\SYSTEM\CONFIG\config::get(\SYSTEM\CONFIG\config_ids::SYS_CONFIG_DB_HOST))); - $vars['database'] .=\SYSTEM\PAGE\replace::replaceFile((new \SYSTEM\PSAI('modules/saimod_sys_config/tpl/config_tr.tpl'))->SERVERPATH(), + $result .=\SYSTEM\PAGE\replace::replaceFile((new \SYSTEM\PSAI('modules/saimod_sys_config/tpl/config_tr.tpl'))->SERVERPATH(), array( 'id' =>\SYSTEM\CONFIG\config_ids::SYS_CONFIG_DB_PORT, 'name' =>'\SYSTEM\CONFIG\config_ids::SYS_CONFIG_DB_PORT', 'value' =>\SYSTEM\CONFIG\config::get(\SYSTEM\CONFIG\config_ids::SYS_CONFIG_DB_PORT))); - $vars['database'] .=\SYSTEM\PAGE\replace::replaceFile((new \SYSTEM\PSAI('modules/saimod_sys_config/tpl/config_tr.tpl'))->SERVERPATH(), + $result .=\SYSTEM\PAGE\replace::replaceFile((new \SYSTEM\PSAI('modules/saimod_sys_config/tpl/config_tr.tpl'))->SERVERPATH(), array( 'id' =>\SYSTEM\CONFIG\config_ids::SYS_CONFIG_DB_USER, 'name' =>'\SYSTEM\CONFIG\config_ids::SYS_CONFIG_DB_USER', 'value' =>\SYSTEM\CONFIG\config::get(\SYSTEM\CONFIG\config_ids::SYS_CONFIG_DB_USER))); - $vars['database'] .=\SYSTEM\PAGE\replace::replaceFile((new \SYSTEM\PSAI('modules/saimod_sys_config/tpl/config_tr.tpl'))->SERVERPATH(), + $result .=\SYSTEM\PAGE\replace::replaceFile((new \SYSTEM\PSAI('modules/saimod_sys_config/tpl/config_tr.tpl'))->SERVERPATH(), array( 'id' =>\SYSTEM\CONFIG\config_ids::SYS_CONFIG_DB_PASSWORD, 'name' =>'\SYSTEM\CONFIG\config_ids::SYS_CONFIG_DB_PASSWORD', 'value' =>'<hidden>')); - $vars['database'] .=\SYSTEM\PAGE\replace::replaceFile((new \SYSTEM\PSAI('modules/saimod_sys_config/tpl/config_tr.tpl'))->SERVERPATH(), + $result .=\SYSTEM\PAGE\replace::replaceFile((new \SYSTEM\PSAI('modules/saimod_sys_config/tpl/config_tr.tpl'))->SERVERPATH(), array( 'id' =>\SYSTEM\CONFIG\config_ids::SYS_CONFIG_DB_DBNAME, 'name' =>'\SYSTEM\CONFIG\config_ids::SYS_CONFIG_DB_DBNAME', 'value' =>\SYSTEM\CONFIG\config::get(\SYSTEM\CONFIG\config_ids::SYS_CONFIG_DB_DBNAME))); - return \SYSTEM\PAGE\replace::replaceFile((new \SYSTEM\PSAI('modules/saimod_sys_config/tpl/config_database.tpl'))->SERVERPATH(),$vars); + return $result; } /** @@ -166,14 +105,12 @@ class saimod_sys_config extends \SYSTEM\SAI\SaiModule { * @return string Returns HTML */ public static function sai_mod__SYSTEM_SAI_saimod_sys_config_action_sai(){ - $vars['sai'] = ''; - $vars['sai'] .= \SYSTEM\PAGE\replace::replaceFile((new \SYSTEM\PSAI('modules/saimod_sys_config/tpl/config_tr.tpl'))->SERVERPATH(), + $result = ''; + $result .= \SYSTEM\PAGE\replace::replaceFile((new \SYSTEM\PSAI('modules/saimod_sys_config/tpl/config_tr.tpl'))->SERVERPATH(), 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))); - return \SYSTEM\PAGE\replace::replaceFile((new \SYSTEM\PSAI('modules/saimod_sys_config/tpl/config_sai.tpl'))->SERVERPATH(),$vars); - - return \SYSTEM\PAGE\replace::replaceFile((new \SYSTEM\PSAI('modules/saimod_sys_config/tpl/config_database.tpl'))->SERVERPATH(),$vars); + return $result; } /** @@ -181,7 +118,9 @@ class saimod_sys_config 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_config/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_config/tpl/menu.tpl'))->SERVERPATH()));} /** * Returns if the Saimod is public(access for everyone) diff --git a/sai/modules/saimod_sys_config/tpl/config_basics.tpl b/sai/modules/saimod_sys_config/tpl/config_basics.tpl deleted file mode 100644 index 048945e..0000000 --- a/sai/modules/saimod_sys_config/tpl/config_basics.tpl +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - - ${basics} - -
    ID Name Value
    \ No newline at end of file diff --git a/sai/modules/saimod_sys_config/tpl/config_database.tpl b/sai/modules/saimod_sys_config/tpl/config_database.tpl deleted file mode 100644 index b7b69b0..0000000 --- a/sai/modules/saimod_sys_config/tpl/config_database.tpl +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - - ${database} - -
    ID Name Value
    \ No newline at end of file diff --git a/sai/modules/saimod_sys_config/tpl/config_sai.tpl b/sai/modules/saimod_sys_config/tpl/config_sai.tpl deleted file mode 100644 index 76b83af..0000000 --- a/sai/modules/saimod_sys_config/tpl/config_sai.tpl +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - - ${sai} - -
    ID Name Value
    \ No newline at end of file diff --git a/sai/modules/saimod_sys_config/tpl/menu.tpl b/sai/modules/saimod_sys_config/tpl/menu.tpl index df42a8e..b76b149 100644 --- a/sai/modules/saimod_sys_config/tpl/menu.tpl +++ b/sai/modules/saimod_sys_config/tpl/menu.tpl @@ -1,6 +1,7 @@ -
  • + + + +   ${sai_menu_config}
    • \ No newline at end of file diff --git a/sai/modules/saimod_sys_config/tpl/saimod_sys_config.tpl b/sai/modules/saimod_sys_config/tpl/saimod_sys_config.tpl index e560f73..2c8d986 100644 --- a/sai/modules/saimod_sys_config/tpl/saimod_sys_config.tpl +++ b/sai/modules/saimod_sys_config/tpl/saimod_sys_config.tpl @@ -1,22 +1,26 @@ -
    -
    -

       ${sai_config_title}

    +
    +
    +

       ${sai_config_title}

    -
    -
    -
    -
    +
    +
    -
    -
    -
    -
    - -
    +
    +
    + + + + + + + + + +
    IDNameValue
    \ No newline at end of file diff --git a/sai/modules/saimod_sys_cron/tpl/list_entry.tpl b/sai/modules/saimod_sys_cron/tpl/list_entry.tpl index 0e98691..94a5ed4 100644 --- a/sai/modules/saimod_sys_cron/tpl/list_entry.tpl +++ b/sai/modules/saimod_sys_cron/tpl/list_entry.tpl @@ -16,9 +16,9 @@ - - - - + + + + \ No newline at end of file diff --git a/sai/modules/saimod_sys_cron/tpl/menu.tpl b/sai/modules/saimod_sys_cron/tpl/menu.tpl index 0ad2791..017eca0 100644 --- a/sai/modules/saimod_sys_cron/tpl/menu.tpl +++ b/sai/modules/saimod_sys_cron/tpl/menu.tpl @@ -1,6 +1,6 @@ -
  • + + +   ${sai_menu_cron}
    • \ No newline at end of file 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 4038beb..5854e30 100644 --- a/sai/modules/saimod_sys_cron/tpl/saimod_sys_cron.tpl +++ b/sai/modules/saimod_sys_cron/tpl/saimod_sys_cron.tpl @@ -1,6 +1,6 @@
    -

       ${sai_cron_title}

    +

       ${sai_cron_title}

    @@ -41,7 +41,7 @@ - +
    diff --git a/sai/modules/saimod_sys_docu/autoload.inc b/sai/modules/saimod_sys_docu/autoload.inc index 770d952..0d1373a 100644 --- a/sai/modules/saimod_sys_docu/autoload.inc +++ b/sai/modules/saimod_sys_docu/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_docu'); \ No newline at end of file +\SYSTEM\SAI\sai::register('\SYSTEM\SAI\saimod_sys_docu'); \ No newline at end of file diff --git a/sai/modules/saimod_sys_docu/saimod_sys_docu.php b/sai/modules/saimod_sys_docu/saimod_sys_docu.php index 71794f7..92a5aea 100644 --- a/sai/modules/saimod_sys_docu/saimod_sys_docu.php +++ b/sai/modules/saimod_sys_docu/saimod_sys_docu.php @@ -63,7 +63,11 @@ class saimod_sys_docu 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_docu/tpl/menu.tpl'))->SERVERPATH());} + public static function menu(){ + return new sai_module_menu( 10, + sai_module_menu::POISITION_RIGHT, + sai_module_menu::DIVIDER_NONE, + \SYSTEM\PAGE\replace::replaceFile((new \SYSTEM\PSAI('modules/saimod_sys_docu/tpl/menu.tpl'))->SERVERPATH()));} /** * Returns if the Saimod is public(access for everyone) diff --git a/sai/modules/saimod_sys_docu/tpl/menu.tpl b/sai/modules/saimod_sys_docu/tpl/menu.tpl index 45713ff..92e6cb3 100644 --- a/sai/modules/saimod_sys_docu/tpl/menu.tpl +++ b/sai/modules/saimod_sys_docu/tpl/menu.tpl @@ -1,7 +1,7 @@ -
  • + + + +   ${sai_menu_docu}
    • \ No newline at end of file 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 f6951f0..1315254 100644 --- a/sai/modules/saimod_sys_docu/tpl/saimod_sys_docu.tpl +++ b/sai/modules/saimod_sys_docu/tpl/saimod_sys_docu.tpl @@ -1,6 +1,6 @@
    -

       ${sai_docu_title}

    +

       ${sai_docu_title}

    @@ -13,8 +13,8 @@
    diff --git a/sai/modules/saimod_sys_docu/tpl/tabopt.tpl b/sai/modules/saimod_sys_docu/tpl/tabopt.tpl index 5e82c22..c4c76ee 100644 --- a/sai/modules/saimod_sys_docu/tpl/tabopt.tpl +++ b/sai/modules/saimod_sys_docu/tpl/tabopt.tpl @@ -1 +1 @@ -
  • ${tab_id_pretty}
    • \ No newline at end of file +
  • ${tab_id_pretty}
    • \ No newline at end of file diff --git a/sai/modules/saimod_sys_docu/tpl/tabopt2.tpl b/sai/modules/saimod_sys_docu/tpl/tabopt2.tpl index 840221d..14835a7 100644 --- a/sai/modules/saimod_sys_docu/tpl/tabopt2.tpl +++ b/sai/modules/saimod_sys_docu/tpl/tabopt2.tpl @@ -1 +1 @@ -
  • ${doc_id_pretty}
    • \ No newline at end of file +
  • ${doc_id_pretty}
    • \ No newline at end of file diff --git a/sai/modules/saimod_sys_files/tpl/menu.tpl b/sai/modules/saimod_sys_files/tpl/menu.tpl index 4b2d712..c868f61 100644 --- a/sai/modules/saimod_sys_files/tpl/menu.tpl +++ b/sai/modules/saimod_sys_files/tpl/menu.tpl @@ -1,6 +1,6 @@ -
  • + + +   ${sai_menu_files}
    • \ No newline at end of file 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 e2ea01a..f975dc4 100644 --- a/sai/modules/saimod_sys_files/tpl/saimod_sys_files.tpl +++ b/sai/modules/saimod_sys_files/tpl/saimod_sys_files.tpl @@ -1,6 +1,6 @@
    -

       ${sai_files_title}

    +

       ${sai_files_title}

     ${sai_files_title_warning}
    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 bdac84a..5503867 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 @@ -19,6 +19,6 @@ - + \ No newline at end of file diff --git a/sai/modules/saimod_sys_files/tpl/saimod_sys_files_list_entry.tpl b/sai/modules/saimod_sys_files/tpl/saimod_sys_files_list_entry.tpl index b304433..d618751 100644 --- a/sai/modules/saimod_sys_files/tpl/saimod_sys_files_list_entry.tpl +++ b/sai/modules/saimod_sys_files/tpl/saimod_sys_files_list_entry.tpl @@ -5,12 +5,12 @@ ${url} - + - + \ No newline at end of file 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 1f373c7..cdd0fb4 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 diff --git a/sai/modules/saimod_sys_git/autoload.inc b/sai/modules/saimod_sys_git/autoload.inc index 30e5c9c..ee5ce67 100644 --- a/sai/modules/saimod_sys_git/autoload.inc +++ b/sai/modules/saimod_sys_git/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_git'); \ No newline at end of file +\SYSTEM\SAI\sai::register('\SYSTEM\SAI\saimod_sys_git'); \ No newline at end of file diff --git a/sai/modules/saimod_sys_git/saimod_sys_git.php b/sai/modules/saimod_sys_git/saimod_sys_git.php index 87ca79b..ecaed27 100644 --- a/sai/modules/saimod_sys_git/saimod_sys_git.php +++ b/sai/modules/saimod_sys_git/saimod_sys_git.php @@ -68,7 +68,11 @@ class saimod_sys_git 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_git/tpl/menu.tpl'))->SERVERPATH());} + public static function menu(){ + return new sai_module_menu( 1, + sai_module_menu::POISITION_RIGHT, + sai_module_menu::DIVIDER_NONE, + \SYSTEM\PAGE\replace::replaceFile((new \SYSTEM\PSAI('modules/saimod_sys_git/tpl/menu.tpl'))->SERVERPATH()));} /** * Returns if the Saimod is public(access for everyone) diff --git a/sai/modules/saimod_sys_git/tpl/menu.tpl b/sai/modules/saimod_sys_git/tpl/menu.tpl index a2eebb2..4e4ff95 100644 --- a/sai/modules/saimod_sys_git/tpl/menu.tpl +++ b/sai/modules/saimod_sys_git/tpl/menu.tpl @@ -1,9 +1,7 @@ - -
      - \ No newline at end of file +
    • + + + +   ${sai_menu_git} + +
      • \ 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 550a310..5e9e65b 100644 --- a/sai/modules/saimod_sys_git/tpl/saimod_sys_git.tpl +++ b/sai/modules/saimod_sys_git/tpl/saimod_sys_git.tpl @@ -1,6 +1,6 @@
      -

         ${sai_git_title}

      +

         ${sai_git_title}

      diff --git a/sai/modules/saimod_sys_log/autoload.inc b/sai/modules/saimod_sys_log/autoload.inc index 1d725d5..4781aa4 100644 --- a/sai/modules/saimod_sys_log/autoload.inc +++ b/sai/modules/saimod_sys_log/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_log'); \ No newline at end of file +\SYSTEM\SAI\sai::register('\SYSTEM\SAI\saimod_sys_log'); \ No newline at end of file diff --git a/sai/modules/saimod_sys_log/js/saimod_sys_log.js b/sai/modules/saimod_sys_log/js/saimod_sys_log.js index 70742d2..c589ea7 100644 --- a/sai/modules/saimod_sys_log/js/saimod_sys_log.js +++ b/sai/modules/saimod_sys_log/js/saimod_sys_log.js @@ -2,9 +2,9 @@ google.load("visualization", "1", {packages:["corechart"]}); function init_saimod_sys_log() { $("#sai_mod_log_table").tablesorter(); $('#tabs_log a').click(function (e) { - $('#tabs_log li').each(function(){ + $('#tabs_log li a').each(function(){ $(this).removeClass('active');}); - $(this).parent().addClass('active'); + $(this).addClass('active'); }); }; diff --git a/sai/modules/saimod_sys_log/saimod_sys_log.php b/sai/modules/saimod_sys_log/saimod_sys_log.php index 5025333..c4a7e55 100644 --- a/sai/modules/saimod_sys_log/saimod_sys_log.php +++ b/sai/modules/saimod_sys_log/saimod_sys_log.php @@ -427,9 +427,18 @@ class saimod_sys_log extends \SYSTEM\SAI\SaiModule { } $vars['pagination'] = ''; $vars['page_last'] = floor($count/100); + $dots = false; for($i=0;$i < ceil($count/100);$i++){ - $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); + if(abs($page-$i) < 7){ + $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); + $dots = false; + } else { + if(!$dots){ + $dots = true; + $vars['pagination'] .= \SYSTEM\PAGE\replace::replaceFile((new \SYSTEM\PSAI('modules/saimod_sys_log/tpl/saimod_sys_log_pagination_dots.tpl'))->SERVERPATH()); + } + } } $vars['count'] = $count_filtered.'/'.$count; $vars['error_filter'] = ''; @@ -479,7 +488,11 @@ class saimod_sys_log 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_log/tpl/menu.tpl'))->SERVERPATH());} + public static function menu(){ + return new sai_module_menu( 1, + sai_module_menu::POISITION_LEFT, + sai_module_menu::DIVIDER_NONE, + \SYSTEM\PAGE\replace::replaceFile((new \SYSTEM\PSAI('modules/saimod_sys_log/tpl/menu.tpl'))->SERVERPATH()));} /** * Returns if the Saimod is public(access for everyone) diff --git a/sai/modules/saimod_sys_log/tpl/menu.tpl b/sai/modules/saimod_sys_log/tpl/menu.tpl index b0c4ea6..2ac9a9f 100644 --- a/sai/modules/saimod_sys_log/tpl/menu.tpl +++ b/sai/modules/saimod_sys_log/tpl/menu.tpl @@ -1,6 +1,6 @@ -
    • + + +   ${sai_menu_log}
      • \ No newline at end of file diff --git a/sai/modules/saimod_sys_log/tpl/saimod_sys_log.tpl b/sai/modules/saimod_sys_log/tpl/saimod_sys_log.tpl index d2420bb..b5a5a8f 100644 --- a/sai/modules/saimod_sys_log/tpl/saimod_sys_log.tpl +++ b/sai/modules/saimod_sys_log/tpl/saimod_sys_log.tpl @@ -1,6 +1,6 @@
      -

         ${sai_log_title}

      +

         ${sai_log_title}

      @@ -10,16 +10,14 @@
      -
      -
      -
      -
      -
      + +
      +
      \ No newline at end of file diff --git a/sai/modules/saimod_sys_log/tpl/saimod_sys_log_error_filter.tpl b/sai/modules/saimod_sys_log/tpl/saimod_sys_log_error_filter.tpl index 1a0056d..60ac482 100644 --- a/sai/modules/saimod_sys_log/tpl/saimod_sys_log_error_filter.tpl +++ b/sai/modules/saimod_sys_log/tpl/saimod_sys_log_error_filter.tpl @@ -1 +1 @@ -
    • ${filter}
      • \ No newline at end of file +
    • ${filter}
      • \ No newline at end of file diff --git a/sai/modules/saimod_sys_log/tpl/saimod_sys_log_filter.tpl b/sai/modules/saimod_sys_log/tpl/saimod_sys_log_filter.tpl index 053f9a9..95e5f9c 100644 --- a/sai/modules/saimod_sys_log/tpl/saimod_sys_log_filter.tpl +++ b/sai/modules/saimod_sys_log/tpl/saimod_sys_log_filter.tpl @@ -1,7 +1,7 @@
      @@ -21,8 +21,8 @@ ${table}
      \ No newline at end of file diff --git a/sai/modules/saimod_sys_log/tpl/saimod_sys_log_pagination.tpl b/sai/modules/saimod_sys_log/tpl/saimod_sys_log_pagination.tpl index 8fc22b9..773b8af 100644 --- a/sai/modules/saimod_sys_log/tpl/saimod_sys_log_pagination.tpl +++ b/sai/modules/saimod_sys_log/tpl/saimod_sys_log_pagination.tpl @@ -1 +1 @@ -
    • ${page}
      • \ No newline at end of file +
    • ${page}
      • \ No newline at end of file diff --git a/sai/modules/saimod_sys_log/tpl/saimod_sys_log_pagination_dots.tpl b/sai/modules/saimod_sys_log/tpl/saimod_sys_log_pagination_dots.tpl new file mode 100644 index 0000000..005ae64 --- /dev/null +++ b/sai/modules/saimod_sys_log/tpl/saimod_sys_log_pagination_dots.tpl @@ -0,0 +1 @@ +
    • ...
      • \ No newline at end of file diff --git a/sai/modules/saimod_sys_log/tpl/saimod_sys_log_stats.tpl b/sai/modules/saimod_sys_log/tpl/saimod_sys_log_stats.tpl index f0ee0cd..991b2bc 100644 --- a/sai/modules/saimod_sys_log/tpl/saimod_sys_log_stats.tpl +++ b/sai/modules/saimod_sys_log/tpl/saimod_sys_log_stats.tpl @@ -1,6 +1,6 @@
      diff --git a/sai/modules/saimod_sys_log/tpl/saimod_sys_log_stats_menu.tpl b/sai/modules/saimod_sys_log/tpl/saimod_sys_log_stats_menu.tpl index 2b2455a..94db1f4 100644 --- a/sai/modules/saimod_sys_log/tpl/saimod_sys_log_stats_menu.tpl +++ b/sai/modules/saimod_sys_log/tpl/saimod_sys_log_stats_menu.tpl @@ -1 +1 @@ -
    • ${file}
      • \ No newline at end of file +
    • ${file}
      • \ No newline at end of file diff --git a/sai/modules/saimod_sys_login/autoload.inc b/sai/modules/saimod_sys_login/autoload.inc index b943bce..5ca9c62 100644 --- a/sai/modules/saimod_sys_login/autoload.inc +++ b/sai/modules/saimod_sys_login/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_login'); \ No newline at end of file +\SYSTEM\SAI\sai::register('\SYSTEM\SAI\saimod_sys_login'); \ No newline at end of file diff --git a/sai/modules/saimod_sys_login/saimod_sys_login.php b/sai/modules/saimod_sys_login/saimod_sys_login.php index 5e5a89c..bfa05b7 100644 --- a/sai/modules/saimod_sys_login/saimod_sys_login.php +++ b/sai/modules/saimod_sys_login/saimod_sys_login.php @@ -75,7 +75,11 @@ class saimod_sys_login 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_login/tpl/menu.tpl'))->SERVERPATH());} + public static function menu(){ + return new sai_module_menu( 99, + sai_module_menu::POISITION_RIGHT, + sai_module_menu::DIVIDER_LEFT, + \SYSTEM\PAGE\replace::replaceFile((new \SYSTEM\PSAI('modules/saimod_sys_login/tpl/menu.tpl'))->SERVERPATH()));} /** * Returns if the Saimod is public(access for everyone) diff --git a/sai/modules/saimod_sys_login/tpl/login.tpl b/sai/modules/saimod_sys_login/tpl/login.tpl index 470ae47..b021241 100644 --- a/sai/modules/saimod_sys_login/tpl/login.tpl +++ b/sai/modules/saimod_sys_login/tpl/login.tpl @@ -25,7 +25,7 @@
      • - +
      ${basic_text_register}
      diff --git a/sai/modules/saimod_sys_login/tpl/logout.tpl b/sai/modules/saimod_sys_login/tpl/logout.tpl index d369b4d..a56e8d2 100644 --- a/sai/modules/saimod_sys_login/tpl/logout.tpl +++ b/sai/modules/saimod_sys_login/tpl/logout.tpl @@ -96,7 +96,7 @@
      - +
      diff --git a/sai/modules/saimod_sys_login/tpl/menu.tpl b/sai/modules/saimod_sys_login/tpl/menu.tpl index 01d7e06..73715cb 100644 --- a/sai/modules/saimod_sys_login/tpl/menu.tpl +++ b/sai/modules/saimod_sys_login/tpl/menu.tpl @@ -1,7 +1,7 @@ -
    • + + + +   ${sai_menu_login}
      • \ No newline at end of file diff --git a/sai/modules/saimod_sys_login/tpl/resetpassword.tpl b/sai/modules/saimod_sys_login/tpl/resetpassword.tpl index 0f0a86f..7e43378 100644 --- a/sai/modules/saimod_sys_login/tpl/resetpassword.tpl +++ b/sai/modules/saimod_sys_login/tpl/resetpassword.tpl @@ -19,7 +19,7 @@

      - +

      diff --git a/sai/modules/saimod_sys_mod/saimod_sys_mod.php b/sai/modules/saimod_sys_mod/saimod_sys_mod.php index 5f3e945..aed45cd 100644 --- a/sai/modules/saimod_sys_mod/saimod_sys_mod.php +++ b/sai/modules/saimod_sys_mod/saimod_sys_mod.php @@ -27,15 +27,15 @@ class saimod_sys_mod extends \SYSTEM\SAI\SaiModule { foreach($sys_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')) ? '' : ''; + $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); } @@ -52,8 +52,8 @@ class saimod_sys_mod extends \SYSTEM\SAI\SaiModule { 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')) ? '' : ''; + $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); diff --git a/sai/modules/saimod_sys_mod/tpl/menu.tpl b/sai/modules/saimod_sys_mod/tpl/menu.tpl index 05703e9..eb74b6e 100644 --- a/sai/modules/saimod_sys_mod/tpl/menu.tpl +++ b/sai/modules/saimod_sys_mod/tpl/menu.tpl @@ -1,6 +1,6 @@ -
    • + + +   ${sai_menu_mod}
      • \ No newline at end of file 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 c6d8367..91aab1d 100644 --- a/sai/modules/saimod_sys_mod/tpl/saimod_sys_mod.tpl +++ b/sai/modules/saimod_sys_mod/tpl/saimod_sys_mod.tpl @@ -1,6 +1,6 @@
      -

         ${sai_mod_title}

      +

         ${sai_mod_title}

      @@ -12,9 +12,9 @@
      diff --git a/sai/modules/saimod_sys_page/tpl/menu.tpl b/sai/modules/saimod_sys_page/tpl/menu.tpl index 7f6518d..73f5cdc 100644 --- a/sai/modules/saimod_sys_page/tpl/menu.tpl +++ b/sai/modules/saimod_sys_page/tpl/menu.tpl @@ -1,6 +1,6 @@ -
    • - - - +
    • + + +   ${sai_menu_page}
      • \ No newline at end of file diff --git a/sai/modules/saimod_sys_page/tpl/new_dialog.tpl b/sai/modules/saimod_sys_page/tpl/new_dialog.tpl index d719c4b..955fd9c 100644 --- a/sai/modules/saimod_sys_page/tpl/new_dialog.tpl +++ b/sai/modules/saimod_sys_page/tpl/new_dialog.tpl @@ -44,5 +44,5 @@ - - \ No newline at end of file + + \ No newline at end of file diff --git a/sai/modules/saimod_sys_page/tpl/saimod_sys_page.tpl b/sai/modules/saimod_sys_page/tpl/saimod_sys_page.tpl index 9d35e1d..1389762 100644 --- a/sai/modules/saimod_sys_page/tpl/saimod_sys_page.tpl +++ b/sai/modules/saimod_sys_page/tpl/saimod_sys_page.tpl @@ -1,6 +1,6 @@
      -

         ${sai_page_title}

      +

         ${sai_page_title}

      @@ -12,9 +12,9 @@
        -
      • All
        • +
      • All
        • ${tabopts} - +
      diff --git a/sai/modules/saimod_sys_page/tpl/tabopt.tpl b/sai/modules/saimod_sys_page/tpl/tabopt.tpl index b99eb35..c06aefc 100644 --- a/sai/modules/saimod_sys_page/tpl/tabopt.tpl +++ b/sai/modules/saimod_sys_page/tpl/tabopt.tpl @@ -1 +1 @@ -
    • Group ${tab_id}
      • \ No newline at end of file +
    • Group ${tab_id}
      • \ No newline at end of file diff --git a/sai/modules/saimod_sys_security/tpl/menu.tpl b/sai/modules/saimod_sys_security/tpl/menu.tpl index 1efdc49..3060a8d 100644 --- a/sai/modules/saimod_sys_security/tpl/menu.tpl +++ b/sai/modules/saimod_sys_security/tpl/menu.tpl @@ -1,6 +1,6 @@ -
    • + + +   ${sai_menu_security}
      • \ No newline at end of file diff --git a/sai/modules/saimod_sys_security/tpl/right_add.tpl b/sai/modules/saimod_sys_security/tpl/right_add.tpl index baf035e..ee73a73 100644 --- a/sai/modules/saimod_sys_security/tpl/right_add.tpl +++ b/sai/modules/saimod_sys_security/tpl/right_add.tpl @@ -1 +1 @@ -
      \ No newline at end of file +
      \ No newline at end of file diff --git a/sai/modules/saimod_sys_security/tpl/right_edit.tpl b/sai/modules/saimod_sys_security/tpl/right_edit.tpl index db25b5e..72aa23d 100644 --- a/sai/modules/saimod_sys_security/tpl/right_edit.tpl +++ b/sai/modules/saimod_sys_security/tpl/right_edit.tpl @@ -1,2 +1,2 @@ - - \ No newline at end of file + + \ No newline at end of file diff --git a/sai/modules/saimod_sys_security/tpl/right_remove.tpl b/sai/modules/saimod_sys_security/tpl/right_remove.tpl index 8adbc27..daa8b1a 100644 --- a/sai/modules/saimod_sys_security/tpl/right_remove.tpl +++ b/sai/modules/saimod_sys_security/tpl/right_remove.tpl @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/sai/modules/saimod_sys_security/tpl/saimod_sys_security.tpl b/sai/modules/saimod_sys_security/tpl/saimod_sys_security.tpl index e916a9b..34d79ce 100644 --- a/sai/modules/saimod_sys_security/tpl/saimod_sys_security.tpl +++ b/sai/modules/saimod_sys_security/tpl/saimod_sys_security.tpl @@ -1,6 +1,6 @@
      -

         ${sai_security_title}

      +

         ${sai_security_title}

      @@ -12,8 +12,8 @@
      diff --git a/sai/modules/saimod_sys_security/tpl/saimod_sys_security_deleteright.tpl b/sai/modules/saimod_sys_security/tpl/saimod_sys_security_deleteright.tpl index e0c762e..5041d48 100644 --- a/sai/modules/saimod_sys_security/tpl/saimod_sys_security_deleteright.tpl +++ b/sai/modules/saimod_sys_security/tpl/saimod_sys_security_deleteright.tpl @@ -13,5 +13,5 @@ ${description} - - \ No newline at end of file + + \ No newline at end of file diff --git a/sai/modules/saimod_sys_security/tpl/saimod_sys_security_newright.tpl b/sai/modules/saimod_sys_security/tpl/saimod_sys_security_newright.tpl index d581166..7f73ebf 100644 --- a/sai/modules/saimod_sys_security/tpl/saimod_sys_security_newright.tpl +++ b/sai/modules/saimod_sys_security/tpl/saimod_sys_security_newright.tpl @@ -13,4 +13,4 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/sai/modules/saimod_sys_security/tpl/saimod_sys_security_right_filter.tpl b/sai/modules/saimod_sys_security/tpl/saimod_sys_security_right_filter.tpl index ee0cfd4..fa6c360 100644 --- a/sai/modules/saimod_sys_security/tpl/saimod_sys_security_right_filter.tpl +++ b/sai/modules/saimod_sys_security/tpl/saimod_sys_security_right_filter.tpl @@ -1 +1 @@ -
    • ${name}
      • \ No newline at end of file +
    • ${name}
      • \ No newline at end of file diff --git a/sai/modules/saimod_sys_security/tpl/saimod_sys_security_user_right.tpl b/sai/modules/saimod_sys_security/tpl/saimod_sys_security_user_right.tpl index ab5b2e5..7e21290 100644 --- a/sai/modules/saimod_sys_security/tpl/saimod_sys_security_user_right.tpl +++ b/sai/modules/saimod_sys_security/tpl/saimod_sys_security_user_right.tpl @@ -2,6 +2,6 @@ ${ID} ${name} ${description} - + ${remove_btn} \ No newline at end of file diff --git a/sai/modules/saimod_sys_security/tpl/saimod_sys_security_user_rights_add.tpl b/sai/modules/saimod_sys_security/tpl/saimod_sys_security_user_rights_add.tpl index bc8bd20..76ca7a4 100644 --- a/sai/modules/saimod_sys_security/tpl/saimod_sys_security_user_rights_add.tpl +++ b/sai/modules/saimod_sys_security/tpl/saimod_sys_security_user_rights_add.tpl @@ -1,4 +1,4 @@ - + \ No newline at end of file diff --git a/sai/modules/saimod_sys_security/tpl/saimod_sys_security_user_view.tpl b/sai/modules/saimod_sys_security/tpl/saimod_sys_security_user_view.tpl index 17df451..aff5a96 100644 --- a/sai/modules/saimod_sys_security/tpl/saimod_sys_security_user_view.tpl +++ b/sai/modules/saimod_sys_security/tpl/saimod_sys_security_user_view.tpl @@ -38,7 +38,7 @@ - + @@ -47,13 +47,13 @@ - + - + @@ -61,7 +61,7 @@ - + @@ -69,13 +69,13 @@ - + - + diff --git a/sai/modules/saimod_sys_security/tpl/saimod_sys_security_users.tpl b/sai/modules/saimod_sys_security/tpl/saimod_sys_security_users.tpl index 61ae243..b85f886 100644 --- a/sai/modules/saimod_sys_security/tpl/saimod_sys_security_users.tpl +++ b/sai/modules/saimod_sys_security/tpl/saimod_sys_security_users.tpl @@ -1,7 +1,7 @@
      diff --git a/sai/modules/saimod_sys_text/tpl/menu.tpl b/sai/modules/saimod_sys_text/tpl/menu.tpl index 8c6e040..9447700 100644 --- a/sai/modules/saimod_sys_text/tpl/menu.tpl +++ b/sai/modules/saimod_sys_text/tpl/menu.tpl @@ -1,6 +1,6 @@ -
    • - - - +
    • + + +   ${sai_menu_text}
      • \ No newline at end of file diff --git a/sai/modules/saimod_sys_text/tpl/saimod_sys_text.tpl b/sai/modules/saimod_sys_text/tpl/saimod_sys_text.tpl index ff34a2d..a0e9814 100644 --- a/sai/modules/saimod_sys_text/tpl/saimod_sys_text.tpl +++ b/sai/modules/saimod_sys_text/tpl/saimod_sys_text.tpl @@ -1,6 +1,6 @@
      -

         ${sai_text_title}

      +

         ${sai_text_title}

      @@ -12,11 +12,11 @@
      diff --git a/sai/modules/saimod_sys_text/tpl/saimod_sys_text_lang_filter.tpl b/sai/modules/saimod_sys_text/tpl/saimod_sys_text_lang_filter.tpl index 64c53aa..31e4505 100644 --- a/sai/modules/saimod_sys_text/tpl/saimod_sys_text_lang_filter.tpl +++ b/sai/modules/saimod_sys_text/tpl/saimod_sys_text_lang_filter.tpl @@ -1 +1 @@ -
    • ${name}
      • \ No newline at end of file +
    • ${name}
      • \ No newline at end of file diff --git a/sai/modules/saimod_sys_text/tpl/saimod_sys_text_list.tpl b/sai/modules/saimod_sys_text/tpl/saimod_sys_text_list.tpl index 10f7cc4..08ce842 100644 --- a/sai/modules/saimod_sys_text/tpl/saimod_sys_text_list.tpl +++ b/sai/modules/saimod_sys_text/tpl/saimod_sys_text_list.tpl @@ -1,12 +1,12 @@
      ${basic_rows}: ${count} ${basic_page}: ${page}
      - +
      diff --git a/sai/modules/saimod_sys_text/tpl/tabopt.tpl b/sai/modules/saimod_sys_text/tpl/tabopt.tpl index 3640483..b8ed2b8 100644 --- a/sai/modules/saimod_sys_text/tpl/tabopt.tpl +++ b/sai/modules/saimod_sys_text/tpl/tabopt.tpl @@ -1 +1 @@ -
    • ${tag}(${count})
      • \ No newline at end of file +
    • ${tag}(${count})
      • \ No newline at end of file diff --git a/sai/modules/saimod_sys_text/tpl/tabopt2.tpl b/sai/modules/saimod_sys_text/tpl/tabopt2.tpl index e4b6b4c..075d7d7 100644 --- a/sai/modules/saimod_sys_text/tpl/tabopt2.tpl +++ b/sai/modules/saimod_sys_text/tpl/tabopt2.tpl @@ -1 +1 @@ -
    • ${lang}
      • \ No newline at end of file +
    • ${lang}
      • \ No newline at end of file diff --git a/sai/modules/saimod_sys_todo/autoload.inc b/sai/modules/saimod_sys_todo/autoload.inc index ca02a02..37acdac 100644 --- a/sai/modules/saimod_sys_todo/autoload.inc +++ b/sai/modules/saimod_sys_todo/autoload.inc @@ -3,7 +3,7 @@ \SYSTEM\autoload::registerFolder(dirname(__FILE__).'/stats','SYSTEM\SAI'); \SYSTEM\autoload::registerFolder(dirname(__FILE__).'/qq','SYSTEM\SQL'); -\SYSTEM\SAI\sai::register_sys('\SYSTEM\SAI\saimod_sys_todo'); +\SYSTEM\SAI\sai::register('\SYSTEM\SAI\saimod_sys_todo'); \SYSTEM\SAI\saimod_sys_todo::register('\SYSTEM\SAI\todo_stats_gen'); \SYSTEM\SAI\saimod_sys_todo::register('\SYSTEM\SAI\todo_stats_user'); \SYSTEM\SAI\saimod_sys_todo::register('\SYSTEM\SAI\todo_stats_report'); diff --git a/sai/modules/saimod_sys_todo/saimod_sys_todo.php b/sai/modules/saimod_sys_todo/saimod_sys_todo.php index 38c3ab8..cd21540 100644 --- a/sai/modules/saimod_sys_todo/saimod_sys_todo.php +++ b/sai/modules/saimod_sys_todo/saimod_sys_todo.php @@ -398,7 +398,11 @@ class saimod_sys_todo 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_todo/tpl/menu.tpl'))->SERVERPATH());} + public static function menu(){ + return new sai_module_menu( 15, + sai_module_menu::POISITION_LEFT, + sai_module_menu::DIVIDER_NONE, + \SYSTEM\PAGE\replace::replaceFile((new \SYSTEM\PSAI('modules/saimod_sys_todo/tpl/menu.tpl'))->SERVERPATH()));} /** * Returns if the Saimod is public(access for everyone) @@ -433,29 +437,4 @@ class saimod_sys_todo extends \SYSTEM\SAI\SaiModule { $_POST = $data; //save data in post self::exception(new \Exception($message), false, \SYSTEM\SQL\system_todo::FIELD_TYPE_REPORT); return \SYSTEM\LOG\JsonResult::ok();} - - /** - * Save a Exception as ToDo in the Database - * This is used as Errorhandler in some form. - * - * @param \Exception $E Exception to be saved - * @param bool $thrown Was the Exception thrown? - * @param int $type Type of the Todo(Exception) - * @return bool Returns false - */ - public static function exception(\Exception $E, $thrown, $type = \SYSTEM\SQL\system_todo::FIELD_TYPE_EXCEPTION){ - try{ - if(\property_exists(get_class($E), 'todo_logged') && $E->todo_logged){ - return false;} //alrdy logged(this prevents proper thrown value for every system exception) - \SYSTEM\SQL\SYS_SAIMOD_TODO_EXCEPTION_INSERT::Q1( array( get_class($E), $E->getMessage(), $E->getCode(), $E->getFile(), $E->getLine(), $E->getTraceAsString(), - getenv('REMOTE_ADDR'),round(microtime(true) - \SYSTEM\time::getStartTime(),5),date('Y-m-d H:i:s', microtime(true)), - $_SERVER["SERVER_NAME"],$_SERVER["SERVER_PORT"],$_SERVER['REQUEST_URI'], serialize($_POST), - array_key_exists('HTTP_REFERER', $_SERVER) ? $_SERVER['HTTP_REFERER'] : null, - array_key_exists('HTTP_USER_AGENT',$_SERVER) ? $_SERVER['HTTP_USER_AGENT'] : null, - ($user = \SYSTEM\SECURITY\security::getUser()) ? $user->id : null,$thrown ? 1 : 0,$E->getMessage(),$type)); - if(\property_exists(get_class($E), 'logged')){ - $E->todo_logged = true;} //we just did log - } catch (\Exception $E){return false;} //Error -> Ignore - return false; //We just log and do not handle the error! - } } \ No newline at end of file diff --git a/sai/modules/saimod_sys_todo/tpl/menu.tpl b/sai/modules/saimod_sys_todo/tpl/menu.tpl index 22d5f44..551a8d2 100644 --- a/sai/modules/saimod_sys_todo/tpl/menu.tpl +++ b/sai/modules/saimod_sys_todo/tpl/menu.tpl @@ -1,6 +1,6 @@ -
    • + + +   ${sai_menu_todo}
      • \ No newline at end of file diff --git a/sai/modules/saimod_sys_todo/tpl/saimod_sys_todo.tpl b/sai/modules/saimod_sys_todo/tpl/saimod_sys_todo.tpl index 5ee8e1a..d8fb881 100644 --- a/sai/modules/saimod_sys_todo/tpl/saimod_sys_todo.tpl +++ b/sai/modules/saimod_sys_todo/tpl/saimod_sys_todo.tpl @@ -12,9 +12,9 @@
      ${table_id}
      \ No newline at end of file diff --git a/sai/modules/saimod_sys_todo/tpl/todo_list_pagination.tpl b/sai/modules/saimod_sys_todo/tpl/todo_list_pagination.tpl index 32fa8a8..e9a81f6 100644 --- a/sai/modules/saimod_sys_todo/tpl/todo_list_pagination.tpl +++ b/sai/modules/saimod_sys_todo/tpl/todo_list_pagination.tpl @@ -1 +1 @@ -
    • ${page}
      • \ No newline at end of file +
    • ${page}
      • \ No newline at end of file diff --git a/sai/modules/saistart_sys_sai/tpl/content_loggedin.tpl b/sai/modules/saistart_sys_sai/tpl/content_loggedin.tpl index 752629e..ac4c456 100644 --- a/sai/modules/saistart_sys_sai/tpl/content_loggedin.tpl +++ b/sai/modules/saistart_sys_sai/tpl/content_loggedin.tpl @@ -12,35 +12,35 @@ Week of the year: ${week_number}, ${date}
      -
      +
      -
      -
      ${basic_project}
      -
      -
      - ${basic_name}: ${project_name}
      - ${basic_url}: ${project_url}
      - ${basic_progress}: ${project}%
      -
      - - - - - - - - - ${userstats} -
      ${table_username}${table_open}${table_closed}${table_all}${table_percentage}
      -
      +
      +
      ${basic_project}
      +
      +
      + ${basic_name}: ${project_name}
      + ${basic_url}: ${project_url}
      + ${basic_progress}: ${project}%
      +
      + + + + + + + + + ${userstats} +
      ${table_username}${table_open}${table_closed}${table_all}${table_percentage}
      +
      -
      -
      ${basic_logout}
      -
      -
      +
      +
      ${basic_logout}
      +
      +
      @@ -65,25 +65,25 @@ - + -
      -
      -
      -
      ${basic_analytics}
      -
      +
      +
      +
      +
      ${basic_analytics}
      +
      ${analytics}
      -
      -
      -
      ${basic_git}
      -
      +
      +
      +
      ${basic_git}
      +
      ${git}
      @@ -92,21 +92,25 @@
      -
      -
      -

      ${basic_todo}

      - ${basic_status}: ${project_closed}/${project_all}
      - ${basic_progress}: ${project}% -
      +
      +
      +
      ${basic_todo}
      +
      + ${basic_status}: ${project_closed}/${project_all}
      + ${basic_progress}: ${project}% +
      +
      -
      -
      -

      ${basic_log}

      -

      100 ${sai_log_latest_entries}

      -
      +
      +
      +
      ${basic_log}
      +
      +

      100 ${sai_log_latest_entries}

      +
      +
      \ No newline at end of file diff --git a/sai/modules/saistart_sys_sai/tpl/menu.tpl b/sai/modules/saistart_sys_sai/tpl/menu.tpl index 9d4c541..218d475 100644 --- a/sai/modules/saistart_sys_sai/tpl/menu.tpl +++ b/sai/modules/saistart_sys_sai/tpl/menu.tpl @@ -1,3 +1,3 @@ - -   SAI + +   SAI \ No newline at end of file diff --git a/sai/page/css/sai.css b/sai/page/css/sai.css index a83d9d1..109de8f 100644 --- a/sai/page/css/sai.css +++ b/sai/page/css/sai.css @@ -10,14 +10,14 @@ } #footer{ text-align: right; - padding-right: 20px; + padding-right: 5px; + padding-top: 5px; color: #777; } #footer a{ color: #777; } #content { - padding-top: 20px; box-sizing: border-box; } .carousel-img{ diff --git a/sai/page/default_page.php b/sai/page/default_page.php index a35d547..5468047 100644 --- a/sai/page/default_page.php +++ b/sai/page/default_page.php @@ -20,15 +20,23 @@ class default_page implements \SYSTEM\PAGE\DefaultPage { * * @return string Returns html of the System Saimod Menu. */ - private static function menu_sys(){ - $result = ''; - $mods = \SYSTEM\SAI\sai::getSysModules(); + private static function menu_left(){ + $result = array(); + $mods = \SYSTEM\SAI\sai::getModules(); foreach($mods as $mod){ if(\call_user_func(array($mod, 'right_public')) || \call_user_func(array($mod, 'right_right'))){ - $result .= \call_user_func(array($mod, 'html_li_menu'));} + $menu = \call_user_func(array($mod, 'menu')); + if($menu->position === sai_module_menu::POISITION_LEFT){ + $result[] = $menu;} + } } - return $result; + usort($result, function($a, $b){return $a->order > $b->order;}); + + $html = ''; + foreach($result as $menu){ + $html .= $menu->html();} + return $html; } /** @@ -36,15 +44,23 @@ class default_page implements \SYSTEM\PAGE\DefaultPage { * * @return string Returns html of the Users Saimod Menu. */ - private static function menu_proj(){ - $result = ''; + private static function menu_right(){ + $result = array(); $mods = \SYSTEM\SAI\sai::getModules(); foreach($mods as $mod){ if(\call_user_func(array($mod, 'right_public')) || \call_user_func(array($mod, 'right_right'))){ - $result .= \call_user_func(array($mod, 'html_li_menu'));} + $menu = \call_user_func(array($mod, 'menu')); + if($menu->position === sai_module_menu::POISITION_RIGHT){ + $result[] = $menu;} + } } - return $result; + usort($result, function($a, $b){return $a->order > $b->order;}); + + $html = ''; + foreach($result as $menu){ + $html .= $menu->html();} + return $html; } /** @@ -68,6 +84,7 @@ class default_page implements \SYSTEM\PAGE\DefaultPage { return \SYSTEM\HTML\html::link(\LIB\lib_bootstrap::css()->WEBPATH(false)). \SYSTEM\HTML\html::link(\SYSTEM\CACHE\cache_css::minify( array( \LIB\lib_tablesorter::css(), + \LIB\lib_font_awesome::css(), \LIB\lib_system::css(), new \SYSTEM\PSAI('page/css/sai_classes.css'), new \SYSTEM\PSAI('page/css/sai.css')))); @@ -81,6 +98,7 @@ class default_page implements \SYSTEM\PAGE\DefaultPage { public static function js(){ return \SYSTEM\HTML\html::script( \SYSTEM\CACHE\cache_js::minify( array( \LIB\lib_jquery::js(), + \LIB\lib_popper::js(), \LIB\lib_bootstrap::js(), \LIB\lib_tablesorter::js(), \LIB\lib_bootstrap_growl::js(), @@ -104,8 +122,8 @@ class default_page implements \SYSTEM\PAGE\DefaultPage { $vars['js'] = self::js();} $vars['menu_languages'] = self::lang_menu('./sai.php'); $vars['menu_start'] = self::menu_start(); - $vars['menu_sys'] = self::menu_sys(); - $vars['menu_proj'] = self::menu_proj(); + $vars['menu_left'] = self::menu_left(); + $vars['menu_right'] = self::menu_right(); $vars = array_merge($vars,\SYSTEM\PAGE\text::tag(\SYSTEM\SQL\system_text::TAG_SAI_DEFAULT), array( 'project' => \SYSTEM\CONFIG\config::get(\SYSTEM\CONFIG\config_ids::SYS_SAI_CONFIG_PROJECT), 'project_url' => \SYSTEM\CONFIG\config::get(\SYSTEM\CONFIG\config_ids::SYS_CONFIG_PATH_BASEURL))); diff --git a/sai/page/js/sai.js b/sai/page/js/sai.js index 2be749f..0080a44 100644 --- a/sai/page/js/sai.js +++ b/sai/page/js/sai.js @@ -1,7 +1,7 @@ $(document).ready(function() { new SYSTEM('./sai.php',42,'start',sys_hashchange); $('[data-toggle="tooltip"]').tooltip(); - $('.navbar-collapse a').click(function(){ + $('.navbar-collapse a:not(.dropdown-toggle)').click(function(){ $(".navbar-collapse").collapse('hide'); }); }); @@ -9,7 +9,7 @@ $(document).ready(function() { function sys_hashchange(state){ var state_ = state ? state.split(';')[0].split('(')[0] : state; var state_ = state_ ? state_.split('#')[0] : state; - $('.nav li,#sai_navbar li, #project_navbar li, #menu_start').each(function(){ + $('.sai_menu li a, #menu_start').each(function(){ $(this).removeClass('active');}); if($('#menu_'+state_).length){ $('#menu_'+state_).addClass('active'); diff --git a/sai/page/tpl/language.tpl b/sai/page/tpl/language.tpl index f89dcd1..430256d 100644 --- a/sai/page/tpl/language.tpl +++ b/sai/page/tpl/language.tpl @@ -1 +1 @@ -${lang}  \ No newline at end of file +${lang} ${lang}  \ No newline at end of file diff --git a/sai/page/tpl/sai.tpl b/sai/page/tpl/sai.tpl index 696b7cb..0a8becd 100644 --- a/sai/page/tpl/sai.tpl +++ b/sai/page/tpl/sai.tpl @@ -7,57 +7,84 @@ ${css} ${js} + + + + -
      +
      -
      - ${menu_languages} -
      - - -
      -
      -
      - -
      -
      -
      -
      -
      -
      -
      -
      - -
      +
      +
      +
      +
      +
      +
      diff --git a/sai/sai/SaiModule.php b/sai/sai/SaiModule.php index da5ab31..3c23248 100644 --- a/sai/sai/SaiModule.php +++ b/sai/sai/SaiModule.php @@ -76,7 +76,7 @@ class SaiModule extends \SYSTEM\API\api_default{ * * @return string Returns HTML of the
    • menu for the Saimod */ - public static function html_li_menu(){ + public static function menu(){ throw new \RuntimeException("Unimplemented!");} /** * Check public state for the Saimod. diff --git a/sai/sai/sai.php b/sai/sai/sai.php index 810d76b..04ca769 100644 --- a/sai/sai/sai.php +++ b/sai/sai/sai.php @@ -18,9 +18,7 @@ class sai { /** string Classname of the Module which should be loaded at start */ private static $module_start = '\SYSTEM\SAI\saistart_sys_sai'; /** array Classnames of all registered Sai user Modules */ - private static $modules = array(); //only strings! - /** array Classnames of all registered Sai system Modules */ - private static $modules_sys = array(); //only strings! + private static $modules = array(); //only strings! /** * Check if a given SaiModuleClass is valid @@ -47,7 +45,7 @@ class sai { self::$module_start = $module;} /** - * Register a Sai user Module + * Register a Sai Module * * @param string $module Classname of the Module * @return null Returns null. @@ -56,17 +54,6 @@ class sai { if(!self::check_module($module)){ throw new \SYSTEM\LOG\ERROR('Problem with your Sysmodule class: '.$module.'; it might not be available or inherits from the wrong class!');} array_push(self::$modules,$module);} - - /** - * Register a Sai system Module - * - * @param string $module Classname of the Module - * @return null Returns null. - */ - public static function register_sys($module){ - if(!self::check_module($module)){ - throw new \SYSTEM\LOG\ERROR('Problem with your Sysmodule class: '.$module.'; it might not be available or inherits from the wrong class!');} - array_push(self::$modules_sys,$module);} /** * Get the classname of the Startmodule @@ -83,14 +70,6 @@ class sai { */ public static function getModules(){ return self::$modules;} - - /** - * Get all classnames of the registered system saimods - * - * @return array Returns array with classname of the registered Modules. - */ - public static function getSysModules(){ - return self::$modules_sys;} /** * Get all classnames of all the registered saimods @@ -98,5 +77,5 @@ class sai { * @return array Returns array with classname of all the registered Modules. */ public static function getAllModules(){ - return array_merge(self::$modules_sys,self::$modules,array(self::$module_start));} + return array_merge(self::$modules,array(self::$module_start));} } \ No newline at end of file diff --git a/sai/sai/sai_module_menu.php b/sai/sai/sai_module_menu.php new file mode 100644 index 0000000..ef5e4aa --- /dev/null +++ b/sai/sai/sai_module_menu.php @@ -0,0 +1,37 @@ +order = $order; + $this->position = $position; + $this->divider = $divider; + $this->html = $html; + } + + private static function divider(){ + return '
    • '. + '
    • '; + } + + public function html(){ + $result = ''; + if($this->divider == self::DIVIDER_LEFT){ + $result .= self::divider();} + $result .= $this->html; + if($this->divider == self::DIVIDER_RIGHT){ + $result .= self::divider();} + return $result; + } +} \ No newline at end of file
      ${basic_username}