lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

NEW ckeditor accept a parameter to disable all html filtering

Browse Source
This commit is contained in:
Laurent Destailleur 2016-09-15 23:23:10 +02:00
parent 8a32391171
commit 68b3de5b37
2 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
htdocs/core/class/doleditor.class.php
View File

@ -142,19 +142,23 @@ class DolEditor
* *
* @param int $noprint 1=Return HTML string instead of printing it to output * @param int $noprint 1=Return HTML string instead of printing it to output
* @param string $morejs Add more js. For example: ".on( \'saveSnapshot\', function(e) { alert(\'ee\'); });" * @param string $morejs Add more js. For example: ".on( \'saveSnapshot\', function(e) { alert(\'ee\'); });"
* @param boolean $disallowAnyContent Disallow to use any content. true=restrict to a predefined list of allowed elements.
* @return void|string * @return void|string
*/ */
function Create($noprint=0,$morejs='') function Create($noprint=0,$morejs='',$disallowAnyContent=true)
{ {
global $conf,$langs; global $conf,$langs;
$fullpage=False; $fullpage=False;
if (isset($conf->global->FCKEDITOR_ALLOW_ANY_CONTENT))
{
$disallowAnyContent=empty($conf->global->FCKEDITOR_ALLOW_ANY_CONTENT); // Only predefined list of html tags are allowed $disallowAnyContent=empty($conf->global->FCKEDITOR_ALLOW_ANY_CONTENT); // Only predefined list of html tags are allowed
}
$found=0; $found=0;
$out=''; $out='';
if ($this->tool == 'fckeditor') if ($this->tool == 'fckeditor') // not used anymore
{ {
$found=1; $found=1;
$this->editor->Create(); $this->editor->Create();
@ -179,6 +183,7 @@ class DolEditor
$htmlencode_force=preg_match('/_encoded$/',$this->toolbarname)?'true':'false'; $htmlencode_force=preg_match('/_encoded$/',$this->toolbarname)?'true':'false';
$out.= '<!-- Output ckeditor $disallowAnyContent='.$disallowAnyContent.' toolbarname='.$this->toolbarname.' -->'."\n";
$out.= '<script type="text/javascript"> $out.= '<script type="text/javascript">
$(document).ready(function () { $(document).ready(function () {
/* if (CKEDITOR.loadFullCore) CKEDITOR.loadFullCore(); */ /* if (CKEDITOR.loadFullCore) CKEDITOR.loadFullCore(); */

2
htdocs/websites/index.php
View File

@ -904,7 +904,7 @@ if ($action == 'editcontent')
require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php'; require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
$doleditor=new DolEditor('PAGE_CONTENT',$contentforedit,'',500,'Full','',true,true,true,5,60); $doleditor=new DolEditor('PAGE_CONTENT',$contentforedit,'',500,'Full','',true,true,true,5,60);
$doleditor->Create(); $doleditor->Create(0, '', false);
} }
print '</div></form>'; print '</div></form>';