alxarafe / alixar

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

Indentation +61 added lines, -61 removed lines

@@ -33,66 +33,66 @@
 class modExport extends DolibarrModules
 {
 
-	/**
-	 *   Constructor. Define names, constants, directories, boxes, permissions
-	 *
-	 *   @param      DoliDB		$db      Database handler
-	 */
-	function __construct($db)
-	{
-		$this->db = $db;
-		$this->numero = 240;
-
-		$this->family = "technic";
-		$this->module_position = '72';
+    /**
+     *   Constructor. Define names, constants, directories, boxes, permissions
+     *
+     *   @param      DoliDB		$db      Database handler
+     */
+    function __construct($db)
+    {
+        $this->db = $db;
+        $this->numero = 240;
+
+        $this->family = "technic";
+        $this->module_position = '72';
         // 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 = "Outils d'exports de donnees Dolibarr (via un assistant)";
-		// Possible values for version are: 'development', 'experimental', 'dolibarr' or version
-		$this->version = 'dolibarr';
-		$this->const_name = 'MAIN_MODULE_'.strtoupper($this->name);
-		$this->picto = 'technic';
-
-		// Data directories to create when module is enabled
-		$this->dirs = array("/export/temp");
-
-		// Config pages
-		$this->config_page_url = array("export.php");
-
-		// Dependencies
-		$this->depends = array();
-		$this->requiredby = array();
-		$this->phpmin = array(4,2,0);
-		$this->phpmax = array();
-
-		// Constants
-		$this->const = array();
-
-		// Boxes
-		$this->boxes = array();
-
-		// Permissions
-		$this->rights = array();
-		$this->rights_class = 'export';
-		$r=0;
-
-		$r++;
-		$this->rights[$r][0] = 1201;
-		$this->rights[$r][1] = 'Lire les exports';
-		$this->rights[$r][2] = 'r';
-		$this->rights[$r][3] = 0;
-		$this->rights[$r][4] = 'lire';
-
-		$r++;
-		$this->rights[$r][0] = 1202;
-		$this->rights[$r][1] = 'Creer/modifier un export';
-		$this->rights[$r][2] = 'w';
-		$this->rights[$r][3] = 0;
-		$this->rights[$r][4] = 'creer';
-
-
-		// Menus
-		//-------
-		$this->menu = 1;        // This module add menu entries. They are coded into menu manager.
-	}
+        $this->name = preg_replace('/^mod/i','',get_class($this));
+        $this->description = "Outils d'exports de donnees Dolibarr (via un assistant)";
+        // Possible values for version are: 'development', 'experimental', 'dolibarr' or version
+        $this->version = 'dolibarr';
+        $this->const_name = 'MAIN_MODULE_'.strtoupper($this->name);
+        $this->picto = 'technic';
+
+        // Data directories to create when module is enabled
+        $this->dirs = array("/export/temp");
+
+        // Config pages
+        $this->config_page_url = array("export.php");
+
+        // Dependencies
+        $this->depends = array();
+        $this->requiredby = array();
+        $this->phpmin = array(4,2,0);
+        $this->phpmax = array();
+
+        // Constants
+        $this->const = array();
+
+        // Boxes
+        $this->boxes = array();
+
+        // Permissions
+        $this->rights = array();
+        $this->rights_class = 'export';
+        $r=0;
+
+        $r++;
+        $this->rights[$r][0] = 1201;
+        $this->rights[$r][1] = 'Lire les exports';
+        $this->rights[$r][2] = 'r';
+        $this->rights[$r][3] = 0;
+        $this->rights[$r][4] = 'lire';
+
+        $r++;
+        $this->rights[$r][0] = 1202;
+        $this->rights[$r][1] = 'Creer/modifier un export';
+        $this->rights[$r][2] = 'w';
+        $this->rights[$r][3] = 0;
+        $this->rights[$r][4] = 'creer';
+
+
+        // Menus
+        //-------
+        $this->menu = 1;        // This module add menu entries. They are coded into menu manager.
+    }
 }

Spacing +5 added lines, -5 removed lines

@@ -24,7 +24,7 @@ 
  *	\brief      Fichier de description et activation du module export
  */
 
-include_once DOL_DOCUMENT_ROOT .'/core/modules/DolibarrModules.class.php';
+include_once DOL_DOCUMENT_ROOT.'/core/modules/DolibarrModules.class.php';
 
 
 /**
@@ -46,7 +46,7 @@ 
 		$this->family = "technic";
 		$this->module_position = '72';
         // 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->name = preg_replace('/^mod/i', '', get_class($this));
 		$this->description = "Outils d'exports de donnees Dolibarr (via un assistant)";
 		// Possible values for version are: 'development', 'experimental', 'dolibarr' or version
 		$this->version = 'dolibarr';
@@ -62,7 +62,7 @@ 
 		// Dependencies
 		$this->depends = array();
 		$this->requiredby = array();
-		$this->phpmin = array(4,2,0);
+		$this->phpmin = array(4, 2, 0);
 		$this->phpmax = array();
 
 		// Constants
@@ -74,7 +74,7 @@ 
 		// Permissions
 		$this->rights = array();
 		$this->rights_class = 'export';
-		$r=0;
+		$r = 0;
 
 		$r++;
 		$this->rights[$r][0] = 1201;
@@ -93,6 +93,6 @@ 
 
 		// Menus
 		//-------
-		$this->menu = 1;        // This module add menu entries. They are coded into menu manager.
+		$this->menu = 1; // This module add menu entries. They are coded into menu manager.
 	}
 }

dolibarr/htdocs/core/modules/export/export_excel2007.modules.php

Indentation +60 added lines, -60 removed lines

@@ -33,104 +33,104 @@
  */
 class ExportExcel2007 extends ExportExcel
 {
-	/**
-	 * @var int ID
-	 */
-	public $id;
+    /**
+     * @var int ID
+     */
+    public $id;
 
-	/**
+    /**
      * @var string label
      */
     public $label;
 
-	public $extension;
+    public $extension;
 
-	/**
+    /**
      * Dolibarr version of the loaded document
      * @public string
      */
-	public $version = 'dolibarr';
+    public $version = 'dolibarr';
 
-	public $label_lib;
+    public $label_lib;
 
-	public $version_lib;
+    public $version_lib;
 
-	public $workbook;      // Handle fichier
+    public $workbook;      // Handle fichier
 
-	public $worksheet;     // Handle onglet
+    public $worksheet;     // Handle onglet
 
-	public $row;
+    public $row;
 
-	public $col;
+    public $col;
 
     public $file;          // To save filename
 
-	/**
-	 *	Constructor
-	 *
-	 *	@param	    DoliDB	$db      Database handler
-	 */
-	function __construct($db)
-	{
-		global $conf, $langs;
-		$this->db = $db;
-
-		$this->id='excel2007';                  // Same value then xxx in file name export_xxx.modules.php
-		$this->label='Excel 2007';               // Label of driver
-		$this->desc = $langs->trans('Excel2007FormatDesc');
-		$this->extension='xlsx';             // Extension for generated file by this driver
+    /**
+     *	Constructor
+     *
+     *	@param	    DoliDB	$db      Database handler
+     */
+    function __construct($db)
+    {
+        global $conf, $langs;
+        $this->db = $db;
+
+        $this->id='excel2007';                  // Same value then xxx in file name export_xxx.modules.php
+        $this->label='Excel 2007';               // Label of driver
+        $this->desc = $langs->trans('Excel2007FormatDesc');
+        $this->extension='xlsx';             // Extension for generated file by this driver
         $this->picto='mime/xls';			// Picto
-		$this->version='1.30';             // Driver version
+        $this->version='1.30';             // Driver version
 
-		$this->disabled = (in_array(constant('PHPEXCEL_PATH'),array('disabled','disabled/'))?1:0);	// A condition to disable module (used for native debian packages)
+        $this->disabled = (in_array(constant('PHPEXCEL_PATH'),array('disabled','disabled/'))?1:0);	// A condition to disable module (used for native debian packages)
 
-		if (empty($this->disabled))
-		{
-    		// If driver use an external library, put its name here
-    		if (! empty($conf->global->MAIN_USE_PHP_WRITEEXCEL))
-    		{
-    			require_once PHP_WRITEEXCEL_PATH.'class.writeexcel_workbookbig.inc.php';
+        if (empty($this->disabled))
+        {
+            // If driver use an external library, put its name here
+            if (! empty($conf->global->MAIN_USE_PHP_WRITEEXCEL))
+            {
+                require_once PHP_WRITEEXCEL_PATH.'class.writeexcel_workbookbig.inc.php';
                 require_once PHP_WRITEEXCEL_PATH.'class.writeexcel_worksheet.inc.php';
                 require_once PHP_WRITEEXCEL_PATH.'functions.writeexcel_utility.inc.php';
-    			$this->label_lib='PhpWriteExcel';
+                $this->label_lib='PhpWriteExcel';
                 $this->version_lib='unknown';
-    		}
-    		else
-    		{
+            }
+            else
+            {
                 require_once PHPEXCEL_PATH.'PHPExcel.php';
                 require_once PHPEXCEL_PATH.'PHPExcel/Style/Alignment.php';
-    			$this->label_lib='PhpExcel';
+                $this->label_lib='PhpExcel';
                 $this->version_lib='1.8.0';		// No way to get info from library
-    		}
-		}
+            }
+        }
 
-		$this->row=0;
-	}
+        $this->row=0;
+    }
 
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
     /**
      *  Close Excel file
      *
-	 *  @return		int							<0 if KO, >0 if OK
+     *  @return		int							<0 if KO, >0 if OK
      */
-	function close_file()
-	{
+    function close_file()
+    {
         // phpcs:enable
-		global $conf;
-
-		if (! empty($conf->global->MAIN_USE_PHP_WRITEEXCEL))
-    	{
-	        $this->workbook->close();
-    	}
-    	else
-    	{
+        global $conf;
+
+        if (! empty($conf->global->MAIN_USE_PHP_WRITEEXCEL))
+        {
+            $this->workbook->close();
+        }
+        else
+        {
             require_once PHPEXCEL_PATH.'PHPExcel/Writer/Excel5.php';
-    	    $objWriter = new PHPExcel_Writer_Excel2007($this->workbook);
+            $objWriter = new PHPExcel_Writer_Excel2007($this->workbook);
             $objWriter->save($this->file);
             $this->workbook->disconnectWorksheets();
             unset($this->workbook);
-    	}
-		return 1;
-	}
+        }
+        return 1;
+    }
 }

Spacing +16 added lines, -16 removed lines

@@ -55,15 +55,15 @@ 
 
 	public $version_lib;
 
-	public $workbook;      // Handle fichier
+	public $workbook; // Handle fichier
 
-	public $worksheet;     // Handle onglet
+	public $worksheet; // Handle onglet
 
 	public $row;
 
 	public $col;
 
