alxarafe / alixar

dolibarr/htdocs/core/class/doleditor.class.php

Indentation +107 added lines, -107 removed lines

@@ -30,19 +30,19 @@ 
 {
     var $tool;      // Store the selected tool
 
-	// If using fckeditor
-	var $editor;
+    // If using fckeditor
+    var $editor;
 
-	// If not using fckeditor
-	var $content;
-	var $htmlname;
-	var $toolbarname;
-	var $toolbarstartexpanded;
-	var $rows;
-	var $cols;
-	var $height;
-	var $width;
-	var $readonly;
+    // If not using fckeditor
+    var $content;
+    var $htmlname;
+    var $toolbarname;
+    var $toolbarstartexpanded;
+    var $rows;
+    var $cols;
+    var $height;
+    var $width;
+    var $readonly;
 
 
     /**
@@ -57,22 +57,22 @@ 
      *                       		             			'In' each window has its own toolbar
      *                              		      			'Out:name' share toolbar into the div called 'name'
      *      @param  boolean	$toolbarstartexpanded  			Bar is visible or not at start
-	 *		@param	int		$uselocalbrowser				Enabled to add links to local object with local browser. If false, only external images can be added in content.
-	 *      @param  boolean|string	$okforextendededitor    True=Allow usage of extended editor tool if qualified (like ckeditor). If 'textarea', force use of simple textarea. If 'ace', force use of Ace.
-	 *      												Warning: If you use 'ace', don't forget to also include ace.js in page header. Also, the button "save" must have class="buttonforacesave".
+     *		@param	int		$uselocalbrowser				Enabled to add links to local object with local browser. If false, only external images can be added in content.
+     *      @param  boolean|string	$okforextendededitor    True=Allow usage of extended editor tool if qualified (like ckeditor). If 'textarea', force use of simple textarea. If 'ace', force use of Ace.
+     *      												Warning: If you use 'ace', don't forget to also include ace.js in page header. Also, the button "save" must have class="buttonforacesave".
      *      @param  int		$rows                   		Size of rows for textarea tool
-	 *      @param  string	$cols                   		Size of cols for textarea tool (textarea number of cols '70' or percent 'x%')
-	 *      @param	int		$readonly						0=Read/Edit, 1=Read only
-	 */
+     *      @param  string	$cols                   		Size of cols for textarea tool (textarea number of cols '70' or percent 'x%')
+     *      @param	int		$readonly						0=Read/Edit, 1=Read only
+     */
     function __construct($htmlname, $content, $width='', $height=200, $toolbarname='Basic', $toolbarlocation='In', $toolbarstartexpanded=false, $uselocalbrowser=true, $okforextendededitor=true, $rows=0, $cols=0, $readonly=0)
     {
-    	global $conf,$langs;
+        global $conf,$langs;
 
-    	dol_syslog(get_class($this)."::DolEditor htmlname=".$htmlname." width=".$width." height=".$height." toolbarname=".$toolbarname);
+        dol_syslog(get_class($this)."::DolEditor htmlname=".$htmlname." width=".$width." height=".$height." toolbarname=".$toolbarname);
 
-    	if (! $rows) $rows=round($height/20);
-    	if (! $cols) $cols=($width?round($width/6):80);
-		$shorttoolbarname=preg_replace('/_encoded$/','',$toolbarname);
+        if (! $rows) $rows=round($height/20);
+        if (! $cols) $cols=($width?round($width/6):80);
+        $shorttoolbarname=preg_replace('/_encoded$/','',$toolbarname);
 
         // Name of extended editor to use (FCKEDITOR_EDITORNAME can be 'ckeditor' or 'fckeditor')
         $defaulteditor='ckeditor';
@@ -82,7 +82,7 @@ 
 
         // Check if extended editor is ok. If not we force textarea
         if ((empty($conf->fckeditor->enabled) && $okforextendededitor != 'ace') || empty($okforextendededitor)) $this->tool = 'textarea';
-		if ($okforextendededitor === 'ace') $this->tool='ace';
+        if ($okforextendededitor === 'ace') $this->tool='ace';
         //if ($conf->dol_use_jmobile) $this->tool = 'textarea';       // ckeditor and ace seems ok with mobile
 
         // Define content and some properties
@@ -91,50 +91,50 @@ 
             $content=dol_htmlentitiesbr($content);  // If content is not HTML, we convert to HTML.
         }
         if ($this->tool == 'fckeditor')
-    	{
-        	require_once DOL_DOCUMENT_ROOT.'/includes/fckeditor/fckeditor.php';
-
-    		$content=dol_htmlentitiesbr($content);	// If content is not HTML, we convert to HTML.
-
-        	$this->editor = new FCKeditor($htmlname);
-        	$this->editor->BasePath = DOL_URL_ROOT.'/includes/fckeditor/' ;
-        	$this->editor->Value	= $content;
-        	$this->editor->Height   = $height;
-        	if (! empty($width)) $this->editor->Width = $width;
-        	$this->editor->ToolbarSet = $shorttoolbarname;         // Profile of this toolbar set is deinfed into theme/mytheme/ckeditor/config.js
-        	$this->editor->Config['AutoDetectLanguage'] = 'true';  // Language of user (browser)
-        	$this->editor->Config['ToolbarLocation'] = $toolbarlocation ? $toolbarlocation : 'In';
-        	$this->editor->Config['ToolbarStartExpanded'] = $toolbarstartexpanded;
-
-    		// Rem: Le forcage de ces 2 parametres ne semble pas fonctionner.
-    		// Dolibarr utilise toujours liens avec modulepart='fckeditor' quelque soit modulepart.
-    		// Ou se trouve donc cette valeur /viewimage.php?modulepart=fckeditor&file=' ?
-        	$modulepart='fckeditor';
-    		$this->editor->Config['UserFilesPath'] = '/viewimage.php?modulepart='.$modulepart.'&entity='.$conf->entity.'&file=';
-    		$this->editor->Config['UserFilesAbsolutePath'] = DOL_DATA_ROOT.'/'.$modulepart.'/' ;
-
-        	$this->editor->Config['LinkBrowser']=($uselocalbrowser?'true':'false');
-        	$this->editor->Config['ImageBrowser']=($uselocalbrowser?'true':'false');
-
-        	if (file_exists(DOL_DOCUMENT_ROOT.'/theme/'.$conf->theme.'/fckeditor/fckconfig.js'))
-        	{
-        		$this->editor->Config['CustomConfigurationsPath'] = DOL_URL_ROOT.'/theme/'.$conf->theme.'/fckeditor/fckconfig.js';
-        		$this->editor->Config['SkinPath'] = DOL_URL_ROOT.'/theme/'.$conf->theme.'/fckeditor/';
-    		}
-    	}
-
-    	// Define some properties
+        {
+            require_once DOL_DOCUMENT_ROOT.'/includes/fckeditor/fckeditor.php';
+
+            $content=dol_htmlentitiesbr($content);	// If content is not HTML, we convert to HTML.
+
+            $this->editor = new FCKeditor($htmlname);
+            $this->editor->BasePath = DOL_URL_ROOT.'/includes/fckeditor/' ;
+            $this->editor->Value	= $content;
+            $this->editor->Height   = $height;
+            if (! empty($width)) $this->editor->Width = $width;
+            $this->editor->ToolbarSet = $shorttoolbarname;         // Profile of this toolbar set is deinfed into theme/mytheme/ckeditor/config.js
+            $this->editor->Config['AutoDetectLanguage'] = 'true';  // Language of user (browser)
+            $this->editor->Config['ToolbarLocation'] = $toolbarlocation ? $toolbarlocation : 'In';
+            $this->editor->Config['ToolbarStartExpanded'] = $toolbarstartexpanded;
+
+            // Rem: Le forcage de ces 2 parametres ne semble pas fonctionner.
+            // Dolibarr utilise toujours liens avec modulepart='fckeditor' quelque soit modulepart.
+            // Ou se trouve donc cette valeur /viewimage.php?modulepart=fckeditor&file=' ?
+            $modulepart='fckeditor';
+            $this->editor->Config['UserFilesPath'] = '/viewimage.php?modulepart='.$modulepart.'&entity='.$conf->entity.'&file=';
+            $this->editor->Config['UserFilesAbsolutePath'] = DOL_DATA_ROOT.'/'.$modulepart.'/' ;
+
+            $this->editor->Config['LinkBrowser']=($uselocalbrowser?'true':'false');
+            $this->editor->Config['ImageBrowser']=($uselocalbrowser?'true':'false');
+
+            if (file_exists(DOL_DOCUMENT_ROOT.'/theme/'.$conf->theme.'/fckeditor/fckconfig.js'))
+            {
+                $this->editor->Config['CustomConfigurationsPath'] = DOL_URL_ROOT.'/theme/'.$conf->theme.'/fckeditor/fckconfig.js';
+                $this->editor->Config['SkinPath'] = DOL_URL_ROOT.'/theme/'.$conf->theme.'/fckeditor/';
+            }
+        }
+
+        // Define some properties
         if (in_array($this->tool,array('textarea','ckeditor','ace')))
         {
-    	    $this->content				= $content;
-    	    $this->htmlname 			= $htmlname;
-    	    $this->toolbarname			= $shorttoolbarname;
-    	    $this->toolbarstartexpanded = $toolbarstartexpanded;
+            $this->content				= $content;
+            $this->htmlname 			= $htmlname;
+            $this->toolbarname			= $shorttoolbarname;
+            $this->toolbarstartexpanded = $toolbarstartexpanded;
             $this->rows					= max(ROWS_3,$rows);
             $this->cols					= (preg_match('/%/',$cols)?$cols:max(40,$cols));	// If $cols is a percent, we keep it, otherwise, we take max
             $this->height				= $height;
             $this->width				= $width;
-    	}
+        }
     }
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
@@ -152,20 +152,20 @@ 
     function Create($noprint=0, $morejs='', $disallowAnyContent=true, $titlecontent='', $option='')
     {
         // phpcs:enable
-    	global $conf,$langs;
+        global $conf,$langs;
 
-    	$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 or all
-    	}
+        $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 or all
+        }
 
