From dc1fd6e230eb39657c1bb4d0960ce1cdf60479fe Mon Sep 17 00:00:00 2001
From: rylon <rylon@web.de>
Date: Thu, 16 Apr 2015 19:29:06 +0200
Subject: [PATCH] merge text symbols in log, saistart, fixed problem with tag
 saving in text, tinymce no enforced p-tag

---
 page/text.php                                     | 2 ++
 sai/modules/saimod_sys_log/saimod_sys_log.php     | 1 +
 sai/modules/saimod_sys_text/js/saimod_sys_text.js | 9 ++++++---
 sai/modules/saistart_sys_sai/saistart_sys_sai.php | 4 +++-
 sai/page/default_page.php                         | 2 +-
 5 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/page/text.php b/page/text.php
index 2608fcd..54e0873 100644
--- a/page/text.php
+++ b/page/text.php
@@ -49,6 +49,8 @@ class text {
         //Insert
         if(!\SYSTEM\DBD\SYS_TEXT_SAVE::QI(array($id,$lang,$text,  \SYSTEM\SECURITY\Security::getUser()->id,\SYSTEM\SECURITY\Security::getUser()->id))){
             return false;}
+        //delete all tags
+        \SYSTEM\DBD\SYS_TEXT_DELETE_TAGS::QI(array($id));
         //Insert tags
         foreach($tags as $tag){
             if($tag){\SYSTEM\DBD\SYS_TEXT_SAVE_TAG::QI(array($id,$tag));}}
diff --git a/sai/modules/saimod_sys_log/saimod_sys_log.php b/sai/modules/saimod_sys_log/saimod_sys_log.php
index e651284..4f2b919 100644
--- a/sai/modules/saimod_sys_log/saimod_sys_log.php
+++ b/sai/modules/saimod_sys_log/saimod_sys_log.php
@@ -344,6 +344,7 @@ class saimod_sys_log extends \SYSTEM\SAI\SaiModule {
         $vars = array();
         $vars = \SYSTEM\PAGE\text::tag('basic');
         $vars['PICPATH'] = \SYSTEM\WEBPATH(new \SYSTEM\PSAI(), 'modules/saimod_sys_log/img/');
+        $vars = array_merge($vars, \SYSTEM\PAGE\text::tag('basic'),\SYSTEM\PAGE\text::tag('sai'));
         return \SYSTEM\PAGE\replace::replaceFile(\SYSTEM\SERVERPATH(new \SYSTEM\PSAI(),'modules/saimod_sys_log/tpl/saimod_sys_log.tpl'), $vars);        
     }
     
diff --git a/sai/modules/saimod_sys_text/js/saimod_sys_text.js b/sai/modules/saimod_sys_text/js/saimod_sys_text.js
index 900388b..35a356e 100644
--- a/sai/modules/saimod_sys_text/js/saimod_sys_text.js
+++ b/sai/modules/saimod_sys_text/js/saimod_sys_text.js
@@ -56,7 +56,7 @@ function init_saimod_sys_text_editor(){
                     success : function(data) {
                         if(data.status){
                             alert('success');
-                            system.load('text(edittext(editor));id.'+new_id+';lang.'+lang);
+                            system.load('text(edittext(editor));id.'+new_id+';lang.'+lang,true);
                         }else{
                             alert('Problem: '+data);}
                         }
@@ -74,7 +74,7 @@ function init_saimod_sys_text_editor(){
                     success : function(data) {
                         if(data.status){
                             alert('success');
-                            system.load('text');
+                            system.load('text',true);
                         }else{
                             alert('Problem: '+data);}
                         }
@@ -157,6 +157,9 @@ function init_tinymce(){
         templates: [
             {title: 'Test template 1', content: 'Test 1'},
             {title: 'Test template 2', content: 'Test 2'}
-        ]
+        ],
+        forced_root_block : "", 
+        force_br_newlines : true,
+        force_p_newlines : false,
 });
 }
diff --git a/sai/modules/saistart_sys_sai/saistart_sys_sai.php b/sai/modules/saistart_sys_sai/saistart_sys_sai.php
index a88e600..1cd30d2 100644
--- a/sai/modules/saistart_sys_sai/saistart_sys_sai.php
+++ b/sai/modules/saistart_sys_sai/saistart_sys_sai.php
@@ -33,7 +33,9 @@ class saistart_sys_sai extends \SYSTEM\SAI\SaiModule {
         $vars['username'] = $user->username;
         $vars['locale'] = $user->locale;
         $vars['isadmin']  = \SYSTEM\SECURITY\Security::check(\SYSTEM\SECURITY\RIGHTS::SYS_SAI) ? "yes" : "no";
-        $vars = array_merge($vars,\SYSTEM\SAI\saimod_sys_todo::statistics());
+        $vars = array_merge(    $vars,
+                                \SYSTEM\SAI\saimod_sys_todo::statistics(),
+                                \SYSTEM\PAGE\text::tag('sai'));
         return \SYSTEM\PAGE\replace::replaceFile(\SYSTEM\WEBPATH(new \SYSTEM\PSAI(),'modules/saistart_sys_sai/tpl/content_loggedin.tpl'), $vars);
     }
 }
\ No newline at end of file
diff --git a/sai/page/default_page.php b/sai/page/default_page.php
index 6a5a6fa..94e2643 100644
--- a/sai/page/default_page.php
+++ b/sai/page/default_page.php
@@ -61,7 +61,7 @@ class default_page extends \SYSTEM\PAGE\Page {
         $vars['title'] = \SYSTEM\CONFIG\config::get(\SYSTEM\CONFIG\config_ids::SYS_SAI_CONFIG_TITLE);
         $vars['copyright'] = \SYSTEM\CONFIG\config::get(\SYSTEM\CONFIG\config_ids::SYS_SAI_CONFIG_COPYRIGHT);
         
-        $vars = array_merge($vars,\SYSTEM\PAGE\text::tag('sys_sai'));
+        $vars = array_merge($vars,\SYSTEM\PAGE\text::tag('basic'),\SYSTEM\PAGE\text::tag('sai'));
         return \SYSTEM\PAGE\replace::replaceFile(\SYSTEM\SERVERPATH(new \SYSTEM\PSAI(),'page/tpl/sai.tpl'), $vars);        
     }
 }
\ No newline at end of file