-    public $file;          // To save filename
+    public $file; // To save filename
 
 	/**
 	 *	Constructor
@@ -75,36 +75,36 @@ 
 		global $conf, $langs;
 		$this->db = $db;
 
-		$this->id='excel2007';                  // Same value then xxx in file name export_xxx.modules.php
-		$this->label='Excel 2007';               // Label of driver
+		$this->id = 'excel2007'; // Same value then xxx in file name export_xxx.modules.php
+		$this->label = 'Excel 2007'; // Label of driver
 		$this->desc = $langs->trans('Excel2007FormatDesc');
-		$this->extension='xlsx';             // Extension for generated file by this driver
-        $this->picto='mime/xls';			// Picto
-		$this->version='1.30';             // Driver version
+		$this->extension = 'xlsx'; // Extension for generated file by this driver
+        $this->picto = 'mime/xls'; // Picto
+		$this->version = '1.30'; // Driver version
 
-		$this->disabled = (in_array(constant('PHPEXCEL_PATH'),array('disabled','disabled/'))?1:0);	// A condition to disable module (used for native debian packages)
+		$this->disabled = (in_array(constant('PHPEXCEL_PATH'), array('disabled', 'disabled/')) ? 1 : 0); // A condition to disable module (used for native debian packages)
 
 		if (empty($this->disabled))
 		{
     		// If driver use an external library, put its name here
-    		if (! empty($conf->global->MAIN_USE_PHP_WRITEEXCEL))
+    		if (!empty($conf->global->MAIN_USE_PHP_WRITEEXCEL))
     		{
     			require_once PHP_WRITEEXCEL_PATH.'class.writeexcel_workbookbig.inc.php';
                 require_once PHP_WRITEEXCEL_PATH.'class.writeexcel_worksheet.inc.php';
                 require_once PHP_WRITEEXCEL_PATH.'functions.writeexcel_utility.inc.php';
-    			$this->label_lib='PhpWriteExcel';
-                $this->version_lib='unknown';
+    			$this->label_lib = 'PhpWriteExcel';
+                $this->version_lib = 'unknown';
     		}
     		else
     		{
                 require_once PHPEXCEL_PATH.'PHPExcel.php';
                 require_once PHPEXCEL_PATH.'PHPExcel/Style/Alignment.php';
-    			$this->label_lib='PhpExcel';
-                $this->version_lib='1.8.0';		// No way to get info from library
+    			$this->label_lib = 'PhpExcel';
+                $this->version_lib = '1.8.0'; // No way to get info from library
     		}
 		}
 
-		$this->row=0;
+		$this->row = 0;
 	}
 
 
@@ -119,7 +119,7 @@ 
         // phpcs:enable
 		global $conf;
 
-		if (! empty($conf->global->MAIN_USE_PHP_WRITEEXCEL))
+		if (!empty($conf->global->MAIN_USE_PHP_WRITEEXCEL))
     	{
 	        $this->workbook->close();
     	}

Braces +2 added lines, -4 removed lines

@@ -94,8 +94,7 @@ 
                 require_once PHP_WRITEEXCEL_PATH.'functions.writeexcel_utility.inc.php';
     			$this->label_lib='PhpWriteExcel';
                 $this->version_lib='unknown';
-    		}
-    		else
+    		} else
     		{
                 require_once PHPEXCEL_PATH.'PHPExcel.php';
                 require_once PHPEXCEL_PATH.'PHPExcel/Style/Alignment.php';
@@ -122,8 +121,7 @@ 
 		if (! empty($conf->global->MAIN_USE_PHP_WRITEEXCEL))
     	{
 	        $this->workbook->close();
-    	}
-    	else
+    	} else
     	{
             require_once PHPEXCEL_PATH.'PHPExcel/Writer/Excel5.php';
     	    $objWriter = new PHPExcel_Writer_Excel2007($this->workbook);

dolibarr/htdocs/core/modules/export/export_excel.modules.php

Indentation +346 added lines, -346 removed lines

@@ -32,208 +32,208 @@ 
  */
 class ExportExcel extends ModeleExports
 {
-	/**
-	 * @var int ID
-	 */
-	public $id;
+    /**
+     * @var int ID
+     */
+    public $id;
 
     /**
      * @var string Export Excel label
      */
     public $label;
 
-	public $extension;
+    public $extension;
 
-	/**
+    /**
      * Dolibarr version of the loaded document
      * @public string
      */
-	public $version = 'dolibarr';
+    public $version = 'dolibarr';
 
-	public $label_lib;
+    public $label_lib;
 
-	public $version_lib;
+    public $version_lib;
 
-	public $workbook;      // Handle file
+    public $workbook;      // Handle file
 
-	public $worksheet;     // Handle sheet
+    public $worksheet;     // Handle sheet
 
-	public $row;
+    public $row;
 
-	public $col;
+    public $col;
 
     public $file;          // To save filename
 
 
-	/**
-	 *	Constructor
-	 *
-	 *	@param	    DoliDB	$db      Database handler
-	 */
-	function __construct($db)
-	{
-		global $conf, $langs;
-		$this->db = $db;
-
-		$this->id='excel';                  // Same value then xxx in file name export_xxx.modules.php
-		$this->label='Excel 95';             // Label of driver
-		$this->desc = $langs->trans('Excel95FormatDesc');
-		$this->extension='xls';             // Extension for generated file by this driver
+    /**
+     *	Constructor
+     *
+     *	@param	    DoliDB	$db      Database handler
+     */
+    function __construct($db)
+    {
+        global $conf, $langs;
+        $this->db = $db;
+
+        $this->id='excel';                  // Same value then xxx in file name export_xxx.modules.php
+        $this->label='Excel 95';             // Label of driver
+        $this->desc = $langs->trans('Excel95FormatDesc');
+        $this->extension='xls';             // Extension for generated file by this driver
         $this->picto='mime/xls';					// Picto
-		$this->version='1.30';             // Driver version
+        $this->version='1.30';             // Driver version
 
-		$this->disabled = (in_array(constant('PHPEXCEL_PATH'),array('disabled','disabled/'))?1:0);	// A condition to disable module (used for native debian packages)
+        $this->disabled = (in_array(constant('PHPEXCEL_PATH'),array('disabled','disabled/'))?1:0);	// A condition to disable module (used for native debian packages)
 
-		if (empty($this->disabled))
-		{
-    		// If driver use an external library, put its name here
-    		if (! empty($conf->global->MAIN_USE_PHP_WRITEEXCEL))
-    		{
-    			require_once PHP_WRITEEXCEL_PATH.'class.writeexcel_workbookbig.inc.php';
+        if (empty($this->disabled))
+        {
+            // If driver use an external library, put its name here
+            if (! empty($conf->global->MAIN_USE_PHP_WRITEEXCEL))
+            {
+                require_once PHP_WRITEEXCEL_PATH.'class.writeexcel_workbookbig.inc.php';
                 require_once PHP_WRITEEXCEL_PATH.'class.writeexcel_worksheet.inc.php';
                 require_once PHP_WRITEEXCEL_PATH.'functions.writeexcel_utility.inc.php';
-    			$this->label_lib='PhpWriteExcel';
+                $this->label_lib='PhpWriteExcel';
                 $this->version_lib='unknown';
-    		}
-    		else
-    		{
+            }
+            else
+            {
                 require_once PHPEXCEL_PATH.'PHPExcel.php';
                 require_once PHPEXCEL_PATH.'PHPExcel/Style/Alignment.php';
-    			$this->label_lib='PhpExcel';
+                $this->label_lib='PhpExcel';
                 $this->version_lib='1.8.0';		// No way to get info from library
-    		}
-		}
-
-		$this->row=0;
-	}
-
-	/**
-	 * getDriverId
-	 *
-	 * @return string
-	 */
-	function getDriverId()
-	{
-		return $this->id;
-	}
-
-	/**
-	 * getDriverLabel
-	 *
-	 * @return 	string			Return driver label
-	 */
-	function getDriverLabel()
-	{
-		return $this->label;
-	}
-
-	/**
-	 * getDriverDesc
-	 *
-	 * @return string
-	 */
-	function getDriverDesc()
+            }
+        }
+
+        $this->row=0;
+    }
+
+    /**
+     * getDriverId
+     *
+     * @return string
+     */
+    function getDriverId()
+    {
+        return $this->id;
+    }
+
+    /**
+     * getDriverLabel
+     *
+     * @return 	string			Return driver label
+     */
+    function getDriverLabel()
+    {
+        return $this->label;
+    }
+
+    /**
+     * getDriverDesc
+     *
+     * @return string
+     */
+    function getDriverDesc()
     {
         return $this->desc;
     }
 
-	/**
-	 * getDriverExtension
-	 *
-	 * @return string
-	 */
+    /**
+     * getDriverExtension
+     *
+     * @return string
+     */
     function getDriverExtension()
-	{
-		return $this->extension;
-	}
-
-	/**
-	 * getDriverVersion
-	 *
-	 * @return string
-	 */
-	function getDriverVersion()
-	{
-		return $this->version;
-	}
-
-	/**
-	 * getLibLabel
-	 *
-	 * @return string
-	 */
-	function getLibLabel()
-	{
-		return $this->label_lib;
-	}
-
-	/**
-	 * getLibVersion
-	 *
-	 * @return string
-	 */
-	function getLibVersion()
-	{
-		return $this->version_lib;
-	}
+    {
+        return $this->extension;
+    }
+
+    /**
+     * getDriverVersion
+     *
+     * @return string
+     */
+    function getDriverVersion()
+    {
+        return $this->version;
+    }
+
+    /**
+     * getLibLabel
+     *
+     * @return string
+     */
+    function getLibLabel()
+    {
+        return $this->label_lib;
+    }
+
+    /**
+     * getLibVersion
+     *
+     * @return string
+     */
+    function getLibVersion()
+    {
+        return $this->version_lib;
+    }
 
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
-	/**
-	 *	Open output file
-	 *
-	 * 	@param		string		$file			File name to generate
-	 *  @param		Translate	$outputlangs	Output language object
-	 *	@return		int							<0 if KO, >=0 if OK
-	 */
-	function open_file($file,$outputlangs)
-	{
+    /**
+     *	Open output file
+     *
+     * 	@param		string		$file			File name to generate
+     *  @param		Translate	$outputlangs	Output language object
+     *	@return		int							<0 if KO, >=0 if OK
+     */
+    function open_file($file,$outputlangs)
+    {
         // phpcs:enable
-		global $user,$conf,$langs;
+        global $user,$conf,$langs;
 
-		if (! empty($conf->global->MAIN_USE_PHP_WRITEEXCEL))
-		{
-		    $outputlangs->charset_output='ISO-8859-1';	// Because Excel 5 format is ISO
-		}
+        if (! empty($conf->global->MAIN_USE_PHP_WRITEEXCEL))
+        {
+            $outputlangs->charset_output='ISO-8859-1';	// Because Excel 5 format is ISO
+        }
 
-		dol_syslog(get_class($this)."::open_file file=".$file);
+        dol_syslog(get_class($this)."::open_file file=".$file);
         $this->file=$file;
 
-		$ret=1;
+        $ret=1;
 
-    	$outputlangs->load("exports");
-		if (! empty($conf->global->MAIN_USE_PHP_WRITEEXCEL))
-		{
+        $outputlangs->load("exports");
+        if (! empty($conf->global->MAIN_USE_PHP_WRITEEXCEL))
+        {
             require_once PHP_WRITEEXCEL_PATH.'class.writeexcel_workbookbig.inc.php';
             require_once PHP_WRITEEXCEL_PATH.'class.writeexcel_worksheet.inc.php';
             require_once PHP_WRITEEXCEL_PATH.'functions.writeexcel_utility.inc.php';
-		    $this->workbook = new writeexcel_workbookbig($file);
-    		$this->workbook->set_tempdir($conf->export->dir_temp);			// Set temporary directory
-    		$this->workbook->set_sheetname($outputlangs->trans("Sheet"));
-    		$this->worksheet = &$this->workbook->addworksheet();
-		}
-		else
-		{
+            $this->workbook = new writeexcel_workbookbig($file);
+            $this->workbook->set_tempdir($conf->export->dir_temp);			// Set temporary directory
+            $this->workbook->set_sheetname($outputlangs->trans("Sheet"));
+            $this->worksheet = &$this->workbook->addworksheet();
+        }
+        else
+        {
             require_once PHPEXCEL_PATH.'PHPExcel.php';
             require_once PHPEXCEL_PATH.'PHPExcel/Style/Alignment.php';
 
-		    if ($this->id == 'excel2007')
-		    {
-	            if (! class_exists('ZipArchive'))	// For Excel2007, PHPExcel need ZipArchive
-	            {
-	            	$langs->load("errors");
-	            	$this->error=$langs->trans('ErrorPHPNeedModule','zip');
-	            	return -1;
-	            }
-		    }
-
-		    if (!empty($conf->global->MAIN_USE_FILECACHE_EXPORT_EXCEL_DIR)) {
-			    $cacheMethod = PHPExcel_CachedObjectStorageFactory::cache_to_discISAM;
-			    $cacheSettings = array (
-			    		'dir' => $conf->global->MAIN_USE_FILECACHE_EXPORT_EXCEL_DIR
-			    );
-			    PHPExcel_Settings::setCacheStorageMethod($cacheMethod, $cacheSettings);
-		    }
+            if ($this->id == 'excel2007')
+            {
+                if (! class_exists('ZipArchive'))	// For Excel2007, PHPExcel need ZipArchive
+                {
+                    $langs->load("errors");
+                    $this->error=$langs->trans('ErrorPHPNeedModule','zip');
+                    return -1;
+                }
+            }
+
+            if (!empty($conf->global->MAIN_USE_FILECACHE_EXPORT_EXCEL_DIR)) {
+                $cacheMethod = PHPExcel_CachedObjectStorageFactory::cache_to_discISAM;
+                $cacheSettings = array (
+                        'dir' => $conf->global->MAIN_USE_FILECACHE_EXPORT_EXCEL_DIR
+                );
+                PHPExcel_Settings::setCacheStorageMethod($cacheMethod, $cacheSettings);
+            }
 
             $this->workbook = new PHPExcel();
             $this->workbook->getProperties()->setCreator($user->getFullName($outputlangs).' - Dolibarr '.DOL_VERSION);
@@ -245,242 +245,242 @@ 
             $this->workbook->setActiveSheetIndex(0);
             $this->workbook->getActiveSheet()->setTitle($outputlangs->trans("Sheet"));
             $this->workbook->getActiveSheet()->getDefaultRowDimension()->setRowHeight(16);
-		}
-		return $ret;
-	}
+        }
+        return $ret;
+    }
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
-	/**
-	 *  Write header
-	 *
+    /**
+     *  Write header
+     *
      *  @param      Translate	$outputlangs        Object lang to translate values
-	 * 	@return		int								<0 if KO, >0 if OK
-	 */
-	function write_header($outputlangs)
-	{
+     * 	@return		int								<0 if KO, >0 if OK
+     */
+    function write_header($outputlangs)
+    {
         // phpcs:enable
-		//$outputlangs->charset_output='ISO-8859-1';	// Because Excel 5 format is ISO
+        //$outputlangs->charset_output='ISO-8859-1';	// Because Excel 5 format is ISO
 
-		return 0;
-	}
+        return 0;
+    }
 
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
-	/**
+    /**
      *  Output title line into file
      *
      *  @param      array		$array_export_fields_label   	Array with list of label of fields
      *  @param      array		$array_selected_sorted       	Array with list of field to export
      *  @param      Translate	$outputlangs    				Object lang to translate values
      *  @param		array		$array_types					Array with types of fields
-	 * 	@return		int											<0 if KO, >0 if OK
-	 */
-	function write_title($array_export_fields_label,$array_selected_sorted,$outputlangs,$array_types)
-	{
+     * 	@return		int											<0 if KO, >0 if OK
+     */
+    function write_title($array_export_fields_label,$array_selected_sorted,$outputlangs,$array_types)
+    {
         // phpcs:enable
-		global $conf;
-
-		// Create a format for the column headings
-		if (! empty($conf->global->MAIN_USE_PHP_WRITEEXCEL))
-		{
-		    $outputlangs->charset_output='ISO-8859-1';	// Because Excel 5 format is ISO
-
-		    $formatheader =$this->workbook->addformat();
-    		$formatheader->set_bold();
-    		$formatheader->set_color('blue');
-    		//$formatheader->set_size(12);
-    		//$formatheader->set_font("Courier New");
-    		//$formatheader->set_align('center');
-		}
-		else
-		{
+        global $conf;
+
+        // Create a format for the column headings
+        if (! empty($conf->global->MAIN_USE_PHP_WRITEEXCEL))
+        {
+            $outputlangs->charset_output='ISO-8859-1';	// Because Excel 5 format is ISO
+
+            $formatheader =$this->workbook->addformat();
+            $formatheader->set_bold();
+            $formatheader->set_color('blue');
+            //$formatheader->set_size(12);
+            //$formatheader->set_font("Courier New");
+            //$formatheader->set_align('center');
+        }
+        else
+        {
             $this->workbook->getActiveSheet()->getStyle('1')->getFont()->setBold(true);
-		    $this->workbook->getActiveSheet()->getStyle('1')->getAlignment()->setHorizontal(PHPExcel_Style_Alignment::HORIZONTAL_LEFT);
-		}
+            $this->workbook->getActiveSheet()->getStyle('1')->getAlignment()->setHorizontal(PHPExcel_Style_Alignment::HORIZONTAL_LEFT);
+        }
 
-		$this->col=0;
-		foreach($array_selected_sorted as $code => $value)
-		{
+        $this->col=0;
+        foreach($array_selected_sorted as $code => $value)
+        {
             $alias=$array_export_fields_label[$code];
-			//print "dd".$alias;
-			if (empty($alias)) dol_print_error('','Bad value for field with code='.$code.'. Try to redefine export.');
-    		if (! empty($conf->global->MAIN_USE_PHP_WRITEEXCEL))
-    		{
-    			$this->worksheet->write($this->row, $this->col, $outputlangs->transnoentities($alias), $formatheader);
-    		}
-    		else
-    		{
+            //print "dd".$alias;
+            if (empty($alias)) dol_print_error('','Bad value for field with code='.$code.'. Try to redefine export.');
+            if (! empty($conf->global->MAIN_USE_PHP_WRITEEXCEL))
+            {
+                $this->worksheet->write($this->row, $this->col, $outputlangs->transnoentities($alias), $formatheader);
+            }
+            else
+            {
                 $this->workbook->getActiveSheet()->SetCellValueByColumnAndRow($this->col, $this->row+1, $outputlangs->transnoentities($alias));
-    		    if (! empty($array_types[$code]) && in_array($array_types[$code],array('Date','Numeric','TextAuto')))		// Set autowidth for some types
+                if (! empty($array_types[$code]) && in_array($array_types[$code],array('Date','Numeric','TextAuto')))		// Set autowidth for some types
                 {
-                	$this->workbook->getActiveSheet()->getColumnDimension($this->column2Letter($this->col + 1))->setAutoSize(true);
+                    $this->workbook->getActiveSheet()->getColumnDimension($this->column2Letter($this->col + 1))->setAutoSize(true);
                 }
-    		}
-			$this->col++;
-		}
-		$this->row++;
-		return 0;
-	}
+            }
+            $this->col++;
+        }
+        $this->row++;
+        return 0;
+    }
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
-	/**
+    /**
      *  Output record line into file
      *
      *  @param      array		$array_selected_sorted      Array with list of field to export
      *  @param      resource	$objp                       A record from a fetch with all fields from select
      *  @param      Translate	$outputlangs                Object lang to translate values
      *  @param		array		$array_types				Array with types of fields
-	 * 	@return		int										<0 if KO, >0 if OK
-	 */
-	function write_record($array_selected_sorted,$objp,$outputlangs,$array_types)
-	{
+     * 	@return		int										<0 if KO, >0 if OK
+     */
+    function write_record($array_selected_sorted,$objp,$outputlangs,$array_types)
+    {
         // phpcs:enable
-		global $conf;
+        global $conf;
 
-		// Create a format for the column headings
-		if (! empty($conf->global->MAIN_USE_PHP_WRITEEXCEL))
-		{
-		    $outputlangs->charset_output='ISO-8859-1';	// Because Excel 5 format is ISO
-		}
+        // Create a format for the column headings
+        if (! empty($conf->global->MAIN_USE_PHP_WRITEEXCEL))
+        {
+            $outputlangs->charset_output='ISO-8859-1';	// Because Excel 5 format is ISO
+        }
 
-		// Define first row
-		$this->col=0;
+        // Define first row
+        $this->col=0;
 
-		foreach($array_selected_sorted as $code => $value)
-		{
-			if (strpos($code,' as ') == 0) $alias=str_replace(array('.','-','(',')'),'_',$code);
-			else $alias=substr($code, strpos($code, ' as ') + 4);
+        foreach($array_selected_sorted as $code => $value)
+        {
+            if (strpos($code,' as ') == 0) $alias=str_replace(array('.','-','(',')'),'_',$code);
+            else $alias=substr($code, strpos($code, ' as ') + 4);
             if (empty($alias)) dol_print_error('','Bad value for field with code='.$code.'. Try to redefine export.');
             $newvalue=$objp->$alias;
 
-			$newvalue=$this->excel_clean($newvalue);
-			$typefield=isset($array_types[$code])?$array_types[$code]:'';
-
-			if (preg_match('/^Select:/i', $typefield, $reg) && $typefield = substr($typefield, 7))
-			{
-				$array = unserialize($typefield);
-				$array = $array['options'];
-				$newvalue = $array[$newvalue];
-			}
-
-			// Traduction newvalue
-			if (preg_match('/^\((.*)\)$/i',$newvalue,$reg))
-			{
-				$newvalue=$outputlangs->transnoentities($reg[1]);
-			}
-			else
-			{
-				$newvalue=$outputlangs->convToOutputCharset($newvalue);
-			}
-
-			if (preg_match('/^[0-9][0-9][0-9][0-9]-[0-9][0-9]-[0-9][0-9]$/i',$newvalue))
-			{
-        		if (! empty($conf->global->MAIN_USE_PHP_WRITEEXCEL))
-        		{
-            		$formatdate=$this->workbook->addformat();
-            		$formatdate->set_num_format('yyyy-mm-dd');
-            		//$formatdate->set_num_format(0x0f);
-        		    $arrayvalue=preg_split('/[.,]/',xl_parse_date($newvalue));
-    				//print "x".$arrayvalue[0].'.'.strval($arrayvalue[1]).'<br>';
-    				$newvalue=strval($arrayvalue[0]).'.'.strval($arrayvalue[1]);	// $newvalue=strval(36892.521); directly does not work because . will be convert into , later
-        		    $this->worksheet->write($this->row, $this->col, $newvalue, PHPExcel_Shared_Date::PHPToExcel($formatdate));
-        		}
-        		else
-        		{
-        		    $newvalue=dol_stringtotime($newvalue);
-        		    $this->workbook->getActiveSheet()->SetCellValueByColumnAndRow($this->col, $this->row+1, PHPExcel_Shared_Date::PHPToExcel($newvalue));
-        		    $coord=$this->workbook->getActiveSheet()->getCellByColumnAndRow($this->col, $this->row+1)->getCoordinate();
-        		    $this->workbook->getActiveSheet()->getStyle($coord)->getNumberFormat()->setFormatCode('yyyy-mm-dd');
-        		}
-			}
-			elseif (preg_match('/^[0-9][0-9][0-9][0-9]-[0-9][0-9]-[0-9][0-9] [0-9][0-9]:[0-9][0-9]:[0-9][0-9]$/i',$newvalue))
-			{
-				if (! empty($conf->global->MAIN_USE_PHP_WRITEEXCEL))
-    		    {
-            		$formatdatehour=$this->workbook->addformat();
-            		$formatdatehour->set_num_format('yyyy-mm-dd hh:mm:ss');
-            		//$formatdatehour->set_num_format(0x0f);
-            		$arrayvalue=preg_split('/[.,]/',xl_parse_date($newvalue));
-    				//print "x".$arrayvalue[0].'.'.strval($arrayvalue[1]).'<br>';
-    				$newvalue=strval($arrayvalue[0]).'.'.strval($arrayvalue[1]);	// $newvalue=strval(36892.521); directly does not work because . will be convert into , later
-    		        $this->worksheet->write($this->row, $this->col, $newvalue, $formatdatehour);
-    		    }
-    		    else
-    		    {
-        		    $newvalue=dol_stringtotime($newvalue);
-    		        $this->workbook->getActiveSheet()->SetCellValueByColumnAndRow($this->col, $this->row+1, PHPExcel_Shared_Date::PHPToExcel($newvalue));
-        		    $coord=$this->workbook->getActiveSheet()->getCellByColumnAndRow($this->col, $this->row+1)->getCoordinate();
-        		    $this->workbook->getActiveSheet()->getStyle($coord)->getNumberFormat()->setFormatCode('yyyy-mm-dd h:mm:ss');
-    		    }
-			}
-			else
-			{
-				if (! empty($conf->global->MAIN_USE_PHP_WRITEEXCEL))
-    		    {
-			        $this->worksheet->write($this->row, $this->col, $newvalue);
-    		    }
-    		    else
-				{
-    		    	if ($typefield == 'Text' || $typefield == 'TextAuto')
-    		    	{
-    		    		//$this->workbook->getActiveSheet()->getCellByColumnAndRow($this->col, $this->row+1)->setValueExplicit($newvalue, PHPExcel_Cell_DataType::TYPE_STRING);
-						$this->workbook->getActiveSheet()->SetCellValueByColumnAndRow($this->col, $this->row+1, (string) $newvalue);
-    		    		$coord=$this->workbook->getActiveSheet()->getCellByColumnAndRow($this->col, $this->row+1)->getCoordinate();
-    		    		$this->workbook->getActiveSheet()->getStyle($coord)->getNumberFormat()->setFormatCode('@');
-    		    		$this->workbook->getActiveSheet()->getStyle($coord)->getAlignment()->setHorizontal(PHPExcel_Style_Alignment::HORIZONTAL_LEFT);
-    		    	}
-    		    	else
-    		    	{
-    		    		$this->workbook->getActiveSheet()->SetCellValueByColumnAndRow($this->col, $this->row+1, $newvalue);
-    		    	}
-    		    }
-			}
-			$this->col++;
-		}
-		$this->row++;
-		return 0;
-	}
+            $newvalue=$this->excel_clean($newvalue);
+            $typefield=isset($array_types[$code])?$array_types[$code]:'';
+
+            if (preg_match('/^Select:/i', $typefield, $reg) && $typefield = substr($typefield, 7))
+            {
+                $array = unserialize($typefield);
+                $array = $array['options'];
+                $newvalue = $array[$newvalue];
+            }
+
+            // Traduction newvalue
+            if (preg_match('/^\((.*)\)$/i',$newvalue,$reg))
+            {
+                $newvalue=$outputlangs->transnoentities($reg[1]);
+            }
+            else
+            {
+                $newvalue=$outputlangs->convToOutputCharset($newvalue);
+            }
+
+            if (preg_match('/^[0-9][0-9][0-9][0-9]-[0-9][0-9]-[0-9][0-9]$/i',$newvalue))
+            {
+                if (! empty($conf->global->MAIN_USE_PHP_WRITEEXCEL))
+                {
+                    $formatdate=$this->workbook->addformat();
+                    $formatdate->set_num_format('yyyy-mm-dd');
+                    //$formatdate->set_num_format(0x0f);
+                    $arrayvalue=preg_split('/[.,]/',xl_parse_date($newvalue));
+                    //print "x".$arrayvalue[0].'.'.strval($arrayvalue[1]).'<br>';
+                    $newvalue=strval($arrayvalue[0]).'.'.strval($arrayvalue[1]);	// $newvalue=strval(36892.521); directly does not work because . will be convert into , later
+                    $this->worksheet->write($this->row, $this->col, $newvalue, PHPExcel_Shared_Date::PHPToExcel($formatdate));
+                }
+                else
+                {
+                    $newvalue=dol_stringtotime($newvalue);
+                    $this->workbook->getActiveSheet()->SetCellValueByColumnAndRow($this->col, $this->row+1, PHPExcel_Shared_Date::PHPToExcel($newvalue));
+                    $coord=$this->workbook->getActiveSheet()->getCellByColumnAndRow($this->col, $this->row+1)->getCoordinate();
+                    $this->workbook->getActiveSheet()->getStyle($coord)->getNumberFormat()->setFormatCode('yyyy-mm-dd');
+                }
+            }
+            elseif (preg_match('/^[0-9][0-9][0-9][0-9]-[0-9][0-9]-[0-9][0-9] [0-9][0-9]:[0-9][0-9]:[0-9][0-9]$/i',$newvalue))
+            {
+                if (! empty($conf->global->MAIN_USE_PHP_WRITEEXCEL))
+                {
+                    $formatdatehour=$this->workbook->addformat();
+                    $formatdatehour->set_num_format('yyyy-mm-dd hh:mm:ss');
+                    //$formatdatehour->set_num_format(0x0f);
+                    $arrayvalue=preg_split('/[.,]/',xl_parse_date($newvalue));
+                    //print "x".$arrayvalue[0].'.'.strval($arrayvalue[1]).'<br>';
+                    $newvalue=strval($arrayvalue[0]).'.'.strval($arrayvalue[1]);	// $newvalue=strval(36892.521); directly does not work because . will be convert into , later
+                    $this->worksheet->write($this->row, $this->col, $newvalue, $formatdatehour);
+                }
+                else
+                {
+                    $newvalue=dol_stringtotime($newvalue);
+                    $this->workbook->getActiveSheet()->SetCellValueByColumnAndRow($this->col, $this->row+1, PHPExcel_Shared_Date::PHPToExcel($newvalue));
+                    $coord=$this->workbook->getActiveSheet()->getCellByColumnAndRow($this->col, $this->row+1)->getCoordinate();
+                    $this->workbook->getActiveSheet()->getStyle($coord)->getNumberFormat()->setFormatCode('yyyy-mm-dd h:mm:ss');
+                }
+            }
+            else
+            {
+                if (! empty($conf->global->MAIN_USE_PHP_WRITEEXCEL))
+                {
+                    $this->worksheet->write($this->row, $this->col, $newvalue);
+                }
+                else
+                {
+                    if ($typefield == 'Text' || $typefield == 'TextAuto')
+                    {
+                        //$this->workbook->getActiveSheet()->getCellByColumnAndRow($this->col, $this->row+1)->setValueExplicit($newvalue, PHPExcel_Cell_DataType::TYPE_STRING);
+                        $this->workbook->getActiveSheet()->SetCellValueByColumnAndRow($this->col, $this->row+1, (string) $newvalue);
+                        $coord=$this->workbook->getActiveSheet()->getCellByColumnAndRow($this->col, $this->row+1)->getCoordinate();
+                        $this->workbook->getActiveSheet()->getStyle($coord)->getNumberFormat()->setFormatCode('@');
+                        $this->workbook->getActiveSheet()->getStyle($coord)->getAlignment()->setHorizontal(PHPExcel_Style_Alignment::HORIZONTAL_LEFT);
+                    }
+                    else
+                    {
+                        $this->workbook->getActiveSheet()->SetCellValueByColumnAndRow($this->col, $this->row+1, $newvalue);
+                    }
+                }
+            }
+            $this->col++;
+        }
+        $this->row++;
+        return 0;
+    }
 
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
-	/**
+    /**
      *	Write footer
      *
-	 * 	@param		Translate	$outputlangs	Output language object
-	 * 	@return		int							<0 if KO, >0 if OK
+     * 	@param		Translate	$outputlangs	Output language object
+     * 	@return		int							<0 if KO, >0 if OK
      */
-	function write_footer($outputlangs)
-	{
+    function write_footer($outputlangs)
+    {
         // phpcs:enable
-		return 0;
-	}
+        return 0;
+    }
 
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
     /**
      *	Close Excel file
      *
-	 * 	@return		int							<0 if KO, >0 if OK
+     * 	@return		int							<0 if KO, >0 if OK
      */
-	function close_file()
-	{
+    function close_file()
+    {
         // phpcs:enable
-		global $conf;
-
-		if (! empty($conf->global->MAIN_USE_PHP_WRITEEXCEL))
-    	{
-	        $this->workbook->close();
-    	}
-    	else
-    	{
+        global $conf;
+
+        if (! empty($conf->global->MAIN_USE_PHP_WRITEEXCEL))
+        {
+            $this->workbook->close();
+        }
+        else
+        {
             require_once PHPEXCEL_PATH.'PHPExcel/Writer/Excel5.php';
-    	    $objWriter = new PHPExcel_Writer_Excel5($this->workbook);
+            $objWriter = new PHPExcel_Writer_Excel5($this->workbook);
             $objWriter->save($this->file);
             $this->workbook->disconnectWorksheets();
             unset($this->workbook);
-    	}
-		return 1;
-	}
+        }
+        return 1;
+    }
 
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
@@ -493,10 +493,10 @@ 
     function excel_clean($newvalue)
     {
         // phpcs:enable
-		// Rule Dolibarr: No HTML
-    	$newvalue=dol_string_nohtmltag($newvalue);
+        // Rule Dolibarr: No HTML
+        $newvalue=dol_string_nohtmltag($newvalue);
 
-    	return $newvalue;
+        return $newvalue;
     }
 
 
@@ -509,16 +509,16 @@ 
     function column2Letter($c)
     {
 
-    	$c = intval($c);
-    	if ($c <= 0) return '';
+        $c = intval($c);
+        if ($c <= 0) return '';
 
-    	while ($c != 0)
-    	{
-    		$p = ($c - 1) % 26;
-    		$c = intval(($c - $p) / 26);
-    		$letter = chr(65 + $p) . $letter;
-    	}
+        while ($c != 0)
+        {
+            $p = ($c - 1) % 26;
+            $c = intval(($c - $p) / 26);
+            $letter = chr(65 + $p) . $letter;
+        }
 
-    	return $letter;
+        return $letter;
     }
 }