-    	$found=0;
-		$out='';
+        $found=0;
+        $out='';
 
         if ($this->tool == 'fckeditor') // not used anymore
         {
-			$found=1;
+            $found=1;
             $this->editor->Create();
         }
         if (in_array($this->tool,array('textarea','ckeditor')))
@@ -179,12 +179,12 @@ 
 
             if ($this->tool == 'ckeditor' && ! empty($conf->use_javascript_ajax))
             {
-            	if (! defined('REQUIRE_CKEDITOR')) define('REQUIRE_CKEDITOR','1');
+                if (! defined('REQUIRE_CKEDITOR')) define('REQUIRE_CKEDITOR','1');
 
-            	if (! empty($conf->global->FCKEDITOR_SKIN)) {
-					$skin = $conf->global->FCKEDITOR_SKIN;
-				} else {
-					// $skin = 'moono-lisa'; // default with ckeditor 4.6 : moono-lisa
+                if (! empty($conf->global->FCKEDITOR_SKIN)) {
+                    $skin = $conf->global->FCKEDITOR_SKIN;
+                } else {
+                    // $skin = 'moono-lisa'; // default with ckeditor 4.6 : moono-lisa
 
                     /**
                      * Alixar:
@@ -195,10 +195,10 @@ 
                     $skin = CKEDITOR_SKIN;  // In AlixarDispatcher defineConstants()
                 }
 
-            	$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.= '<!-- Output ckeditor $disallowAnyContent='.$disallowAnyContent.' toolbarname='.$this->toolbarname.' -->'."\n";
+                $out.= '<script type="text/javascript">
             			$(document).ready(function () {
                             /* if (CKEDITOR.loadFullCore) CKEDITOR.loadFullCore(); */
                             /* should be editor=CKEDITOR.replace but what if serveral editors ? */
@@ -233,8 +233,8 @@ 
                                                         });
                                                 }
                                             }';
