sai to statesystem transfered (first step - all modules are available)

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');

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');

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){
+                            if($(entry['div']).length){
+                                //console.log(entry['div']);
+                                //console.log(data);
                                 $(entry['div']).html(data);
-                            system.log(system.LOG_INFO,'load page: '+id+entry['div']+' '+entry['url']+'&'+window.location.search.substr(1)+' - success');},
+                                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 {

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;}
 }

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';

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();
     

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 '<li><a href="#" saimenu=".SYSTEM.SAI.saimod_sys_api">API</a></li>';}
+    public static function html_li_menu(){return '<li><a href="#!api">API</a></li>';}
     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(){
+    public static function css(){
-        return \SYSTEM\LOG\JsonResult::toString(
+        return array(\SYSTEM\WEBPATH(new \SYSTEM\PSAI(),'modules/saimod_sys_api/css/saimod_sys_api.css'));}
-            array(  \SYSTEM\WEBPATH(new \SYSTEM\PSAI(),'modules/saimod_sys_api/saimod_sys_api.css')));}
+    public static function js(){
-    public static function sai_mod__SYSTEM_SAI_saimod_sys_api_flag_js(){
+        return array(  \SYSTEM\WEBPATH(new \SYSTEM\PSAI(),'modules/saimod_sys_api/js/saimod_sys_api.js'));}
-        return \SYSTEM\LOG\JsonResult::toString(
-            array(  \SYSTEM\WEBPATH(new \SYSTEM\PSAI(),'modules/saimod_sys_api/saimod_sys_api.js')));}    
 }

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 '<li><a href="#" saimenu=".SYSTEM.SAI.saimod_sys_cache">Cache</a></li>';}
+    public static function html_li_menu(){return '<li><a href="#!cache">Cache</a></li>';}
     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 css(){}
-    public static function sai_mod__SYSTEM_SAI_saimod_sys_cache_flag_js(){}
+    //public static function js(){}
 }

sai/modules/saimod_sys_config/saimod_sys_config.php

@@ -1,6 +1,5 @@
 <?php
 namespace SYSTEM\SAI;
-
 class saimod_sys_config extends \SYSTEM\SAI\SaiModule {    
     public static function sai_mod__SYSTEM_SAI_saimod_sys_config(){
         $result =   '<h4>System Config</h4><hr>'.
@@ -32,10 +31,10 @@ class saimod_sys_config extends \SYSTEM\SAI\SaiModule {
         
         return $result;
     }
-    public static function html_li_menu(){return '<li><a href="#" saimenu=".SYSTEM.SAI.saimod_sys_config">Config</a></li>';}
+    public static function html_li_menu(){return '<li><a href="#!config">Config</a></li>';}
     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 css(){}
-    public static function sai_mod__SYSTEM_SAI_saimod_sys_config_flag_js(){}
+    //public static function js(){}
 }

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();

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 '<li><a href="#" saimenu=".SYSTEM.SAI.saimod_sys_cron">Cron</a></li>';}
+    public static function html_li_menu(){return '<li><a href="#!cron">Cron</a></li>';}
     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(){
+    public static function css(){
-        return \SYSTEM\LOG\JsonResult::toString(
+        return array(  \SYSTEM\WEBPATH(new \SYSTEM\PSAI(),'modules/saimod_sys_cron/css/saimod_sys_cron.css'));}
-            array(  \SYSTEM\WEBPATH(new \SYSTEM\PSAI(),'modules/saimod_sys_cron/css/saimod_sys_cron.css')));}
+    public static function js(){
-    public static function sai_mod__SYSTEM_SAI_saimod_sys_cron_flag_js(){
+        return array(  \SYSTEM\WEBPATH(new \SYSTEM\PSAI(),'modules/saimod_sys_cron/js/saimod_sys_cron.js'));}
-        return \SYSTEM\LOG\JsonResult::toString(
-            array(  \SYSTEM\WEBPATH(new \SYSTEM\PSAI(),'modules/saimod_sys_cron/js/saimod_sys_cron.js')));}    
 }

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');    

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 '<li><a href="#" saimenu=".SYSTEM.SAI.saimod_sys_docu">Docu</a></li>';}
+    public static function html_li_menu(){return '<li><a href="#!docu">Docu</a></li>';}
     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 css(){}
-    public static function sai_mod__SYSTEM_SAI_saimod_sys_docu_flag_js(){
+    public static function js(){
-        return \SYSTEM\LOG\JsonResult::toString(
+        return array(   \SYSTEM\WEBPATH(new \SYSTEM\PSYSTEM(),'lib/EpicEditor/js/epiceditor.min.js'),
-            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'));}
-                    \SYSTEM\WEBPATH(new \SYSTEM\PSAI(),'modules/saimod_sys_docu/saimod_sys_docu.js')));}
 }

