From 733ed25138006f6c60ca192e8d95603ed504c540 Mon Sep 17 00:00:00 2001 From: rylon Date: Mon, 6 Apr 2015 04:04:35 +0200 Subject: [PATCH] sai to statesystem transfered (first step - all modules are available) --- dbd/sql/mysql/data/sai_api.sql | 2 +- dbd/sql/mysql/data/system_page.sql | 13 +++ files/sys/system.js | 12 ++- page/State.php | 4 +- sai/modules/autoload.inc | 2 +- .../{ => css}/saimod_sys_api.css | 0 .../saimod_sys_api/{ => js}/saimod_sys_api.js | 2 +- sai/modules/saimod_sys_api/saimod_sys_api.php | 12 +-- .../saimod_sys_cache/saimod_sys_cache.php | 6 +- .../saimod_sys_config/saimod_sys_config.php | 7 +- .../saimod_sys_cron/js/saimod_sys_cron.js | 2 +- .../saimod_sys_cron/saimod_sys_cron.php | 12 +-- .../{ => js}/saimod_sys_docu.js | 2 +- .../saimod_sys_docu/saimod_sys_docu.php | 11 +- .../{ => js}/saimod_sys_files.js | 18 ++-- .../saimod_sys_files/saimod_sys_files.php | 8 +- .../saimod_sys_log/js/saimod_sys_log.js | 13 +-- sai/modules/saimod_sys_log/saimod_sys_log.php | 11 +- .../{ => js}/sai_sys_login_submit.js | 12 +-- .../saimod_sys_login/saimod_sys_login.php | 19 ++-- .../saimod_sys_mod/{ => js}/saimod_sys_mod.js | 2 +- sai/modules/saimod_sys_mod/saimod_sys_mod.php | 9 +- .../{ => css}/saimod_sys_security.css | 0 .../{ => js}/saimod_sys_security.js | 27 +++-- .../saimod_sys_security.php | 10 +- .../autoload.inc | 2 +- .../js/saimod_sys_text.js} | 62 +++++------ .../qq/SYS_SAIMOD_LOCALE_ADD.php | 0 .../qq/SYS_SAIMOD_LOCALE_CATEGORY.php | 0 .../qq/SYS_SAIMOD_LOCALE_DEL.php | 0 .../qq/SYS_SAIMOD_LOCALE_ID.php | 0 .../qq/SYS_SAIMOD_LOCALE_SELECT.php | 0 .../qq/SYS_SAIMOD_LOCALE_SELECT_LANG.php | 0 .../saimod_sys_text.php} | 36 +++---- .../tinymce/LICENSE.TXT | 0 .../tinymce/jquery.tinymce.min.js | 0 .../tinymce/langs/readme.md | 0 .../tinymce/plugins/advlist/plugin.min.js | 0 .../tinymce/plugins/anchor/plugin.min.js | 0 .../tinymce/plugins/autolink/plugin.min.js | 0 .../tinymce/plugins/autoresize/plugin.min.js | 0 .../tinymce/plugins/autosave/plugin.min.js | 0 .../tinymce/plugins/bbcode/plugin.min.js | 0 .../tinymce/plugins/charmap/plugin.min.js | 0 .../tinymce/plugins/code/plugin.min.js | 0 .../tinymce/plugins/contextmenu/plugin.min.js | 0 .../plugins/directionality/plugin.min.js | 0 .../plugins/emoticons/img/smiley-cool.gif | Bin .../plugins/emoticons/img/smiley-cry.gif | Bin .../emoticons/img/smiley-embarassed.gif | Bin .../emoticons/img/smiley-foot-in-mouth.gif | Bin .../plugins/emoticons/img/smiley-frown.gif | Bin .../plugins/emoticons/img/smiley-innocent.gif | Bin .../plugins/emoticons/img/smiley-kiss.gif | Bin .../plugins/emoticons/img/smiley-laughing.gif | Bin .../emoticons/img/smiley-money-mouth.gif | Bin .../plugins/emoticons/img/smiley-sealed.gif | Bin .../plugins/emoticons/img/smiley-smile.gif | Bin .../emoticons/img/smiley-surprised.gif | Bin .../emoticons/img/smiley-tongue-out.gif | Bin .../emoticons/img/smiley-undecided.gif | Bin .../plugins/emoticons/img/smiley-wink.gif | Bin .../plugins/emoticons/img/smiley-yell.gif | Bin .../tinymce/plugins/emoticons/plugin.min.js | 0 .../tinymce/plugins/example/plugin.min.js | 0 .../plugins/example_dependency/plugin.min.js | 0 .../tinymce/plugins/fullpage/plugin.min.js | 0 .../tinymce/plugins/fullscreen/plugin.min.js | 0 .../tinymce/plugins/hr/plugin.min.js | 0 .../tinymce/plugins/image/plugin.min.js | 0 .../tinymce/plugins/importcss/plugin.min.js | 0 .../plugins/insertdatetime/plugin.min.js | 0 .../tinymce/plugins/layer/plugin.min.js | 0 .../plugins/legacyoutput/plugin.min.js | 0 .../tinymce/plugins/link/plugin.min.js | 0 .../tinymce/plugins/lists/plugin.min.js | 0 .../tinymce/plugins/media/moxieplayer.swf | Bin .../tinymce/plugins/media/plugin.min.js | 0 .../plugins/moxiemanager/plugin.min.js | 0 .../tinymce/plugins/nonbreaking/plugin.min.js | 0 .../tinymce/plugins/noneditable/plugin.min.js | 0 .../tinymce/plugins/pagebreak/plugin.min.js | 0 .../tinymce/plugins/paste/plugin.min.js | 0 .../tinymce/plugins/preview/plugin.min.js | 0 .../tinymce/plugins/print/plugin.min.js | 0 .../tinymce/plugins/save/plugin.min.js | 0 .../plugins/searchreplace/plugin.min.js | 0 .../plugins/spellchecker/plugin.min.js | 0 .../tinymce/plugins/tabfocus/plugin.min.js | 0 .../tinymce/plugins/table/plugin.min.js | 0 .../tinymce/plugins/template/plugin.min.js | 0 .../tinymce/plugins/textcolor/plugin.min.js | 0 .../plugins/visualblocks/css/visualblocks.css | 0 .../plugins/visualblocks/plugin.min.js | 0 .../tinymce/plugins/visualchars/plugin.min.js | 0 .../tinymce/plugins/wordcount/plugin.min.js | 0 .../skins/lightgray/content.inline.min.css | 0 .../tinymce/skins/lightgray/content.min.css | 0 .../skins/lightgray/fonts/icomoon-small.eot | Bin .../skins/lightgray/fonts/icomoon-small.svg | 0 .../skins/lightgray/fonts/icomoon-small.ttf | Bin .../skins/lightgray/fonts/icomoon-small.woff | Bin .../tinymce/skins/lightgray/fonts/icomoon.eot | Bin .../tinymce/skins/lightgray/fonts/icomoon.svg | 0 .../tinymce/skins/lightgray/fonts/icomoon.ttf | Bin .../skins/lightgray/fonts/icomoon.woff | Bin .../tinymce/skins/lightgray/fonts/readme.md | 0 .../tinymce/skins/lightgray/img/anchor.gif | Bin .../tinymce/skins/lightgray/img/loader.gif | Bin .../tinymce/skins/lightgray/img/object.gif | Bin .../tinymce/skins/lightgray/img/trans.gif | Bin .../tinymce/skins/lightgray/img/wline.gif | Bin .../skins/lightgray/skin.ie7.min.css.noie | 0 .../tinymce/skins/lightgray/skin.min.css | 0 .../tinymce/themes/modern/theme.min.js | 0 .../tinymce/tinymce.min.js | 0 .../tpl/entry.tpl | 0 .../tpl/lang_tabs.tpl | 0 .../tpl/langtabopt.tpl | 0 .../tpl/langtabs.tpl | 0 .../tpl/tab.tpl | 0 .../tpl/tabopt.tpl | 0 .../tpl/tabs.tpl | 0 .../saimod_sys_todo/js/saimod_sys_todo.js | 22 ++-- .../saimod_sys_todo/saimod_sys_todo.php | 8 +- .../{ => js}/saistart_sys_sai.js | 7 +- .../saistart_sys_sai/saistart_sys_sai.php | 14 ++- sai/page/css/{index.css => sai.css} | 0 sai/page/default_page.php | 21 ++-- sai/page/js/lang_switcher.js | 30 ------ sai/page/js/sai.js | 96 +++--------------- sai/page/sai.tpl | 5 +- 132 files changed, 216 insertions(+), 303 deletions(-) create mode 100644 dbd/sql/mysql/data/system_page.sql rename sai/modules/saimod_sys_api/{ => css}/saimod_sys_api.css (100%) rename sai/modules/saimod_sys_api/{ => js}/saimod_sys_api.js (99%) rename sai/modules/saimod_sys_docu/{ => js}/saimod_sys_docu.js (85%) rename sai/modules/saimod_sys_files/{ => js}/saimod_sys_files.js (62%) rename sai/modules/saimod_sys_login/{ => js}/sai_sys_login_submit.js (81%) rename sai/modules/saimod_sys_mod/{ => js}/saimod_sys_mod.js (64%) rename sai/modules/saimod_sys_security/{ => css}/saimod_sys_security.css (100%) rename sai/modules/saimod_sys_security/{ => js}/saimod_sys_security.js (64%) rename sai/modules/{saimod_sys_locale => saimod_sys_text}/autoload.inc (69%) rename sai/modules/{saimod_sys_locale/saimod_sys_locale.js => saimod_sys_text/js/saimod_sys_text.js} (85%) rename sai/modules/{saimod_sys_locale => saimod_sys_text}/qq/SYS_SAIMOD_LOCALE_ADD.php (100%) rename sai/modules/{saimod_sys_locale => saimod_sys_text}/qq/SYS_SAIMOD_LOCALE_CATEGORY.php (100%) rename sai/modules/{saimod_sys_locale => saimod_sys_text}/qq/SYS_SAIMOD_LOCALE_DEL.php (100%) rename sai/modules/{saimod_sys_locale => saimod_sys_text}/qq/SYS_SAIMOD_LOCALE_ID.php (100%) rename sai/modules/{saimod_sys_locale => saimod_sys_text}/qq/SYS_SAIMOD_LOCALE_SELECT.php (100%) rename sai/modules/{saimod_sys_locale => saimod_sys_text}/qq/SYS_SAIMOD_LOCALE_SELECT_LANG.php (100%) rename sai/modules/{saimod_sys_locale/saimod_sys_locale.php => saimod_sys_text/saimod_sys_text.php} (72%) rename sai/modules/{saimod_sys_locale => saimod_sys_text}/tinymce/LICENSE.TXT (100%) rename sai/modules/{saimod_sys_locale => saimod_sys_text}/tinymce/jquery.tinymce.min.js (100%) rename sai/modules/{saimod_sys_locale => saimod_sys_text}/tinymce/langs/readme.md (100%) rename sai/modules/{saimod_sys_locale => saimod_sys_text}/tinymce/plugins/advlist/plugin.min.js (100%) rename sai/modules/{saimod_sys_locale => saimod_sys_text}/tinymce/plugins/anchor/plugin.min.js (100%) rename sai/modules/{saimod_sys_locale => saimod_sys_text}/tinymce/plugins/autolink/plugin.min.js (100%) rename sai/modules/{saimod_sys_locale => saimod_sys_text}/tinymce/plugins/autoresize/plugin.min.js (100%) rename sai/modules/{saimod_sys_locale => saimod_sys_text}/tinymce/plugins/autosave/plugin.min.js (100%) rename sai/modules/{saimod_sys_locale => saimod_sys_text}/tinymce/plugins/bbcode/plugin.min.js (100%) rename sai/modules/{saimod_sys_locale => saimod_sys_text}/tinymce/plugins/charmap/plugin.min.js (100%) rename sai/modules/{saimod_sys_locale => saimod_sys_text}/tinymce/plugins/code/plugin.min.js (100%) rename sai/modules/{saimod_sys_locale => saimod_sys_text}/tinymce/plugins/contextmenu/plugin.min.js (100%) rename sai/modules/{saimod_sys_locale => saimod_sys_text}/tinymce/plugins/directionality/plugin.min.js (100%) rename sai/modules/{saimod_sys_locale => saimod_sys_text}/tinymce/plugins/emoticons/img/smiley-cool.gif (100%) rename sai/modules/{saimod_sys_locale => saimod_sys_text}/tinymce/plugins/emoticons/img/smiley-cry.gif (100%) rename sai/modules/{saimod_sys_locale => saimod_sys_text}/tinymce/plugins/emoticons/img/smiley-embarassed.gif (100%) rename sai/modules/{saimod_sys_locale => saimod_sys_text}/tinymce/plugins/emoticons/img/smiley-foot-in-mouth.gif (100%) rename sai/modules/{saimod_sys_locale => saimod_sys_text}/tinymce/plugins/emoticons/img/smiley-frown.gif (100%) rename sai/modules/{saimod_sys_locale => saimod_sys_text}/tinymce/plugins/emoticons/img/smiley-innocent.gif (100%) rename sai/modules/{saimod_sys_locale => saimod_sys_text}/tinymce/plugins/emoticons/img/smiley-kiss.gif (100%) rename sai/modules/{saimod_sys_locale => saimod_sys_text}/tinymce/plugins/emoticons/img/smiley-laughing.gif (100%) rename sai/modules/{saimod_sys_locale => saimod_sys_text}/tinymce/plugins/emoticons/img/smiley-money-mouth.gif (100%) rename sai/modules/{saimod_sys_locale => saimod_sys_text}/tinymce/plugins/emoticons/img/smiley-sealed.gif (100%) rename sai/modules/{saimod_sys_locale => saimod_sys_text}/tinymce/plugins/emoticons/img/smiley-smile.gif (100%) rename sai/modules/{saimod_sys_locale => saimod_sys_text}/tinymce/plugins/emoticons/img/smiley-surprised.gif (100%) rename sai/modules/{saimod_sys_locale => saimod_sys_text}/tinymce/plugins/emoticons/img/smiley-tongue-out.gif (100%) rename sai/modules/{saimod_sys_locale => saimod_sys_text}/tinymce/plugins/emoticons/img/smiley-undecided.gif (100%) rename sai/modules/{saimod_sys_locale => saimod_sys_text}/tinymce/plugins/emoticons/img/smiley-wink.gif (100%) rename sai/modules/{saimod_sys_locale => saimod_sys_text}/tinymce/plugins/emoticons/img/smiley-yell.gif (100%) rename sai/modules/{saimod_sys_locale => saimod_sys_text}/tinymce/plugins/emoticons/plugin.min.js (100%) rename sai/modules/{saimod_sys_locale => saimod_sys_text}/tinymce/plugins/example/plugin.min.js (100%) rename sai/modules/{saimod_sys_locale => saimod_sys_text}/tinymce/plugins/example_dependency/plugin.min.js (100%) rename sai/modules/{saimod_sys_locale => saimod_sys_text}/tinymce/plugins/fullpage/plugin.min.js (100%) rename sai/modules/{saimod_sys_locale => saimod_sys_text}/tinymce/plugins/fullscreen/plugin.min.js (100%) rename sai/modules/{saimod_sys_locale => saimod_sys_text}/tinymce/plugins/hr/plugin.min.js (100%) rename sai/modules/{saimod_sys_locale => saimod_sys_text}/tinymce/plugins/image/plugin.min.js (100%) rename sai/modules/{saimod_sys_locale => saimod_sys_text}/tinymce/plugins/importcss/plugin.min.js (100%) rename sai/modules/{saimod_sys_locale => saimod_sys_text}/tinymce/plugins/insertdatetime/plugin.min.js (100%) rename sai/modules/{saimod_sys_locale => saimod_sys_text}/tinymce/plugins/layer/plugin.min.js (100%) rename sai/modules/{saimod_sys_locale => saimod_sys_text}/tinymce/plugins/legacyoutput/plugin.min.js (100%) rename sai/modules/{saimod_sys_locale => saimod_sys_text}/tinymce/plugins/link/plugin.min.js (100%) rename sai/modules/{saimod_sys_locale => saimod_sys_text}/tinymce/plugins/lists/plugin.min.js (100%) rename sai/modules/{saimod_sys_locale => saimod_sys_text}/tinymce/plugins/media/moxieplayer.swf (100%) rename sai/modules/{saimod_sys_locale => saimod_sys_text}/tinymce/plugins/media/plugin.min.js (100%) rename sai/modules/{saimod_sys_locale => saimod_sys_text}/tinymce/plugins/moxiemanager/plugin.min.js (100%) rename sai/modules/{saimod_sys_locale => saimod_sys_text}/tinymce/plugins/nonbreaking/plugin.min.js (100%) rename sai/modules/{saimod_sys_locale => saimod_sys_text}/tinymce/plugins/noneditable/plugin.min.js (100%) rename sai/modules/{saimod_sys_locale => saimod_sys_text}/tinymce/plugins/pagebreak/plugin.min.js (100%) rename sai/modules/{saimod_sys_locale => saimod_sys_text}/tinymce/plugins/paste/plugin.min.js (100%) rename sai/modules/{saimod_sys_locale => saimod_sys_text}/tinymce/plugins/preview/plugin.min.js (100%) rename sai/modules/{saimod_sys_locale => saimod_sys_text}/tinymce/plugins/print/plugin.min.js (100%) rename sai/modules/{saimod_sys_locale => saimod_sys_text}/tinymce/plugins/save/plugin.min.js (100%) rename sai/modules/{saimod_sys_locale => saimod_sys_text}/tinymce/plugins/searchreplace/plugin.min.js (100%) rename sai/modules/{saimod_sys_locale => saimod_sys_text}/tinymce/plugins/spellchecker/plugin.min.js (100%) rename sai/modules/{saimod_sys_locale => saimod_sys_text}/tinymce/plugins/tabfocus/plugin.min.js (100%) rename sai/modules/{saimod_sys_locale => saimod_sys_text}/tinymce/plugins/table/plugin.min.js (100%) rename sai/modules/{saimod_sys_locale => saimod_sys_text}/tinymce/plugins/template/plugin.min.js (100%) rename sai/modules/{saimod_sys_locale => saimod_sys_text}/tinymce/plugins/textcolor/plugin.min.js (100%) rename sai/modules/{saimod_sys_locale => saimod_sys_text}/tinymce/plugins/visualblocks/css/visualblocks.css (100%) rename sai/modules/{saimod_sys_locale => saimod_sys_text}/tinymce/plugins/visualblocks/plugin.min.js (100%) rename sai/modules/{saimod_sys_locale => saimod_sys_text}/tinymce/plugins/visualchars/plugin.min.js (100%) rename sai/modules/{saimod_sys_locale => saimod_sys_text}/tinymce/plugins/wordcount/plugin.min.js (100%) rename sai/modules/{saimod_sys_locale => saimod_sys_text}/tinymce/skins/lightgray/content.inline.min.css (100%) rename sai/modules/{saimod_sys_locale => saimod_sys_text}/tinymce/skins/lightgray/content.min.css (100%) rename sai/modules/{saimod_sys_locale => saimod_sys_text}/tinymce/skins/lightgray/fonts/icomoon-small.eot (100%) rename sai/modules/{saimod_sys_locale => saimod_sys_text}/tinymce/skins/lightgray/fonts/icomoon-small.svg (100%) rename sai/modules/{saimod_sys_locale => saimod_sys_text}/tinymce/skins/lightgray/fonts/icomoon-small.ttf (100%) rename sai/modules/{saimod_sys_locale => saimod_sys_text}/tinymce/skins/lightgray/fonts/icomoon-small.woff (100%) rename sai/modules/{saimod_sys_locale => saimod_sys_text}/tinymce/skins/lightgray/fonts/icomoon.eot (100%) rename sai/modules/{saimod_sys_locale => saimod_sys_text}/tinymce/skins/lightgray/fonts/icomoon.svg (100%) rename sai/modules/{saimod_sys_locale => saimod_sys_text}/tinymce/skins/lightgray/fonts/icomoon.ttf (100%) rename sai/modules/{saimod_sys_locale => saimod_sys_text}/tinymce/skins/lightgray/fonts/icomoon.woff (100%) rename sai/modules/{saimod_sys_locale => saimod_sys_text}/tinymce/skins/lightgray/fonts/readme.md (100%) rename sai/modules/{saimod_sys_locale => saimod_sys_text}/tinymce/skins/lightgray/img/anchor.gif (100%) rename sai/modules/{saimod_sys_locale => saimod_sys_text}/tinymce/skins/lightgray/img/loader.gif (100%) rename sai/modules/{saimod_sys_locale => saimod_sys_text}/tinymce/skins/lightgray/img/object.gif (100%) rename sai/modules/{saimod_sys_locale => saimod_sys_text}/tinymce/skins/lightgray/img/trans.gif (100%) rename sai/modules/{saimod_sys_locale => saimod_sys_text}/tinymce/skins/lightgray/img/wline.gif (100%) rename sai/modules/{saimod_sys_locale => saimod_sys_text}/tinymce/skins/lightgray/skin.ie7.min.css.noie (100%) rename sai/modules/{saimod_sys_locale => saimod_sys_text}/tinymce/skins/lightgray/skin.min.css (100%) rename sai/modules/{saimod_sys_locale => saimod_sys_text}/tinymce/themes/modern/theme.min.js (100%) rename sai/modules/{saimod_sys_locale => saimod_sys_text}/tinymce/tinymce.min.js (100%) rename sai/modules/{saimod_sys_locale => saimod_sys_text}/tpl/entry.tpl (100%) rename sai/modules/{saimod_sys_locale => saimod_sys_text}/tpl/lang_tabs.tpl (100%) rename sai/modules/{saimod_sys_locale => saimod_sys_text}/tpl/langtabopt.tpl (100%) rename sai/modules/{saimod_sys_locale => saimod_sys_text}/tpl/langtabs.tpl (100%) rename sai/modules/{saimod_sys_locale => saimod_sys_text}/tpl/tab.tpl (100%) rename sai/modules/{saimod_sys_locale => saimod_sys_text}/tpl/tabopt.tpl (100%) rename sai/modules/{saimod_sys_locale => saimod_sys_text}/tpl/tabs.tpl (100%) rename sai/modules/saistart_sys_sai/{ => js}/saistart_sys_sai.js (73%) rename sai/page/css/{index.css => sai.css} (100%) delete mode 100644 sai/page/js/lang_switcher.js 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 @@ -
    -
    +
    +