-            	if ($this->uselocalbrowser)
-            	{
+                if ($this->uselocalbrowser)
+                {
                     $out.= ','."\n";
                     // To use filemanager with old fckeditor (GPL)
                     $out.= '    filebrowserBrowseUrl : ckeditorFilebrowserBrowseUrl,';
@@ -243,7 +243,7 @@ 
                     //$out.= '    filebrowserImageUploadUrl : \''.DOL_URL_ROOT.'/includes/fckeditor/editor/filemanagerdol/connectors/php/upload.php?Type=Image\',';
                     $out.= "\n";
                     // To use filemanager with ckfinder (Non free) and ckfinder directory is inside htdocs/includes
-					/* $out.= '    filebrowserBrowseUrl : \''.DOL_URL_ROOT.'/includes/ckfinder/ckfinder.html\',
+                    /* $out.= '    filebrowserBrowseUrl : \''.DOL_URL_ROOT.'/includes/ckfinder/ckfinder.html\',
                                filebrowserImageBrowseUrl : \''.DOL_URL_ROOT.'/includes/ckfinder/ckfinder.html?Type=Images\',
                                filebrowserFlashBrowseUrl : \''.DOL_URL_ROOT.'/includes/ckfinder/ckfinder.html?Type=Flash\',
                                filebrowserUploadUrl : \''.DOL_URL_ROOT.'/includes/ckfinder/core/connector/php/connector.php?command=QuickUpload&type=Files\',
@@ -254,10 +254,10 @@ 
                                filebrowserWindowHeight : \'500\',
                                filebrowserImageWindowWidth : \'900\',
                                filebrowserImageWindowHeight : \'500\'';
-            	}
-            	$out.= '	})'.$morejs;
-            	$out.= '});'."\n";
-            	$out.= '</script>'."\n";
+                }
+                $out.= '	})'.$morejs;
+                $out.= '});'."\n";
+                $out.= '</script>'."\n";
             }
         }
 
@@ -265,19 +265,19 @@ 
         // Warning: ace.js and ext-statusbar.js must be loaded by the parent page.
         if (preg_match('/^ace/', $this->tool))
         {
-        	$found=1;
-			$format=$option;
+            $found=1;
+            $format=$option;
 
             $out.= "\n".'<!-- Output Ace editor -->'."\n";
 
-			if ($titlecontent)
-			{
-	            $out.= '<div class="aceeditorstatusbar" id="statusBar'.$this->htmlname.'">'.$titlecontent;
-	            $out.= ' &nbsp; - &nbsp; <a id="morelines" href="#" class="right morelines'.$this->htmlname.'">'.dol_escape_htmltag($langs->trans("ShowMoreLines")).'</a> &nbsp; &nbsp; ';
-	            $out.= '</div>';
-	            $out.= '<script type="text/javascript" language="javascript">'."\n";
-	            $out.= 'jQuery(document).ready(function() {'."\n";
-	            $out.= '	var aceEditor = window.ace.edit("'.$this->htmlname.'aceeditorid");
+            if ($titlecontent)
+            {
+                $out.= '<div class="aceeditorstatusbar" id="statusBar'.$this->htmlname.'">'.$titlecontent;
+                $out.= ' &nbsp; - &nbsp; <a id="morelines" href="#" class="right morelines'.$this->htmlname.'">'.dol_escape_htmltag($langs->trans("ShowMoreLines")).'</a> &nbsp; &nbsp; ';
+                $out.= '</div>';
+                $out.= '<script type="text/javascript" language="javascript">'."\n";
+                $out.= 'jQuery(document).ready(function() {'."\n";
+                $out.= '	var aceEditor = window.ace.edit("'.$this->htmlname.'aceeditorid");
 	    	    		   	var StatusBar = window.ace.require("ace/ext/statusbar").StatusBar;									// Init status bar. Need lib ext-statusbar
 	        			   	var statusBar = new StatusBar(aceEditor, document.getElementById("statusBar'.$this->htmlname.'"));	// Init status bar. Need lib ext-statusbar
 	            			var oldNbOfLines = 0
@@ -299,21 +299,21 @@ 
 									}
 							});
 						})';
-	            $out.= '</script>'."\n";
-			}
+                $out.= '</script>'."\n";
+            }
 
             $out.= '<pre id="'.$this->htmlname.'aceeditorid" style="'.($this->width?'width: '.$this->width.'px; ':'');
             $out.= ($this->height?' height: '.$this->height.'px; ':'');
             //$out.=" min-height: 100px;";
             $out.= '">';
-        	$out.= htmlspecialchars($this->content);
-        	$out.= '</pre>';
-        	$out.= '<textarea id="'.$this->htmlname.'" name="'.$this->htmlname.'" style="width:0px; height: 0px; display: none;">';
-        	$out.= htmlspecialchars($this->content);
-        	$out.= '</textarea>';
+            $out.= htmlspecialchars($this->content);
+            $out.= '</pre>';
+            $out.= '<textarea id="'.$this->htmlname.'" name="'.$this->htmlname.'" style="width:0px; height: 0px; display: none;">';
+            $out.= htmlspecialchars($this->content);
+            $out.= '</textarea>';
 
-        	$out.= '<script type="text/javascript" language="javascript">'."\n";
-        	$out.= 'var aceEditor = window.ace.edit("'.$this->htmlname.'aceeditorid");
+            $out.= '<script type="text/javascript" language="javascript">'."\n";
+            $out.= 'var aceEditor = window.ace.edit("'.$this->htmlname.'aceeditorid");
 
 				    aceEditor.session.setMode("ace/mode/'.$format.'");
 					aceEditor.setOptions({
@@ -333,7 +333,7 @@ 
 					//aceEditor.getSession().setMode("ace/mode/javascript_expression");
 					'."\n";
 
-        	$out.= 'jQuery(document).ready(function() {
+            $out.= 'jQuery(document).ready(function() {
 						jQuery(".buttonforacesave").click(function() {
         					console.log("We click on savefile button for component '.$this->htmlname.'");
         					var aceEditor = window.ace.edit("'.$this->htmlname.'aceeditorid")
@@ -343,7 +343,7 @@ 
 							else return false;*/
 	        			});
 					})';