sai/modules/saimod_sys_files/js/saimod_sys_files.js

@@ -1,18 +1,18 @@
-function init__SYSTEM_SAI_saimod_sys_files() {
+function init_saimod_sys_files() {
-    $('.tooltip').tooltipster();
+    //$('.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(){
+    $('#tab_'+name).load('./sai.php?sai_mod=.SYSTEM.SAI.saimod_sys_files&action=tab&name='+name, function(){
-        register_controlls();
+        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');},

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 '<li><a href="#" saimenu=".SYSTEM.SAI.saimod_sys_files">Files</a></li>';}
+    public static function html_li_menu(){return '<li><a href="#!files">Files</a></li>';}
     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 css(){}
-    public static function sai_mod__SYSTEM_SAI_saimod_sys_files_flag_js(){return \SYSTEM\LOG\JsonResult::toString(
+    public static function js(){
-            array(  \SYSTEM\WEBPATH(new \SYSTEM\PSAI(),'modules/saimod_sys_files/saimod_sys_files.js')));}
+        return array(  \SYSTEM\WEBPATH(new \SYSTEM\PSAI(),'modules/saimod_sys_files/js/saimod_sys_files.js'));}
 }

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;

sai/modules/saimod_sys_log/saimod_sys_log.php

@@ -1,8 +1,6 @@
 <?php
 namespace SYSTEM\SAI;
-
 class saimod_sys_log extends \SYSTEM\SAI\SaiModule {    
-    
     public static function sai_mod__SYSTEM_SAI_saimod_sys_log_action_truncate(){        
         \SYSTEM\DBD\SYS_SAIMOD_LOG_TRUNCATE::QQ();
         return \SYSTEM\LOG\JsonResult::ok();}
@@ -344,12 +342,11 @@ class saimod_sys_log extends \SYSTEM\SAI\SaiModule {
         }        
     }
     
-    public static function html_li_menu(){return '<li><a href="#" saimenu=".SYSTEM.SAI.saimod_sys_log">Log</a></li>';}
+    public static function html_li_menu(){return '<li><a href="#!log">Log</a></li>';}
     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 css(){}
-    public static function sai_mod__SYSTEM_SAI_saimod_sys_log_flag_js(){
+    public static function js(){
-        return \SYSTEM\LOG\JsonResult::toString(
+        return array(\SYSTEM\WEBPATH(new \SYSTEM\PSAI(),'modules/saimod_sys_log/js/saimod_sys_log.js'));}
-            array(\SYSTEM\WEBPATH(new \SYSTEM\PSAI(),'modules/saimod_sys_log/js/saimod_sys_log.js')));}
 }

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.</br>");
                     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.</br>");
                     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

sai/modules/saimod_sys_login/saimod_sys_login.php

@@ -1,7 +1,5 @@
 <?php
-
 namespace SYSTEM\SAI;
-
 class saimod_sys_login extends \SYSTEM\SAI\SaiModule {
     public static function sai_mod__SYSTEM_SAI_saimod_sys_login(){              
         $vars = array();    
@@ -46,16 +44,15 @@ class saimod_sys_login extends \SYSTEM\SAI\SaiModule {
                                     \SYSTEM\locale::getStrings(\SYSTEM\DBD\system_locale_string::VALUE_CATEGORY_BASIC));
         return \SYSTEM\PAGE\replace::replaceFile(\SYSTEM\WEBPATH(new \SYSTEM\PSAI(),'modules/saimod_sys_login/tpl/register.tpl'), $vars);}
 
-    public static function html_li_menu(){return '</ul><ul class="nav pull-right"><li><a href="#" saimenu=".SYSTEM.SAI.saimod_sys_login" id="sai_login_loginmenuli">'.(\SYSTEM\SECURITY\Security::isLoggedIn() ? 'Logout' : 'Login').'</a></li>';}
+    public static function html_li_menu(){return '</ul><ul class="nav pull-right"><li><a href="#!login" id="sai_login_loginmenuli">'.(\SYSTEM\SECURITY\Security::isLoggedIn() ? 'Logout' : 'Login').'</a></li>';}
     public static function right_public(){return true;}    
     public static function right_right(){return true;}
     
-    public static function sai_mod__SYSTEM_SAI_saimod_sys_login_flag_css(){}
+    //public static function css(){}
-    public static function sai_mod__SYSTEM_SAI_saimod_sys_login_flag_js(){
+    public static function js(){
-        return \SYSTEM\LOG\JsonResult::toString(
+        return array(   \SYSTEM\WEBPATH(new \SYSTEM\PSAI(),'js/jqBootstrapValidation.js'),
-            array(  \SYSTEM\WEBPATH(new \SYSTEM\PSAI(),'js/jqBootstrapValidation.js'),
+                        \SYSTEM\WEBPATH(new \SYSTEM\PSAI(),'modules/saimod_sys_login/js/sai_sys_login_submit.js'),
-                    \SYSTEM\WEBPATH(new \SYSTEM\PSAI(),'modules/saimod_sys_login/sai_sys_login_submit.js'),
                         \SYSTEM\WEBPATH(new \SYSTEM\PSAI(),'js/crypto/jquery.md5.js'),
-                    \SYSTEM\WEBPATH(new \SYSTEM\PSAI(),'js/crypto/jquery.sha1.js')
+                        \SYSTEM\WEBPATH(new \SYSTEM\PSAI(),'js/crypto/jquery.sha1.js'));
-                 ));}
+    }
 }

sai/modules/saimod_sys_mod/js/saimod_sys_mod.js

@@ -1,4 +1,4 @@
-function init__SYSTEM_SAI_saimod_sys_mod() {          
+function init_saimod_sys_mod() {          
   $('#modstab a').click(function (e) {
     e.preventDefault();    
     $(this).tab('show');

sai/modules/saimod_sys_mod/saimod_sys_mod.php

@@ -33,12 +33,11 @@ class saimod_sys_mod extends \SYSTEM\SAI\SaiModule {
                 
     }
     
-    public static function html_li_menu(){return '<li><a href="#" saimenu=".SYSTEM.SAI.saimod_sys_mod">SAI Mods</a></li>';}
+    public static function html_li_menu(){return '<li><a href="#!mod">SAI Mods</a></li>';}
     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_mod_flag_css(){}
+    //public static function css(){}
-    public static function sai_mod__SYSTEM_SAI_saimod_sys_mod_flag_js(){
+    public static function js(){
-        return \SYSTEM\LOG\JsonResult::toString(
+        return array(\SYSTEM\WEBPATH(new \SYSTEM\PSAI(),'modules/saimod_sys_mod/js/saimod_sys_mod.js'));}
-            array(\SYSTEM\WEBPATH(new \SYSTEM\PSAI(),'modules/saimod_sys_mod/saimod_sys_mod.js')));}
 }

sai/modules/saimod_sys_security/js/saimod_sys_security.js

@@ -1,5 +1,5 @@
 var user_search = '';
-function init__SYSTEM_SAI_saimod_sys_security() {          
+function init_saimod_sys_security() {          
   $('#securitytab a').click(function (e) {
     e.preventDefault();    
     $(this).tab('show');
@@ -13,21 +13,21 @@ function load_security_tab(action){
     $('img#loader').show();
     switch(action){
         case 'users':
-            $('#tab_users').load(SAI_ENDPOINT+'sai_mod=.SYSTEM.SAI.saimod_sys_security&action='+action+'&search='+encodeURIComponent(user_search), function(){
+            $('#tab_users').load('./sai.php?sai_mod=.SYSTEM.SAI.saimod_sys_security&action='+action+'&search='+encodeURIComponent(user_search), function(){
                 register_users();                
                 $('img#loader').hide();});
             return;
         case 'rights':
-            $('#tab_rights').load(SAI_ENDPOINT+'sai_mod=.SYSTEM.SAI.saimod_sys_security&action='+action, function(){
+            $('#tab_rights').load('./sai.php?sai_mod=.SYSTEM.SAI.saimod_sys_security&action='+action, function(){
                 register_rights();
                 $('img#loader').hide();});
             return;
         case 'groups':
-            $('#tab_groups').load(SAI_ENDPOINT+'sai_mod=.SYSTEM.SAI.saimod_sys_security&action='+action, function(){                
+            $('#tab_groups').load('./sai.php?sai_mod=.SYSTEM.SAI.saimod_sys_security&action='+action, function(){                
                 $('img#loader').hide();});
             return;
         case 'stats':
-            $('#tab_stats').load(SAI_ENDPOINT+'sai_mod=.SYSTEM.SAI.saimod_sys_security&action='+action, function(){                
+            $('#tab_stats').load('./sai.php?sai_mod=.SYSTEM.SAI.saimod_sys_security&action='+action, function(){                
                 $('img#loader').hide();});
             return;
         default:
@@ -37,7 +37,7 @@ function load_security_tab(action){
 
 function register_rights(){
     $('#new_right').click(function(){
-        $('#tab_rights').load(SAI_ENDPOINT+'sai_mod=.SYSTEM.SAI.saimod_sys_security&action=newright',function(){
+        $('#tab_rights').load('./sai.php?sai_mod=.SYSTEM.SAI.saimod_sys_security&action=newright',function(){
             register_newright();
         });
     });
@@ -47,7 +47,7 @@ function register_rights(){
     });
     
     $('.right_delete').click(function(){
-        $('#tab_rights').load(SAI_ENDPOINT+'sai_mod=.SYSTEM.SAI.saimod_sys_security&action=deleterightconfirm&id='+$(this).attr('right_id'),function(){
+        $('#tab_rights').load('./sai.php?sai_mod=.SYSTEM.SAI.saimod_sys_security&action=deleterightconfirm&id='+$(this).attr('right_id'),function(){
             register_deleteright();
         });
     });
@@ -55,7 +55,7 @@ function register_rights(){
 
 function register_deleteright(){
     $('#deleteright_confirm').click(function(){
-        $.get(  SAI_ENDPOINT+'sai_mod=.SYSTEM.SAI.saimod_sys_security&action=deleteright&id='+$(this).attr('right_id'),
+        $.get('./sai.php?sai_mod=.SYSTEM.SAI.saimod_sys_security&action=deleteright&id='+$(this).attr('right_id'),
             function(data){
                 if(data==1){
                     alert('sucess');
@@ -72,8 +72,7 @@ function register_deleteright(){
 
 function register_newright(){
     $('#addright').click(function(){
-        $.get(  SAI_ENDPOINT+
+        $.get(  './sai.php?sai_mod=.SYSTEM.SAI.saimod_sys_security&action=addright&id='+$('#addright_id').val()+
-                'sai_mod=.SYSTEM.SAI.saimod_sys_security&action=addright&id='+$('#addright_id').val()+
                 '&name='+encodeURIComponent($('#addright_name').val())+
                 '&description='+encodeURIComponent($('#addright_description').val()),function(data){
                     if(data==1){
@@ -92,10 +91,9 @@ function register_users(){
     });
     $('#user_search').val(user_search);
     $('.user_entry').click(function(){
-        $('#tab_users').load(SAI_ENDPOINT+'sai_mod=.SYSTEM.SAI.saimod_sys_security&action=user&username='+encodeURIComponent($(this).attr('username')),function(){
+        $('#tab_users').load('./sai.php?sai_mod=.SYSTEM.SAI.saimod_sys_security&action=user&username='+encodeURIComponent($(this).attr('username')),function(){
             $('.deleteuserright').click(function(){
-                $.get( SAI_ENDPOINT+
+                $.get( './sai.php?sai_mod=.SYSTEM.SAI.saimod_sys_security&action=deleterightuser&rightid='+$(this).attr('right_id')+
-                        'sai_mod=.SYSTEM.SAI.saimod_sys_security&action=deleterightuser&rightid='+$(this).attr('right_id')+
                         '&userid='+$(this).attr('user_id'),function(data){
                             if(data==1){
                                 alert('sucess');
@@ -105,8 +103,7 @@ function register_users(){
                         });
             })
             $('#adduserright_add').click(function(){
-                 $.get( SAI_ENDPOINT+
+                 $.get( './sai.php?sai_mod=.SYSTEM.SAI.saimod_sys_security&action=addrightuser&rightid='+$('#adduserright_rightid').val()+
-                        'sai_mod=.SYSTEM.SAI.saimod_sys_security&action=addrightuser&rightid='+$('#adduserright_rightid').val()+
                         '&userid='+$(this).attr('user_id'),function(data){
                             if(data==1){
                                 alert('sucess');

sai/modules/saimod_sys_security/saimod_sys_security.php

@@ -174,12 +174,12 @@ class saimod_sys_security extends \SYSTEM\SAI\SaiModule {
         }
     }
     
-    public static function html_li_menu(){return '<li><a href="#" saimenu=".SYSTEM.SAI.saimod_sys_security">Security</a></li>';}
+    public static function html_li_menu(){return '<li><a href="#!security">Security</a></li>';}
     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_SECURITY);}
     
-    public static function sai_mod__SYSTEM_SAI_saimod_sys_security_flag_css(){return \SYSTEM\LOG\JsonResult::toString(
+    public static function css(){
-                                     array(\SYSTEM\WEBPATH(new \SYSTEM\PSAI(),'modules/saimod_sys_security/saimod_sys_security.css')));}
+        return array(\SYSTEM\WEBPATH(new \SYSTEM\PSAI(),'modules/saimod_sys_security/css/saimod_sys_security.css'));}
-    public static function sai_mod__SYSTEM_SAI_saimod_sys_security_flag_js(){ return \SYSTEM\LOG\JsonResult::toString(
+    public static function js(){
-                                     array(\SYSTEM\WEBPATH(new \SYSTEM\PSAI(),'modules/saimod_sys_security/saimod_sys_security.js')));}
+        return array(\SYSTEM\WEBPATH(new \SYSTEM\PSAI(),'modules/saimod_sys_security/js/saimod_sys_security.js'));}
 }

sai/modules/saimod_sys_text/autoload.inc

@@ -2,4 +2,4 @@
 \SYSTEM\autoload::registerFolder(dirname(__FILE__),'SYSTEM\SAI');
 \SYSTEM\autoload::registerFolder(dirname(__FILE__).'/qq/','SYSTEM\DBD');
 
-\SYSTEM\SAI\sai::register_sys('\SYSTEM\SAI\saimod_sys_locale');
+\SYSTEM\SAI\sai::register_sys('\SYSTEM\SAI\saimod_sys_text');

sai/modules/saimod_sys_text/js/saimod_sys_text.js

@@ -4,7 +4,7 @@ var cData = {group: '',
              id: '',
              editmode: false};
          
-function init__SYSTEM_SAI_saimod_sys_locale() {
+function init_saimod_sys_text() {
     init_tinymce();
     $('#addtext').show();
     if(!cData.lang && !cData.group) {
@@ -13,11 +13,11 @@ function init__SYSTEM_SAI_saimod_sys_locale() {
         $('#langtabs_ li#'+cData.lang).addClass('active');
         $('#'+cData.group).addClass('active');
         $('#'+cData.lang).addClass('active');
-        saimod_sys_locale_loadcontent(cData.lang, cData.group);
+        saimod_sys_text_loadcontent(cData.lang, cData.group);
         }  
         
     $('.content_add').click(function(){
-        saimod_sys_locale_newtext();});
+        saimod_sys_text_newtext();});
     
     $('#edit_close').click(function(){
         $('#addtext').show();
@@ -25,7 +25,7 @@ function init__SYSTEM_SAI_saimod_sys_locale() {
     
     $('#newtext').click(function(){
         $('#addtext').show();
-        saimod_sys_locale_savenewcontent();
+        saimod_sys_text_savenewcontent();
         $('#new_text_id_input').val('');
         $('#new_category_id_input').val('');
         cData.editmode = false;});
@@ -35,7 +35,7 @@ function init__SYSTEM_SAI_saimod_sys_locale() {
             $('#'+cData.group).removeClass('active');}
         if (cData.group && cData.lang && (cData.group !== $(this).attr('id'))){
             cData.group = $(this).attr('id');
-            saimod_sys_locale_loadcontent(cData.lang, cData.group);}
+            saimod_sys_text_loadcontent(cData.lang, cData.group);}
         cData.group = $(this).attr('id');
         $(this).addClass('active');
         });
@@ -50,17 +50,17 @@ function init__SYSTEM_SAI_saimod_sys_locale() {
         cData.lang = $(this).attr('id');
         $('#langtabs_ li#'+cData.lang).addClass('active');
         $('#'+cData.lang).addClass('active');
-        saimod_sys_locale_loadcontent(cData.lang, cData.group);
+        saimod_sys_text_loadcontent(cData.lang, cData.group);
         if (cData.editmode === true){
             console.log("now i am true");
-            saimod_sys_locale_loadsinglecontent(cData.id, cData.lang);
+            saimod_sys_text_loadsinglecontent(cData.id, cData.lang);
         }});
     
     $('#changetext').click(function(){
-        saimod_sys_locale_savecontent(cData.id, cData.lang);});
+        saimod_sys_text_savecontent(cData.id, cData.lang);});
     
     $('#del_text').click(function(){
-        saimod_sys_locale_delete($('#modaltitle').html());
+        saimod_sys_text_delete($('#modaltitle').html());
         cData.editmode = false;});
     $(document).keyup(function(e) {
         if (e.keyCode === 27) { $('#addtext').show(); }   // esc
@@ -73,7 +73,7 @@ function init__SYSTEM_SAI_saimod_sys_locale() {
     });
 }
 
-function saimod_sys_locale_newtext(){
+function saimod_sys_text_newtext(){
     cData.editmode = true;
     $('#modaltitle').hide();
     $('#modaltextarea').hide();
@@ -81,8 +81,8 @@ function saimod_sys_locale_newtext(){
     $('#addtext').hide();
     //call not available - check
     $.ajax({
-        url: SAI_ENDPOINT,
+        url: 'sai.php',
-                        data: { sai_mod: '.SYSTEM.SAI.saimod_sys_locale',
+                        data: { sai_mod: '.SYSTEM.SAI.saimod_sys_text',
                                 action: 'newtext'},
                             type: 'GET',
                             success: function(data) {
@@ -98,15 +98,15 @@ function saimod_sys_locale_newtext(){
     });
 }
 
-function saimod_sys_locale_savecontent(id, lang){
+function saimod_sys_text_savecontent(id, lang){
     tinyMCE.triggerSave();    
     newtext = $('#contenttextarea').val();
     newgroup = $('#new_category_id_input').val();
     console.log($('#new_category_id_input'));
     console.log(newgroup);
     $.ajax({
-        url: SAI_ENDPOINT,
+        url: 'sai.php',
-                        data: { sai_mod: '.SYSTEM.SAI.saimod_sys_locale',
+                        data: { sai_mod: '.SYSTEM.SAI.saimod_sys_text',
                                 action: 'edit',
                                 id: id,
                                 lang: lang,
@@ -120,33 +120,33 @@ function saimod_sys_locale_savecontent(id, lang){
                                 } else {
                                     $('#modal_fail').hide();                            
                                     $('#modal_success').show();                                
-                                    saimod_sys_locale_loadcontent(cData.lang,cData.group);
+                                    saimod_sys_text_loadcontent(cData.lang,cData.group);
                                 }
                             }
     });
 }
 
-function saimod_sys_locale_savenewcontent(){
+function saimod_sys_text_savenewcontent(){
     tinyMCE.triggerSave();
     id = $('#new_text_id_input').val();
     cData.group = $('#new_category_id_input').val();
     console.log("id: "+id);
     console.log("category: "+cData.group);
     $.ajax({
-        url: SAI_ENDPOINT,
+        url: 'sai.php',
-                        data: { sai_mod: '.SYSTEM.SAI.saimod_sys_locale',
+                        data: { sai_mod: '.SYSTEM.SAI.saimod_sys_text',
                                 action: 'add',
                                 id: id,
                                 category: cData.group},
                             type: 'GET',
                             success: function(data) {
-                                saimod_sys_locale_loadcontent(cData.lang,cData.group);
+                                saimod_sys_text_loadcontent(cData.lang,cData.group);
-                                saimod_sys_locale_loadsinglecontent(id, cData.lang);
+                                saimod_sys_text_loadsinglecontent(id, cData.lang);
                             }
     });
 }
 
-function saimod_sys_locale_loadsinglecontent(id, lang){
+function saimod_sys_text_loadsinglecontent(id, lang){
     $('#new_text_id').hide();
     $('#new_category_id').hide();
     $('#newtext').hide();
@@ -156,8 +156,8 @@ function saimod_sys_locale_loadsinglecontent(id, lang){
     init_tinymce();
     
     $.ajax({
-        url: SAI_ENDPOINT,
+        url: 'sai.php',
-        data: { sai_mod: '.SYSTEM.SAI.saimod_sys_locale',
+        data: { sai_mod: '.SYSTEM.SAI.saimod_sys_text',
                 action: 'singleload',
                 id: id,
                 lang: lang},
@@ -175,23 +175,23 @@ function saimod_sys_locale_loadsinglecontent(id, lang){
     });
 }
 
-function saimod_sys_locale_loadcontent(id, group){
+function saimod_sys_text_loadcontent(id, group){
     cData.editmode = true;
-    $('#tab-content').load(SAI_ENDPOINT+'sai_mod=.SYSTEM.SAI.saimod_sys_locale&action=load&id='+id+'&group='+group, function(){
+    $('#tab-content').load('./sai.php?sai_mod=.SYSTEM.SAI.saimod_sys_text&action=load&id='+id+'&group='+group, function(){
         $('.tableentry').click(function(){
             cData.editmode = true;
-            saimod_sys_locale_loadsinglecontent($(this).attr('text_id'), cData.lang);
+            saimod_sys_text_loadsinglecontent($(this).attr('text_id'), cData.lang);
         });
     });
 }
 
-function saimod_sys_locale_delete(buttonID){
+function saimod_sys_text_delete(buttonID){
-    $.getJSON(SAI_ENDPOINT+'sai_mod=.SYSTEM.SAI.saimod_sys_locale&action=delete&id='+buttonID,
+    $.getJSON('./sai.php?sai_mod=.SYSTEM.SAI.saimod_sys_text&action=delete&id='+buttonID,
             function(data){if (data.status == false){ alert("Failed to delete text!"); } else { 
                     alert("Text deleted!");
-                    saimod_sys_locale_loadcontent(cData.lang,cData.group);}});
+                    saimod_sys_text_loadcontent(cData.lang,cData.group);}});
             
-            saimod_sys_locale_loadcontent(cData.lang,cData.group);
+            saimod_sys_text_loadcontent(cData.lang,cData.group);
             $('#modal_main').modal('hide');
 }
 

sai/modules/saimod_sys_text/saimod_sys_text.php

@@ -1,12 +1,12 @@
 <?php
 namespace SYSTEM\SAI;
 
-class saimod_sys_locale extends \SYSTEM\SAI\SaiModule {
+class saimod_sys_text extends \SYSTEM\SAI\SaiModule {
     
     public static function getLanguages(){
         return \SYSTEM\CONFIG\config::get(\SYSTEM\CONFIG\config_ids::SYS_CONFIG_LANGS);}
 
-    public static function sai_mod__SYSTEM_SAI_saimod_sys_locale(){        
+    public static function sai_mod__SYSTEM_SAI_saimod_sys_text(){        
         $vars = array();                        
         $res = \SYSTEM\DBD\SYS_SAIMOD_LOCALE_CATEGORY::QQ();
         $vars['tabopts'] = '';
@@ -15,23 +15,23 @@ class saimod_sys_locale extends \SYSTEM\SAI\SaiModule {
             $vars2 = array( 'active' => ($first ? 'active' : ''),
                             'tab_id' => $r['category']);
             $first = false;
-            $vars['tabopts'] .= \SYSTEM\PAGE\replace::replaceFile(\SYSTEM\SERVERPATH(new \SYSTEM\PSAI(),'modules/saimod_sys_locale/tpl/tabopt.tpl'), $vars2);
+            $vars['tabopts'] .= \SYSTEM\PAGE\replace::replaceFile(\SYSTEM\SERVERPATH(new \SYSTEM\PSAI(),'modules/saimod_sys_text/tpl/tabopt.tpl'), $vars2);
         }           
         $langtab_ = '';
         foreach (self::getLanguages() as $lang){
             $details['langs'] = $lang;
-            $langtab_ .= \SYSTEM\PAGE\replace::replaceFile(\SYSTEM\SERVERPATH(new \SYSTEM\PSAI(),'modules/saimod_sys_locale/tpl/langtabopt.tpl'), $details);
+            $langtab_ .= \SYSTEM\PAGE\replace::replaceFile(\SYSTEM\SERVERPATH(new \SYSTEM\PSAI(),'modules/saimod_sys_text/tpl/langtabopt.tpl'), $details);
             $languages[] = $lang;
         }    
         $langtab['langs'] = $langtab_;
-        $langhead = \SYSTEM\PAGE\replace::replaceFile(\SYSTEM\SERVERPATH(new \SYSTEM\PSAI(),'modules/saimod_sys_locale/tpl/langtabs.tpl'), $langtab);
+        $langhead = \SYSTEM\PAGE\replace::replaceFile(\SYSTEM\SERVERPATH(new \SYSTEM\PSAI(),'modules/saimod_sys_text/tpl/langtabs.tpl'), $langtab);
         $vars['tabs'] = $langhead;
         $vars['langs'] = $langtab_;
-        return \SYSTEM\PAGE\replace::replaceFile(\SYSTEM\SERVERPATH(new \SYSTEM\PSAI(),'modules/saimod_sys_locale/tpl/tabs.tpl'), $vars);
+        return \SYSTEM\PAGE\replace::replaceFile(\SYSTEM\SERVERPATH(new \SYSTEM\PSAI(),'modules/saimod_sys_text/tpl/tabs.tpl'), $vars);
-                //.\SYSTEM\PAGE\replace::replaceFile(\SYSTEM\SERVERPATH(new \SYSTEM\PSAI(),'modules/saimod_sys_locale/tpl/editmode.tpl'), $vars);
+                //.\SYSTEM\PAGE\replace::replaceFile(\SYSTEM\SERVERPATH(new \SYSTEM\PSAI(),'modules/saimod_sys_text/tpl/editmode.tpl'), $vars);
     }
     
-    public static function sai_mod__SYSTEM_SAI_saimod_sys_locale_action_load($lang, $group){
+    public static function sai_mod__SYSTEM_SAI_saimod_sys_text_action_load($lang, $group){
         $con = new \SYSTEM\DB\Connection();
         if(\SYSTEM\system::isSystemDbInfoPG()){
             $query = 'SELECT id, "'.$lang.'" FROM '.\SYSTEM\DBD\system_locale_string::NAME_PG.' WHERE category='.$group.' ORDER BY category ASC;';
@@ -44,12 +44,12 @@ class saimod_sys_locale extends \SYSTEM\SAI\SaiModule {
         while($r = $res->next()){  
             $temparr['lang'] = $r[$lang];
             $temparr['id'] = $r['id'];
-            $entries .= \SYSTEM\PAGE\replace::replaceFile(\SYSTEM\SERVERPATH(new \SYSTEM\PSAI(),'modules/saimod_sys_locale/tpl/entry.tpl'), $temparr);
+            $entries .= \SYSTEM\PAGE\replace::replaceFile(\SYSTEM\SERVERPATH(new \SYSTEM\PSAI(),'modules/saimod_sys_text/tpl/entry.tpl'), $temparr);
         }
         return $entries;
     }
     
-    public static function sai_mod__SYSTEM_SAI_saimod_sys_locale_action_singleload($id, $lang){
+    public static function sai_mod__SYSTEM_SAI_saimod_sys_text_action_singleload($id, $lang){
         $con = new \SYSTEM\DB\Connection();
         $result = "";
         if(\SYSTEM\system::isSystemDbInfoPG()){
@@ -65,7 +65,7 @@ class saimod_sys_locale extends \SYSTEM\SAI\SaiModule {
         return $entries;
     }
     
-    public static function sai_mod__SYSTEM_SAI_saimod_sys_locale_action_edit($id, $lang, $category, $newtext){
+    public static function sai_mod__SYSTEM_SAI_saimod_sys_text_action_edit($id, $lang, $category, $newtext){
          //$charset = 'utf-8';
          $con = new \SYSTEM\DB\Connection(\SYSTEM\system::getSystemDBInfo());
          $res = null;         
@@ -77,18 +77,18 @@ class saimod_sys_locale extends \SYSTEM\SAI\SaiModule {
         return $res->affectedRows() == 0 ? \SYSTEM\LOG\JsonResult::error(new \SYSTEM\LOG\WARNING("no rows affected")) : \SYSTEM\LOG\JsonResult::ok();
     }
     
-    public static function sai_mod__SYSTEM_SAI_saimod_sys_locale_action_add($id, $category){                
+    public static function sai_mod__SYSTEM_SAI_saimod_sys_text_action_add($id, $category){                
         return \SYSTEM\DBD\SYS_SAIMOD_LOCALE_ADD::QI(array($id, $category)) ? \SYSTEM\LOG\JsonResult::ok() : \SYSTEM\LOG\JsonResult::error(new \SYSTEM\LOG\WARNING("no data added"));}
   
-    public static function sai_mod__SYSTEM_SAI_saimod_sys_locale_action_delete($id){
+    public static function sai_mod__SYSTEM_SAI_saimod_sys_text_action_delete($id){
         return \SYSTEM\DBD\SYS_SAIMOD_LOCALE_DEL::QI(array($id)) ? \SYSTEM\LOG\JsonResult::ok() : \SYSTEM\LOG\JsonResult::error(new \SYSTEM\LOG\WARNING("could not delete the permitted data"));}
       
-    public static function html_li_menu(){return '<li><a href="#" saimenu=".SYSTEM.SAI.saimod_sys_locale">Text</a></li>';}
+    public static function html_li_menu(){return '<li><a href="#!text">Text</a></li>';}
     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_LOCALE);}
     
-    public static function sai_mod__SYSTEM_SAI_saimod_sys_locale_flag_css(){}
+    //public static function css(){}
-    public static function sai_mod__SYSTEM_SAI_saimod_sys_locale_flag_js(){
+    public static function js(){
-        return \SYSTEM\LOG\JsonResult::toString(
+        return array(  \SYSTEM\WEBPATH(new \SYSTEM\PSAI(),'modules/saimod_sys_text/tinymce/tinymce.min.js'),
-            array(  \SYSTEM\WEBPATH(new \SYSTEM\PSAI(),'modules/saimod_sys_locale/saimod_sys_locale.js')));}
+                       \SYSTEM\WEBPATH(new \SYSTEM\PSAI(),'modules/saimod_sys_text/js/saimod_sys_text.js'));}
 }