Spacing +74 added lines, -74 removed lines

@@ -54,15 +54,15 @@ 
 
 	public $version_lib;
 
-	public $workbook;      // Handle file
+	public $workbook; // Handle file
 
-	public $worksheet;     // Handle sheet
+	public $worksheet; // Handle sheet
 
 	public $row;
 
 	public $col;
 
-    public $file;          // To save filename
+    public $file; // To save filename
 
 
 	/**
@@ -75,36 +75,36 @@ 
 		global $conf, $langs;
 		$this->db = $db;
 
-		$this->id='excel';                  // Same value then xxx in file name export_xxx.modules.php
-		$this->label='Excel 95';             // Label of driver
+		$this->id = 'excel'; // Same value then xxx in file name export_xxx.modules.php
+		$this->label = 'Excel 95'; // Label of driver
 		$this->desc = $langs->trans('Excel95FormatDesc');
-		$this->extension='xls';             // Extension for generated file by this driver
-        $this->picto='mime/xls';					// Picto
-		$this->version='1.30';             // Driver version
+		$this->extension = 'xls'; // Extension for generated file by this driver
+        $this->picto = 'mime/xls'; // Picto
+		$this->version = '1.30'; // Driver version
 
-		$this->disabled = (in_array(constant('PHPEXCEL_PATH'),array('disabled','disabled/'))?1:0);	// A condition to disable module (used for native debian packages)
+		$this->disabled = (in_array(constant('PHPEXCEL_PATH'), array('disabled', 'disabled/')) ? 1 : 0); // A condition to disable module (used for native debian packages)
 
 		if (empty($this->disabled))
 		{
     		// If driver use an external library, put its name here
-    		if (! empty($conf->global->MAIN_USE_PHP_WRITEEXCEL))
+    		if (!empty($conf->global->MAIN_USE_PHP_WRITEEXCEL))
     		{
     			require_once PHP_WRITEEXCEL_PATH.'class.writeexcel_workbookbig.inc.php';
                 require_once PHP_WRITEEXCEL_PATH.'class.writeexcel_worksheet.inc.php';
                 require_once PHP_WRITEEXCEL_PATH.'functions.writeexcel_utility.inc.php';
-    			$this->label_lib='PhpWriteExcel';
-                $this->version_lib='unknown';
+    			$this->label_lib = 'PhpWriteExcel';
+                $this->version_lib = 'unknown';
     		}
     		else
     		{
                 require_once PHPEXCEL_PATH.'PHPExcel.php';
                 require_once PHPEXCEL_PATH.'PHPExcel/Style/Alignment.php';
-    			$this->label_lib='PhpExcel';
-                $this->version_lib='1.8.0';		// No way to get info from library
+    			$this->label_lib = 'PhpExcel';
+                $this->version_lib = '1.8.0'; // No way to get info from library
     		}
 		}
 
-		$this->row=0;
+		$this->row = 0;
 	}
 
 	/**
@@ -186,29 +186,29 @@ 
 	 *  @param		Translate	$outputlangs	Output language object
 	 *	@return		int							<0 if KO, >=0 if OK
 	 */
-	function open_file($file,$outputlangs)
+	function open_file($file, $outputlangs)
 	{
         // phpcs:enable
-		global $user,$conf,$langs;
+		global $user, $conf, $langs;
 
-		if (! empty($conf->global->MAIN_USE_PHP_WRITEEXCEL))
+		if (!empty($conf->global->MAIN_USE_PHP_WRITEEXCEL))
 		{
-		    $outputlangs->charset_output='ISO-8859-1';	// Because Excel 5 format is ISO
+		    $outputlangs->charset_output = 'ISO-8859-1'; // Because Excel 5 format is ISO
 		}
 
 		dol_syslog(get_class($this)."::open_file file=".$file);
-        $this->file=$file;
+        $this->file = $file;
 
-		$ret=1;
+		$ret = 1;
 
     	$outputlangs->load("exports");
-		if (! empty($conf->global->MAIN_USE_PHP_WRITEEXCEL))
+		if (!empty($conf->global->MAIN_USE_PHP_WRITEEXCEL))
 		{
             require_once PHP_WRITEEXCEL_PATH.'class.writeexcel_workbookbig.inc.php';
             require_once PHP_WRITEEXCEL_PATH.'class.writeexcel_worksheet.inc.php';
             require_once PHP_WRITEEXCEL_PATH.'functions.writeexcel_utility.inc.php';
 		    $this->workbook = new writeexcel_workbookbig($file);
-    		$this->workbook->set_tempdir($conf->export->dir_temp);			// Set temporary directory
+    		$this->workbook->set_tempdir($conf->export->dir_temp); // Set temporary directory
     		$this->workbook->set_sheetname($outputlangs->trans("Sheet"));
     		$this->worksheet = &$this->workbook->addworksheet();
 		}
@@ -219,17 +219,17 @@ 
 
 		    if ($this->id == 'excel2007')
 		    {
-	            if (! class_exists('ZipArchive'))	// For Excel2007, PHPExcel need ZipArchive
+	            if (!class_exists('ZipArchive'))	// For Excel2007, PHPExcel need ZipArchive
 	            {
 	            	$langs->load("errors");
-	            	$this->error=$langs->trans('ErrorPHPNeedModule','zip');
+	            	$this->error = $langs->trans('ErrorPHPNeedModule', 'zip');
 	            	return -1;
 	            }
 		    }
 
 		    if (!empty($conf->global->MAIN_USE_FILECACHE_EXPORT_EXCEL_DIR)) {
 			    $cacheMethod = PHPExcel_CachedObjectStorageFactory::cache_to_discISAM;
-			    $cacheSettings = array (
+			    $cacheSettings = array(
 			    		'dir' => $conf->global->MAIN_USE_FILECACHE_EXPORT_EXCEL_DIR
 			    );
 			    PHPExcel_Settings::setCacheStorageMethod($cacheMethod, $cacheSettings);
@@ -275,17 +275,17 @@ 
      *  @param		array		$array_types					Array with types of fields
 	 * 	@return		int											<0 if KO, >0 if OK
 	 */
-	function write_title($array_export_fields_label,$array_selected_sorted,$outputlangs,$array_types)
+	function write_title($array_export_fields_label, $array_selected_sorted, $outputlangs, $array_types)
 	{
         // phpcs:enable
 		global $conf;
 
 		// Create a format for the column headings
-		if (! empty($conf->global->MAIN_USE_PHP_WRITEEXCEL))
+		if (!empty($conf->global->MAIN_USE_PHP_WRITEEXCEL))
 		{
-		    $outputlangs->charset_output='ISO-8859-1';	// Because Excel 5 format is ISO
+		    $outputlangs->charset_output = 'ISO-8859-1'; // Because Excel 5 format is ISO
 
-		    $formatheader =$this->workbook->addformat();
+		    $formatheader = $this->workbook->addformat();
     		$formatheader->set_bold();
     		$formatheader->set_color('blue');
     		//$formatheader->set_size(12);
@@ -298,20 +298,20 @@ 
 		    $this->workbook->getActiveSheet()->getStyle('1')->getAlignment()->setHorizontal(PHPExcel_Style_Alignment::HORIZONTAL_LEFT);
 		}
 
-		$this->col=0;
-		foreach($array_selected_sorted as $code => $value)
+		$this->col = 0;
+		foreach ($array_selected_sorted as $code => $value)
 		{
-            $alias=$array_export_fields_label[$code];
+            $alias = $array_export_fields_label[$code];
 			//print "dd".$alias;
-			if (empty($alias)) dol_print_error('','Bad value for field with code='.$code.'. Try to redefine export.');
-    		if (! empty($conf->global->MAIN_USE_PHP_WRITEEXCEL))
+			if (empty($alias)) dol_print_error('', 'Bad value for field with code='.$code.'. Try to redefine export.');
+    		if (!empty($conf->global->MAIN_USE_PHP_WRITEEXCEL))
     		{
     			$this->worksheet->write($this->row, $this->col, $outputlangs->transnoentities($alias), $formatheader);
     		}
     		else
     		{
-                $this->workbook->getActiveSheet()->SetCellValueByColumnAndRow($this->col, $this->row+1, $outputlangs->transnoentities($alias));
-    		    if (! empty($array_types[$code]) && in_array($array_types[$code],array('Date','Numeric','TextAuto')))		// Set autowidth for some types
+                $this->workbook->getActiveSheet()->SetCellValueByColumnAndRow($this->col, $this->row + 1, $outputlangs->transnoentities($alias));
+    		    if (!empty($array_types[$code]) && in_array($array_types[$code], array('Date', 'Numeric', 'TextAuto')))		// Set autowidth for some types
                 {
                 	$this->workbook->getActiveSheet()->getColumnDimension($this->column2Letter($this->col + 1))->setAutoSize(true);
                 }
@@ -332,29 +332,29 @@ 
      *  @param		array		$array_types				Array with types of fields
 	 * 	@return		int										<0 if KO, >0 if OK
 	 */
-	function write_record($array_selected_sorted,$objp,$outputlangs,$array_types)
+	function write_record($array_selected_sorted, $objp, $outputlangs, $array_types)
 	{
         // phpcs:enable
 		global $conf;
 
 		// Create a format for the column headings
-		if (! empty($conf->global->MAIN_USE_PHP_WRITEEXCEL))
+		if (!empty($conf->global->MAIN_USE_PHP_WRITEEXCEL))
 		{
-		    $outputlangs->charset_output='ISO-8859-1';	// Because Excel 5 format is ISO
+		    $outputlangs->charset_output = 'ISO-8859-1'; // Because Excel 5 format is ISO
 		}
 
 		// Define first row
-		$this->col=0;
+		$this->col = 0;
 
-		foreach($array_selected_sorted as $code => $value)
+		foreach ($array_selected_sorted as $code => $value)
 		{
-			if (strpos($code,' as ') == 0) $alias=str_replace(array('.','-','(',')'),'_',$code);
-			else $alias=substr($code, strpos($code, ' as ') + 4);
-            if (empty($alias)) dol_print_error('','Bad value for field with code='.$code.'. Try to redefine export.');
-            $newvalue=$objp->$alias;
+			if (strpos($code, ' as ') == 0) $alias = str_replace(array('.', '-', '(', ')'), '_', $code);
+			else $alias = substr($code, strpos($code, ' as ') + 4);
+            if (empty($alias)) dol_print_error('', 'Bad value for field with code='.$code.'. Try to redefine export.');
+            $newvalue = $objp->$alias;
 
-			$newvalue=$this->excel_clean($newvalue);
-			$typefield=isset($array_types[$code])?$array_types[$code]:'';
+			$newvalue = $this->excel_clean($newvalue);
+			$typefield = isset($array_types[$code]) ? $array_types[$code] : '';
 
 			if (preg_match('/^Select:/i', $typefield, $reg) && $typefield = substr($typefield, 7))
 			{
@@ -364,58 +364,58 @@ 
 			}
 
 			// Traduction newvalue
-			if (preg_match('/^\((.*)\)$/i',$newvalue,$reg))
+			if (preg_match('/^\((.*)\)$/i', $newvalue, $reg))
 			{
-				$newvalue=$outputlangs->transnoentities($reg[1]);
+				$newvalue = $outputlangs->transnoentities($reg[1]);
 			}
 			else
 			{
-				$newvalue=$outputlangs->convToOutputCharset($newvalue);
+				$newvalue = $outputlangs->convToOutputCharset($newvalue);
 			}
 
-			if (preg_match('/^[0-9][0-9][0-9][0-9]-[0-9][0-9]-[0-9][0-9]$/i',$newvalue))
+			if (preg_match('/^[0-9][0-9][0-9][0-9]-[0-9][0-9]-[0-9][0-9]$/i', $newvalue))
 			{
-        		if (! empty($conf->global->MAIN_USE_PHP_WRITEEXCEL))
+        		if (!empty($conf->global->MAIN_USE_PHP_WRITEEXCEL))
         		{
-            		$formatdate=$this->workbook->addformat();
+            		$formatdate = $this->workbook->addformat();
             		$formatdate->set_num_format('yyyy-mm-dd');
             		//$formatdate->set_num_format(0x0f);
-        		    $arrayvalue=preg_split('/[.,]/',xl_parse_date($newvalue));
+        		    $arrayvalue = preg_split('/[.,]/', xl_parse_date($newvalue));
     				//print "x".$arrayvalue[0].'.'.strval($arrayvalue[1]).'<br>';
-    				$newvalue=strval($arrayvalue[0]).'.'.strval($arrayvalue[1]);	// $newvalue=strval(36892.521); directly does not work because . will be convert into , later
+    				$newvalue = strval($arrayvalue[0]).'.'.strval($arrayvalue[1]); // $newvalue=strval(36892.521); directly does not work because . will be convert into , later
         		    $this->worksheet->write($this->row, $this->col, $newvalue, PHPExcel_Shared_Date::PHPToExcel($formatdate));
         		}
         		else
         		{
-        		    $newvalue=dol_stringtotime($newvalue);
-        		    $this->workbook->getActiveSheet()->SetCellValueByColumnAndRow($this->col, $this->row+1, PHPExcel_Shared_Date::PHPToExcel($newvalue));
-        		    $coord=$this->workbook->getActiveSheet()->getCellByColumnAndRow($this->col, $this->row+1)->getCoordinate();
+        		    $newvalue = dol_stringtotime($newvalue);
+        		    $this->workbook->getActiveSheet()->SetCellValueByColumnAndRow($this->col, $this->row + 1, PHPExcel_Shared_Date::PHPToExcel($newvalue));
+        		    $coord = $this->workbook->getActiveSheet()->getCellByColumnAndRow($this->col, $this->row + 1)->getCoordinate();
         		    $this->workbook->getActiveSheet()->getStyle($coord)->getNumberFormat()->setFormatCode('yyyy-mm-dd');
         		}
 			}
-			elseif (preg_match('/^[0-9][0-9][0-9][0-9]-[0-9][0-9]-[0-9][0-9] [0-9][0-9]:[0-9][0-9]:[0-9][0-9]$/i',$newvalue))
+			elseif (preg_match('/^[0-9][0-9][0-9][0-9]-[0-9][0-9]-[0-9][0-9] [0-9][0-9]:[0-9][0-9]:[0-9][0-9]$/i', $newvalue))
 			{
-				if (! empty($conf->global->MAIN_USE_PHP_WRITEEXCEL))
+				if (!empty($conf->global->MAIN_USE_PHP_WRITEEXCEL))
     		    {
-            		$formatdatehour=$this->workbook->addformat();
+            		$formatdatehour = $this->workbook->addformat();
             		$formatdatehour->set_num_format('yyyy-mm-dd hh:mm:ss');
             		//$formatdatehour->set_num_format(0x0f);
-            		$arrayvalue=preg_split('/[.,]/',xl_parse_date($newvalue));
+            		$arrayvalue = preg_split('/[.,]/', xl_parse_date($newvalue));
     				//print "x".$arrayvalue[0].'.'.strval($arrayvalue[1]).'<br>';
-    				$newvalue=strval($arrayvalue[0]).'.'.strval($arrayvalue[1]);	// $newvalue=strval(36892.521); directly does not work because . will be convert into , later
+    				$newvalue = strval($arrayvalue[0]).'.'.strval($arrayvalue[1]); // $newvalue=strval(36892.521); directly does not work because . will be convert into , later
     		        $this->worksheet->write($this->row, $this->col, $newvalue, $formatdatehour);
     		    }
     		    else
     		    {
-        		    $newvalue=dol_stringtotime($newvalue);
-    		        $this->workbook->getActiveSheet()->SetCellValueByColumnAndRow($this->col, $this->row+1, PHPExcel_Shared_Date::PHPToExcel($newvalue));
-        		    $coord=$this->workbook->getActiveSheet()->getCellByColumnAndRow($this->col, $this->row+1)->getCoordinate();
+        		    $newvalue = dol_stringtotime($newvalue);
+    		        $this->workbook->getActiveSheet()->SetCellValueByColumnAndRow($this->col, $this->row + 1, PHPExcel_Shared_Date::PHPToExcel($newvalue));
+        		    $coord = $this->workbook->getActiveSheet()->getCellByColumnAndRow($this->col, $this->row + 1)->getCoordinate();
         		    $this->workbook->getActiveSheet()->getStyle($coord)->getNumberFormat()->setFormatCode('yyyy-mm-dd h:mm:ss');
     		    }
 			}
 			else
 			{
-				if (! empty($conf->global->MAIN_USE_PHP_WRITEEXCEL))
+				if (!empty($conf->global->MAIN_USE_PHP_WRITEEXCEL))
     		    {
 			        $this->worksheet->write($this->row, $this->col, $newvalue);
     		    }
@@ -424,14 +424,14 @@ 
     		    	if ($typefield == 'Text' || $typefield == 'TextAuto')
     		    	{
     		    		//$this->workbook->getActiveSheet()->getCellByColumnAndRow($this->col, $this->row+1)->setValueExplicit($newvalue, PHPExcel_Cell_DataType::TYPE_STRING);
-						$this->workbook->getActiveSheet()->SetCellValueByColumnAndRow($this->col, $this->row+1, (string) $newvalue);
-    		    		$coord=$this->workbook->getActiveSheet()->getCellByColumnAndRow($this->col, $this->row+1)->getCoordinate();
+						$this->workbook->getActiveSheet()->SetCellValueByColumnAndRow($this->col, $this->row + 1, (string) $newvalue);
+    		    		$coord = $this->workbook->getActiveSheet()->getCellByColumnAndRow($this->col, $this->row + 1)->getCoordinate();
     		    		$this->workbook->getActiveSheet()->getStyle($coord)->getNumberFormat()->setFormatCode('@');
     		    		$this->workbook->getActiveSheet()->getStyle($coord)->getAlignment()->setHorizontal(PHPExcel_Style_Alignment::HORIZONTAL_LEFT);
     		    	}
     		    	else
     		    	{
-    		    		$this->workbook->getActiveSheet()->SetCellValueByColumnAndRow($this->col, $this->row+1, $newvalue);
+    		    		$this->workbook->getActiveSheet()->SetCellValueByColumnAndRow($this->col, $this->row + 1, $newvalue);
     		    	}
     		    }
 			}
@@ -467,7 +467,7 @@ 
         // phpcs:enable
 		global $conf;
 
-		if (! empty($conf->global->MAIN_USE_PHP_WRITEEXCEL))
+		if (!empty($conf->global->MAIN_USE_PHP_WRITEEXCEL))
     	{
 	        $this->workbook->close();
     	}
@@ -494,7 +494,7 @@ 
     {
         // phpcs:enable
 		// Rule Dolibarr: No HTML
-    	$newvalue=dol_string_nohtmltag($newvalue);
+    	$newvalue = dol_string_nohtmltag($newvalue);
 
     	return $newvalue;
     }
@@ -516,7 +516,7 @@ 
     	{
     		$p = ($c - 1) % 26;
     		$c = intval(($c - $p) / 26);
-    		$letter = chr(65 + $p) . $letter;
+    		$letter = chr(65 + $p).$letter;
     	}
 
     	return $letter;

Braces +32 added lines, -31 removed lines

@@ -94,8 +94,7 @@ 
                 require_once PHP_WRITEEXCEL_PATH.'functions.writeexcel_utility.inc.php';
     			$this->label_lib='PhpWriteExcel';
                 $this->version_lib='unknown';
-    		}
-    		else
+    		} else
     		{
                 require_once PHPEXCEL_PATH.'PHPExcel.php';
                 require_once PHPEXCEL_PATH.'PHPExcel/Style/Alignment.php';
@@ -211,17 +210,18 @@ 
     		$this->workbook->set_tempdir($conf->export->dir_temp);			// Set temporary directory
     		$this->workbook->set_sheetname($outputlangs->trans("Sheet"));
     		$this->worksheet = &$this->workbook->addworksheet();
-		}
-		else
+		} else
 		{
             require_once PHPEXCEL_PATH.'PHPExcel.php';
             require_once PHPEXCEL_PATH.'PHPExcel/Style/Alignment.php';
 
 		    if ($this->id == 'excel2007')
 		    {
-	            if (! class_exists('ZipArchive'))	// For Excel2007, PHPExcel need ZipArchive
+	            if (! class_exists('ZipArchive')) {
+	                // For Excel2007, PHPExcel need ZipArchive
 	            {
 	            	$langs->load("errors");
+	            }
 	            	$this->error=$langs->trans('ErrorPHPNeedModule','zip');
 	            	return -1;
 	            }
@@ -291,8 +291,7 @@ 
     		//$formatheader->set_size(12);
     		//$formatheader->set_font("Courier New");
     		//$formatheader->set_align('center');
-		}
-		else
+		} else
 		{
             $this->workbook->getActiveSheet()->getStyle('1')->getFont()->setBold(true);
 		    $this->workbook->getActiveSheet()->getStyle('1')->getAlignment()->setHorizontal(PHPExcel_Style_Alignment::HORIZONTAL_LEFT);
@@ -303,17 +302,20 @@ 
 		{
             $alias=$array_export_fields_label[$code];
 			//print "dd".$alias;
-			if (empty($alias)) dol_print_error('','Bad value for field with code='.$code.'. Try to redefine export.');
+			if (empty($alias)) {
+			    dol_print_error('','Bad value for field with code='.$code.'. Try to redefine export.');
+			}
     		if (! empty($conf->global->MAIN_USE_PHP_WRITEEXCEL))
     		{
     			$this->worksheet->write($this->row, $this->col, $outputlangs->transnoentities($alias), $formatheader);
-    		}
-    		else
+    		} else
     		{
                 $this->workbook->getActiveSheet()->SetCellValueByColumnAndRow($this->col, $this->row+1, $outputlangs->transnoentities($alias));
-    		    if (! empty($array_types[$code]) && in_array($array_types[$code],array('Date','Numeric','TextAuto')))		// Set autowidth for some types
+    		    if (! empty($array_types[$code]) && in_array($array_types[$code],array('Date','Numeric','TextAuto'))) {
+    		        // Set autowidth for some types
                 {
                 	$this->workbook->getActiveSheet()->getColumnDimension($this->column2Letter($this->col + 1))->setAutoSize(true);
+    		    }
                 }
     		}
 			$this->col++;
@@ -348,9 +350,14 @@ 
 
 		foreach($array_selected_sorted as $code => $value)
 		{
-			if (strpos($code,' as ') == 0) $alias=str_replace(array('.','-','(',')'),'_',$code);
-			else $alias=substr($code, strpos($code, ' as ') + 4);
-            if (empty($alias)) dol_print_error('','Bad value for field with code='.$code.'. Try to redefine export.');
+			if (strpos($code,' as ') == 0) {
+			    $alias=str_replace(array('.','-','(',')'),'_',$code);
+			} else {
+			    $alias=substr($code, strpos($code, ' as ') + 4);
+			}
+            if (empty($alias)) {
+                dol_print_error('','Bad value for field with code='.$code.'. Try to redefine export.');
+            }
             $newvalue=$objp->$alias;
 
 			$newvalue=$this->excel_clean($newvalue);
@@ -367,8 +374,7 @@ 
 			if (preg_match('/^\((.*)\)$/i',$newvalue,$reg))
 			{
 				$newvalue=$outputlangs->transnoentities($reg[1]);
-			}
-			else
+			} else
 			{
 				$newvalue=$outputlangs->convToOutputCharset($newvalue);
 			}
@@ -384,16 +390,14 @@ 
     				//print "x".$arrayvalue[0].'.'.strval($arrayvalue[1]).'<br>';
     				$newvalue=strval($arrayvalue[0]).'.'.strval($arrayvalue[1]);	// $newvalue=strval(36892.521); directly does not work because . will be convert into , later
         		    $this->worksheet->write($this->row, $this->col, $newvalue, PHPExcel_Shared_Date::PHPToExcel($formatdate));
-        		}
-        		else
+        		} else
         		{
         		    $newvalue=dol_stringtotime($newvalue);
         		    $this->workbook->getActiveSheet()->SetCellValueByColumnAndRow($this->col, $this->row+1, PHPExcel_Shared_Date::PHPToExcel($newvalue));
         		    $coord=$this->workbook->getActiveSheet()->getCellByColumnAndRow($this->col, $this->row+1)->getCoordinate();
         		    $this->workbook->getActiveSheet()->getStyle($coord)->getNumberFormat()->setFormatCode('yyyy-mm-dd');
         		}
-			}
-			elseif (preg_match('/^[0-9][0-9][0-9][0-9]-[0-9][0-9]-[0-9][0-9] [0-9][0-9]:[0-9][0-9]:[0-9][0-9]$/i',$newvalue))
+			} elseif (preg_match('/^[0-9][0-9][0-9][0-9]-[0-9][0-9]-[0-9][0-9] [0-9][0-9]:[0-9][0-9]:[0-9][0-9]$/i',$newvalue))
 			{
 				if (! empty($conf->global->MAIN_USE_PHP_WRITEEXCEL))
     		    {
@@ -404,22 +408,19 @@ 
     				//print "x".$arrayvalue[0].'.'.strval($arrayvalue[1]).'<br>';
     				$newvalue=strval($arrayvalue[0]).'.'.strval($arrayvalue[1]);	// $newvalue=strval(36892.521); directly does not work because . will be convert into , later
     		        $this->worksheet->write($this->row, $this->col, $newvalue, $formatdatehour);
-    		    }
-    		    else
+    		    } else
     		    {
         		    $newvalue=dol_stringtotime($newvalue);
     		        $this->workbook->getActiveSheet()->SetCellValueByColumnAndRow($this->col, $this->row+1, PHPExcel_Shared_Date::PHPToExcel($newvalue));
         		    $coord=$this->workbook->getActiveSheet()->getCellByColumnAndRow($this->col, $this->row+1)->getCoordinate();
         		    $this->workbook->getActiveSheet()->getStyle($coord)->getNumberFormat()->setFormatCode('yyyy-mm-dd h:mm:ss');
     		    }
-			}
-			else
+			} else
 			{
 				if (! empty($conf->global->MAIN_USE_PHP_WRITEEXCEL))
     		    {
 			        $this->worksheet->write($this->row, $this->col, $newvalue);
-    		    }
-    		    else
+    		    } else
 				{
     		    	if ($typefield == 'Text' || $typefield == 'TextAuto')
     		    	{
@@ -428,8 +429,7 @@ 
     		    		$coord=$this->workbook->getActiveSheet()->getCellByColumnAndRow($this->col, $this->row+1)->getCoordinate();
     		    		$this->workbook->getActiveSheet()->getStyle($coord)->getNumberFormat()->setFormatCode('@');
     		    		$this->workbook->getActiveSheet()->getStyle($coord)->getAlignment()->setHorizontal(PHPExcel_Style_Alignment::HORIZONTAL_LEFT);
-    		    	}
-    		    	else
+    		    	} else
     		    	{
     		    		$this->workbook->getActiveSheet()->SetCellValueByColumnAndRow($this->col, $this->row+1, $newvalue);
     		    	}
