webcraftmedia/system
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

merge text symbols in log, saistart, fixed problem with tag saving in text, tinymce no enforced p-tag

Browse Source
This commit is contained in:
Ulf Gebhardt 2015-04-16 19:29:06 +02:00
parent 3e3ab76a03
commit dc1fd6e230
5 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
page/text.php
View File

@ -49,6 +49,8 @@ class text {
//Insert //Insert
if(!\SYSTEM\DBD\SYS_TEXT_SAVE::QI(array($id,$lang,$text, \SYSTEM\SECURITY\Security::getUser()->id,\SYSTEM\SECURITY\Security::getUser()->id))){ if(!\SYSTEM\DBD\SYS_TEXT_SAVE::QI(array($id,$lang,$text, \SYSTEM\SECURITY\Security::getUser()->id,\SYSTEM\SECURITY\Security::getUser()->id))){
return false;} return false;}
//delete all tags
\SYSTEM\DBD\SYS_TEXT_DELETE_TAGS::QI(array($id));
//Insert tags //Insert tags
foreach($tags as $tag){ foreach($tags as $tag){
if($tag){\SYSTEM\DBD\SYS_TEXT_SAVE_TAG::QI(array($id,$tag));}} if($tag){\SYSTEM\DBD\SYS_TEXT_SAVE_TAG::QI(array($id,$tag));}}

1
sai/modules/saimod_sys_log/saimod_sys_log.php
View File

@ -344,6 +344,7 @@ class saimod_sys_log extends \SYSTEM\SAI\SaiModule {
$vars = array(); $vars = array();
$vars = \SYSTEM\PAGE\text::tag('basic'); $vars = \SYSTEM\PAGE\text::tag('basic');
$vars['PICPATH'] = \SYSTEM\WEBPATH(new \SYSTEM\PSAI(), 'modules/saimod_sys_log/img/'); $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); return \SYSTEM\PAGE\replace::replaceFile(\SYSTEM\SERVERPATH(new \SYSTEM\PSAI(),'modules/saimod_sys_log/tpl/saimod_sys_log.tpl'), $vars);
} }

9
sai/modules/saimod_sys_text/js/saimod_sys_text.js
View File

@ -56,7 +56,7 @@ function init_saimod_sys_text_editor(){
success : function(data) { success : function(data) {
if(data.status){ if(data.status){
alert('success'); alert('success');
system.load('text(edittext(editor));id.'+new_id+';lang.'+lang); system.load('text(edittext(editor));id.'+new_id+';lang.'+lang,true);
}else{ }else{
alert('Problem: '+data);} alert('Problem: '+data);}
} }
@ -74,7 +74,7 @@ function init_saimod_sys_text_editor(){
success : function(data) { success : function(data) {
if(data.status){ if(data.status){
alert('success'); alert('success');
system.load('text'); system.load('text',true);
}else{ }else{
alert('Problem: '+data);} alert('Problem: '+data);}
} }
@ -157,6 +157,9 @@ function init_tinymce(){
templates: [ templates: [
{title: 'Test template 1', content: 'Test 1'}, {title: 'Test template 1', content: 'Test 1'},
{title: 'Test template 2', content: 'Test 2'} {title: 'Test template 2', content: 'Test 2'}
] ],
forced_root_block : "",
force_br_newlines : true,
force_p_newlines : false,
}); });
} }

4
sai/modules/saistart_sys_sai/saistart_sys_sai.php
View File

@ -33,7 +33,9 @@ class saistart_sys_sai extends \SYSTEM\SAI\SaiModule {
$vars['username'] = $user->username; $vars['username'] = $user->username;
$vars['locale'] = $user->locale; $vars['locale'] = $user->locale;
$vars['isadmin'] = \SYSTEM\SECURITY\Security::check(\SYSTEM\SECURITY\RIGHTS::SYS_SAI) ? "yes" : "no"; $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); return \SYSTEM\PAGE\replace::replaceFile(\SYSTEM\WEBPATH(new \SYSTEM\PSAI(),'modules/saistart_sys_sai/tpl/content_loggedin.tpl'), $vars);
} }
} }

2
sai/page/default_page.php
View File

@ -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['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['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); return \SYSTEM\PAGE\replace::replaceFile(\SYSTEM\SERVERPATH(new \SYSTEM\PSAI(),'page/tpl/sai.tpl'), $vars);
} }
} }