diff --git a/dbd/sql/mysql/data/sai_api.sql b/dbd/sql/mysql/data/sai_api.sql index 4745657..494515f 100644 --- a/dbd/sql/mysql/data/sai_api.sql +++ b/dbd/sql/mysql/data/sai_api.sql @@ -91,7 +91,7 @@ INSERT INTO `system_api` (`ID`, `group`, `type`, `parentID`, `parentValue`, `nam INSERT INTO `system_api` (`ID`, `group`, `type`, `parentID`, `parentValue`, `name`, `verify`) VALUES (609, 42, 2, 600, 'deletedialog', 'ID', 'INT'); -INSERT INTO `system_api` (`ID`, `group`, `type`, `parentID`, `parentValue`, `name`, `verify`) VALUES (700, 42, 0, 0, '_SYSTEM_SAI_saimod_sys_locale', 'action', NULL); +INSERT INTO `system_api` (`ID`, `group`, `type`, `parentID`, `parentValue`, `name`, `verify`) VALUES (700, 42, 0, 0, '_SYSTEM_SAI_saimod_sys_text', 'action', NULL); -- INSERT INTO `system_api` (`ID`, `group`, `type`, `parentID`, `parentValue`, `name`, `verify`) VALUES (701, 42, 2, 700, 'load', 'id', 'LANG'); INSERT INTO `system_api` (`ID`, `group`, `type`, `parentID`, `parentValue`, `name`, `verify`) VALUES (702, 42, 2, 700, 'load', 'group', 'INT'); diff --git a/dbd/sql/mysql/data/system_page.sql b/dbd/sql/mysql/data/system_page.sql new file mode 100644 index 0000000..8edbad1 --- /dev/null +++ b/dbd/sql/mysql/data/system_page.sql @@ -0,0 +1,13 @@ +INSERT INTO `system_page` (`group`, `id`, `div`, `url`, `func`, `php_class`) VALUES (42, 'api', '#content', './sai.php?sai_mod=.SYSTEM.SAI.saimod_sys_api', 'init_saimod_sys_api', '\\SYSTEM\\SAI\\saimod_sys_api'); +INSERT INTO `system_page` (`group`, `id`, `div`, `url`, `func`, `php_class`) VALUES (42, 'cache', '#content', './sai.php?sai_mod=.SYSTEM.SAI.saimod_sys_cache', 'init_saimod_sys_cache', '\\SYSTEM\\SAI\\saimod_sys_cache'); +INSERT INTO `system_page` (`group`, `id`, `div`, `url`, `func`, `php_class`) VALUES (42, 'config', '#content', './sai.php?sai_mod=.SYSTEM.SAI.saimod_sys_config', 'init_saimod_sys_config', '\\SYSTEM\\SAI\\saimod_sys_config'); +INSERT INTO `system_page` (`group`, `id`, `div`, `url`, `func`, `php_class`) VALUES (42, 'cron', '#content', './sai.php?sai_mod=.SYSTEM.SAI.saimod_sys_cron', 'init_saimod_sys_cron', '\\SYSTEM\\SAI\\saimod_sys_cron'); +INSERT INTO `system_page` (`group`, `id`, `div`, `url`, `func`, `php_class`) VALUES (42, 'docu', '#content', './sai.php?sai_mod=.SYSTEM.SAI.saimod_sys_docu', 'init_saimod_sys_docu', '\\SYSTEM\\SAI\\saimod_sys_docu'); +INSERT INTO `system_page` (`group`, `id`, `div`, `url`, `func`, `php_class`) VALUES (42, 'files', '#content', './sai.php?sai_mod=.SYSTEM.SAI.saimod_sys_files', 'init_saimod_sys_files', '\\SYSTEM\\SAI\\saimod_sys_files'); +INSERT INTO `system_page` (`group`, `id`, `div`, `url`, `func`, `php_class`) VALUES (42, 'log', '#content', './sai.php?sai_mod=.SYSTEM.SAI.saimod_sys_log', 'init_saimod_sys_log', '\\SYSTEM\\SAI\\saimod_sys_log'); +INSERT INTO `system_page` (`group`, `id`, `div`, `url`, `func`, `php_class`) VALUES (42, 'login', '#content', './sai.php?sai_mod=.SYSTEM.SAI.saimod_sys_login', 'init_saimod_sys_login', '\\SYSTEM\\SAI\\saimod_sys_login'); +INSERT INTO `system_page` (`group`, `id`, `div`, `url`, `func`, `php_class`) VALUES (42, 'mod', '#content', './sai.php?sai_mod=.SYSTEM.SAI.saimod_sys_mod', 'init_saimod_sys_mod', '\\SYSTEM\\SAI\\saimod_sys_mod'); +INSERT INTO `system_page` (`group`, `id`, `div`, `url`, `func`, `php_class`) VALUES (42, 'security', '#content', './sai.php?sai_mod=.SYSTEM.SAI.saimod_sys_security', 'init_saimod_sys_security', '\\SYSTEM\\SAI\\saimod_sys_security'); +INSERT INTO `system_page` (`group`, `id`, `div`, `url`, `func`, `php_class`) VALUES (42, 'start', '#content', './sai.php?sai_mod=.SYSTEM.SAI.saistart_sys_sai', 'init_saistart_sys_sai', '\\SYSTEM\\SAI\\saistart_sys_sai'); +INSERT INTO `system_page` (`group`, `id`, `div`, `url`, `func`, `php_class`) VALUES (42, 'text', '#content', './sai.php?sai_mod=.SYSTEM.SAI.saimod_sys_text', 'init_saimod_sys_text', '\\SYSTEM\\SAI\\saimod_sys_text'); +INSERT INTO `system_page` (`group`, `id`, `div`, `url`, `func`, `php_class`) VALUES (42, 'todo', '#content', './sai.php?sai_mod=.SYSTEM.SAI.saimod_sys_todo', 'init_saimod_sys_todo', '\\SYSTEM\\SAI\\saimod_sys_todo'); \ No newline at end of file diff --git a/files/sys/system.js b/files/sys/system.js index 5d018c4..2de0dce 100644 --- a/files/sys/system.js +++ b/files/sys/system.js @@ -39,8 +39,14 @@ SYSTEM.prototype.handle_call_pages = function (data,id) { dataType: 'html', url: entry['url']+'&'+window.location.search.substr(1), success: function(data){ - $(entry['div']).html(data); - system.log(system.LOG_INFO,'load page: '+id+entry['div']+' '+entry['url']+'&'+window.location.search.substr(1)+' - success');}, + if($(entry['div']).length){ + //console.log(entry['div']); + //console.log(data); + $(entry['div']).html(data); + system.log_info('load page: '+id+entry['div']+' '+entry['url']+'&'+window.location.search.substr(1)+' - success'); + } else { + system.log_error('load page: '+id+entry['div']+' '+entry['url']+'&'+window.location.search.substr(1)+' - div not found'); + }}, error: function(XMLHttpRequest, textStatus, errorThrown){system.log(system.LOG_ERROR,errorThrown);} }); //load css @@ -67,7 +73,7 @@ SYSTEM.prototype.handle_call_pages = function (data,id) { //update state system.state[entry['div']] = entry['url']+'&'+window.location.search.substr(1); } else { - system.log(system.LOG_INFO,'load page: '+id+entry['div']+' '+entry['url']+'&'+window.location.search.substr(1)+' - skipped - already loaded'); + system.log_info('load page: '+id+entry['div']+' '+entry['url']+'&'+window.location.search.substr(1)+' - skipped - already loaded'); } }); } else { diff --git a/page/State.php b/page/State.php index e59cbba..165caf8 100644 --- a/page/State.php +++ b/page/State.php @@ -20,6 +20,8 @@ class State { $row['css'] = array_merge($row['css'], call_user_func($row['php_class'].'::css'));} if(\class_exists($row['php_class']) && \method_exists($row['php_class'], 'js') && \is_callable($row['php_class'].'::js')){ $row['js'] = array_merge($row['js'], call_user_func($row['php_class'].'::js'));} - $result[] = $row;} + $row['php_class'] = ''; + $result[] = $row; + } return $returnasjson ? \SYSTEM\LOG\JsonResult::toString($result) : $result;} } \ No newline at end of file diff --git a/sai/modules/autoload.inc b/sai/modules/autoload.inc index 9b78174..4bb638c 100644 --- a/sai/modules/autoload.inc +++ b/sai/modules/autoload.inc @@ -7,7 +7,7 @@ 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_locale/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'; diff --git a/sai/modules/saimod_sys_api/saimod_sys_api.css b/sai/modules/saimod_sys_api/css/saimod_sys_api.css similarity index 100% rename from sai/modules/saimod_sys_api/saimod_sys_api.css rename to sai/modules/saimod_sys_api/css/saimod_sys_api.css diff --git a/sai/modules/saimod_sys_api/saimod_sys_api.js b/sai/modules/saimod_sys_api/js/saimod_sys_api.js similarity index 99% rename from sai/modules/saimod_sys_api/saimod_sys_api.js rename to sai/modules/saimod_sys_api/js/saimod_sys_api.js index c80b5a1..ea8b3ad 100644 --- a/sai/modules/saimod_sys_api/saimod_sys_api.js +++ b/sai/modules/saimod_sys_api/js/saimod_sys_api.js @@ -1,6 +1,6 @@ var currentID = ''; -function init__SYSTEM_SAI_saimod_sys_api() { +function init_saimod_sys_api() { saimod_sys_api_tree(); saimod_sys_api_register_clickevents(); diff --git a/sai/modules/saimod_sys_api/saimod_sys_api.php b/sai/modules/saimod_sys_api/saimod_sys_api.php index 7af02aa..d738458 100644 --- a/sai/modules/saimod_sys_api/saimod_sys_api.php +++ b/sai/modules/saimod_sys_api/saimod_sys_api.php @@ -91,14 +91,12 @@ class saimod_sys_api extends \SYSTEM\SAI\SaiModule { } } - public static function html_li_menu(){return '
  • API
    • ';} + public static function html_li_menu(){return '
  • 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);} - public static function sai_mod__SYSTEM_SAI_saimod_sys_api_flag_css(){ - return \SYSTEM\LOG\JsonResult::toString( - array( \SYSTEM\WEBPATH(new \SYSTEM\PSAI(),'modules/saimod_sys_api/saimod_sys_api.css')));} - public static function sai_mod__SYSTEM_SAI_saimod_sys_api_flag_js(){ - return \SYSTEM\LOG\JsonResult::toString( - array( \SYSTEM\WEBPATH(new \SYSTEM\PSAI(),'modules/saimod_sys_api/saimod_sys_api.js')));} + public static function css(){ + return array(\SYSTEM\WEBPATH(new \SYSTEM\PSAI(),'modules/saimod_sys_api/css/saimod_sys_api.css'));} + public static function js(){ + return array( \SYSTEM\WEBPATH(new \SYSTEM\PSAI(),'modules/saimod_sys_api/js/saimod_sys_api.js'));} } \ 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 979b7b6..f55788f 100644 --- a/sai/modules/saimod_sys_cache/saimod_sys_cache.php +++ b/sai/modules/saimod_sys_cache/saimod_sys_cache.php @@ -39,10 +39,10 @@ class saimod_sys_cache extends \SYSTEM\SAI\SaiModule { return 'success'; } - public static function html_li_menu(){return '
  • Cache
    • ';} + public static function html_li_menu(){return '
  • Cache
    • ';} public static function right_public(){return false;} public static function right_right(){return \SYSTEM\SECURITY\Security::check(\SYSTEM\SECURITY\RIGHTS::SYS_SAI);} - public static function sai_mod__SYSTEM_SAI_saimod_sys_cache_flag_css(){} - public static function sai_mod__SYSTEM_SAI_saimod_sys_cache_flag_js(){} + //public static function css(){} + //public static function js(){} } \ No newline at end of file diff --git a/sai/modules/saimod_sys_config/saimod_sys_config.php b/sai/modules/saimod_sys_config/saimod_sys_config.php index a907da9..4eac2d1 100644 --- a/sai/modules/saimod_sys_config/saimod_sys_config.php +++ b/sai/modules/saimod_sys_config/saimod_sys_config.php @@ -1,6 +1,5 @@ System Config
    '. @@ -32,10 +31,10 @@ class saimod_sys_config extends \SYSTEM\SAI\SaiModule { return $result; } - public static function html_li_menu(){return '
  • Config
    • ';} + public static function html_li_menu(){return '
  • Config
    • ';} public static function right_public(){return false;} public static function right_right(){return \SYSTEM\SECURITY\Security::check(\SYSTEM\SECURITY\RIGHTS::SYS_SAI);} - public static function sai_mod__SYSTEM_SAI_saimod_sys_config_flag_css(){} - public static function sai_mod__SYSTEM_SAI_saimod_sys_config_flag_js(){} + //public static function css(){} + //public static function js(){} } \ No newline at end of file diff --git a/sai/modules/saimod_sys_cron/js/saimod_sys_cron.js b/sai/modules/saimod_sys_cron/js/saimod_sys_cron.js index 48adf2f..ae5f618 100644 --- a/sai/modules/saimod_sys_cron/js/saimod_sys_cron.js +++ b/sai/modules/saimod_sys_cron/js/saimod_sys_cron.js @@ -1,4 +1,4 @@ -function init__SYSTEM_SAI_saimod_sys_cron() { +function init_saimod_sys_cron() { register_cron_add(); register_cron_del(); register_cron_edit(); diff --git a/sai/modules/saimod_sys_cron/saimod_sys_cron.php b/sai/modules/saimod_sys_cron/saimod_sys_cron.php index 0956c28..62006d8 100644 --- a/sai/modules/saimod_sys_cron/saimod_sys_cron.php +++ b/sai/modules/saimod_sys_cron/saimod_sys_cron.php @@ -39,14 +39,12 @@ 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 '
  • Cron
    • ';} + public static function html_li_menu(){return '
  • Cron
    • ';} public static function right_public(){return false;} public static function right_right(){return \SYSTEM\SECURITY\Security::check(\SYSTEM\SECURITY\RIGHTS::SYS_SAI_CRON);} - public static function sai_mod__SYSTEM_SAI_saimod_sys_cron_flag_css(){ - return \SYSTEM\LOG\JsonResult::toString( - array( \SYSTEM\WEBPATH(new \SYSTEM\PSAI(),'modules/saimod_sys_cron/css/saimod_sys_cron.css')));} - public static function sai_mod__SYSTEM_SAI_saimod_sys_cron_flag_js(){ - return \SYSTEM\LOG\JsonResult::toString( - array( \SYSTEM\WEBPATH(new \SYSTEM\PSAI(),'modules/saimod_sys_cron/js/saimod_sys_cron.js')));} + public static function css(){ + return array( \SYSTEM\WEBPATH(new \SYSTEM\PSAI(),'modules/saimod_sys_cron/css/saimod_sys_cron.css'));} + public static function js(){ + return array( \SYSTEM\WEBPATH(new \SYSTEM\PSAI(),'modules/saimod_sys_cron/js/saimod_sys_cron.js'));} } \ No newline at end of file diff --git a/sai/modules/saimod_sys_docu/saimod_sys_docu.js b/sai/modules/saimod_sys_docu/js/saimod_sys_docu.js similarity index 85% rename from sai/modules/saimod_sys_docu/saimod_sys_docu.js rename to sai/modules/saimod_sys_docu/js/saimod_sys_docu.js index 6bb2124..47d95c6 100644 --- a/sai/modules/saimod_sys_docu/saimod_sys_docu.js +++ b/sai/modules/saimod_sys_docu/js/saimod_sys_docu.js @@ -1,6 +1,6 @@ var editor = null; -function init__SYSTEM_SAI_saimod_sys_docu() { +function init_saimod_sys_docu() { $('#documaintab a, .subtabs a').click(function (e) { e.preventDefault(); $(this).tab('show'); diff --git a/sai/modules/saimod_sys_docu/saimod_sys_docu.php b/sai/modules/saimod_sys_docu/saimod_sys_docu.php index 13115f8..3e49a14 100644 --- a/sai/modules/saimod_sys_docu/saimod_sys_docu.php +++ b/sai/modules/saimod_sys_docu/saimod_sys_docu.php @@ -41,13 +41,12 @@ class saimod_sys_docu extends \SYSTEM\SAI\SaiModule { return \SYSTEM\PAGE\replace::replaceFile(\SYSTEM\SERVERPATH(new \SYSTEM\PSAI(),'modules/saimod_sys_docu/tpl/tabs.tpl'), $vars); } - public static function html_li_menu(){return '
  • Docu
    • ';} + public static function html_li_menu(){return '
  • Docu
    • ';} public static function right_public(){return false;} public static function right_right(){return \SYSTEM\SECURITY\Security::check(\SYSTEM\SECURITY\RIGHTS::SYS_SAI);} - public static function sai_mod__SYSTEM_SAI_saimod_sys_docu_flag_css(){} - public static function sai_mod__SYSTEM_SAI_saimod_sys_docu_flag_js(){ - return \SYSTEM\LOG\JsonResult::toString( - array( \SYSTEM\WEBPATH(new \SYSTEM\PSYSTEM(),'lib/EpicEditor/js/epiceditor.min.js'), - \SYSTEM\WEBPATH(new \SYSTEM\PSAI(),'modules/saimod_sys_docu/saimod_sys_docu.js')));} + //public static function css(){} + public static function js(){ + return array( \SYSTEM\WEBPATH(new \SYSTEM\PSYSTEM(),'lib/EpicEditor/js/epiceditor.min.js'), + \SYSTEM\WEBPATH(new \SYSTEM\PSAI(),'modules/saimod_sys_docu/js/saimod_sys_docu.js'));} } \ No newline at end of file diff --git a/sai/modules/saimod_sys_files/saimod_sys_files.js b/sai/modules/saimod_sys_files/js/saimod_sys_files.js similarity index 62% rename from sai/modules/saimod_sys_files/saimod_sys_files.js rename to sai/modules/saimod_sys_files/js/saimod_sys_files.js index c2d2548..052e9f2 100644 --- a/sai/modules/saimod_sys_files/saimod_sys_files.js +++ b/sai/modules/saimod_sys_files/js/saimod_sys_files.js @@ -1,18 +1,18 @@ -function init__SYSTEM_SAI_saimod_sys_files() { - $('.tooltip').tooltipster(); +function init_saimod_sys_files() { + //$('.tooltip').tooltipster(); $('#filestab a').click(function (e) {e.preventDefault(); load_tab($(this).attr('tabname')); $(this).tab('show');}); - register_controlls(); + register_controls(); } function load_tab(name){ - $('#tab_'+name).load(SAI_ENDPOINT+'sai_mod=.SYSTEM.SAI.saimod_sys_files&action=tab&name='+name, function(){ - register_controlls(); + $('#tab_'+name).load('./sai.php?sai_mod=.SYSTEM.SAI.saimod_sys_files&action=tab&name='+name, function(){ + register_controls(); }); } -function register_controlls(){ +function register_controls(){ $(".imgdelbtn").click(function(){ - $.getJSON(SAI_ENDPOINT+'sai_mod=.SYSTEM.SAI.saimod_sys_files&action=del&cat='+$(this).attr("cat")+'&id='+$(this).attr("id"), function(data){ + $.getJSON('./sai.php?sai_mod=.SYSTEM.SAI.saimod_sys_files&action=del&cat='+$(this).attr("cat")+'&id='+$(this).attr("id"), function(data){ if(data.status){ alert("ok"); } else{ @@ -22,7 +22,7 @@ function register_controlls(){ }); $(".imgrnbtn").click(function(){ - $.getJSON(SAI_ENDPOINT+'sai_mod=.SYSTEM.SAI.saimod_sys_files&action=rn&cat='+$(this).attr("cat")+'&id='+$(this).attr("id")+'&newid='+$($(this).attr("textfield")).val(), function(data){ + $.getJSON('./sai.php?sai_mod=.SYSTEM.SAI.saimod_sys_files&action=rn&cat='+$(this).attr("cat")+'&id='+$(this).attr("id")+'&newid='+$($(this).attr("textfield")).val(), function(data){ if(data.status){ alert("ok"); } else{ @@ -42,7 +42,7 @@ function register_controlls(){ $('.btn_upload').click(function(){ var formData = new FormData($('#form_'+$(this).attr('cat'))[0]); $.ajax({ - url: SAI_ENDPOINT+'sai_mod=.SYSTEM.SAI.saimod_sys_files&action=upload&cat='+$(this).attr('cat'), //Server script to process data + url: './sai.php?sai_mod=.SYSTEM.SAI.saimod_sys_files&action=upload&cat='+$(this).attr('cat'), //Server script to process data type: 'POST', //Ajax events success: function(){alert('ok');}, diff --git a/sai/modules/saimod_sys_files/saimod_sys_files.php b/sai/modules/saimod_sys_files/saimod_sys_files.php index d175d91..287083d 100644 --- a/sai/modules/saimod_sys_files/saimod_sys_files.php +++ b/sai/modules/saimod_sys_files/saimod_sys_files.php @@ -42,11 +42,11 @@ class saimod_sys_files extends \SYSTEM\SAI\SaiModule { $result .= \SYSTEM\PAGE\replace::replaceFile(\SYSTEM\SERVERPATH(new \SYSTEM\PSAI(),'modules/saimod_sys_files/tpl/saimod_sys_files_tableentry.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_tabfull.tpl'), array('cat' => $name, 'content' => $result));} - public static function html_li_menu(){return '
  • Files
    • ';} + public static function html_li_menu(){return '
  • Files
    • ';} 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);} - public static function sai_mod__SYSTEM_SAI_saimod_sys_files_flag_css(){} - public static function sai_mod__SYSTEM_SAI_saimod_sys_files_flag_js(){return \SYSTEM\LOG\JsonResult::toString( - array( \SYSTEM\WEBPATH(new \SYSTEM\PSAI(),'modules/saimod_sys_files/saimod_sys_files.js')));} + //public static function css(){} + public static function js(){ + return array( \SYSTEM\WEBPATH(new \SYSTEM\PSAI(),'modules/saimod_sys_files/js/saimod_sys_files.js'));} } \ 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 fae24a8..dd1ddd8 100644 --- a/sai/modules/saimod_sys_log/js/saimod_sys_log.js +++ b/sai/modules/saimod_sys_log/js/saimod_sys_log.js @@ -1,4 +1,5 @@ -function init__SYSTEM_SAI_saimod_sys_log() { +google.load("visualization", "1", {packages:["corechart"]}); +function init_saimod_sys_log() { $('#tabs_log a').click(function (e) { e.preventDefault(); $(this).tab('show'); @@ -12,13 +13,13 @@ function load_log_tab(action){ $('img#loader').show(); switch(action){ case 'log': - $('#tab_log').load(SAI_ENDPOINT+'sai_mod=.SYSTEM.SAI.saimod_sys_log&action='+action, function(){ + $('#tab_log').load('./sai.php?sai_mod=.SYSTEM.SAI.saimod_sys_log&action='+action, function(){ register_log(); register_error(); $('img#loader').hide();}); return; case 'stats': - $('#tab_stats').load(SAI_ENDPOINT+'sai_mod=.SYSTEM.SAI.saimod_sys_log&action='+action, function(){ + $('#tab_stats').load('./sai.php?sai_mod=.SYSTEM.SAI.saimod_sys_log&action='+action, function(){ register_stats(); $('img#loader').hide();}); return; @@ -30,13 +31,13 @@ function load_log_tab(action){ function register_error(){ $('.sai_log_error').click(function(){ $('img#loader').show(); - $('#table_log').load(SAI_ENDPOINT+'sai_mod=.SYSTEM.SAI.saimod_sys_log&action=error&error='+$(this).attr('error'), function(){ + $('#table_log').load('./sai.php?sai_mod=.SYSTEM.SAI.saimod_sys_log&action=error&error='+$(this).attr('error'), function(){ $('img#loader').hide();})}); } function load_table_log(filter){ $('img#loader').show(); - $('#table_log').load(SAI_ENDPOINT+'sai_mod=.SYSTEM.SAI.saimod_sys_log&action=filter&filter='+filter, function(){ + $('#table_log').load('./sai.php?sai_mod=.SYSTEM.SAI.saimod_sys_log&action=filter&filter='+filter, function(){ register_error(); $('img#loader').hide();}); } @@ -71,7 +72,7 @@ function load_visualisation(){ var name = $('#vis_filter_type').val();; var filter = $('#vis_filter_time').val(); var db = $('#stats_tabs li.active').attr('db'); - $.getJSON(SAI_ENDPOINT+'sai_mod=.SYSTEM.SAI.saimod_sys_log&action=stats&name='+name+'&filter='+filter+'&db='+db,function(json){ + $.getJSON('./sai.php?sai_mod=.SYSTEM.SAI.saimod_sys_log&action=stats&name='+name+'&filter='+filter+'&db='+db,function(json){ if(!json || json.status != true || !json.result){ $('img#loader').hide(); return; diff --git a/sai/modules/saimod_sys_log/saimod_sys_log.php b/sai/modules/saimod_sys_log/saimod_sys_log.php index 84a1976..504e3b0 100644 --- a/sai/modules/saimod_sys_log/saimod_sys_log.php +++ b/sai/modules/saimod_sys_log/saimod_sys_log.php @@ -1,8 +1,6 @@ Log';} + public static function html_li_menu(){return '
  • Log
    • ';} public static function right_public(){return false;} public static function right_right(){return \SYSTEM\SECURITY\Security::check(\SYSTEM\SECURITY\RIGHTS::SYS_SAI);} - public static function sai_mod__SYSTEM_SAI_saimod_sys_log_flag_css(){} - public static function sai_mod__SYSTEM_SAI_saimod_sys_log_flag_js(){ - return \SYSTEM\LOG\JsonResult::toString( - array(\SYSTEM\WEBPATH(new \SYSTEM\PSAI(),'modules/saimod_sys_log/js/saimod_sys_log.js')));} + //public static function css(){} + public static function js(){ + return array(\SYSTEM\WEBPATH(new \SYSTEM\PSAI(),'modules/saimod_sys_log/js/saimod_sys_log.js'));} } \ No newline at end of file diff --git a/sai/modules/saimod_sys_login/sai_sys_login_submit.js b/sai/modules/saimod_sys_login/js/sai_sys_login_submit.js similarity index 81% rename from sai/modules/saimod_sys_login/sai_sys_login_submit.js rename to sai/modules/saimod_sys_login/js/sai_sys_login_submit.js index c00651d..e63b117 100644 --- a/sai/modules/saimod_sys_login/sai_sys_login_submit.js +++ b/sai/modules/saimod_sys_login/js/sai_sys_login_submit.js @@ -1,10 +1,10 @@ -function init__SYSTEM_SAI_saimod_sys_login() { +function init_saimod_sys_login() { //jqBootstrapValidation $("#login_form input").not("[type=submit]").jqBootstrapValidation({ preventSubmit: true, submitError: function($form, event, errors) {}, submitSuccess: function($form, event){ - $.get(SAI_ENDPOINT+'sai_mod=.SYSTEM.SAI.saimod_sys_login&action=login&username='+$('#bt_login_user').val()+'&password_sha='+$.sha1($('#bt_login_password').val())+'&password_md5='+$.md5($('#bt_login_password').val()), function (data) { + $.get('./sai.php?sai_mod=.SYSTEM.SAI.saimod_sys_login&action=login&username='+$('#bt_login_user').val()+'&password_sha='+$.sha1($('#bt_login_password').val())+'&password_md5='+$.md5($('#bt_login_password').val()), function (data) { if(data == 1){ $('.help-block').html("Login successfull.
    "); location.reload(true); @@ -20,7 +20,7 @@ function init__SYSTEM_SAI_saimod_sys_login() { preventSubmit: true, submitError: function($form, event, errors) {}, submitSuccess: function($form, event){ - $.get(SAI_ENDPOINT+'sai_mod=.SYSTEM.SAI.saimod_sys_login&action=logout', function (data) { + $.get('./sai.php?sai_mod=.SYSTEM.SAI.saimod_sys_login&action=logout', function (data) { if(data == 1){ $('.help-block').html("Logout successfull.
    "); location.reload(true); @@ -32,7 +32,7 @@ function init__SYSTEM_SAI_saimod_sys_login() { } }); - $.getJSON(SAI_ENDPOINT+'sai_mod=.SYSTEM.SAI.saimod_sys_login&action=userinfo', function(data){ + $.getJSON('./sai.php?sai_mod=.SYSTEM.SAI.saimod_sys_login&action=userinfo', function(data){ if(data){ $('#user_email_input').attr('value', data.email); $('span#user_username').text(data.username); @@ -44,7 +44,7 @@ function init__SYSTEM_SAI_saimod_sys_login() { }); $("#register_link").click(function(){ - $('div#content-wrapper').load(SAI_ENDPOINT+'sai_mod=.SYSTEM.SAI.saimod_sys_login&action=registerform',function(){ + $('div#content-wrapper').load('./sai.php?sai_mod=.SYSTEM.SAI.saimod_sys_login&action=registerform',function(){ init__SYSTEM_SAI_saimod_sys_login_register(); }); }); @@ -75,7 +75,7 @@ function init__SYSTEM_SAI_saimod_sys_login_register(){ $.ajax({ dataType: "json", - url: SAI_ENDPOINT+'sai_mod=.SYSTEM.SAI.saimod_sys_login&action=register&username='+username+'&password='+$.sha1(password)+'&email='+email+'&locale='+locale, + url: './sai.php?sai_mod=.SYSTEM.SAI.saimod_sys_login&action=register&username='+username+'&password='+$.sha1(password)+'&email='+email+'&locale='+locale, data: null, success: function (dataCreate) { if(dataCreate === 1){ // reload -> user will be loged in diff --git a/sai/modules/saimod_sys_login/saimod_sys_login.php b/sai/modules/saimod_sys_login/saimod_sys_login.php index ec3d72b..e3481f0 100644 --- a/sai/modules/saimod_sys_login/saimod_sys_login.php +++ b/sai/modules/saimod_sys_login/saimod_sys_login.php @@ -1,7 +1,5 @@ -
    -
    +
    +

    ${copyright}