-        	$out.= '</script>'."\n";
+            $out.= '</script>'."\n";
         }
 
         if (empty($found))

dolibarr/htdocs/core/modules/modFckeditor.class.php

Indentation +36 added lines, -36 removed lines

@@ -34,55 +34,55 @@
 
 class modFckeditor extends DolibarrModules
 {
-	/**
-	 *   Constructor. Define names, constants, directories, boxes, permissions
-	 *
-	 *   @param      DoliDB		$db      Database handler
-	 */
-	function __construct($db)
-	{
-		$this->db = $db;
-		$this->numero = 2000;
+    /**
+     *   Constructor. Define names, constants, directories, boxes, permissions
+     *
+     *   @param      DoliDB		$db      Database handler
+     */
+    function __construct($db)
+    {
+        $this->db = $db;
+        $this->numero = 2000;
 
-		$this->family = "technic";
-		$this->module_position = '20';
-		// Module label (no space allowed), used if translation string 'ModuleXXXName' not found (where XXX is value of numeric property 'numero' of module)
-		$this->name = preg_replace('/^mod/i','',get_class($this));
-		$this->description = "Editeur WYSIWYG";
-		// Possible values for version are: 'development', 'experimental', 'dolibarr' or version
-		$this->version = 'dolibarr';
-		$this->const_name = 'MAIN_MODULE_'.strtoupper($this->name);
-		// Name of png file (without png) used for this module.
-		// Png file must be in theme/yourtheme/img directory under name object_pictovalue.png.
-		$this->picto='list';
+        $this->family = "technic";
+        $this->module_position = '20';
+        // Module label (no space allowed), used if translation string 'ModuleXXXName' not found (where XXX is value of numeric property 'numero' of module)
+        $this->name = preg_replace('/^mod/i','',get_class($this));
+        $this->description = "Editeur WYSIWYG";
+        // Possible values for version are: 'development', 'experimental', 'dolibarr' or version
+        $this->version = 'dolibarr';
+        $this->const_name = 'MAIN_MODULE_'.strtoupper($this->name);
+        // Name of png file (without png) used for this module.
+        // Png file must be in theme/yourtheme/img directory under name object_pictovalue.png.
+        $this->picto='list';
 
-		// Data directories to create when module is enabled
-		$this->dirs = array("/medias/temp","/medias/image");
+        // Data directories to create when module is enabled
+        $this->dirs = array("/medias/temp","/medias/image");
 
-		// Config pages
-		$this->config_page_url = array("fckeditor.php");
+        // Config pages
+        $this->config_page_url = array("fckeditor.php");
 
-		// Dependencies
-		$this->disabled = (in_array(constant('JS_CKEDITOR'),array('disabled','disabled/'))?1:0);	// A condition to disable module (used for native debian packages)
-		$this->depends = array();
-		$this->requiredby = array('modWebsites');
+        // Dependencies
+        $this->disabled = (in_array(constant('JS_CKEDITOR'),array('disabled','disabled/'))?1:0);	// A condition to disable module (used for native debian packages)
+        $this->depends = array();
+        $this->requiredby = array('modWebsites');
 
-		// Constants
-		$this->const = array();
+        // Constants
+        $this->const = array();
         $this->const[0]  = array("FCKEDITOR_ENABLE_SOCIETE","yesno","1","WYSIWIG for description and note (except products/services)");
         $this->const[1]  = array("FCKEDITOR_ENABLE_PRODUCTDESC","yesno","1","WYSIWIG for products/services description and note");
         $this->const[2]  = array("FCKEDITOR_ENABLE_MAILING","yesno","1","WYSIWIG for mass emailings");
         $this->const[3]  = array("FCKEDITOR_ENABLE_DETAILS","yesno","1","WYSIWIG for products details lines for all entities");
         $this->const[4]  = array("FCKEDITOR_ENABLE_USERSIGN","yesno","1","WYSIWIG for user signature");
         $this->const[5]  = array("FCKEDITOR_ENABLE_MAIL","yesno","1","WYSIWIG for products details lines for all entities");
-		//$this->const[6]  = array("FCKEDITOR_SKIN","string","moono-lisa","Skin by default for fckeditor");
+        //$this->const[6]  = array("FCKEDITOR_SKIN","string","moono-lisa","Skin by default for fckeditor");
         $this->const[6] = array("FCKEDITOR_SKIN", "string", CKEDITOR_SKIN, "Skin by default for fckeditor");
 
         // Boxes
-		$this->boxes = array();
+        $this->boxes = array();
 
-		// Permissions
-		$this->rights = array();
-		$this->rights_class = 'fckeditor';
-	}
+        // Permissions
+        $this->rights = array();
+        $this->rights_class = 'fckeditor';
+    }
 }