@@ -470,8 +470,7 @@ 
 		if (! empty($conf->global->MAIN_USE_PHP_WRITEEXCEL))
     	{
 	        $this->workbook->close();
-    	}
-    	else
+    	} else
     	{
             require_once PHPEXCEL_PATH.'PHPExcel/Writer/Excel5.php';
     	    $objWriter = new PHPExcel_Writer_Excel5($this->workbook);
@@ -510,7 +509,9 @@ 
     {
 
     	$c = intval($c);
-    	if ($c <= 0) return '';
+    	if ($c <= 0) {
+    	    return '';
+    	}
 
     	while ($c != 0)
     	{

dolibarr/htdocs/core/modules/export/export_csv.modules.php

Indentation +284 added lines, -284 removed lines

@@ -30,208 +30,208 @@ 
  */
 class ExportCsv extends ModeleExports
 {
-	/**
-	 * @var int ID
-	 */
-	public $id;
+    /**
+     * @var int ID
+     */
+    public $id;
 
-	/**
+    /**
      * @var string export files label
      */
     public $label;
 
-	public $extension;
+    public $extension;
 
-	/**
+    /**
      * Dolibarr version of the loaded document
      * @public string
      */
-	public $version = 'dolibarr';
-
-	public $label_lib;
-
-	public $version_lib;
-
-	public $separator;
-
-	public $handle;    // Handle fichier
-
-
-	/**
-	 *	Constructor
-	 *
-	 *	@param	    DoliDB	$db      Database handler
-	 */
-	function __construct($db)
-	{
-		global $conf, $langs;
-		$this->db = $db;
-
-		$this->separator=',';
-		if (! empty($conf->global->EXPORT_CSV_SEPARATOR_TO_USE)) $this->separator=$conf->global->EXPORT_CSV_SEPARATOR_TO_USE;
-		$this->escape='"';
-		$this->enclosure='"';
-
-		$this->id='csv';                // Same value then xxx in file name export_xxx.modules.php
-		$this->label = 'CSV';             // Label of driver
-		$this->desc=$langs->trans("CSVFormatDesc",$this->separator,$this->enclosure,$this->escape);
-		$this->extension='csv';         // Extension for generated file by this driver
-		$this->picto='mime/other';		// Picto
-		$this->version='1.32';         // Driver version
-
-		// If driver use an external library, put its name here
-		$this->label_lib='Dolibarr';
-		$this->version_lib=DOL_VERSION;
-	}
-
-	/**
-	 * getDriverId
-	 *
-	 * @return string
-	 */
-	function getDriverId()
-	{
-		return $this->id;
-	}
-
-	/**
-	 * getDriverLabel
-	 *
-	 * @return 	string			Return driver label
-	 */
-	function getDriverLabel()
-	{
-		return $this->label;
-	}
-
-	/**
-	 * getDriverDesc
-	 *
-	 * @return string
-	 */
-	function getDriverDesc()
-	{
-		return $this->desc;
-	}
-
-	/**
-	 * getDriverExtension
-	 *
-	 * @return string
-	 */
-	function getDriverExtension()
-	{
-		return $this->extension;
-	}
-
-	/**
-	 * getDriverVersion
-	 *
-	 * @return string
-	 */
-	function getDriverVersion()
-	{
-		return $this->version;
-	}
-
-	/**
-	 * getLabelLabel
-	 *
-	 * @return string
-	 */
-	function getLibLabel()
-	{
-		return $this->label_lib;
-	}
-
-	/**
-	 * getLibVersion
-	 *
-	 * @return string
-	 */
-	function getLibVersion()
-	{
-		return $this->version_lib;
-	}
+    public $version = 'dolibarr';
+
+    public $label_lib;
+
+    public $version_lib;
+
+    public $separator;
+
+    public $handle;    // Handle fichier
+
+
+    /**
+     *	Constructor
+     *
+     *	@param	    DoliDB	$db      Database handler
+     */
+    function __construct($db)
+    {
+        global $conf, $langs;
+        $this->db = $db;
+
+        $this->separator=',';
+        if (! empty($conf->global->EXPORT_CSV_SEPARATOR_TO_USE)) $this->separator=$conf->global->EXPORT_CSV_SEPARATOR_TO_USE;
+        $this->escape='"';
+        $this->enclosure='"';
+
+        $this->id='csv';                // Same value then xxx in file name export_xxx.modules.php
+        $this->label = 'CSV';             // Label of driver
+        $this->desc=$langs->trans("CSVFormatDesc",$this->separator,$this->enclosure,$this->escape);
+        $this->extension='csv';         // Extension for generated file by this driver
+        $this->picto='mime/other';		// Picto
+        $this->version='1.32';         // Driver version
+
+        // If driver use an external library, put its name here
+        $this->label_lib='Dolibarr';
+        $this->version_lib=DOL_VERSION;
+    }
+
+    /**
+     * getDriverId
+     *
+     * @return string
+     */
+    function getDriverId()
+    {
+        return $this->id;
+    }
+
+    /**
+     * getDriverLabel
+     *
+     * @return 	string			Return driver label
+     */
+    function getDriverLabel()
+    {
+        return $this->label;
+    }
+
+    /**
+     * getDriverDesc
+     *
+     * @return string
+     */
+    function getDriverDesc()
+    {
+        return $this->desc;
+    }
+
+    /**
+     * getDriverExtension
+     *
+     * @return string
+     */
+    function getDriverExtension()
+    {
+        return $this->extension;
+    }
+
+    /**
+     * getDriverVersion
+     *
+     * @return string
+     */
+    function getDriverVersion()
+    {
+        return $this->version;
+    }
+
+    /**
+     * getLabelLabel
+     *
+     * @return string
+     */
+    function getLibLabel()
+    {
+        return $this->label_lib;
+    }
+
+    /**
+     * getLibVersion
+     *
+     * @return string
+     */
+    function getLibVersion()
+    {
+        return $this->version_lib;
+    }
 
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
-	/**
-	 *	Open output file
-	 *
-	 *	@param		string		$file			Path of filename to generate
-	 * 	@param		Translate	$outputlangs	Output language object
-	 *	@return		int							<0 if KO, >=0 if OK
-	 */
-	function open_file($file,$outputlangs)
-	{
+    /**
+     *	Open output file
+     *
+     *	@param		string		$file			Path of filename to generate
+     * 	@param		Translate	$outputlangs	Output language object
+     *	@return		int							<0 if KO, >=0 if OK
+     */
+    function open_file($file,$outputlangs)
+    {
         // phpcs:enable
-		global $langs;
+        global $langs;
 
-		dol_syslog("ExportCsv::open_file file=".$file);
+        dol_syslog("ExportCsv::open_file file=".$file);
 
-		$ret=1;
+        $ret=1;
 
-		$outputlangs->load("exports");
-		$this->handle = fopen($file, "wt");
-		if (! $this->handle)
-		{
-			$langs->load("errors");
-			$this->error=$langs->trans("ErrorFailToCreateFile",$file);
-			$ret=-1;
-		}
+        $outputlangs->load("exports");
+        $this->handle = fopen($file, "wt");
+        if (! $this->handle)
+        {
+            $langs->load("errors");
+            $this->error=$langs->trans("ErrorFailToCreateFile",$file);
+            $ret=-1;
+        }
 
-		return $ret;
-	}
+        return $ret;
+    }
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
-	/**
-	 * 	Output header into file
-	 *
-	 * 	@param		Translate	$outputlangs	Output language object
-	 * 	@return		int							<0 if KO, >0 if OK
-	 */
-	function write_header($outputlangs)
-	{
+    /**
+     * 	Output header into file
+     *
+     * 	@param		Translate	$outputlangs	Output language object
+     * 	@return		int							<0 if KO, >0 if OK
+     */
+    function write_header($outputlangs)
+    {
         // phpcs:enable
-		return 0;
-	}
+        return 0;
+    }
 
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
-	/**
-	 * 	Output title line into file
-	 *
+    /**
+     * 	Output title line into file
+     *
      *  @param      array		$array_export_fields_label   	Array with list of label of fields
      *  @param      array		$array_selected_sorted       	Array with list of field to export
      *  @param      Translate	$outputlangs    				Object lang to translate values
      *  @param		array		$array_types					Array with types of fields
-	 * 	@return		int											<0 if KO, >0 if OK
-	 */
-	function write_title($array_export_fields_label,$array_selected_sorted,$outputlangs,$array_types)
-	{
+     * 	@return		int											<0 if KO, >0 if OK
+     */
+    function write_title($array_export_fields_label,$array_selected_sorted,$outputlangs,$array_types)
+    {
         // phpcs:enable
-		global $conf;
+        global $conf;
 
-		if (! empty($conf->global->EXPORT_CSV_FORCE_CHARSET))
-		{
-			$outputlangs->charset_output = $conf->global->EXPORT_CSV_FORCE_CHARSET;
-		}
-		else
-		{
-			$outputlangs->charset_output = 'ISO-8859-1';
-		}
+        if (! empty($conf->global->EXPORT_CSV_FORCE_CHARSET))
+        {
+            $outputlangs->charset_output = $conf->global->EXPORT_CSV_FORCE_CHARSET;
+        }
+        else
+        {
+            $outputlangs->charset_output = 'ISO-8859-1';
+        }
 
-		foreach($array_selected_sorted as $code => $value)
-		{
-			$newvalue=$outputlangs->transnoentities($array_export_fields_label[$code]);		// newvalue is now $outputlangs->charset_output encoded
-			$newvalue=$this->csvClean($newvalue,$outputlangs->charset_output);
+        foreach($array_selected_sorted as $code => $value)
+        {
+            $newvalue=$outputlangs->transnoentities($array_export_fields_label[$code]);		// newvalue is now $outputlangs->charset_output encoded
+            $newvalue=$this->csvClean($newvalue,$outputlangs->charset_output);
 
-			fwrite($this->handle,$newvalue.$this->separator);
-		}
-		fwrite($this->handle,"\n");
-		return 0;
-	}
+            fwrite($this->handle,$newvalue.$this->separator);
+        }
+        fwrite($this->handle,"\n");
+        return 0;
+    }
 
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
@@ -242,124 +242,124 @@ 
      *  @param     	resource	$objp                       A record from a fetch with all fields from select
      *  @param     	Translate	$outputlangs    			Object lang to translate values
      *  @param		array		$array_types				Array with types of fields
-	 * 	@return		int										<0 if KO, >0 if OK
-	 */
-	function write_record($array_selected_sorted,$objp,$outputlangs,$array_types)
-	{
+     * 	@return		int										<0 if KO, >0 if OK
+     */
+    function write_record($array_selected_sorted,$objp,$outputlangs,$array_types)
+    {
         // phpcs:enable
-		global $conf;
-
-		if (! empty($conf->global->EXPORT_CSV_FORCE_CHARSET))
-		{
-			$outputlangs->charset_output = $conf->global->EXPORT_CSV_FORCE_CHARSET;
-		}
-		else
-		{
-			$outputlangs->charset_output = 'ISO-8859-1';
-		}
-
-		$this->col=0;
-		foreach($array_selected_sorted as $code => $value)
-		{
-			if (strpos($code,' as ') == 0) $alias=str_replace(array('.','-','(',')'),'_',$code);
-			else $alias=substr($code, strpos($code, ' as ') + 4);
-			if (empty($alias)) dol_print_error('','Bad value for field with key='.$code.'. Try to redefine export.');
-
-			$newvalue=$outputlangs->convToOutputCharset($objp->$alias);		// objp->$alias must be utf8 encoded as any var in memory	// newvalue is now $outputlangs->charset_output encoded
-			$typefield=isset($array_types[$code])?$array_types[$code]:'';
-
-			// Translation newvalue
-			if (preg_match('/^\((.*)\)$/i',$newvalue,$reg)) $newvalue=$outputlangs->transnoentities($reg[1]);
-
-			$newvalue=$this->csvClean($newvalue,$outputlangs->charset_output);
-
-			if (preg_match('/^Select:/i', $typefield, $reg) && $typefield = substr($typefield, 7))
-			{
-				$array = unserialize($typefield);
-				$array = $array['options'];
-				$newvalue = $array[$newvalue];
-			}
-
-			fwrite($this->handle,$newvalue.$this->separator);
-			$this->col++;
-		}
-
-		fwrite($this->handle,"\n");
-		return 0;
-	}
+        global $conf;
+
+        if (! empty($conf->global->EXPORT_CSV_FORCE_CHARSET))
+        {
+            $outputlangs->charset_output = $conf->global->EXPORT_CSV_FORCE_CHARSET;
+        }
+        else
+        {
+            $outputlangs->charset_output = 'ISO-8859-1';
+        }
+
+        $this->col=0;
+        foreach($array_selected_sorted as $code => $value)
+        {
+            if (strpos($code,' as ') == 0) $alias=str_replace(array('.','-','(',')'),'_',$code);
+            else $alias=substr($code, strpos($code, ' as ') + 4);
+            if (empty($alias)) dol_print_error('','Bad value for field with key='.$code.'. Try to redefine export.');
+
+            $newvalue=$outputlangs->convToOutputCharset($objp->$alias);		// objp->$alias must be utf8 encoded as any var in memory	// newvalue is now $outputlangs->charset_output encoded
+            $typefield=isset($array_types[$code])?$array_types[$code]:'';
+
+            // Translation newvalue
+            if (preg_match('/^\((.*)\)$/i',$newvalue,$reg)) $newvalue=$outputlangs->transnoentities($reg[1]);
+
+            $newvalue=$this->csvClean($newvalue,$outputlangs->charset_output);
+
+            if (preg_match('/^Select:/i', $typefield, $reg) && $typefield = substr($typefield, 7))
+            {
+                $array = unserialize($typefield);
+                $array = $array['options'];
+                $newvalue = $array[$newvalue];
+            }
+
+            fwrite($this->handle,$newvalue.$this->separator);
+            $this->col++;
+        }
+
+        fwrite($this->handle,"\n");
+        return 0;
+    }
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
-	/**
-	 * 	Output footer into file
-	 *
-	 * 	@param		Translate	$outputlangs	Output language object
-	 * 	@return		int							<0 if KO, >0 if OK
-	 */
-	function write_footer($outputlangs)
-	{
+    /**
+     * 	Output footer into file
+     *
+     * 	@param		Translate	$outputlangs	Output language object
+     * 	@return		int							<0 if KO, >0 if OK
+     */
+    function write_footer($outputlangs)
+    {
         // phpcs:enable
-		return 0;
-	}
+        return 0;
+    }
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
-	/**
-	 * 	Close file handle
-	 *
-	 * 	@return		int							<0 if KO, >0 if OK
-	 */
-	function close_file()
-	{
+    /**
+     * 	Close file handle
+     *
+     * 	@return		int							<0 if KO, >0 if OK
+     */
+    function close_file()
+    {
         // phpcs:enable
-		fclose($this->handle);
-		return 0;
-	}
-
-
-	/**
-	 * Clean a cell to respect rules of CSV file cells
-	 * Note: It uses $this->separator
-	 * Note: We keep this function public to be able to test
-	 *
-	 * @param 	string	$newvalue	String to clean
-	 * @param	string	$charset	Input AND Output character set
-	 * @return 	string				Value cleaned
-	 */
-	public function csvClean($newvalue, $charset)
-	{
-		global $conf;
-		$addquote=0;
-
-
-		// Rule Dolibarr: No HTML
-   		//print $charset.' '.$newvalue."\n";
-   		//$newvalue=dol_string_nohtmltag($newvalue,0,$charset);
-   		$newvalue=dol_htmlcleanlastbr($newvalue);
-   		//print $charset.' '.$newvalue."\n";
-
-		// Rule 1 CSV: No CR, LF in cells (except if USE_STRICT_CSV_RULES is on, we can keep record as it is but we must add quotes)
-		$oldvalue=$newvalue;
-		$newvalue=str_replace("\r",'',$newvalue);
-		$newvalue=str_replace("\n",'\n',$newvalue);
-		if (! empty($conf->global->USE_STRICT_CSV_RULES) && $oldvalue != $newvalue)
-		{
-			// If strict use of CSV rules, we just add quote
-			$newvalue=$oldvalue;
-			$addquote=1;
-		}
-
-		// Rule 2 CSV: If value contains ", we must escape with ", and add "
-		if (preg_match('/"/',$newvalue))
-		{
-			$addquote=1;
-			$newvalue=str_replace('"','""',$newvalue);
-		}
-
-		// Rule 3 CSV: If value contains separator, we must add "
-		if (preg_match('/'.$this->separator.'/',$newvalue))
-		{
-			$addquote=1;
-		}
-
-		return ($addquote?'"':'').$newvalue.($addquote?'"':'');
-	}
+        fclose($this->handle);
+        return 0;
+    }
+
+
+    /**
+     * Clean a cell to respect rules of CSV file cells
+     * Note: It uses $this->separator
+     * Note: We keep this function public to be able to test
+     *
+     * @param 	string	$newvalue	String to clean
+     * @param	string	$charset	Input AND Output character set
+     * @return 	string				Value cleaned
+     */
+    public function csvClean($newvalue, $charset)
+    {
+        global $conf;
+        $addquote=0;
+
+
+        // Rule Dolibarr: No HTML
+            //print $charset.' '.$newvalue."\n";
+            //$newvalue=dol_string_nohtmltag($newvalue,0,$charset);
+            $newvalue=dol_htmlcleanlastbr($newvalue);
+            //print $charset.' '.$newvalue."\n";
+
+        // Rule 1 CSV: No CR, LF in cells (except if USE_STRICT_CSV_RULES is on, we can keep record as it is but we must add quotes)
+        $oldvalue=$newvalue;
+        $newvalue=str_replace("\r",'',$newvalue);
+        $newvalue=str_replace("\n",'\n',$newvalue);
+        if (! empty($conf->global->USE_STRICT_CSV_RULES) && $oldvalue != $newvalue)
+        {
+            // If strict use of CSV rules, we just add quote
+            $newvalue=$oldvalue;
+            $addquote=1;
+        }
+
+        // Rule 2 CSV: If value contains ", we must escape with ", and add "
+        if (preg_match('/"/',$newvalue))
+        {
+            $addquote=1;
+            $newvalue=str_replace('"','""',$newvalue);
+        }
+
+        // Rule 3 CSV: If value contains separator, we must add "
+        if (preg_match('/'.$this->separator.'/',$newvalue))
+        {
+            $addquote=1;
+        }
+
+        return ($addquote?'"':'').$newvalue.($addquote?'"':'');
+    }
 }

Spacing +53 added lines, -53 removed lines

@@ -22,7 +22,7 @@ 
  *		\author	    Laurent Destailleur
  */
 
-require_once DOL_DOCUMENT_ROOT .'/core/modules/export/modules_export.php';
+require_once DOL_DOCUMENT_ROOT.'/core/modules/export/modules_export.php';
 
 
 /**
@@ -54,7 +54,7 @@ 
 
 	public $separator;
 
-	public $handle;    // Handle fichier
+	public $handle; // Handle fichier
 
 
 	/**
@@ -67,21 +67,21 @@ 
 		global $conf, $langs;
 		$this->db = $db;
 
-		$this->separator=',';
-		if (! empty($conf->global->EXPORT_CSV_SEPARATOR_TO_USE)) $this->separator=$conf->global->EXPORT_CSV_SEPARATOR_TO_USE;
-		$this->escape='"';
-		$this->enclosure='"';
+		$this->separator = ',';
+		if (!empty($conf->global->EXPORT_CSV_SEPARATOR_TO_USE)) $this->separator = $conf->global->EXPORT_CSV_SEPARATOR_TO_USE;
+		$this->escape = '"';
+		$this->enclosure = '"';
 
-		$this->id='csv';                // Same value then xxx in file name export_xxx.modules.php
-		$this->label = 'CSV';             // Label of driver
-		$this->desc=$langs->trans("CSVFormatDesc",$this->separator,$this->enclosure,$this->escape);
-		$this->extension='csv';         // Extension for generated file by this driver
-		$this->picto='mime/other';		// Picto
-		$this->version='1.32';         // Driver version
+		$this->id = 'csv'; // Same value then xxx in file name export_xxx.modules.php
+		$this->label = 'CSV'; // Label of driver
+		$this->desc = $langs->trans("CSVFormatDesc", $this->separator, $this->enclosure, $this->escape);
+		$this->extension = 'csv'; // Extension for generated file by this driver
+		$this->picto = 'mime/other'; // Picto
+		$this->version = '1.32'; // Driver version
 
 		// If driver use an external library, put its name here
-		$this->label_lib='Dolibarr';
-		$this->version_lib=DOL_VERSION;
+		$this->label_lib = 'Dolibarr';
+		$this->version_lib = DOL_VERSION;
 	}
 
 	/**
@@ -163,22 +163,22 @@ 
 	 * 	@param		Translate	$outputlangs	Output language object
 	 *	@return		int							<0 if KO, >=0 if OK
 	 */
-	function open_file($file,$outputlangs)
+	function open_file($file, $outputlangs)
 	{
         // phpcs:enable
 		global $langs;
 
 		dol_syslog("ExportCsv::open_file file=".$file);
 
-		$ret=1;
+		$ret = 1;
 
 		$outputlangs->load("exports");
 		$this->handle = fopen($file, "wt");
-		if (! $this->handle)
+		if (!$this->handle)
 		{
 			$langs->load("errors");
-			$this->error=$langs->trans("ErrorFailToCreateFile",$file);
-			$ret=-1;
+			$this->error = $langs->trans("ErrorFailToCreateFile", $file);
+			$ret = -1;
 		}
 
 		return $ret;
@@ -208,12 +208,12 @@ 
      *  @param		array		$array_types					Array with types of fields
 	 * 	@return		int											<0 if KO, >0 if OK
 	 */
-	function write_title($array_export_fields_label,$array_selected_sorted,$outputlangs,$array_types)
+	function write_title($array_export_fields_label, $array_selected_sorted, $outputlangs, $array_types)
 	{
         // phpcs:enable
 		global $conf;
 
-		if (! empty($conf->global->EXPORT_CSV_FORCE_CHARSET))
+		if (!empty($conf->global->EXPORT_CSV_FORCE_CHARSET))
 		{
 			$outputlangs->charset_output = $conf->global->EXPORT_CSV_FORCE_CHARSET;
 		}
@@ -222,14 +222,14 @@ 
 			$outputlangs->charset_output = 'ISO-8859-1';
 		}
 
-		foreach($array_selected_sorted as $code => $value)
+		foreach ($array_selected_sorted as $code => $value)
 		{
-			$newvalue=$outputlangs->transnoentities($array_export_fields_label[$code]);		// newvalue is now $outputlangs->charset_output encoded
-			$newvalue=$this->csvClean($newvalue,$outputlangs->charset_output);
+			$newvalue = $outputlangs->transnoentities($array_export_fields_label[$code]); // newvalue is now $outputlangs->charset_output encoded
+			$newvalue = $this->csvClean($newvalue, $outputlangs->charset_output);
 
-			fwrite($this->handle,$newvalue.$this->separator);
+			fwrite($this->handle, $newvalue.$this->separator);
 		}
-		fwrite($this->handle,"\n");
+		fwrite($this->handle, "\n");
 		return 0;
 	}
 
@@ -244,12 +244,12 @@ 
      *  @param		array		$array_types				Array with types of fields
 	 * 	@return		int										<0 if KO, >0 if OK
 	 */
-	function write_record($array_selected_sorted,$objp,$outputlangs,$array_types)
+	function write_record($array_selected_sorted, $objp, $outputlangs, $array_types)
 	{
         // phpcs:enable
 		global $conf;
 
-		if (! empty($conf->global->EXPORT_CSV_FORCE_CHARSET))
+		if (!empty($conf->global->EXPORT_CSV_FORCE_CHARSET))
 		{
 			$outputlangs->charset_output = $conf->global->EXPORT_CSV_FORCE_CHARSET;
 		}
@@ -258,20 +258,20 @@ 
 			$outputlangs->charset_output = 'ISO-8859-1';
 		}
 
-		$this->col=0;
-		foreach($array_selected_sorted as $code => $value)
+		$this->col = 0;
+		foreach ($array_selected_sorted as $code => $value)
 		{
-			if (strpos($code,' as ') == 0) $alias=str_replace(array('.','-','(',')'),'_',$code);
-			else $alias=substr($code, strpos($code, ' as ') + 4);
-			if (empty($alias)) dol_print_error('','Bad value for field with key='.$code.'. Try to redefine export.');
+			if (strpos($code, ' as ') == 0) $alias = str_replace(array('.', '-', '(', ')'), '_', $code);
+			else $alias = substr($code, strpos($code, ' as ') + 4);
+			if (empty($alias)) dol_print_error('', 'Bad value for field with key='.$code.'. Try to redefine export.');
 
-			$newvalue=$outputlangs->convToOutputCharset($objp->$alias);		// objp->$alias must be utf8 encoded as any var in memory	// newvalue is now $outputlangs->charset_output encoded
-			$typefield=isset($array_types[$code])?$array_types[$code]:'';
+			$newvalue = $outputlangs->convToOutputCharset($objp->$alias); // objp->$alias must be utf8 encoded as any var in memory	// newvalue is now $outputlangs->charset_output encoded
+			$typefield = isset($array_types[$code]) ? $array_types[$code] : '';
 
 			// Translation newvalue
-			if (preg_match('/^\((.*)\)$/i',$newvalue,$reg)) $newvalue=$outputlangs->transnoentities($reg[1]);
+			if (preg_match('/^\((.*)\)$/i', $newvalue, $reg)) $newvalue = $outputlangs->transnoentities($reg[1]);
 
-			$newvalue=$this->csvClean($newvalue,$outputlangs->charset_output);
+			$newvalue = $this->csvClean($newvalue, $outputlangs->charset_output);
 
 			if (preg_match('/^Select:/i', $typefield, $reg) && $typefield = substr($typefield, 7))
 			{
@@ -280,11 +280,11 @@ 
 				$newvalue = $array[$newvalue];
 			}
 
-			fwrite($this->handle,$newvalue.$this->separator);
+			fwrite($this->handle, $newvalue.$this->separator);
 			$this->col++;
 		}
 
-		fwrite($this->handle,"\n");
+		fwrite($this->handle, "\n");
 		return 0;
 	}
 
@@ -327,39 +327,39 @@ 
 	public function csvClean($newvalue, $charset)
 	{
 		global $conf;
-		$addquote=0;
+		$addquote = 0;
 
 
 		// Rule Dolibarr: No HTML
    		//print $charset.' '.$newvalue."\n";
    		//$newvalue=dol_string_nohtmltag($newvalue,0,$charset);
-   		$newvalue=dol_htmlcleanlastbr($newvalue);
+   		$newvalue = dol_htmlcleanlastbr($newvalue);
    		//print $charset.' '.$newvalue."\n";
 
 		// Rule 1 CSV: No CR, LF in cells (except if USE_STRICT_CSV_RULES is on, we can keep record as it is but we must add quotes)
-		$oldvalue=$newvalue;
-		$newvalue=str_replace("\r",'',$newvalue);
-		$newvalue=str_replace("\n",'\n',$newvalue);
-		if (! empty($conf->global->USE_STRICT_CSV_RULES) && $oldvalue != $newvalue)
+		$oldvalue = $newvalue;
+		$newvalue = str_replace("\r", '', $newvalue);
+		$newvalue = str_replace("\n", '\n', $newvalue);
+		if (!empty($conf->global->USE_STRICT_CSV_RULES) && $oldvalue != $newvalue)
 		{
 			// If strict use of CSV rules, we just add quote
-			$newvalue=$oldvalue;
-			$addquote=1;
+			$newvalue = $oldvalue;
+			$addquote = 1;
 		}
 
 		// Rule 2 CSV: If value contains ", we must escape with ", and add "
-		if (preg_match('/"/',$newvalue))
+		if (preg_match('/"/', $newvalue))
 		{
-			$addquote=1;
-			$newvalue=str_replace('"','""',$newvalue);
+			$addquote = 1;
+			$newvalue = str_replace('"', '""', $newvalue);
 		}
 
 		// Rule 3 CSV: If value contains separator, we must add "
-		if (preg_match('/'.$this->separator.'/',$newvalue))
+		if (preg_match('/'.$this->separator.'/', $newvalue))
 		{
-			$addquote=1;
+			$addquote = 1;
 		}
 
-		return ($addquote?'"':'').$newvalue.($addquote?'"':'');
+		return ($addquote ? '"' : '').$newvalue.($addquote ? '"' : '');
 	}
 }

Braces +16 added lines, -9 removed lines

@@ -68,7 +68,9 @@ 
 		$this->db = $db;
 
 		$this->separator=',';
-		if (! empty($conf->global->EXPORT_CSV_SEPARATOR_TO_USE)) $this->separator=$conf->global->EXPORT_CSV_SEPARATOR_TO_USE;
+		if (! empty($conf->global->EXPORT_CSV_SEPARATOR_TO_USE)) {
+		    $this->separator=$conf->global->EXPORT_CSV_SEPARATOR_TO_USE;
+		}
 		$this->escape='"';
 		$this->enclosure='"';
 
@@ -216,8 +218,7 @@ 
 		if (! empty($conf->global->EXPORT_CSV_FORCE_CHARSET))
 		{
 			$outputlangs->charset_output = $conf->global->EXPORT_CSV_FORCE_CHARSET;
-		}
-		else
+		} else
 		{
 			$outputlangs->charset_output = 'ISO-8859-1';
 		}
@@ -252,8 +253,7 @@ 
 		if (! empty($conf->global->EXPORT_CSV_FORCE_CHARSET))
 		{
 			$outputlangs->charset_output = $conf->global->EXPORT_CSV_FORCE_CHARSET;
-		}
-		else
+		} else
 		{
 			$outputlangs->charset_output = 'ISO-8859-1';
 		}
@@ -261,15 +261,22 @@ 
 		$this->col=0;
 		foreach($array_selected_sorted as $code => $value)
 		{
-			if (strpos($code,' as ') == 0) $alias=str_replace(array('.','-','(',')'),'_',$code);
-			else $alias=substr($code, strpos($code, ' as ') + 4);
-			if (empty($alias)) dol_print_error('','Bad value for field with key='.$code.'. Try to redefine export.');
+			if (strpos($code,' as ') == 0) {
+			    $alias=str_replace(array('.','-','(',')'),'_',$code);
+			} else {
+			    $alias=substr($code, strpos($code, ' as ') + 4);
+			}
+			if (empty($alias)) {
+			    dol_print_error('','Bad value for field with key='.$code.'. Try to redefine export.');
+			}
 
 			$newvalue=$outputlangs->convToOutputCharset($objp->$alias);		// objp->$alias must be utf8 encoded as any var in memory	// newvalue is now $outputlangs->charset_output encoded
 			$typefield=isset($array_types[$code])?$array_types[$code]:'';
 
 			// Translation newvalue
-			if (preg_match('/^\((.*)\)$/i',$newvalue,$reg)) $newvalue=$outputlangs->transnoentities($reg[1]);
+			if (preg_match('/^\((.*)\)$/i',$newvalue,$reg)) {
+			    $newvalue=$outputlangs->transnoentities($reg[1]);
+			}
 
 			$newvalue=$this->csvClean($newvalue,$outputlangs->charset_output);
 

dolibarr/htdocs/core/modules/export/export_tsv.modules.php

Indentation +108 added lines, -108 removed lines

@@ -32,9 +32,9 @@ 
 class ExportTsv extends ModeleExports
 {
     /**
-	 * @var int ID
-	 */
-	public $id;
+     * @var int ID
+     */
+    public $id;
 
     /**
      * @var string label
@@ -47,7 +47,7 @@ 
      * Dolibarr version of the loaded document
      * @public string
      */
-	public $version = 'dolibarr';
+    public $version = 'dolibarr';
 
     public $label_lib;
 
@@ -59,9 +59,9 @@ 
 
 
     /**
-	 *	Constructor
-	 *
-	 *	@param	    DoliDB	$db      Database handler
+     *	Constructor
+     *
+     *	@param	    DoliDB	$db      Database handler
      */
     function __construct($db)
     {
@@ -80,71 +80,71 @@ 
         $this->version_lib=DOL_VERSION;
     }
 
-	/**
-	 * getDriverId
-	 *
-	 * @return string
-	 */
+    /**
+     * getDriverId
+     *
+     * @return string
+     */
     function getDriverId()
     {
         return $this->id;
     }
 
-	/**
-	 * getDriverLabel
-	 *
-	 * @return 	string			Return driver label
-	 */
+    /**
+     * getDriverLabel
+     *
+     * @return 	string			Return driver label
+     */
     function getDriverLabel()
     {
         return $this->label;
     }
 
-	/**
-	 * getDriverDesc
-	 *
-	 * @return string
-	 */
+    /**
+     * getDriverDesc
+     *
+     * @return string
+     */
     function getDriverDesc()
     {
         return $this->desc;
     }
 
-	/**
-	 * getDriverExtension
-	 *
-	 * @return string
-	 */
+    /**
+     * getDriverExtension
+     *
+     * @return string
+     */
     function getDriverExtension()
     {
         return $this->extension;
     }
 
-	/**
-	 * getDriverVersion
-	 *
-	 * @return string
-	 */
+    /**
+     * getDriverVersion
+     *
+     * @return string
+     */
     function getDriverVersion()
     {
         return $this->version;
     }
 
-	/**
-	 * getLibLabel
-	 *
-	 * @return string
-	 */
+    /**
+     * getLibLabel
+     *
+     * @return string
+     */
     function getLibLabel()
     {
         return $this->label_lib;
     }
 
-	/**
-	 * getLibVersion
-	 *
-	 * @return string
-	 */
+    /**
+     * getLibVersion
+     *
+     * @return string
+     */
     function getLibVersion()
     {
         return $this->version_lib;
@@ -153,12 +153,12 @@ 
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
     /**
-	*	Open output file
-	*
-	 *	@param		string		$file			Path of filename to generate
-	*	@param		Translate	$outputlangs	Output language object
-	*	@return		int							<0 if KO, >=0 if OK
-    */
+     *	Open output file
+     *
+     *	@param		string		$file			Path of filename to generate
+     *	@param		Translate	$outputlangs	Output language object
+     *	@return		int							<0 if KO, >=0 if OK
+     */
     function open_file($file,$outputlangs)
     {
         // phpcs:enable
@@ -169,24 +169,24 @@ 
         $ret=1;
 
         $outputlangs->load("exports");
-		$this->handle = fopen($file, "wt");
+        $this->handle = fopen($file, "wt");
         if (! $this->handle)
-		{
-			$langs->load("errors");
-			$this->error=$langs->trans("ErrorFailToCreateFile",$file);
-			$ret=-1;
-		}
+        {
+            $langs->load("errors");
+            $this->error=$langs->trans("ErrorFailToCreateFile",$file);
+            $ret=-1;
+        }
 
-		return $ret;
+        return $ret;
     }
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
-	/**
-	 * 	Output header into file
-	 *
-	 * 	@param		Translate	$outputlangs		Output language object
-	 * 	@return		int								<0 if KO, >0 if OK
-	 */
+    /**
+     * 	Output header into file
+     *
+     * 	@param		Translate	$outputlangs		Output language object
+     * 	@return		int								<0 if KO, >0 if OK
+     */
     function write_header($outputlangs)
     {
         // phpcs:enable
@@ -202,17 +202,17 @@ 
      *  @param      array		$array_selected_sorted       	Array with list of field to export
      *  @param      Translate	$outputlangs    				Object lang to translate values
      *  @param		array		$array_types					Array with types of fields
-	 * 	@return		int											<0 if KO, >0 if OK
-	 */
+     * 	@return		int											<0 if KO, >0 if OK
+     */
     function write_title($array_export_fields_label,$array_selected_sorted,$outputlangs,$array_types)
     {
         // phpcs:enable
         foreach($array_selected_sorted as $code => $value)
         {
             $newvalue=$outputlangs->transnoentities($array_export_fields_label[$code]);		// newvalue is now $outputlangs->charset_output encoded
-			$newvalue=$this->tsv_clean($newvalue,$outputlangs->charset_output);
+            $newvalue=$this->tsv_clean($newvalue,$outputlangs->charset_output);
 
-			fwrite($this->handle,$newvalue.$this->separator);
+            fwrite($this->handle,$newvalue.$this->separator);
         }
         fwrite($this->handle,"\n");
         return 0;
@@ -220,68 +220,68 @@ 
 
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
-	/**
-	 * 	Output record line into file
-	 *
-	 *  @param      array		$array_selected_sorted      Array with list of field to export
-	 *  @param      resource	$objp                       A record from a fetch with all fields from select
-	 *  @param      Translate	$outputlangs                Object lang to translate values
+    /**
+     * 	Output record line into file
+     *
+     *  @param      array		$array_selected_sorted      Array with list of field to export
+     *  @param      resource	$objp                       A record from a fetch with all fields from select
+     *  @param      Translate	$outputlangs                Object lang to translate values
      *  @param		array		$array_types				Array with types of fields
-	 * 	@return		int										<0 if KO, >0 if OK
-	 */
+     * 	@return		int										<0 if KO, >0 if OK
+     */
     function write_record($array_selected_sorted,$objp,$outputlangs,$array_types)
     {
         // phpcs:enable
-    	global $conf;
+        global $conf;
 
-		$this->col=0;
- 		foreach($array_selected_sorted as $code => $value)
+        $this->col=0;
+            foreach($array_selected_sorted as $code => $value)
         {
-			if (strpos($code,' as ') == 0) $alias=str_replace(array('.','-','(',')'),'_',$code);
-			else $alias=substr($code, strpos($code, ' as ') + 4);
+            if (strpos($code,' as ') == 0) $alias=str_replace(array('.','-','(',')'),'_',$code);
+            else $alias=substr($code, strpos($code, ' as ') + 4);
             if (empty($alias)) dol_print_error('','Bad value for field with code='.$code.'. Try to redefine export.');
 
             $newvalue=$outputlangs->convToOutputCharset($objp->$alias);		// objp->$alias must be utf8 encoded as any var in memory // newvalue is now $outputlangs->charset_output encoded
             $typefield=isset($array_types[$code])?$array_types[$code]:'';
 
             // Translation newvalue
-			if (preg_match('/^\((.*)\)$/i',$newvalue,$reg)) $newvalue=$outputlangs->transnoentities($reg[1]);
+            if (preg_match('/^\((.*)\)$/i',$newvalue,$reg)) $newvalue=$outputlangs->transnoentities($reg[1]);
 
-			$newvalue=$this->tsv_clean($newvalue,$outputlangs->charset_output);
+            $newvalue=$this->tsv_clean($newvalue,$outputlangs->charset_output);
 
-			if (preg_match('/^Select:/i', $typefield, $reg) && $typefield = substr($typefield, 7))
-			{
-				$array = unserialize($typefield);
-				$array = $array['options'];
-				$newvalue = $array[$newvalue];
-			}
+            if (preg_match('/^Select:/i', $typefield, $reg) && $typefield = substr($typefield, 7))
+            {
+                $array = unserialize($typefield);
+                $array = $array['options'];
+                $newvalue = $array[$newvalue];
+            }
 
-			fwrite($this->handle,$newvalue.$this->separator);
+            fwrite($this->handle,$newvalue.$this->separator);
             $this->col++;
-		}
+        }
         fwrite($this->handle,"\n");
         return 0;
     }
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
-	/**
-	 * 	Output footer into file
-	 *
-	 * 	@param		Translate	$outputlangs		Output language object
-	 * 	@return		int								<0 if KO, >0 if OK
-	 */
+    /**
+     * 	Output footer into file
+     *
+     * 	@param		Translate	$outputlangs		Output language object
+     * 	@return		int								<0 if KO, >0 if OK
+     */
     function write_footer($outputlangs)
     {
         // phpcs:enable
-		return 0;
+        return 0;
     }
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
-	/**
-	 * 	Close file handle
-	 *
-	 * 	@return		int							<0 if KO, >0 if OK
-	 */
+    /**
+     * 	Close file handle
+     *
+     * 	@return		int							<0 if KO, >0 if OK
+     */
     function close_file()
     {
         // phpcs:enable
@@ -300,18 +300,18 @@ 
     function tsv_clean($newvalue, $charset)
     {
         // phpcs:enable
-		// Rule Dolibarr: No HTML
-		$newvalue=dol_string_nohtmltag($newvalue, 1, $charset);
+        // Rule Dolibarr: No HTML
+        $newvalue=dol_string_nohtmltag($newvalue, 1, $charset);
 
-		// Rule 1 TSV: No CR, LF in cells
-    	$newvalue=str_replace("\r",'',$newvalue);
+        // Rule 1 TSV: No CR, LF in cells
+        $newvalue=str_replace("\r",'',$newvalue);
         $newvalue=str_replace("\n",'\n',$newvalue);
 
         // Rule 2 TSV: If value contains tab, we must replace by space
-		if (preg_match('/'.$this->separator.'/',$newvalue))
-		{
-			$newvalue=str_replace("\t"," ",$newvalue);
-		}
+        if (preg_match('/'.$this->separator.'/',$newvalue))
+        {
+            $newvalue=str_replace("\t"," ",$newvalue);
+        }
 
         return $newvalue;
     }

Spacing +38 added lines, -38 removed lines

@@ -23,7 +23,7 @@ 
  *		\author	    Laurent Destailleur
  */
 
-require_once DOL_DOCUMENT_ROOT .'/core/modules/export/modules_export.php';
+require_once DOL_DOCUMENT_ROOT.'/core/modules/export/modules_export.php';
 
 
 /**
@@ -53,9 +53,9 @@ 
 
     public $version_lib;
 
-    public $separator="\t";
+    public $separator = "\t";
 
-    public $handle;    // Handle fichier
+    public $handle; // Handle fichier
 
 
     /**
@@ -68,16 +68,16 @@ 
         global $conf, $langs;
         $this->db = $db;
 
-        $this->id='tsv';                // Same value then xxx in file name export_xxx.modules.php
-        $this->label = 'TSV';             // Label of driver
+        $this->id = 'tsv'; // Same value then xxx in file name export_xxx.modules.php
+        $this->label = 'TSV'; // Label of driver
         $this->desc = $langs->trans('TsvFormatDesc');
-        $this->extension='tsv';         // Extension for generated file by this driver
-        $this->picto='mime/other';		// Picto
-        $this->version='1.15';         // Driver version
+        $this->extension = 'tsv'; // Extension for generated file by this driver
+        $this->picto = 'mime/other'; // Picto
+        $this->version = '1.15'; // Driver version
 
         // If driver use an external library, put its name here
-        $this->label_lib='Dolibarr';
-        $this->version_lib=DOL_VERSION;
+        $this->label_lib = 'Dolibarr';
+        $this->version_lib = DOL_VERSION;
     }
 
 	/**
@@ -159,22 +159,22 @@ 
 	*	@param		Translate	$outputlangs	Output language object
 	*	@return		int							<0 if KO, >=0 if OK
     */
-    function open_file($file,$outputlangs)
+    function open_file($file, $outputlangs)
     {
         // phpcs:enable
         global $langs;
 
         dol_syslog("ExportTsv::open_file file=".$file);
 
-        $ret=1;
+        $ret = 1;
 
         $outputlangs->load("exports");
 		$this->handle = fopen($file, "wt");
-        if (! $this->handle)
+        if (!$this->handle)
 		{
 			$langs->load("errors");
-			$this->error=$langs->trans("ErrorFailToCreateFile",$file);
-			$ret=-1;
+			$this->error = $langs->trans("ErrorFailToCreateFile", $file);
+			$ret = -1;
 		}
 
 		return $ret;
@@ -204,17 +204,17 @@ 
      *  @param		array		$array_types					Array with types of fields
 	 * 	@return		int											<0 if KO, >0 if OK
 	 */
-    function write_title($array_export_fields_label,$array_selected_sorted,$outputlangs,$array_types)
+    function write_title($array_export_fields_label, $array_selected_sorted, $outputlangs, $array_types)
     {
         // phpcs:enable
-        foreach($array_selected_sorted as $code => $value)
+        foreach ($array_selected_sorted as $code => $value)
         {
-            $newvalue=$outputlangs->transnoentities($array_export_fields_label[$code]);		// newvalue is now $outputlangs->charset_output encoded
-			$newvalue=$this->tsv_clean($newvalue,$outputlangs->charset_output);
+            $newvalue = $outputlangs->transnoentities($array_export_fields_label[$code]); // newvalue is now $outputlangs->charset_output encoded
+			$newvalue = $this->tsv_clean($newvalue, $outputlangs->charset_output);
 
-			fwrite($this->handle,$newvalue.$this->separator);
+			fwrite($this->handle, $newvalue.$this->separator);
         }
-        fwrite($this->handle,"\n");
+        fwrite($this->handle, "\n");
         return 0;
     }
 
@@ -229,25 +229,25 @@ 
      *  @param		array		$array_types				Array with types of fields
 	 * 	@return		int										<0 if KO, >0 if OK
 	 */
-    function write_record($array_selected_sorted,$objp,$outputlangs,$array_types)
+    function write_record($array_selected_sorted, $objp, $outputlangs, $array_types)
     {
         // phpcs:enable
     	global $conf;
 
-		$this->col=0;
- 		foreach($array_selected_sorted as $code => $value)
+		$this->col = 0;
+ 		foreach ($array_selected_sorted as $code => $value)
         {
-			if (strpos($code,' as ') == 0) $alias=str_replace(array('.','-','(',')'),'_',$code);
-			else $alias=substr($code, strpos($code, ' as ') + 4);
-            if (empty($alias)) dol_print_error('','Bad value for field with code='.$code.'. Try to redefine export.');
+			if (strpos($code, ' as ') == 0) $alias = str_replace(array('.', '-', '(', ')'), '_', $code);
+			else $alias = substr($code, strpos($code, ' as ') + 4);
+            if (empty($alias)) dol_print_error('', 'Bad value for field with code='.$code.'. Try to redefine export.');
 
-            $newvalue=$outputlangs->convToOutputCharset($objp->$alias);		// objp->$alias must be utf8 encoded as any var in memory // newvalue is now $outputlangs->charset_output encoded
-            $typefield=isset($array_types[$code])?$array_types[$code]:'';
+            $newvalue = $outputlangs->convToOutputCharset($objp->$alias); // objp->$alias must be utf8 encoded as any var in memory // newvalue is now $outputlangs->charset_output encoded
+            $typefield = isset($array_types[$code]) ? $array_types[$code] : '';
 
             // Translation newvalue
-			if (preg_match('/^\((.*)\)$/i',$newvalue,$reg)) $newvalue=$outputlangs->transnoentities($reg[1]);
+			if (preg_match('/^\((.*)\)$/i', $newvalue, $reg)) $newvalue = $outputlangs->transnoentities($reg[1]);
 
-			$newvalue=$this->tsv_clean($newvalue,$outputlangs->charset_output);
+			$newvalue = $this->tsv_clean($newvalue, $outputlangs->charset_output);
 
 			if (preg_match('/^Select:/i', $typefield, $reg) && $typefield = substr($typefield, 7))
 			{
@@ -256,10 +256,10 @@ 
 				$newvalue = $array[$newvalue];
 			}
 
-			fwrite($this->handle,$newvalue.$this->separator);
+			fwrite($this->handle, $newvalue.$this->separator);
             $this->col++;
 		}
-        fwrite($this->handle,"\n");
+        fwrite($this->handle, "\n");
         return 0;
     }
 
@@ -301,16 +301,16 @@ 
     {
         // phpcs:enable
 		// Rule Dolibarr: No HTML
-		$newvalue=dol_string_nohtmltag($newvalue, 1, $charset);
+		$newvalue = dol_string_nohtmltag($newvalue, 1, $charset);
 
 		// Rule 1 TSV: No CR, LF in cells
-    	$newvalue=str_replace("\r",'',$newvalue);
-        $newvalue=str_replace("\n",'\n',$newvalue);
+    	$newvalue = str_replace("\r", '', $newvalue);
+        $newvalue = str_replace("\n", '\n', $newvalue);
 
         // Rule 2 TSV: If value contains tab, we must replace by space
-		if (preg_match('/'.$this->separator.'/',$newvalue))
+		if (preg_match('/'.$this->separator.'/', $newvalue))
 		{
-			$newvalue=str_replace("\t"," ",$newvalue);
+			$newvalue = str_replace("\t", " ", $newvalue);
 		}
 
         return $newvalue;

Braces +11 added lines, -4 removed lines

@@ -237,15 +237,22 @@
 		$this->col=0;
  		foreach($array_selected_sorted as $code => $value)
         {
-			if (strpos($code,' as ') == 0) $alias=str_replace(array('.','-','(',')'),'_',$code);
-			else $alias=substr($code, strpos($code, ' as ') + 4);
-            if (empty($alias)) dol_print_error('','Bad value for field with code='.$code.'. Try to redefine export.');
+			if (strpos($code,' as ') == 0) {
+			    $alias=str_replace(array('.','-','(',')'),'_',$code);
+			} else {
+			    $alias=substr($code, strpos($code, ' as ') + 4);
+			}
+            if (empty($alias)) {
+                dol_print_error('','Bad value for field with code='.$code.'. Try to redefine export.');
+            }
 
             $newvalue=$outputlangs->convToOutputCharset($objp->$alias);		// objp->$alias must be utf8 encoded as any var in memory // newvalue is now $outputlangs->charset_output encoded
             $typefield=isset($array_types[$code])?$array_types[$code]:'';
 
             // Translation newvalue
-			if (preg_match('/^\((.*)\)$/i',$newvalue,$reg)) $newvalue=$outputlangs->transnoentities($reg[1]);
+			if (preg_match('/^\((.*)\)$/i',$newvalue,$reg)) {
+			    $newvalue=$outputlangs->transnoentities($reg[1]);
+			}
 
 			$newvalue=$this->tsv_clean($newvalue,$outputlangs->charset_output);
 

dolibarr/htdocs/core/modules/export/modules_export.php

Indentation +117 added lines, -117 removed lines

@@ -30,140 +30,140 @@
  */
 class ModeleExports extends CommonDocGenerator    // This class can't be abstract as there is instance propreties loaded by liste_modeles
 {
-	/**
-	 * @var string Error code (or message)
-	 */
-	public $error='';
+    /**
+     * @var string Error code (or message)
+     */
+    public $error='';
 
-	public $driverlabel=array();
+    public $driverlabel=array();
 
-	public $driverversion=array();
+    public $driverversion=array();
 
-	public $liblabel=array();
+    public $liblabel=array();
 
-	public $libversion=array();
+    public $libversion=array();
 
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
-	/**
-	 *  Load into memory list of available export format
-	 *
+    /**
+     *  Load into memory list of available export format
+     *
      *  @param	DoliDB	$db     			Database handler
      *  @param  integer	$maxfilenamelength  Max length of value to show
      *  @return	array						List of templates (same content than array this->driverlabel)
-	 */
-	function liste_modeles($db,$maxfilenamelength=0)
-	{
+     */
+    function liste_modeles($db,$maxfilenamelength=0)
+    {
         // phpcs:enable
-		dol_syslog(get_class($this)."::liste_modeles");
+        dol_syslog(get_class($this)."::liste_modeles");
 
-		$dir=DOL_DOCUMENT_ROOT."/core/modules/export/";
-		$handle=opendir($dir);
+        $dir=DOL_DOCUMENT_ROOT."/core/modules/export/";
+        $handle=opendir($dir);
 
-		// Recherche des fichiers drivers exports disponibles
-		$i=0;
+        // Recherche des fichiers drivers exports disponibles
+        $i=0;
         if (is_resource($handle))
         {
-    		while (($file = readdir($handle))!==false)
-    		{
-    			if (preg_match("/^export_(.*)\.modules\.php$/i",$file,$reg))
-    			{
-    				$moduleid=$reg[1];
-
-    				// Loading Class
-    				$file = $dir."export_".$moduleid.".modules.php";
-    				$classname = "Export".ucfirst($moduleid);
-
-    				require_once $file;
-    				if (class_exists($classname))
-    				{
-        				$module = new $classname($db);
-
-        				// Picto
-        				$this->picto[$module->id]=$module->picto;
-        				// Driver properties
-        				$this->driverlabel[$module->id]=$module->getDriverLabel().(empty($module->disabled)?'':' __(Disabled)__');	// '__(Disabled)__' is a key
-        				$this->driverdesc[$module->id]=$module->getDriverDesc();
-        				$this->driverversion[$module->id]=$module->getDriverVersion();
-        				// If use an external lib
-        				$this->liblabel[$module->id]=$module->getLibLabel();
-        				$this->libversion[$module->id]=$module->getLibVersion();
-    				}
-    				$i++;
-    			}
-    		}
-    		closedir($handle);
+            while (($file = readdir($handle))!==false)
+            {
+                if (preg_match("/^export_(.*)\.modules\.php$/i",$file,$reg))
+                {
+                    $moduleid=$reg[1];
+
+                    // Loading Class
+                    $file = $dir."export_".$moduleid.".modules.php";
+                    $classname = "Export".ucfirst($moduleid);
+
+                    require_once $file;
+                    if (class_exists($classname))
+                    {
+                        $module = new $classname($db);
+
+                        // Picto
+                        $this->picto[$module->id]=$module->picto;
+                        // Driver properties
+                        $this->driverlabel[$module->id]=$module->getDriverLabel().(empty($module->disabled)?'':' __(Disabled)__');	// '__(Disabled)__' is a key
+                        $this->driverdesc[$module->id]=$module->getDriverDesc();
+                        $this->driverversion[$module->id]=$module->getDriverVersion();
+                        // If use an external lib
+                        $this->liblabel[$module->id]=$module->getLibLabel();
+                        $this->libversion[$module->id]=$module->getLibVersion();
+                    }
+                    $i++;
+                }
+            }
+            closedir($handle);
         }
 
         asort($this->driverlabel);
 
-		return $this->driverlabel;
-	}
-
-
-	/**
-	 *  Return picto of export driver
-	 *
-	 *  @param	string	$key	Key of driver
-	 *  @return	string			Picto string
-	 */
-	function getPictoForKey($key)
-	{
-		return $this->picto[$key];
-	}
-
-	/**
-	 *  Renvoi libelle d'un driver export
-	 *
-	 *  @param	string	$key	Key of driver
-	 *  @return	string			Label
-	 */
-	function getDriverLabelForKey($key)
-	{
-		return $this->driverlabel[$key];
-	}
-
-	/**
-	 *  Renvoi le descriptif d'un driver export
-	 *
-	 *  @param	string	$key	Key of driver
-	 *  @return	string			Description
-	 */
-	function getDriverDescForKey($key)
-	{
-		return $this->driverdesc[$key];
-	}
-
-	/**
-	 *  Renvoi version d'un driver export
-	 *
-	 *  @param	string	$key	Key of driver
-	 *  @return	string			Driver version
-	 */
-	function getDriverVersionForKey($key)
-	{
-		return $this->driverversion[$key];
-	}
-
-	/**
-	 *  Renvoi libelle de librairie externe du driver
-	 *
-	 *  @param	string	$key	Key of driver
-	 *  @return	string			Label of library
-	 */
-	function getLibLabelForKey($key)
-	{
-		return $this->liblabel[$key];
-	}
-
-	/**
-	 *  Renvoi version de librairie externe du driver
-	 *
-	 *  @param	string	$key	Key of driver
-	 *  @return	string			Version of library
-	 */
-	function getLibVersionForKey($key)
-	{
-		return $this->libversion[$key];
-	}
+        return $this->driverlabel;
+    }
+
+
+    /**
+     *  Return picto of export driver
+     *
+     *  @param	string	$key	Key of driver
+     *  @return	string			Picto string
+     */
+    function getPictoForKey($key)
+    {
+        return $this->picto[$key];
+    }
+
+    /**
+     *  Renvoi libelle d'un driver export
+     *
+     *  @param	string	$key	Key of driver
+     *  @return	string			Label
+     */
+    function getDriverLabelForKey($key)
+    {
+        return $this->driverlabel[$key];
+    }
+
+    /**
+     *  Renvoi le descriptif d'un driver export
+     *
+     *  @param	string	$key	Key of driver
+     *  @return	string			Description
+     */
+    function getDriverDescForKey($key)
+    {
+        return $this->driverdesc[$key];
+    }
+
+    /**
+     *  Renvoi version d'un driver export
+     *
+     *  @param	string	$key	Key of driver
+     *  @return	string			Driver version
+     */
+    function getDriverVersionForKey($key)
+    {
+        return $this->driverversion[$key];
+    }
+
+    /**
+     *  Renvoi libelle de librairie externe du driver
+     *
+     *  @param	string	$key	Key of driver
+     *  @return	string			Label of library
+     */
+    function getLibLabelForKey($key)
+    {
+        return $this->liblabel[$key];
+    }
+
+    /**
+     *  Renvoi version de librairie externe du driver
+     *
+     *  @param	string	$key	Key of driver
+     *  @return	string			Version of library
+     */
+    function getLibVersionForKey($key)
+    {
+        return $this->libversion[$key];
+    }
 }

Spacing +18 added lines, -18 removed lines

@@ -33,15 +33,15 @@ 
 	/**
 	 * @var string Error code (or message)
 	 */
-	public $error='';
+	public $error = '';
 
-	public $driverlabel=array();
+	public $driverlabel = array();
 
-	public $driverversion=array();
+	public $driverversion = array();
 
-	public $liblabel=array();
+	public $liblabel = array();
 
-	public $libversion=array();
+	public $libversion = array();
 
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
@@ -52,23 +52,23 @@ 
      *  @param  integer	$maxfilenamelength  Max length of value to show
      *  @return	array						List of templates (same content than array this->driverlabel)
 	 */
-	function liste_modeles($db,$maxfilenamelength=0)
+	function liste_modeles($db, $maxfilenamelength = 0)
 	{
         // phpcs:enable
 		dol_syslog(get_class($this)."::liste_modeles");
 
-		$dir=DOL_DOCUMENT_ROOT."/core/modules/export/";
-		$handle=opendir($dir);
+		$dir = DOL_DOCUMENT_ROOT."/core/modules/export/";
+		$handle = opendir($dir);
 
 		// Recherche des fichiers drivers exports disponibles
-		$i=0;
+		$i = 0;
         if (is_resource($handle))
         {
-    		while (($file = readdir($handle))!==false)
+    		while (($file = readdir($handle)) !== false)
     		{
-    			if (preg_match("/^export_(.*)\.modules\.php$/i",$file,$reg))
+    			if (preg_match("/^export_(.*)\.modules\.php$/i", $file, $reg))
     			{
-    				$moduleid=$reg[1];
+    				$moduleid = $reg[1];
 
     				// Loading Class
     				$file = $dir."export_".$moduleid.".modules.php";
@@ -80,14 +80,14 @@ 
         				$module = new $classname($db);
 
         				// Picto
-        				$this->picto[$module->id]=$module->picto;
+        				$this->picto[$module->id] = $module->picto;
         				// Driver properties
-        				$this->driverlabel[$module->id]=$module->getDriverLabel().(empty($module->disabled)?'':' __(Disabled)__');	// '__(Disabled)__' is a key
-        				$this->driverdesc[$module->id]=$module->getDriverDesc();
-        				$this->driverversion[$module->id]=$module->getDriverVersion();
+        				$this->driverlabel[$module->id] = $module->getDriverLabel().(empty($module->disabled) ? '' : ' __(Disabled)__'); // '__(Disabled)__' is a key
+        				$this->driverdesc[$module->id] = $module->getDriverDesc();
+        				$this->driverversion[$module->id] = $module->getDriverVersion();
         				// If use an external lib
-        				$this->liblabel[$module->id]=$module->getLibLabel();
-        				$this->libversion[$module->id]=$module->getLibVersion();
+        				$this->liblabel[$module->id] = $module->getLibLabel();
+        				$this->libversion[$module->id] = $module->getLibVersion();
     				}
     				$i++;
     			}

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

Indentation +10 added lines, -10 removed lines

@@ -31,24 +31,24 @@ 
 class modModuleBuilder extends DolibarrModules
 {
     /**
-	 *   Constructor. Define names, constants, directories, boxes, permissions
-	 *
-	 *   @param      DoliDB		$db      Database handler
+     *   Constructor. Define names, constants, directories, boxes, permissions
+     *
+     *   @param      DoliDB		$db      Database handler
      */
     function __construct($db)
     {
-    	global $langs,$conf;
+        global $langs,$conf;
 
         $this->db = $db;
         $this->numero = 3300;
 
-		// Family can be 'crm','financial','hr','projects','products','ecm','technic','other'
-		// It is used to group modules in module setup page
+        // Family can be 'crm','financial','hr','projects','products','ecm','technic','other'
+        // It is used to group modules in module setup page
         $this->family = "technic";
         // 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 = "A RAD (Rapid Application Development) tool to help developers to build their own module.";
-		// Possible values for version are: 'development', 'experimental', 'dolibarr' or version
+        // Possible values for version are: 'development', 'experimental', 'dolibarr' or version
         $this->version = 'dolibarr';
         // Key used in llx_const table to save module status enabled/disabled (where MYMODULE is value of property name of module in uppercase)
         $this->const_name = 'MAIN_MODULE_'.strtoupper($this->name);
@@ -64,10 +64,10 @@ 
 
         // Dependencies
         //-------------
-	    $this->hidden = false;	// A condition to disable module
-	    $this->depends = array();		// List of modules id that must be enabled if this module is enabled
+        $this->hidden = false;	// A condition to disable module
+        $this->depends = array();		// List of modules id that must be enabled if this module is enabled
         $this->requiredby = array();	// List of modules id to disable if this one is disabled
-	    $this->conflictwith = array();	// List of modules id this module is in conflict with
+        $this->conflictwith = array();	// List of modules id this module is in conflict with
         $this->langfiles = array();
 
         // Constants

Spacing +9 added lines, -9 removed lines

@@ -23,7 +23,7 @@ 
  *  \ingroup    blockedlog
  *  \brief      Description and activation file for module ModuleBuilder
  */
-include_once DOL_DOCUMENT_ROOT .'/core/modules/DolibarrModules.class.php';
+include_once DOL_DOCUMENT_ROOT.'/core/modules/DolibarrModules.class.php';
 
 /**
  *	Class to describe a ModuleBuilder module
@@ -37,7 +37,7 @@ 
      */
     function __construct($db)
     {
-    	global $langs,$conf;
+    	global $langs, $conf;
 
         $this->db = $db;
         $this->numero = 3300;
@@ -46,14 +46,14 @@ 
 		// It is used to group modules in module setup page
         $this->family = "technic";
         // 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->name = preg_replace('/^mod/i', '', get_class($this));
         $this->description = "A RAD (Rapid Application Development) tool to help developers to build their own module.";
 		// Possible values for version are: 'development', 'experimental', 'dolibarr' or version
         $this->version = 'dolibarr';
         // Key used in llx_const table to save module status enabled/disabled (where MYMODULE is value of property name of module in uppercase)
         $this->const_name = 'MAIN_MODULE_'.strtoupper($this->name);
         // Name of image file used for this module.
-        $this->picto='technic';
+        $this->picto = 'technic';
 
         // Data directories to create when module is enabled
         $this->dirs = array();
@@ -64,10 +64,10 @@ 
 
         // Dependencies
         //-------------
-	    $this->hidden = false;	// A condition to disable module
-	    $this->depends = array();		// List of modules id that must be enabled if this module is enabled
-        $this->requiredby = array();	// List of modules id to disable if this one is disabled
-	    $this->conflictwith = array();	// List of modules id this module is in conflict with
+	    $this->hidden = false; // A condition to disable module
+	    $this->depends = array(); // List of modules id that must be enabled if this module is enabled
+        $this->requiredby = array(); // List of modules id to disable if this one is disabled
+	    $this->conflictwith = array(); // List of modules id this module is in conflict with
         $this->langfiles = array();
 
         // Constants
@@ -86,7 +86,7 @@ 
         //------------------
         $this->menu = array();
 
-        $this->menu[$r]=array('fk_menu'=>'fk_mainmenu=home,fk_leftmenu=admintools',
+        $this->menu[$r] = array('fk_menu'=>'fk_mainmenu=home,fk_leftmenu=admintools',
             'type'=>'left',
             'titre'=>'ModuleBuilder',
             'mainmenu'=>'home',

dolibarr/htdocs/core/modules/syslog/mod_syslog_chromephp.php

Indentation +162 added lines, -162 removed lines

@@ -7,168 +7,168 @@
  */
 class mod_syslog_chromephp extends LogHandler implements LogHandlerInterface
 {
-	var $code = 'chromephp';
-
-	/**
-	 * 	Return name of logger
-	 *
-	 * 	@return	string		Name of logger
-	 */
-	public function getName()
-	{
-		return 'ChromePHP';
-	}
-
-	/**
-	 * Version of the module ('x.y.z' or 'dolibarr' or 'experimental' or 'development')
-	 *
-	 * @return string
-	 */
-	public function getVersion()
-	{
-		return 'dolibarr';
-	}
-
-	/**
-	 * Content of the info tooltip.
-	 *
-	 * @return string
-	 */
-	public function getInfo()
-	{
-		return '';
-	}
-
-	/**
-	 * Return warning if something is wrong with logger
-	 *
-	 * @return string
-	 */
-	public function getWarning()
-	{
-		global $langs;
-
-		return ($this->isActive() == 1)?'':$langs->trans('ClassNotFoundIntoPathWarning','ChromePhp.class.php');
-	}
+    var $code = 'chromephp';
+
+    /**
+     * 	Return name of logger
+     *
+     * 	@return	string		Name of logger
+     */
+    public function getName()
+    {
+        return 'ChromePHP';
+    }
+
+    /**
+     * Version of the module ('x.y.z' or 'dolibarr' or 'experimental' or 'development')
+     *
+     * @return string
+     */
+    public function getVersion()
+    {
+        return 'dolibarr';
+    }
+
+    /**
+     * Content of the info tooltip.
+     *
+     * @return string
+     */
+    public function getInfo()
+    {
+        return '';
+    }
+
+    /**
+     * Return warning if something is wrong with logger
+     *
+     * @return string
+     */
+    public function getWarning()
+    {
+        global $langs;
+
+        return ($this->isActive() == 1)?'':$langs->trans('ClassNotFoundIntoPathWarning','ChromePhp.class.php');
+    }
 	
-	/**
-	 * Is the module active ?
-	 *
-	 * @return int         -1 if not active, 0 if active but lib/path not found, 1 if OK
-	 */
-	public function isActive()
-	{
-		global $conf;
-		try
-		{
-			if (empty($conf->global->SYSLOG_CHROMEPHP_INCLUDEPATH)) {
-				$conf->global->SYSLOG_CHROMEPHP_INCLUDEPATH = DOL_DOCUMENT_ROOT . '/includes/ccampbell/chromephp/';
-			}
-			set_include_path($conf->global->SYSLOG_CHROMEPHP_INCLUDEPATH);
-
-		    $res = @include_once 'ChromePhp.php';
-		    if (! $res) $res=@include_once 'ChromePhp.class.php';
-
-		    restore_include_path();
-
-		    if ($res)
-		    {
-        		return empty($conf->global->SYSLOG_DISABLE_LOGHANDLER_CHROMEPHP)?1:0;    // Set SYSLOG_DISABLE_LOGHANDLER_CHROMEPHP to 1 to disable this loghandler
-		    }
-		    else
-		    {
-		        return 0;
-		    }
-		}
-		catch(Exception $e)
-		{
-		    print '<!-- ChromePHP not available into PHP -->'."\n";
-		}
-
-		return -1;
-	}
-
-	/**
-	 * 	Return array of configuration data
-	 *
-	 * 	@return	array		Return array of configuration data
-	 */
-	public function configure()
-	{
-		global $langs;
-
-		return array(
-			array(
-				'name' => $langs->trans('IncludePath','SYSLOG_CHROMEPHP_INCLUDEPATH'),
-				'constant' => 'SYSLOG_CHROMEPHP_INCLUDEPATH',
-				'default' => DOL_DOCUMENT_ROOT . '/includes/ccampbell/chromephp/',
-				'attr' => 'size="60"',
-			    'example' =>'/usr/share/php, '.DOL_DOCUMENT_ROOT . '/includes/ccampbell/chromephp/'
-			)
-		);
-	}
-
-	/**
-	 * 	Return if configuration is valid
-	 *
-	 * 	@return	array		Array of errors. Empty array if ok.
-	 */
-	public function checkConfiguration()
-	{
-		global $langs,$conf;
-
-		$errors = array();
-
-		if (! file_exists($conf->global->SYSLOG_CHROMEPHP_INCLUDEPATH.'/ChromePhp.php') && ! file_exists($conf->global->SYSLOG_CHROMEPHP_INCLUDEPATH.'/ChromePhp.class.php'))
-		{
-			$conf->global->MAIN_SYSLOG_DISABLE_CHROMEPHP = 1; // avoid infinite loop
-			if (is_object($langs))   // $langs may not be defined yet.
-			{
-				$errors[] = $langs->trans("ErrorFailedToOpenFile", 'ChromePhp.class.php or ChromePhp.php');
-			}
-			else
-			{
-				$errors[] = "ErrorFailedToOpenFile ChromePhp.class.php or ChromePhp.php";
-			}
-		}
-
-		return $errors;
-	}
-
-	/**
-	 * 	Output log content. We also start output buffering at first log write.
-	 *
-	 *	@param	array	$content	Content to log
-	 * 	@return	null|false
-	 */
-	public function export($content)
-	{
-		global $conf;
-
-		if (! empty($conf->global->MAIN_SYSLOG_DISABLE_CHROMEPHP)) return;	// Global option to disable output of this handler
-
-		//We check the configuration to avoid showing PHP warnings
-		if (count($this->checkConfiguration()) > 0) return false;
-
-		try
-		{
-			// Warning ChromePHP must be into PHP include path. It is not possible to use into require_once a constant from
-			// database or config file because we must be able to log data before database or config file read.
-			$oldinclude=get_include_path();
-			set_include_path($conf->global->SYSLOG_CHROMEPHP_INCLUDEPATH);
-		    $res = @include_once 'ChromePhp.php';
-		    if (! $res) $res=@include_once 'ChromePhp.class.php';
-			set_include_path($oldinclude);
+    /**
+     * Is the module active ?
+     *
+     * @return int         -1 if not active, 0 if active but lib/path not found, 1 if OK
+     */
+    public function isActive()
+    {
+        global $conf;
+        try
+        {
+            if (empty($conf->global->SYSLOG_CHROMEPHP_INCLUDEPATH)) {
+                $conf->global->SYSLOG_CHROMEPHP_INCLUDEPATH = DOL_DOCUMENT_ROOT . '/includes/ccampbell/chromephp/';
+            }
+            set_include_path($conf->global->SYSLOG_CHROMEPHP_INCLUDEPATH);
+
+            $res = @include_once 'ChromePhp.php';
+            if (! $res) $res=@include_once 'ChromePhp.class.php';
+
+            restore_include_path();
+
+            if ($res)
+            {
+                return empty($conf->global->SYSLOG_DISABLE_LOGHANDLER_CHROMEPHP)?1:0;    // Set SYSLOG_DISABLE_LOGHANDLER_CHROMEPHP to 1 to disable this loghandler
+            }
+            else
+            {
+                return 0;
+            }
+        }
+        catch(Exception $e)
+        {
+            print '<!-- ChromePHP not available into PHP -->'."\n";
+        }
+
+        return -1;
+    }
+
+    /**
+     * 	Return array of configuration data
+     *
+     * 	@return	array		Return array of configuration data
+     */
+    public function configure()
+    {
+        global $langs;
+
+        return array(
+            array(
+                'name' => $langs->trans('IncludePath','SYSLOG_CHROMEPHP_INCLUDEPATH'),
+                'constant' => 'SYSLOG_CHROMEPHP_INCLUDEPATH',
+                'default' => DOL_DOCUMENT_ROOT . '/includes/ccampbell/chromephp/',
+                'attr' => 'size="60"',
+                'example' =>'/usr/share/php, '.DOL_DOCUMENT_ROOT . '/includes/ccampbell/chromephp/'
+            )
+        );
+    }
+
+    /**
+     * 	Return if configuration is valid
+     *
+     * 	@return	array		Array of errors. Empty array if ok.
+     */
+    public function checkConfiguration()
+    {
+        global $langs,$conf;
+
+        $errors = array();
+
+        if (! file_exists($conf->global->SYSLOG_CHROMEPHP_INCLUDEPATH.'/ChromePhp.php') && ! file_exists($conf->global->SYSLOG_CHROMEPHP_INCLUDEPATH.'/ChromePhp.class.php'))
+        {
+            $conf->global->MAIN_SYSLOG_DISABLE_CHROMEPHP = 1; // avoid infinite loop
+            if (is_object($langs))   // $langs may not be defined yet.
+            {
+                $errors[] = $langs->trans("ErrorFailedToOpenFile", 'ChromePhp.class.php or ChromePhp.php');
+            }
+            else
+            {
+                $errors[] = "ErrorFailedToOpenFile ChromePhp.class.php or ChromePhp.php";
+            }
+        }
+
+        return $errors;
+    }
+
+    /**
+     * 	Output log content. We also start output buffering at first log write.
+     *
+     *	@param	array	$content	Content to log
+     * 	@return	null|false
+     */
+    public function export($content)
+    {
+        global $conf;
+
+        if (! empty($conf->global->MAIN_SYSLOG_DISABLE_CHROMEPHP)) return;	// Global option to disable output of this handler
+
+        //We check the configuration to avoid showing PHP warnings
+        if (count($this->checkConfiguration()) > 0) return false;
+
+        try
+        {
+            // Warning ChromePHP must be into PHP include path. It is not possible to use into require_once a constant from
+            // database or config file because we must be able to log data before database or config file read.
+            $oldinclude=get_include_path();
+            set_include_path($conf->global->SYSLOG_CHROMEPHP_INCLUDEPATH);
+            $res = @include_once 'ChromePhp.php';
+            if (! $res) $res=@include_once 'ChromePhp.class.php';
+            set_include_path($oldinclude);
 			
-			ob_start();	// To be sure headers are not flushed until all page is completely processed
-			if ($content['level'] == LOG_ERR) ChromePhp::error($content['message']);
-			elseif ($content['level'] == LOG_WARNING) ChromePhp::warn($content['message']);
-			elseif ($content['level'] == LOG_INFO) ChromePhp::log($content['message']);
-			else ChromePhp::log($content['message']);
-		}
-		catch (Exception $e)
-		{
-			// Do not use dol_syslog here to avoid infinite loop
-		}
-	}
+            ob_start();	// To be sure headers are not flushed until all page is completely processed
+            if ($content['level'] == LOG_ERR) ChromePhp::error($content['message']);
+            elseif ($content['level'] == LOG_WARNING) ChromePhp::warn($content['message']);
+            elseif ($content['level'] == LOG_INFO) ChromePhp::log($content['message']);
+            else ChromePhp::log($content['message']);
+        }
+        catch (Exception $e)
+        {
+            // Do not use dol_syslog here to avoid infinite loop
+        }
+    }
 }

Spacing +14 added lines, -14 removed lines

@@ -48,7 +48,7 @@ 
 	{
 		global $langs;
 
-		return ($this->isActive() == 1)?'':$langs->trans('ClassNotFoundIntoPathWarning','ChromePhp.class.php');
+		return ($this->isActive() == 1) ? '' : $langs->trans('ClassNotFoundIntoPathWarning', 'ChromePhp.class.php');
 	}
 	
 	/**
@@ -62,25 +62,25 @@ 
 		try
 		{
 			if (empty($conf->global->SYSLOG_CHROMEPHP_INCLUDEPATH)) {
-				$conf->global->SYSLOG_CHROMEPHP_INCLUDEPATH = DOL_DOCUMENT_ROOT . '/includes/ccampbell/chromephp/';
+				$conf->global->SYSLOG_CHROMEPHP_INCLUDEPATH = DOL_DOCUMENT_ROOT.'/includes/ccampbell/chromephp/';
 			}
 			set_include_path($conf->global->SYSLOG_CHROMEPHP_INCLUDEPATH);
 
 		    $res = @include_once 'ChromePhp.php';
-		    if (! $res) $res=@include_once 'ChromePhp.class.php';
+		    if (!$res) $res = @include_once 'ChromePhp.class.php';
 
 		    restore_include_path();
 
 		    if ($res)
 		    {
-        		return empty($conf->global->SYSLOG_DISABLE_LOGHANDLER_CHROMEPHP)?1:0;    // Set SYSLOG_DISABLE_LOGHANDLER_CHROMEPHP to 1 to disable this loghandler
+        		return empty($conf->global->SYSLOG_DISABLE_LOGHANDLER_CHROMEPHP) ? 1 : 0; // Set SYSLOG_DISABLE_LOGHANDLER_CHROMEPHP to 1 to disable this loghandler
 		    }
 		    else
 		    {
 		        return 0;
 		    }
 		}
-		catch(Exception $e)
+		catch (Exception $e)
 		{
 		    print '<!-- ChromePHP not available into PHP -->'."\n";
 		}
@@ -99,11 +99,11 @@ 
 
 		return array(
 			array(
-				'name' => $langs->trans('IncludePath','SYSLOG_CHROMEPHP_INCLUDEPATH'),
+				'name' => $langs->trans('IncludePath', 'SYSLOG_CHROMEPHP_INCLUDEPATH'),
 				'constant' => 'SYSLOG_CHROMEPHP_INCLUDEPATH',
-				'default' => DOL_DOCUMENT_ROOT . '/includes/ccampbell/chromephp/',
+				'default' => DOL_DOCUMENT_ROOT.'/includes/ccampbell/chromephp/',
 				'attr' => 'size="60"',
-			    'example' =>'/usr/share/php, '.DOL_DOCUMENT_ROOT . '/includes/ccampbell/chromephp/'
+			    'example' =>'/usr/share/php, '.DOL_DOCUMENT_ROOT.'/includes/ccampbell/chromephp/'
 			)
 		);
 	}
@@ -115,11 +115,11 @@ 
 	 */
 	public function checkConfiguration()
 	{
-		global $langs,$conf;
+		global $langs, $conf;
 
 		$errors = array();
 
-		if (! file_exists($conf->global->SYSLOG_CHROMEPHP_INCLUDEPATH.'/ChromePhp.php') && ! file_exists($conf->global->SYSLOG_CHROMEPHP_INCLUDEPATH.'/ChromePhp.class.php'))
+		if (!file_exists($conf->global->SYSLOG_CHROMEPHP_INCLUDEPATH.'/ChromePhp.php') && !file_exists($conf->global->SYSLOG_CHROMEPHP_INCLUDEPATH.'/ChromePhp.class.php'))
 		{
 			$conf->global->MAIN_SYSLOG_DISABLE_CHROMEPHP = 1; // avoid infinite loop
 			if (is_object($langs))   // $langs may not be defined yet.
@@ -145,7 +145,7 @@ 
 	{
 		global $conf;
 
-		if (! empty($conf->global->MAIN_SYSLOG_DISABLE_CHROMEPHP)) return;	// Global option to disable output of this handler
+		if (!empty($conf->global->MAIN_SYSLOG_DISABLE_CHROMEPHP)) return; // Global option to disable output of this handler
 
 		//We check the configuration to avoid showing PHP warnings
 		if (count($this->checkConfiguration()) > 0) return false;
@@ -154,13 +154,13 @@ 
 		{
 			// Warning ChromePHP must be into PHP include path. It is not possible to use into require_once a constant from
 			// database or config file because we must be able to log data before database or config file read.
-			$oldinclude=get_include_path();
+			$oldinclude = get_include_path();
 			set_include_path($conf->global->SYSLOG_CHROMEPHP_INCLUDEPATH);
 		    $res = @include_once 'ChromePhp.php';
-		    if (! $res) $res=@include_once 'ChromePhp.class.php';
+		    if (!$res) $res = @include_once 'ChromePhp.class.php';
 			set_include_path($oldinclude);
 			
-			ob_start();	// To be sure headers are not flushed until all page is completely processed
+			ob_start(); // To be sure headers are not flushed until all page is completely processed
 			if ($content['level'] == LOG_ERR) ChromePhp::error($content['message']);
 			elseif ($content['level'] == LOG_WARNING) ChromePhp::warn($content['message']);
 			elseif ($content['level'] == LOG_INFO) ChromePhp::log($content['message']);

Braces +28 added lines, -16 removed lines

@@ -67,20 +67,20 @@ 
 			set_include_path($conf->global->SYSLOG_CHROMEPHP_INCLUDEPATH);
 
 		    $res = @include_once 'ChromePhp.php';
-		    if (! $res) $res=@include_once 'ChromePhp.class.php';
+		    if (! $res) {
+		        $res=@include_once 'ChromePhp.class.php';
+		    }
 
 		    restore_include_path();
 
 		    if ($res)
 		    {
         		return empty($conf->global->SYSLOG_DISABLE_LOGHANDLER_CHROMEPHP)?1:0;    // Set SYSLOG_DISABLE_LOGHANDLER_CHROMEPHP to 1 to disable this loghandler
-		    }
-		    else
+		    } else
 		    {
 		        return 0;
 		    }
-		}
-		catch(Exception $e)
+		} catch(Exception $e)
 		{
 		    print '<!-- ChromePHP not available into PHP -->'."\n";
 		}
@@ -122,11 +122,12 @@ 
 		if (! file_exists($conf->global->SYSLOG_CHROMEPHP_INCLUDEPATH.'/ChromePhp.php') && ! file_exists($conf->global->SYSLOG_CHROMEPHP_INCLUDEPATH.'/ChromePhp.class.php'))
 		{
 			$conf->global->MAIN_SYSLOG_DISABLE_CHROMEPHP = 1; // avoid infinite loop
-			if (is_object($langs))   // $langs may not be defined yet.
+			if (is_object($langs)) {
+			    // $langs may not be defined yet.
 			{
 				$errors[] = $langs->trans("ErrorFailedToOpenFile", 'ChromePhp.class.php or ChromePhp.php');
 			}
-			else
+			} else
 			{
 				$errors[] = "ErrorFailedToOpenFile ChromePhp.class.php or ChromePhp.php";
 			}
@@ -145,10 +146,15 @@ 
 	{
 		global $conf;
 
-		if (! empty($conf->global->MAIN_SYSLOG_DISABLE_CHROMEPHP)) return;	// Global option to disable output of this handler
+		if (! empty($conf->global->MAIN_SYSLOG_DISABLE_CHROMEPHP)) {
+		    return;
+		}
+		// Global option to disable output of this handler
 
 		//We check the configuration to avoid showing PHP warnings
-		if (count($this->checkConfiguration()) > 0) return false;
+		if (count($this->checkConfiguration()) > 0) {
+		    return false;
+		}
 
 		try
 		{
@@ -157,16 +163,22 @@ 
 			$oldinclude=get_include_path();
 			set_include_path($conf->global->SYSLOG_CHROMEPHP_INCLUDEPATH);
 		    $res = @include_once 'ChromePhp.php';
-		    if (! $res) $res=@include_once 'ChromePhp.class.php';
+		    if (! $res) {
+		        $res=@include_once 'ChromePhp.class.php';
+		    }
 			set_include_path($oldinclude);
 			
 			ob_start();	// To be sure headers are not flushed until all page is completely processed
-			if ($content['level'] == LOG_ERR) ChromePhp::error($content['message']);
-			elseif ($content['level'] == LOG_WARNING) ChromePhp::warn($content['message']);
-			elseif ($content['level'] == LOG_INFO) ChromePhp::log($content['message']);
-			else ChromePhp::log($content['message']);
-		}
-		catch (Exception $e)
+			if ($content['level'] == LOG_ERR) {
+			    ChromePhp::error($content['message']);
+			} elseif ($content['level'] == LOG_WARNING) {
+			    ChromePhp::warn($content['message']);
+			} elseif ($content['level'] == LOG_INFO) {
+			    ChromePhp::log($content['message']);
+			} else {
+			    ChromePhp::log($content['message']);
+			}
+		} catch (Exception $e)
 		{
 			// Do not use dol_syslog here to avoid infinite loop
 		}

dolibarr/htdocs/core/modules/syslog/mod_syslog_syslog.php

Indentation +117 added lines, -117 removed lines

@@ -7,121 +7,121 @@
  */
 class mod_syslog_syslog extends LogHandler implements LogHandlerInterface
 {
-	var $code = 'syslog';
-
-	/**
-	 * 	Return name of logger
-	 *
-	 * 	@return	string		Name of logger
-	 */
-	public function getName()
-	{
-		return 'Syslog';
-	}
-
-	/**
-	 * Version of the module ('x.y.z' or 'dolibarr' or 'experimental' or 'development')
-	 *
-	 * @return string
-	 */
-	public function getVersion()
-	{
-		return 'dolibarr';
-	}
-
-	/**
-	 * Content of the info tooltip.
-	 *
-	 * @return false|string
-	 */
-	public function getInfo()
-	{
-		global $langs;
-
-		return $langs->trans('OnlyWindowsLOG_USER');
-	}
-
-	/**
-	 * Is the module active ?
-	 *
-	 * @return int
-	 */
-	public function isActive()
-	{
-	    global $conf;
-
-		// This function does not exists on some ISP (Ex: Free in France)
-		if (!function_exists('openlog')) return 0;
-
-		return empty($conf->global->SYSLOG_DISABLE_LOGHANDLER_SYSLOG)?1:0;    // Set SYSLOG_DISABLE_LOGHANDLER_SYSLOG to 1 to disable this loghandler
-	}
-
-	/**
-	 * 	Return array of configuration data
-	 *
-	 * 	@return	array		Return array of configuration data
-	 */
-	public function configure()
-	{
-		global $langs;
-
-		return array(
-			array(
-				'constant' => 'SYSLOG_FACILITY',
-				'name' => $langs->trans('SyslogFacility'),
-				'default' => 'LOG_USER'
-			)
-		);
-	}
-
-	/**
-	 * 	Return if configuration is valid
-	 *
-	 * 	@return	array		Array of errors. Empty array if ok.
-	 */
-	public function checkConfiguration()
-	{
-		global $conf, $langs;
-
-		$errors = array();
-
-	    $facility = constant($conf->global->SYSLOG_FACILITY);
-	    if ($facility)
-		{
-			// Only LOG_USER supported on Windows
-			if (! empty($_SERVER["WINDIR"])) $facility=constant('LOG_USER');
-
-			dol_syslog("admin/syslog: facility ".$facility);
-		}
-		else
-		{
-		    $errors[] = $langs->trans("ErrorUnknownSyslogConstant", $facility);
-		}
-
-		return $errors;
-	}
-
-	/**
-	 * Export the message
-	 *
-	 * @param  	array 	$content 	Array containing the info about the message
-	 * @return	void
-	 */
-	public function export($content)
-	{
-		global $conf;
-
-		if (! empty($conf->global->MAIN_SYSLOG_DISABLE_SYSLOG)) return;	// Global option to disable output of this handler
-
-		if (! empty($conf->global->SYSLOG_FACILITY))  // Example LOG_USER
-		{
-			$facility = constant($conf->global->SYSLOG_FACILITY);
-		}
-		else $facility = constant('LOG_USER');
-
-		// (int) is required to avoid error parameter 3 expected to be long
-		openlog('dolibarr', LOG_PID | LOG_PERROR, (int) $facility);
-		syslog($content['level'], $content['message']);
-		closelog();
-	}
+    var $code = 'syslog';
+
+    /**
+     * 	Return name of logger
+     *
+     * 	@return	string		Name of logger
+     */
+    public function getName()
+    {
+        return 'Syslog';
+    }
+
+    /**
+     * Version of the module ('x.y.z' or 'dolibarr' or 'experimental' or 'development')
+     *
+     * @return string
+     */
+    public function getVersion()
+    {
+        return 'dolibarr';
+    }
+
+    /**
+     * Content of the info tooltip.
+     *
+     * @return false|string
+     */
+    public function getInfo()
+    {
+        global $langs;
+
+        return $langs->trans('OnlyWindowsLOG_USER');
+    }
+
+    /**
+     * Is the module active ?
+     *
+     * @return int
+     */
+    public function isActive()
+    {
+        global $conf;
+
+        // This function does not exists on some ISP (Ex: Free in France)
+        if (!function_exists('openlog')) return 0;
+
+        return empty($conf->global->SYSLOG_DISABLE_LOGHANDLER_SYSLOG)?1:0;    // Set SYSLOG_DISABLE_LOGHANDLER_SYSLOG to 1 to disable this loghandler
+    }
+
+    /**
+     * 	Return array of configuration data
+     *
+     * 	@return	array		Return array of configuration data
+     */
+    public function configure()
+    {
+        global $langs;
+
+        return array(
+            array(
+                'constant' => 'SYSLOG_FACILITY',
+                'name' => $langs->trans('SyslogFacility'),
+                'default' => 'LOG_USER'
+            )
+        );
+    }
+
+    /**
+     * 	Return if configuration is valid
+     *
+     * 	@return	array		Array of errors. Empty array if ok.
+     */
+    public function checkConfiguration()
+    {
+        global $conf, $langs;
+
+        $errors = array();
+
+        $facility = constant($conf->global->SYSLOG_FACILITY);
+        if ($facility)
+        {
+            // Only LOG_USER supported on Windows
+            if (! empty($_SERVER["WINDIR"])) $facility=constant('LOG_USER');
+
+            dol_syslog("admin/syslog: facility ".$facility);
+        }
+        else
+        {
+            $errors[] = $langs->trans("ErrorUnknownSyslogConstant", $facility);
+        }
+
+        return $errors;
+    }
+
+    /**
+     * Export the message
+     *
+     * @param  	array 	$content 	Array containing the info about the message
+     * @return	void
+     */
+    public function export($content)
+    {
+        global $conf;
+
+        if (! empty($conf->global->MAIN_SYSLOG_DISABLE_SYSLOG)) return;	// Global option to disable output of this handler
+
+        if (! empty($conf->global->SYSLOG_FACILITY))  // Example LOG_USER
+        {
+            $facility = constant($conf->global->SYSLOG_FACILITY);
+        }
+        else $facility = constant('LOG_USER');
+
+        // (int) is required to avoid error parameter 3 expected to be long
+        openlog('dolibarr', LOG_PID | LOG_PERROR, (int) $facility);
+        syslog($content['level'], $content['message']);
+        closelog();
+    }
 }
\ No newline at end of file

Spacing +4 added lines, -4 removed lines

@@ -53,7 +53,7 @@ 
 		// This function does not exists on some ISP (Ex: Free in France)
 		if (!function_exists('openlog')) return 0;
 
-		return empty($conf->global->SYSLOG_DISABLE_LOGHANDLER_SYSLOG)?1:0;    // Set SYSLOG_DISABLE_LOGHANDLER_SYSLOG to 1 to disable this loghandler
+		return empty($conf->global->SYSLOG_DISABLE_LOGHANDLER_SYSLOG) ? 1 : 0; // Set SYSLOG_DISABLE_LOGHANDLER_SYSLOG to 1 to disable this loghandler
 	}
 
 	/**
@@ -89,7 +89,7 @@ 
 	    if ($facility)
 		{
 			// Only LOG_USER supported on Windows
-			if (! empty($_SERVER["WINDIR"])) $facility=constant('LOG_USER');
+			if (!empty($_SERVER["WINDIR"])) $facility = constant('LOG_USER');
 
 			dol_syslog("admin/syslog: facility ".$facility);
 		}
@@ -111,9 +111,9 @@ 
 	{
 		global $conf;
 
-		if (! empty($conf->global->MAIN_SYSLOG_DISABLE_SYSLOG)) return;	// Global option to disable output of this handler
+		if (!empty($conf->global->MAIN_SYSLOG_DISABLE_SYSLOG)) return; // Global option to disable output of this handler
 
-		if (! empty($conf->global->SYSLOG_FACILITY))  // Example LOG_USER
+		if (!empty($conf->global->SYSLOG_FACILITY))  // Example LOG_USER
 		{
 			$facility = constant($conf->global->SYSLOG_FACILITY);
 		}

Braces +16 added lines, -7 removed lines

@@ -51,7 +51,9 @@ 
 	    global $conf;
 
 		// This function does not exists on some ISP (Ex: Free in France)
-		if (!function_exists('openlog')) return 0;
+		if (!function_exists('openlog')) {
+		    return 0;
+		}
 
 		return empty($conf->global->SYSLOG_DISABLE_LOGHANDLER_SYSLOG)?1:0;    // Set SYSLOG_DISABLE_LOGHANDLER_SYSLOG to 1 to disable this loghandler
 	}
@@ -89,11 +91,12 @@ 
 	    if ($facility)
 		{
 			// Only LOG_USER supported on Windows
-			if (! empty($_SERVER["WINDIR"])) $facility=constant('LOG_USER');
+			if (! empty($_SERVER["WINDIR"])) {
+			    $facility=constant('LOG_USER');
+			}
 
 			dol_syslog("admin/syslog: facility ".$facility);
-		}
-		else
+		} else
 		{
 		    $errors[] = $langs->trans("ErrorUnknownSyslogConstant", $facility);
 		}
@@ -111,13 +114,19 @@ 
 	{
 		global $conf;
 
-		if (! empty($conf->global->MAIN_SYSLOG_DISABLE_SYSLOG)) return;	// Global option to disable output of this handler
+		if (! empty($conf->global->MAIN_SYSLOG_DISABLE_SYSLOG)) {
+		    return;
+		}
+		// Global option to disable output of this handler
 
-		if (! empty($conf->global->SYSLOG_FACILITY))  // Example LOG_USER
+		if (! empty($conf->global->SYSLOG_FACILITY)) {
+		    // Example LOG_USER
 		{
 			$facility = constant($conf->global->SYSLOG_FACILITY);
 		}
-		else $facility = constant('LOG_USER');
+		} else {
+		    $facility = constant('LOG_USER');
+		}
 
 		// (int) is required to avoid error parameter 3 expected to be long
 		openlog('dolibarr', LOG_PID | LOG_PERROR, (int) $facility);