alxarafe / alixar

dolibarr/htdocs/core/class/dolgraph.class.php

Indentation +945 added lines, -945 removed lines

@@ -39,941 +39,941 @@ 
  */
 class DolGraph
 {
-	public $type=array();			// Array with type of each series. Example: array('bars', 'lines', ...)
-	public $mode='side';		    // Mode bars graph: side, depth
-	private $_library='jflot';	// Graphic library to use (jflot, artichow)
-
-	//! Array of data
-	public $data;				// Data of graph: array(array('abs1',valA1,valB1), array('abs2',valA2,valB2), ...)
-	public $title;				// Title of graph
-	public $cssprefix='';		// To add into css styles
-	public $width=380;
-	public $height=200;
-	public $MaxValue=0;
-	public $MinValue=0;
-	public $SetShading=0;
-
-	public $PrecisionY=-1;
-
-	public $horizTickIncrement=-1;
-	public $SetNumXTicks=-1;
-	public $labelInterval=-1;
-
-	public $hideXGrid=false;
-	public $hideYGrid=false;
-
-	public $Legend=array();
-	public $LegendWidthMin=0;
-	public $showlegend=1;
-	public $showpointvalue=1;
-	public $showpercent=0;
-	public $combine=0;				// 0.05 if you want to combine records < 5% into "other"
-	public $graph;     			// Objet Graph (Artichow, Phplot...)
-
-	/**
-	 * @var string Error code (or message)
-	 */
-	public $error='';
-
-	public $bordercolor;			// array(R,G,B)
-	public $bgcolor;				// array(R,G,B)
-	public $bgcolorgrid=array(255,255,255);			// array(R,G,B)
-	public $datacolor;				// array(array(R,G,B),...)
-
-	private $stringtoshow;      // To store string to output graph into HTML page
-
-
-	/**
-	 * Constructor
-	 *
-	 * @param	string	$library		'jflot' (default) or 'artichow' (no more supported)
-	 */
-	function __construct($library='jflot')
-	{
-		global $conf;
-		global $theme_bordercolor, $theme_datacolor, $theme_bgcolor, $theme_bgcoloronglet;
-
-		// To use old feature
-		if ($library == 'artichow')
-		{
-			$this->_library='artichow';
-
-			// Test if module GD present
-			$modules_list = get_loaded_extensions();
-			$isgdinstalled=0;
-			foreach ($modules_list as $module)
-			{
-				if ($module == 'gd') $isgdinstalled=1;
-			}
-			if (! $isgdinstalled)
-			{
-				$this->error="Error: PHP GD module is not available. It is required to build graphics.";
-				return -1;
-			}
-		}
-
-		$this->bordercolor = array(235,235,224);
-		$this->datacolor = array(array(120,130,150), array(160,160,180), array(190,190,220));
-		$this->bgcolor = array(235,235,224);
-
-		$color_file = DOL_DOCUMENT_ROOT.'/theme/'.$conf->theme.'/graph-color.php';
-		if (is_readable($color_file))
-		{
-			include_once $color_file;
-			if (isset($theme_bordercolor)) $this->bordercolor = $theme_bordercolor;
-			if (isset($theme_datacolor))   $this->datacolor   = $theme_datacolor;
-			if (isset($theme_bgcolor))     $this->bgcolor     = $theme_bgcolor;
-		}
-		//print 'bgcolor: '.join(',',$this->bgcolor).'<br>';
-	}
+    public $type=array();			// Array with type of each series. Example: array('bars', 'lines', ...)
+    public $mode='side';		    // Mode bars graph: side, depth
+    private $_library='jflot';	// Graphic library to use (jflot, artichow)
+
+    //! Array of data
+    public $data;				// Data of graph: array(array('abs1',valA1,valB1), array('abs2',valA2,valB2), ...)
+    public $title;				// Title of graph
+    public $cssprefix='';		// To add into css styles
+    public $width=380;
+    public $height=200;
+    public $MaxValue=0;
+    public $MinValue=0;
+    public $SetShading=0;
+
+    public $PrecisionY=-1;
+
+    public $horizTickIncrement=-1;
+    public $SetNumXTicks=-1;
+    public $labelInterval=-1;
+
+    public $hideXGrid=false;
+    public $hideYGrid=false;
+
+    public $Legend=array();
+    public $LegendWidthMin=0;
+    public $showlegend=1;
+    public $showpointvalue=1;
+    public $showpercent=0;
+    public $combine=0;				// 0.05 if you want to combine records < 5% into "other"
+    public $graph;     			// Objet Graph (Artichow, Phplot...)
+
+    /**
+     * @var string Error code (or message)
+     */
+    public $error='';
+
+    public $bordercolor;			// array(R,G,B)
+    public $bgcolor;				// array(R,G,B)
+    public $bgcolorgrid=array(255,255,255);			// array(R,G,B)
+    public $datacolor;				// array(array(R,G,B),...)
+
+    private $stringtoshow;      // To store string to output graph into HTML page
+
+
+    /**
+     * Constructor
+     *
+     * @param	string	$library		'jflot' (default) or 'artichow' (no more supported)
+     */
+    function __construct($library='jflot')
+    {
+        global $conf;
+        global $theme_bordercolor, $theme_datacolor, $theme_bgcolor, $theme_bgcoloronglet;
+
+        // To use old feature
+        if ($library == 'artichow')
+        {
+            $this->_library='artichow';
+
+            // Test if module GD present
+            $modules_list = get_loaded_extensions();
+            $isgdinstalled=0;
+            foreach ($modules_list as $module)
+            {
+                if ($module == 'gd') $isgdinstalled=1;
+            }
+            if (! $isgdinstalled)
+            {
+                $this->error="Error: PHP GD module is not available. It is required to build graphics.";
+                return -1;
+            }
+        }
+
+        $this->bordercolor = array(235,235,224);
+        $this->datacolor = array(array(120,130,150), array(160,160,180), array(190,190,220));
+        $this->bgcolor = array(235,235,224);
+
+        $color_file = DOL_DOCUMENT_ROOT.'/theme/'.$conf->theme.'/graph-color.php';
+        if (is_readable($color_file))
+        {
+            include_once $color_file;
+            if (isset($theme_bordercolor)) $this->bordercolor = $theme_bordercolor;
+            if (isset($theme_datacolor))   $this->datacolor   = $theme_datacolor;
+            if (isset($theme_bgcolor))     $this->bgcolor     = $theme_bgcolor;
+        }
+        //print 'bgcolor: '.join(',',$this->bgcolor).'<br>';
+    }
 
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
-	/**
-	 * Set Y precision
-	 *
-	 * @param 	float	$which_prec		Precision
-	 * @return 	boolean
-	 */
-	function SetPrecisionY($which_prec)
-	{
+    /**
+     * Set Y precision
+     *
+     * @param 	float	$which_prec		Precision
+     * @return 	boolean
+     */
+    function SetPrecisionY($which_prec)
+    {
         // phpcs:enable
-		$this->PrecisionY = $which_prec;
-		return true;
-	}
+        $this->PrecisionY = $which_prec;
+        return true;
+    }
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
-	/**
-	 * Utiliser SetNumTicks ou SetHorizTickIncrement mais pas les 2
-	 *
-	 * @param 	float 		$xi		Xi
-	 * @return	boolean				True
-	 */
-	function SetHorizTickIncrement($xi)
-	{
+    /**
+     * Utiliser SetNumTicks ou SetHorizTickIncrement mais pas les 2
+     *
+     * @param 	float 		$xi		Xi
+     * @return	boolean				True
+     */
+    function SetHorizTickIncrement($xi)
+    {
         // phpcs:enable
-		$this->horizTickIncrement = $xi;
-		return true;
-	}
+        $this->horizTickIncrement = $xi;
+        return true;
+    }
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
-	/**
-	 * Utiliser SetNumTicks ou SetHorizTickIncrement mais pas les 2
-	 *
-	 * @param 	float 		$xt		Xt
-	 * @return	boolean				True
-	 */
-	function SetNumXTicks($xt)
-	{
+    /**
+     * Utiliser SetNumTicks ou SetHorizTickIncrement mais pas les 2
+     *
+     * @param 	float 		$xt		Xt
+     * @return	boolean				True
+     */
+    function SetNumXTicks($xt)
+    {
         // phpcs:enable
-		$this->SetNumXTicks = $xt;
-		return true;
-	}
+        $this->SetNumXTicks = $xt;
+        return true;
+    }
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
-	/**
-	 * Set label interval to reduce number of labels
-	 *
-	 * @param 	float 		$x		Label interval
-	 * @return	boolean				True
-	 */
-	function SetLabelInterval($x)
-	{
+    /**
+     * Set label interval to reduce number of labels
+     *
+     * @param 	float 		$x		Label interval
+     * @return	boolean				True
+     */
+    function SetLabelInterval($x)
+    {
         // phpcs:enable
-		$this->labelInterval = $x;
-		return true;
-	}
+        $this->labelInterval = $x;
+        return true;
+    }
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
-	/**
-	 * Hide X grid
-	 *
-	 * @param	boolean		$bool	XGrid or not
-	 * @return	boolean				true
-	 */
-	function SetHideXGrid($bool)
-	{
+    /**
+     * Hide X grid
+     *
+     * @param	boolean		$bool	XGrid or not
+     * @return	boolean				true
+     */
+    function SetHideXGrid($bool)
+    {
         // phpcs:enable
-		$this->hideXGrid = $bool;
-		return true;
-	}
+        $this->hideXGrid = $bool;
+        return true;
+    }
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
-	/**
-	 * Hide Y grid
-	 *
-	 * @param	boolean		$bool	YGrid or not
-	 * @return	boolean				true
-	 */
-	function SetHideYGrid($bool)
-	{
+    /**
+     * Hide Y grid
+     *
+     * @param	boolean		$bool	YGrid or not
+     * @return	boolean				true
+     */
+    function SetHideYGrid($bool)
+    {
         // phpcs:enable
-		$this->hideYGrid = $bool;
-		return true;
-	}
+        $this->hideYGrid = $bool;
+        return true;
+    }
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
-	/**
-	 * Set y label
-	 *
-	 * @param 	string	$label		Y label
-	 * @return	boolean|null				True
-	 */
-	function SetYLabel($label)
-	{
+    /**
+     * Set y label
+     *
+     * @param 	string	$label		Y label
+     * @return	boolean|null				True
+     */
+    function SetYLabel($label)
+    {
         // phpcs:enable
-		$this->YLabel = $label;
-	}
+        $this->YLabel = $label;
+    }
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
-	/**
-	 * Set width
-	 *
-	 * @param 	int		$w			Width
-	 * @return	boolean|null				True
-	 */
-	function SetWidth($w)
-	{
+    /**
+     * Set width
+     *
+     * @param 	int		$w			Width
+     * @return	boolean|null				True
+     */
+    function SetWidth($w)
+    {
         // phpcs:enable
-		$this->width = $w;
-	}
+        $this->width = $w;
+    }
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
-	/**
-	 * Set title
-	 *
-	 * @param 	string	$title		Title
-	 * @return	void
-	 */
-	function SetTitle($title)
-	{
+    /**
+     * Set title
+     *
+     * @param 	string	$title		Title
+     * @return	void
+     */
+    function SetTitle($title)
+    {
         // phpcs:enable
-		$this->title = $title;
-	}
+        $this->title = $title;
+    }
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
-	/**
-	 * Set data
-	 *
-	 * @param 	array	$data		Data
-	 * @return	void
-	 * @see draw_jflot for syntax of data array
-	 */
-	function SetData($data)
-	{
+    /**
+     * Set data
+     *
+     * @param 	array	$data		Data
+     * @return	void
+     * @see draw_jflot for syntax of data array
+     */
+    function SetData($data)
+    {
         // phpcs:enable
-		$this->data = $data;
-	}
+        $this->data = $data;
+    }
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
-	/**
-	 * Set data
-	 *
-	 * @param 	array	$datacolor		Data color array(array(R,G,B),array(R,G,B)...)
-	 * @return	void
-	 */
-	function SetDataColor($datacolor)
-	{
+    /**
+     * Set data
+     *
+     * @param 	array	$datacolor		Data color array(array(R,G,B),array(R,G,B)...)
+     * @return	void
+     */
+    function SetDataColor($datacolor)
+    {
         // phpcs:enable
-		$this->datacolor = $datacolor;
-	}
+        $this->datacolor = $datacolor;
+    }
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
-	/**
-	 * Set type
-	 *
-	 * @param 	array	$type		Array with type for each serie. Example: array('pie'), array('lines',...,'bars')
-	 * @return	void
-	 */
-	function SetType($type)
-	{
+    /**
+     * Set type
+     *
+     * @param 	array	$type		Array with type for each serie. Example: array('pie'), array('lines',...,'bars')
+     * @return	void
+     */
+    function SetType($type)
+    {
         // phpcs:enable
-		$this->type = $type;
-	}
+        $this->type = $type;
+    }
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
-	/**
-	 * Set legend
-	 *
-	 * @param 	array	$legend		Legend. Example: array('seriename1','seriname2',...)
-	 * @return	void
-	 */
-	function SetLegend($legend)
-	{
+    /**
+     * Set legend
+     *
+     * @param 	array	$legend		Legend. Example: array('seriename1','seriname2',...)
+     * @return	void
+     */
+    function SetLegend($legend)
+    {
         // phpcs:enable
-		$this->Legend = $legend;
-	}
+        $this->Legend = $legend;
+    }
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
-	/**
-	 * Set min width
-	 *
-	 * @param 	int		$legendwidthmin		Min width
-	 * @return	void
-	 */
-	function SetLegendWidthMin($legendwidthmin)
-	{
+    /**
+     * Set min width
+     *
+     * @param 	int		$legendwidthmin		Min width
+     * @return	void
+     */
+    function SetLegendWidthMin($legendwidthmin)
+    {
         // phpcs:enable
-		$this->LegendWidthMin = $legendwidthmin;
-	}
+        $this->LegendWidthMin = $legendwidthmin;
+    }
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
-	/**
-	 * Set max value
-	 *
-	 * @param 	int		$max			Max value
-	 * @return	void
-	 */
-	function SetMaxValue($max)
-	{
+    /**
+     * Set max value
+     *
+     * @param 	int		$max			Max value
+     * @return	void
+     */
+    function SetMaxValue($max)
+    {
         // phpcs:enable
-		$this->MaxValue = $max;
-	}
+        $this->MaxValue = $max;
+    }
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
-	/**
-	 * Get max value
-	 *
-	 * @return	int		Max value
-	 */
-	function GetMaxValue()
-	{
+    /**
+     * Get max value
+     *
+     * @return	int		Max value
+     */
+    function GetMaxValue()
+    {
         // phpcs:enable
-		return $this->MaxValue;
-	}
+        return $this->MaxValue;
+    }
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
-	/**
-	 * Set min value
-	 *
-	 * @param 	int		$min			Min value
-	 * @return	void
-	 */
-	function SetMinValue($min)
-	{
+    /**
+     * Set min value
+     *
+     * @param 	int		$min			Min value
+     * @return	void
+     */
+    function SetMinValue($min)
+    {
         // phpcs:enable
-		$this->MinValue = $min;
-	}
+        $this->MinValue = $min;
+    }
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
-	/**
-	 * Get min value
-	 *
-	 * @return	int		Max value
-	 */
-	function GetMinValue()
-	{
+    /**
+     * Get min value
+     *
+     * @return	int		Max value
+     */
+    function GetMinValue()
+    {
         // phpcs:enable
-		return $this->MinValue;
-	}
+        return $this->MinValue;
+    }
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
-	/**
-	 * Set height
-	 *
-	 * @param 	int		$h				Height
-	 * @return	void
-	 */
-	function SetHeight($h)
-	{
+    /**
+     * Set height
+     *
+     * @param 	int		$h				Height
+     * @return	void
+     */
+    function SetHeight($h)
+    {
         // phpcs:enable
-		$this->height = $h;
-	}
+        $this->height = $h;
+    }
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
-	/**
-	 * Set shading
-	 *
-	 * @param 	string	$s				Shading
-	 * @return	void
-	 */
-	function SetShading($s)
-	{
+    /**
+     * Set shading
+     *
+     * @param 	string	$s				Shading
+     * @return	void
+     */
+    function SetShading($s)
+    {
         // phpcs:enable
-		$this->SetShading = $s;
-	}
+        $this->SetShading = $s;
+    }
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
-	/**
-	 * Set shading
-	 *
-	 * @param 	string	$s				Shading
-	 * @return	void
-	 */
-	function SetCssPrefix($s)
-	{
+    /**
+     * Set shading
+     *
+     * @param 	string	$s				Shading
+     * @return	void
+     */
+    function SetCssPrefix($s)
+    {
         // phpcs:enable
-		$this->cssprefix = $s;
-	}
+        $this->cssprefix = $s;
+    }
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
-	/**
-	 * Reset bg color
-	 *
-	 * @return	void
-	 */
-	function ResetBgColor()
-	{
+    /**
+     * Reset bg color
+     *
+     * @return	void
+     */
+    function ResetBgColor()
+    {
         // phpcs:enable
-		unset($this->bgcolor);
-	}
+        unset($this->bgcolor);
+    }
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
-	/**
-	 * Reset bgcolorgrid
-	 *
-	 * @return	void
-	 */
-	function ResetBgColorGrid()
-	{
+    /**
+     * Reset bgcolorgrid
+     *
+     * @return	void
+     */
+    function ResetBgColorGrid()
+    {
         // phpcs:enable
-		unset($this->bgcolorgrid);
-	}
-
-	/**
-	 * Is graph ko
-	 *
-	 * @return	string		Error
-	 */
-	function isGraphKo()
-	{
-		return $this->error;
-	}
-
-	/**
-	 * Show legend or not
-	 *
-	 * @param	int		$showlegend		1=Show legend (default), 0=Hide legend
-	 * @return	void
-	 */
-	function setShowLegend($showlegend)
-	{
-		$this->showlegend=$showlegend;
-	}
-
-	/**
-	 * Show pointvalue or not
-	 *
-	 * @param	int		$showpointvalue		1=Show value for each point, as tooltip or inline (default), 0=Hide value
-	 * @return	void
-	 */
-	function setShowPointValue($showpointvalue)
-	{
-		$this->showpointvalue=$showpointvalue;
-	}
-
-	/**
-	 * Show percent or not
-	 *
-	 * @param	int		$showpercent		1=Show percent for each point, as tooltip or inline, 0=Hide percent (default)
-	 * @return	void
-	 */
-	function setShowPercent($showpercent)
-	{
-		$this->showpercent=$showpercent;
-	}
+        unset($this->bgcolorgrid);
+    }
+
+    /**
+     * Is graph ko
+     *
+     * @return	string		Error
+     */
+    function isGraphKo()
+    {
+        return $this->error;
+    }
+
+    /**
+     * Show legend or not
+     *
+     * @param	int		$showlegend		1=Show legend (default), 0=Hide legend
+     * @return	void
+     */
+    function setShowLegend($showlegend)
+    {
+        $this->showlegend=$showlegend;
+    }
+
+    /**
+     * Show pointvalue or not
+     *
+     * @param	int		$showpointvalue		1=Show value for each point, as tooltip or inline (default), 0=Hide value
+     * @return	void
+     */
+    function setShowPointValue($showpointvalue)
+    {
+        $this->showpointvalue=$showpointvalue;
+    }
+
+    /**
+     * Show percent or not
+     *
+     * @param	int		$showpercent		1=Show percent for each point, as tooltip or inline, 0=Hide percent (default)
+     * @return	void
+     */
+    function setShowPercent($showpercent)
+    {
+        $this->showpercent=$showpercent;
+    }
 
 
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
-	/**
-	 * Define background color of complete image
-	 *
-	 * @param	array	$bg_color		array(R,G,B) ou 'onglet' ou 'default'
-	 * @return	void
-	 */
-	function SetBgColor($bg_color = array(255,255,255))
-	{
+    /**
+     * Define background color of complete image
+     *
+     * @param	array	$bg_color		array(R,G,B) ou 'onglet' ou 'default'
+     * @return	void
+     */
+    function SetBgColor($bg_color = array(255,255,255))
+    {
         // phpcs:enable
-		global $theme_bgcolor,$theme_bgcoloronglet;
-
-		if (! is_array($bg_color))
-		{
-			if ($bg_color == 'onglet')
-			{
-				//print 'ee'.join(',',$theme_bgcoloronglet);
-				$this->bgcolor = $theme_bgcoloronglet;
-			}
-			else
-			{
-				$this->bgcolor = $theme_bgcolor;
-			}
-		}
-		else
-		{
-			$this->bgcolor = $bg_color;
-		}
-	}
+        global $theme_bgcolor,$theme_bgcoloronglet;
+
+        if (! is_array($bg_color))
+        {
+            if ($bg_color == 'onglet')
+            {
+                //print 'ee'.join(',',$theme_bgcoloronglet);
+                $this->bgcolor = $theme_bgcoloronglet;
+            }
+            else
+            {
+                $this->bgcolor = $theme_bgcolor;
+            }
+        }
+        else
+        {
+            $this->bgcolor = $bg_color;
+        }
+    }
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
-	/**
-	 * Define background color of grid
-	 *
-	 * @param	array	$bg_colorgrid		array(R,G,B) ou 'onglet' ou 'default'
-	 * @return	void
-	 */
-	function SetBgColorGrid($bg_colorgrid = array(255,255,255))
-	{
+    /**
+     * Define background color of grid
+     *
+     * @param	array	$bg_colorgrid		array(R,G,B) ou 'onglet' ou 'default'
+     * @return	void
+     */
+    function SetBgColorGrid($bg_colorgrid = array(255,255,255))
+    {
         // phpcs:enable
-		global $theme_bgcolor,$theme_bgcoloronglet;
-
-		if (! is_array($bg_colorgrid))
-		{
-			if ($bg_colorgrid == 'onglet')
-			{
-				//print 'ee'.join(',',$theme_bgcoloronglet);
-				$this->bgcolorgrid = $theme_bgcoloronglet;
-			}
-			else
-			{
-				$this->bgcolorgrid = $theme_bgcolor;
-			}
-		}
-		else
-		{
-			$this->bgcolorgrid = $bg_colorgrid;
-		}
-	}
+        global $theme_bgcolor,$theme_bgcoloronglet;
+
+        if (! is_array($bg_colorgrid))
+        {
+            if ($bg_colorgrid == 'onglet')
+            {
+                //print 'ee'.join(',',$theme_bgcoloronglet);
+                $this->bgcolorgrid = $theme_bgcoloronglet;
+            }
+            else
+            {
+                $this->bgcolorgrid = $theme_bgcolor;
+            }
+        }
+        else
+        {
+            $this->bgcolorgrid = $bg_colorgrid;
+        }
+    }
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
-	/**
-	 * Reset data color
-	 *
-	 * @return	void
-	 */
-	function ResetDataColor()
-	{
+    /**
+     * Reset data color
+     *
+     * @return	void
+     */
+    function ResetDataColor()
+    {
         // phpcs:enable
-		unset($this->datacolor);
-	}
+        unset($this->datacolor);
+    }
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
-	/**
-	 * Get max value
-	 *
-	 * @return	int		Max value
-	 */
-	function GetMaxValueInData()
-	{
+    /**
+     * Get max value
+     *
+     * @return	int		Max value
+     */
+    function GetMaxValueInData()
+    {
         // phpcs:enable
-		$k = 0;
-		$vals = array();
-
-		$nblines = count($this->data);
-		$nbvalues = count($this->data[0]) - 1;
-
-		for ($j = 0 ; $j < $nblines ; $j++)
-		{
-			for ($i = 0 ; $i < $nbvalues ; $i++)
-			{
-				$vals[$k] = $this->data[$j][$i+1];
-				$k++;
-			}
-		}
-		rsort($vals);
-		return $vals[0];
-	}
+        $k = 0;
+        $vals = array();
+
+        $nblines = count($this->data);
+        $nbvalues = count($this->data[0]) - 1;
+
+        for ($j = 0 ; $j < $nblines ; $j++)
+        {
+            for ($i = 0 ; $i < $nbvalues ; $i++)
+            {
+                $vals[$k] = $this->data[$j][$i+1];
+                $k++;
+            }
+        }
+        rsort($vals);
+        return $vals[0];
+    }
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
-	/**
-	 * Return min value of all data
-	 *
-	 * @return	int		Min value of all data
-	 */
-	function GetMinValueInData()
-	{
+    /**
+     * Return min value of all data
+     *
+     * @return	int		Min value of all data
+     */
+    function GetMinValueInData()
+    {
         // phpcs:enable
-		$k = 0;
-		$vals = array();
-
-		$nblines = count($this->data);
-		$nbvalues = count($this->data[0]) - 1;
-
-		for ($j = 0 ; $j < $nblines ; $j++)
-		{
-			for ($i = 0 ; $i < $nbvalues ; $i++)
-			{
-				$vals[$k] = $this->data[$j][$i+1];
-				$k++;
-			}
-		}
-		sort($vals);
-		return $vals[0];
-	}
+        $k = 0;
+        $vals = array();
+
+        $nblines = count($this->data);
+        $nbvalues = count($this->data[0]) - 1;
+
+        for ($j = 0 ; $j < $nblines ; $j++)
+        {
+            for ($i = 0 ; $i < $nbvalues ; $i++)
+            {
+                $vals[$k] = $this->data[$j][$i+1];
+                $k++;
+            }
+        }
+        sort($vals);
+        return $vals[0];
+    }
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
-	/**
-	 * Return max value of all data
-	 *
-	 * @return 	int		Max value of all data
-	 */
-	function GetCeilMaxValue()
-	{
+    /**
+     * Return max value of all data
+     *
+     * @return 	int		Max value of all data
+     */
+    function GetCeilMaxValue()
+    {
         // phpcs:enable
-		$max = $this->GetMaxValueInData();
-		if ($max != 0) $max++;
-		$size=dol_strlen(abs(ceil($max)));
-		$factor=1;
-		for ($i=0; $i < ($size-1); $i++)
-		{
-			$factor*=10;
-		}
-
-		$res=0;
-		if (is_numeric($max)) $res=ceil($max/$factor)*$factor;
-
-		//print "max=".$max." res=".$res;
-		return $res;
-	}
+        $max = $this->GetMaxValueInData();
+        if ($max != 0) $max++;
+        $size=dol_strlen(abs(ceil($max)));
+        $factor=1;
+        for ($i=0; $i < ($size-1); $i++)
+        {
+            $factor*=10;
+        }
+
+        $res=0;
+        if (is_numeric($max)) $res=ceil($max/$factor)*$factor;
+
+        //print "max=".$max." res=".$res;
+        return $res;
+    }
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
-	/**
-	 * Return min value of all data
-	 *
-	 * @return 	double		Max value of all data
-	 */
-	function GetFloorMinValue()
-	{
+    /**
+     * Return min value of all data
+     *
+     * @return 	double		Max value of all data
+     */
+    function GetFloorMinValue()
+    {
         // phpcs:enable
-		$min = $this->GetMinValueInData();
-		if ($min == '') $min=0;
-		if ($min != 0) $min--;
-		$size=dol_strlen(abs(floor($min)));
-		$factor=1;
-		for ($i=0; $i < ($size-1); $i++)
-		{
-			$factor*=10;
-		}
-
-		$res=floor($min/$factor)*$factor;
-
-		//print "min=".$min." res=".$res;
-		return $res;
-	}
-
-	/**
-	 * Build a graph into memory using correct library  (may also be wrote on disk, depending on library used)
-	 *
-	 * @param	string	$file    	Image file name to use to save onto disk (also used as javascript unique id)
-	 * @param	string	$fileurl	Url path to show image if saved onto disk
-	 * @return	integer|null
-	 */
-	function draw($file, $fileurl='')
-	{
-		if (empty($file))
-		{
-			$this->error="Call to draw method was made with empty value for parameter file.";
-			dol_syslog(get_class($this)."::draw ".$this->error, LOG_ERR);
-			return -2;
-		}
-		if (! is_array($this->data))
-		{
-			$this->error="Call to draw method was made but SetData was not called or called with an empty dataset for parameters";
-			dol_syslog(get_class($this)."::draw ".$this->error, LOG_ERR);
-			return -1;
-		}
-		if (count($this->data) < 1)
-		{
-			$this->error="Call to draw method was made but SetData was is an empty dataset";
-			dol_syslog(get_class($this)."::draw ".$this->error, LOG_WARNING);
-		}
-		$call = "draw_".$this->_library;
-		call_user_func_array(array($this,$call), array($file,$fileurl));
-	}
+        $min = $this->GetMinValueInData();
+        if ($min == '') $min=0;
+        if ($min != 0) $min--;
+        $size=dol_strlen(abs(floor($min)));
+        $factor=1;
+        for ($i=0; $i < ($size-1); $i++)
+        {
+            $factor*=10;
+        }
+
+        $res=floor($min/$factor)*$factor;
+
+        //print "min=".$min." res=".$res;
+        return $res;
+    }
+
+    /**
+     * Build a graph into memory using correct library  (may also be wrote on disk, depending on library used)
+     *
+     * @param	string	$file    	Image file name to use to save onto disk (also used as javascript unique id)
+     * @param	string	$fileurl	Url path to show image if saved onto disk
+     * @return	integer|null
+     */
+    function draw($file, $fileurl='')
+    {
+        if (empty($file))
+        {
+            $this->error="Call to draw method was made with empty value for parameter file.";
+            dol_syslog(get_class($this)."::draw ".$this->error, LOG_ERR);
+            return -2;
+        }
+        if (! is_array($this->data))
+        {
+            $this->error="Call to draw method was made but SetData was not called or called with an empty dataset for parameters";
+            dol_syslog(get_class($this)."::draw ".$this->error, LOG_ERR);
+            return -1;
+        }
+        if (count($this->data) < 1)
+        {
+            $this->error="Call to draw method was made but SetData was is an empty dataset";
+            dol_syslog(get_class($this)."::draw ".$this->error, LOG_WARNING);
+        }
+        $call = "draw_".$this->_library;
+        call_user_func_array(array($this,$call), array($file,$fileurl));
+    }
 
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-	/**
-	 * Build a graph onto disk using Artichow library and return img string to it
-	 *
-	 * @param	string	$file    	Image file name to use if we save onto disk
-	 * @param	string	$fileurl	Url path to show image if saved onto disk
-	 * @return	void
-	 */
-	private function draw_artichow($file,$fileurl)
-	{
+    /**
+     * Build a graph onto disk using Artichow library and return img string to it
+     *
+     * @param	string	$file    	Image file name to use if we save onto disk
+     * @param	string	$fileurl	Url path to show image if saved onto disk
+     * @return	void
+     */
+    private function draw_artichow($file,$fileurl)
+    {
         // phpcs:enable
-		global $artichow_defaultfont;
-
-		dol_syslog(get_class($this)."::draw_artichow this->type=".join(',',$this->type));
-
-		if (! defined('SHADOW_RIGHT_TOP'))  define('SHADOW_RIGHT_TOP',3);
-		if (! defined('LEGEND_BACKGROUND')) define('LEGEND_BACKGROUND',2);
-		if (! defined('LEGEND_LINE'))       define('LEGEND_LINE',1);
-
-		// Create graph
-		$classname='';
-		if (! isset($this->type[0]) || $this->type[0] == 'bars')  $classname='BarPlot';    // Only one type (first one) is supported by artichow
-		else if ($this->type[0] == 'lines' || $this->type[0] == 'linesnopoint') $classname='LinePlot';
-		else $classname='TypeUnknown';
-		include_once ARTICHOW_PATH.$classname.'.class.php';
-
-		// Definition de couleurs
-		$bgcolor=new Color($this->bgcolor[0],$this->bgcolor[1],$this->bgcolor[2]);
-		$bgcolorgrid=new Color($this->bgcolorgrid[0],$this->bgcolorgrid[1],$this->bgcolorgrid[2]);
-		$colortrans=new Color(0,0,0,100);
-		$colorsemitrans=new Color(255,255,255,60);
-		$colorgradient= new LinearGradient(new Color(235, 235, 235),new Color(255, 255, 255),0);
-		$colorwhite=new Color(255,255,255);
-
-		// Graph
-		$graph = new Graph($this->width, $this->height);
-		$graph->border->hide();
-		$graph->setAntiAliasing(true);
-		if (isset($this->title))
-		{
-			$graph->title->set($this->title);
-			//print $artichow_defaultfont;exit;
-			$graph->title->setFont(new $artichow_defaultfont(10));
-		}
-
-		if (is_array($this->bgcolor)) $graph->setBackgroundColor($bgcolor);
-		else $graph->setBackgroundGradient($colorgradient);
-
-		$group = new PlotGroup;
-		//$group->setSpace(5, 5, 0, 0);
-
-		$paddleft=50;
-		$paddright=10;
-		$strl=dol_strlen(max(abs($this->MaxValue),abs($this->MinValue)));
-		if ($strl > 6) $paddleft += ($strl * 4);
-		$group->setPadding($paddleft, $paddright);		// Width on left and right for Y axis values
-		$group->legend->setSpace(0);
-		$group->legend->setPadding(2,2,2,2);
-		$group->legend->setPosition(null, 0.1);
-		$group->legend->setBackgroundColor($colorsemitrans);
-
-		if (is_array($this->bgcolorgrid)) $group->grid->setBackgroundColor($bgcolorgrid);
-		else $group->grid->setBackgroundColor($colortrans);
-
-		if ($this->hideXGrid)	$group->grid->hideVertical(true);
-		if ($this->hideYGrid)	$group->grid->hideHorizontal(true);
-
-		// On boucle sur chaque lot de donnees
-		$legends=array();
-		$i=0;
-		$nblot=count($this->data[0])-1;
-
-		while ($i < $nblot)
-		{
-			$x=0;
-			$values=array();
-			foreach($this->data as $key => $valarray)
-			{
-				$legends[$x] = $valarray[0];
-				$values[$x]  = $valarray[$i+1];
-				$x++;
-			}
-
-			// We fix unknown values to null
-			$newvalues=array();
-			foreach($values as $val)
-			{
-				$newvalues[]=(is_numeric($val) ? $val : null);
-			}
+        global $artichow_defaultfont;
+
+        dol_syslog(get_class($this)."::draw_artichow this->type=".join(',',$this->type));
+
+        if (! defined('SHADOW_RIGHT_TOP'))  define('SHADOW_RIGHT_TOP',3);
+        if (! defined('LEGEND_BACKGROUND')) define('LEGEND_BACKGROUND',2);
+        if (! defined('LEGEND_LINE'))       define('LEGEND_LINE',1);
+
+        // Create graph
+        $classname='';
+        if (! isset($this->type[0]) || $this->type[0] == 'bars')  $classname='BarPlot';    // Only one type (first one) is supported by artichow
+        else if ($this->type[0] == 'lines' || $this->type[0] == 'linesnopoint') $classname='LinePlot';
+        else $classname='TypeUnknown';
+        include_once ARTICHOW_PATH.$classname.'.class.php';
+
+        // Definition de couleurs
+        $bgcolor=new Color($this->bgcolor[0],$this->bgcolor[1],$this->bgcolor[2]);
+        $bgcolorgrid=new Color($this->bgcolorgrid[0],$this->bgcolorgrid[1],$this->bgcolorgrid[2]);
+        $colortrans=new Color(0,0,0,100);
+        $colorsemitrans=new Color(255,255,255,60);
+        $colorgradient= new LinearGradient(new Color(235, 235, 235),new Color(255, 255, 255),0);
+        $colorwhite=new Color(255,255,255);
+
+        // Graph
+        $graph = new Graph($this->width, $this->height);
+        $graph->border->hide();
+        $graph->setAntiAliasing(true);
+        if (isset($this->title))
+        {
+            $graph->title->set($this->title);
+            //print $artichow_defaultfont;exit;
+            $graph->title->setFont(new $artichow_defaultfont(10));
+        }
+
+        if (is_array($this->bgcolor)) $graph->setBackgroundColor($bgcolor);
+        else $graph->setBackgroundGradient($colorgradient);
+
+        $group = new PlotGroup;
+        //$group->setSpace(5, 5, 0, 0);
+
+        $paddleft=50;
+        $paddright=10;
+        $strl=dol_strlen(max(abs($this->MaxValue),abs($this->MinValue)));
+        if ($strl > 6) $paddleft += ($strl * 4);
+        $group->setPadding($paddleft, $paddright);		// Width on left and right for Y axis values
+        $group->legend->setSpace(0);
+        $group->legend->setPadding(2,2,2,2);
+        $group->legend->setPosition(null, 0.1);
+        $group->legend->setBackgroundColor($colorsemitrans);
+
+        if (is_array($this->bgcolorgrid)) $group->grid->setBackgroundColor($bgcolorgrid);
+        else $group->grid->setBackgroundColor($colortrans);
+
+        if ($this->hideXGrid)	$group->grid->hideVertical(true);
+        if ($this->hideYGrid)	$group->grid->hideHorizontal(true);
+
+        // On boucle sur chaque lot de donnees
+        $legends=array();
+        $i=0;
+        $nblot=count($this->data[0])-1;
+
+        while ($i < $nblot)
+        {
+            $x=0;
+            $values=array();
+            foreach($this->data as $key => $valarray)
+            {
+                $legends[$x] = $valarray[0];
+                $values[$x]  = $valarray[$i+1];
+                $x++;
+            }
+
+            // We fix unknown values to null
+            $newvalues=array();
+            foreach($values as $val)
+            {
+                $newvalues[]=(is_numeric($val) ? $val : null);
+            }
+
+
+            if ($this->type[0] == 'bars')
+            {
+                //print "Lot de donnees $i<br>";
+                //print_r($values);
+                //print '<br>';
+
+                $color=new Color($this->datacolor[$i][0],$this->datacolor[$i][1],$this->datacolor[$i][2],20);
+                $colorbis=new Color(min($this->datacolor[$i][0]+50,255),min($this->datacolor[$i][1]+50,255),min($this->datacolor[$i][2]+50,255),50);
+
+                $colorgrey=new Color(100,100,100);
+                $colorborder=new Color($this->datacolor[$i][0],$this->datacolor[$i][1],$this->datacolor[$i][2]);
+
+                if ($this->mode == 'side')  $plot = new BarPlot($newvalues, $i+1, $nblot);
+                if ($this->mode == 'depth') $plot = new BarPlot($newvalues, 1, 1, ($nblot-$i-1)*5);
+
+                $plot->barBorder->setColor($colorgrey);
+                //$plot->setBarColor($color);
+                $plot->setBarGradient(new LinearGradient($colorbis, $color, 90));
+
+                if ($this->mode == 'side')  $plot->setBarPadding(0.1, 0.1);
+                if ($this->mode == 'depth') $plot->setBarPadding(0.1, 0.4);
+                if ($this->mode == 'side')  $plot->setBarSpace(5);
+                if ($this->mode == 'depth') $plot->setBarSpace(2);
+
+                $plot->barShadow->setSize($this->SetShading);
+                $plot->barShadow->setPosition(SHADOW_RIGHT_TOP);
+                $plot->barShadow->setColor(new Color(160, 160, 160, 50));
+                $plot->barShadow->smooth(true);
+                //$plot->setSize(1, 0.96);
+                //$plot->setCenter(0.5, 0.52);
+
+                // Le mode automatique est plus efficace
+                $plot->SetYMax($this->MaxValue);
+                $plot->SetYMin($this->MinValue);
+            }
+
+            if ($this->type[0] == 'lines' || $this->type[0] == 'linesnopoint')
+            {
+                $color=new Color($this->datacolor[$i][0],$this->datacolor[$i][1],$this->datacolor[$i][2],20);
+                $colorbis=new Color(min($this->datacolor[$i][0]+20,255),min($this->datacolor[$i][1]+20,255),min($this->datacolor[$i][2]+20,255),60);
+                $colorter=new Color(min($this->datacolor[$i][0]+50,255),min($this->datacolor[$i][1]+50,255),min($this->datacolor[$i][2]+50,255),90);
+
+                $plot = new LinePlot($newvalues);
+                //$plot->setSize(1, 0.96);
+                //$plot->setCenter(0.5, 0.52);
+
+                $plot->setColor($color);
+                $plot->setThickness(1);
+
+                // Set line background gradient
+                $plot->setFillGradient(new LinearGradient($colorter, $colorbis, 90));
+
+                $plot->xAxis->setLabelText($legends);
+
+                // Le mode automatique est plus efficace
+                $plot->SetYMax($this->MaxValue);
+                $plot->SetYMin($this->MinValue);
+                //$plot->setYAxis(0);
+                //$plot->hideLine(true);
+            }
+
+            //$plot->reduce(80);		// Evite temps d'affichage trop long et nombre de ticks absisce satures
+
+            $group->legend->setTextFont(new $artichow_defaultfont(10)); // This is to force Artichow to use awFileFontDriver to
+            // solve a bug in Artichow with UTF8
+            if (count($this->Legend))
+            {
+                if ($this->type[0] == 'bars')  										$group->legend->add($plot, $this->Legend[$i], LEGEND_BACKGROUND);
+                if ($this->type[0] == 'lines' || $this->type[0] == 'linesnopoint')	$group->legend->add($plot, $this->Legend[$i], LEGEND_LINE);
+            }
+            $group->add($plot);
 
+            $i++;
+        }
+
+        $group->axis->bottom->setLabelText($legends);
+        $group->axis->bottom->label->setFont(new $artichow_defaultfont(7));
+
+        //print $group->axis->bottom->getLabelNumber();
+        if ($this->labelInterval > 0) $group->axis->bottom->setLabelInterval($this->labelInterval);
 
-			if ($this->type[0] == 'bars')
-			{
-				//print "Lot de donnees $i<br>";
-				//print_r($values);
-				//print '<br>';
-
-				$color=new Color($this->datacolor[$i][0],$this->datacolor[$i][1],$this->datacolor[$i][2],20);
-				$colorbis=new Color(min($this->datacolor[$i][0]+50,255),min($this->datacolor[$i][1]+50,255),min($this->datacolor[$i][2]+50,255),50);
-
-				$colorgrey=new Color(100,100,100);
-				$colorborder=new Color($this->datacolor[$i][0],$this->datacolor[$i][1],$this->datacolor[$i][2]);
-
-				if ($this->mode == 'side')  $plot = new BarPlot($newvalues, $i+1, $nblot);
-				if ($this->mode == 'depth') $plot = new BarPlot($newvalues, 1, 1, ($nblot-$i-1)*5);
-
-				$plot->barBorder->setColor($colorgrey);
-				//$plot->setBarColor($color);
-				$plot->setBarGradient(new LinearGradient($colorbis, $color, 90));
-
-				if ($this->mode == 'side')  $plot->setBarPadding(0.1, 0.1);
-				if ($this->mode == 'depth') $plot->setBarPadding(0.1, 0.4);
-				if ($this->mode == 'side')  $plot->setBarSpace(5);
-				if ($this->mode == 'depth') $plot->setBarSpace(2);
-
-				$plot->barShadow->setSize($this->SetShading);
-				$plot->barShadow->setPosition(SHADOW_RIGHT_TOP);
-				$plot->barShadow->setColor(new Color(160, 160, 160, 50));
-				$plot->barShadow->smooth(true);
-				//$plot->setSize(1, 0.96);
-				//$plot->setCenter(0.5, 0.52);
-
-				// Le mode automatique est plus efficace
-				$plot->SetYMax($this->MaxValue);
-				$plot->SetYMin($this->MinValue);
-			}
+        $graph->add($group);
+
+        // Generate file
+        $graph->draw($file);
 
-			if ($this->type[0] == 'lines' || $this->type[0] == 'linesnopoint')
-			{
-				$color=new Color($this->datacolor[$i][0],$this->datacolor[$i][1],$this->datacolor[$i][2],20);
-				$colorbis=new Color(min($this->datacolor[$i][0]+20,255),min($this->datacolor[$i][1]+20,255),min($this->datacolor[$i][2]+20,255),60);
-				$colorter=new Color(min($this->datacolor[$i][0]+50,255),min($this->datacolor[$i][1]+50,255),min($this->datacolor[$i][2]+50,255),90);
-
-				$plot = new LinePlot($newvalues);
-				//$plot->setSize(1, 0.96);
-				//$plot->setCenter(0.5, 0.52);
-
-				$plot->setColor($color);
-				$plot->setThickness(1);
-
-				// Set line background gradient
-				$plot->setFillGradient(new LinearGradient($colorter, $colorbis, 90));
-
-				$plot->xAxis->setLabelText($legends);
-
-				// Le mode automatique est plus efficace
-				$plot->SetYMax($this->MaxValue);
-				$plot->SetYMin($this->MinValue);
-				//$plot->setYAxis(0);
-				//$plot->hideLine(true);
-			}
-
-			//$plot->reduce(80);		// Evite temps d'affichage trop long et nombre de ticks absisce satures
-
-			$group->legend->setTextFont(new $artichow_defaultfont(10)); // This is to force Artichow to use awFileFontDriver to
-			// solve a bug in Artichow with UTF8
-			if (count($this->Legend))
-			{
-				if ($this->type[0] == 'bars')  										$group->legend->add($plot, $this->Legend[$i], LEGEND_BACKGROUND);
-				if ($this->type[0] == 'lines' || $this->type[0] == 'linesnopoint')	$group->legend->add($plot, $this->Legend[$i], LEGEND_LINE);
-			}
-			$group->add($plot);
-
-			$i++;
-		}
-
-		$group->axis->bottom->setLabelText($legends);
-		$group->axis->bottom->label->setFont(new $artichow_defaultfont(7));
-
-		//print $group->axis->bottom->getLabelNumber();
-		if ($this->labelInterval > 0) $group->axis->bottom->setLabelInterval($this->labelInterval);
-
-		$graph->add($group);
-
-		// Generate file
-		$graph->draw($file);
-
-		$this->stringtoshow='<!-- Build using '.$this->_library.' --><img src="'.$fileurl.'" title="'.dol_escape_htmltag($this->title?$this->title:$this->YLabel).'" alt="'.dol_escape_htmltag($this->title?$this->title:$this->YLabel).'">';
-	}
+        $this->stringtoshow='<!-- Build using '.$this->_library.' --><img src="'.$fileurl.'" title="'.dol_escape_htmltag($this->title?$this->title:$this->YLabel).'" alt="'.dol_escape_htmltag($this->title?$this->title:$this->YLabel).'">';
+    }
 
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-	/**
-	 * Build a graph using JFlot library. Input when calling this method should be:
-	 *	$this->data  = array(array(0=>'labelxA',1=>yA),  array('labelxB',yB));
-	 *	$this->data  = array(array(0=>'labelxA',1=>yA1,...,n=>yAn), array('labelxB',yB1,...yBn));   // or when there is n series to show for each x
-	 *  $this->data  = array(array('label'=>'labelxA','data'=>yA),  array('labelxB',yB));			// Syntax deprecated
-	 *  $this->legend= array("Val1",...,"Valn");													// list of n series name
-	 *  $this->type  = array('bars',...'lines'); or array('pie')
-	 *  $this->mode = 'depth' ???
-	 *  $this->bgcolorgrid
-	 *  $this->datacolor
-	 *  $this->shownodatagraph
-	 *
-	 * @param	string	$file    	Image file name to use to save onto disk (also used as javascript unique id)
-	 * @param	string	$fileurl	Url path to show image if saved onto disk. Never used here.
-	 * @return	void
-	 */
-	private function draw_jflot($file, $fileurl)
-	{
+    /**
+     * Build a graph using JFlot library. Input when calling this method should be:
+     *	$this->data  = array(array(0=>'labelxA',1=>yA),  array('labelxB',yB));
+     *	$this->data  = array(array(0=>'labelxA',1=>yA1,...,n=>yAn), array('labelxB',yB1,...yBn));   // or when there is n series to show for each x
+     *  $this->data  = array(array('label'=>'labelxA','data'=>yA),  array('labelxB',yB));			// Syntax deprecated
+     *  $this->legend= array("Val1",...,"Valn");													// list of n series name
+     *  $this->type  = array('bars',...'lines'); or array('pie')
+     *  $this->mode = 'depth' ???
+     *  $this->bgcolorgrid
+     *  $this->datacolor
+     *  $this->shownodatagraph
+     *
+     * @param	string	$file    	Image file name to use to save onto disk (also used as javascript unique id)
+     * @param	string	$fileurl	Url path to show image if saved onto disk. Never used here.
+     * @return	void
+     */
+    private function draw_jflot($file, $fileurl)
+    {
         // phpcs:enable
-		global $artichow_defaultfont;
-
-		dol_syslog(get_class($this)."::draw_jflot this->type=".join(',',$this->type)." this->MaxValue=".$this->MaxValue);
-
-		if (empty($this->width) && empty($this->height))
-		{
-			print 'Error width or height not set';
-			return;
-		}
-
-		$legends=array();
-		$nblot=count($this->data[0])-1;    // -1 to remove legend
-		if ($nblot < 0) dol_syslog('Bad value for property ->data. Must be set by mydolgraph->SetData before calling mydolgrapgh->draw', LOG_WARNING);
-		$firstlot=0;
-		// Works with line but not with bars
-		//if ($nblot > 2) $firstlot = ($nblot - 2);        // We limit nblot to 2 because jflot can't manage more than 2 bars on same x
-
-		$i=$firstlot;
-		$serie=array();
-		while ($i < $nblot)	// Loop on each serie
-		{
-			$values=array();	// Array with horizontal y values (specific values of a serie) for each abscisse x
-			$serie[$i]="var d".$i." = [];\n";
-
-			// Fill array $values
-			$x=0;
-			foreach($this->data as $valarray)	// Loop on each x
-			{
-				$legends[$x] = $valarray[0];
-				$values[$x]  = (is_numeric($valarray[$i+1]) ? $valarray[$i+1] : null);
-				$x++;
-			}
-
-			// TODO Avoid push by adding generated long array...
-			if (isset($this->type[$firstlot]) && $this->type[$firstlot] == 'pie')
-			{
-				foreach($values as $x => $y) {
-					if (isset($y)) $serie[$i].='d'.$i.'.push({"label":"'.dol_escape_js($legends[$x]).'", "data":'.$y.'});'."\n";
-				}
-			}
-			else
-			{
-				foreach($values as $x => $y) {
-					if (isset($y)) $serie[$i].='d'.$i.'.push(['.$x.', '.$y.']);'."\n";
-				}
-			}
-
-			unset($values);
-			$i++;
-		}
-		$tag=dol_escape_htmltag(dol_string_unaccent(dol_string_nospecial(basename($file),'_',array('-','.'))));
-
-		$this->stringtoshow ='<!-- Build using '.$this->_library.' -->'."\n";
-		if (! empty($this->title)) $this->stringtoshow.='<div align="center" class="dolgraphtitle'.(empty($this->cssprefix)?'':' dolgraphtitle'.$this->cssprefix).'">'.$this->title.'</div>';
-		if (! empty($this->shownographyet))
-		{
-		  $this->stringtoshow.='<div style="width:'.$this->width.'px;height:'.$this->height.'px;" class="nographyet"></div>';
-		  $this->stringtoshow.='<div class="nographyettext">'.$langs->trans("NotEnoughDataYet").'</div>';
-		  return;
-		}
-		$this->stringtoshow.='<div id="placeholder_'.$tag.'" style="width:'.$this->width.'px;height:'.$this->height.'px;" class="dolgraph'.(empty($this->cssprefix)?'':' dolgraph'.$this->cssprefix).'"></div>'."\n";
-
-		$this->stringtoshow.='<script id="'.$tag.'">'."\n";
-		$this->stringtoshow.='$(function () {'."\n";
-		$i=$firstlot;
-		if ($nblot < 0)
-		{
-			$this->stringtoshow.='<!-- No series of data -->';
-		}
-		else
-		{
-			while ($i < $nblot)
-			{
-				$this->stringtoshow.=$serie[$i];
-				$i++;
-			}
-		}
-		$this->stringtoshow.="\n";
-
-		// Special case for Graph of type 'pie'
-		if (isset($this->type[$firstlot]) && $this->type[$firstlot] == 'pie')
-		{
-			$datacolor=array();
-			foreach($this->datacolor as $val) $datacolor[]="#".sprintf("%02x%02x%02x",$val[0],$val[1],$val[2]);
-
-			$urltemp='';	// TODO Add support for url link into labels
-			$showlegend=$this->showlegend;
-			$showpointvalue=$this->showpointvalue;
-			$showpercent=$this->showpercent;
-
-			$this->stringtoshow.= '
+        global $artichow_defaultfont;
+
+        dol_syslog(get_class($this)."::draw_jflot this->type=".join(',',$this->type)." this->MaxValue=".$this->MaxValue);
+
+        if (empty($this->width) && empty($this->height))
+        {
+            print 'Error width or height not set';
+            return;
+        }
+
+        $legends=array();
+        $nblot=count($this->data[0])-1;    // -1 to remove legend
+        if ($nblot < 0) dol_syslog('Bad value for property ->data. Must be set by mydolgraph->SetData before calling mydolgrapgh->draw', LOG_WARNING);
+        $firstlot=0;
+        // Works with line but not with bars
+        //if ($nblot > 2) $firstlot = ($nblot - 2);        // We limit nblot to 2 because jflot can't manage more than 2 bars on same x
+
+        $i=$firstlot;
+        $serie=array();
+        while ($i < $nblot)	// Loop on each serie
+        {
+            $values=array();	// Array with horizontal y values (specific values of a serie) for each abscisse x
+            $serie[$i]="var d".$i." = [];\n";
+
+            // Fill array $values
+            $x=0;
+            foreach($this->data as $valarray)	// Loop on each x
+            {
+                $legends[$x] = $valarray[0];
+                $values[$x]  = (is_numeric($valarray[$i+1]) ? $valarray[$i+1] : null);
+                $x++;
+            }
+
+            // TODO Avoid push by adding generated long array...
+            if (isset($this->type[$firstlot]) && $this->type[$firstlot] == 'pie')
+            {
+                foreach($values as $x => $y) {
+                    if (isset($y)) $serie[$i].='d'.$i.'.push({"label":"'.dol_escape_js($legends[$x]).'", "data":'.$y.'});'."\n";
+                }
+            }
+            else
+            {
+                foreach($values as $x => $y) {
+                    if (isset($y)) $serie[$i].='d'.$i.'.push(['.$x.', '.$y.']);'."\n";
+                }
+            }
+
+            unset($values);
+            $i++;
+        }
+        $tag=dol_escape_htmltag(dol_string_unaccent(dol_string_nospecial(basename($file),'_',array('-','.'))));
+
+        $this->stringtoshow ='<!-- Build using '.$this->_library.' -->'."\n";
+        if (! empty($this->title)) $this->stringtoshow.='<div align="center" class="dolgraphtitle'.(empty($this->cssprefix)?'':' dolgraphtitle'.$this->cssprefix).'">'.$this->title.'</div>';
+        if (! empty($this->shownographyet))
+        {
+            $this->stringtoshow.='<div style="width:'.$this->width.'px;height:'.$this->height.'px;" class="nographyet"></div>';
+            $this->stringtoshow.='<div class="nographyettext">'.$langs->trans("NotEnoughDataYet").'</div>';
+            return;
+        }
+        $this->stringtoshow.='<div id="placeholder_'.$tag.'" style="width:'.$this->width.'px;height:'.$this->height.'px;" class="dolgraph'.(empty($this->cssprefix)?'':' dolgraph'.$this->cssprefix).'"></div>'."\n";
+
+        $this->stringtoshow.='<script id="'.$tag.'">'."\n";
+        $this->stringtoshow.='$(function () {'."\n";
+        $i=$firstlot;
+        if ($nblot < 0)
+        {
+            $this->stringtoshow.='<!-- No series of data -->';
+        }
+        else
+        {
+            while ($i < $nblot)
+            {
+                $this->stringtoshow.=$serie[$i];
+                $i++;
+            }
+        }
+        $this->stringtoshow.="\n";
+
+        // Special case for Graph of type 'pie'
+        if (isset($this->type[$firstlot]) && $this->type[$firstlot] == 'pie')
+        {
+            $datacolor=array();
+            foreach($this->datacolor as $val) $datacolor[]="#".sprintf("%02x%02x%02x",$val[0],$val[1],$val[2]);
+
+            $urltemp='';	// TODO Add support for url link into labels
+            $showlegend=$this->showlegend;
+            $showpointvalue=$this->showpointvalue;
+            $showpercent=$this->showpercent;
+
+            $this->stringtoshow.= '
 			function plotWithOptions_'.$tag.'() {
 			$.plot($("#placeholder_'.$tag.'"), d0,
 			{
@@ -992,15 +992,15 @@ 
 								var percent=Math.round(series.percent);
 								var number=series.data[0][1];
 								return \'';
-								$this->stringtoshow.='<span style="font-size:8pt;text-align:center;padding:2px;color:black;">';
-								if ($urltemp) $this->stringtoshow.='<a style="color: #FFFFFF;" border="0" href="'.$urltemp.'">';
-								$this->stringtoshow.='\'+';
-								$this->stringtoshow.=($showlegend?'':'label+\' \'+');	// Hide label if already shown in legend
-								$this->stringtoshow.=($showpointvalue?'number+':'');
-								$this->stringtoshow.=($showpercent?'\'<br/>\'+percent+\'%\'+':'');
-								$this->stringtoshow.='\'';
-								if ($urltemp) $this->stringtoshow.='</a>';
-								$this->stringtoshow.='</span>\';
+                                $this->stringtoshow.='<span style="font-size:8pt;text-align:center;padding:2px;color:black;">';
+                                if ($urltemp) $this->stringtoshow.='<a style="color: #FFFFFF;" border="0" href="'.$urltemp.'">';
+                                $this->stringtoshow.='\'+';
+                                $this->stringtoshow.=($showlegend?'':'label+\' \'+');	// Hide label if already shown in legend
+                                $this->stringtoshow.=($showpointvalue?'number+':'');
+                                $this->stringtoshow.=($showpercent?'\'<br/>\'+percent+\'%\'+':'');
+                                $this->stringtoshow.='\'';
+                                if ($urltemp) $this->stringtoshow.='</a>';
+                                $this->stringtoshow.='</span>\';
 							},
 							background: {
 							opacity: 0.0,
@@ -1015,20 +1015,20 @@ 
 			pan: {
 				interactive: true
 			},';
-			if (count($datacolor))
-			{
-				$this->stringtoshow.='colors: '.(! empty($data['seriescolor']) ? json_encode($data['seriescolor']) : json_encode($datacolor)).',';
-			}
-			$this->stringtoshow.='legend: {show: '.($showlegend?'true':'false').', position: \'ne\' }
+            if (count($datacolor))
+            {
+                $this->stringtoshow.='colors: '.(! empty($data['seriescolor']) ? json_encode($data['seriescolor']) : json_encode($datacolor)).',';
+            }
+            $this->stringtoshow.='legend: {show: '.($showlegend?'true':'false').', position: \'ne\' }
 		});
 		}'."\n";
-		}
-		// Other cases, graph of type 'bars', 'lines'
-		else
-		{
-			// Add code to support tooltips
-		    // TODO: remove js css and use graph-tooltip-inner class instead by adding css in each themes
-			$this->stringtoshow.='
+        }
+        // Other cases, graph of type 'bars', 'lines'
+        else
+        {
+            // Add code to support tooltips
+            // TODO: remove js css and use graph-tooltip-inner class instead by adding css in each themes
+            $this->stringtoshow.='
 			function showTooltip_'.$tag.'(x, y, contents) {
 				$(\'<div class="graph-tooltip-inner" id="tooltip_'.$tag.'">\' + contents + \'</div>\').css({
 					position: \'absolute\',
@@ -1060,10 +1060,10 @@ 
 						var y = item.datapoint[1].toFixed(2);
 						var z = item.series.xaxis.ticks[item.dataIndex].label;
 						';
-						if ($this->showpointvalue > 0) $this->stringtoshow.='
+                        if ($this->showpointvalue > 0) $this->stringtoshow.='
 							showTooltip_'.$tag.'(item.pageX, item.pageY, item.series.label + "<br>" + z + " => " + y);
 						';
-						$this->stringtoshow.='
+                        $this->stringtoshow.='
 					}
 				}
 				else {
@@ -1073,95 +1073,95 @@ 
 			});
 			';
 
-			$this->stringtoshow.='var stack = null, steps = false;'."\n";
-
-			$this->stringtoshow.='function plotWithOptions_'.$tag.'() {'."\n";
-			$this->stringtoshow.='$.plot($("#placeholder_'.$tag.'"), [ '."\n";
-			$i=$firstlot;
-			while ($i < $nblot)
-			{
-				if ($i > $firstlot) $this->stringtoshow.=', '."\n";
-				$color=sprintf("%02x%02x%02x",$this->datacolor[$i][0],$this->datacolor[$i][1],$this->datacolor[$i][2]);
-				$this->stringtoshow.='{ ';
-				if (! isset($this->type[$i]) || $this->type[$i] == 'bars') $this->stringtoshow.='bars: { lineWidth: 1, show: true, align: "'.($i==$firstlot?'center':'left').'", barWidth: 0.5 }, ';
-				if (isset($this->type[$i]) && ($this->type[$i] == 'lines' || $this->type[$i] == 'linesnopoint')) $this->stringtoshow.='lines: { show: true, fill: false }, points: { show: '.($this->type[$i] == 'linesnopoint' ? 'false' : 'true').' }, ';
-				$this->stringtoshow.='color: "#'.$color.'", label: "'.(isset($this->Legend[$i]) ? dol_escape_js($this->Legend[$i]) : '').'", data: d'.$i.' }';
-				$i++;
-			}
-			// shadowSize: 0 -> Drawing is faster without shadows
-			$this->stringtoshow.="\n".' ], { series: { shadowSize: 0, stack: stack, lines: { fill: false, steps: steps }, bars: { barWidth: 0.6 } }'."\n";
-
-			// Xaxis
-			$this->stringtoshow.=', xaxis: { ticks: ['."\n";
-			$x=0;
-			foreach($this->data as $key => $valarray)
-			{
-				if ($x > 0) $this->stringtoshow.=', '."\n";
-				$this->stringtoshow.= ' ['.$x.', "'.$valarray[0].'"]';
-				$x++;
-			}
-			$this->stringtoshow.='] }'."\n";
-
-			// Yaxis
-			$this->stringtoshow.=', yaxis: { min: '.$this->MinValue.', max: '.($this->MaxValue).' }'."\n";
-
-			// Background color
-			$color1=sprintf("%02x%02x%02x",$this->bgcolorgrid[0],$this->bgcolorgrid[0],$this->bgcolorgrid[2]);
-			$color2=sprintf("%02x%02x%02x",$this->bgcolorgrid[0],$this->bgcolorgrid[1],$this->bgcolorgrid[2]);
-			$this->stringtoshow.=', grid: { hoverable: true, backgroundColor: { colors: ["#'.$color1.'", "#'.$color2.'"] }, borderWidth: 1, borderColor: \'#e6e6e6\', tickColor  : \'#e6e6e6\' }'."\n";
-			//$this->stringtoshow.=', shadowSize: 20'."\n";    TODO Uncommet this
-			$this->stringtoshow.='});'."\n";
-			$this->stringtoshow.='}'."\n";
-		}
-
-		$this->stringtoshow.='plotWithOptions_'.$tag.'();'."\n";
-		$this->stringtoshow.='});'."\n";
-		$this->stringtoshow.='</script>'."\n";
-	}
-
-
-
-	/**
-	 * Output HTML string to show graph
-	 *
-	 * @param	int			$shownographyet 	Show graph to say there is not enough data
-	 * @return	string							HTML string to show graph
-	 */
-	function show($shownographyet=0)
-	{
-		global $langs;
-
-		if ($shownographyet)
-		{
-			$s= '<div class="nographyet" style="width:'.(preg_match('/%/',$this->width)?$this->width:$this->width.'px').'; height:'.(preg_match('/%/',$this->height)?$this->height:$this->height.'px').';"></div>';
-			$s.='<div class="nographyettext">'.$langs->trans("NotEnoughDataYet").'</div>';
-			return $s;
-		}
-
-		return $this->stringtoshow;
-	}
-
-
-	/**
-	 * getDefaultGraphSizeForStats
-	 *
-	 * @param	string	$direction		'width' or 'height'
-	 * @param	string	$defaultsize	Value we want as default size
-	 * @return	int						Value of width or height to use by default
-	 */
-	static function getDefaultGraphSizeForStats($direction,$defaultsize='')
-	{
-		global $conf;
-
-		if ($direction == 'width')
-		{
-			if (empty($conf->dol_optimize_smallscreen)) return ($defaultsize ? $defaultsize : '500');
-			else return (empty($_SESSION['dol_screen_width']) ? '280' : ($_SESSION['dol_screen_width']-40));
-		}
-		if ($direction == 'height')
-		{
-			return (empty($conf->dol_optimize_smallscreen)?($defaultsize?$defaultsize:'200'):'160');
-		}
-		return 0;
-	}
+            $this->stringtoshow.='var stack = null, steps = false;'."\n";
+
+            $this->stringtoshow.='function plotWithOptions_'.$tag.'() {'."\n";
+            $this->stringtoshow.='$.plot($("#placeholder_'.$tag.'"), [ '."\n";
+            $i=$firstlot;
+            while ($i < $nblot)
+            {
+                if ($i > $firstlot) $this->stringtoshow.=', '."\n";
+                $color=sprintf("%02x%02x%02x",$this->datacolor[$i][0],$this->datacolor[$i][1],$this->datacolor[$i][2]);
+                $this->stringtoshow.='{ ';
+                if (! isset($this->type[$i]) || $this->type[$i] == 'bars') $this->stringtoshow.='bars: { lineWidth: 1, show: true, align: "'.($i==$firstlot?'center':'left').'", barWidth: 0.5 }, ';
+                if (isset($this->type[$i]) && ($this->type[$i] == 'lines' || $this->type[$i] == 'linesnopoint')) $this->stringtoshow.='lines: { show: true, fill: false }, points: { show: '.($this->type[$i] == 'linesnopoint' ? 'false' : 'true').' }, ';
+                $this->stringtoshow.='color: "#'.$color.'", label: "'.(isset($this->Legend[$i]) ? dol_escape_js($this->Legend[$i]) : '').'", data: d'.$i.' }';
+                $i++;
+            }
+            // shadowSize: 0 -> Drawing is faster without shadows
+            $this->stringtoshow.="\n".' ], { series: { shadowSize: 0, stack: stack, lines: { fill: false, steps: steps }, bars: { barWidth: 0.6 } }'."\n";
+
+            // Xaxis
+            $this->stringtoshow.=', xaxis: { ticks: ['."\n";
+            $x=0;
+            foreach($this->data as $key => $valarray)
+            {
+                if ($x > 0) $this->stringtoshow.=', '."\n";
+                $this->stringtoshow.= ' ['.$x.', "'.$valarray[0].'"]';
+                $x++;
+            }
+            $this->stringtoshow.='] }'."\n";
+
+            // Yaxis
+            $this->stringtoshow.=', yaxis: { min: '.$this->MinValue.', max: '.($this->MaxValue).' }'."\n";
+
+            // Background color
+            $color1=sprintf("%02x%02x%02x",$this->bgcolorgrid[0],$this->bgcolorgrid[0],$this->bgcolorgrid[2]);
+            $color2=sprintf("%02x%02x%02x",$this->bgcolorgrid[0],$this->bgcolorgrid[1],$this->bgcolorgrid[2]);
+            $this->stringtoshow.=', grid: { hoverable: true, backgroundColor: { colors: ["#'.$color1.'", "#'.$color2.'"] }, borderWidth: 1, borderColor: \'#e6e6e6\', tickColor  : \'#e6e6e6\' }'."\n";
+            //$this->stringtoshow.=', shadowSize: 20'."\n";    TODO Uncommet this
+            $this->stringtoshow.='});'."\n";
+            $this->stringtoshow.='}'."\n";
+        }
+
+        $this->stringtoshow.='plotWithOptions_'.$tag.'();'."\n";
+        $this->stringtoshow.='});'."\n";
+        $this->stringtoshow.='</script>'."\n";
+    }
+
+
+
+    /**
+     * Output HTML string to show graph
+     *
+     * @param	int			$shownographyet 	Show graph to say there is not enough data
+     * @return	string							HTML string to show graph
+     */
+    function show($shownographyet=0)
+    {
+        global $langs;
+
+        if ($shownographyet)
+        {
+            $s= '<div class="nographyet" style="width:'.(preg_match('/%/',$this->width)?$this->width:$this->width.'px').'; height:'.(preg_match('/%/',$this->height)?$this->height:$this->height.'px').';"></div>';
+            $s.='<div class="nographyettext">'.$langs->trans("NotEnoughDataYet").'</div>';
+            return $s;
+        }
+
+        return $this->stringtoshow;
+    }
+
+
+    /**
+     * getDefaultGraphSizeForStats
+     *
+     * @param	string	$direction		'width' or 'height'
+     * @param	string	$defaultsize	Value we want as default size
+     * @return	int						Value of width or height to use by default
+     */
+    static function getDefaultGraphSizeForStats($direction,$defaultsize='')
+    {
+        global $conf;
+
+        if ($direction == 'width')
+        {
+            if (empty($conf->dol_optimize_smallscreen)) return ($defaultsize ? $defaultsize : '500');
+            else return (empty($_SESSION['dol_screen_width']) ? '280' : ($_SESSION['dol_screen_width']-40));
+        }
+        if ($direction == 'height')
+        {
+            return (empty($conf->dol_optimize_smallscreen)?($defaultsize?$defaultsize:'200'):'160');
+        }
+        return 0;
+    }
 }

Spacing +198 added lines, -198 removed lines

@@ -39,48 +39,48 @@ 
  */
 class DolGraph
 {
-	public $type=array();			// Array with type of each series. Example: array('bars', 'lines', ...)
-	public $mode='side';		    // Mode bars graph: side, depth
-	private $_library='jflot';	// Graphic library to use (jflot, artichow)
+	public $type = array(); // Array with type of each series. Example: array('bars', 'lines', ...)
+	public $mode = 'side'; // Mode bars graph: side, depth
+	private $_library = 'jflot'; // Graphic library to use (jflot, artichow)
 
 	//! Array of data
-	public $data;				// Data of graph: array(array('abs1',valA1,valB1), array('abs2',valA2,valB2), ...)
-	public $title;				// Title of graph
-	public $cssprefix='';		// To add into css styles
-	public $width=380;
-	public $height=200;
-	public $MaxValue=0;
-	public $MinValue=0;
-	public $SetShading=0;
-
-	public $PrecisionY=-1;
-
-	public $horizTickIncrement=-1;
-	public $SetNumXTicks=-1;
-	public $labelInterval=-1;
-
-	public $hideXGrid=false;
-	public $hideYGrid=false;
-
-	public $Legend=array();
-	public $LegendWidthMin=0;
-	public $showlegend=1;
-	public $showpointvalue=1;
-	public $showpercent=0;
-	public $combine=0;				// 0.05 if you want to combine records < 5% into "other"
-	public $graph;     			// Objet Graph (Artichow, Phplot...)
+	public $data; // Data of graph: array(array('abs1',valA1,valB1), array('abs2',valA2,valB2), ...)
+	public $title; // Title of graph
+	public $cssprefix = ''; // To add into css styles
+	public $width = 380;
+	public $height = 200;
+	public $MaxValue = 0;
+	public $MinValue = 0;
+	public $SetShading = 0;
+
+	public $PrecisionY = -1;
+
+	public $horizTickIncrement = -1;
+	public $SetNumXTicks = -1;
+	public $labelInterval = -1;
+
+	public $hideXGrid = false;
+	public $hideYGrid = false;
+
+	public $Legend = array();
+	public $LegendWidthMin = 0;
+	public $showlegend = 1;
+	public $showpointvalue = 1;
+	public $showpercent = 0;
+	public $combine = 0; // 0.05 if you want to combine records < 5% into "other"
+	public $graph; // Objet Graph (Artichow, Phplot...)
 
 	/**
 	 * @var string Error code (or message)
 	 */
-	public $error='';
+	public $error = '';
 
-	public $bordercolor;			// array(R,G,B)
-	public $bgcolor;				// array(R,G,B)
-	public $bgcolorgrid=array(255,255,255);			// array(R,G,B)
-	public $datacolor;				// array(array(R,G,B),...)
+	public $bordercolor; // array(R,G,B)
+	public $bgcolor; // array(R,G,B)
+	public $bgcolorgrid = array(255, 255, 255); // array(R,G,B)
+	public $datacolor; // array(array(R,G,B),...)
 
-	private $stringtoshow;      // To store string to output graph into HTML page
+	private $stringtoshow; // To store string to output graph into HTML page
 
 
 	/**
@@ -88,7 +88,7 @@ 
 	 *
 	 * @param	string	$library		'jflot' (default) or 'artichow' (no more supported)
 	 */
-	function __construct($library='jflot')
+	function __construct($library = 'jflot')
 	{
 		global $conf;
 		global $theme_bordercolor, $theme_datacolor, $theme_bgcolor, $theme_bgcoloronglet;
@@ -96,25 +96,25 @@ 
 		// To use old feature
 		if ($library == 'artichow')
 		{
-			$this->_library='artichow';
+			$this->_library = 'artichow';
 
 			// Test if module GD present
 			$modules_list = get_loaded_extensions();
-			$isgdinstalled=0;
+			$isgdinstalled = 0;
 			foreach ($modules_list as $module)
 			{
-				if ($module == 'gd') $isgdinstalled=1;
+				if ($module == 'gd') $isgdinstalled = 1;
 			}
-			if (! $isgdinstalled)
+			if (!$isgdinstalled)
 			{
-				$this->error="Error: PHP GD module is not available. It is required to build graphics.";
+				$this->error = "Error: PHP GD module is not available. It is required to build graphics.";
 				return -1;
 			}
 		}
 
-		$this->bordercolor = array(235,235,224);
-		$this->datacolor = array(array(120,130,150), array(160,160,180), array(190,190,220));
-		$this->bgcolor = array(235,235,224);
+		$this->bordercolor = array(235, 235, 224);
+		$this->datacolor = array(array(120, 130, 150), array(160, 160, 180), array(190, 190, 220));
+		$this->bgcolor = array(235, 235, 224);
 
 		$color_file = DOL_DOCUMENT_ROOT.'/theme/'.$conf->theme.'/graph-color.php';
 		if (is_readable($color_file))
@@ -448,7 +448,7 @@ 
 	 */
 	function setShowLegend($showlegend)
 	{
-		$this->showlegend=$showlegend;
+		$this->showlegend = $showlegend;
 	}
 
 	/**
@@ -459,7 +459,7 @@ 
 	 */
 	function setShowPointValue($showpointvalue)
 	{
-		$this->showpointvalue=$showpointvalue;
+		$this->showpointvalue = $showpointvalue;
 	}
 
 	/**
@@ -470,7 +470,7 @@ 
 	 */
 	function setShowPercent($showpercent)
 	{
-		$this->showpercent=$showpercent;
+		$this->showpercent = $showpercent;
 	}
 
 
@@ -482,12 +482,12 @@ 
 	 * @param	array	$bg_color		array(R,G,B) ou 'onglet' ou 'default'
 	 * @return	void
 	 */
-	function SetBgColor($bg_color = array(255,255,255))
+	function SetBgColor($bg_color = array(255, 255, 255))
 	{
         // phpcs:enable
-		global $theme_bgcolor,$theme_bgcoloronglet;
+		global $theme_bgcolor, $theme_bgcoloronglet;
 
-		if (! is_array($bg_color))
+		if (!is_array($bg_color))
 		{
 			if ($bg_color == 'onglet')
 			{
@@ -512,12 +512,12 @@ 
 	 * @param	array	$bg_colorgrid		array(R,G,B) ou 'onglet' ou 'default'
 	 * @return	void
 	 */
-	function SetBgColorGrid($bg_colorgrid = array(255,255,255))
+	function SetBgColorGrid($bg_colorgrid = array(255, 255, 255))
 	{
         // phpcs:enable
-		global $theme_bgcolor,$theme_bgcoloronglet;
+		global $theme_bgcolor, $theme_bgcoloronglet;
 
-		if (! is_array($bg_colorgrid))
+		if (!is_array($bg_colorgrid))
 		{
 			if ($bg_colorgrid == 'onglet')
 			{
@@ -562,11 +562,11 @@ 
 		$nblines = count($this->data);
 		$nbvalues = count($this->data[0]) - 1;
 
-		for ($j = 0 ; $j < $nblines ; $j++)
+		for ($j = 0; $j < $nblines; $j++)
 		{
-			for ($i = 0 ; $i < $nbvalues ; $i++)
+			for ($i = 0; $i < $nbvalues; $i++)
 			{
-				$vals[$k] = $this->data[$j][$i+1];
+				$vals[$k] = $this->data[$j][$i + 1];
 				$k++;
 			}
 		}
@@ -589,11 +589,11 @@ 
 		$nblines = count($this->data);
 		$nbvalues = count($this->data[0]) - 1;
 
-		for ($j = 0 ; $j < $nblines ; $j++)
+		for ($j = 0; $j < $nblines; $j++)
 		{
-			for ($i = 0 ; $i < $nbvalues ; $i++)
+			for ($i = 0; $i < $nbvalues; $i++)
 			{
-				$vals[$k] = $this->data[$j][$i+1];
+				$vals[$k] = $this->data[$j][$i + 1];
 				$k++;
 			}
 		}
@@ -612,15 +612,15 @@ 
         // phpcs:enable
 		$max = $this->GetMaxValueInData();
 		if ($max != 0) $max++;
-		$size=dol_strlen(abs(ceil($max)));
-		$factor=1;
-		for ($i=0; $i < ($size-1); $i++)
+		$size = dol_strlen(abs(ceil($max)));
+		$factor = 1;
+		for ($i = 0; $i < ($size - 1); $i++)
 		{
-			$factor*=10;
+			$factor *= 10;
 		}
 
-		$res=0;
-		if (is_numeric($max)) $res=ceil($max/$factor)*$factor;
+		$res = 0;
+		if (is_numeric($max)) $res = ceil($max / $factor) * $factor;
 
 		//print "max=".$max." res=".$res;
 		return $res;
@@ -636,16 +636,16 @@ 
 	{
         // phpcs:enable
 		$min = $this->GetMinValueInData();
-		if ($min == '') $min=0;
+		if ($min == '') $min = 0;
 		if ($min != 0) $min--;
-		$size=dol_strlen(abs(floor($min)));
-		$factor=1;
-		for ($i=0; $i < ($size-1); $i++)
+		$size = dol_strlen(abs(floor($min)));
+		$factor = 1;
+		for ($i = 0; $i < ($size - 1); $i++)
 		{
-			$factor*=10;
+			$factor *= 10;
 		}
 
-		$res=floor($min/$factor)*$factor;
+		$res = floor($min / $factor) * $factor;
 
 		//print "min=".$min." res=".$res;
 		return $res;
@@ -658,27 +658,27 @@ 
 	 * @param	string	$fileurl	Url path to show image if saved onto disk
 	 * @return	integer|null
 	 */
-	function draw($file, $fileurl='')
+	function draw($file, $fileurl = '')
 	{
 		if (empty($file))
 		{
-			$this->error="Call to draw method was made with empty value for parameter file.";
+			$this->error = "Call to draw method was made with empty value for parameter file.";
 			dol_syslog(get_class($this)."::draw ".$this->error, LOG_ERR);
 			return -2;
 		}
-		if (! is_array($this->data))
+		if (!is_array($this->data))
 		{
-			$this->error="Call to draw method was made but SetData was not called or called with an empty dataset for parameters";
+			$this->error = "Call to draw method was made but SetData was not called or called with an empty dataset for parameters";
 			dol_syslog(get_class($this)."::draw ".$this->error, LOG_ERR);
 			return -1;
 		}
 		if (count($this->data) < 1)
 		{
-			$this->error="Call to draw method was made but SetData was is an empty dataset";
+			$this->error = "Call to draw method was made but SetData was is an empty dataset";
 			dol_syslog(get_class($this)."::draw ".$this->error, LOG_WARNING);
 		}
 		$call = "draw_".$this->_library;
-		call_user_func_array(array($this,$call), array($file,$fileurl));
+		call_user_func_array(array($this, $call), array($file, $fileurl));
 	}
 
 
@@ -690,31 +690,31 @@ 
 	 * @param	string	$fileurl	Url path to show image if saved onto disk
 	 * @return	void
 	 */
-	private function draw_artichow($file,$fileurl)
+	private function draw_artichow($file, $fileurl)
 	{
         // phpcs:enable
 		global $artichow_defaultfont;
 
-		dol_syslog(get_class($this)."::draw_artichow this->type=".join(',',$this->type));
+		dol_syslog(get_class($this)."::draw_artichow this->type=".join(',', $this->type));
 
-		if (! defined('SHADOW_RIGHT_TOP'))  define('SHADOW_RIGHT_TOP',3);
-		if (! defined('LEGEND_BACKGROUND')) define('LEGEND_BACKGROUND',2);
-		if (! defined('LEGEND_LINE'))       define('LEGEND_LINE',1);
+		if (!defined('SHADOW_RIGHT_TOP'))  define('SHADOW_RIGHT_TOP', 3);
+		if (!defined('LEGEND_BACKGROUND')) define('LEGEND_BACKGROUND', 2);
+		if (!defined('LEGEND_LINE'))       define('LEGEND_LINE', 1);
 
 		// Create graph
-		$classname='';
-		if (! isset($this->type[0]) || $this->type[0] == 'bars')  $classname='BarPlot';    // Only one type (first one) is supported by artichow
-		else if ($this->type[0] == 'lines' || $this->type[0] == 'linesnopoint') $classname='LinePlot';
-		else $classname='TypeUnknown';
+		$classname = '';
+		if (!isset($this->type[0]) || $this->type[0] == 'bars')  $classname = 'BarPlot'; // Only one type (first one) is supported by artichow
+		else if ($this->type[0] == 'lines' || $this->type[0] == 'linesnopoint') $classname = 'LinePlot';
+		else $classname = 'TypeUnknown';
 		include_once ARTICHOW_PATH.$classname.'.class.php';
 
 		// Definition de couleurs
-		$bgcolor=new Color($this->bgcolor[0],$this->bgcolor[1],$this->bgcolor[2]);
-		$bgcolorgrid=new Color($this->bgcolorgrid[0],$this->bgcolorgrid[1],$this->bgcolorgrid[2]);
-		$colortrans=new Color(0,0,0,100);
-		$colorsemitrans=new Color(255,255,255,60);
-		$colorgradient= new LinearGradient(new Color(235, 235, 235),new Color(255, 255, 255),0);
-		$colorwhite=new Color(255,255,255);
+		$bgcolor = new Color($this->bgcolor[0], $this->bgcolor[1], $this->bgcolor[2]);
+		$bgcolorgrid = new Color($this->bgcolorgrid[0], $this->bgcolorgrid[1], $this->bgcolorgrid[2]);
+		$colortrans = new Color(0, 0, 0, 100);
+		$colorsemitrans = new Color(255, 255, 255, 60);
+		$colorgradient = new LinearGradient(new Color(235, 235, 235), new Color(255, 255, 255), 0);
+		$colorwhite = new Color(255, 255, 255);
 
 		// Graph
 		$graph = new Graph($this->width, $this->height);
@@ -733,13 +733,13 @@ 
 		$group = new PlotGroup;
 		//$group->setSpace(5, 5, 0, 0);
 
-		$paddleft=50;
-		$paddright=10;
-		$strl=dol_strlen(max(abs($this->MaxValue),abs($this->MinValue)));
+		$paddleft = 50;
+		$paddright = 10;
+		$strl = dol_strlen(max(abs($this->MaxValue), abs($this->MinValue)));
 		if ($strl > 6) $paddleft += ($strl * 4);
-		$group->setPadding($paddleft, $paddright);		// Width on left and right for Y axis values
+		$group->setPadding($paddleft, $paddright); // Width on left and right for Y axis values
 		$group->legend->setSpace(0);
-		$group->legend->setPadding(2,2,2,2);
+		$group->legend->setPadding(2, 2, 2, 2);
 		$group->legend->setPosition(null, 0.1);
 		$group->legend->setBackgroundColor($colorsemitrans);
 
@@ -750,26 +750,26 @@ 
 		if ($this->hideYGrid)	$group->grid->hideHorizontal(true);
 
 		// On boucle sur chaque lot de donnees
-		$legends=array();
-		$i=0;
-		$nblot=count($this->data[0])-1;
+		$legends = array();
+		$i = 0;
+		$nblot = count($this->data[0]) - 1;
 
 		while ($i < $nblot)
 		{
-			$x=0;
-			$values=array();
-			foreach($this->data as $key => $valarray)
+			$x = 0;
+			$values = array();
+			foreach ($this->data as $key => $valarray)
 			{
 				$legends[$x] = $valarray[0];
-				$values[$x]  = $valarray[$i+1];
+				$values[$x]  = $valarray[$i + 1];
 				$x++;
 			}
 
 			// We fix unknown values to null
-			$newvalues=array();
-			foreach($values as $val)
+			$newvalues = array();
+			foreach ($values as $val)
 			{
-				$newvalues[]=(is_numeric($val) ? $val : null);
+				$newvalues[] = (is_numeric($val) ? $val : null);
 			}
 
 
@@ -779,14 +779,14 @@ 
 				//print_r($values);
 				//print '<br>';
 
-				$color=new Color($this->datacolor[$i][0],$this->datacolor[$i][1],$this->datacolor[$i][2],20);
-				$colorbis=new Color(min($this->datacolor[$i][0]+50,255),min($this->datacolor[$i][1]+50,255),min($this->datacolor[$i][2]+50,255),50);
+				$color = new Color($this->datacolor[$i][0], $this->datacolor[$i][1], $this->datacolor[$i][2], 20);
+				$colorbis = new Color(min($this->datacolor[$i][0] + 50, 255), min($this->datacolor[$i][1] + 50, 255), min($this->datacolor[$i][2] + 50, 255), 50);
 
-				$colorgrey=new Color(100,100,100);
-				$colorborder=new Color($this->datacolor[$i][0],$this->datacolor[$i][1],$this->datacolor[$i][2]);
+				$colorgrey = new Color(100, 100, 100);
+				$colorborder = new Color($this->datacolor[$i][0], $this->datacolor[$i][1], $this->datacolor[$i][2]);
 
-				if ($this->mode == 'side')  $plot = new BarPlot($newvalues, $i+1, $nblot);
-				if ($this->mode == 'depth') $plot = new BarPlot($newvalues, 1, 1, ($nblot-$i-1)*5);
+				if ($this->mode == 'side')  $plot = new BarPlot($newvalues, $i + 1, $nblot);
+				if ($this->mode == 'depth') $plot = new BarPlot($newvalues, 1, 1, ($nblot - $i - 1) * 5);
 
 				$plot->barBorder->setColor($colorgrey);
 				//$plot->setBarColor($color);
@@ -811,9 +811,9 @@ 
 
 			if ($this->type[0] == 'lines' || $this->type[0] == 'linesnopoint')
 			{
-				$color=new Color($this->datacolor[$i][0],$this->datacolor[$i][1],$this->datacolor[$i][2],20);
-				$colorbis=new Color(min($this->datacolor[$i][0]+20,255),min($this->datacolor[$i][1]+20,255),min($this->datacolor[$i][2]+20,255),60);
-				$colorter=new Color(min($this->datacolor[$i][0]+50,255),min($this->datacolor[$i][1]+50,255),min($this->datacolor[$i][2]+50,255),90);
+				$color = new Color($this->datacolor[$i][0], $this->datacolor[$i][1], $this->datacolor[$i][2], 20);
+				$colorbis = new Color(min($this->datacolor[$i][0] + 20, 255), min($this->datacolor[$i][1] + 20, 255), min($this->datacolor[$i][2] + 20, 255), 60);
+				$colorter = new Color(min($this->datacolor[$i][0] + 50, 255), min($this->datacolor[$i][1] + 50, 255), min($this->datacolor[$i][2] + 50, 255), 90);
 
 				$plot = new LinePlot($newvalues);
 				//$plot->setSize(1, 0.96);
@@ -859,7 +859,7 @@ 
 		// Generate file
 		$graph->draw($file);
 
-		$this->stringtoshow='<!-- Build using '.$this->_library.' --><img src="'.$fileurl.'" title="'.dol_escape_htmltag($this->title?$this->title:$this->YLabel).'" alt="'.dol_escape_htmltag($this->title?$this->title:$this->YLabel).'">';
+		$this->stringtoshow = '<!-- Build using '.$this->_library.' --><img src="'.$fileurl.'" title="'.dol_escape_htmltag($this->title ? $this->title : $this->YLabel).'" alt="'.dol_escape_htmltag($this->title ? $this->title : $this->YLabel).'">';
 	}
 
 
@@ -885,7 +885,7 @@ 
         // phpcs:enable
 		global $artichow_defaultfont;
 
-		dol_syslog(get_class($this)."::draw_jflot this->type=".join(',',$this->type)." this->MaxValue=".$this->MaxValue);
+		dol_syslog(get_class($this)."::draw_jflot this->type=".join(',', $this->type)." this->MaxValue=".$this->MaxValue);
 
 		if (empty($this->width) && empty($this->height))
 		{
@@ -893,87 +893,87 @@ 
 			return;
 		}
 
-		$legends=array();
-		$nblot=count($this->data[0])-1;    // -1 to remove legend
+		$legends = array();
+		$nblot = count($this->data[0]) - 1; // -1 to remove legend
 		if ($nblot < 0) dol_syslog('Bad value for property ->data. Must be set by mydolgraph->SetData before calling mydolgrapgh->draw', LOG_WARNING);
-		$firstlot=0;
+		$firstlot = 0;
 		// Works with line but not with bars
 		//if ($nblot > 2) $firstlot = ($nblot - 2);        // We limit nblot to 2 because jflot can't manage more than 2 bars on same x
 
-		$i=$firstlot;
-		$serie=array();
+		$i = $firstlot;
+		$serie = array();
 		while ($i < $nblot)	// Loop on each serie
 		{
-			$values=array();	// Array with horizontal y values (specific values of a serie) for each abscisse x
-			$serie[$i]="var d".$i." = [];\n";
+			$values = array(); // Array with horizontal y values (specific values of a serie) for each abscisse x
+			$serie[$i] = "var d".$i." = [];\n";
 
 			// Fill array $values
-			$x=0;
-			foreach($this->data as $valarray)	// Loop on each x
+			$x = 0;
+			foreach ($this->data as $valarray)	// Loop on each x
 			{
 				$legends[$x] = $valarray[0];
-				$values[$x]  = (is_numeric($valarray[$i+1]) ? $valarray[$i+1] : null);
+				$values[$x]  = (is_numeric($valarray[$i + 1]) ? $valarray[$i + 1] : null);
 				$x++;
 			}
 
 			// TODO Avoid push by adding generated long array...
 			if (isset($this->type[$firstlot]) && $this->type[$firstlot] == 'pie')
 			{
-				foreach($values as $x => $y) {
-					if (isset($y)) $serie[$i].='d'.$i.'.push({"label":"'.dol_escape_js($legends[$x]).'", "data":'.$y.'});'."\n";
+				foreach ($values as $x => $y) {
+					if (isset($y)) $serie[$i] .= 'd'.$i.'.push({"label":"'.dol_escape_js($legends[$x]).'", "data":'.$y.'});'."\n";
 				}
 			}
 			else
 			{
-				foreach($values as $x => $y) {
-					if (isset($y)) $serie[$i].='d'.$i.'.push(['.$x.', '.$y.']);'."\n";
+				foreach ($values as $x => $y) {
+					if (isset($y)) $serie[$i] .= 'd'.$i.'.push(['.$x.', '.$y.']);'."\n";
 				}
 			}
 
 			unset($values);
 			$i++;
 		}
-		$tag=dol_escape_htmltag(dol_string_unaccent(dol_string_nospecial(basename($file),'_',array('-','.'))));
+		$tag = dol_escape_htmltag(dol_string_unaccent(dol_string_nospecial(basename($file), '_', array('-', '.'))));
 
-		$this->stringtoshow ='<!-- Build using '.$this->_library.' -->'."\n";
-		if (! empty($this->title)) $this->stringtoshow.='<div align="center" class="dolgraphtitle'.(empty($this->cssprefix)?'':' dolgraphtitle'.$this->cssprefix).'">'.$this->title.'</div>';
-		if (! empty($this->shownographyet))
+		$this->stringtoshow = '<!-- Build using '.$this->_library.' -->'."\n";
+		if (!empty($this->title)) $this->stringtoshow .= '<div align="center" class="dolgraphtitle'.(empty($this->cssprefix) ? '' : ' dolgraphtitle'.$this->cssprefix).'">'.$this->title.'</div>';
+		if (!empty($this->shownographyet))
 		{
-		  $this->stringtoshow.='<div style="width:'.$this->width.'px;height:'.$this->height.'px;" class="nographyet"></div>';
-		  $this->stringtoshow.='<div class="nographyettext">'.$langs->trans("NotEnoughDataYet").'</div>';
+		  $this->stringtoshow .= '<div style="width:'.$this->width.'px;height:'.$this->height.'px;" class="nographyet"></div>';
+		  $this->stringtoshow .= '<div class="nographyettext">'.$langs->trans("NotEnoughDataYet").'</div>';
 		  return;
 		}
-		$this->stringtoshow.='<div id="placeholder_'.$tag.'" style="width:'.$this->width.'px;height:'.$this->height.'px;" class="dolgraph'.(empty($this->cssprefix)?'':' dolgraph'.$this->cssprefix).'"></div>'."\n";
+		$this->stringtoshow .= '<div id="placeholder_'.$tag.'" style="width:'.$this->width.'px;height:'.$this->height.'px;" class="dolgraph'.(empty($this->cssprefix) ? '' : ' dolgraph'.$this->cssprefix).'"></div>'."\n";
 
-		$this->stringtoshow.='<script id="'.$tag.'">'."\n";
-		$this->stringtoshow.='$(function () {'."\n";
-		$i=$firstlot;
+		$this->stringtoshow .= '<script id="'.$tag.'">'."\n";
+		$this->stringtoshow .= '$(function () {'."\n";
+		$i = $firstlot;
 		if ($nblot < 0)
 		{
-			$this->stringtoshow.='<!-- No series of data -->';
+			$this->stringtoshow .= '<!-- No series of data -->';
 		}
 		else
 		{
 			while ($i < $nblot)
 			{
-				$this->stringtoshow.=$serie[$i];
+				$this->stringtoshow .= $serie[$i];
 				$i++;
 			}
 		}
-		$this->stringtoshow.="\n";
+		$this->stringtoshow .= "\n";
 
 		// Special case for Graph of type 'pie'
 		if (isset($this->type[$firstlot]) && $this->type[$firstlot] == 'pie')
 		{
-			$datacolor=array();
-			foreach($this->datacolor as $val) $datacolor[]="#".sprintf("%02x%02x%02x",$val[0],$val[1],$val[2]);
+			$datacolor = array();
+			foreach ($this->datacolor as $val) $datacolor[] = "#".sprintf("%02x%02x%02x", $val[0], $val[1], $val[2]);
 
-			$urltemp='';	// TODO Add support for url link into labels
-			$showlegend=$this->showlegend;
-			$showpointvalue=$this->showpointvalue;
-			$showpercent=$this->showpercent;
+			$urltemp = ''; // TODO Add support for url link into labels
+			$showlegend = $this->showlegend;
+			$showpointvalue = $this->showpointvalue;
+			$showpercent = $this->showpercent;
 
-			$this->stringtoshow.= '
+			$this->stringtoshow .= '
 			function plotWithOptions_'.$tag.'() {
 			$.plot($("#placeholder_'.$tag.'"), d0,
 			{
@@ -984,7 +984,7 @@ 
 						'.($this->combine ? '
 						combine: {
 						 	threshold: '.$this->combine.'
-						},' : '') . '
+						},' : '').'
 						label: {
 							show: true,
 							radius: 0.9,
@@ -992,15 +992,15 @@ 
 								var percent=Math.round(series.percent);
 								var number=series.data[0][1];
 								return \'';
-								$this->stringtoshow.='<span style="font-size:8pt;text-align:center;padding:2px;color:black;">';
-								if ($urltemp) $this->stringtoshow.='<a style="color: #FFFFFF;" border="0" href="'.$urltemp.'">';
-								$this->stringtoshow.='\'+';
-								$this->stringtoshow.=($showlegend?'':'label+\' \'+');	// Hide label if already shown in legend
-								$this->stringtoshow.=($showpointvalue?'number+':'');
-								$this->stringtoshow.=($showpercent?'\'<br/>\'+percent+\'%\'+':'');
-								$this->stringtoshow.='\'';
-								if ($urltemp) $this->stringtoshow.='</a>';
-								$this->stringtoshow.='</span>\';
+								$this->stringtoshow .= '<span style="font-size:8pt;text-align:center;padding:2px;color:black;">';
+								if ($urltemp) $this->stringtoshow .= '<a style="color: #FFFFFF;" border="0" href="'.$urltemp.'">';
+								$this->stringtoshow .= '\'+';
+								$this->stringtoshow .= ($showlegend ? '' : 'label+\' \'+'); // Hide label if already shown in legend
+								$this->stringtoshow .= ($showpointvalue ? 'number+' : '');
+								$this->stringtoshow .= ($showpercent ? '\'<br/>\'+percent+\'%\'+' : '');
+								$this->stringtoshow .= '\'';
+								if ($urltemp) $this->stringtoshow .= '</a>';
+								$this->stringtoshow .= '</span>\';
 							},
 							background: {
 							opacity: 0.0,
@@ -1017,9 +1017,9 @@ 
 			},';
 			if (count($datacolor))
 			{
-				$this->stringtoshow.='colors: '.(! empty($data['seriescolor']) ? json_encode($data['seriescolor']) : json_encode($datacolor)).',';
+				$this->stringtoshow .= 'colors: '.(!empty($data['seriescolor']) ? json_encode($data['seriescolor']) : json_encode($datacolor)).',';
 			}
-			$this->stringtoshow.='legend: {show: '.($showlegend?'true':'false').', position: \'ne\' }
+			$this->stringtoshow .= 'legend: {show: '.($showlegend ? 'true' : 'false').', position: \'ne\' }
 		});
 		}'."\n";
 		}
@@ -1028,7 +1028,7 @@ 
 		{
 			// Add code to support tooltips
 		    // TODO: remove js css and use graph-tooltip-inner class instead by adding css in each themes
-			$this->stringtoshow.='
+			$this->stringtoshow .= '
 			function showTooltip_'.$tag.'(x, y, contents) {
 				$(\'<div class="graph-tooltip-inner" id="tooltip_'.$tag.'">\' + contents + \'</div>\').css({
 					position: \'absolute\',
@@ -1060,10 +1060,10 @@ 
 						var y = item.datapoint[1].toFixed(2);
 						var z = item.series.xaxis.ticks[item.dataIndex].label;
 						';
-						if ($this->showpointvalue > 0) $this->stringtoshow.='
+						if ($this->showpointvalue > 0) $this->stringtoshow .= '
 							showTooltip_'.$tag.'(item.pageX, item.pageY, item.series.label + "<br>" + z + " => " + y);
 						';
-						$this->stringtoshow.='
+						$this->stringtoshow .= '
 					}
 				}
 				else {
@@ -1073,50 +1073,50 @@ 
 			});
 			';
 
-			$this->stringtoshow.='var stack = null, steps = false;'."\n";
+			$this->stringtoshow .= 'var stack = null, steps = false;'."\n";
 
-			$this->stringtoshow.='function plotWithOptions_'.$tag.'() {'."\n";
-			$this->stringtoshow.='$.plot($("#placeholder_'.$tag.'"), [ '."\n";
-			$i=$firstlot;
+			$this->stringtoshow .= 'function plotWithOptions_'.$tag.'() {'."\n";
+			$this->stringtoshow .= '$.plot($("#placeholder_'.$tag.'"), [ '."\n";
+			$i = $firstlot;
 			while ($i < $nblot)
 			{
-				if ($i > $firstlot) $this->stringtoshow.=', '."\n";
-				$color=sprintf("%02x%02x%02x",$this->datacolor[$i][0],$this->datacolor[$i][1],$this->datacolor[$i][2]);
-				$this->stringtoshow.='{ ';
-				if (! isset($this->type[$i]) || $this->type[$i] == 'bars') $this->stringtoshow.='bars: { lineWidth: 1, show: true, align: "'.($i==$firstlot?'center':'left').'", barWidth: 0.5 }, ';
-				if (isset($this->type[$i]) && ($this->type[$i] == 'lines' || $this->type[$i] == 'linesnopoint')) $this->stringtoshow.='lines: { show: true, fill: false }, points: { show: '.($this->type[$i] == 'linesnopoint' ? 'false' : 'true').' }, ';
-				$this->stringtoshow.='color: "#'.$color.'", label: "'.(isset($this->Legend[$i]) ? dol_escape_js($this->Legend[$i]) : '').'", data: d'.$i.' }';
+				if ($i > $firstlot) $this->stringtoshow .= ', '."\n";
+				$color = sprintf("%02x%02x%02x", $this->datacolor[$i][0], $this->datacolor[$i][1], $this->datacolor[$i][2]);
+				$this->stringtoshow .= '{ ';
+				if (!isset($this->type[$i]) || $this->type[$i] == 'bars') $this->stringtoshow .= 'bars: { lineWidth: 1, show: true, align: "'.($i == $firstlot ? 'center' : 'left').'", barWidth: 0.5 }, ';
+				if (isset($this->type[$i]) && ($this->type[$i] == 'lines' || $this->type[$i] == 'linesnopoint')) $this->stringtoshow .= 'lines: { show: true, fill: false }, points: { show: '.($this->type[$i] == 'linesnopoint' ? 'false' : 'true').' }, ';
+				$this->stringtoshow .= 'color: "#'.$color.'", label: "'.(isset($this->Legend[$i]) ? dol_escape_js($this->Legend[$i]) : '').'", data: d'.$i.' }';
 				$i++;
 			}
 			// shadowSize: 0 -> Drawing is faster without shadows
-			$this->stringtoshow.="\n".' ], { series: { shadowSize: 0, stack: stack, lines: { fill: false, steps: steps }, bars: { barWidth: 0.6 } }'."\n";
+			$this->stringtoshow .= "\n".' ], { series: { shadowSize: 0, stack: stack, lines: { fill: false, steps: steps }, bars: { barWidth: 0.6 } }'."\n";
 
 			// Xaxis
-			$this->stringtoshow.=', xaxis: { ticks: ['."\n";
-			$x=0;
-			foreach($this->data as $key => $valarray)
+			$this->stringtoshow .= ', xaxis: { ticks: ['."\n";
+			$x = 0;
+			foreach ($this->data as $key => $valarray)
 			{
-				if ($x > 0) $this->stringtoshow.=', '."\n";
-				$this->stringtoshow.= ' ['.$x.', "'.$valarray[0].'"]';
+				if ($x > 0) $this->stringtoshow .= ', '."\n";
+				$this->stringtoshow .= ' ['.$x.', "'.$valarray[0].'"]';
 				$x++;
 			}
-			$this->stringtoshow.='] }'."\n";
+			$this->stringtoshow .= '] }'."\n";
 
 			// Yaxis
-			$this->stringtoshow.=', yaxis: { min: '.$this->MinValue.', max: '.($this->MaxValue).' }'."\n";
+			$this->stringtoshow .= ', yaxis: { min: '.$this->MinValue.', max: '.($this->MaxValue).' }'."\n";
 
 			// Background color
-			$color1=sprintf("%02x%02x%02x",$this->bgcolorgrid[0],$this->bgcolorgrid[0],$this->bgcolorgrid[2]);
-			$color2=sprintf("%02x%02x%02x",$this->bgcolorgrid[0],$this->bgcolorgrid[1],$this->bgcolorgrid[2]);
-			$this->stringtoshow.=', grid: { hoverable: true, backgroundColor: { colors: ["#'.$color1.'", "#'.$color2.'"] }, borderWidth: 1, borderColor: \'#e6e6e6\', tickColor  : \'#e6e6e6\' }'."\n";
+			$color1 = sprintf("%02x%02x%02x", $this->bgcolorgrid[0], $this->bgcolorgrid[0], $this->bgcolorgrid[2]);
+			$color2 = sprintf("%02x%02x%02x", $this->bgcolorgrid[0], $this->bgcolorgrid[1], $this->bgcolorgrid[2]);
+			$this->stringtoshow .= ', grid: { hoverable: true, backgroundColor: { colors: ["#'.$color1.'", "#'.$color2.'"] }, borderWidth: 1, borderColor: \'#e6e6e6\', tickColor  : \'#e6e6e6\' }'."\n";
 			//$this->stringtoshow.=', shadowSize: 20'."\n";    TODO Uncommet this
-			$this->stringtoshow.='});'."\n";
-			$this->stringtoshow.='}'."\n";
+			$this->stringtoshow .= '});'."\n";
+			$this->stringtoshow .= '}'."\n";
 		}
 
-		$this->stringtoshow.='plotWithOptions_'.$tag.'();'."\n";
-		$this->stringtoshow.='});'."\n";
-		$this->stringtoshow.='</script>'."\n";
+		$this->stringtoshow .= 'plotWithOptions_'.$tag.'();'."\n";
+		$this->stringtoshow .= '});'."\n";
+		$this->stringtoshow .= '</script>'."\n";
 	}
 
 
@@ -1127,14 +1127,14 @@ 
 	 * @param	int			$shownographyet 	Show graph to say there is not enough data
 	 * @return	string							HTML string to show graph
 	 */
-	function show($shownographyet=0)
+	function show($shownographyet = 0)
 	{
 		global $langs;
 
 		if ($shownographyet)
 		{
-			$s= '<div class="nographyet" style="width:'.(preg_match('/%/',$this->width)?$this->width:$this->width.'px').'; height:'.(preg_match('/%/',$this->height)?$this->height:$this->height.'px').';"></div>';
-			$s.='<div class="nographyettext">'.$langs->trans("NotEnoughDataYet").'</div>';
+			$s = '<div class="nographyet" style="width:'.(preg_match('/%/', $this->width) ? $this->width : $this->width.'px').'; height:'.(preg_match('/%/', $this->height) ? $this->height : $this->height.'px').';"></div>';
+			$s .= '<div class="nographyettext">'.$langs->trans("NotEnoughDataYet").'</div>';
 			return $s;
 		}
 
@@ -1149,18 +1149,18 @@ 
 	 * @param	string	$defaultsize	Value we want as default size
 	 * @return	int						Value of width or height to use by default
 	 */
-	static function getDefaultGraphSizeForStats($direction,$defaultsize='')
+	static function getDefaultGraphSizeForStats($direction, $defaultsize = '')
 	{
 		global $conf;
 
 		if ($direction == 'width')
 		{
 			if (empty($conf->dol_optimize_smallscreen)) return ($defaultsize ? $defaultsize : '500');
-			else return (empty($_SESSION['dol_screen_width']) ? '280' : ($_SESSION['dol_screen_width']-40));
+			else return (empty($_SESSION['dol_screen_width']) ? '280' : ($_SESSION['dol_screen_width'] - 40));
 		}
 		if ($direction == 'height')
 		{
-			return (empty($conf->dol_optimize_smallscreen)?($defaultsize?$defaultsize:'200'):'160');
+			return (empty($conf->dol_optimize_smallscreen) ? ($defaultsize ? $defaultsize : '200') : '160');
 		}
 		return 0;
 	}

Braces +143 added lines, -59 removed lines

@@ -103,7 +103,9 @@ 
 			$isgdinstalled=0;
 			foreach ($modules_list as $module)
 			{
-				if ($module == 'gd') $isgdinstalled=1;
+				if ($module == 'gd') {
+				    $isgdinstalled=1;
+				}
 			}
 			if (! $isgdinstalled)
 			{
@@ -120,9 +122,15 @@ 
 		if (is_readable($color_file))
 		{
 			include_once $color_file;
-			if (isset($theme_bordercolor)) $this->bordercolor = $theme_bordercolor;
-			if (isset($theme_datacolor))   $this->datacolor   = $theme_datacolor;
-			if (isset($theme_bgcolor))     $this->bgcolor     = $theme_bgcolor;
+			if (isset($theme_bordercolor)) {
+			    $this->bordercolor = $theme_bordercolor;
+			}
+			if (isset($theme_datacolor)) {
+			    $this->datacolor   = $theme_datacolor;
+			}
+			if (isset($theme_bgcolor)) {
+			    $this->bgcolor     = $theme_bgcolor;
+			}
 		}
 		//print 'bgcolor: '.join(',',$this->bgcolor).'<br>';
 	}
@@ -493,13 +501,11 @@ 
 			{
 				//print 'ee'.join(',',$theme_bgcoloronglet);
 				$this->bgcolor = $theme_bgcoloronglet;
-			}
-			else
+			} else
 			{
 				$this->bgcolor = $theme_bgcolor;
 			}
-		}
-		else
+		} else
 		{
 			$this->bgcolor = $bg_color;
 		}
@@ -523,13 +529,11 @@ 
 			{
 				//print 'ee'.join(',',$theme_bgcoloronglet);
 				$this->bgcolorgrid = $theme_bgcoloronglet;
-			}
-			else
+			} else
 			{
 				$this->bgcolorgrid = $theme_bgcolor;
 			}
-		}
-		else
+		} else
 		{
 			$this->bgcolorgrid = $bg_colorgrid;
 		}
@@ -611,7 +615,9 @@ 
 	{
         // phpcs:enable
 		$max = $this->GetMaxValueInData();
-		if ($max != 0) $max++;
+		if ($max != 0) {
+		    $max++;
+		}
 		$size=dol_strlen(abs(ceil($max)));
 		$factor=1;
 		for ($i=0; $i < ($size-1); $i++)
@@ -620,7 +626,9 @@ 
 		}
 
 		$res=0;
-		if (is_numeric($max)) $res=ceil($max/$factor)*$factor;
+		if (is_numeric($max)) {
+		    $res=ceil($max/$factor)*$factor;
+		}
 
 		//print "max=".$max." res=".$res;
 		return $res;
@@ -636,8 +644,12 @@ 
 	{
         // phpcs:enable
 		$min = $this->GetMinValueInData();
-		if ($min == '') $min=0;
-		if ($min != 0) $min--;
+		if ($min == '') {
+		    $min=0;
+		}
+		if ($min != 0) {
+		    $min--;
+		}
 		$size=dol_strlen(abs(floor($min)));
 		$factor=1;
 		for ($i=0; $i < ($size-1); $i++)
@@ -697,15 +709,27 @@ 
 
 		dol_syslog(get_class($this)."::draw_artichow this->type=".join(',',$this->type));
 
-		if (! defined('SHADOW_RIGHT_TOP'))  define('SHADOW_RIGHT_TOP',3);
-		if (! defined('LEGEND_BACKGROUND')) define('LEGEND_BACKGROUND',2);
-		if (! defined('LEGEND_LINE'))       define('LEGEND_LINE',1);
+		if (! defined('SHADOW_RIGHT_TOP')) {
+		    define('SHADOW_RIGHT_TOP',3);
+		}
+		if (! defined('LEGEND_BACKGROUND')) {
+		    define('LEGEND_BACKGROUND',2);
+		}
+		if (! defined('LEGEND_LINE')) {
+		    define('LEGEND_LINE',1);
+		}
 
 		// Create graph
 		$classname='';
-		if (! isset($this->type[0]) || $this->type[0] == 'bars')  $classname='BarPlot';    // Only one type (first one) is supported by artichow
-		else if ($this->type[0] == 'lines' || $this->type[0] == 'linesnopoint') $classname='LinePlot';
-		else $classname='TypeUnknown';
+		if (! isset($this->type[0]) || $this->type[0] == 'bars') {
+		    $classname='BarPlot';
+		}
+		// Only one type (first one) is supported by artichow
+		else if ($this->type[0] == 'lines' || $this->type[0] == 'linesnopoint') {
+		    $classname='LinePlot';
+		} else {
+		    $classname='TypeUnknown';
+		}
 		include_once ARTICHOW_PATH.$classname.'.class.php';
 
 		// Definition de couleurs
@@ -727,8 +751,11 @@ 
 			$graph->title->setFont(new $artichow_defaultfont(10));
 		}
 
-		if (is_array($this->bgcolor)) $graph->setBackgroundColor($bgcolor);
-		else $graph->setBackgroundGradient($colorgradient);
+		if (is_array($this->bgcolor)) {
+		    $graph->setBackgroundColor($bgcolor);
+		} else {
+		    $graph->setBackgroundGradient($colorgradient);
+		}
 
 		$group = new PlotGroup;
 		//$group->setSpace(5, 5, 0, 0);
@@ -736,18 +763,27 @@ 
 		$paddleft=50;
 		$paddright=10;
 		$strl=dol_strlen(max(abs($this->MaxValue),abs($this->MinValue)));
-		if ($strl > 6) $paddleft += ($strl * 4);
+		if ($strl > 6) {
+		    $paddleft += ($strl * 4);
+		}
 		$group->setPadding($paddleft, $paddright);		// Width on left and right for Y axis values
 		$group->legend->setSpace(0);
 		$group->legend->setPadding(2,2,2,2);
 		$group->legend->setPosition(null, 0.1);
 		$group->legend->setBackgroundColor($colorsemitrans);
 
-		if (is_array($this->bgcolorgrid)) $group->grid->setBackgroundColor($bgcolorgrid);
-		else $group->grid->setBackgroundColor($colortrans);
+		if (is_array($this->bgcolorgrid)) {
+		    $group->grid->setBackgroundColor($bgcolorgrid);
+		} else {
+		    $group->grid->setBackgroundColor($colortrans);
+		}
 
-		if ($this->hideXGrid)	$group->grid->hideVertical(true);
-		if ($this->hideYGrid)	$group->grid->hideHorizontal(true);
+		if ($this->hideXGrid) {
+		    $group->grid->hideVertical(true);
+		}
+		if ($this->hideYGrid) {
+		    $group->grid->hideHorizontal(true);
+		}
 
 		// On boucle sur chaque lot de donnees
 		$legends=array();
@@ -785,17 +821,29 @@ 
 				$colorgrey=new Color(100,100,100);
 				$colorborder=new Color($this->datacolor[$i][0],$this->datacolor[$i][1],$this->datacolor[$i][2]);
 
-				if ($this->mode == 'side')  $plot = new BarPlot($newvalues, $i+1, $nblot);
-				if ($this->mode == 'depth') $plot = new BarPlot($newvalues, 1, 1, ($nblot-$i-1)*5);
+				if ($this->mode == 'side') {
+				    $plot = new BarPlot($newvalues, $i+1, $nblot);
+				}
+				if ($this->mode == 'depth') {
+				    $plot = new BarPlot($newvalues, 1, 1, ($nblot-$i-1)*5);
+				}
 
 				$plot->barBorder->setColor($colorgrey);
 				//$plot->setBarColor($color);
 				$plot->setBarGradient(new LinearGradient($colorbis, $color, 90));
 
-				if ($this->mode == 'side')  $plot->setBarPadding(0.1, 0.1);
-				if ($this->mode == 'depth') $plot->setBarPadding(0.1, 0.4);
-				if ($this->mode == 'side')  $plot->setBarSpace(5);
-				if ($this->mode == 'depth') $plot->setBarSpace(2);
+				if ($this->mode == 'side') {
+				    $plot->setBarPadding(0.1, 0.1);
+				}
+				if ($this->mode == 'depth') {
+				    $plot->setBarPadding(0.1, 0.4);
+				}
+				if ($this->mode == 'side') {
+				    $plot->setBarSpace(5);
+				}
+				if ($this->mode == 'depth') {
+				    $plot->setBarSpace(2);
+				}
 
 				$plot->barShadow->setSize($this->SetShading);
 				$plot->barShadow->setPosition(SHADOW_RIGHT_TOP);
@@ -840,8 +888,12 @@ 
 			// solve a bug in Artichow with UTF8
 			if (count($this->Legend))
 			{
-				if ($this->type[0] == 'bars')  										$group->legend->add($plot, $this->Legend[$i], LEGEND_BACKGROUND);
-				if ($this->type[0] == 'lines' || $this->type[0] == 'linesnopoint')	$group->legend->add($plot, $this->Legend[$i], LEGEND_LINE);
+				if ($this->type[0] == 'bars') {
+				    $group->legend->add($plot, $this->Legend[$i], LEGEND_BACKGROUND);
+				}
+				if ($this->type[0] == 'lines' || $this->type[0] == 'linesnopoint') {
+				    $group->legend->add($plot, $this->Legend[$i], LEGEND_LINE);
+				}
 			}
 			$group->add($plot);
 
@@ -852,7 +904,9 @@ 
 		$group->axis->bottom->label->setFont(new $artichow_defaultfont(7));
 
 		//print $group->axis->bottom->getLabelNumber();
-		if ($this->labelInterval > 0) $group->axis->bottom->setLabelInterval($this->labelInterval);
+		if ($this->labelInterval > 0) {
+		    $group->axis->bottom->setLabelInterval($this->labelInterval);
+		}
 
 		$graph->add($group);
 
@@ -895,23 +949,30 @@ 
 
 		$legends=array();
 		$nblot=count($this->data[0])-1;    // -1 to remove legend
-		if ($nblot < 0) dol_syslog('Bad value for property ->data. Must be set by mydolgraph->SetData before calling mydolgrapgh->draw', LOG_WARNING);
+		if ($nblot < 0) {
+		    dol_syslog('Bad value for property ->data. Must be set by mydolgraph->SetData before calling mydolgrapgh->draw', LOG_WARNING);
+		}
 		$firstlot=0;
 		// Works with line but not with bars
 		//if ($nblot > 2) $firstlot = ($nblot - 2);        // We limit nblot to 2 because jflot can't manage more than 2 bars on same x
 
 		$i=$firstlot;
 		$serie=array();
-		while ($i < $nblot)	// Loop on each serie
+		while ($i < $nblot) {
+		    // Loop on each serie
 		{
-			$values=array();	// Array with horizontal y values (specific values of a serie) for each abscisse x
+			$values=array();
+		}
+		// Array with horizontal y values (specific values of a serie) for each abscisse x
 			$serie[$i]="var d".$i." = [];\n";
 
 			// Fill array $values
 			$x=0;
-			foreach($this->data as $valarray)	// Loop on each x
+			foreach($this->data as $valarray) {
+			    // Loop on each x
 			{
 				$legends[$x] = $valarray[0];
+			}
 				$values[$x]  = (is_numeric($valarray[$i+1]) ? $valarray[$i+1] : null);
 				$x++;
 			}
@@ -920,13 +981,16 @@ 
 			if (isset($this->type[$firstlot]) && $this->type[$firstlot] == 'pie')
 			{
 				foreach($values as $x => $y) {
-					if (isset($y)) $serie[$i].='d'.$i.'.push({"label":"'.dol_escape_js($legends[$x]).'", "data":'.$y.'});'."\n";
+					if (isset($y)) {
+					    $serie[$i].='d'.$i.'.push({"label":"'.dol_escape_js($legends[$x]).'", "data":'.$y.'});'."\n";
+					}
 				}
-			}
-			else
+			} else
 			{
 				foreach($values as $x => $y) {
-					if (isset($y)) $serie[$i].='d'.$i.'.push(['.$x.', '.$y.']);'."\n";
+					if (isset($y)) {
+					    $serie[$i].='d'.$i.'.push(['.$x.', '.$y.']);'."\n";
+					}
 				}
 			}
 
@@ -936,7 +1000,9 @@ 
 		$tag=dol_escape_htmltag(dol_string_unaccent(dol_string_nospecial(basename($file),'_',array('-','.'))));
 
 		$this->stringtoshow ='<!-- Build using '.$this->_library.' -->'."\n";
-		if (! empty($this->title)) $this->stringtoshow.='<div align="center" class="dolgraphtitle'.(empty($this->cssprefix)?'':' dolgraphtitle'.$this->cssprefix).'">'.$this->title.'</div>';
+		if (! empty($this->title)) {
+		    $this->stringtoshow.='<div align="center" class="dolgraphtitle'.(empty($this->cssprefix)?'':' dolgraphtitle'.$this->cssprefix).'">'.$this->title.'</div>';
+		}
 		if (! empty($this->shownographyet))
 		{
 		  $this->stringtoshow.='<div style="width:'.$this->width.'px;height:'.$this->height.'px;" class="nographyet"></div>';
@@ -951,8 +1017,7 @@ 
 		if ($nblot < 0)
 		{
 			$this->stringtoshow.='<!-- No series of data -->';
-		}
-		else
+		} else
 		{
 			while ($i < $nblot)
 			{
@@ -966,7 +1031,9 @@ 
 		if (isset($this->type[$firstlot]) && $this->type[$firstlot] == 'pie')
 		{
 			$datacolor=array();
-			foreach($this->datacolor as $val) $datacolor[]="#".sprintf("%02x%02x%02x",$val[0],$val[1],$val[2]);
+			foreach($this->datacolor as $val) {
+			    $datacolor[]="#".sprintf("%02x%02x%02x",$val[0],$val[1],$val[2]);
+			}
 
 			$urltemp='';	// TODO Add support for url link into labels
 			$showlegend=$this->showlegend;
@@ -993,13 +1060,17 @@ 
 								var number=series.data[0][1];
 								return \'';
 								$this->stringtoshow.='<span style="font-size:8pt;text-align:center;padding:2px;color:black;">';
-								if ($urltemp) $this->stringtoshow.='<a style="color: #FFFFFF;" border="0" href="'.$urltemp.'">';
+								if ($urltemp) {
+								    $this->stringtoshow.='<a style="color: #FFFFFF;" border="0" href="'.$urltemp.'">';
+								}
 								$this->stringtoshow.='\'+';
 								$this->stringtoshow.=($showlegend?'':'label+\' \'+');	// Hide label if already shown in legend
 								$this->stringtoshow.=($showpointvalue?'number+':'');
 								$this->stringtoshow.=($showpercent?'\'<br/>\'+percent+\'%\'+':'');
 								$this->stringtoshow.='\'';
-								if ($urltemp) $this->stringtoshow.='</a>';
+								if ($urltemp) {
+								    $this->stringtoshow.='</a>';
+								}
 								$this->stringtoshow.='</span>\';
 							},
 							background: {
@@ -1060,9 +1131,11 @@ 
 						var y = item.datapoint[1].toFixed(2);
 						var z = item.series.xaxis.ticks[item.dataIndex].label;
 						';
-						if ($this->showpointvalue > 0) $this->stringtoshow.='
+						if ($this->showpointvalue > 0) {
+						    $this->stringtoshow.='
 							showTooltip_'.$tag.'(item.pageX, item.pageY, item.series.label + "<br>" + z + " => " + y);
 						';
+						}
 						$this->stringtoshow.='
 					}
 				}
@@ -1080,11 +1153,17 @@ 
 			$i=$firstlot;
 			while ($i < $nblot)
 			{
-				if ($i > $firstlot) $this->stringtoshow.=', '."\n";
+				if ($i > $firstlot) {
+				    $this->stringtoshow.=', '."\n";
+				}
 				$color=sprintf("%02x%02x%02x",$this->datacolor[$i][0],$this->datacolor[$i][1],$this->datacolor[$i][2]);
 				$this->stringtoshow.='{ ';
-				if (! isset($this->type[$i]) || $this->type[$i] == 'bars') $this->stringtoshow.='bars: { lineWidth: 1, show: true, align: "'.($i==$firstlot?'center':'left').'", barWidth: 0.5 }, ';
-				if (isset($this->type[$i]) && ($this->type[$i] == 'lines' || $this->type[$i] == 'linesnopoint')) $this->stringtoshow.='lines: { show: true, fill: false }, points: { show: '.($this->type[$i] == 'linesnopoint' ? 'false' : 'true').' }, ';
+				if (! isset($this->type[$i]) || $this->type[$i] == 'bars') {
+				    $this->stringtoshow.='bars: { lineWidth: 1, show: true, align: "'.($i==$firstlot?'center':'left').'", barWidth: 0.5 }, ';
+				}
+				if (isset($this->type[$i]) && ($this->type[$i] == 'lines' || $this->type[$i] == 'linesnopoint')) {
+				    $this->stringtoshow.='lines: { show: true, fill: false }, points: { show: '.($this->type[$i] == 'linesnopoint' ? 'false' : 'true').' }, ';
+				}
 				$this->stringtoshow.='color: "#'.$color.'", label: "'.(isset($this->Legend[$i]) ? dol_escape_js($this->Legend[$i]) : '').'", data: d'.$i.' }';
 				$i++;
 			}
@@ -1096,7 +1175,9 @@ 
 			$x=0;
 			foreach($this->data as $key => $valarray)
 			{
-				if ($x > 0) $this->stringtoshow.=', '."\n";
+				if ($x > 0) {
+				    $this->stringtoshow.=', '."\n";
+				}
 				$this->stringtoshow.= ' ['.$x.', "'.$valarray[0].'"]';
 				$x++;
 			}
@@ -1155,8 +1236,11 @@ 
 
 		if ($direction == 'width')
 		{
-			if (empty($conf->dol_optimize_smallscreen)) return ($defaultsize ? $defaultsize : '500');
-			else return (empty($_SESSION['dol_screen_width']) ? '280' : ($_SESSION['dol_screen_width']-40));
+			if (empty($conf->dol_optimize_smallscreen)) {
+			    return ($defaultsize ? $defaultsize : '500');
+			} else {
+			    return (empty($_SESSION['dol_screen_width']) ? '280' : ($_SESSION['dol_screen_width']-40));
+			}
 		}
 		if ($direction == 'height')
 		{

dolibarr/htdocs/core/class/extrafields.class.php

Indentation +1967 added lines, -1967 removed lines

@@ -37,2020 +37,2020 @@
  */
 class ExtraFields
 {
-	/**
+    /**
      * @var DoliDB Database handler.
      */
     public $db;
 
-	// type of element (for what object is the extrafield)
-	// @deprecated
-	var $attribute_elementtype;
-	// Array with type of the extra field
-	// @deprecated
-	var $attribute_type;
-	// Array with label of extra field
-	// @deprecated
-	var $attribute_label;
-	// Array with size of extra field
-	// @deprecated
-	var $attribute_size;
-	// array with list of possible values for some types of extra fields
-	// @deprecated
-	var $attribute_choice;
-	// Array to store compute formula for computed fields
-	// @deprecated
-	var $attribute_computed;
-	// Array to store default value
-	// @deprecated
-	var $attribute_default;
-	// Array to store if attribute is unique or not
-	// @deprecated
-	var $attribute_unique;
-	// Array to store if attribute is required or not
-	// @deprecated
-	var $attribute_required;
-	// Array to store parameters of attribute (used in select type)
-	// @deprecated
-	var $attribute_param;
-	// Array to store position of attribute
-	// @deprecated
-	var $attribute_pos;
-	// Array to store if attribute is editable regardless of the document status
-	// @deprecated
-	var $attribute_alwayseditable;
-	// Array to store permission to check
-	// @deprecated
-	var $attribute_perms;
-	// Array to store language file to translate label of values
-	// @deprecated
-	var $attribute_langfile;
-	// Array to store if field is visible by default on list
-	// @deprecated
-	var $attribute_list;
-
-	// New array to store extrafields definition
-	var $attributes;
-
-	/**
-	 * @var string Error code (or message)
-	 */
-	public $error='';
-
-	var $errno;
-
-
-	public static $type2label=array(
-	'varchar'=>'String',
-	'text'=>'TextLong',
-	'html'=>'HtmlText',
-	'int'=>'Int',
-	'double'=>'Float',
-	'date'=>'Date',
-	'datetime'=>'DateAndTime',
-	'boolean'=>'Boolean',
-	'price'=>'ExtrafieldPrice',
-	'phone'=>'ExtrafieldPhone',
-	'mail'=>'ExtrafieldMail',
-	'url'=>'ExtrafieldUrl',
-	'password' => 'ExtrafieldPassword',
-	'select' => 'ExtrafieldSelect',
-	'sellist' => 'ExtrafieldSelectList',
-	'radio' => 'ExtrafieldRadio',
-	'checkbox' => 'ExtrafieldCheckBox',
-	'chkbxlst' => 'ExtrafieldCheckBoxFromList',
-	'link' => 'ExtrafieldLink',
-	'separate' => 'ExtrafieldSeparator',
-	);
-
-
-	/**
-	 *	Constructor
-	 *
-	 *  @param		DoliDB		$db      Database handler
-	*/
-	function __construct($db)
-	{
-		$this->db = $db;
-		$this->error = array();
-		$this->attributes = array();
-
-		// For old usage
-		$this->attribute_elementtype = array();
-		$this->attribute_type = array();
-		$this->attribute_label = array();
-		$this->attribute_size = array();
-		$this->attribute_computed = array();
-		$this->attribute_default = array();
-		$this->attribute_unique = array();
-		$this->attribute_required = array();
-		$this->attribute_perms = array();
-		$this->attribute_langfile = array();
-		$this->attribute_list = array();
-	}
-
-	/**
-	 *  Add a new extra field parameter
-	 *
-	 *  @param	string			$attrname           Code of attribute
-	 *  @param  string			$label              label of attribute
-	 *  @param  int				$type               Type of attribute ('boolean','int','varchar','text','html','date','datehour','price','phone','mail','password','url','select','checkbox','separate',...)
-	 *  @param  int				$pos                Position of attribute
-	 *  @param  string			$size               Size/length of attribute
-	 *  @param  string			$elementtype        Element type. Same value than object->table_element (Example 'member', 'product', 'thirdparty', ...)
-	 *  @param	int				$unique				Is field unique or not
-	 *  @param	int				$required			Is field required or not
-	 *  @param	string			$default_value		Defaulted value (In database. use the default_value feature for default value on screen. Example: '', '0', 'null', 'avalue')
-	 *  @param  array|string	$param				Params for field (ex for select list : array('options' => array(value'=>'label of option')) )
-	 *  @param  int				$alwayseditable		Is attribute always editable regardless of the document status
-	 *  @param	string			$perms				Permission to check
-	 *  @param	string			$list				Visibilty ('0'=never visible, '1'=visible on list+forms, '2'=list only, '3'=form only or 'eval string')
-	 *  @param	string			$help				Text with help tooltip
-	 *  @param  string  		$computed           Computed value
-	 *  @param  string  		$entity    		 	Entity of extrafields (for multicompany modules)
-	 *  @param  string  		$langfile  		 	Language file
-	 *  @param  string  		$enabled  		 	Condition to have the field enabled or not
-	 *  @return int      							<=0 if KO, >0 if OK
-	 */
-	function addExtraField($attrname, $label, $type, $pos, $size, $elementtype, $unique=0, $required=0, $default_value='', $param='', $alwayseditable=0, $perms='', $list='-1', $help='', $computed='', $entity='', $langfile='', $enabled='1')
-	{
-		if (empty($attrname)) return -1;
-		if (empty($label)) return -1;
-
-		if ($elementtype == 'thirdparty') $elementtype='societe';
-		if ($elementtype == 'contact') $elementtype='socpeople';
-
-		// Create field into database except for separator type which is not stored in database
-		if ($type != 'separate')
-		{
-			$result=$this->create($attrname, $type, $size, $elementtype, $unique, $required, $default_value, $param, $perms, $list, $computed, $help);
-		}
-		$err1=$this->errno;
-		if ($result > 0 || $err1 == 'DB_ERROR_COLUMN_ALREADY_EXISTS' || $type == 'separate')
-		{
-			// Add declaration of field into table
-			$result2=$this->create_label($attrname, $label, $type, $pos, $size, $elementtype, $unique, $required, $param, $alwayseditable, $perms, $list, $help, $default_value, $computed, $entity, $langfile, $enabled);
-			$err2=$this->errno;
-			if ($result2 > 0 || ($err1 == 'DB_ERROR_COLUMN_ALREADY_EXISTS' && $err2 == 'DB_ERROR_RECORD_ALREADY_EXISTS'))
-			{
-				$this->error='';
-				$this->errno=0;
-				return 1;
-			}
-			else return -2;
-		}
-		else
-		{
-			return -1;
-		}
-	}
-
-	/**
-	 *	Add a new optional attribute.
-	 *  This is a private method. For public method, use addExtraField.
-	 *
-	 *	@param	string	$attrname			code of attribute
-	 *  @param	int		$type				Type of attribute ('boolean', 'int', 'varchar', 'text', 'html', 'date', 'datehour','price','phone','mail','password','url','select','checkbox', ...)
-	 *  @param	string	$length				Size/length of attribute ('5', '24,8', ...)
-	 *  @param  string	$elementtype        Element type ('member', 'product', 'thirdparty', 'contact', ...)
-	 *  @param	int		$unique				Is field unique or not
-	 *  @param	int		$required			Is field required or not
-	 *  @param  string  $default_value		Default value for field (in database)
-	 *  @param  array	$param				Params for field  (ex for select list : array('options'=>array('value'=>'label of option'))
-	 *  @param	string	$perms				Permission
-	 *	@param	string	$list				Into list view by default
-	 *  @param  string  $computed           Computed value
-	 *  @return int      	           		<=0 if KO, >0 if OK
-	 */
-	private function create($attrname, $type='varchar', $length=255, $elementtype='member', $unique=0, $required=0, $default_value='',$param='', $perms='', $list='0', $computed='')
-	{
-		if ($elementtype == 'thirdparty') $elementtype='societe';
-		if ($elementtype == 'contact') $elementtype='socpeople';
-
-		$table=$elementtype.'_extrafields';
-		if ($elementtype == 'categorie') $table='categories_extrafields';
-
-		if (! empty($attrname) && preg_match("/^\w[a-zA-Z0-9_]*$/",$attrname) && ! is_numeric($attrname))
-		{
-			if ($type=='boolean') {
-				$typedb='int';
-				$lengthdb='1';
-			} elseif($type=='price') {
-				$typedb='double';
-				$lengthdb='24,8';
-			} elseif($type=='phone') {
-				$typedb='varchar';
-				$lengthdb='20';
-			} elseif($type=='mail') {
-				$typedb='varchar';
-				$lengthdb='128';
-			} elseif($type=='url') {
-				$typedb='varchar';
-				$lengthdb='255';
-			} elseif (($type=='select') || ($type=='sellist') || ($type=='radio') ||($type=='checkbox') ||($type=='chkbxlst')){
-				$typedb='varchar';
-				$lengthdb='255';
-			} elseif ($type=='link') {
-				$typedb='int';
-				$lengthdb='11';
-			} elseif ($type=='html') {
-				$typedb='text';
-				$lengthdb=$length;
-			} elseif($type=='password') {
-				$typedb='varchar';
-				$lengthdb='128';
-			} else {
-				$typedb=$type;
-				$lengthdb=$length;
-				if ($type == 'varchar' && empty($lengthdb)) $lengthdb='255';
-			}
-			$field_desc = array(
-				'type'=>$typedb,
-				'value'=>$lengthdb,
-				'null'=>($required?'NOT NULL':'NULL'),
-				'default' => $default_value
-			);
-
-			$result=$this->db->DDLAddField(MAIN_DB_PREFIX.$table, $attrname, $field_desc);
-			if ($result > 0)
-			{
-				if ($unique)
-				{
-					$sql="ALTER TABLE ".MAIN_DB_PREFIX.$table." ADD UNIQUE INDEX uk_".$table."_".$attrname." (".$attrname.")";
-					$resql=$this->db->query($sql,1,'dml');
-				}
-				return 1;
-			}
-			else
-			{
-				$this->error=$this->db->lasterror();
-				$this->errno=$this->db->lasterrno();
-				return -1;
-			}
-		}
-		else
-		{
-			return 0;
-		}
-	}
+    // type of element (for what object is the extrafield)
+    // @deprecated
+    var $attribute_elementtype;
+    // Array with type of the extra field
+    // @deprecated
+    var $attribute_type;
+    // Array with label of extra field
+    // @deprecated
+    var $attribute_label;
+    // Array with size of extra field
+    // @deprecated
+    var $attribute_size;
+    // array with list of possible values for some types of extra fields
+    // @deprecated
+    var $attribute_choice;
+    // Array to store compute formula for computed fields
+    // @deprecated
+    var $attribute_computed;
+    // Array to store default value
+    // @deprecated
+    var $attribute_default;
+    // Array to store if attribute is unique or not
+    // @deprecated
+    var $attribute_unique;
+    // Array to store if attribute is required or not
+    // @deprecated
+    var $attribute_required;
+    // Array to store parameters of attribute (used in select type)
+    // @deprecated
+    var $attribute_param;
+    // Array to store position of attribute
+    // @deprecated
+    var $attribute_pos;
+    // Array to store if attribute is editable regardless of the document status
+    // @deprecated
+    var $attribute_alwayseditable;
+    // Array to store permission to check
+    // @deprecated
+    var $attribute_perms;
+    // Array to store language file to translate label of values
+    // @deprecated
+    var $attribute_langfile;
+    // Array to store if field is visible by default on list
+    // @deprecated
+    var $attribute_list;
+
+    // New array to store extrafields definition
+    var $attributes;
+
+    /**
+     * @var string Error code (or message)
+     */
+    public $error='';
+
+    var $errno;
+
+
+    public static $type2label=array(
+    'varchar'=>'String',
+    'text'=>'TextLong',
+    'html'=>'HtmlText',
+    'int'=>'Int',
+    'double'=>'Float',
+    'date'=>'Date',
+    'datetime'=>'DateAndTime',
+    'boolean'=>'Boolean',
+    'price'=>'ExtrafieldPrice',
+    'phone'=>'ExtrafieldPhone',
+    'mail'=>'ExtrafieldMail',
+    'url'=>'ExtrafieldUrl',
+    'password' => 'ExtrafieldPassword',
+    'select' => 'ExtrafieldSelect',
+    'sellist' => 'ExtrafieldSelectList',
+    'radio' => 'ExtrafieldRadio',
+    'checkbox' => 'ExtrafieldCheckBox',
+    'chkbxlst' => 'ExtrafieldCheckBoxFromList',
+    'link' => 'ExtrafieldLink',
+    'separate' => 'ExtrafieldSeparator',
+    );
+
+
+    /**
+     *	Constructor
+     *
+     *  @param		DoliDB		$db      Database handler
+     */
+    function __construct($db)
+    {
+        $this->db = $db;
+        $this->error = array();
+        $this->attributes = array();
+
+        // For old usage
+        $this->attribute_elementtype = array();
+        $this->attribute_type = array();
+        $this->attribute_label = array();
+        $this->attribute_size = array();
+        $this->attribute_computed = array();
+        $this->attribute_default = array();
+        $this->attribute_unique = array();
+        $this->attribute_required = array();
+        $this->attribute_perms = array();
+        $this->attribute_langfile = array();
+        $this->attribute_list = array();
+    }
+
+    /**
+     *  Add a new extra field parameter
+     *
+     *  @param	string			$attrname           Code of attribute
+     *  @param  string			$label              label of attribute
+     *  @param  int				$type               Type of attribute ('boolean','int','varchar','text','html','date','datehour','price','phone','mail','password','url','select','checkbox','separate',...)
+     *  @param  int				$pos                Position of attribute
+     *  @param  string			$size               Size/length of attribute
+     *  @param  string			$elementtype        Element type. Same value than object->table_element (Example 'member', 'product', 'thirdparty', ...)
+     *  @param	int				$unique				Is field unique or not
+     *  @param	int				$required			Is field required or not
+     *  @param	string			$default_value		Defaulted value (In database. use the default_value feature for default value on screen. Example: '', '0', 'null', 'avalue')
+     *  @param  array|string	$param				Params for field (ex for select list : array('options' => array(value'=>'label of option')) )
+     *  @param  int				$alwayseditable		Is attribute always editable regardless of the document status
+     *  @param	string			$perms				Permission to check
+     *  @param	string			$list				Visibilty ('0'=never visible, '1'=visible on list+forms, '2'=list only, '3'=form only or 'eval string')
+     *  @param	string			$help				Text with help tooltip
+     *  @param  string  		$computed           Computed value
+     *  @param  string  		$entity    		 	Entity of extrafields (for multicompany modules)
+     *  @param  string  		$langfile  		 	Language file
+     *  @param  string  		$enabled  		 	Condition to have the field enabled or not
+     *  @return int      							<=0 if KO, >0 if OK
+     */
+    function addExtraField($attrname, $label, $type, $pos, $size, $elementtype, $unique=0, $required=0, $default_value='', $param='', $alwayseditable=0, $perms='', $list='-1', $help='', $computed='', $entity='', $langfile='', $enabled='1')
+    {
+        if (empty($attrname)) return -1;
+        if (empty($label)) return -1;
+
+        if ($elementtype == 'thirdparty') $elementtype='societe';
+        if ($elementtype == 'contact') $elementtype='socpeople';
+
+        // Create field into database except for separator type which is not stored in database
+        if ($type != 'separate')
+        {
+            $result=$this->create($attrname, $type, $size, $elementtype, $unique, $required, $default_value, $param, $perms, $list, $computed, $help);
+        }
+        $err1=$this->errno;
+        if ($result > 0 || $err1 == 'DB_ERROR_COLUMN_ALREADY_EXISTS' || $type == 'separate')
+        {
+            // Add declaration of field into table
+            $result2=$this->create_label($attrname, $label, $type, $pos, $size, $elementtype, $unique, $required, $param, $alwayseditable, $perms, $list, $help, $default_value, $computed, $entity, $langfile, $enabled);
+            $err2=$this->errno;
+            if ($result2 > 0 || ($err1 == 'DB_ERROR_COLUMN_ALREADY_EXISTS' && $err2 == 'DB_ERROR_RECORD_ALREADY_EXISTS'))
+            {
+                $this->error='';
+                $this->errno=0;
+                return 1;
+            }
+            else return -2;
+        }
+        else
+        {
+            return -1;
+        }
+    }
+
+    /**
+     *	Add a new optional attribute.
+     *  This is a private method. For public method, use addExtraField.
+     *
+     *	@param	string	$attrname			code of attribute
+     *  @param	int		$type				Type of attribute ('boolean', 'int', 'varchar', 'text', 'html', 'date', 'datehour','price','phone','mail','password','url','select','checkbox', ...)
+     *  @param	string	$length				Size/length of attribute ('5', '24,8', ...)
+     *  @param  string	$elementtype        Element type ('member', 'product', 'thirdparty', 'contact', ...)
+     *  @param	int		$unique				Is field unique or not
+     *  @param	int		$required			Is field required or not
+     *  @param  string  $default_value		Default value for field (in database)
+     *  @param  array	$param				Params for field  (ex for select list : array('options'=>array('value'=>'label of option'))
+     *  @param	string	$perms				Permission
+     *	@param	string	$list				Into list view by default
+     *  @param  string  $computed           Computed value
+     *  @return int      	           		<=0 if KO, >0 if OK
+     */
+    private function create($attrname, $type='varchar', $length=255, $elementtype='member', $unique=0, $required=0, $default_value='',$param='', $perms='', $list='0', $computed='')
+    {
+        if ($elementtype == 'thirdparty') $elementtype='societe';
+        if ($elementtype == 'contact') $elementtype='socpeople';
+
+        $table=$elementtype.'_extrafields';
+        if ($elementtype == 'categorie') $table='categories_extrafields';
+
+        if (! empty($attrname) && preg_match("/^\w[a-zA-Z0-9_]*$/",$attrname) && ! is_numeric($attrname))
+        {
+            if ($type=='boolean') {
+                $typedb='int';
+                $lengthdb='1';
+            } elseif($type=='price') {
+                $typedb='double';
+                $lengthdb='24,8';
+            } elseif($type=='phone') {
+                $typedb='varchar';
+                $lengthdb='20';
+            } elseif($type=='mail') {
+                $typedb='varchar';
+                $lengthdb='128';
+            } elseif($type=='url') {
+                $typedb='varchar';
+                $lengthdb='255';
+            } elseif (($type=='select') || ($type=='sellist') || ($type=='radio') ||($type=='checkbox') ||($type=='chkbxlst')){
+                $typedb='varchar';
+                $lengthdb='255';
+            } elseif ($type=='link') {
+                $typedb='int';
+                $lengthdb='11';
+            } elseif ($type=='html') {
+                $typedb='text';
+                $lengthdb=$length;
+            } elseif($type=='password') {
+                $typedb='varchar';
+                $lengthdb='128';
+            } else {
+                $typedb=$type;
+                $lengthdb=$length;
+                if ($type == 'varchar' && empty($lengthdb)) $lengthdb='255';
+            }
+            $field_desc = array(
+                'type'=>$typedb,
+                'value'=>$lengthdb,
+                'null'=>($required?'NOT NULL':'NULL'),
+                'default' => $default_value
+            );
+
+            $result=$this->db->DDLAddField(MAIN_DB_PREFIX.$table, $attrname, $field_desc);
+            if ($result > 0)
+            {
+                if ($unique)
+                {
+                    $sql="ALTER TABLE ".MAIN_DB_PREFIX.$table." ADD UNIQUE INDEX uk_".$table."_".$attrname." (".$attrname.")";
+                    $resql=$this->db->query($sql,1,'dml');
+                }
+                return 1;
+            }
+            else
+            {
+                $this->error=$this->db->lasterror();
+                $this->errno=$this->db->lasterrno();
+                return -1;
+            }
+        }
+        else
+        {
+            return 0;
+        }
+    }
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-	/**
-	 *	Add description of a new optional attribute
-	 *
-	 *	@param	string			$attrname		code of attribute
-	 *	@param	string			$label			label of attribute
-	 *  @param	int				$type			Type of attribute ('int', 'varchar', 'text', 'html', 'date', 'datehour', 'float')
-	 *  @param	int				$pos			Position of attribute
-	 *  @param	string			$size			Size/length of attribute ('5', '24,8', ...)
-	 *  @param  string			$elementtype	Element type ('member', 'product', 'thirdparty', ...)
-	 *  @param	int				$unique			Is field unique or not
-	 *  @param	int				$required		Is field required or not
-	 *  @param  array|string	$param			Params for field  (ex for select list : array('options' => array(value'=>'label of option')) )
-	 *  @param  int				$alwayseditable	Is attribute always editable regardless of the document status
-	 *  @param	string			$perms			Permission to check
-	 *  @param	string			$list			Visibily
-	 *  @param	string			$help			Help on tooltip
-	 *  @param  string          $default        Default value (in database. use the default_value feature for default value on screen).
-	 *  @param  string          $computed       Computed value
-	 *  @param  string          $entity     	Entity of extrafields
-	 *  @param	string			$langfile		Language file
-	 *  @param  string  		$enabled  		Condition to have the field enabled or not
-	 *  @return	int								<=0 if KO, >0 if OK
-	 */
-	private function create_label($attrname, $label='', $type='', $pos=0, $size=0, $elementtype='member', $unique=0, $required=0, $param='', $alwayseditable=0, $perms='', $list='-1', $help='', $default='', $computed='',$entity='', $langfile='', $enabled='1')
-	{
+    /**
+     *	Add description of a new optional attribute
+     *
+     *	@param	string			$attrname		code of attribute
+     *	@param	string			$label			label of attribute
+     *  @param	int				$type			Type of attribute ('int', 'varchar', 'text', 'html', 'date', 'datehour', 'float')
+     *  @param	int				$pos			Position of attribute
+     *  @param	string			$size			Size/length of attribute ('5', '24,8', ...)
+     *  @param  string			$elementtype	Element type ('member', 'product', 'thirdparty', ...)
+     *  @param	int				$unique			Is field unique or not
+     *  @param	int				$required		Is field required or not
+     *  @param  array|string	$param			Params for field  (ex for select list : array('options' => array(value'=>'label of option')) )
+     *  @param  int				$alwayseditable	Is attribute always editable regardless of the document status
+     *  @param	string			$perms			Permission to check
+     *  @param	string			$list			Visibily
+     *  @param	string			$help			Help on tooltip
+     *  @param  string          $default        Default value (in database. use the default_value feature for default value on screen).
+     *  @param  string          $computed       Computed value
+     *  @param  string          $entity     	Entity of extrafields
+     *  @param	string			$langfile		Language file
+     *  @param  string  		$enabled  		Condition to have the field enabled or not
+     *  @return	int								<=0 if KO, >0 if OK
+     */
+    private function create_label($attrname, $label='', $type='', $pos=0, $size=0, $elementtype='member', $unique=0, $required=0, $param='', $alwayseditable=0, $perms='', $list='-1', $help='', $default='', $computed='',$entity='', $langfile='', $enabled='1')
+    {
         // phpcs:enable
-		global $conf,$user;
-
-		if ($elementtype == 'thirdparty') $elementtype='societe';
-		if ($elementtype == 'contact') $elementtype='socpeople';
-
-		// Clean parameters
-		if (empty($pos)) $pos=0;
-		if (empty($list)) $list='0';
-		if (empty($required)) $required=0;
-		if (empty($unique)) $unique=0;
-		if (empty($alwayseditable)) $alwayseditable=0;
-
-		if (! empty($attrname) && preg_match("/^\w[a-zA-Z0-9-_]*$/",$attrname) && ! is_numeric($attrname))
-		{
-			if (is_array($param) && count($param) > 0)
-			{
-				$params = serialize($param);
-			}
-			elseif (strlen($param) > 0)
-			{
-				$params = trim($param);
-			}
-			else
-			{
-				$params='';
-			}
-
-			$sql = "INSERT INTO ".MAIN_DB_PREFIX."extrafields(";
-			$sql.= " name,";
-			$sql.= " label,";
-			$sql.= " type,";
-			$sql.= " pos,";
-			$sql.= " size,";
-			$sql.= " entity,";
-			$sql.= " elementtype,";
-			$sql.= " fieldunique,";
-			$sql.= " fieldrequired,";
-			$sql.= " param,";
-			$sql.= " alwayseditable,";
-			$sql.= " perms,";
-			$sql.= " langs,";
-			$sql.= " list,";
-			$sql.= " fielddefault,";
-			$sql.= " fieldcomputed,";
-			$sql.= " fk_user_author,";
-			$sql.= " fk_user_modif,";
-			$sql.= " datec,";
-			$sql.= " enabled,";
-			$sql.= " help";
-			$sql.= " )";
-			$sql.= " VALUES('".$attrname."',";
-			$sql.= " '".$this->db->escape($label)."',";
-			$sql.= " '".$this->db->escape($type)."',";
-			$sql.= " ".$pos.",";
-			$sql.= " '".$this->db->escape($size)."',";
-			$sql.= " ".($entity===''?$conf->entity:$entity).",";
-			$sql.= " '".$this->db->escape($elementtype)."',";
-			$sql.= " ".$unique.",";
-			$sql.= " ".$required.",";
-			$sql.= " '".$this->db->escape($params)."',";
-			$sql.= " ".$alwayseditable.",";
-			$sql.= " ".($perms?"'".$this->db->escape($perms)."'":"null").",";
-			$sql.= " ".($langfile?"'".$this->db->escape($langfile)."'":"null").",";
-			$sql.= " '".$this->db->escape($list)."',";
-			$sql.= " ".($default?"'".$this->db->escape($default)."'":"null").",";
-			$sql.= " ".($computed?"'".$this->db->escape($computed)."'":"null").",";
-			$sql .= " " . (is_object($user) ? $user->id : 0). ",";
-			$sql .= " " . (is_object($user) ? $user->id : 0). ",";
-			$sql .= "'" . $this->db->idate(dol_now()) . "',";
-			$sql.= " ".($enabled?"'".$this->db->escape($enabled)."'":"1").",";
-			$sql.= " ".($help?"'".$this->db->escape($help)."'":"null");
-			$sql.=')';
-
-			dol_syslog(get_class($this)."::create_label", LOG_DEBUG);
-			if ($this->db->query($sql))
-			{
-				return 1;
-			}
-			else
-			{
-				$this->error=$this->db->lasterror();
-				$this->errno=$this->db->lasterrno();
-				return -1;
-			}
-		}
-	}
-
-	/**
-	 *	Delete an optional attribute
-	 *
-	 *	@param	string	$attrname		Code of attribute to delete
-	 *  @param  string	$elementtype    Element type ('member', 'product', 'thirdparty', 'contact', ...)
-	 *  @return int              		< 0 if KO, 0 if nothing is done, 1 if OK
-	 */
-	function delete($attrname, $elementtype='member')
-	{
-		if ($elementtype == 'thirdparty') $elementtype='societe';
-		if ($elementtype == 'contact') $elementtype='socpeople';
-
-		$table=$elementtype.'_extrafields';
-		if ($elementtype == 'categorie') $table='categories_extrafields';
-
-		$error=0;
-
-		if (! empty($attrname) && preg_match("/^\w[a-zA-Z0-9-_]*$/",$attrname))
-		{
-			$result=$this->delete_label($attrname,$elementtype);
-			if ($result < 0)
-			{
-			    $this->error=$this->db->lasterror();
-			    $error++;
-			}
-
-			if (! $error)
-			{
-        		$sql = "SELECT COUNT(rowid) as nb";
-        		$sql.= " FROM ".MAIN_DB_PREFIX."extrafields";
-        		$sql.= " WHERE elementtype = '".$elementtype."'";
-        		$sql.= " AND name = '".$attrname."'";
-        		//$sql.= " AND entity IN (0,".$conf->entity.")";      Do not test on entity here. We want to see if there is still on field remaning in other entities before deleting field in table
+        global $conf,$user;
+
+        if ($elementtype == 'thirdparty') $elementtype='societe';
+        if ($elementtype == 'contact') $elementtype='socpeople';
+
+        // Clean parameters
+        if (empty($pos)) $pos=0;
+        if (empty($list)) $list='0';
+        if (empty($required)) $required=0;
+        if (empty($unique)) $unique=0;
+        if (empty($alwayseditable)) $alwayseditable=0;
+
+        if (! empty($attrname) && preg_match("/^\w[a-zA-Z0-9-_]*$/",$attrname) && ! is_numeric($attrname))
+        {
+            if (is_array($param) && count($param) > 0)
+            {
+                $params = serialize($param);
+            }
+            elseif (strlen($param) > 0)
+            {
+                $params = trim($param);
+            }
+            else
+            {
+                $params='';
+            }
+
+            $sql = "INSERT INTO ".MAIN_DB_PREFIX."extrafields(";
+            $sql.= " name,";
+            $sql.= " label,";
+            $sql.= " type,";
+            $sql.= " pos,";
+            $sql.= " size,";
+            $sql.= " entity,";
+            $sql.= " elementtype,";
+            $sql.= " fieldunique,";
+            $sql.= " fieldrequired,";
+            $sql.= " param,";
+            $sql.= " alwayseditable,";
+            $sql.= " perms,";
+            $sql.= " langs,";
+            $sql.= " list,";
+            $sql.= " fielddefault,";
+            $sql.= " fieldcomputed,";
+            $sql.= " fk_user_author,";
+            $sql.= " fk_user_modif,";
+            $sql.= " datec,";
+            $sql.= " enabled,";
+            $sql.= " help";
+            $sql.= " )";
+            $sql.= " VALUES('".$attrname."',";
+            $sql.= " '".$this->db->escape($label)."',";
+            $sql.= " '".$this->db->escape($type)."',";
+            $sql.= " ".$pos.",";
+            $sql.= " '".$this->db->escape($size)."',";
+            $sql.= " ".($entity===''?$conf->entity:$entity).",";
+            $sql.= " '".$this->db->escape($elementtype)."',";
+            $sql.= " ".$unique.",";
+            $sql.= " ".$required.",";
+            $sql.= " '".$this->db->escape($params)."',";
+            $sql.= " ".$alwayseditable.",";
+            $sql.= " ".($perms?"'".$this->db->escape($perms)."'":"null").",";
+            $sql.= " ".($langfile?"'".$this->db->escape($langfile)."'":"null").",";
+            $sql.= " '".$this->db->escape($list)."',";
+            $sql.= " ".($default?"'".$this->db->escape($default)."'":"null").",";
+            $sql.= " ".($computed?"'".$this->db->escape($computed)."'":"null").",";
+            $sql .= " " . (is_object($user) ? $user->id : 0). ",";
+            $sql .= " " . (is_object($user) ? $user->id : 0). ",";
+            $sql .= "'" . $this->db->idate(dol_now()) . "',";
+            $sql.= " ".($enabled?"'".$this->db->escape($enabled)."'":"1").",";
+            $sql.= " ".($help?"'".$this->db->escape($help)."'":"null");
+            $sql.=')';
+
+            dol_syslog(get_class($this)."::create_label", LOG_DEBUG);
+            if ($this->db->query($sql))
+            {
+                return 1;
+            }
+            else
+            {
+                $this->error=$this->db->lasterror();
+                $this->errno=$this->db->lasterrno();
+                return -1;
+            }
+        }
+    }
+
+    /**
+     *	Delete an optional attribute
+     *
+     *	@param	string	$attrname		Code of attribute to delete
+     *  @param  string	$elementtype    Element type ('member', 'product', 'thirdparty', 'contact', ...)
+     *  @return int              		< 0 if KO, 0 if nothing is done, 1 if OK
+     */
+    function delete($attrname, $elementtype='member')
+    {
+        if ($elementtype == 'thirdparty') $elementtype='societe';
+        if ($elementtype == 'contact') $elementtype='socpeople';
+
+        $table=$elementtype.'_extrafields';
+        if ($elementtype == 'categorie') $table='categories_extrafields';
+
+        $error=0;
+
+        if (! empty($attrname) && preg_match("/^\w[a-zA-Z0-9-_]*$/",$attrname))
+        {
+            $result=$this->delete_label($attrname,$elementtype);
+            if ($result < 0)
+            {
+                $this->error=$this->db->lasterror();
+                $error++;
+            }
+
+            if (! $error)
+            {
+                $sql = "SELECT COUNT(rowid) as nb";
+                $sql.= " FROM ".MAIN_DB_PREFIX."extrafields";
+                $sql.= " WHERE elementtype = '".$elementtype."'";
+                $sql.= " AND name = '".$attrname."'";
+                //$sql.= " AND entity IN (0,".$conf->entity.")";      Do not test on entity here. We want to see if there is still on field remaning in other entities before deleting field in table
                 $resql = $this->db->query($sql);
                 if ($resql)
                 {
                     $obj = $this->db->fetch_object($resql);
                     if ($obj->nb <= 0)
                     {
-            			$result=$this->db->DDLDropField(MAIN_DB_PREFIX.$table,$attrname);	// This also drop the unique key
-            			if ($result < 0)
-            			{
-            				$this->error=$this->db->lasterror();
-            				$error++;
-            			}
+                        $result=$this->db->DDLDropField(MAIN_DB_PREFIX.$table,$attrname);	// This also drop the unique key
+                        if ($result < 0)
+                        {
+                            $this->error=$this->db->lasterror();
+                            $error++;
+                        }
                     }
                 }
-			}
+            }
 
-			return $result;
-		}
-		else
-		{
-			return 0;
-		}
-	}
+            return $result;
+        }
+        else
+        {
+            return 0;
+        }
+    }
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-	/**
-	 *	Delete description of an optional attribute
-	 *
-	 *	@param	string	$attrname			Code of attribute to delete
-	 *  @param  string	$elementtype        Element type ('member', 'product', 'thirdparty', ...)
-	 *  @return int              			< 0 if KO, 0 if nothing is done, 1 if OK
-	 */
-	private function delete_label($attrname, $elementtype='member')
-	{
+    /**
+     *	Delete description of an optional attribute
+     *
+     *	@param	string	$attrname			Code of attribute to delete
+     *  @param  string	$elementtype        Element type ('member', 'product', 'thirdparty', ...)
+     *  @return int              			< 0 if KO, 0 if nothing is done, 1 if OK
+     */
+    private function delete_label($attrname, $elementtype='member')
+    {
         // phpcs:enable
-		global $conf;
-
-		if ($elementtype == 'thirdparty') $elementtype='societe';
-		if ($elementtype == 'contact') $elementtype='socpeople';
-
-		if (isset($attrname) && $attrname != '' && preg_match("/^\w[a-zA-Z0-9-_]*$/",$attrname))
-		{
-			$sql = "DELETE FROM ".MAIN_DB_PREFIX."extrafields";
-			$sql.= " WHERE name = '".$attrname."'";
-			$sql.= " AND entity IN  (0,".$conf->entity.')';
-			$sql.= " AND elementtype = '".$elementtype."'";
-
-			dol_syslog(get_class($this)."::delete_label", LOG_DEBUG);
-			$resql=$this->db->query($sql);
-			if ($resql)
-			{
-				return 1;
-			}
-			else
-			{
-				print dol_print_error($this->db);
-				return -1;
-			}
-		}
-		else
-		{
-			return 0;
-		}
-	}
-
-	/**
-	 * 	Modify type of a personalized attribute
-	 *
-	 *  @param	string	$attrname			Name of attribute
-	 *  @param	string	$label				Label of attribute
-	 *  @param	string	$type				Type of attribute ('boolean', 'int', 'varchar', 'text', 'html', 'date', 'datehour','price','phone','mail','password','url','select','checkbox', ...)
-	 *  @param	int		$length				Length of attribute
-	 *  @param  string	$elementtype        Element type ('member', 'product', 'thirdparty', 'contact', ...)
-	 *  @param	int		$unique				Is field unique or not
-	 *  @param	int		$required			Is field required or not
-	 *  @param	int		$pos				Position of attribute
-	 *  @param  array	$param				Params for field (ex for select list : array('options' => array(value'=>'label of option')) )
-	 *  @param  int		$alwayseditable		Is attribute always editable regardless of the document status
-	 *  @param	string	$perms				Permission to check
-	 *  @param	string	$list				Visibility
-	 *  @param	string	$help				Help on tooltip
-	 *  @param  string  $default            Default value (in database. use the default_value feature for default value on screen).
-	 *  @param  string  $computed           Computed value
-	 *  @param  string  $entity	            Entity of extrafields
-	 *  @param	string	$langfile			Language file
-	 *  @param  string  $enabled  			Condition to have the field enabled or not
+        global $conf;
+
+        if ($elementtype == 'thirdparty') $elementtype='societe';
+        if ($elementtype == 'contact') $elementtype='socpeople';
+
+        if (isset($attrname) && $attrname != '' && preg_match("/^\w[a-zA-Z0-9-_]*$/",$attrname))
+        {
+            $sql = "DELETE FROM ".MAIN_DB_PREFIX."extrafields";
+            $sql.= " WHERE name = '".$attrname."'";
+            $sql.= " AND entity IN  (0,".$conf->entity.')';
+            $sql.= " AND elementtype = '".$elementtype."'";
+
+            dol_syslog(get_class($this)."::delete_label", LOG_DEBUG);
+            $resql=$this->db->query($sql);
+            if ($resql)
+            {
+                return 1;
+            }
+            else
+            {
+                print dol_print_error($this->db);
+                return -1;
+            }
+        }
+        else
+        {
+            return 0;
+        }
+    }
+
+    /**
+     * 	Modify type of a personalized attribute
+     *
+     *  @param	string	$attrname			Name of attribute
+     *  @param	string	$label				Label of attribute
+     *  @param	string	$type				Type of attribute ('boolean', 'int', 'varchar', 'text', 'html', 'date', 'datehour','price','phone','mail','password','url','select','checkbox', ...)
+     *  @param	int		$length				Length of attribute
+     *  @param  string	$elementtype        Element type ('member', 'product', 'thirdparty', 'contact', ...)
+     *  @param	int		$unique				Is field unique or not
+     *  @param	int		$required			Is field required or not
+     *  @param	int		$pos				Position of attribute
+     *  @param  array	$param				Params for field (ex for select list : array('options' => array(value'=>'label of option')) )
+     *  @param  int		$alwayseditable		Is attribute always editable regardless of the document status
+     *  @param	string	$perms				Permission to check
+     *  @param	string	$list				Visibility
+     *  @param	string	$help				Help on tooltip
+     *  @param  string  $default            Default value (in database. use the default_value feature for default value on screen).
+     *  @param  string  $computed           Computed value
+     *  @param  string  $entity	            Entity of extrafields
+     *  @param	string	$langfile			Language file
+     *  @param  string  $enabled  			Condition to have the field enabled or not
      *  @param  int     $totalizable        Is extrafield totalizable on list
-	 * 	@return	int							>0 if OK, <=0 if KO
-	 */
-	function update($attrname, $label, $type, $length, $elementtype, $unique=0, $required=0, $pos=0, $param='', $alwayseditable=0, $perms='', $list='', $help='', $default='', $computed='', $entity='', $langfile='', $enabled='1', $totalizable=0)
-	{
-		if ($elementtype == 'thirdparty') $elementtype='societe';
-		if ($elementtype == 'contact') $elementtype='socpeople';
+     * 	@return	int							>0 if OK, <=0 if KO
+     */
+    function update($attrname, $label, $type, $length, $elementtype, $unique=0, $required=0, $pos=0, $param='', $alwayseditable=0, $perms='', $list='', $help='', $default='', $computed='', $entity='', $langfile='', $enabled='1', $totalizable=0)
+    {
+        if ($elementtype == 'thirdparty') $elementtype='societe';
+        if ($elementtype == 'contact') $elementtype='socpeople';
 
         $table=$elementtype.'_extrafields';
-		if ($elementtype == 'categorie') $table='categories_extrafields';
-
-		if (isset($attrname) && $attrname != '' && preg_match("/^\w[a-zA-Z0-9-_]*$/",$attrname))
-		{
-			if ($type=='boolean') {
-				$typedb='int';
-				$lengthdb='1';
-			} elseif($type=='price') {
-				$typedb='double';
-				$lengthdb='24,8';
-			} elseif($type=='phone') {
-				$typedb='varchar';
-				$lengthdb='20';
-			} elseif($type=='mail') {
-				$typedb='varchar';
-				$lengthdb='128';
-			} elseif($type=='url') {
-				$typedb='varchar';
-				$lengthdb='255';
-			} elseif (($type=='select') || ($type=='sellist') || ($type=='radio') || ($type=='checkbox') || ($type=='chkbxlst')) {
-				$typedb='varchar';
-				$lengthdb='255';
-			} elseif ($type == 'html') {
-				$typedb='text';
-			} elseif ($type=='link') {
-				$typedb='int';
-				$lengthdb='11';
-			} elseif($type=='password') {
-				$typedb='varchar';
-				$lengthdb='50';
-			} else {
-				$typedb=$type;
-				$lengthdb=$length;
-			}
-			$field_desc = array('type'=>$typedb, 'value'=>$lengthdb, 'null'=>($required?'NOT NULL':'NULL'), 'default'=>$default);
-
-			if ($type != 'separate') // No table update when separate type
-			{
-				$result=$this->db->DDLUpdateField(MAIN_DB_PREFIX.$table, $attrname, $field_desc);
-			}
-			if ($result > 0 || $type == 'separate')
-			{
-				if ($label)
-				{
-					$result=$this->update_label($attrname,$label,$type,$length,$elementtype,$unique,$required,$pos,$param,$alwayseditable,$perms,$list,$help,$default,$computed,$entity,$langfile,$enabled, $totalizable);
-				}
-				if ($result > 0)
-				{
-					$sql='';
-					if ($unique)
-					{
-						$sql="ALTER TABLE ".MAIN_DB_PREFIX.$table." ADD UNIQUE INDEX uk_".$table."_".$attrname." (".$attrname.")";
-					}
-					else
-					{
-						$sql="ALTER TABLE ".MAIN_DB_PREFIX.$table." DROP INDEX uk_".$table."_".$attrname;
-					}
-					dol_syslog(get_class($this).'::update', LOG_DEBUG);
-					$resql=$this->db->query($sql,1,'dml');
-					return 1;
-				}
-				else
-				{
-					$this->error=$this->db->lasterror();
-					return -1;
-				}
-			}
-			else
-			{
-				$this->error=$this->db->lasterror();
-				return -1;
-			}
-		}
-		else
-		{
-			return 0;
-		}
-	}
+        if ($elementtype == 'categorie') $table='categories_extrafields';
+
+        if (isset($attrname) && $attrname != '' && preg_match("/^\w[a-zA-Z0-9-_]*$/",$attrname))
+        {
+            if ($type=='boolean') {
+                $typedb='int';
+                $lengthdb='1';
+            } elseif($type=='price') {
+                $typedb='double';
+                $lengthdb='24,8';
+            } elseif($type=='phone') {
+                $typedb='varchar';
+                $lengthdb='20';
+            } elseif($type=='mail') {
+                $typedb='varchar';
+                $lengthdb='128';
+            } elseif($type=='url') {
+                $typedb='varchar';
+                $lengthdb='255';
+            } elseif (($type=='select') || ($type=='sellist') || ($type=='radio') || ($type=='checkbox') || ($type=='chkbxlst')) {
+                $typedb='varchar';
+                $lengthdb='255';
+            } elseif ($type == 'html') {
+                $typedb='text';
+            } elseif ($type=='link') {
+                $typedb='int';
+                $lengthdb='11';
+            } elseif($type=='password') {
+                $typedb='varchar';
+                $lengthdb='50';
+            } else {
+                $typedb=$type;
+                $lengthdb=$length;
+            }
+            $field_desc = array('type'=>$typedb, 'value'=>$lengthdb, 'null'=>($required?'NOT NULL':'NULL'), 'default'=>$default);
+
+            if ($type != 'separate') // No table update when separate type
+            {
+                $result=$this->db->DDLUpdateField(MAIN_DB_PREFIX.$table, $attrname, $field_desc);
+            }
+            if ($result > 0 || $type == 'separate')
+            {
+                if ($label)
+                {
+                    $result=$this->update_label($attrname,$label,$type,$length,$elementtype,$unique,$required,$pos,$param,$alwayseditable,$perms,$list,$help,$default,$computed,$entity,$langfile,$enabled, $totalizable);
+                }
+                if ($result > 0)
+                {
+                    $sql='';
+                    if ($unique)
+                    {
+                        $sql="ALTER TABLE ".MAIN_DB_PREFIX.$table." ADD UNIQUE INDEX uk_".$table."_".$attrname." (".$attrname.")";
+                    }
+                    else
+                    {
+                        $sql="ALTER TABLE ".MAIN_DB_PREFIX.$table." DROP INDEX uk_".$table."_".$attrname;
+                    }
+                    dol_syslog(get_class($this).'::update', LOG_DEBUG);
+                    $resql=$this->db->query($sql,1,'dml');
+                    return 1;
+                }
+                else
+                {
+                    $this->error=$this->db->lasterror();
+                    return -1;
+                }
+            }
+            else
+            {
+                $this->error=$this->db->lasterror();
+                return -1;
+            }
+        }
+        else
+        {
+            return 0;
+        }
+    }
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-	/**
-	 *  Modify description of personalized attribute
-	 *
-	 *  @param	string	$attrname			Name of attribute
-	 *  @param	string	$label				Label of attribute
-	 *  @param  string	$type               Type of attribute
-	 *  @param  int		$size		        Length of attribute
-	 *  @param  string	$elementtype		Element type ('member', 'product', 'thirdparty', ...)
-	 *  @param	int		$unique				Is field unique or not
-	 *  @param	int		$required			Is field required or not
-	 *  @param	int		$pos				Position of attribute
-	 *  @param  array	$param				Params for field  (ex for select list : array('options' => array(value'=>'label of option')) )
-	 *  @param  int		$alwayseditable		Is attribute always editable regardless of the document status
-	 *  @param	string	$perms				Permission to check
-	 *  @param	string	$list				Visiblity
-	 *  @param	string	$help				Help on tooltip.
-	 *  @param  string  $default            Default value (in database. use the default_value feature for default value on screen).
-	 *  @param  string  $computed           Computed value
-	 *  @param  string  $entity     		Entity of extrafields
-	 *  @param	string	$langfile			Language file
-	 *  @param  string  $enabled  			Condition to have the field enabled or not
+    /**
+     *  Modify description of personalized attribute
+     *
+     *  @param	string	$attrname			Name of attribute
+     *  @param	string	$label				Label of attribute
+     *  @param  string	$type               Type of attribute
+     *  @param  int		$size		        Length of attribute
+     *  @param  string	$elementtype		Element type ('member', 'product', 'thirdparty', ...)
+     *  @param	int		$unique				Is field unique or not
+     *  @param	int		$required			Is field required or not
+     *  @param	int		$pos				Position of attribute
+     *  @param  array	$param				Params for field  (ex for select list : array('options' => array(value'=>'label of option')) )
+     *  @param  int		$alwayseditable		Is attribute always editable regardless of the document status
+     *  @param	string	$perms				Permission to check
+     *  @param	string	$list				Visiblity
+     *  @param	string	$help				Help on tooltip.
+     *  @param  string  $default            Default value (in database. use the default_value feature for default value on screen).
+     *  @param  string  $computed           Computed value
+     *  @param  string  $entity     		Entity of extrafields
+     *  @param	string	$langfile			Language file
+     *  @param  string  $enabled  			Condition to have the field enabled or not
      *  @param  int     $totalizable        Is extrafield totalizable on list
      *  @return	int							<=0 if KO, >0 if OK
-	 */
-	private function update_label($attrname,$label,$type,$size,$elementtype,$unique=0,$required=0,$pos=0,$param='',$alwayseditable=0,$perms='',$list='0',$help='',$default='',$computed='',$entity='',$langfile='',$enabled='1', $totalizable=0)
-	{
+     */
+    private function update_label($attrname,$label,$type,$size,$elementtype,$unique=0,$required=0,$pos=0,$param='',$alwayseditable=0,$perms='',$list='0',$help='',$default='',$computed='',$entity='',$langfile='',$enabled='1', $totalizable=0)
+    {
         // phpcs:enable
-		global $conf, $user;
-		dol_syslog(get_class($this)."::update_label ".$attrname.", ".$label.", ".$type.", ".$size.", ".$elementtype.", ".$unique.", ".$required.", ".$pos.", ".$alwayseditable.", ".$perms.", ".$list.", ".$default.", ".$computed.", ".$entity.", ".$langfile.", ".$enabled.", ".$totalizable);
+        global $conf, $user;
+        dol_syslog(get_class($this)."::update_label ".$attrname.", ".$label.", ".$type.", ".$size.", ".$elementtype.", ".$unique.", ".$required.", ".$pos.", ".$alwayseditable.", ".$perms.", ".$list.", ".$default.", ".$computed.", ".$entity.", ".$langfile.", ".$enabled.", ".$totalizable);
 
-		// Clean parameters
-		if ($elementtype == 'thirdparty') $elementtype='societe';
-		if ($elementtype == 'contact') $elementtype='socpeople';
+        // Clean parameters
+        if ($elementtype == 'thirdparty') $elementtype='societe';
+        if ($elementtype == 'contact') $elementtype='socpeople';
 
-		if (empty($pos)) $pos=0;
-		if (empty($list)) $list='0';
+        if (empty($pos)) $pos=0;
+        if (empty($list)) $list='0';
         if (empty($totalizable)) {
             $totalizable = 0;
         }
-		if (empty($required)) $required=0;
-		if (empty($unique)) $unique=0;
-		if (empty($alwayseditable)) $alwayseditable=0;
-
-		if (isset($attrname) && $attrname != '' && preg_match("/^\w[a-zA-Z0-9-_]*$/",$attrname))
-		{
-			$this->db->begin();
-
-			if (is_array($param) && count($param) > 0)
-			{
-				$params = serialize($param);
-			}
-			elseif (strlen($param) > 0)
-			{
-				$params = trim($param);
-			}
-			else
-			{
-				$params='';
-			}
-
-			if ($entity === '' || $entity != '0')
-			{
-				// We dont want on all entities, we delete all and current
-				$sql_del = "DELETE FROM ".MAIN_DB_PREFIX."extrafields";
-				$sql_del.= " WHERE name = '".$attrname."'";
-				$sql_del.= " AND entity IN (0, ".($entity===''?$conf->entity:$entity).")";
-				$sql_del.= " AND elementtype = '".$elementtype."'";
-			}
-			else
-			{
-				// We want on all entities ($entities = '0'), we delete on all only (we keep setup specific to each entity)
-				$sql_del = "DELETE FROM ".MAIN_DB_PREFIX."extrafields";
-				$sql_del.= " WHERE name = '".$attrname."'";
-				$sql_del.= " AND entity = 0";
-				$sql_del.= " AND elementtype = '".$elementtype."'";
-			}
-			$resql1=$this->db->query($sql_del);
-
-			$sql = "INSERT INTO ".MAIN_DB_PREFIX."extrafields(";
-			$sql.= " name,";		// This is code
-			$sql.= " entity,";
-			$sql.= " label,";
-			$sql.= " type,";
-			$sql.= " size,";
-			$sql.= " elementtype,";
-			$sql.= " fieldunique,";
-			$sql.= " fieldrequired,";
-			$sql.= " perms,";
-			$sql.= " langs,";
-			$sql.= " pos,";
-			$sql.= " alwayseditable,";
-			$sql.= " param,";
-			$sql.= " list,";
+        if (empty($required)) $required=0;
+        if (empty($unique)) $unique=0;
+        if (empty($alwayseditable)) $alwayseditable=0;
+
+        if (isset($attrname) && $attrname != '' && preg_match("/^\w[a-zA-Z0-9-_]*$/",$attrname))
+        {
+            $this->db->begin();
+
+            if (is_array($param) && count($param) > 0)
+            {
+                $params = serialize($param);
+            }
+            elseif (strlen($param) > 0)
+            {
+                $params = trim($param);
+            }
+            else
+            {
+                $params='';
+            }
+
+            if ($entity === '' || $entity != '0')
+            {
+                // We dont want on all entities, we delete all and current
+                $sql_del = "DELETE FROM ".MAIN_DB_PREFIX."extrafields";
+                $sql_del.= " WHERE name = '".$attrname."'";
+                $sql_del.= " AND entity IN (0, ".($entity===''?$conf->entity:$entity).")";
+                $sql_del.= " AND elementtype = '".$elementtype."'";
+            }
+            else
+            {
+                // We want on all entities ($entities = '0'), we delete on all only (we keep setup specific to each entity)
+                $sql_del = "DELETE FROM ".MAIN_DB_PREFIX."extrafields";
+                $sql_del.= " WHERE name = '".$attrname."'";
+                $sql_del.= " AND entity = 0";
+                $sql_del.= " AND elementtype = '".$elementtype."'";
+            }
+            $resql1=$this->db->query($sql_del);
+
+            $sql = "INSERT INTO ".MAIN_DB_PREFIX."extrafields(";
+            $sql.= " name,";		// This is code
+            $sql.= " entity,";
+            $sql.= " label,";
+            $sql.= " type,";
+            $sql.= " size,";
+            $sql.= " elementtype,";
+            $sql.= " fieldunique,";
+            $sql.= " fieldrequired,";
+            $sql.= " perms,";
+            $sql.= " langs,";
+            $sql.= " pos,";
+            $sql.= " alwayseditable,";
+            $sql.= " param,";
+            $sql.= " list,";
             $sql.= " totalizable,";
-			$sql.= " fielddefault,";
-			$sql.= " fieldcomputed,";
-			$sql.= " fk_user_author,";
-			$sql.= " fk_user_modif,";
-			$sql.= " datec,";
-			$sql.= " enabled,";
-			$sql.= " help";
-			$sql.= ") VALUES (";
-			$sql.= "'".$attrname."',";
-			$sql.= " ".($entity===''?$conf->entity:$entity).",";
-			$sql.= " '".$this->db->escape($label)."',";
-			$sql.= " '".$this->db->escape($type)."',";
-			$sql.= " '".$this->db->escape($size)."',";
-			$sql.= " '".$this->db->escape($elementtype)."',";
-			$sql.= " ".$unique.",";
-			$sql.= " ".$required.",";
-			$sql.= " ".($perms?"'".$this->db->escape($perms)."'":"null").",";
-			$sql.= " ".($langfile?"'".$this->db->escape($langfile)."'":"null").",";
-			$sql.= " ".$pos.",";
-			$sql.= " '".$this->db->escape($alwayseditable)."',";
-			$sql.= " '".$this->db->escape($params)."',";
-			$sql.= " '".$this->db->escape($list)."', ";
+            $sql.= " fielddefault,";
+            $sql.= " fieldcomputed,";
+            $sql.= " fk_user_author,";
+            $sql.= " fk_user_modif,";
+            $sql.= " datec,";
+            $sql.= " enabled,";
+            $sql.= " help";
+            $sql.= ") VALUES (";
+            $sql.= "'".$attrname."',";
+            $sql.= " ".($entity===''?$conf->entity:$entity).",";
+            $sql.= " '".$this->db->escape($label)."',";
+            $sql.= " '".$this->db->escape($type)."',";
+            $sql.= " '".$this->db->escape($size)."',";
+            $sql.= " '".$this->db->escape($elementtype)."',";
+            $sql.= " ".$unique.",";
+            $sql.= " ".$required.",";
+            $sql.= " ".($perms?"'".$this->db->escape($perms)."'":"null").",";
+            $sql.= " ".($langfile?"'".$this->db->escape($langfile)."'":"null").",";
+            $sql.= " ".$pos.",";
+            $sql.= " '".$this->db->escape($alwayseditable)."',";
+            $sql.= " '".$this->db->escape($params)."',";
+            $sql.= " '".$this->db->escape($list)."', ";
             $sql.= " ".$totalizable.",";
-			$sql.= " ".(($default!='')?"'".$this->db->escape($default)."'":"null").",";
-			$sql.= " ".($computed?"'".$this->db->escape($computed)."'":"null").",";
-			$sql .= " " . $user->id . ",";
-			$sql .= " " . $user->id . ",";
-			$sql .= "'" . $this->db->idate(dol_now()) . "',";
-			$sql .= "'" . $this->db->escape($enabled). "',";
-			$sql.= " ".($help?"'".$this->db->escape($help)."'":"null");
-			$sql.= ")";
-
-			$resql2=$this->db->query($sql);
-
-			if ($resql1 && $resql2)
-			{
-				$this->db->commit();
-				return 1;
-			}
-			else
-			{
-				$this->db->rollback();
-				print dol_print_error($this->db);
-				return -1;
-			}
-		}
-		else
-		{
-			return 0;
-		}
-	}
+            $sql.= " ".(($default!='')?"'".$this->db->escape($default)."'":"null").",";
+            $sql.= " ".($computed?"'".$this->db->escape($computed)."'":"null").",";
+            $sql .= " " . $user->id . ",";
+            $sql .= " " . $user->id . ",";
+            $sql .= "'" . $this->db->idate(dol_now()) . "',";
+            $sql .= "'" . $this->db->escape($enabled). "',";
+            $sql.= " ".($help?"'".$this->db->escape($help)."'":"null");
+            $sql.= ")";
+
+            $resql2=$this->db->query($sql);
+
+            if ($resql1 && $resql2)
+            {
+                $this->db->commit();
+                return 1;
+            }
+            else
+            {
+                $this->db->rollback();
+                print dol_print_error($this->db);
+                return -1;
+            }
+        }
+        else
+        {
+            return 0;
+        }
+    }
 
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
-	/**
-	 * 	Load array this->attributes, or old this->attribute_xxx like attribute_label, attribute_type, ...
-	 *
-	 * 	@param	string		$elementtype		Type of element ('adherent', 'commande', 'thirdparty', 'facture', 'propal', 'product', ...).
-	 * 	@param	boolean		$forceload			Force load of extra fields whatever is option MAIN_EXTRAFIELDS_DISABLED. Deprecated. Should not be required.
-	 * 	@return	array							Array of attributes keys+label for all extra fields.
-	 */
-	function fetch_name_optionals_label($elementtype,$forceload=false)
-	{
+    /**
+     * 	Load array this->attributes, or old this->attribute_xxx like attribute_label, attribute_type, ...
+     *
+     * 	@param	string		$elementtype		Type of element ('adherent', 'commande', 'thirdparty', 'facture', 'propal', 'product', ...).
+     * 	@param	boolean		$forceload			Force load of extra fields whatever is option MAIN_EXTRAFIELDS_DISABLED. Deprecated. Should not be required.
+     * 	@return	array							Array of attributes keys+label for all extra fields.
+     */
+    function fetch_name_optionals_label($elementtype,$forceload=false)
+    {
         // phpcs:enable
-		global $conf;
-
-		if (empty($elementtype)) return array();
-
-		if ($elementtype == 'thirdparty') $elementtype='societe';
-		if ($elementtype == 'contact') $elementtype='socpeople';
-		if ($elementtype == 'order_supplier') $elementtype='commande_fournisseur';
-
-		$array_name_label=array();
-
-		// To avoid conflicts with external modules. TODO Remove this.
-		if (!$forceload && !empty($conf->global->MAIN_EXTRAFIELDS_DISABLED)) return $array_name_label;
-
-		// Set array of label of entity
-		// TODO Remove completely loading of label. This should be done by presentation.
-		$labelmulticompany=array();
-		if (!empty($conf->multicompany->enabled))
-		{
-			$sql_entity_name='SELECT rowid, label FROM '.MAIN_DB_PREFIX.'entity WHERE rowid in (0,'.$conf->entity.')';
-			$resql_entity_name=$this->db->query($sql_entity_name);
-			if ($resql_entity_name)
-			{
-				while ($obj = $this->db->fetch_object($resql_entity_name))
-				{
-					$labelmulticompany[$obj->rowid]=$obj->label;
-				}
-			}
-		}
-
-		// We should not have several time this log. If we have, there is some optimization to do by calling a simple $object->fetch_optionals() that include cache management.
-		dol_syslog("fetch_name_optionals_label elementtype=".$elementtype);
-
-		$sql = "SELECT rowid,name,label,type,size,elementtype,fieldunique,fieldrequired,param,pos,alwayseditable,perms,langs,list,totalizable,fielddefault,fieldcomputed,entity,enabled,help";
-		$sql.= " FROM ".MAIN_DB_PREFIX."extrafields";
-		$sql.= " WHERE entity IN (0,".$conf->entity.")";
-		if ($elementtype) $sql.= " AND elementtype = '".$elementtype."'";	// Filed with object->table_element
-		$sql.= " ORDER BY pos";
-
-		$resql=$this->db->query($sql);
-		if ($resql)
-		{
-			if ($this->db->num_rows($resql))
-			{
-				while ($tab = $this->db->fetch_object($resql))
-				{
-					// We can add this attribute to object. TODO Remove this and return $this->attributes[$elementtype]['label']
-					if ($tab->type != 'separate')
-					{
-						$array_name_label[$tab->name]=$tab->label;
-					}
-
-					// Old usage
-					$this->attribute_type[$tab->name]=$tab->type;
-					$this->attribute_label[$tab->name]=$tab->label;
-					$this->attribute_size[$tab->name]=$tab->size;
-					$this->attribute_elementtype[$tab->name]=$tab->elementtype;
-					$this->attribute_default[$tab->name]=$tab->fielddefault;
-					$this->attribute_computed[$tab->name]=$tab->fieldcomputed;
-					$this->attribute_unique[$tab->name]=$tab->fieldunique;
-					$this->attribute_required[$tab->name]=$tab->fieldrequired;
-					$this->attribute_param[$tab->name]=($tab->param ? unserialize($tab->param) : '');
-					$this->attribute_pos[$tab->name]=$tab->pos;
-					$this->attribute_alwayseditable[$tab->name]=$tab->alwayseditable;
-					$this->attribute_perms[$tab->name]=(strlen($tab->perms) == 0 ? 1 : $tab->perms);
-					$this->attribute_langfile[$tab->name]=$tab->langs;
-					$this->attribute_list[$tab->name]=$tab->list;
-					$this->attribute_totalizable[$tab->name]=$tab->totalizable;
-					$this->attribute_entityid[$tab->name]=$tab->entity;
-					$this->attribute_entitylabel[$tab->name]=(empty($labelmulticompany[$tab->entity])?'Entity'.$tab->entity:$labelmulticompany[$tab->entity]);
-
-					// New usage
-					$this->attributes[$tab->elementtype]['type'][$tab->name]=$tab->type;
-					$this->attributes[$tab->elementtype]['label'][$tab->name]=$tab->label;
-					$this->attributes[$tab->elementtype]['size'][$tab->name]=$tab->size;
-					$this->attributes[$tab->elementtype]['elementtype'][$tab->name]=$tab->elementtype;
-					$this->attributes[$tab->elementtype]['default'][$tab->name]=$tab->fielddefault;
-					$this->attributes[$tab->elementtype]['computed'][$tab->name]=$tab->fieldcomputed;
-					$this->attributes[$tab->elementtype]['unique'][$tab->name]=$tab->fieldunique;
-					$this->attributes[$tab->elementtype]['required'][$tab->name]=$tab->fieldrequired;
-					$this->attributes[$tab->elementtype]['param'][$tab->name]=($tab->param ? unserialize($tab->param) : '');
-					$this->attributes[$tab->elementtype]['pos'][$tab->name]=$tab->pos;
-					$this->attributes[$tab->elementtype]['alwayseditable'][$tab->name]=$tab->alwayseditable;
-					$this->attributes[$tab->elementtype]['perms'][$tab->name]=(strlen($tab->perms) == 0 ? 1 : $tab->perms);
-					$this->attributes[$tab->elementtype]['langfile'][$tab->name]=$tab->langs;
-					$this->attributes[$tab->elementtype]['list'][$tab->name]=$tab->list;
+        global $conf;
+
+        if (empty($elementtype)) return array();
+
+        if ($elementtype == 'thirdparty') $elementtype='societe';
+        if ($elementtype == 'contact') $elementtype='socpeople';
+        if ($elementtype == 'order_supplier') $elementtype='commande_fournisseur';
+
+        $array_name_label=array();
+
+        // To avoid conflicts with external modules. TODO Remove this.
+        if (!$forceload && !empty($conf->global->MAIN_EXTRAFIELDS_DISABLED)) return $array_name_label;
+
+        // Set array of label of entity
+        // TODO Remove completely loading of label. This should be done by presentation.
+        $labelmulticompany=array();
+        if (!empty($conf->multicompany->enabled))
+        {
+            $sql_entity_name='SELECT rowid, label FROM '.MAIN_DB_PREFIX.'entity WHERE rowid in (0,'.$conf->entity.')';
+            $resql_entity_name=$this->db->query($sql_entity_name);
+            if ($resql_entity_name)
+            {
+                while ($obj = $this->db->fetch_object($resql_entity_name))
+                {
+                    $labelmulticompany[$obj->rowid]=$obj->label;
+                }
+            }
+        }
+
+        // We should not have several time this log. If we have, there is some optimization to do by calling a simple $object->fetch_optionals() that include cache management.
+        dol_syslog("fetch_name_optionals_label elementtype=".$elementtype);
+
+        $sql = "SELECT rowid,name,label,type,size,elementtype,fieldunique,fieldrequired,param,pos,alwayseditable,perms,langs,list,totalizable,fielddefault,fieldcomputed,entity,enabled,help";
+        $sql.= " FROM ".MAIN_DB_PREFIX."extrafields";
+        $sql.= " WHERE entity IN (0,".$conf->entity.")";
+        if ($elementtype) $sql.= " AND elementtype = '".$elementtype."'";	// Filed with object->table_element
+        $sql.= " ORDER BY pos";
+
+        $resql=$this->db->query($sql);
+        if ($resql)
+        {
+            if ($this->db->num_rows($resql))
+            {
+                while ($tab = $this->db->fetch_object($resql))
+                {
+                    // We can add this attribute to object. TODO Remove this and return $this->attributes[$elementtype]['label']
+                    if ($tab->type != 'separate')
+                    {
+                        $array_name_label[$tab->name]=$tab->label;
+                    }
+
+                    // Old usage
+                    $this->attribute_type[$tab->name]=$tab->type;
+                    $this->attribute_label[$tab->name]=$tab->label;
+                    $this->attribute_size[$tab->name]=$tab->size;
+                    $this->attribute_elementtype[$tab->name]=$tab->elementtype;
+                    $this->attribute_default[$tab->name]=$tab->fielddefault;
+                    $this->attribute_computed[$tab->name]=$tab->fieldcomputed;
+                    $this->attribute_unique[$tab->name]=$tab->fieldunique;
+                    $this->attribute_required[$tab->name]=$tab->fieldrequired;
+                    $this->attribute_param[$tab->name]=($tab->param ? unserialize($tab->param) : '');
+                    $this->attribute_pos[$tab->name]=$tab->pos;
+                    $this->attribute_alwayseditable[$tab->name]=$tab->alwayseditable;
+                    $this->attribute_perms[$tab->name]=(strlen($tab->perms) == 0 ? 1 : $tab->perms);
+                    $this->attribute_langfile[$tab->name]=$tab->langs;
+                    $this->attribute_list[$tab->name]=$tab->list;
+                    $this->attribute_totalizable[$tab->name]=$tab->totalizable;
+                    $this->attribute_entityid[$tab->name]=$tab->entity;
+                    $this->attribute_entitylabel[$tab->name]=(empty($labelmulticompany[$tab->entity])?'Entity'.$tab->entity:$labelmulticompany[$tab->entity]);
+
+                    // New usage
+                    $this->attributes[$tab->elementtype]['type'][$tab->name]=$tab->type;
+                    $this->attributes[$tab->elementtype]['label'][$tab->name]=$tab->label;
+                    $this->attributes[$tab->elementtype]['size'][$tab->name]=$tab->size;
+                    $this->attributes[$tab->elementtype]['elementtype'][$tab->name]=$tab->elementtype;
+                    $this->attributes[$tab->elementtype]['default'][$tab->name]=$tab->fielddefault;
+                    $this->attributes[$tab->elementtype]['computed'][$tab->name]=$tab->fieldcomputed;
+                    $this->attributes[$tab->elementtype]['unique'][$tab->name]=$tab->fieldunique;
+                    $this->attributes[$tab->elementtype]['required'][$tab->name]=$tab->fieldrequired;
+                    $this->attributes[$tab->elementtype]['param'][$tab->name]=($tab->param ? unserialize($tab->param) : '');
+                    $this->attributes[$tab->elementtype]['pos'][$tab->name]=$tab->pos;
+                    $this->attributes[$tab->elementtype]['alwayseditable'][$tab->name]=$tab->alwayseditable;
+                    $this->attributes[$tab->elementtype]['perms'][$tab->name]=(strlen($tab->perms) == 0 ? 1 : $tab->perms);
+                    $this->attributes[$tab->elementtype]['langfile'][$tab->name]=$tab->langs;
+                    $this->attributes[$tab->elementtype]['list'][$tab->name]=$tab->list;
                     $this->attributes[$tab->elementtype]['totalizable'][$tab->name]=$tab->totalizable;
-					$this->attributes[$tab->elementtype]['entityid'][$tab->name]=$tab->entity;
-					$this->attributes[$tab->elementtype]['entitylabel'][$tab->name]=(empty($labelmulticompany[$tab->entity])?'Entity'.$tab->entity:$labelmulticompany[$tab->entity]);
-					$this->attributes[$tab->elementtype]['enabled'][$tab->name]=$tab->enabled;
-					$this->attributes[$tab->elementtype]['help'][$tab->name]=$tab->help;
-
-					$this->attributes[$tab->elementtype]['loaded']=1;
-				}
-			}
-			if ($elementtype) $this->attributes[$elementtype]['loaded']=1;	// If nothing found, we also save tag 'loaded'
-		}
-		else
-		{
-			$this->error=$this->db->lasterror();
-			dol_syslog(get_class($this)."::fetch_name_optionals_label ".$this->error, LOG_ERR);
-		}
-
-		return $array_name_label;
-	}
-
-
-	/**
-	 * Return HTML string to put an input field into a page
-	 * Code very similar with showInputField of common object
-	 *
-	 * @param  string  $key            			Key of attribute
-	 * @param  string  $value          			Preselected value to show (for date type it must be in timestamp format, for amount or price it must be a php numeric value)
-	 * @param  string  $moreparam      			To add more parametes on html input tag
-	 * @param  string  $keysuffix      			Prefix string to add after name and id of field (can be used to avoid duplicate names)
-	 * @param  string  $keyprefix      			Suffix string to add before name and id of field (can be used to avoid duplicate names)
-	 * @param  string  $morecss        			More css (to defined size of field. Old behaviour: may also be a numeric)
-	 * @param  int     $objectid       			Current object id
-	 * @param  string  $extrafieldsobjectkey	If defined (for example $object->table_element), use the new method to get extrafields data
-	 * @return string
-	 */
-	function showInputField($key, $value, $moreparam='', $keysuffix='', $keyprefix='', $morecss='', $objectid=0, $extrafieldsobjectkey='')
-	{
-		global $conf,$langs,$form;
-
-		if (! is_object($form))
-		{
-			require_once DOL_DOCUMENT_ROOT.'/core/class/html.form.class.php';
-			$form=new Form($this->db);
-		}
-
-		$out='';
-
-		$keyprefix = $keyprefix.'options_';		// Because we work on extrafields
-
-		if (! empty($extrafieldsobjectkey))
-		{
-			$label=$this->attributes[$extrafieldsobjectkey]['label'][$key];
-			$type=$this->attributes[$extrafieldsobjectkey]['type'][$key];
-			$size=$this->attributes[$extrafieldsobjectkey]['size'][$key];
-			$default=$this->attributes[$extrafieldsobjectkey]['default'][$key];
-			$computed=$this->attributes[$extrafieldsobjectkey]['computed'][$key];
-			$unique=$this->attributes[$extrafieldsobjectkey]['unique'][$key];
-			$required=$this->attributes[$extrafieldsobjectkey]['required'][$key];
-			$param=$this->attributes[$extrafieldsobjectkey]['param'][$key];
-			$perms=dol_eval($this->attributes[$extrafieldsobjectkey]['perms'][$key], 1);
-			$langfile=$this->attributes[$extrafieldsobjectkey]['langfile'][$key];
-			$list=dol_eval($this->attributes[$extrafieldsobjectkey]['list'][$key], 1);
-			$totalizable=$this->attributes[$extrafieldsobjectkey]['totalizable'][$key];
-			$help=$this->attributes[$extrafieldsobjectkey]['help'][$key];
-			$hidden=(empty($list) ? 1 : 0);		// If empty, we are sure it is hidden, otherwise we show. If it depends on mode (view/create/edit form or list, this must be filtered by caller)
-		}
-		else	// Old usage
-		{
-			$label=$this->attribute_label[$key];
-			$type =$this->attribute_type[$key];
-			$size =$this->attribute_size[$key];
-			$elementtype=$this->attribute_elementtype[$key];	// Seems not used
-			$default=$this->attribute_default[$key];
-			$computed=$this->attribute_computed[$key];
-			$unique=$this->attribute_unique[$key];
-			$required=$this->attribute_required[$key];
-			$param=$this->attribute_param[$key];
-			$langfile=$this->attribute_langfile[$key];
-			$list=$this->attribute_list[$key];
-			$totalizable=$this->attribute_totalizable[$key];
-			$hidden=(empty($list) ? 1 : 0);		// If empty, we are sure it is hidden, otherwise we show. If it depends on mode (view/create/edit form or list, this must be filtered by caller)
-		}
-
-		if ($computed)
-		{
-			if (! preg_match('/^search_/', $keyprefix)) return '<span class="opacitymedium">'.$langs->trans("AutomaticallyCalculated").'</span>';
-			else return '';
-		}
-
-		if (empty($morecss))
-		{
-			if ($type == 'date')
-			{
-				$morecss = 'minwidth100imp';
-			}
-			elseif ($type == 'datetime')
-			{
-				$morecss = 'minwidth200imp';
-			}
-			elseif (in_array($type,array('int','integer','double','price')))
-			{
-				$morecss = 'maxwidth75';
-			}
-			elseif ($type == 'password')
-			{
-				$morecss='maxwidth100';
-			}
-			elseif ($type == 'url')
-			{
-				$morecss='minwidth400';
-			}
-			elseif ($type == 'boolean')
-			{
-				$morecss='';
-			}
-			else
-			{
-				if (round($size) < 12)
-				{
-					$morecss = 'minwidth100';
-				}
-				else if (round($size) <= 48)
-				{
-					$morecss = 'minwidth200';
-				}
-				else
-				{
-					$morecss = 'minwidth400';
-				}
-			}
-		}
-
-		if (in_array($type,array('date','datetime')))
-		{
-			$tmp=explode(',',$size);
-			$newsize=$tmp[0];
-
-			$showtime = in_array($type,array('datetime')) ? 1 : 0;
-
-			// Do not show current date when field not required (see selectDate() method)
-			if (!$required && $value == '') $value = '-1';
-
-			// TODO Must also support $moreparam
-			$out = $form->selectDate($value, $keyprefix.$key.$keysuffix, $showtime, $showtime, $required, '', 1, (($keyprefix != 'search_' && $keyprefix != 'search_options_') ? 1 : 0), 0, 1);
-		}
-		elseif (in_array($type,array('int','integer')))
-		{
-			$tmp=explode(',',$size);
-			$newsize=$tmp[0];
-			$out='<input type="text" class="flat '.$morecss.' maxwidthonsmartphone" name="'.$keyprefix.$key.$keysuffix.'" id="'.$keyprefix.$key.$keysuffix.'" maxlength="'.$newsize.'" value="'.dol_escape_htmltag($value).'"'.($moreparam?$moreparam:'').'>';
-		}
-		elseif (preg_match('/varchar/', $type))
-		{
-			$out='<input type="text" class="flat '.$morecss.' maxwidthonsmartphone" name="'.$keyprefix.$key.$keysuffix.'" id="'.$keyprefix.$key.$keysuffix.'" maxlength="'.$size.'" value="'.dol_escape_htmltag($value).'"'.($moreparam?$moreparam:'').'>';
-		}
-		elseif (in_array($type, array('mail', 'phone', 'url')))
-		{
-			$out='<input type="text" class="flat '.$morecss.' maxwidthonsmartphone" name="'.$keyprefix.$key.$keysuffix.'" id="'.$keyprefix.$key.$keysuffix.'" value="'.dol_escape_htmltag($value).'" '.($moreparam?$moreparam:'').'>';
-		}
-		elseif ($type == 'text')
-		{
-			if (! preg_match('/search_/', $keyprefix))		// If keyprefix is search_ or search_options_, we must just use a simple text field
-			{
-				require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
-				$doleditor=new DolEditor($keyprefix.$key.$keysuffix,$value,'',200,'dolibarr_notes','In',false,false,false,ROWS_5,'90%');
-				$out=$doleditor->Create(1);
-			}
-			else
-			{
-				$out='<input type="text" class="flat '.$morecss.' maxwidthonsmartphone" name="'.$keyprefix.$key.$keysuffix.'" id="'.$keyprefix.$key.$keysuffix.'" value="'.dol_escape_htmltag($value).'" '.($moreparam?$moreparam:'').'>';
-			}
-		}
-		elseif ($type == 'html')
-		{
-			if (! preg_match('/search_/', $keyprefix))		// If keyprefix is search_ or search_options_, we must just use a simple text field
-			{
-				require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
-				$doleditor=new DolEditor($keyprefix.$key.$keysuffix,$value,'',200,'dolibarr_notes','In',false,false,! empty($conf->fckeditor->enabled) && $conf->global->FCKEDITOR_ENABLE_SOCIETE,ROWS_5,'90%');
-				$out=$doleditor->Create(1);
-			}
-			else
-			{
-				$out='<input type="text" class="flat '.$morecss.' maxwidthonsmartphone" name="'.$keyprefix.$key.$keysuffix.'" id="'.$keyprefix.$key.$keysuffix.'" value="'.dol_escape_htmltag($value).'" '.($moreparam?$moreparam:'').'>';
-			}
-		}
-		elseif ($type == 'boolean')
-		{
-			$checked='';
-			if (!empty($value)) {
-				$checked=' checked value="1" ';
-			} else {
-				$checked=' value="1" ';
-			}
-			$out='<input type="checkbox" class="flat '.$morecss.' maxwidthonsmartphone" name="'.$keyprefix.$key.$keysuffix.'" id="'.$keyprefix.$key.$keysuffix.'" '.$checked.' '.($moreparam?$moreparam:'').'>';
-		}
-		elseif ($type == 'price')
-		{
-			if (!empty($value)) {		// $value in memory is a php numeric, we format it into user number format.
-				$value=price($value);
-			}
-			$out='<input type="text" class="flat '.$morecss.' maxwidthonsmartphone" name="'.$keyprefix.$key.$keysuffix.'" id="'.$keyprefix.$key.$keysuffix.'" value="'.$value.'" '.($moreparam?$moreparam:'').'> '.$langs->getCurrencySymbol($conf->currency);
-		}
-		elseif ($type == 'double')
-		{
-			if (!empty($value)) {		// $value in memory is a php numeric, we format it into user number format.
-				$value=price($value);
-			}
-			$out='<input type="text" class="flat '.$morecss.' maxwidthonsmartphone" name="'.$keyprefix.$key.$keysuffix.'" id="'.$keyprefix.$key.$keysuffix.'" value="'.$value.'" '.($moreparam?$moreparam:'').'> ';
-		}
-		elseif ($type == 'select')
-		{
-			$out = '';
-			if (! empty($conf->use_javascript_ajax) && ! empty($conf->global->MAIN_EXTRAFIELDS_USE_SELECT2))
-			{
-				include_once DOL_DOCUMENT_ROOT . '/core/lib/ajax.lib.php';
-				$out.= ajax_combobox($keyprefix.$key.$keysuffix, array(), 0);
-			}
-
-			$out.='<select class="flat '.$morecss.' maxwidthonsmartphone" name="'.$keyprefix.$key.$keysuffix.'" id="'.$keyprefix.$key.$keysuffix.'" '.($moreparam?$moreparam:'').'>';
-			$out.='<option value="0">&nbsp;</option>';
-			foreach ($param['options'] as $key => $val)
-			{
-				if ((string) $key == '') continue;
-				list($val, $parent) = explode('|', $val);
-				$out.='<option value="'.$key.'"';
-				$out.= (((string) $value == (string) $key)?' selected':'');
-				$out.= (!empty($parent)?' parent="'.$parent.'"':'');
-				$out.='>';
-				if ($langfile && $val) $out.=$langs->trans($val);
-				else $out.=$val;
-				$out.='</option>';
-			}
-			$out.='</select>';
-		}
-		elseif ($type == 'sellist')
-		{
-			$out = '';
-			if (! empty($conf->use_javascript_ajax) && ! empty($conf->global->MAIN_EXTRAFIELDS_USE_SELECT2))
-			{
-				include_once DOL_DOCUMENT_ROOT . '/core/lib/ajax.lib.php';
-				$out.= ajax_combobox($keyprefix.$key.$keysuffix, array(), 0);
-			}
-
-			$out.='<select class="flat '.$morecss.' maxwidthonsmartphone" name="'.$keyprefix.$key.$keysuffix.'" id="'.$keyprefix.$key.$keysuffix.'" '.($moreparam?$moreparam:'').'>';
-			if (is_array($param['options']))
-			{
-				$param_list=array_keys($param['options']);
-				$InfoFieldList = explode(":", $param_list[0]);
-				$parentName='';
-				$parentField='';
-				// 0 : tableName
-				// 1 : label field name
-				// 2 : key fields name (if differ of rowid)
-				// 3 : key field parent (for dependent lists)
-				// 4 : where clause filter on column or table extrafield, syntax field='value' or extra.field=value
-				$keyList=(empty($InfoFieldList[2])?'rowid':$InfoFieldList[2].' as rowid');
-
-
-				if (count($InfoFieldList) > 4 && ! empty($InfoFieldList[4]))
-				{
-					if (strpos($InfoFieldList[4], 'extra.') !== false)
-					{
-						$keyList='main.'.$InfoFieldList[2].' as rowid';
-					} else {
-						$keyList=$InfoFieldList[2].' as rowid';
-					}
-				}
-				if (count($InfoFieldList) > 3 && ! empty($InfoFieldList[3]))
-				{
-					list($parentName, $parentField) = explode('|', $InfoFieldList[3]);
-					$keyList.= ', '.$parentField;
-				}
-
-				$fields_label = explode('|',$InfoFieldList[1]);
-				if (is_array($fields_label))
-				{
-					$keyList .=', ';
-					$keyList .= implode(', ', $fields_label);
-				}
-
-				$sqlwhere='';
-				$sql = 'SELECT '.$keyList;
-				$sql.= ' FROM '.MAIN_DB_PREFIX .$InfoFieldList[0];
-				if (!empty($InfoFieldList[4]))
-				{
-				    // can use curent entity filter
-				    if (strpos($InfoFieldList[4], '$ENTITY$')!==false) {
-				        $InfoFieldList[4]=str_replace('$ENTITY$',$conf->entity,$InfoFieldList[4]);
-				    }
-					// can use SELECT request
-					if (strpos($InfoFieldList[4], '$SEL$')!==false) {
-						$InfoFieldList[4]=str_replace('$SEL$','SELECT',$InfoFieldList[4]);
-					}
-
-					// current object id can be use into filter
-					if (strpos($InfoFieldList[4], '$ID$')!==false && !empty($objectid)) {
-						$InfoFieldList[4]=str_replace('$ID$',$objectid,$InfoFieldList[4]);
-					} else {
-						$InfoFieldList[4]=str_replace('$ID$','0',$InfoFieldList[4]);
-					}
-					//We have to join on extrafield table
-					if (strpos($InfoFieldList[4], 'extra')!==false)
-					{
-						$sql.= ' as main, '.MAIN_DB_PREFIX .$InfoFieldList[0].'_extrafields as extra';
-						$sqlwhere.= ' WHERE extra.fk_object=main.'.$InfoFieldList[2]. ' AND '.$InfoFieldList[4];
-					}
-					else
-					{
-						$sqlwhere.= ' WHERE '.$InfoFieldList[4];
-					}
-				}
-				else
-				{
-					$sqlwhere.= ' WHERE 1=1';
-				}
-				// Some tables may have field, some other not. For the moment we disable it.
-				if (in_array($InfoFieldList[0],array('tablewithentity')))
-				{
-					$sqlwhere.= ' AND entity = '.$conf->entity;
-				}
-				$sql.=$sqlwhere;
-				//print $sql;
-
-				$sql .= ' ORDER BY ' . implode(', ', $fields_label);
-
-				dol_syslog(get_class($this).'::showInputField type=sellist', LOG_DEBUG);
-				$resql = $this->db->query($sql);
-				if ($resql)
-				{
-					$out.='<option value="0">&nbsp;</option>';
-					$num = $this->db->num_rows($resql);
-					$i = 0;
-					while ($i < $num)
-					{
-						$labeltoshow='';
-						$obj = $this->db->fetch_object($resql);
-
-						// Several field into label (eq table:code|libelle:rowid)
-						$notrans = false;
-						$fields_label = explode('|',$InfoFieldList[1]);
-						if (is_array($fields_label))
-						{
-							$notrans = true;
-							foreach ($fields_label as $field_toshow)
-							{
-								$labeltoshow.= $obj->$field_toshow.' ';
-							}
-						}
-						else
-						{
-							$labeltoshow=$obj->{$InfoFieldList[1]};
-						}
-						$labeltoshow=dol_trunc($labeltoshow,45);
-
-						if ($value == $obj->rowid)
-						{
-							foreach ($fields_label as $field_toshow)
-							{
-								$translabel=$langs->trans($obj->$field_toshow);
-								if ($translabel!=$obj->$field_toshow) {
-									$labeltoshow=dol_trunc($translabel,18).' ';
-								}else {
-									$labeltoshow=dol_trunc($obj->$field_toshow,18).' ';
-								}
-							}
-							$out.='<option value="'.$obj->rowid.'" selected>'.$labeltoshow.'</option>';
-						}
-						else
-						{
-							if (! $notrans)
-							{
-								$translabel=$langs->trans($obj->{$InfoFieldList[1]});
-								if ($translabel!=$obj->{$InfoFieldList[1]}) {
-									$labeltoshow=dol_trunc($translabel,18);
-								}
-								else {
-									$labeltoshow=dol_trunc($obj->{$InfoFieldList[1]},18);
-								}
-							}
-							if (empty($labeltoshow)) $labeltoshow='(not defined)';
-							if ($value==$obj->rowid)
-							{
-								$out.='<option value="'.$obj->rowid.'" selected>'.$labeltoshow.'</option>';
-							}
-
-							if (!empty($InfoFieldList[3]) && $parentField)
-							{
-								$parent = $parentName.':'.$obj->{$parentField};
-							}
-
-							$out.='<option value="'.$obj->rowid.'"';
-							$out.= ($value==$obj->rowid?' selected':'');
-							$out.= (!empty($parent)?' parent="'.$parent.'"':'');
-							$out.='>'.$labeltoshow.'</option>';
-						}
-
-						$i++;
-					}
-					$this->db->free($resql);
-				}
-				else {
-					print 'Error in request '.$sql.' '.$this->db->lasterror().'. Check setup of extra parameters.<br>';
-				}
-			}
-			$out.='</select>';
-		}
-		elseif ($type == 'checkbox')
-		{
-			$value_arr=explode(',',$value);
-			$out=$form->multiselectarray($keyprefix.$key.$keysuffix, (empty($param['options'])?null:$param['options']), $value_arr, '', 0, '', 0, '100%');
-		}
-		elseif ($type == 'radio')
-		{
-			$out='';
-			foreach ($param['options'] as $keyopt => $val)
-			{
-				$out.='<input class="flat '.$morecss.'" type="radio" name="'.$keyprefix.$key.$keysuffix.'" id="'.$keyprefix.$key.$keysuffix.'" '.($moreparam?$moreparam:'');
-				$out.=' value="'.$keyopt.'"';
-				$out.=' id="'.$keyprefix.$key.$keysuffix.'_'.$keyopt.'"';
-				$out.= ($value==$keyopt?'checked':'');
-				$out.='/><label for="'.$keyprefix.$key.$keysuffix.'_'.$keyopt.'">'.$val.'</label><br>';
-			}
-		}
-		elseif ($type == 'chkbxlst')
-		{
-			if (is_array($value)) {
-				$value_arr = $value;
-			}
-			else {
-				$value_arr = explode(',', $value);
-			}
-
-			if (is_array($param['options'])) {
-				$param_list = array_keys($param['options']);
-				$InfoFieldList = explode(":", $param_list[0]);
-				$parentName='';
-				$parentField='';
-				// 0 : tableName
-				// 1 : label field name
-				// 2 : key fields name (if differ of rowid)
-				// 3 : key field parent (for dependent lists)
-				// 4 : where clause filter on column or table extrafield, syntax field='value' or extra.field=value
-				$keyList = (empty($InfoFieldList[2]) ? 'rowid' : $InfoFieldList[2] . ' as rowid');
-
-				if (count($InfoFieldList) > 3 && ! empty($InfoFieldList[3])) {
-					list ( $parentName, $parentField ) = explode('|', $InfoFieldList[3]);
-					$keyList .= ', ' . $parentField;
-				}
-				if (count($InfoFieldList) > 4 && ! empty($InfoFieldList[4])) {
-					if (strpos($InfoFieldList[4], 'extra.') !== false) {
-						$keyList = 'main.' . $InfoFieldList[2] . ' as rowid';
-					} else {
-						$keyList = $InfoFieldList[2] . ' as rowid';
-					}
-				}
-
-				$fields_label = explode('|', $InfoFieldList[1]);
-				if (is_array($fields_label)) {
-					$keyList .= ', ';
-					$keyList .= implode(', ', $fields_label);
-				}
-
-				$sqlwhere = '';
-				$sql = 'SELECT ' . $keyList;
-				$sql .= ' FROM ' . MAIN_DB_PREFIX . $InfoFieldList[0];
-				if (! empty($InfoFieldList[4])) {
-
-					// can use SELECT request
-					if (strpos($InfoFieldList[4], '$SEL$')!==false) {
-						$InfoFieldList[4]=str_replace('$SEL$','SELECT',$InfoFieldList[4]);
-					}
-
-					// current object id can be use into filter
-					if (strpos($InfoFieldList[4], '$ID$')!==false && !empty($objectid)) {
-						$InfoFieldList[4]=str_replace('$ID$',$objectid,$InfoFieldList[4]);
-					} else if (preg_match("#^.*list.php$#",$_SERVER["DOCUMENT_URI"])) {
-						// Pattern for word=$ID$
-						$word = '\b[a-zA-Z0-9-\.-_]+\b=\$ID\$';
+                    $this->attributes[$tab->elementtype]['entityid'][$tab->name]=$tab->entity;
+                    $this->attributes[$tab->elementtype]['entitylabel'][$tab->name]=(empty($labelmulticompany[$tab->entity])?'Entity'.$tab->entity:$labelmulticompany[$tab->entity]);
+                    $this->attributes[$tab->elementtype]['enabled'][$tab->name]=$tab->enabled;
+                    $this->attributes[$tab->elementtype]['help'][$tab->name]=$tab->help;
+
+                    $this->attributes[$tab->elementtype]['loaded']=1;
+                }
+            }
+            if ($elementtype) $this->attributes[$elementtype]['loaded']=1;	// If nothing found, we also save tag 'loaded'
+        }
+        else
+        {
+            $this->error=$this->db->lasterror();
+            dol_syslog(get_class($this)."::fetch_name_optionals_label ".$this->error, LOG_ERR);
+        }
+
+        return $array_name_label;
+    }
+
+
+    /**
+     * Return HTML string to put an input field into a page
+     * Code very similar with showInputField of common object
+     *
+     * @param  string  $key            			Key of attribute
+     * @param  string  $value          			Preselected value to show (for date type it must be in timestamp format, for amount or price it must be a php numeric value)
+     * @param  string  $moreparam      			To add more parametes on html input tag
+     * @param  string  $keysuffix      			Prefix string to add after name and id of field (can be used to avoid duplicate names)
+     * @param  string  $keyprefix      			Suffix string to add before name and id of field (can be used to avoid duplicate names)
+     * @param  string  $morecss        			More css (to defined size of field. Old behaviour: may also be a numeric)
+     * @param  int     $objectid       			Current object id
+     * @param  string  $extrafieldsobjectkey	If defined (for example $object->table_element), use the new method to get extrafields data
+     * @return string
+     */
+    function showInputField($key, $value, $moreparam='', $keysuffix='', $keyprefix='', $morecss='', $objectid=0, $extrafieldsobjectkey='')
+    {
+        global $conf,$langs,$form;
+
+        if (! is_object($form))
+        {
+            require_once DOL_DOCUMENT_ROOT.'/core/class/html.form.class.php';
+            $form=new Form($this->db);
+        }
+
+        $out='';
+
+        $keyprefix = $keyprefix.'options_';		// Because we work on extrafields
+
+        if (! empty($extrafieldsobjectkey))
+        {
+            $label=$this->attributes[$extrafieldsobjectkey]['label'][$key];
+            $type=$this->attributes[$extrafieldsobjectkey]['type'][$key];
+            $size=$this->attributes[$extrafieldsobjectkey]['size'][$key];
+            $default=$this->attributes[$extrafieldsobjectkey]['default'][$key];
+            $computed=$this->attributes[$extrafieldsobjectkey]['computed'][$key];
+            $unique=$this->attributes[$extrafieldsobjectkey]['unique'][$key];
+            $required=$this->attributes[$extrafieldsobjectkey]['required'][$key];
+            $param=$this->attributes[$extrafieldsobjectkey]['param'][$key];
+            $perms=dol_eval($this->attributes[$extrafieldsobjectkey]['perms'][$key], 1);
+            $langfile=$this->attributes[$extrafieldsobjectkey]['langfile'][$key];
+            $list=dol_eval($this->attributes[$extrafieldsobjectkey]['list'][$key], 1);
+            $totalizable=$this->attributes[$extrafieldsobjectkey]['totalizable'][$key];
+            $help=$this->attributes[$extrafieldsobjectkey]['help'][$key];
+            $hidden=(empty($list) ? 1 : 0);		// If empty, we are sure it is hidden, otherwise we show. If it depends on mode (view/create/edit form or list, this must be filtered by caller)
+        }
+        else	// Old usage
+        {
+            $label=$this->attribute_label[$key];
+            $type =$this->attribute_type[$key];
+            $size =$this->attribute_size[$key];
+            $elementtype=$this->attribute_elementtype[$key];	// Seems not used
+            $default=$this->attribute_default[$key];
+            $computed=$this->attribute_computed[$key];
+            $unique=$this->attribute_unique[$key];
+            $required=$this->attribute_required[$key];
+            $param=$this->attribute_param[$key];
+            $langfile=$this->attribute_langfile[$key];
+            $list=$this->attribute_list[$key];
+            $totalizable=$this->attribute_totalizable[$key];
+            $hidden=(empty($list) ? 1 : 0);		// If empty, we are sure it is hidden, otherwise we show. If it depends on mode (view/create/edit form or list, this must be filtered by caller)
+        }
+
+        if ($computed)
+        {
+            if (! preg_match('/^search_/', $keyprefix)) return '<span class="opacitymedium">'.$langs->trans("AutomaticallyCalculated").'</span>';
+            else return '';
+        }
+
+        if (empty($morecss))
+        {
+            if ($type == 'date')
+            {
+                $morecss = 'minwidth100imp';
+            }
+            elseif ($type == 'datetime')
+            {
+                $morecss = 'minwidth200imp';
+            }
+            elseif (in_array($type,array('int','integer','double','price')))
+            {
+                $morecss = 'maxwidth75';
+            }
+            elseif ($type == 'password')
+            {
+                $morecss='maxwidth100';
+            }
+            elseif ($type == 'url')
+            {
+                $morecss='minwidth400';
+            }
+            elseif ($type == 'boolean')
+            {
+                $morecss='';
+            }
+            else
+            {
+                if (round($size) < 12)
+                {
+                    $morecss = 'minwidth100';
+                }
+                else if (round($size) <= 48)
+                {
+                    $morecss = 'minwidth200';
+                }
+                else
+                {
+                    $morecss = 'minwidth400';
+                }
+            }
+        }
+
+        if (in_array($type,array('date','datetime')))
+        {
+            $tmp=explode(',',$size);
+            $newsize=$tmp[0];
+
+            $showtime = in_array($type,array('datetime')) ? 1 : 0;
+
+            // Do not show current date when field not required (see selectDate() method)
+            if (!$required && $value == '') $value = '-1';
+
+            // TODO Must also support $moreparam
+            $out = $form->selectDate($value, $keyprefix.$key.$keysuffix, $showtime, $showtime, $required, '', 1, (($keyprefix != 'search_' && $keyprefix != 'search_options_') ? 1 : 0), 0, 1);
+        }
+        elseif (in_array($type,array('int','integer')))
+        {
+            $tmp=explode(',',$size);
+            $newsize=$tmp[0];
+            $out='<input type="text" class="flat '.$morecss.' maxwidthonsmartphone" name="'.$keyprefix.$key.$keysuffix.'" id="'.$keyprefix.$key.$keysuffix.'" maxlength="'.$newsize.'" value="'.dol_escape_htmltag($value).'"'.($moreparam?$moreparam:'').'>';
+        }
+        elseif (preg_match('/varchar/', $type))
+        {
+            $out='<input type="text" class="flat '.$morecss.' maxwidthonsmartphone" name="'.$keyprefix.$key.$keysuffix.'" id="'.$keyprefix.$key.$keysuffix.'" maxlength="'.$size.'" value="'.dol_escape_htmltag($value).'"'.($moreparam?$moreparam:'').'>';
+        }
+        elseif (in_array($type, array('mail', 'phone', 'url')))
+        {
+            $out='<input type="text" class="flat '.$morecss.' maxwidthonsmartphone" name="'.$keyprefix.$key.$keysuffix.'" id="'.$keyprefix.$key.$keysuffix.'" value="'.dol_escape_htmltag($value).'" '.($moreparam?$moreparam:'').'>';
+        }
+        elseif ($type == 'text')
+        {
+            if (! preg_match('/search_/', $keyprefix))		// If keyprefix is search_ or search_options_, we must just use a simple text field
+            {
+                require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
+                $doleditor=new DolEditor($keyprefix.$key.$keysuffix,$value,'',200,'dolibarr_notes','In',false,false,false,ROWS_5,'90%');
+                $out=$doleditor->Create(1);
+            }
+            else
+            {
+                $out='<input type="text" class="flat '.$morecss.' maxwidthonsmartphone" name="'.$keyprefix.$key.$keysuffix.'" id="'.$keyprefix.$key.$keysuffix.'" value="'.dol_escape_htmltag($value).'" '.($moreparam?$moreparam:'').'>';
+            }
+        }
+        elseif ($type == 'html')
+        {
+            if (! preg_match('/search_/', $keyprefix))		// If keyprefix is search_ or search_options_, we must just use a simple text field
+            {
+                require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
+                $doleditor=new DolEditor($keyprefix.$key.$keysuffix,$value,'',200,'dolibarr_notes','In',false,false,! empty($conf->fckeditor->enabled) && $conf->global->FCKEDITOR_ENABLE_SOCIETE,ROWS_5,'90%');
+                $out=$doleditor->Create(1);
+            }
+            else
+            {
+                $out='<input type="text" class="flat '.$morecss.' maxwidthonsmartphone" name="'.$keyprefix.$key.$keysuffix.'" id="'.$keyprefix.$key.$keysuffix.'" value="'.dol_escape_htmltag($value).'" '.($moreparam?$moreparam:'').'>';
+            }
+        }
+        elseif ($type == 'boolean')
+        {
+            $checked='';
+            if (!empty($value)) {
+                $checked=' checked value="1" ';
+            } else {
+                $checked=' value="1" ';
+            }
+            $out='<input type="checkbox" class="flat '.$morecss.' maxwidthonsmartphone" name="'.$keyprefix.$key.$keysuffix.'" id="'.$keyprefix.$key.$keysuffix.'" '.$checked.' '.($moreparam?$moreparam:'').'>';
+        }
+        elseif ($type == 'price')
+        {
+            if (!empty($value)) {		// $value in memory is a php numeric, we format it into user number format.
+                $value=price($value);
+            }
+            $out='<input type="text" class="flat '.$morecss.' maxwidthonsmartphone" name="'.$keyprefix.$key.$keysuffix.'" id="'.$keyprefix.$key.$keysuffix.'" value="'.$value.'" '.($moreparam?$moreparam:'').'> '.$langs->getCurrencySymbol($conf->currency);
+        }
+        elseif ($type == 'double')
+        {
+            if (!empty($value)) {		// $value in memory is a php numeric, we format it into user number format.
+                $value=price($value);
+            }
+            $out='<input type="text" class="flat '.$morecss.' maxwidthonsmartphone" name="'.$keyprefix.$key.$keysuffix.'" id="'.$keyprefix.$key.$keysuffix.'" value="'.$value.'" '.($moreparam?$moreparam:'').'> ';
+        }
+        elseif ($type == 'select')
+        {
+            $out = '';
+            if (! empty($conf->use_javascript_ajax) && ! empty($conf->global->MAIN_EXTRAFIELDS_USE_SELECT2))
+            {
+                include_once DOL_DOCUMENT_ROOT . '/core/lib/ajax.lib.php';
+                $out.= ajax_combobox($keyprefix.$key.$keysuffix, array(), 0);
+            }
+
+            $out.='<select class="flat '.$morecss.' maxwidthonsmartphone" name="'.$keyprefix.$key.$keysuffix.'" id="'.$keyprefix.$key.$keysuffix.'" '.($moreparam?$moreparam:'').'>';
+            $out.='<option value="0">&nbsp;</option>';
+            foreach ($param['options'] as $key => $val)
+            {
+                if ((string) $key == '') continue;
+                list($val, $parent) = explode('|', $val);
+                $out.='<option value="'.$key.'"';
+                $out.= (((string) $value == (string) $key)?' selected':'');
+                $out.= (!empty($parent)?' parent="'.$parent.'"':'');
+                $out.='>';
+                if ($langfile && $val) $out.=$langs->trans($val);
+                else $out.=$val;
+                $out.='</option>';
+            }
+            $out.='</select>';
+        }
+        elseif ($type == 'sellist')
+        {
+            $out = '';
+            if (! empty($conf->use_javascript_ajax) && ! empty($conf->global->MAIN_EXTRAFIELDS_USE_SELECT2))
+            {
+                include_once DOL_DOCUMENT_ROOT . '/core/lib/ajax.lib.php';
+                $out.= ajax_combobox($keyprefix.$key.$keysuffix, array(), 0);
+            }
+
+            $out.='<select class="flat '.$morecss.' maxwidthonsmartphone" name="'.$keyprefix.$key.$keysuffix.'" id="'.$keyprefix.$key.$keysuffix.'" '.($moreparam?$moreparam:'').'>';
+            if (is_array($param['options']))
+            {
+                $param_list=array_keys($param['options']);
+                $InfoFieldList = explode(":", $param_list[0]);
+                $parentName='';
+                $parentField='';
+                // 0 : tableName
+                // 1 : label field name
+                // 2 : key fields name (if differ of rowid)
+                // 3 : key field parent (for dependent lists)
+                // 4 : where clause filter on column or table extrafield, syntax field='value' or extra.field=value
+                $keyList=(empty($InfoFieldList[2])?'rowid':$InfoFieldList[2].' as rowid');
+
+
+                if (count($InfoFieldList) > 4 && ! empty($InfoFieldList[4]))
+                {
+                    if (strpos($InfoFieldList[4], 'extra.') !== false)
+                    {
+                        $keyList='main.'.$InfoFieldList[2].' as rowid';
+                    } else {
+                        $keyList=$InfoFieldList[2].' as rowid';
+                    }
+                }
+                if (count($InfoFieldList) > 3 && ! empty($InfoFieldList[3]))
+                {
+                    list($parentName, $parentField) = explode('|', $InfoFieldList[3]);
+                    $keyList.= ', '.$parentField;
+                }
+
+                $fields_label = explode('|',$InfoFieldList[1]);
+                if (is_array($fields_label))
+                {
+                    $keyList .=', ';
+                    $keyList .= implode(', ', $fields_label);
+                }
+
+                $sqlwhere='';
+                $sql = 'SELECT '.$keyList;
+                $sql.= ' FROM '.MAIN_DB_PREFIX .$InfoFieldList[0];
+                if (!empty($InfoFieldList[4]))
+                {
+                    // can use curent entity filter
+                    if (strpos($InfoFieldList[4], '$ENTITY$')!==false) {
+                        $InfoFieldList[4]=str_replace('$ENTITY$',$conf->entity,$InfoFieldList[4]);
+                    }
+                    // can use SELECT request
+                    if (strpos($InfoFieldList[4], '$SEL$')!==false) {
+                        $InfoFieldList[4]=str_replace('$SEL$','SELECT',$InfoFieldList[4]);
+                    }
+
+                    // current object id can be use into filter
+                    if (strpos($InfoFieldList[4], '$ID$')!==false && !empty($objectid)) {
+                        $InfoFieldList[4]=str_replace('$ID$',$objectid,$InfoFieldList[4]);
+                    } else {
+                        $InfoFieldList[4]=str_replace('$ID$','0',$InfoFieldList[4]);
+                    }
+                    //We have to join on extrafield table
+                    if (strpos($InfoFieldList[4], 'extra')!==false)
+                    {
+                        $sql.= ' as main, '.MAIN_DB_PREFIX .$InfoFieldList[0].'_extrafields as extra';
+                        $sqlwhere.= ' WHERE extra.fk_object=main.'.$InfoFieldList[2]. ' AND '.$InfoFieldList[4];
+                    }
+                    else
+                    {
+                        $sqlwhere.= ' WHERE '.$InfoFieldList[4];
+                    }
+                }
+                else
+                {
+                    $sqlwhere.= ' WHERE 1=1';
+                }
+                // Some tables may have field, some other not. For the moment we disable it.
+                if (in_array($InfoFieldList[0],array('tablewithentity')))
+                {
+                    $sqlwhere.= ' AND entity = '.$conf->entity;
+                }
+                $sql.=$sqlwhere;
+                //print $sql;
+
+                $sql .= ' ORDER BY ' . implode(', ', $fields_label);
+
+                dol_syslog(get_class($this).'::showInputField type=sellist', LOG_DEBUG);
+                $resql = $this->db->query($sql);
+                if ($resql)
+                {
+                    $out.='<option value="0">&nbsp;</option>';
+                    $num = $this->db->num_rows($resql);
+                    $i = 0;
+                    while ($i < $num)
+                    {
+                        $labeltoshow='';
+                        $obj = $this->db->fetch_object($resql);
+
+                        // Several field into label (eq table:code|libelle:rowid)
+                        $notrans = false;
+                        $fields_label = explode('|',$InfoFieldList[1]);
+                        if (is_array($fields_label))
+                        {
+                            $notrans = true;
+                            foreach ($fields_label as $field_toshow)
+                            {
+                                $labeltoshow.= $obj->$field_toshow.' ';
+                            }
+                        }
+                        else
+                        {
+                            $labeltoshow=$obj->{$InfoFieldList[1]};
+                        }
+                        $labeltoshow=dol_trunc($labeltoshow,45);
+
+                        if ($value == $obj->rowid)
+                        {
+                            foreach ($fields_label as $field_toshow)
+                            {
+                                $translabel=$langs->trans($obj->$field_toshow);
+                                if ($translabel!=$obj->$field_toshow) {
+                                    $labeltoshow=dol_trunc($translabel,18).' ';
+                                }else {
+                                    $labeltoshow=dol_trunc($obj->$field_toshow,18).' ';
+                                }
+                            }
+                            $out.='<option value="'.$obj->rowid.'" selected>'.$labeltoshow.'</option>';
+                        }
+                        else
+                        {
+                            if (! $notrans)
+                            {
+                                $translabel=$langs->trans($obj->{$InfoFieldList[1]});
+                                if ($translabel!=$obj->{$InfoFieldList[1]}) {
+                                    $labeltoshow=dol_trunc($translabel,18);
+                                }
+                                else {
+                                    $labeltoshow=dol_trunc($obj->{$InfoFieldList[1]},18);
+                                }
+                            }
+                            if (empty($labeltoshow)) $labeltoshow='(not defined)';
+                            if ($value==$obj->rowid)
+                            {
+                                $out.='<option value="'.$obj->rowid.'" selected>'.$labeltoshow.'</option>';
+                            }
+
+                            if (!empty($InfoFieldList[3]) && $parentField)
+                            {
+                                $parent = $parentName.':'.$obj->{$parentField};
+                            }
+
+                            $out.='<option value="'.$obj->rowid.'"';
+                            $out.= ($value==$obj->rowid?' selected':'');
+                            $out.= (!empty($parent)?' parent="'.$parent.'"':'');
+                            $out.='>'.$labeltoshow.'</option>';
+                        }
+
+                        $i++;
+                    }
+                    $this->db->free($resql);
+                }
+                else {
+                    print 'Error in request '.$sql.' '.$this->db->lasterror().'. Check setup of extra parameters.<br>';
+                }
+            }
+            $out.='</select>';
+        }
+        elseif ($type == 'checkbox')
+        {
+            $value_arr=explode(',',$value);
+            $out=$form->multiselectarray($keyprefix.$key.$keysuffix, (empty($param['options'])?null:$param['options']), $value_arr, '', 0, '', 0, '100%');
+        }
+        elseif ($type == 'radio')
+        {
+            $out='';
+            foreach ($param['options'] as $keyopt => $val)
+            {
+                $out.='<input class="flat '.$morecss.'" type="radio" name="'.$keyprefix.$key.$keysuffix.'" id="'.$keyprefix.$key.$keysuffix.'" '.($moreparam?$moreparam:'');
+                $out.=' value="'.$keyopt.'"';
+                $out.=' id="'.$keyprefix.$key.$keysuffix.'_'.$keyopt.'"';
+                $out.= ($value==$keyopt?'checked':'');
+                $out.='/><label for="'.$keyprefix.$key.$keysuffix.'_'.$keyopt.'">'.$val.'</label><br>';
+            }
+        }
+        elseif ($type == 'chkbxlst')
+        {
+            if (is_array($value)) {
+                $value_arr = $value;
+            }
+            else {
+                $value_arr = explode(',', $value);
+            }
+
+            if (is_array($param['options'])) {
+                $param_list = array_keys($param['options']);
+                $InfoFieldList = explode(":", $param_list[0]);
+                $parentName='';
+                $parentField='';
+                // 0 : tableName
+                // 1 : label field name
+                // 2 : key fields name (if differ of rowid)
+                // 3 : key field parent (for dependent lists)
+                // 4 : where clause filter on column or table extrafield, syntax field='value' or extra.field=value
+                $keyList = (empty($InfoFieldList[2]) ? 'rowid' : $InfoFieldList[2] . ' as rowid');
+
+                if (count($InfoFieldList) > 3 && ! empty($InfoFieldList[3])) {
+                    list ( $parentName, $parentField ) = explode('|', $InfoFieldList[3]);
+                    $keyList .= ', ' . $parentField;
+                }
+                if (count($InfoFieldList) > 4 && ! empty($InfoFieldList[4])) {
+                    if (strpos($InfoFieldList[4], 'extra.') !== false) {
+                        $keyList = 'main.' . $InfoFieldList[2] . ' as rowid';
+                    } else {
+                        $keyList = $InfoFieldList[2] . ' as rowid';
+                    }
+                }
+
+                $fields_label = explode('|', $InfoFieldList[1]);
+                if (is_array($fields_label)) {
+                    $keyList .= ', ';
+                    $keyList .= implode(', ', $fields_label);
+                }
+
+                $sqlwhere = '';
+                $sql = 'SELECT ' . $keyList;
+                $sql .= ' FROM ' . MAIN_DB_PREFIX . $InfoFieldList[0];
+                if (! empty($InfoFieldList[4])) {
+
+                    // can use SELECT request
+                    if (strpos($InfoFieldList[4], '$SEL$')!==false) {
+                        $InfoFieldList[4]=str_replace('$SEL$','SELECT',$InfoFieldList[4]);
+                    }
+
+                    // current object id can be use into filter
+                    if (strpos($InfoFieldList[4], '$ID$')!==false && !empty($objectid)) {
+                        $InfoFieldList[4]=str_replace('$ID$',$objectid,$InfoFieldList[4]);
+                    } else if (preg_match("#^.*list.php$#",$_SERVER["DOCUMENT_URI"])) {
+                        // Pattern for word=$ID$
+                        $word = '\b[a-zA-Z0-9-\.-_]+\b=\$ID\$';
 						
-						// Removing space arount =, ( and )
-						$InfoFieldList[4]=preg_replace('# *(=|\(|\)) *#','$1', $InfoFieldList[4]);
+                        // Removing space arount =, ( and )
+                        $InfoFieldList[4]=preg_replace('# *(=|\(|\)) *#','$1', $InfoFieldList[4]);
 						
-						$nbPreg = 1;
-						// While we have parenthesis
-						while ($nbPreg!=0) {
-							// Init des compteurs
-							$nbPregRepl = $nbPregSel = 0;
-							// On retire toutes les parenthèses sans = avant
-							$InfoFieldList[4]=preg_replace( '#([^=])(\([^)^(]*(' . $word .   ')[^)^(]*\))#','$1 $3 ',$InfoFieldList[4],-1,$nbPregRepl);
-							// On retire les espaces autour des = et parenthèses
-							$InfoFieldList[4]=preg_replace('# *(=|\(|\)) *#','$1', $InfoFieldList[4]);
-							// On retire toutes les parenthèses avec = avant
-							$InfoFieldList[4]=preg_replace(  '#\b[a-zA-Z0-9-\.-_]+\b=\([^)^(]*(' . $word .   ')[^)^(]*\)#','$1 ',$InfoFieldList[4], -1, $nbPregSel);
-							// On retire les espaces autour des = et parenthèses
-							$InfoFieldList[4]=preg_replace('# *(=|\(|\)) *#','$1', $InfoFieldList[4]);
+                        $nbPreg = 1;
+                        // While we have parenthesis
+                        while ($nbPreg!=0) {
+                            // Init des compteurs
+                            $nbPregRepl = $nbPregSel = 0;
+                            // On retire toutes les parenthèses sans = avant
+                            $InfoFieldList[4]=preg_replace( '#([^=])(\([^)^(]*(' . $word .   ')[^)^(]*\))#','$1 $3 ',$InfoFieldList[4],-1,$nbPregRepl);
+                            // On retire les espaces autour des = et parenthèses
+                            $InfoFieldList[4]=preg_replace('# *(=|\(|\)) *#','$1', $InfoFieldList[4]);
+                            // On retire toutes les parenthèses avec = avant
+                            $InfoFieldList[4]=preg_replace(  '#\b[a-zA-Z0-9-\.-_]+\b=\([^)^(]*(' . $word .   ')[^)^(]*\)#','$1 ',$InfoFieldList[4], -1, $nbPregSel);
+                            // On retire les espaces autour des = et parenthèses
+                            $InfoFieldList[4]=preg_replace('# *(=|\(|\)) *#','$1', $InfoFieldList[4]);
 							
-							// Calcul du compteur général pour la boucle
-							$nbPreg = $nbPregRepl + $nbPregSel;
-						}
+                            // Calcul du compteur général pour la boucle
+                            $nbPreg = $nbPregRepl + $nbPregSel;
+                        }
 						
-						// Si l'on a un AND ou un OR, avant ou après
-						preg_match('#(AND|OR|) *('.$word.') *(AND|OR|)#',$InfoFieldList[4],$matchCondition);
-						while(!empty($matchCondition[0])) {
-							// If the two sides differ but are not empty
-							if (! empty($matchCondition[1]) && ! empty($matchCondition[3]) && $matchCondition[1] != $matchCondition[3] ) {
-								// Nobody sain would do that without parentheses
-								$InfoFieldList[4]=str_replace('$ID$','0',$InfoFieldList[4]);
-							}
-							else {
-								if (! empty($matchCondition[1])) {
-									$boolCond =(( $matchCondition[1] == "AND" )?' AND 1 ':' OR 0 ');
-									$InfoFieldList[4]=str_replace($matchCondition[0],$boolCond.$matchCondition[3],$InfoFieldList[4]);
-								}
-								else if (! empty($matchCondition[3])) {
-									$boolCond =(( $matchCondition[3] == "AND" )?' 1 AND ':' 0 OR');
-									$InfoFieldList[4]=str_replace($matchCondition[0],$boolCond,$InfoFieldList[4]);
-								}
-								else {
-									$InfoFieldList[4] = 1;
-								}
-							}
+                        // Si l'on a un AND ou un OR, avant ou après
+                        preg_match('#(AND|OR|) *('.$word.') *(AND|OR|)#',$InfoFieldList[4],$matchCondition);
+                        while(!empty($matchCondition[0])) {
+                            // If the two sides differ but are not empty
+                            if (! empty($matchCondition[1]) && ! empty($matchCondition[3]) && $matchCondition[1] != $matchCondition[3] ) {
+                                // Nobody sain would do that without parentheses
+                                $InfoFieldList[4]=str_replace('$ID$','0',$InfoFieldList[4]);
+                            }
+                            else {
+                                if (! empty($matchCondition[1])) {
+                                    $boolCond =(( $matchCondition[1] == "AND" )?' AND 1 ':' OR 0 ');
+                                    $InfoFieldList[4]=str_replace($matchCondition[0],$boolCond.$matchCondition[3],$InfoFieldList[4]);
+                                }
+                                else if (! empty($matchCondition[3])) {
+                                    $boolCond =(( $matchCondition[3] == "AND" )?' 1 AND ':' 0 OR');
+                                    $InfoFieldList[4]=str_replace($matchCondition[0],$boolCond,$InfoFieldList[4]);
+                                }
+                                else {
+                                    $InfoFieldList[4] = 1;
+                                }
+                            }
 							
-							// Si l'on a un AND ou un OR, avant ou après
-							preg_match('#(AND|OR|) *('.$word.') *(AND|OR|)#',$InfoFieldList[4],$matchCondition);
-						}
-					}
-					else {
-						$InfoFieldList[4]=str_replace('$ID$','0',$InfoFieldList[4]);
-					}
-
-					// We have to join on extrafield table
-					if (strpos($InfoFieldList[4], 'extra') !== false) {
-						$sql .= ' as main, ' . MAIN_DB_PREFIX . $InfoFieldList[0] . '_extrafields as extra';
-						$sqlwhere .= ' WHERE extra.fk_object=main.' . $InfoFieldList[2] . ' AND ' . $InfoFieldList[4];
-					} else {
-						$sqlwhere .= ' WHERE ' . $InfoFieldList[4];
-					}
-				} else {
-					$sqlwhere .= ' WHERE 1=1';
-				}
-				// Some tables may have field, some other not. For the moment we disable it.
-				if (in_array($InfoFieldList[0], array ('tablewithentity')))
-				{
-					$sqlwhere .= ' AND entity = ' . $conf->entity;
-				}
-				// $sql.=preg_replace('/^ AND /','',$sqlwhere);
-				// print $sql;
-
-				$sql .= $sqlwhere;
-				dol_syslog(get_class($this) . '::showInputField type=chkbxlst',LOG_DEBUG);
-				$resql = $this->db->query($sql);
-				if ($resql) {
-					$num = $this->db->num_rows($resql);
-					$i = 0;
-
-					$data=array();
-
-					while ( $i < $num ) {
-						$labeltoshow = '';
-						$obj = $this->db->fetch_object($resql);
-
-						$notrans = false;
-						// Several field into label (eq table:code|libelle:rowid)
-						$fields_label = explode('|', $InfoFieldList[1]);
-						if (is_array($fields_label)) {
-							$notrans = true;
-							foreach ( $fields_label as $field_toshow ) {
-								$labeltoshow .= $obj->$field_toshow . ' ';
-							}
-						} else {
-							$labeltoshow = $obj->{$InfoFieldList[1]};
-						}
-						$labeltoshow = dol_trunc($labeltoshow, 45);
-
-						if (is_array($value_arr) && in_array($obj->rowid, $value_arr)) {
-							foreach ( $fields_label as $field_toshow ) {
-								$translabel = $langs->trans($obj->$field_toshow);
-								if ($translabel != $obj->$field_toshow) {
-									$labeltoshow = dol_trunc($translabel, 18) . ' ';
-								} else {
-									$labeltoshow = dol_trunc($obj->$field_toshow, 18) . ' ';
-								}
-							}
-
-							$data[$obj->rowid]=$labeltoshow;
-						} else {
-							if (! $notrans) {
-								$translabel = $langs->trans($obj->{$InfoFieldList[1]});
-								if ($translabel != $obj->{$InfoFieldList[1]}) {
-									$labeltoshow = dol_trunc($translabel, 18);
-								} else {
-									$labeltoshow = dol_trunc($obj->{$InfoFieldList[1]}, 18);
-								}
-							}
-							if (empty($labeltoshow))
-								$labeltoshow = '(not defined)';
-
-								if (is_array($value_arr) && in_array($obj->rowid, $value_arr)) {
-									$data[$obj->rowid]=$labeltoshow;
-								}
-
-								if (! empty($InfoFieldList[3]) && $parentField) {
-									$parent = $parentName . ':' . $obj->{$parentField};
-								}
-
-								$data[$obj->rowid]=$labeltoshow;
-						}
-
-						$i ++;
-					}
-					$this->db->free($resql);
-
-					$out=$form->multiselectarray($keyprefix.$key.$keysuffix, $data, $value_arr, '', 0, '', 0, '100%');
-				} else {
-					print 'Error in request ' . $sql . ' ' . $this->db->lasterror() . '. Check setup of extra parameters.<br>';
-				}
-			}
-		}
-		elseif ($type == 'link')
-		{
-			$param_list=array_keys($param['options']);				// $param_list='ObjectName:classPath'
-			$showempty=(($required && $default != '')?0:1);
-			$out=$form->selectForForms($param_list[0], $keyprefix.$key.$keysuffix, $value, $showempty);
-		}
-		elseif ($type == 'password')
-		{
-			// If prefix is 'search_', field is used as a filter, we use a common text field.
-			$out='<input style="display:none" type="text" name="fakeusernameremembered">';	// Hidden field to reduce impact of evil Google Chrome autopopulate bug.
-			$out.='<input autocomplete="new-password" type="'.($keyprefix=='search_'?'text':'password').'" class="flat '.$morecss.'" name="'.$keyprefix.$key.$keysuffix.'" id="'.$keyprefix.$key.$keysuffix.'" value="'.$value.'" '.($moreparam?$moreparam:'').'>';
-		}
-		if (!empty($hidden)) {
-			$out='<input type="hidden" value="'.$value.'" name="'.$keyprefix.$key.$keysuffix.'" id="'.$keyprefix.$key.$keysuffix.'"/>';
-		}
-		/* Add comments
+                            // Si l'on a un AND ou un OR, avant ou après
+                            preg_match('#(AND|OR|) *('.$word.') *(AND|OR|)#',$InfoFieldList[4],$matchCondition);
+                        }
+                    }
+                    else {
+                        $InfoFieldList[4]=str_replace('$ID$','0',$InfoFieldList[4]);
+                    }
+
+                    // We have to join on extrafield table
+                    if (strpos($InfoFieldList[4], 'extra') !== false) {
+                        $sql .= ' as main, ' . MAIN_DB_PREFIX . $InfoFieldList[0] . '_extrafields as extra';
+                        $sqlwhere .= ' WHERE extra.fk_object=main.' . $InfoFieldList[2] . ' AND ' . $InfoFieldList[4];
+                    } else {
+                        $sqlwhere .= ' WHERE ' . $InfoFieldList[4];
+                    }
+                } else {
+                    $sqlwhere .= ' WHERE 1=1';
+                }
+                // Some tables may have field, some other not. For the moment we disable it.
+                if (in_array($InfoFieldList[0], array ('tablewithentity')))
+                {
+                    $sqlwhere .= ' AND entity = ' . $conf->entity;
+                }
+                // $sql.=preg_replace('/^ AND /','',$sqlwhere);
+                // print $sql;
+
+                $sql .= $sqlwhere;
+                dol_syslog(get_class($this) . '::showInputField type=chkbxlst',LOG_DEBUG);
+                $resql = $this->db->query($sql);
+                if ($resql) {
+                    $num = $this->db->num_rows($resql);
+                    $i = 0;
+
+                    $data=array();
+
+                    while ( $i < $num ) {
+                        $labeltoshow = '';
+                        $obj = $this->db->fetch_object($resql);
+
+                        $notrans = false;
+                        // Several field into label (eq table:code|libelle:rowid)
+                        $fields_label = explode('|', $InfoFieldList[1]);
+                        if (is_array($fields_label)) {
+                            $notrans = true;
+                            foreach ( $fields_label as $field_toshow ) {
+                                $labeltoshow .= $obj->$field_toshow . ' ';
+                            }
+                        } else {
+                            $labeltoshow = $obj->{$InfoFieldList[1]};
+                        }
+                        $labeltoshow = dol_trunc($labeltoshow, 45);
+
+                        if (is_array($value_arr) && in_array($obj->rowid, $value_arr)) {
+                            foreach ( $fields_label as $field_toshow ) {
+                                $translabel = $langs->trans($obj->$field_toshow);
+                                if ($translabel != $obj->$field_toshow) {
+                                    $labeltoshow = dol_trunc($translabel, 18) . ' ';
+                                } else {
+                                    $labeltoshow = dol_trunc($obj->$field_toshow, 18) . ' ';
+                                }
+                            }
+
+                            $data[$obj->rowid]=$labeltoshow;
+                        } else {
+                            if (! $notrans) {
+                                $translabel = $langs->trans($obj->{$InfoFieldList[1]});
+                                if ($translabel != $obj->{$InfoFieldList[1]}) {
+                                    $labeltoshow = dol_trunc($translabel, 18);
+                                } else {
+                                    $labeltoshow = dol_trunc($obj->{$InfoFieldList[1]}, 18);
+                                }
+                            }
+                            if (empty($labeltoshow))
+                                $labeltoshow = '(not defined)';
+
+                                if (is_array($value_arr) && in_array($obj->rowid, $value_arr)) {
+                                    $data[$obj->rowid]=$labeltoshow;
+                                }
+
+                                if (! empty($InfoFieldList[3]) && $parentField) {
+                                    $parent = $parentName . ':' . $obj->{$parentField};
+                                }
+
+                                $data[$obj->rowid]=$labeltoshow;
+                        }
+
+                        $i ++;
+                    }
+                    $this->db->free($resql);
+
+                    $out=$form->multiselectarray($keyprefix.$key.$keysuffix, $data, $value_arr, '', 0, '', 0, '100%');
+                } else {
+                    print 'Error in request ' . $sql . ' ' . $this->db->lasterror() . '. Check setup of extra parameters.<br>';
+                }
+            }
+        }
+        elseif ($type == 'link')
+        {
+            $param_list=array_keys($param['options']);				// $param_list='ObjectName:classPath'
+            $showempty=(($required && $default != '')?0:1);
+            $out=$form->selectForForms($param_list[0], $keyprefix.$key.$keysuffix, $value, $showempty);
+        }
+        elseif ($type == 'password')
+        {
+            // If prefix is 'search_', field is used as a filter, we use a common text field.
+            $out='<input style="display:none" type="text" name="fakeusernameremembered">';	// Hidden field to reduce impact of evil Google Chrome autopopulate bug.
+            $out.='<input autocomplete="new-password" type="'.($keyprefix=='search_'?'text':'password').'" class="flat '.$morecss.'" name="'.$keyprefix.$key.$keysuffix.'" id="'.$keyprefix.$key.$keysuffix.'" value="'.$value.'" '.($moreparam?$moreparam:'').'>';
+        }
+        if (!empty($hidden)) {
+            $out='<input type="hidden" value="'.$value.'" name="'.$keyprefix.$key.$keysuffix.'" id="'.$keyprefix.$key.$keysuffix.'"/>';
+        }
+        /* Add comments
 		 if ($type == 'date') $out.=' (YYYY-MM-DD)';
 		 elseif ($type == 'datetime') $out.=' (YYYY-MM-DD HH:MM:SS)';
 		 */
-		return $out;
-	}
-
-
-	/**
-	 * Return HTML string to put an output field into a page
-	 *
-	 * @param   string	$key            		Key of attribute
-	 * @param   string	$value          		Value to show
-	 * @param	string	$moreparam				To add more parameters on html input tag (only checkbox use html input for output rendering)
-	 * @param	string	$extrafieldsobjectkey	If defined (for example $object->table_element), use the new method to get extrafields data
-	 * @return	string							Formated value
-	 */
-	function showOutputField($key, $value, $moreparam='', $extrafieldsobjectkey='')
-	{
-		global $conf,$langs;
-
-		if (! empty($extrafieldsobjectkey))
-		{
-			$label=$this->attributes[$extrafieldsobjectkey]['label'][$key];
-			$type=$this->attributes[$extrafieldsobjectkey]['type'][$key];
-			$size=$this->attributes[$extrafieldsobjectkey]['size'][$key];
-			$default=$this->attributes[$extrafieldsobjectkey]['default'][$key];
-			$computed=$this->attributes[$extrafieldsobjectkey]['computed'][$key];
-			$unique=$this->attributes[$extrafieldsobjectkey]['unique'][$key];
-			$required=$this->attributes[$extrafieldsobjectkey]['required'][$key];
-			$param=$this->attributes[$extrafieldsobjectkey]['param'][$key];
-			$perms=dol_eval($this->attributes[$extrafieldsobjectkey]['perms'][$key], 1);
-			$langfile=$this->attributes[$extrafieldsobjectkey]['langfile'][$key];
-			$list=dol_eval($this->attributes[$extrafieldsobjectkey]['list'][$key], 1);
-			$help=$this->attributes[$extrafieldsobjectkey]['help'][$key];
-			$hidden=(empty($list) ? 1 : 0);		// If $list empty, we are sure it is hidden, otherwise we show. If it depends on mode (view/create/edit form or list, this must be filtered by caller)
-		}
-		else	// Old usage
-		{
-			$label=$this->attribute_label[$key];
-			$type=$this->attribute_type[$key];
-			$size=$this->attribute_size[$key];
-			$default=$this->attribute_default[$key];
-			$computed=$this->attribute_computed[$key];
-			$unique=$this->attribute_unique[$key];
-			$required=$this->attribute_required[$key];
-			$param=$this->attribute_param[$key];
-			$perms=dol_eval($this->attribute_perms[$key], 1);
-			$langfile=$this->attribute_langfile[$key];
-			$list=dol_eval($this->attribute_list[$key], 1);
-			$help='';	// Not supported with old syntax
-			$hidden=(empty($list) ? 1 : 0);		// If $list empty, we are sure it is hidden, otherwise we show. If it depends on mode (view/create/edit form or list, this must be filtered by caller)
-		}
-
-		if ($hidden) return '';		// This is a protection. If field is hidden, we should just not call this method.
-
-		// If field is a computed field, value must become result of compute
-		if ($computed)
-		{
-		    // Make the eval of compute string
-		    //var_dump($computed);
-		    $value = dol_eval($computed, 1, 0);
-		}
-
-		$showsize=0;
-		if ($type == 'date')
-		{
-			$showsize=10;
-			$value=dol_print_date($value, 'day');
-		}
-		elseif ($type == 'datetime')
-		{
-			$showsize=19;
-			$value=dol_print_date($value, 'dayhour');
-		}
-		elseif ($type == 'int')
-		{
-			$showsize=10;
-		}
-		elseif ($type == 'double')
-		{
-			if (!empty($value)) {
-				$value=price($value);
-			}
-		}
-		elseif ($type == 'boolean')
-		{
-			$checked='';
-			if (!empty($value)) {
-				$checked=' checked ';
-			}
-			$value='<input type="checkbox" '.$checked.' '.($moreparam?$moreparam:'').' readonly disabled>';
-		}
-		elseif ($type == 'mail')
-		{
-			$value=dol_print_email($value, 0, 0, 0, 64, 1, 1);
-		}
-		elseif ($type == 'url')
-		{
-			$value=dol_print_url($value,'_blank',32,1);
-		}
-		elseif ($type == 'phone')
-		{
-			$value=dol_print_phone($value, '', 0, 0, '', '&nbsp;', 1);
-		}
-		elseif ($type == 'price')
-		{
-			$value=price($value, 0, $langs, 0, 0, -1, $conf->currency);
-		}
-		elseif ($type == 'select')
-		{
-			if ($langfile && $param['options'][$value]) $value=$langs->trans($param['options'][$value]);
-			else $value=$param['options'][$value];
-		}
-		elseif ($type == 'sellist')
-		{
-			$param_list=array_keys($param['options']);
-			$InfoFieldList = explode(":", $param_list[0]);
-
-			$selectkey="rowid";
-			$keyList='rowid';
-
-			if (count($InfoFieldList)>=3)
-			{
-				$selectkey = $InfoFieldList[2];
-				$keyList=$InfoFieldList[2].' as rowid';
-			}
-
-			$fields_label = explode('|',$InfoFieldList[1]);
-			if(is_array($fields_label)) {
-				$keyList .=', ';
-				$keyList .= implode(', ', $fields_label);
-			}
-
-			$sql = 'SELECT '.$keyList;
-			$sql.= ' FROM '.MAIN_DB_PREFIX .$InfoFieldList[0];
-			if (strpos($InfoFieldList[4], 'extra')!==false)
-			{
-				$sql.= ' as main';
-			}
-			if ($selectkey=='rowid' && empty($value)) {
-				$sql.= " WHERE ".$selectkey."=0";
-			} elseif ($selectkey=='rowid') {
-				$sql.= " WHERE ".$selectkey."=".$this->db->escape($value);
-			}else {
-				$sql.= " WHERE ".$selectkey."='".$this->db->escape($value)."'";
-			}
-
-			//$sql.= ' AND entity = '.$conf->entity;
-
-			dol_syslog(get_class($this).':showOutputField:$type=sellist', LOG_DEBUG);
-			$resql = $this->db->query($sql);
-			if ($resql)
-			{
-				$value='';	// value was used, so now we reste it to use it to build final output
-
-				$obj = $this->db->fetch_object($resql);
-
-				// Several field into label (eq table:code|libelle:rowid)
-				$fields_label = explode('|',$InfoFieldList[1]);
-
-				if(is_array($fields_label) && count($fields_label)>1)
-				{
-					foreach ($fields_label as $field_toshow)
-					{
-						$translabel='';
-						if (!empty($obj->$field_toshow)) {
-							$translabel=$langs->trans($obj->$field_toshow);
-						}
-						if ($translabel!=$field_toshow) {
-							$value.=dol_trunc($translabel,18).' ';
-						}else {
-							$value.=$obj->$field_toshow.' ';
-						}
-					}
-				}
-				else
-				{
-					$translabel='';
-					if (!empty($obj->{$InfoFieldList[1]})) {
-						$translabel=$langs->trans($obj->{$InfoFieldList[1]});
-					}
-					if ($translabel!=$obj->{$InfoFieldList[1]}) {
-						$value=dol_trunc($translabel,18);
-					}else {
-						$value=$obj->{$InfoFieldList[1]};
-					}
-				}
-			}
-			else dol_syslog(get_class($this).'::showOutputField error '.$this->db->lasterror(), LOG_WARNING);
-		}
-		elseif ($type == 'radio')
-		{
-			$value=$param['options'][$value];
-		}
-		elseif ($type == 'checkbox')
-		{
-			$value_arr=explode(',',$value);
-			$value='';
-			$toprint=array();
-			if (is_array($value_arr))
-			{
-				foreach ($value_arr as $keyval=>$valueval) {
-					$toprint[]='<li class="select2-search-choice-dolibarr noborderoncategories" style="background: #aaa">'.$param['options'][$valueval].'</li>';
-				}
-			}
-			$value='<div class="select2-container-multi-dolibarr" style="width: 90%;"><ul class="select2-choices-dolibarr">'.implode(' ', $toprint).'</ul></div>';
-		}
-		elseif ($type == 'chkbxlst')
-		{
-			$value_arr = explode(',', $value);
-
-			$param_list = array_keys($param['options']);
-			$InfoFieldList = explode(":", $param_list[0]);
-
-			$selectkey = "rowid";
-			$keyList = 'rowid';
-
-			if (count($InfoFieldList) >= 3) {
-				$selectkey = $InfoFieldList[2];
-				$keyList = $InfoFieldList[2] . ' as rowid';
-			}
-
-			$fields_label = explode('|', $InfoFieldList[1]);
-			if (is_array($fields_label)) {
-				$keyList .= ', ';
-				$keyList .= implode(', ', $fields_label);
-			}
-
-			$sql = 'SELECT ' . $keyList;
-			$sql .= ' FROM ' . MAIN_DB_PREFIX . $InfoFieldList[0];
-			if (strpos($InfoFieldList[4], 'extra') !== false) {
-				$sql .= ' as main';
-			}
-			// $sql.= " WHERE ".$selectkey."='".$this->db->escape($value)."'";
-			// $sql.= ' AND entity = '.$conf->entity;
-
-			dol_syslog(get_class($this) . ':showOutputField:$type=chkbxlst',LOG_DEBUG);
-			$resql = $this->db->query($sql);
-			if ($resql) {
-				$value = ''; // value was used, so now we reste it to use it to build final output
-				$toprint=array();
-				while ( $obj = $this->db->fetch_object($resql) ) {
-
-					// Several field into label (eq table:code|libelle:rowid)
-					$fields_label = explode('|', $InfoFieldList[1]);
-					if (is_array($value_arr) && in_array($obj->rowid, $value_arr)) {
-						if (is_array($fields_label) && count($fields_label) > 1) {
-							foreach ( $fields_label as $field_toshow ) {
-								$translabel = '';
-								if (! empty($obj->$field_toshow)) {
-									$translabel = $langs->trans($obj->$field_toshow);
-								}
-								if ($translabel != $field_toshow) {
-									$toprint[]='<li class="select2-search-choice-dolibarr noborderoncategories" style="background: #aaa">'.dol_trunc($translabel, 18).'</li>';
-								} else {
-									$toprint[]='<li class="select2-search-choice-dolibarr noborderoncategories" style="background: #aaa">'.$obj->$field_toshow.'</li>';
-								}
-							}
-						} else {
-							$translabel = '';
-							if (! empty($obj->{$InfoFieldList[1]})) {
-								$translabel = $langs->trans($obj->{$InfoFieldList[1]});
-							}
-							if ($translabel != $obj->{$InfoFieldList[1]}) {
-								$toprint[]='<li class="select2-search-choice-dolibarr noborderoncategories" style="background: #aaa">'.dol_trunc($translabel, 18).'</li>';
-							} else {
-								$toprint[]='<li class="select2-search-choice-dolibarr noborderoncategories" style="background: #aaa">'.$obj->{$InfoFieldList[1]}.'</li>';
-							}
-						}
-					}
-				}
-				$value='<div class="select2-container-multi-dolibarr" style="width: 90%;"><ul class="select2-choices-dolibarr">'.implode(' ', $toprint).'</ul></div>';
-			} else {
-				dol_syslog(get_class($this) . '::showOutputField error ' . $this->db->lasterror(), LOG_WARNING);
-			}
-		}
-		elseif ($type == 'link')
-		{
-			$out='';
-
-			// Only if something to display (perf)
-			if ($value)		// If we have -1 here, pb is into sert, not into ouptu
-			{
-				$param_list=array_keys($param['options']);				// $param_list='ObjectName:classPath'
-
-				$InfoFieldList = explode(":", $param_list[0]);
-				$classname=$InfoFieldList[0];
-				$classpath=$InfoFieldList[1];
-				if (! empty($classpath))
-				{
-					dol_include_once($InfoFieldList[1]);
-					if ($classname && class_exists($classname))
-					{
-						$object = new $classname($this->db);
-						$object->fetch($value);
-						$value=$object->getNomUrl(3);
-					}
-				}
-				else
-				{
-					dol_syslog('Error bad setup of extrafield', LOG_WARNING);
-					return 'Error bad setup of extrafield';
-				}
-			}
-		}
-		elseif ($type == 'text')
-		{
-			$value=dol_htmlentitiesbr($value);
-		}
-		elseif ($type == 'html')
-		{
-			$value=dol_htmlentitiesbr($value);
-		}
-		elseif ($type == 'password')
-		{
-			$value=dol_trunc(preg_replace('/./i','*',$value), 8, 'right', 'UTF-8', 1);
-		}
-		else
-		{
-			$showsize=round($size);
-			if ($showsize > 48) $showsize=48;
-		}
-
-		//print $type.'-'.$size;
-		$out=$value;
-
-		return $out;
-	}
-
-	/**
-	 * Return tag to describe alignement to use for this extrafield
-	 *
-	 * @param   string	$key            		Key of attribute
-	 * @param	string	$extrafieldsobjectkey	If defined, use the new method to get extrafields data
-	 * @return	string							Formated value
-	 */
-	function getAlignFlag($key, $extrafieldsobjectkey='')
-	{
-		global $conf,$langs;
-
-		if (! empty($extrafieldsobjectkey)) $type=$this->attributes[$extrafieldsobjectkey]['type'][$key];
-		else $type=$this->attribute_type[$key];
-
-		$align='';
+        return $out;
+    }
+
+
+    /**
+     * Return HTML string to put an output field into a page
+     *
+     * @param   string	$key            		Key of attribute
+     * @param   string	$value          		Value to show
+     * @param	string	$moreparam				To add more parameters on html input tag (only checkbox use html input for output rendering)
+     * @param	string	$extrafieldsobjectkey	If defined (for example $object->table_element), use the new method to get extrafields data
+     * @return	string							Formated value
+     */
+    function showOutputField($key, $value, $moreparam='', $extrafieldsobjectkey='')
+    {
+        global $conf,$langs;
+
+        if (! empty($extrafieldsobjectkey))
+        {
+            $label=$this->attributes[$extrafieldsobjectkey]['label'][$key];
+            $type=$this->attributes[$extrafieldsobjectkey]['type'][$key];
+            $size=$this->attributes[$extrafieldsobjectkey]['size'][$key];
+            $default=$this->attributes[$extrafieldsobjectkey]['default'][$key];
+            $computed=$this->attributes[$extrafieldsobjectkey]['computed'][$key];
+            $unique=$this->attributes[$extrafieldsobjectkey]['unique'][$key];
+            $required=$this->attributes[$extrafieldsobjectkey]['required'][$key];
+            $param=$this->attributes[$extrafieldsobjectkey]['param'][$key];
+            $perms=dol_eval($this->attributes[$extrafieldsobjectkey]['perms'][$key], 1);
+            $langfile=$this->attributes[$extrafieldsobjectkey]['langfile'][$key];
+            $list=dol_eval($this->attributes[$extrafieldsobjectkey]['list'][$key], 1);
+            $help=$this->attributes[$extrafieldsobjectkey]['help'][$key];
+            $hidden=(empty($list) ? 1 : 0);		// If $list empty, we are sure it is hidden, otherwise we show. If it depends on mode (view/create/edit form or list, this must be filtered by caller)
+        }
+        else	// Old usage
+        {
+            $label=$this->attribute_label[$key];
+            $type=$this->attribute_type[$key];
+            $size=$this->attribute_size[$key];
+            $default=$this->attribute_default[$key];
+            $computed=$this->attribute_computed[$key];
+            $unique=$this->attribute_unique[$key];
+            $required=$this->attribute_required[$key];
+            $param=$this->attribute_param[$key];
+            $perms=dol_eval($this->attribute_perms[$key], 1);
+            $langfile=$this->attribute_langfile[$key];
+            $list=dol_eval($this->attribute_list[$key], 1);
+            $help='';	// Not supported with old syntax
+            $hidden=(empty($list) ? 1 : 0);		// If $list empty, we are sure it is hidden, otherwise we show. If it depends on mode (view/create/edit form or list, this must be filtered by caller)
+        }
+
+        if ($hidden) return '';		// This is a protection. If field is hidden, we should just not call this method.
 
+        // If field is a computed field, value must become result of compute
+        if ($computed)
+        {
+            // Make the eval of compute string
+            //var_dump($computed);
+            $value = dol_eval($computed, 1, 0);
+        }
+
+        $showsize=0;
         if ($type == 'date')
-		{
-			$align="center";
-		}
-		elseif ($type == 'datetime')
-		{
-			$align="center";
-		}
-		elseif ($type == 'int')
-		{
-			$align="right";
-		}
-		elseif ($type == 'double')
-		{
-			$align="right";
-		}
-		elseif ($type == 'boolean')
-		{
-			$align="center";
-		}
-		elseif ($type == 'radio')
-		{
-			$align="center";
-		}
-		elseif ($type == 'checkbox')
-		{
-			$align="center";
-		}
-		elseif ($type == 'price')
-		{
-			$align="right";
-		}
-
-		return $align;
-	}
-
-	/**
-	 * Return HTML string to print separator extrafield
-	 *
-	 * @param   string	$key            Key of attribute
-	 * @param	string	$object			Object
-	 * @return 	string					HTML code with line for separator
-	 */
-	function showSeparator($key, $object)
-	{
-		global $langs;
-
-		$out = '<tr class="trextrafieldseparator trextrafieldseparator'.$key.'"><td colspan="2"><strong>';
-		$out.= $langs->trans($this->attributes[$object->table_element]['label'][$key]);
-		$out.= '</strong></td></tr>';
-		return $out;
-	}
-
-	/**
-	 * Fill array_options property of object by extrafields value (using for data sent by forms)
-	 *
-	 * @param   array	$extralabels    $array of extrafields (@deprecated)
-	 * @param   object	$object         Object
-	 * @param	string	$onlykey		Only following key is filled. When we make update of only one extrafield ($action = 'update_extras'), calling page must must set this to avoid to have other extrafields being reset.
-	 * @return	int						1 if array_options set, 0 if no value, -1 if error (field required missing for example)
-	 */
-	function setOptionalsFromPost($extralabels, &$object, $onlykey='')
-	{
-		global $_POST, $langs;
-		$nofillrequired='';// For error when required field left blank
-		$error_field_required = array();
-
-		if (is_array($this->attributes[$object->table_element]['label'])) $extralabels=$this->attributes[$object->table_element]['label'];
-
-		if (is_array($extralabels))
-		{
-			// Get extra fields
-			foreach ($extralabels as $key => $value)
-			{
-				if (! empty($onlykey) && $key != $onlykey) continue;
-
-				$key_type = $this->attributes[$object->table_element]['type'][$key];
-				if ($key_type == 'separate') continue;
-
-				$enabled = 1;
-				if (isset($this->attributes[$object->table_element]['list'][$key]))
-				{
-					$enabled = dol_eval($this->attributes[$object->table_element]['list'][$key], 1);
-				}
-				$perms = 1;
-				if (isset($this->attributes[$object->table_element]['perms'][$key]))
-				{
-					$perms = dol_eval($this->attributes[$object->table_element]['perms'][$key], 1);
-				}
-				if (empty($enabled)) continue;
-				if (empty($perms)) continue;
-
-				if ($this->attributes[$object->table_element]['required'][$key])	// Value is required
-				{
-					// Check if empty without using GETPOST, value can be alpha, int, array, etc...
-					if ((! is_array($_POST["options_".$key]) && empty($_POST["options_".$key]) && $_POST["options_".$key] != '0')
-						|| (is_array($_POST["options_".$key]) && empty($_POST["options_".$key])))
-					{
-						//print 'ccc'.$value.'-'.$this->attributes[$object->table_element]['required'][$key];
-						$nofillrequired++;
-						$error_field_required[] = $langs->transnoentitiesnoconv($value);
-					}
-				}
-
-				if (in_array($key_type,array('date')))
-				{
-					// Clean parameters
-					// TODO GMT date in memory must be GMT so we should add gm=true in parameters
-					$value_key=dol_mktime(0, 0, 0, $_POST["options_".$key."month"], $_POST["options_".$key."day"], $_POST["options_".$key."year"]);
-				}
-				elseif (in_array($key_type,array('datetime')))
-				{
-					// Clean parameters
-					// TODO GMT date in memory must be GMT so we should add gm=true in parameters
-					$value_key=dol_mktime($_POST["options_".$key."hour"], $_POST["options_".$key."min"], 0, $_POST["options_".$key."month"], $_POST["options_".$key."day"], $_POST["options_".$key."year"]);
-				}
-				else if (in_array($key_type,array('checkbox','chkbxlst')))
-				{
-					$value_arr=GETPOST("options_".$key, 'array'); // check if an array
-					if (!empty($value_arr)) {
-						$value_key=implode($value_arr,',');
-					}else {
-						$value_key='';
-					}
-				}
-				else if (in_array($key_type,array('price','double')))
-				{
-					$value_arr=GETPOST("options_".$key, 'alpha');
-					$value_key=price2num($value_arr);
-				}
-				else
-				{
-					$value_key=GETPOST("options_".$key);
-				}
-
-				$object->array_options["options_".$key]=$value_key;
-			}
-
-			if ($nofillrequired) {
-				$langs->load('errors');
-				setEventMessages($langs->trans('ErrorFieldsRequired').' : '.implode(', ',$error_field_required), null, 'errors');
-				return -1;
-			}
-			else {
-				return 1;
-			}
-		}
-		else {
-			return 0;
-		}
-	}
-
-	/**
-	 * return array_options array of data of extrafields value of object sent by a search form
-	 *
-	 * @param  array|string		$extrafieldsobjectkey  	array of extrafields (old usage) or value of object->table_element (new usage)
-	 * @param  string			$keyprefix      		Prefix string to add into name and id of field (can be used to avoid duplicate names)
-	 * @param  string			$keysuffix      		Suffix string to add into name and id of field (can be used to avoid duplicate names)
-	 * @return array|int								array_options set or 0 if no value
-	 */
-	function getOptionalsFromPost($extrafieldsobjectkey, $keyprefix='', $keysuffix='')
-	{
-		global $_POST;
-
-		if (is_string($extrafieldsobjectkey) && is_array($this->attributes[$extrafieldsobjectkey]['label']))
-		{
-			$extralabels = $this->attributes[$extrafieldsobjectkey]['label'];
-		}
-		else
-		{
-			$extralabels = $extrafieldsobjectkey;
-		}
-
-		if (is_array($extralabels))
-		{
-			$array_options = array();
-
-			// Get extra fields
-			foreach ($extralabels as $key => $value)
-			{
-				$key_type = '';
-				if (is_string($extrafieldsobjectkey))
-				{
-					$key_type = $this->attributes[$extrafieldsobjectkey]['type'][$key];
-				}
-
-				if (in_array($key_type,array('date','datetime')))
-				{
-					// Clean parameters
-					$value_key=dol_mktime($_POST[$keysuffix."options_".$key.$keyprefix."hour"], $_POST[$keysuffix."options_".$key.$keyprefix."min"], 0, $_POST[$keysuffix."options_".$key.$keyprefix."month"], $_POST[$keysuffix."options_".$key.$keyprefix."day"], $_POST[$keysuffix."options_".$key.$keyprefix."year"]);
-				}
-				else if (in_array($key_type,array('checkbox', 'chkbxlst')))
-				{
-					$value_arr=GETPOST($keysuffix."options_".$key.$keyprefix);
-					// Make sure we get an array even if there's only one checkbox
-					$value_arr=(array) $value_arr;
-					$value_key=implode(',', $value_arr);
-				}
-				else if (in_array($key_type,array('price','double')))
-				{
-					$value_arr=GETPOST($keysuffix."options_".$key.$keyprefix);
-					$value_key=price2num($value_arr);
-				}
-				else
-				{
-					$value_key=GETPOST($keysuffix."options_".$key.$keyprefix);
-				}
-
-				$array_options[$keysuffix."options_".$key]=$value_key;	// No keyprefix here. keyprefix is used only for read.
-			}
-
-			return $array_options;
-		}
-
-		return 0;
-	}
+        {
+            $showsize=10;
+            $value=dol_print_date($value, 'day');
+        }
+        elseif ($type == 'datetime')
+        {
+            $showsize=19;
+            $value=dol_print_date($value, 'dayhour');
+        }
+        elseif ($type == 'int')
+        {
+            $showsize=10;
+        }
+        elseif ($type == 'double')
+        {
+            if (!empty($value)) {
+                $value=price($value);
+            }
+        }
+        elseif ($type == 'boolean')
+        {
+            $checked='';
+            if (!empty($value)) {
+                $checked=' checked ';
+            }
+            $value='<input type="checkbox" '.$checked.' '.($moreparam?$moreparam:'').' readonly disabled>';
+        }
+        elseif ($type == 'mail')
+        {
+            $value=dol_print_email($value, 0, 0, 0, 64, 1, 1);
+        }
+        elseif ($type == 'url')
+        {
+            $value=dol_print_url($value,'_blank',32,1);
+        }
+        elseif ($type == 'phone')
+        {
+            $value=dol_print_phone($value, '', 0, 0, '', '&nbsp;', 1);
+        }
+        elseif ($type == 'price')
+        {
+            $value=price($value, 0, $langs, 0, 0, -1, $conf->currency);
+        }
+        elseif ($type == 'select')
+        {
+            if ($langfile && $param['options'][$value]) $value=$langs->trans($param['options'][$value]);
+            else $value=$param['options'][$value];
+        }
+        elseif ($type == 'sellist')
+        {
+            $param_list=array_keys($param['options']);
+            $InfoFieldList = explode(":", $param_list[0]);
+
+            $selectkey="rowid";
+            $keyList='rowid';
+
+            if (count($InfoFieldList)>=3)
+            {
+                $selectkey = $InfoFieldList[2];
+                $keyList=$InfoFieldList[2].' as rowid';
+            }
+
+            $fields_label = explode('|',$InfoFieldList[1]);
+            if(is_array($fields_label)) {
+                $keyList .=', ';
+                $keyList .= implode(', ', $fields_label);
+            }
+
+            $sql = 'SELECT '.$keyList;
+            $sql.= ' FROM '.MAIN_DB_PREFIX .$InfoFieldList[0];
+            if (strpos($InfoFieldList[4], 'extra')!==false)
+            {
+                $sql.= ' as main';
+            }
+            if ($selectkey=='rowid' && empty($value)) {
+                $sql.= " WHERE ".$selectkey."=0";
+            } elseif ($selectkey=='rowid') {
+                $sql.= " WHERE ".$selectkey."=".$this->db->escape($value);
+            }else {
+                $sql.= " WHERE ".$selectkey."='".$this->db->escape($value)."'";
+            }
+
+            //$sql.= ' AND entity = '.$conf->entity;
+
+            dol_syslog(get_class($this).':showOutputField:$type=sellist', LOG_DEBUG);
+            $resql = $this->db->query($sql);
+            if ($resql)
+            {
+                $value='';	// value was used, so now we reste it to use it to build final output
+
+                $obj = $this->db->fetch_object($resql);
+
+                // Several field into label (eq table:code|libelle:rowid)
+                $fields_label = explode('|',$InfoFieldList[1]);
+
+                if(is_array($fields_label) && count($fields_label)>1)
+                {
+                    foreach ($fields_label as $field_toshow)
+                    {
+                        $translabel='';
+                        if (!empty($obj->$field_toshow)) {
+                            $translabel=$langs->trans($obj->$field_toshow);
+                        }
+                        if ($translabel!=$field_toshow) {
+                            $value.=dol_trunc($translabel,18).' ';
+                        }else {
+                            $value.=$obj->$field_toshow.' ';
+                        }
+                    }
+                }
+                else
+                {
+                    $translabel='';
+                    if (!empty($obj->{$InfoFieldList[1]})) {
+                        $translabel=$langs->trans($obj->{$InfoFieldList[1]});
+                    }
+                    if ($translabel!=$obj->{$InfoFieldList[1]}) {
+                        $value=dol_trunc($translabel,18);
+                    }else {
+                        $value=$obj->{$InfoFieldList[1]};
+                    }
+                }
+            }
+            else dol_syslog(get_class($this).'::showOutputField error '.$this->db->lasterror(), LOG_WARNING);
+        }
+        elseif ($type == 'radio')
+        {
+            $value=$param['options'][$value];
+        }
+        elseif ($type == 'checkbox')
+        {
+            $value_arr=explode(',',$value);
+            $value='';
+            $toprint=array();
+            if (is_array($value_arr))
+            {
+                foreach ($value_arr as $keyval=>$valueval) {
+                    $toprint[]='<li class="select2-search-choice-dolibarr noborderoncategories" style="background: #aaa">'.$param['options'][$valueval].'</li>';
+                }
+            }
+            $value='<div class="select2-container-multi-dolibarr" style="width: 90%;"><ul class="select2-choices-dolibarr">'.implode(' ', $toprint).'</ul></div>';
+        }
+        elseif ($type == 'chkbxlst')
+        {
+            $value_arr = explode(',', $value);
+
+            $param_list = array_keys($param['options']);
+            $InfoFieldList = explode(":", $param_list[0]);
+
+            $selectkey = "rowid";
+            $keyList = 'rowid';
+
+            if (count($InfoFieldList) >= 3) {
+                $selectkey = $InfoFieldList[2];
+                $keyList = $InfoFieldList[2] . ' as rowid';
+            }
+
+            $fields_label = explode('|', $InfoFieldList[1]);
+            if (is_array($fields_label)) {
+                $keyList .= ', ';
+                $keyList .= implode(', ', $fields_label);
+            }
+
+            $sql = 'SELECT ' . $keyList;
+            $sql .= ' FROM ' . MAIN_DB_PREFIX . $InfoFieldList[0];
+            if (strpos($InfoFieldList[4], 'extra') !== false) {
+                $sql .= ' as main';
+            }
+            // $sql.= " WHERE ".$selectkey."='".$this->db->escape($value)."'";
+            // $sql.= ' AND entity = '.$conf->entity;
+
+            dol_syslog(get_class($this) . ':showOutputField:$type=chkbxlst',LOG_DEBUG);
+            $resql = $this->db->query($sql);
+            if ($resql) {
+                $value = ''; // value was used, so now we reste it to use it to build final output
+                $toprint=array();
+                while ( $obj = $this->db->fetch_object($resql) ) {
+
+                    // Several field into label (eq table:code|libelle:rowid)
+                    $fields_label = explode('|', $InfoFieldList[1]);
+                    if (is_array($value_arr) && in_array($obj->rowid, $value_arr)) {
+                        if (is_array($fields_label) && count($fields_label) > 1) {
+                            foreach ( $fields_label as $field_toshow ) {
+                                $translabel = '';
+                                if (! empty($obj->$field_toshow)) {
+                                    $translabel = $langs->trans($obj->$field_toshow);
+                                }
+                                if ($translabel != $field_toshow) {
+                                    $toprint[]='<li class="select2-search-choice-dolibarr noborderoncategories" style="background: #aaa">'.dol_trunc($translabel, 18).'</li>';
+                                } else {
+                                    $toprint[]='<li class="select2-search-choice-dolibarr noborderoncategories" style="background: #aaa">'.$obj->$field_toshow.'</li>';
+                                }
+                            }
+                        } else {
+                            $translabel = '';
+                            if (! empty($obj->{$InfoFieldList[1]})) {
+                                $translabel = $langs->trans($obj->{$InfoFieldList[1]});
+                            }
+                            if ($translabel != $obj->{$InfoFieldList[1]}) {
+                                $toprint[]='<li class="select2-search-choice-dolibarr noborderoncategories" style="background: #aaa">'.dol_trunc($translabel, 18).'</li>';
+                            } else {
+                                $toprint[]='<li class="select2-search-choice-dolibarr noborderoncategories" style="background: #aaa">'.$obj->{$InfoFieldList[1]}.'</li>';
+                            }
+                        }
+                    }
+                }
+                $value='<div class="select2-container-multi-dolibarr" style="width: 90%;"><ul class="select2-choices-dolibarr">'.implode(' ', $toprint).'</ul></div>';
+            } else {
+                dol_syslog(get_class($this) . '::showOutputField error ' . $this->db->lasterror(), LOG_WARNING);
+            }
+        }
+        elseif ($type == 'link')
+        {
+            $out='';
+
+            // Only if something to display (perf)
+            if ($value)		// If we have -1 here, pb is into sert, not into ouptu
+            {
+                $param_list=array_keys($param['options']);				// $param_list='ObjectName:classPath'
+
+                $InfoFieldList = explode(":", $param_list[0]);
+                $classname=$InfoFieldList[0];
+                $classpath=$InfoFieldList[1];
+                if (! empty($classpath))
+                {
+                    dol_include_once($InfoFieldList[1]);
+                    if ($classname && class_exists($classname))
+                    {
+                        $object = new $classname($this->db);
+                        $object->fetch($value);
+                        $value=$object->getNomUrl(3);
+                    }
+                }
+                else
+                {
+                    dol_syslog('Error bad setup of extrafield', LOG_WARNING);
+                    return 'Error bad setup of extrafield';
+                }
+            }
+        }
+        elseif ($type == 'text')
+        {
+            $value=dol_htmlentitiesbr($value);
+        }
+        elseif ($type == 'html')
+        {
+            $value=dol_htmlentitiesbr($value);
+        }
+        elseif ($type == 'password')
+        {
+            $value=dol_trunc(preg_replace('/./i','*',$value), 8, 'right', 'UTF-8', 1);
+        }
+        else
+        {
+            $showsize=round($size);
+            if ($showsize > 48) $showsize=48;
+        }
+
+        //print $type.'-'.$size;
+        $out=$value;
+
+        return $out;
+    }
+
+    /**
+     * Return tag to describe alignement to use for this extrafield
+     *
+     * @param   string	$key            		Key of attribute
+     * @param	string	$extrafieldsobjectkey	If defined, use the new method to get extrafields data
+     * @return	string							Formated value
+     */
+    function getAlignFlag($key, $extrafieldsobjectkey='')
+    {
+        global $conf,$langs;
+
+        if (! empty($extrafieldsobjectkey)) $type=$this->attributes[$extrafieldsobjectkey]['type'][$key];
+        else $type=$this->attribute_type[$key];
+
+        $align='';
+
+        if ($type == 'date')
+        {
+            $align="center";
+        }
+        elseif ($type == 'datetime')
+        {
+            $align="center";
+        }
+        elseif ($type == 'int')
+        {
+            $align="right";
+        }
+        elseif ($type == 'double')
+        {
+            $align="right";
+        }
+        elseif ($type == 'boolean')
+        {
+            $align="center";
+        }
+        elseif ($type == 'radio')
+        {
+            $align="center";
+        }
+        elseif ($type == 'checkbox')
+        {
+            $align="center";
+        }
+        elseif ($type == 'price')
+        {
+            $align="right";
+        }
+
+        return $align;
+    }
+
+    /**
+     * Return HTML string to print separator extrafield
+     *
+     * @param   string	$key            Key of attribute
+     * @param	string	$object			Object
+     * @return 	string					HTML code with line for separator
+     */
+    function showSeparator($key, $object)
+    {
+        global $langs;
+
+        $out = '<tr class="trextrafieldseparator trextrafieldseparator'.$key.'"><td colspan="2"><strong>';
+        $out.= $langs->trans($this->attributes[$object->table_element]['label'][$key]);
+        $out.= '</strong></td></tr>';
+        return $out;
+    }
+
+    /**
+     * Fill array_options property of object by extrafields value (using for data sent by forms)
+     *
+     * @param   array	$extralabels    $array of extrafields (@deprecated)
+     * @param   object	$object         Object
+     * @param	string	$onlykey		Only following key is filled. When we make update of only one extrafield ($action = 'update_extras'), calling page must must set this to avoid to have other extrafields being reset.
+     * @return	int						1 if array_options set, 0 if no value, -1 if error (field required missing for example)
+     */
+    function setOptionalsFromPost($extralabels, &$object, $onlykey='')
+    {
+        global $_POST, $langs;
+        $nofillrequired='';// For error when required field left blank
+        $error_field_required = array();
+
+        if (is_array($this->attributes[$object->table_element]['label'])) $extralabels=$this->attributes[$object->table_element]['label'];
+
+        if (is_array($extralabels))
+        {
+            // Get extra fields
+            foreach ($extralabels as $key => $value)
+            {
+                if (! empty($onlykey) && $key != $onlykey) continue;
+
+                $key_type = $this->attributes[$object->table_element]['type'][$key];
+                if ($key_type == 'separate') continue;
+
+                $enabled = 1;
+                if (isset($this->attributes[$object->table_element]['list'][$key]))
+                {
+                    $enabled = dol_eval($this->attributes[$object->table_element]['list'][$key], 1);
+                }
+                $perms = 1;
+                if (isset($this->attributes[$object->table_element]['perms'][$key]))
+                {
+                    $perms = dol_eval($this->attributes[$object->table_element]['perms'][$key], 1);
+                }
+                if (empty($enabled)) continue;
+                if (empty($perms)) continue;
+
+                if ($this->attributes[$object->table_element]['required'][$key])	// Value is required
+                {
+                    // Check if empty without using GETPOST, value can be alpha, int, array, etc...
+                    if ((! is_array($_POST["options_".$key]) && empty($_POST["options_".$key]) && $_POST["options_".$key] != '0')
+                        || (is_array($_POST["options_".$key]) && empty($_POST["options_".$key])))
+                    {
+                        //print 'ccc'.$value.'-'.$this->attributes[$object->table_element]['required'][$key];
+                        $nofillrequired++;
+                        $error_field_required[] = $langs->transnoentitiesnoconv($value);
+                    }
+                }
+
+                if (in_array($key_type,array('date')))
+                {
+                    // Clean parameters
+                    // TODO GMT date in memory must be GMT so we should add gm=true in parameters
+                    $value_key=dol_mktime(0, 0, 0, $_POST["options_".$key."month"], $_POST["options_".$key."day"], $_POST["options_".$key."year"]);
+                }
+                elseif (in_array($key_type,array('datetime')))
+                {
+                    // Clean parameters
+                    // TODO GMT date in memory must be GMT so we should add gm=true in parameters
+                    $value_key=dol_mktime($_POST["options_".$key."hour"], $_POST["options_".$key."min"], 0, $_POST["options_".$key."month"], $_POST["options_".$key."day"], $_POST["options_".$key."year"]);
+                }
+                else if (in_array($key_type,array('checkbox','chkbxlst')))
+                {
+                    $value_arr=GETPOST("options_".$key, 'array'); // check if an array
+                    if (!empty($value_arr)) {
+                        $value_key=implode($value_arr,',');
+                    }else {
+                        $value_key='';
+                    }
+                }
+                else if (in_array($key_type,array('price','double')))
+                {
+                    $value_arr=GETPOST("options_".$key, 'alpha');
+                    $value_key=price2num($value_arr);
+                }
+                else
+                {
+                    $value_key=GETPOST("options_".$key);
+                }
+
+                $object->array_options["options_".$key]=$value_key;
+            }
+
+            if ($nofillrequired) {
+                $langs->load('errors');
+                setEventMessages($langs->trans('ErrorFieldsRequired').' : '.implode(', ',$error_field_required), null, 'errors');
+                return -1;
+            }
+            else {
+                return 1;
+            }
+        }
+        else {
+            return 0;
+        }
+    }
+
+    /**
+     * return array_options array of data of extrafields value of object sent by a search form
+     *
+     * @param  array|string		$extrafieldsobjectkey  	array of extrafields (old usage) or value of object->table_element (new usage)
+     * @param  string			$keyprefix      		Prefix string to add into name and id of field (can be used to avoid duplicate names)
+     * @param  string			$keysuffix      		Suffix string to add into name and id of field (can be used to avoid duplicate names)
+     * @return array|int								array_options set or 0 if no value
+     */
+    function getOptionalsFromPost($extrafieldsobjectkey, $keyprefix='', $keysuffix='')
+    {
+        global $_POST;
+
+        if (is_string($extrafieldsobjectkey) && is_array($this->attributes[$extrafieldsobjectkey]['label']))
+        {
+            $extralabels = $this->attributes[$extrafieldsobjectkey]['label'];
+        }
+        else
+        {
+            $extralabels = $extrafieldsobjectkey;
+        }
+
+        if (is_array($extralabels))
+        {
+            $array_options = array();
+
+            // Get extra fields
+            foreach ($extralabels as $key => $value)
+            {
+                $key_type = '';
+                if (is_string($extrafieldsobjectkey))
+                {
+                    $key_type = $this->attributes[$extrafieldsobjectkey]['type'][$key];
+                }
+
+                if (in_array($key_type,array('date','datetime')))
+                {
+                    // Clean parameters
+                    $value_key=dol_mktime($_POST[$keysuffix."options_".$key.$keyprefix."hour"], $_POST[$keysuffix."options_".$key.$keyprefix."min"], 0, $_POST[$keysuffix."options_".$key.$keyprefix."month"], $_POST[$keysuffix."options_".$key.$keyprefix."day"], $_POST[$keysuffix."options_".$key.$keyprefix."year"]);
+                }
+                else if (in_array($key_type,array('checkbox', 'chkbxlst')))
+                {
+                    $value_arr=GETPOST($keysuffix."options_".$key.$keyprefix);
+                    // Make sure we get an array even if there's only one checkbox
+                    $value_arr=(array) $value_arr;
+                    $value_key=implode(',', $value_arr);
+                }
+                else if (in_array($key_type,array('price','double')))
+                {
+                    $value_arr=GETPOST($keysuffix."options_".$key.$keyprefix);
+                    $value_key=price2num($value_arr);
+                }
+                else
+                {
+                    $value_key=GETPOST($keysuffix."options_".$key.$keyprefix);
+                }
+
+                $array_options[$keysuffix."options_".$key]=$value_key;	// No keyprefix here. keyprefix is used only for read.
+            }
+
+            return $array_options;
+        }
+
+        return 0;
+    }
 }

Spacing +668 added lines, -668 removed lines

@@ -94,12 +94,12 @@ 
 	/**
 	 * @var string Error code (or message)
 	 */
-	public $error='';
+	public $error = '';
 
 	var $errno;
 
 
-	public static $type2label=array(
+	public static $type2label = array(
 	'varchar'=>'String',
 	'text'=>'TextLong',
 	'html'=>'HtmlText',
@@ -171,29 +171,29 @@ 
 	 *  @param  string  		$enabled  		 	Condition to have the field enabled or not
 	 *  @return int      							<=0 if KO, >0 if OK
 	 */
-	function addExtraField($attrname, $label, $type, $pos, $size, $elementtype, $unique=0, $required=0, $default_value='', $param='', $alwayseditable=0, $perms='', $list='-1', $help='', $computed='', $entity='', $langfile='', $enabled='1')
+	function addExtraField($attrname, $label, $type, $pos, $size, $elementtype, $unique = 0, $required = 0, $default_value = '', $param = '', $alwayseditable = 0, $perms = '', $list = '-1', $help = '', $computed = '', $entity = '', $langfile = '', $enabled = '1')
 	{
 		if (empty($attrname)) return -1;
 		if (empty($label)) return -1;
 
-		if ($elementtype == 'thirdparty') $elementtype='societe';
-		if ($elementtype == 'contact') $elementtype='socpeople';
+		if ($elementtype == 'thirdparty') $elementtype = 'societe';
+		if ($elementtype == 'contact') $elementtype = 'socpeople';
 
 		// Create field into database except for separator type which is not stored in database
 		if ($type != 'separate')
 		{
-			$result=$this->create($attrname, $type, $size, $elementtype, $unique, $required, $default_value, $param, $perms, $list, $computed, $help);
+			$result = $this->create($attrname, $type, $size, $elementtype, $unique, $required, $default_value, $param, $perms, $list, $computed, $help);
 		}
-		$err1=$this->errno;
+		$err1 = $this->errno;
 		if ($result > 0 || $err1 == 'DB_ERROR_COLUMN_ALREADY_EXISTS' || $type == 'separate')
 		{
 			// Add declaration of field into table
-			$result2=$this->create_label($attrname, $label, $type, $pos, $size, $elementtype, $unique, $required, $param, $alwayseditable, $perms, $list, $help, $default_value, $computed, $entity, $langfile, $enabled);
-			$err2=$this->errno;
+			$result2 = $this->create_label($attrname, $label, $type, $pos, $size, $elementtype, $unique, $required, $param, $alwayseditable, $perms, $list, $help, $default_value, $computed, $entity, $langfile, $enabled);
+			$err2 = $this->errno;
 			if ($result2 > 0 || ($err1 == 'DB_ERROR_COLUMN_ALREADY_EXISTS' && $err2 == 'DB_ERROR_RECORD_ALREADY_EXISTS'))
 			{
-				$this->error='';
-				$this->errno=0;
+				$this->error = '';
+				$this->errno = 0;
 				return 1;
 			}
 			else return -2;
@@ -221,69 +221,69 @@ 
 	 *  @param  string  $computed           Computed value
 	 *  @return int      	           		<=0 if KO, >0 if OK
 	 */
-	private function create($attrname, $type='varchar', $length=255, $elementtype='member', $unique=0, $required=0, $default_value='',$param='', $perms='', $list='0', $computed='')
+	private function create($attrname, $type = 'varchar', $length = 255, $elementtype = 'member', $unique = 0, $required = 0, $default_value = '', $param = '', $perms = '', $list = '0', $computed = '')
 	{
-		if ($elementtype == 'thirdparty') $elementtype='societe';
-		if ($elementtype == 'contact') $elementtype='socpeople';
-
-		$table=$elementtype.'_extrafields';
-		if ($elementtype == 'categorie') $table='categories_extrafields';
-
-		if (! empty($attrname) && preg_match("/^\w[a-zA-Z0-9_]*$/",$attrname) && ! is_numeric($attrname))
-		{
-			if ($type=='boolean') {
-				$typedb='int';
-				$lengthdb='1';
-			} elseif($type=='price') {
-				$typedb='double';
-				$lengthdb='24,8';
-			} elseif($type=='phone') {
-				$typedb='varchar';
-				$lengthdb='20';
-			} elseif($type=='mail') {
-				$typedb='varchar';
-				$lengthdb='128';
-			} elseif($type=='url') {
-				$typedb='varchar';
-				$lengthdb='255';
-			} elseif (($type=='select') || ($type=='sellist') || ($type=='radio') ||($type=='checkbox') ||($type=='chkbxlst')){
-				$typedb='varchar';
-				$lengthdb='255';
-			} elseif ($type=='link') {
-				$typedb='int';
-				$lengthdb='11';
-			} elseif ($type=='html') {
-				$typedb='text';
-				$lengthdb=$length;
-			} elseif($type=='password') {
-				$typedb='varchar';
-				$lengthdb='128';
+		if ($elementtype == 'thirdparty') $elementtype = 'societe';
+		if ($elementtype == 'contact') $elementtype = 'socpeople';
+
+		$table = $elementtype.'_extrafields';
+		if ($elementtype == 'categorie') $table = 'categories_extrafields';
+
+		if (!empty($attrname) && preg_match("/^\w[a-zA-Z0-9_]*$/", $attrname) && !is_numeric($attrname))
+		{
+			if ($type == 'boolean') {
+				$typedb = 'int';
+				$lengthdb = '1';
+			} elseif ($type == 'price') {
+				$typedb = 'double';
+				$lengthdb = '24,8';
+			} elseif ($type == 'phone') {
+				$typedb = 'varchar';
+				$lengthdb = '20';
+			} elseif ($type == 'mail') {
+				$typedb = 'varchar';
+				$lengthdb = '128';
+			} elseif ($type == 'url') {
+				$typedb = 'varchar';
+				$lengthdb = '255';
+			} elseif (($type == 'select') || ($type == 'sellist') || ($type == 'radio') || ($type == 'checkbox') || ($type == 'chkbxlst')) {
+				$typedb = 'varchar';
+				$lengthdb = '255';
+			} elseif ($type == 'link') {
+				$typedb = 'int';
+				$lengthdb = '11';
+			} elseif ($type == 'html') {
+				$typedb = 'text';
+				$lengthdb = $length;
+			} elseif ($type == 'password') {
+				$typedb = 'varchar';
+				$lengthdb = '128';
 			} else {
-				$typedb=$type;
-				$lengthdb=$length;
-				if ($type == 'varchar' && empty($lengthdb)) $lengthdb='255';
+				$typedb = $type;
+				$lengthdb = $length;
+				if ($type == 'varchar' && empty($lengthdb)) $lengthdb = '255';
 			}
 			$field_desc = array(
 				'type'=>$typedb,
 				'value'=>$lengthdb,
-				'null'=>($required?'NOT NULL':'NULL'),
+				'null'=>($required ? 'NOT NULL' : 'NULL'),
 				'default' => $default_value
 			);
 
-			$result=$this->db->DDLAddField(MAIN_DB_PREFIX.$table, $attrname, $field_desc);
+			$result = $this->db->DDLAddField(MAIN_DB_PREFIX.$table, $attrname, $field_desc);
 			if ($result > 0)
 			{
 				if ($unique)
 				{
-					$sql="ALTER TABLE ".MAIN_DB_PREFIX.$table." ADD UNIQUE INDEX uk_".$table."_".$attrname." (".$attrname.")";
-					$resql=$this->db->query($sql,1,'dml');
+					$sql = "ALTER TABLE ".MAIN_DB_PREFIX.$table." ADD UNIQUE INDEX uk_".$table."_".$attrname." (".$attrname.")";
+					$resql = $this->db->query($sql, 1, 'dml');
 				}
 				return 1;
 			}
 			else
 			{
-				$this->error=$this->db->lasterror();
-				$this->errno=$this->db->lasterrno();
+				$this->error = $this->db->lasterror();
+				$this->errno = $this->db->lasterrno();
 				return -1;
 			}
 		}
@@ -317,22 +317,22 @@ 
 	 *  @param  string  		$enabled  		Condition to have the field enabled or not
 	 *  @return	int								<=0 if KO, >0 if OK
 	 */
-	private function create_label($attrname, $label='', $type='', $pos=0, $size=0, $elementtype='member', $unique=0, $required=0, $param='', $alwayseditable=0, $perms='', $list='-1', $help='', $default='', $computed='',$entity='', $langfile='', $enabled='1')
+	private function create_label($attrname, $label = '', $type = '', $pos = 0, $size = 0, $elementtype = 'member', $unique = 0, $required = 0, $param = '', $alwayseditable = 0, $perms = '', $list = '-1', $help = '', $default = '', $computed = '', $entity = '', $langfile = '', $enabled = '1')
 	{
         // phpcs:enable
-		global $conf,$user;
+		global $conf, $user;
 
-		if ($elementtype == 'thirdparty') $elementtype='societe';
-		if ($elementtype == 'contact') $elementtype='socpeople';
+		if ($elementtype == 'thirdparty') $elementtype = 'societe';
+		if ($elementtype == 'contact') $elementtype = 'socpeople';
 
 		// Clean parameters
-		if (empty($pos)) $pos=0;
-		if (empty($list)) $list='0';
-		if (empty($required)) $required=0;
-		if (empty($unique)) $unique=0;
-		if (empty($alwayseditable)) $alwayseditable=0;
+		if (empty($pos)) $pos = 0;
+		if (empty($list)) $list = '0';
+		if (empty($required)) $required = 0;
+		if (empty($unique)) $unique = 0;
+		if (empty($alwayseditable)) $alwayseditable = 0;
 
-		if (! empty($attrname) && preg_match("/^\w[a-zA-Z0-9-_]*$/",$attrname) && ! is_numeric($attrname))
+		if (!empty($attrname) && preg_match("/^\w[a-zA-Z0-9-_]*$/", $attrname) && !is_numeric($attrname))
 		{
 			if (is_array($param) && count($param) > 0)
 			{
@@ -344,54 +344,54 @@ 
 			}
 			else
 			{
-				$params='';
+				$params = '';
 			}
 
 			$sql = "INSERT INTO ".MAIN_DB_PREFIX."extrafields(";
-			$sql.= " name,";
-			$sql.= " label,";
-			$sql.= " type,";
-			$sql.= " pos,";
-			$sql.= " size,";
-			$sql.= " entity,";
-			$sql.= " elementtype,";
-			$sql.= " fieldunique,";
-			$sql.= " fieldrequired,";
-			$sql.= " param,";
-			$sql.= " alwayseditable,";
-			$sql.= " perms,";
-			$sql.= " langs,";
-			$sql.= " list,";
-			$sql.= " fielddefault,";
-			$sql.= " fieldcomputed,";
-			$sql.= " fk_user_author,";
-			$sql.= " fk_user_modif,";
-			$sql.= " datec,";
-			$sql.= " enabled,";
-			$sql.= " help";
-			$sql.= " )";
-			$sql.= " VALUES('".$attrname."',";
-			$sql.= " '".$this->db->escape($label)."',";
-			$sql.= " '".$this->db->escape($type)."',";
-			$sql.= " ".$pos.",";
-			$sql.= " '".$this->db->escape($size)."',";
-			$sql.= " ".($entity===''?$conf->entity:$entity).",";
-			$sql.= " '".$this->db->escape($elementtype)."',";
-			$sql.= " ".$unique.",";
-			$sql.= " ".$required.",";
-			$sql.= " '".$this->db->escape($params)."',";
-			$sql.= " ".$alwayseditable.",";
-			$sql.= " ".($perms?"'".$this->db->escape($perms)."'":"null").",";
-			$sql.= " ".($langfile?"'".$this->db->escape($langfile)."'":"null").",";
-			$sql.= " '".$this->db->escape($list)."',";
-			$sql.= " ".($default?"'".$this->db->escape($default)."'":"null").",";
-			$sql.= " ".($computed?"'".$this->db->escape($computed)."'":"null").",";
-			$sql .= " " . (is_object($user) ? $user->id : 0). ",";
-			$sql .= " " . (is_object($user) ? $user->id : 0). ",";
-			$sql .= "'" . $this->db->idate(dol_now()) . "',";
-			$sql.= " ".($enabled?"'".$this->db->escape($enabled)."'":"1").",";
-			$sql.= " ".($help?"'".$this->db->escape($help)."'":"null");
-			$sql.=')';
+			$sql .= " name,";
+			$sql .= " label,";
+			$sql .= " type,";
+			$sql .= " pos,";
+			$sql .= " size,";
+			$sql .= " entity,";
+			$sql .= " elementtype,";
+			$sql .= " fieldunique,";
+			$sql .= " fieldrequired,";
+			$sql .= " param,";
+			$sql .= " alwayseditable,";
+			$sql .= " perms,";
+			$sql .= " langs,";
+			$sql .= " list,";
+			$sql .= " fielddefault,";
+			$sql .= " fieldcomputed,";
+			$sql .= " fk_user_author,";
+			$sql .= " fk_user_modif,";
+			$sql .= " datec,";
+			$sql .= " enabled,";
+			$sql .= " help";
+			$sql .= " )";
+			$sql .= " VALUES('".$attrname."',";
+			$sql .= " '".$this->db->escape($label)."',";
+			$sql .= " '".$this->db->escape($type)."',";
+			$sql .= " ".$pos.",";
+			$sql .= " '".$this->db->escape($size)."',";
+			$sql .= " ".($entity === '' ? $conf->entity : $entity).",";
+			$sql .= " '".$this->db->escape($elementtype)."',";
+			$sql .= " ".$unique.",";
+			$sql .= " ".$required.",";
+			$sql .= " '".$this->db->escape($params)."',";
+			$sql .= " ".$alwayseditable.",";
+			$sql .= " ".($perms ? "'".$this->db->escape($perms)."'" : "null").",";
+			$sql .= " ".($langfile ? "'".$this->db->escape($langfile)."'" : "null").",";
+			$sql .= " '".$this->db->escape($list)."',";
+			$sql .= " ".($default ? "'".$this->db->escape($default)."'" : "null").",";
+			$sql .= " ".($computed ? "'".$this->db->escape($computed)."'" : "null").",";
+			$sql .= " ".(is_object($user) ? $user->id : 0).",";
+			$sql .= " ".(is_object($user) ? $user->id : 0).",";
+			$sql .= "'".$this->db->idate(dol_now())."',";
+			$sql .= " ".($enabled ? "'".$this->db->escape($enabled)."'" : "1").",";
+			$sql .= " ".($help ? "'".$this->db->escape($help)."'" : "null");
+			$sql .= ')';
 
 			dol_syslog(get_class($this)."::create_label", LOG_DEBUG);
 			if ($this->db->query($sql))
@@ -400,8 +400,8 @@ 
 			}
 			else
 			{
-				$this->error=$this->db->lasterror();
-				$this->errno=$this->db->lasterrno();
+				$this->error = $this->db->lasterror();
+				$this->errno = $this->db->lasterrno();
 				return -1;
 			}
 		}
@@ -414,31 +414,31 @@ 
 	 *  @param  string	$elementtype    Element type ('member', 'product', 'thirdparty', 'contact', ...)
 	 *  @return int              		< 0 if KO, 0 if nothing is done, 1 if OK
 	 */
-	function delete($attrname, $elementtype='member')
+	function delete($attrname, $elementtype = 'member')
 	{
-		if ($elementtype == 'thirdparty') $elementtype='societe';
-		if ($elementtype == 'contact') $elementtype='socpeople';
+		if ($elementtype == 'thirdparty') $elementtype = 'societe';
+		if ($elementtype == 'contact') $elementtype = 'socpeople';
 
-		$table=$elementtype.'_extrafields';
-		if ($elementtype == 'categorie') $table='categories_extrafields';
+		$table = $elementtype.'_extrafields';
+		if ($elementtype == 'categorie') $table = 'categories_extrafields';
 
-		$error=0;
+		$error = 0;
 
-		if (! empty($attrname) && preg_match("/^\w[a-zA-Z0-9-_]*$/",$attrname))
+		if (!empty($attrname) && preg_match("/^\w[a-zA-Z0-9-_]*$/", $attrname))
 		{
-			$result=$this->delete_label($attrname,$elementtype);
+			$result = $this->delete_label($attrname, $elementtype);
 			if ($result < 0)
 			{
-			    $this->error=$this->db->lasterror();
+			    $this->error = $this->db->lasterror();
 			    $error++;
 			}
 
-			if (! $error)
+			if (!$error)
 			{
         		$sql = "SELECT COUNT(rowid) as nb";
-        		$sql.= " FROM ".MAIN_DB_PREFIX."extrafields";
-        		$sql.= " WHERE elementtype = '".$elementtype."'";
-        		$sql.= " AND name = '".$attrname."'";
+        		$sql .= " FROM ".MAIN_DB_PREFIX."extrafields";
+        		$sql .= " WHERE elementtype = '".$elementtype."'";
+        		$sql .= " AND name = '".$attrname."'";
         		//$sql.= " AND entity IN (0,".$conf->entity.")";      Do not test on entity here. We want to see if there is still on field remaning in other entities before deleting field in table
                 $resql = $this->db->query($sql);
                 if ($resql)
@@ -446,10 +446,10 @@ 
                     $obj = $this->db->fetch_object($resql);
                     if ($obj->nb <= 0)
                     {
-            			$result=$this->db->DDLDropField(MAIN_DB_PREFIX.$table,$attrname);	// This also drop the unique key
+            			$result = $this->db->DDLDropField(MAIN_DB_PREFIX.$table, $attrname); // This also drop the unique key
             			if ($result < 0)
             			{
-            				$this->error=$this->db->lasterror();
+            				$this->error = $this->db->lasterror();
             				$error++;
             			}
                     }
@@ -472,23 +472,23 @@ 
 	 *  @param  string	$elementtype        Element type ('member', 'product', 'thirdparty', ...)
 	 *  @return int              			< 0 if KO, 0 if nothing is done, 1 if OK
 	 */
-	private function delete_label($attrname, $elementtype='member')
+	private function delete_label($attrname, $elementtype = 'member')
 	{
         // phpcs:enable
 		global $conf;
 
-		if ($elementtype == 'thirdparty') $elementtype='societe';
-		if ($elementtype == 'contact') $elementtype='socpeople';
+		if ($elementtype == 'thirdparty') $elementtype = 'societe';
+		if ($elementtype == 'contact') $elementtype = 'socpeople';
 
-		if (isset($attrname) && $attrname != '' && preg_match("/^\w[a-zA-Z0-9-_]*$/",$attrname))
+		if (isset($attrname) && $attrname != '' && preg_match("/^\w[a-zA-Z0-9-_]*$/", $attrname))
 		{
 			$sql = "DELETE FROM ".MAIN_DB_PREFIX."extrafields";
-			$sql.= " WHERE name = '".$attrname."'";
-			$sql.= " AND entity IN  (0,".$conf->entity.')';
-			$sql.= " AND elementtype = '".$elementtype."'";
+			$sql .= " WHERE name = '".$attrname."'";
+			$sql .= " AND entity IN  (0,".$conf->entity.')';
+			$sql .= " AND elementtype = '".$elementtype."'";
 
 			dol_syslog(get_class($this)."::delete_label", LOG_DEBUG);
-			$resql=$this->db->query($sql);
+			$resql = $this->db->query($sql);
 			if ($resql)
 			{
 				return 1;
@@ -529,82 +529,82 @@ 
      *  @param  int     $totalizable        Is extrafield totalizable on list
 	 * 	@return	int							>0 if OK, <=0 if KO
 	 */
-	function update($attrname, $label, $type, $length, $elementtype, $unique=0, $required=0, $pos=0, $param='', $alwayseditable=0, $perms='', $list='', $help='', $default='', $computed='', $entity='', $langfile='', $enabled='1', $totalizable=0)
+	function update($attrname, $label, $type, $length, $elementtype, $unique = 0, $required = 0, $pos = 0, $param = '', $alwayseditable = 0, $perms = '', $list = '', $help = '', $default = '', $computed = '', $entity = '', $langfile = '', $enabled = '1', $totalizable = 0)
 	{
-		if ($elementtype == 'thirdparty') $elementtype='societe';
-		if ($elementtype == 'contact') $elementtype='socpeople';
-
-        $table=$elementtype.'_extrafields';
-		if ($elementtype == 'categorie') $table='categories_extrafields';
-
-		if (isset($attrname) && $attrname != '' && preg_match("/^\w[a-zA-Z0-9-_]*$/",$attrname))
-		{
-			if ($type=='boolean') {
-				$typedb='int';
-				$lengthdb='1';
-			} elseif($type=='price') {
-				$typedb='double';
-				$lengthdb='24,8';
-			} elseif($type=='phone') {
-				$typedb='varchar';
-				$lengthdb='20';
-			} elseif($type=='mail') {
-				$typedb='varchar';
-				$lengthdb='128';
-			} elseif($type=='url') {
-				$typedb='varchar';
-				$lengthdb='255';
-			} elseif (($type=='select') || ($type=='sellist') || ($type=='radio') || ($type=='checkbox') || ($type=='chkbxlst')) {
-				$typedb='varchar';
-				$lengthdb='255';
+		if ($elementtype == 'thirdparty') $elementtype = 'societe';
+		if ($elementtype == 'contact') $elementtype = 'socpeople';
+
+        $table = $elementtype.'_extrafields';
+		if ($elementtype == 'categorie') $table = 'categories_extrafields';
+
+		if (isset($attrname) && $attrname != '' && preg_match("/^\w[a-zA-Z0-9-_]*$/", $attrname))
+		{
+			if ($type == 'boolean') {
+				$typedb = 'int';
+				$lengthdb = '1';
+			} elseif ($type == 'price') {
+				$typedb = 'double';
+				$lengthdb = '24,8';
+			} elseif ($type == 'phone') {
+				$typedb = 'varchar';
+				$lengthdb = '20';
+			} elseif ($type == 'mail') {
+				$typedb = 'varchar';
+				$lengthdb = '128';
+			} elseif ($type == 'url') {
+				$typedb = 'varchar';
+				$lengthdb = '255';
+			} elseif (($type == 'select') || ($type == 'sellist') || ($type == 'radio') || ($type == 'checkbox') || ($type == 'chkbxlst')) {
+				$typedb = 'varchar';
+				$lengthdb = '255';
 			} elseif ($type == 'html') {
-				$typedb='text';
-			} elseif ($type=='link') {
-				$typedb='int';
-				$lengthdb='11';
-			} elseif($type=='password') {
-				$typedb='varchar';
-				$lengthdb='50';
+				$typedb = 'text';
+			} elseif ($type == 'link') {
+				$typedb = 'int';
+				$lengthdb = '11';
+			} elseif ($type == 'password') {
+				$typedb = 'varchar';
+				$lengthdb = '50';
 			} else {
-				$typedb=$type;
-				$lengthdb=$length;
+				$typedb = $type;
+				$lengthdb = $length;
 			}
-			$field_desc = array('type'=>$typedb, 'value'=>$lengthdb, 'null'=>($required?'NOT NULL':'NULL'), 'default'=>$default);
+			$field_desc = array('type'=>$typedb, 'value'=>$lengthdb, 'null'=>($required ? 'NOT NULL' : 'NULL'), 'default'=>$default);
 
 			if ($type != 'separate') // No table update when separate type
 			{
-				$result=$this->db->DDLUpdateField(MAIN_DB_PREFIX.$table, $attrname, $field_desc);
+				$result = $this->db->DDLUpdateField(MAIN_DB_PREFIX.$table, $attrname, $field_desc);
 			}
 			if ($result > 0 || $type == 'separate')
 			{
 				if ($label)
 				{
-					$result=$this->update_label($attrname,$label,$type,$length,$elementtype,$unique,$required,$pos,$param,$alwayseditable,$perms,$list,$help,$default,$computed,$entity,$langfile,$enabled, $totalizable);
+					$result = $this->update_label($attrname, $label, $type, $length, $elementtype, $unique, $required, $pos, $param, $alwayseditable, $perms, $list, $help, $default, $computed, $entity, $langfile, $enabled, $totalizable);
 				}
 				if ($result > 0)
 				{
-					$sql='';
+					$sql = '';
 					if ($unique)
 					{
-						$sql="ALTER TABLE ".MAIN_DB_PREFIX.$table." ADD UNIQUE INDEX uk_".$table."_".$attrname." (".$attrname.")";
+						$sql = "ALTER TABLE ".MAIN_DB_PREFIX.$table." ADD UNIQUE INDEX uk_".$table."_".$attrname." (".$attrname.")";
 					}
 					else
 					{
-						$sql="ALTER TABLE ".MAIN_DB_PREFIX.$table." DROP INDEX uk_".$table."_".$attrname;
+						$sql = "ALTER TABLE ".MAIN_DB_PREFIX.$table." DROP INDEX uk_".$table."_".$attrname;
 					}
 					dol_syslog(get_class($this).'::update', LOG_DEBUG);
-					$resql=$this->db->query($sql,1,'dml');
+					$resql = $this->db->query($sql, 1, 'dml');
 					return 1;
 				}
 				else
 				{
-					$this->error=$this->db->lasterror();
+					$this->error = $this->db->lasterror();
 					return -1;
 				}
 			}
 			else
 			{
-				$this->error=$this->db->lasterror();
+				$this->error = $this->db->lasterror();
 				return -1;
 			}
 		}
@@ -639,26 +639,26 @@ 
      *  @param  int     $totalizable        Is extrafield totalizable on list
      *  @return	int							<=0 if KO, >0 if OK
 	 */
-	private function update_label($attrname,$label,$type,$size,$elementtype,$unique=0,$required=0,$pos=0,$param='',$alwayseditable=0,$perms='',$list='0',$help='',$default='',$computed='',$entity='',$langfile='',$enabled='1', $totalizable=0)
+	private function update_label($attrname, $label, $type, $size, $elementtype, $unique = 0, $required = 0, $pos = 0, $param = '', $alwayseditable = 0, $perms = '', $list = '0', $help = '', $default = '', $computed = '', $entity = '', $langfile = '', $enabled = '1', $totalizable = 0)
 	{
         // phpcs:enable
 		global $conf, $user;
 		dol_syslog(get_class($this)."::update_label ".$attrname.", ".$label.", ".$type.", ".$size.", ".$elementtype.", ".$unique.", ".$required.", ".$pos.", ".$alwayseditable.", ".$perms.", ".$list.", ".$default.", ".$computed.", ".$entity.", ".$langfile.", ".$enabled.", ".$totalizable);
 
 		// Clean parameters
-		if ($elementtype == 'thirdparty') $elementtype='societe';
-		if ($elementtype == 'contact') $elementtype='socpeople';
+		if ($elementtype == 'thirdparty') $elementtype = 'societe';
+		if ($elementtype == 'contact') $elementtype = 'socpeople';
 
-		if (empty($pos)) $pos=0;
-		if (empty($list)) $list='0';
+		if (empty($pos)) $pos = 0;
+		if (empty($list)) $list = '0';
         if (empty($totalizable)) {
             $totalizable = 0;
         }
-		if (empty($required)) $required=0;
-		if (empty($unique)) $unique=0;
-		if (empty($alwayseditable)) $alwayseditable=0;
+		if (empty($required)) $required = 0;
+		if (empty($unique)) $unique = 0;
+		if (empty($alwayseditable)) $alwayseditable = 0;
 
-		if (isset($attrname) && $attrname != '' && preg_match("/^\w[a-zA-Z0-9-_]*$/",$attrname))
+		if (isset($attrname) && $attrname != '' && preg_match("/^\w[a-zA-Z0-9-_]*$/", $attrname))
 		{
 			$this->db->begin();
 
@@ -672,76 +672,76 @@ 
 			}
 			else
 			{
-				$params='';
+				$params = '';
 			}
 
 			if ($entity === '' || $entity != '0')
 			{
 				// We dont want on all entities, we delete all and current
 				$sql_del = "DELETE FROM ".MAIN_DB_PREFIX."extrafields";
-				$sql_del.= " WHERE name = '".$attrname."'";
-				$sql_del.= " AND entity IN (0, ".($entity===''?$conf->entity:$entity).")";
-				$sql_del.= " AND elementtype = '".$elementtype."'";
+				$sql_del .= " WHERE name = '".$attrname."'";
+				$sql_del .= " AND entity IN (0, ".($entity === '' ? $conf->entity : $entity).")";
+				$sql_del .= " AND elementtype = '".$elementtype."'";
 			}
 			else
 			{
 				// We want on all entities ($entities = '0'), we delete on all only (we keep setup specific to each entity)
 				$sql_del = "DELETE FROM ".MAIN_DB_PREFIX."extrafields";
-				$sql_del.= " WHERE name = '".$attrname."'";
-				$sql_del.= " AND entity = 0";
-				$sql_del.= " AND elementtype = '".$elementtype."'";
+				$sql_del .= " WHERE name = '".$attrname."'";
+				$sql_del .= " AND entity = 0";
+				$sql_del .= " AND elementtype = '".$elementtype."'";
 			}
-			$resql1=$this->db->query($sql_del);
+			$resql1 = $this->db->query($sql_del);
 
 			$sql = "INSERT INTO ".MAIN_DB_PREFIX."extrafields(";
-			$sql.= " name,";		// This is code
-			$sql.= " entity,";
-			$sql.= " label,";
-			$sql.= " type,";
-			$sql.= " size,";
-			$sql.= " elementtype,";
-			$sql.= " fieldunique,";
-			$sql.= " fieldrequired,";
-			$sql.= " perms,";
-			$sql.= " langs,";
-			$sql.= " pos,";
-			$sql.= " alwayseditable,";
-			$sql.= " param,";
-			$sql.= " list,";
-            $sql.= " totalizable,";
-			$sql.= " fielddefault,";
-			$sql.= " fieldcomputed,";
-			$sql.= " fk_user_author,";
-			$sql.= " fk_user_modif,";
-			$sql.= " datec,";
-			$sql.= " enabled,";
-			$sql.= " help";
-			$sql.= ") VALUES (";
-			$sql.= "'".$attrname."',";
-			$sql.= " ".($entity===''?$conf->entity:$entity).",";
-			$sql.= " '".$this->db->escape($label)."',";
-			$sql.= " '".$this->db->escape($type)."',";
-			$sql.= " '".$this->db->escape($size)."',";
-			$sql.= " '".$this->db->escape($elementtype)."',";
-			$sql.= " ".$unique.",";
-			$sql.= " ".$required.",";
-			$sql.= " ".($perms?"'".$this->db->escape($perms)."'":"null").",";
-			$sql.= " ".($langfile?"'".$this->db->escape($langfile)."'":"null").",";
-			$sql.= " ".$pos.",";
-			$sql.= " '".$this->db->escape($alwayseditable)."',";
-			$sql.= " '".$this->db->escape($params)."',";
-			$sql.= " '".$this->db->escape($list)."', ";
-            $sql.= " ".$totalizable.",";
-			$sql.= " ".(($default!='')?"'".$this->db->escape($default)."'":"null").",";
-			$sql.= " ".($computed?"'".$this->db->escape($computed)."'":"null").",";
-			$sql .= " " . $user->id . ",";
-			$sql .= " " . $user->id . ",";
-			$sql .= "'" . $this->db->idate(dol_now()) . "',";
-			$sql .= "'" . $this->db->escape($enabled). "',";
-			$sql.= " ".($help?"'".$this->db->escape($help)."'":"null");
-			$sql.= ")";
-
-			$resql2=$this->db->query($sql);
+			$sql .= " name,"; // This is code
+			$sql .= " entity,";
+			$sql .= " label,";
+			$sql .= " type,";
+			$sql .= " size,";
+			$sql .= " elementtype,";
+			$sql .= " fieldunique,";
+			$sql .= " fieldrequired,";
+			$sql .= " perms,";
+			$sql .= " langs,";
+			$sql .= " pos,";
+			$sql .= " alwayseditable,";
+			$sql .= " param,";
+			$sql .= " list,";
+            $sql .= " totalizable,";
+			$sql .= " fielddefault,";
+			$sql .= " fieldcomputed,";
+			$sql .= " fk_user_author,";
+			$sql .= " fk_user_modif,";
+			$sql .= " datec,";
+			$sql .= " enabled,";
+			$sql .= " help";
+			$sql .= ") VALUES (";
+			$sql .= "'".$attrname."',";
+			$sql .= " ".($entity === '' ? $conf->entity : $entity).",";
+			$sql .= " '".$this->db->escape($label)."',";
+			$sql .= " '".$this->db->escape($type)."',";
+			$sql .= " '".$this->db->escape($size)."',";
+			$sql .= " '".$this->db->escape($elementtype)."',";
+			$sql .= " ".$unique.",";
+			$sql .= " ".$required.",";
+			$sql .= " ".($perms ? "'".$this->db->escape($perms)."'" : "null").",";
+			$sql .= " ".($langfile ? "'".$this->db->escape($langfile)."'" : "null").",";
+			$sql .= " ".$pos.",";
+			$sql .= " '".$this->db->escape($alwayseditable)."',";
+			$sql .= " '".$this->db->escape($params)."',";
+			$sql .= " '".$this->db->escape($list)."', ";
+            $sql .= " ".$totalizable.",";
+			$sql .= " ".(($default != '') ? "'".$this->db->escape($default)."'" : "null").",";
+			$sql .= " ".($computed ? "'".$this->db->escape($computed)."'" : "null").",";
+			$sql .= " ".$user->id.",";
+			$sql .= " ".$user->id.",";
+			$sql .= "'".$this->db->idate(dol_now())."',";
+			$sql .= "'".$this->db->escape($enabled)."',";
+			$sql .= " ".($help ? "'".$this->db->escape($help)."'" : "null");
+			$sql .= ")";
+
+			$resql2 = $this->db->query($sql);
 
 			if ($resql1 && $resql2)
 			{
@@ -770,34 +770,34 @@ 
 	 * 	@param	boolean		$forceload			Force load of extra fields whatever is option MAIN_EXTRAFIELDS_DISABLED. Deprecated. Should not be required.
 	 * 	@return	array							Array of attributes keys+label for all extra fields.
 	 */
-	function fetch_name_optionals_label($elementtype,$forceload=false)
+	function fetch_name_optionals_label($elementtype, $forceload = false)
 	{
         // phpcs:enable
 		global $conf;
 
 		if (empty($elementtype)) return array();
 
-		if ($elementtype == 'thirdparty') $elementtype='societe';
-		if ($elementtype == 'contact') $elementtype='socpeople';
-		if ($elementtype == 'order_supplier') $elementtype='commande_fournisseur';
+		if ($elementtype == 'thirdparty') $elementtype = 'societe';
+		if ($elementtype == 'contact') $elementtype = 'socpeople';
+		if ($elementtype == 'order_supplier') $elementtype = 'commande_fournisseur';
 
-		$array_name_label=array();
+		$array_name_label = array();
 
 		// To avoid conflicts with external modules. TODO Remove this.
 		if (!$forceload && !empty($conf->global->MAIN_EXTRAFIELDS_DISABLED)) return $array_name_label;
 
 		// Set array of label of entity
 		// TODO Remove completely loading of label. This should be done by presentation.
-		$labelmulticompany=array();
+		$labelmulticompany = array();
 		if (!empty($conf->multicompany->enabled))
 		{
-			$sql_entity_name='SELECT rowid, label FROM '.MAIN_DB_PREFIX.'entity WHERE rowid in (0,'.$conf->entity.')';
-			$resql_entity_name=$this->db->query($sql_entity_name);
+			$sql_entity_name = 'SELECT rowid, label FROM '.MAIN_DB_PREFIX.'entity WHERE rowid in (0,'.$conf->entity.')';
+			$resql_entity_name = $this->db->query($sql_entity_name);
 			if ($resql_entity_name)
 			{
 				while ($obj = $this->db->fetch_object($resql_entity_name))
 				{
-					$labelmulticompany[$obj->rowid]=$obj->label;
+					$labelmulticompany[$obj->rowid] = $obj->label;
 				}
 			}
 		}
@@ -806,12 +806,12 @@ 
 		dol_syslog("fetch_name_optionals_label elementtype=".$elementtype);
 
 		$sql = "SELECT rowid,name,label,type,size,elementtype,fieldunique,fieldrequired,param,pos,alwayseditable,perms,langs,list,totalizable,fielddefault,fieldcomputed,entity,enabled,help";
-		$sql.= " FROM ".MAIN_DB_PREFIX."extrafields";
-		$sql.= " WHERE entity IN (0,".$conf->entity.")";
-		if ($elementtype) $sql.= " AND elementtype = '".$elementtype."'";	// Filed with object->table_element
-		$sql.= " ORDER BY pos";
+		$sql .= " FROM ".MAIN_DB_PREFIX."extrafields";
+		$sql .= " WHERE entity IN (0,".$conf->entity.")";
+		if ($elementtype) $sql .= " AND elementtype = '".$elementtype."'"; // Filed with object->table_element
+		$sql .= " ORDER BY pos";
 
-		$resql=$this->db->query($sql);
+		$resql = $this->db->query($sql);
 		if ($resql)
 		{
 			if ($this->db->num_rows($resql))
@@ -821,57 +821,57 @@ 
 					// We can add this attribute to object. TODO Remove this and return $this->attributes[$elementtype]['label']
 					if ($tab->type != 'separate')
 					{
-						$array_name_label[$tab->name]=$tab->label;
+						$array_name_label[$tab->name] = $tab->label;
 					}
 
 					// Old usage
-					$this->attribute_type[$tab->name]=$tab->type;
-					$this->attribute_label[$tab->name]=$tab->label;
-					$this->attribute_size[$tab->name]=$tab->size;
-					$this->attribute_elementtype[$tab->name]=$tab->elementtype;
-					$this->attribute_default[$tab->name]=$tab->fielddefault;
-					$this->attribute_computed[$tab->name]=$tab->fieldcomputed;
-					$this->attribute_unique[$tab->name]=$tab->fieldunique;
-					$this->attribute_required[$tab->name]=$tab->fieldrequired;
-					$this->attribute_param[$tab->name]=($tab->param ? unserialize($tab->param) : '');
-					$this->attribute_pos[$tab->name]=$tab->pos;
-					$this->attribute_alwayseditable[$tab->name]=$tab->alwayseditable;
-					$this->attribute_perms[$tab->name]=(strlen($tab->perms) == 0 ? 1 : $tab->perms);
-					$this->attribute_langfile[$tab->name]=$tab->langs;
-					$this->attribute_list[$tab->name]=$tab->list;
-					$this->attribute_totalizable[$tab->name]=$tab->totalizable;
-					$this->attribute_entityid[$tab->name]=$tab->entity;
-					$this->attribute_entitylabel[$tab->name]=(empty($labelmulticompany[$tab->entity])?'Entity'.$tab->entity:$labelmulticompany[$tab->entity]);
+					$this->attribute_type[$tab->name] = $tab->type;
+					$this->attribute_label[$tab->name] = $tab->label;
+					$this->attribute_size[$tab->name] = $tab->size;
+					$this->attribute_elementtype[$tab->name] = $tab->elementtype;
+					$this->attribute_default[$tab->name] = $tab->fielddefault;
+					$this->attribute_computed[$tab->name] = $tab->fieldcomputed;
+					$this->attribute_unique[$tab->name] = $tab->fieldunique;
+					$this->attribute_required[$tab->name] = $tab->fieldrequired;
+					$this->attribute_param[$tab->name] = ($tab->param ? unserialize($tab->param) : '');
+					$this->attribute_pos[$tab->name] = $tab->pos;
+					$this->attribute_alwayseditable[$tab->name] = $tab->alwayseditable;
+					$this->attribute_perms[$tab->name] = (strlen($tab->perms) == 0 ? 1 : $tab->perms);
+					$this->attribute_langfile[$tab->name] = $tab->langs;
+					$this->attribute_list[$tab->name] = $tab->list;
+					$this->attribute_totalizable[$tab->name] = $tab->totalizable;
+					$this->attribute_entityid[$tab->name] = $tab->entity;
+					$this->attribute_entitylabel[$tab->name] = (empty($labelmulticompany[$tab->entity]) ? 'Entity'.$tab->entity : $labelmulticompany[$tab->entity]);
 
 					// New usage
-					$this->attributes[$tab->elementtype]['type'][$tab->name]=$tab->type;
-					$this->attributes[$tab->elementtype]['label'][$tab->name]=$tab->label;
-					$this->attributes[$tab->elementtype]['size'][$tab->name]=$tab->size;
-					$this->attributes[$tab->elementtype]['elementtype'][$tab->name]=$tab->elementtype;
-					$this->attributes[$tab->elementtype]['default'][$tab->name]=$tab->fielddefault;
-					$this->attributes[$tab->elementtype]['computed'][$tab->name]=$tab->fieldcomputed;
-					$this->attributes[$tab->elementtype]['unique'][$tab->name]=$tab->fieldunique;
-					$this->attributes[$tab->elementtype]['required'][$tab->name]=$tab->fieldrequired;
-					$this->attributes[$tab->elementtype]['param'][$tab->name]=($tab->param ? unserialize($tab->param) : '');
-					$this->attributes[$tab->elementtype]['pos'][$tab->name]=$tab->pos;
-					$this->attributes[$tab->elementtype]['alwayseditable'][$tab->name]=$tab->alwayseditable;
-					$this->attributes[$tab->elementtype]['perms'][$tab->name]=(strlen($tab->perms) == 0 ? 1 : $tab->perms);
-					$this->attributes[$tab->elementtype]['langfile'][$tab->name]=$tab->langs;
-					$this->attributes[$tab->elementtype]['list'][$tab->name]=$tab->list;
-                    $this->attributes[$tab->elementtype]['totalizable'][$tab->name]=$tab->totalizable;
-					$this->attributes[$tab->elementtype]['entityid'][$tab->name]=$tab->entity;
-					$this->attributes[$tab->elementtype]['entitylabel'][$tab->name]=(empty($labelmulticompany[$tab->entity])?'Entity'.$tab->entity:$labelmulticompany[$tab->entity]);
-					$this->attributes[$tab->elementtype]['enabled'][$tab->name]=$tab->enabled;
-					$this->attributes[$tab->elementtype]['help'][$tab->name]=$tab->help;
-
-					$this->attributes[$tab->elementtype]['loaded']=1;
+					$this->attributes[$tab->elementtype]['type'][$tab->name] = $tab->type;
+					$this->attributes[$tab->elementtype]['label'][$tab->name] = $tab->label;
+					$this->attributes[$tab->elementtype]['size'][$tab->name] = $tab->size;
+					$this->attributes[$tab->elementtype]['elementtype'][$tab->name] = $tab->elementtype;
+					$this->attributes[$tab->elementtype]['default'][$tab->name] = $tab->fielddefault;
+					$this->attributes[$tab->elementtype]['computed'][$tab->name] = $tab->fieldcomputed;
+					$this->attributes[$tab->elementtype]['unique'][$tab->name] = $tab->fieldunique;
+					$this->attributes[$tab->elementtype]['required'][$tab->name] = $tab->fieldrequired;
+					$this->attributes[$tab->elementtype]['param'][$tab->name] = ($tab->param ? unserialize($tab->param) : '');
+					$this->attributes[$tab->elementtype]['pos'][$tab->name] = $tab->pos;
+					$this->attributes[$tab->elementtype]['alwayseditable'][$tab->name] = $tab->alwayseditable;
+					$this->attributes[$tab->elementtype]['perms'][$tab->name] = (strlen($tab->perms) == 0 ? 1 : $tab->perms);
+					$this->attributes[$tab->elementtype]['langfile'][$tab->name] = $tab->langs;
+					$this->attributes[$tab->elementtype]['list'][$tab->name] = $tab->list;
+                    $this->attributes[$tab->elementtype]['totalizable'][$tab->name] = $tab->totalizable;
+					$this->attributes[$tab->elementtype]['entityid'][$tab->name] = $tab->entity;
+					$this->attributes[$tab->elementtype]['entitylabel'][$tab->name] = (empty($labelmulticompany[$tab->entity]) ? 'Entity'.$tab->entity : $labelmulticompany[$tab->entity]);
+					$this->attributes[$tab->elementtype]['enabled'][$tab->name] = $tab->enabled;
+					$this->attributes[$tab->elementtype]['help'][$tab->name] = $tab->help;
+
+					$this->attributes[$tab->elementtype]['loaded'] = 1;
 				}
 			}
-			if ($elementtype) $this->attributes[$elementtype]['loaded']=1;	// If nothing found, we also save tag 'loaded'
+			if ($elementtype) $this->attributes[$elementtype]['loaded'] = 1; // If nothing found, we also save tag 'loaded'
 		}
 		else
 		{
-			$this->error=$this->db->lasterror();
+			$this->error = $this->db->lasterror();
 			dol_syslog(get_class($this)."::fetch_name_optionals_label ".$this->error, LOG_ERR);
 		}
 
@@ -893,57 +893,57 @@ 
 	 * @param  string  $extrafieldsobjectkey	If defined (for example $object->table_element), use the new method to get extrafields data
 	 * @return string
 	 */
-	function showInputField($key, $value, $moreparam='', $keysuffix='', $keyprefix='', $morecss='', $objectid=0, $extrafieldsobjectkey='')
+	function showInputField($key, $value, $moreparam = '', $keysuffix = '', $keyprefix = '', $morecss = '', $objectid = 0, $extrafieldsobjectkey = '')
 	{
-		global $conf,$langs,$form;
+		global $conf, $langs, $form;
 
-		if (! is_object($form))
+		if (!is_object($form))
 		{
 			require_once DOL_DOCUMENT_ROOT.'/core/class/html.form.class.php';
-			$form=new Form($this->db);
+			$form = new Form($this->db);
 		}
 
-		$out='';
+		$out = '';
 
-		$keyprefix = $keyprefix.'options_';		// Because we work on extrafields
+		$keyprefix = $keyprefix.'options_'; // Because we work on extrafields
 
-		if (! empty($extrafieldsobjectkey))
+		if (!empty($extrafieldsobjectkey))
 		{
-			$label=$this->attributes[$extrafieldsobjectkey]['label'][$key];
-			$type=$this->attributes[$extrafieldsobjectkey]['type'][$key];
-			$size=$this->attributes[$extrafieldsobjectkey]['size'][$key];
-			$default=$this->attributes[$extrafieldsobjectkey]['default'][$key];
-			$computed=$this->attributes[$extrafieldsobjectkey]['computed'][$key];
-			$unique=$this->attributes[$extrafieldsobjectkey]['unique'][$key];
-			$required=$this->attributes[$extrafieldsobjectkey]['required'][$key];
-			$param=$this->attributes[$extrafieldsobjectkey]['param'][$key];
-			$perms=dol_eval($this->attributes[$extrafieldsobjectkey]['perms'][$key], 1);
-			$langfile=$this->attributes[$extrafieldsobjectkey]['langfile'][$key];
-			$list=dol_eval($this->attributes[$extrafieldsobjectkey]['list'][$key], 1);
-			$totalizable=$this->attributes[$extrafieldsobjectkey]['totalizable'][$key];
-			$help=$this->attributes[$extrafieldsobjectkey]['help'][$key];
-			$hidden=(empty($list) ? 1 : 0);		// If empty, we are sure it is hidden, otherwise we show. If it depends on mode (view/create/edit form or list, this must be filtered by caller)
+			$label = $this->attributes[$extrafieldsobjectkey]['label'][$key];
+			$type = $this->attributes[$extrafieldsobjectkey]['type'][$key];
+			$size = $this->attributes[$extrafieldsobjectkey]['size'][$key];
+			$default = $this->attributes[$extrafieldsobjectkey]['default'][$key];
+			$computed = $this->attributes[$extrafieldsobjectkey]['computed'][$key];
+			$unique = $this->attributes[$extrafieldsobjectkey]['unique'][$key];
+			$required = $this->attributes[$extrafieldsobjectkey]['required'][$key];
+			$param = $this->attributes[$extrafieldsobjectkey]['param'][$key];
+			$perms = dol_eval($this->attributes[$extrafieldsobjectkey]['perms'][$key], 1);
+			$langfile = $this->attributes[$extrafieldsobjectkey]['langfile'][$key];
+			$list = dol_eval($this->attributes[$extrafieldsobjectkey]['list'][$key], 1);
+			$totalizable = $this->attributes[$extrafieldsobjectkey]['totalizable'][$key];
+			$help = $this->attributes[$extrafieldsobjectkey]['help'][$key];
+			$hidden = (empty($list) ? 1 : 0); // If empty, we are sure it is hidden, otherwise we show. If it depends on mode (view/create/edit form or list, this must be filtered by caller)
 		}
 		else	// Old usage
 		{
-			$label=$this->attribute_label[$key];
-			$type =$this->attribute_type[$key];
-			$size =$this->attribute_size[$key];
-			$elementtype=$this->attribute_elementtype[$key];	// Seems not used
-			$default=$this->attribute_default[$key];
-			$computed=$this->attribute_computed[$key];
-			$unique=$this->attribute_unique[$key];
-			$required=$this->attribute_required[$key];
-			$param=$this->attribute_param[$key];
-			$langfile=$this->attribute_langfile[$key];
-			$list=$this->attribute_list[$key];
-			$totalizable=$this->attribute_totalizable[$key];
-			$hidden=(empty($list) ? 1 : 0);		// If empty, we are sure it is hidden, otherwise we show. If it depends on mode (view/create/edit form or list, this must be filtered by caller)
+			$label = $this->attribute_label[$key];
+			$type = $this->attribute_type[$key];
+			$size = $this->attribute_size[$key];
+			$elementtype = $this->attribute_elementtype[$key]; // Seems not used
+			$default = $this->attribute_default[$key];
+			$computed = $this->attribute_computed[$key];
+			$unique = $this->attribute_unique[$key];
+			$required = $this->attribute_required[$key];
+			$param = $this->attribute_param[$key];
+			$langfile = $this->attribute_langfile[$key];
+			$list = $this->attribute_list[$key];
+			$totalizable = $this->attribute_totalizable[$key];
+			$hidden = (empty($list) ? 1 : 0); // If empty, we are sure it is hidden, otherwise we show. If it depends on mode (view/create/edit form or list, this must be filtered by caller)
 		}
 
 		if ($computed)
 		{
-			if (! preg_match('/^search_/', $keyprefix)) return '<span class="opacitymedium">'.$langs->trans("AutomaticallyCalculated").'</span>';
+			if (!preg_match('/^search_/', $keyprefix)) return '<span class="opacitymedium">'.$langs->trans("AutomaticallyCalculated").'</span>';
 			else return '';
 		}
 
@@ -957,21 +957,21 @@ 
 			{
 				$morecss = 'minwidth200imp';
 			}
-			elseif (in_array($type,array('int','integer','double','price')))
+			elseif (in_array($type, array('int', 'integer', 'double', 'price')))
 			{
 				$morecss = 'maxwidth75';
 			}
 			elseif ($type == 'password')
 			{
-				$morecss='maxwidth100';
+				$morecss = 'maxwidth100';
 			}
 			elseif ($type == 'url')
 			{
-				$morecss='minwidth400';
+				$morecss = 'minwidth400';
 			}
 			elseif ($type == 'boolean')
 			{
-				$morecss='';
+				$morecss = '';
 			}
 			else
 			{
@@ -990,12 +990,12 @@ 
 			}
 		}
 
-		if (in_array($type,array('date','datetime')))
+		if (in_array($type, array('date', 'datetime')))
 		{
-			$tmp=explode(',',$size);
-			$newsize=$tmp[0];
+			$tmp = explode(',', $size);
+			$newsize = $tmp[0];
 
-			$showtime = in_array($type,array('datetime')) ? 1 : 0;
+			$showtime = in_array($type, array('datetime')) ? 1 : 0;
 
 			// Do not show current date when field not required (see selectDate() method)
 			if (!$required && $value == '') $value = '-1';
@@ -1003,244 +1003,244 @@ 
 			// TODO Must also support $moreparam
 			$out = $form->selectDate($value, $keyprefix.$key.$keysuffix, $showtime, $showtime, $required, '', 1, (($keyprefix != 'search_' && $keyprefix != 'search_options_') ? 1 : 0), 0, 1);
 		}
-		elseif (in_array($type,array('int','integer')))
+		elseif (in_array($type, array('int', 'integer')))
 		{
-			$tmp=explode(',',$size);
-			$newsize=$tmp[0];
-			$out='<input type="text" class="flat '.$morecss.' maxwidthonsmartphone" name="'.$keyprefix.$key.$keysuffix.'" id="'.$keyprefix.$key.$keysuffix.'" maxlength="'.$newsize.'" value="'.dol_escape_htmltag($value).'"'.($moreparam?$moreparam:'').'>';
+			$tmp = explode(',', $size);
+			$newsize = $tmp[0];
+			$out = '<input type="text" class="flat '.$morecss.' maxwidthonsmartphone" name="'.$keyprefix.$key.$keysuffix.'" id="'.$keyprefix.$key.$keysuffix.'" maxlength="'.$newsize.'" value="'.dol_escape_htmltag($value).'"'.($moreparam ? $moreparam : '').'>';
 		}
 		elseif (preg_match('/varchar/', $type))
 		{
-			$out='<input type="text" class="flat '.$morecss.' maxwidthonsmartphone" name="'.$keyprefix.$key.$keysuffix.'" id="'.$keyprefix.$key.$keysuffix.'" maxlength="'.$size.'" value="'.dol_escape_htmltag($value).'"'.($moreparam?$moreparam:'').'>';
+			$out = '<input type="text" class="flat '.$morecss.' maxwidthonsmartphone" name="'.$keyprefix.$key.$keysuffix.'" id="'.$keyprefix.$key.$keysuffix.'" maxlength="'.$size.'" value="'.dol_escape_htmltag($value).'"'.($moreparam ? $moreparam : '').'>';
 		}
 		elseif (in_array($type, array('mail', 'phone', 'url')))
 		{
-			$out='<input type="text" class="flat '.$morecss.' maxwidthonsmartphone" name="'.$keyprefix.$key.$keysuffix.'" id="'.$keyprefix.$key.$keysuffix.'" value="'.dol_escape_htmltag($value).'" '.($moreparam?$moreparam:'').'>';
+			$out = '<input type="text" class="flat '.$morecss.' maxwidthonsmartphone" name="'.$keyprefix.$key.$keysuffix.'" id="'.$keyprefix.$key.$keysuffix.'" value="'.dol_escape_htmltag($value).'" '.($moreparam ? $moreparam : '').'>';
 		}
 		elseif ($type == 'text')
 		{
-			if (! preg_match('/search_/', $keyprefix))		// If keyprefix is search_ or search_options_, we must just use a simple text field
+			if (!preg_match('/search_/', $keyprefix))		// If keyprefix is search_ or search_options_, we must just use a simple text field
 			{
 				require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
-				$doleditor=new DolEditor($keyprefix.$key.$keysuffix,$value,'',200,'dolibarr_notes','In',false,false,false,ROWS_5,'90%');
-				$out=$doleditor->Create(1);
+				$doleditor = new DolEditor($keyprefix.$key.$keysuffix, $value, '', 200, 'dolibarr_notes', 'In', false, false, false, ROWS_5, '90%');
+				$out = $doleditor->Create(1);
 			}
 			else
 			{
-				$out='<input type="text" class="flat '.$morecss.' maxwidthonsmartphone" name="'.$keyprefix.$key.$keysuffix.'" id="'.$keyprefix.$key.$keysuffix.'" value="'.dol_escape_htmltag($value).'" '.($moreparam?$moreparam:'').'>';
+				$out = '<input type="text" class="flat '.$morecss.' maxwidthonsmartphone" name="'.$keyprefix.$key.$keysuffix.'" id="'.$keyprefix.$key.$keysuffix.'" value="'.dol_escape_htmltag($value).'" '.($moreparam ? $moreparam : '').'>';
 			}
 		}
 		elseif ($type == 'html')
 		{
-			if (! preg_match('/search_/', $keyprefix))		// If keyprefix is search_ or search_options_, we must just use a simple text field
+			if (!preg_match('/search_/', $keyprefix))		// If keyprefix is search_ or search_options_, we must just use a simple text field
 			{
 				require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
-				$doleditor=new DolEditor($keyprefix.$key.$keysuffix,$value,'',200,'dolibarr_notes','In',false,false,! empty($conf->fckeditor->enabled) && $conf->global->FCKEDITOR_ENABLE_SOCIETE,ROWS_5,'90%');
-				$out=$doleditor->Create(1);
+				$doleditor = new DolEditor($keyprefix.$key.$keysuffix, $value, '', 200, 'dolibarr_notes', 'In', false, false, !empty($conf->fckeditor->enabled) && $conf->global->FCKEDITOR_ENABLE_SOCIETE, ROWS_5, '90%');
+				$out = $doleditor->Create(1);
 			}
 			else
 			{
-				$out='<input type="text" class="flat '.$morecss.' maxwidthonsmartphone" name="'.$keyprefix.$key.$keysuffix.'" id="'.$keyprefix.$key.$keysuffix.'" value="'.dol_escape_htmltag($value).'" '.($moreparam?$moreparam:'').'>';
+				$out = '<input type="text" class="flat '.$morecss.' maxwidthonsmartphone" name="'.$keyprefix.$key.$keysuffix.'" id="'.$keyprefix.$key.$keysuffix.'" value="'.dol_escape_htmltag($value).'" '.($moreparam ? $moreparam : '').'>';
 			}
 		}
 		elseif ($type == 'boolean')
 		{
-			$checked='';
+			$checked = '';
 			if (!empty($value)) {
-				$checked=' checked value="1" ';
+				$checked = ' checked value="1" ';
 			} else {
-				$checked=' value="1" ';
+				$checked = ' value="1" ';
 			}
-			$out='<input type="checkbox" class="flat '.$morecss.' maxwidthonsmartphone" name="'.$keyprefix.$key.$keysuffix.'" id="'.$keyprefix.$key.$keysuffix.'" '.$checked.' '.($moreparam?$moreparam:'').'>';
+			$out = '<input type="checkbox" class="flat '.$morecss.' maxwidthonsmartphone" name="'.$keyprefix.$key.$keysuffix.'" id="'.$keyprefix.$key.$keysuffix.'" '.$checked.' '.($moreparam ? $moreparam : '').'>';
 		}
 		elseif ($type == 'price')
 		{
 			if (!empty($value)) {		// $value in memory is a php numeric, we format it into user number format.
-				$value=price($value);
+				$value = price($value);
 			}
-			$out='<input type="text" class="flat '.$morecss.' maxwidthonsmartphone" name="'.$keyprefix.$key.$keysuffix.'" id="'.$keyprefix.$key.$keysuffix.'" value="'.$value.'" '.($moreparam?$moreparam:'').'> '.$langs->getCurrencySymbol($conf->currency);
+			$out = '<input type="text" class="flat '.$morecss.' maxwidthonsmartphone" name="'.$keyprefix.$key.$keysuffix.'" id="'.$keyprefix.$key.$keysuffix.'" value="'.$value.'" '.($moreparam ? $moreparam : '').'> '.$langs->getCurrencySymbol($conf->currency);
 		}
 		elseif ($type == 'double')
 		{
 			if (!empty($value)) {		// $value in memory is a php numeric, we format it into user number format.
-				$value=price($value);
+				$value = price($value);
 			}
-			$out='<input type="text" class="flat '.$morecss.' maxwidthonsmartphone" name="'.$keyprefix.$key.$keysuffix.'" id="'.$keyprefix.$key.$keysuffix.'" value="'.$value.'" '.($moreparam?$moreparam:'').'> ';
+			$out = '<input type="text" class="flat '.$morecss.' maxwidthonsmartphone" name="'.$keyprefix.$key.$keysuffix.'" id="'.$keyprefix.$key.$keysuffix.'" value="'.$value.'" '.($moreparam ? $moreparam : '').'> ';
 		}
 		elseif ($type == 'select')
 		{
 			$out = '';
-			if (! empty($conf->use_javascript_ajax) && ! empty($conf->global->MAIN_EXTRAFIELDS_USE_SELECT2))
+			if (!empty($conf->use_javascript_ajax) && !empty($conf->global->MAIN_EXTRAFIELDS_USE_SELECT2))
 			{
-				include_once DOL_DOCUMENT_ROOT . '/core/lib/ajax.lib.php';
-				$out.= ajax_combobox($keyprefix.$key.$keysuffix, array(), 0);
+				include_once DOL_DOCUMENT_ROOT.'/core/lib/ajax.lib.php';
+				$out .= ajax_combobox($keyprefix.$key.$keysuffix, array(), 0);
 			}
 
-			$out.='<select class="flat '.$morecss.' maxwidthonsmartphone" name="'.$keyprefix.$key.$keysuffix.'" id="'.$keyprefix.$key.$keysuffix.'" '.($moreparam?$moreparam:'').'>';
-			$out.='<option value="0">&nbsp;</option>';
+			$out .= '<select class="flat '.$morecss.' maxwidthonsmartphone" name="'.$keyprefix.$key.$keysuffix.'" id="'.$keyprefix.$key.$keysuffix.'" '.($moreparam ? $moreparam : '').'>';
+			$out .= '<option value="0">&nbsp;</option>';
 			foreach ($param['options'] as $key => $val)
 			{
 				if ((string) $key == '') continue;
 				list($val, $parent) = explode('|', $val);
-				$out.='<option value="'.$key.'"';
-				$out.= (((string) $value == (string) $key)?' selected':'');
-				$out.= (!empty($parent)?' parent="'.$parent.'"':'');
-				$out.='>';
-				if ($langfile && $val) $out.=$langs->trans($val);
-				else $out.=$val;
-				$out.='</option>';
+				$out .= '<option value="'.$key.'"';
+				$out .= (((string) $value == (string) $key) ? ' selected' : '');
+				$out .= (!empty($parent) ? ' parent="'.$parent.'"' : '');
+				$out .= '>';
+				if ($langfile && $val) $out .= $langs->trans($val);
+				else $out .= $val;
+				$out .= '</option>';
 			}
-			$out.='</select>';
+			$out .= '</select>';
 		}
 		elseif ($type == 'sellist')
 		{
 			$out = '';
-			if (! empty($conf->use_javascript_ajax) && ! empty($conf->global->MAIN_EXTRAFIELDS_USE_SELECT2))
+			if (!empty($conf->use_javascript_ajax) && !empty($conf->global->MAIN_EXTRAFIELDS_USE_SELECT2))
 			{
-				include_once DOL_DOCUMENT_ROOT . '/core/lib/ajax.lib.php';
-				$out.= ajax_combobox($keyprefix.$key.$keysuffix, array(), 0);
+				include_once DOL_DOCUMENT_ROOT.'/core/lib/ajax.lib.php';
+				$out .= ajax_combobox($keyprefix.$key.$keysuffix, array(), 0);
 			}
 
-			$out.='<select class="flat '.$morecss.' maxwidthonsmartphone" name="'.$keyprefix.$key.$keysuffix.'" id="'.$keyprefix.$key.$keysuffix.'" '.($moreparam?$moreparam:'').'>';
+			$out .= '<select class="flat '.$morecss.' maxwidthonsmartphone" name="'.$keyprefix.$key.$keysuffix.'" id="'.$keyprefix.$key.$keysuffix.'" '.($moreparam ? $moreparam : '').'>';
 			if (is_array($param['options']))
 			{
-				$param_list=array_keys($param['options']);
+				$param_list = array_keys($param['options']);
 				$InfoFieldList = explode(":", $param_list[0]);
-				$parentName='';
-				$parentField='';
+				$parentName = '';
+				$parentField = '';
 				// 0 : tableName
 				// 1 : label field name
 				// 2 : key fields name (if differ of rowid)
 				// 3 : key field parent (for dependent lists)
 				// 4 : where clause filter on column or table extrafield, syntax field='value' or extra.field=value
-				$keyList=(empty($InfoFieldList[2])?'rowid':$InfoFieldList[2].' as rowid');
+				$keyList = (empty($InfoFieldList[2]) ? 'rowid' : $InfoFieldList[2].' as rowid');
 
 
-				if (count($InfoFieldList) > 4 && ! empty($InfoFieldList[4]))
+				if (count($InfoFieldList) > 4 && !empty($InfoFieldList[4]))
 				{
 					if (strpos($InfoFieldList[4], 'extra.') !== false)
 					{
-						$keyList='main.'.$InfoFieldList[2].' as rowid';
+						$keyList = 'main.'.$InfoFieldList[2].' as rowid';
 					} else {
-						$keyList=$InfoFieldList[2].' as rowid';
+						$keyList = $InfoFieldList[2].' as rowid';
 					}
 				}
-				if (count($InfoFieldList) > 3 && ! empty($InfoFieldList[3]))
+				if (count($InfoFieldList) > 3 && !empty($InfoFieldList[3]))
 				{
 					list($parentName, $parentField) = explode('|', $InfoFieldList[3]);
-					$keyList.= ', '.$parentField;
+					$keyList .= ', '.$parentField;
 				}
 
-				$fields_label = explode('|',$InfoFieldList[1]);
+				$fields_label = explode('|', $InfoFieldList[1]);
 				if (is_array($fields_label))
 				{
-					$keyList .=', ';
+					$keyList .= ', ';
 					$keyList .= implode(', ', $fields_label);
 				}
 
-				$sqlwhere='';
+				$sqlwhere = '';
 				$sql = 'SELECT '.$keyList;
-				$sql.= ' FROM '.MAIN_DB_PREFIX .$InfoFieldList[0];
+				$sql .= ' FROM '.MAIN_DB_PREFIX.$InfoFieldList[0];
 				if (!empty($InfoFieldList[4]))
 				{
 				    // can use curent entity filter
-				    if (strpos($InfoFieldList[4], '$ENTITY$')!==false) {
-				        $InfoFieldList[4]=str_replace('$ENTITY$',$conf->entity,$InfoFieldList[4]);
+				    if (strpos($InfoFieldList[4], '$ENTITY$') !== false) {
+				        $InfoFieldList[4] = str_replace('$ENTITY$', $conf->entity, $InfoFieldList[4]);
 				    }
 					// can use SELECT request
-					if (strpos($InfoFieldList[4], '$SEL$')!==false) {
-						$InfoFieldList[4]=str_replace('$SEL$','SELECT',$InfoFieldList[4]);
+					if (strpos($InfoFieldList[4], '$SEL$') !== false) {
+						$InfoFieldList[4] = str_replace('$SEL$', 'SELECT', $InfoFieldList[4]);
 					}
 
 					// current object id can be use into filter
-					if (strpos($InfoFieldList[4], '$ID$')!==false && !empty($objectid)) {
-						$InfoFieldList[4]=str_replace('$ID$',$objectid,$InfoFieldList[4]);
+					if (strpos($InfoFieldList[4], '$ID$') !== false && !empty($objectid)) {
+						$InfoFieldList[4] = str_replace('$ID$', $objectid, $InfoFieldList[4]);
 					} else {
-						$InfoFieldList[4]=str_replace('$ID$','0',$InfoFieldList[4]);
+						$InfoFieldList[4] = str_replace('$ID$', '0', $InfoFieldList[4]);
 					}
 					//We have to join on extrafield table
-					if (strpos($InfoFieldList[4], 'extra')!==false)
+					if (strpos($InfoFieldList[4], 'extra') !== false)
 					{
-						$sql.= ' as main, '.MAIN_DB_PREFIX .$InfoFieldList[0].'_extrafields as extra';
-						$sqlwhere.= ' WHERE extra.fk_object=main.'.$InfoFieldList[2]. ' AND '.$InfoFieldList[4];
+						$sql .= ' as main, '.MAIN_DB_PREFIX.$InfoFieldList[0].'_extrafields as extra';
+						$sqlwhere .= ' WHERE extra.fk_object=main.'.$InfoFieldList[2].' AND '.$InfoFieldList[4];
 					}
 					else
 					{
-						$sqlwhere.= ' WHERE '.$InfoFieldList[4];
+						$sqlwhere .= ' WHERE '.$InfoFieldList[4];
 					}
 				}
 				else
 				{
-					$sqlwhere.= ' WHERE 1=1';
+					$sqlwhere .= ' WHERE 1=1';
 				}
 				// Some tables may have field, some other not. For the moment we disable it.
-				if (in_array($InfoFieldList[0],array('tablewithentity')))
+				if (in_array($InfoFieldList[0], array('tablewithentity')))
 				{
-					$sqlwhere.= ' AND entity = '.$conf->entity;
+					$sqlwhere .= ' AND entity = '.$conf->entity;
 				}
-				$sql.=$sqlwhere;
+				$sql .= $sqlwhere;
 				//print $sql;
 
-				$sql .= ' ORDER BY ' . implode(', ', $fields_label);
+				$sql .= ' ORDER BY '.implode(', ', $fields_label);
 
 				dol_syslog(get_class($this).'::showInputField type=sellist', LOG_DEBUG);
 				$resql = $this->db->query($sql);
 				if ($resql)
 				{
-					$out.='<option value="0">&nbsp;</option>';
+					$out .= '<option value="0">&nbsp;</option>';
 					$num = $this->db->num_rows($resql);
 					$i = 0;
 					while ($i < $num)
 					{
-						$labeltoshow='';
+						$labeltoshow = '';
 						$obj = $this->db->fetch_object($resql);
 
 						// Several field into label (eq table:code|libelle:rowid)
 						$notrans = false;
-						$fields_label = explode('|',$InfoFieldList[1]);
+						$fields_label = explode('|', $InfoFieldList[1]);
 						if (is_array($fields_label))
 						{
 							$notrans = true;
 							foreach ($fields_label as $field_toshow)
 							{
-								$labeltoshow.= $obj->$field_toshow.' ';
+								$labeltoshow .= $obj->$field_toshow.' ';
 							}
 						}
 						else
 						{
-							$labeltoshow=$obj->{$InfoFieldList[1]};
+							$labeltoshow = $obj->{$InfoFieldList[1]};
 						}
-						$labeltoshow=dol_trunc($labeltoshow,45);
+						$labeltoshow = dol_trunc($labeltoshow, 45);
 
 						if ($value == $obj->rowid)
 						{
 							foreach ($fields_label as $field_toshow)
 							{
-								$translabel=$langs->trans($obj->$field_toshow);
-								if ($translabel!=$obj->$field_toshow) {
-									$labeltoshow=dol_trunc($translabel,18).' ';
-								}else {
-									$labeltoshow=dol_trunc($obj->$field_toshow,18).' ';
+								$translabel = $langs->trans($obj->$field_toshow);
+								if ($translabel != $obj->$field_toshow) {
+									$labeltoshow = dol_trunc($translabel, 18).' ';
+								} else {
+									$labeltoshow = dol_trunc($obj->$field_toshow, 18).' ';
 								}
 							}
-							$out.='<option value="'.$obj->rowid.'" selected>'.$labeltoshow.'</option>';
+							$out .= '<option value="'.$obj->rowid.'" selected>'.$labeltoshow.'</option>';
 						}
 						else
 						{
-							if (! $notrans)
+							if (!$notrans)
 							{
-								$translabel=$langs->trans($obj->{$InfoFieldList[1]});
-								if ($translabel!=$obj->{$InfoFieldList[1]}) {
-									$labeltoshow=dol_trunc($translabel,18);
+								$translabel = $langs->trans($obj->{$InfoFieldList[1]});
+								if ($translabel != $obj->{$InfoFieldList[1]}) {
+									$labeltoshow = dol_trunc($translabel, 18);
 								}
 								else {
-									$labeltoshow=dol_trunc($obj->{$InfoFieldList[1]},18);
+									$labeltoshow = dol_trunc($obj->{$InfoFieldList[1]},18);
 								}
 							}
-							if (empty($labeltoshow)) $labeltoshow='(not defined)';
-							if ($value==$obj->rowid)
+							if (empty($labeltoshow)) $labeltoshow = '(not defined)';
+							if ($value == $obj->rowid)
 							{
-								$out.='<option value="'.$obj->rowid.'" selected>'.$labeltoshow.'</option>';
+								$out .= '<option value="'.$obj->rowid.'" selected>'.$labeltoshow.'</option>';
 							}
 
 							if (!empty($InfoFieldList[3]) && $parentField)
@@ -1248,10 +1248,10 @@ 
 								$parent = $parentName.':'.$obj->{$parentField};
 							}
 
-							$out.='<option value="'.$obj->rowid.'"';
-							$out.= ($value==$obj->rowid?' selected':'');
-							$out.= (!empty($parent)?' parent="'.$parent.'"':'');
-							$out.='>'.$labeltoshow.'</option>';
+							$out .= '<option value="'.$obj->rowid.'"';
+							$out .= ($value == $obj->rowid ? ' selected' : '');
+							$out .= (!empty($parent) ? ' parent="'.$parent.'"' : '');
+							$out .= '>'.$labeltoshow.'</option>';
 						}
 
 						$i++;
@@ -1262,23 +1262,23 @@ 
 					print 'Error in request '.$sql.' '.$this->db->lasterror().'. Check setup of extra parameters.<br>';
 				}
 			}
-			$out.='</select>';
+			$out .= '</select>';
 		}
 		elseif ($type == 'checkbox')
 		{
-			$value_arr=explode(',',$value);
-			$out=$form->multiselectarray($keyprefix.$key.$keysuffix, (empty($param['options'])?null:$param['options']), $value_arr, '', 0, '', 0, '100%');
+			$value_arr = explode(',', $value);
+			$out = $form->multiselectarray($keyprefix.$key.$keysuffix, (empty($param['options']) ?null:$param['options']), $value_arr, '', 0, '', 0, '100%');
 		}
 		elseif ($type == 'radio')
 		{
-			$out='';
+			$out = '';
 			foreach ($param['options'] as $keyopt => $val)
 			{
-				$out.='<input class="flat '.$morecss.'" type="radio" name="'.$keyprefix.$key.$keysuffix.'" id="'.$keyprefix.$key.$keysuffix.'" '.($moreparam?$moreparam:'');
-				$out.=' value="'.$keyopt.'"';
-				$out.=' id="'.$keyprefix.$key.$keysuffix.'_'.$keyopt.'"';
-				$out.= ($value==$keyopt?'checked':'');
-				$out.='/><label for="'.$keyprefix.$key.$keysuffix.'_'.$keyopt.'">'.$val.'</label><br>';
+				$out .= '<input class="flat '.$morecss.'" type="radio" name="'.$keyprefix.$key.$keysuffix.'" id="'.$keyprefix.$key.$keysuffix.'" '.($moreparam ? $moreparam : '');
+				$out .= ' value="'.$keyopt.'"';
+				$out .= ' id="'.$keyprefix.$key.$keysuffix.'_'.$keyopt.'"';
+				$out .= ($value == $keyopt ? 'checked' : '');
+				$out .= '/><label for="'.$keyprefix.$key.$keysuffix.'_'.$keyopt.'">'.$val.'</label><br>';
 			}
 		}
 		elseif ($type == 'chkbxlst')
@@ -1293,24 +1293,24 @@ 
 			if (is_array($param['options'])) {
 				$param_list = array_keys($param['options']);
 				$InfoFieldList = explode(":", $param_list[0]);
-				$parentName='';
-				$parentField='';
+				$parentName = '';
+				$parentField = '';
 				// 0 : tableName
 				// 1 : label field name
 				// 2 : key fields name (if differ of rowid)
 				// 3 : key field parent (for dependent lists)
 				// 4 : where clause filter on column or table extrafield, syntax field='value' or extra.field=value
-				$keyList = (empty($InfoFieldList[2]) ? 'rowid' : $InfoFieldList[2] . ' as rowid');
+				$keyList = (empty($InfoFieldList[2]) ? 'rowid' : $InfoFieldList[2].' as rowid');
 
-				if (count($InfoFieldList) > 3 && ! empty($InfoFieldList[3])) {
-					list ( $parentName, $parentField ) = explode('|', $InfoFieldList[3]);
-					$keyList .= ', ' . $parentField;
+				if (count($InfoFieldList) > 3 && !empty($InfoFieldList[3])) {
+					list ($parentName, $parentField) = explode('|', $InfoFieldList[3]);
+					$keyList .= ', '.$parentField;
 				}
-				if (count($InfoFieldList) > 4 && ! empty($InfoFieldList[4])) {
+				if (count($InfoFieldList) > 4 && !empty($InfoFieldList[4])) {
 					if (strpos($InfoFieldList[4], 'extra.') !== false) {
-						$keyList = 'main.' . $InfoFieldList[2] . ' as rowid';
+						$keyList = 'main.'.$InfoFieldList[2].' as rowid';
 					} else {
-						$keyList = $InfoFieldList[2] . ' as rowid';
+						$keyList = $InfoFieldList[2].' as rowid';
 					}
 				}
 
@@ -1321,59 +1321,59 @@ 
 				}
 
 				$sqlwhere = '';
-				$sql = 'SELECT ' . $keyList;
-				$sql .= ' FROM ' . MAIN_DB_PREFIX . $InfoFieldList[0];
-				if (! empty($InfoFieldList[4])) {
+				$sql = 'SELECT '.$keyList;
+				$sql .= ' FROM '.MAIN_DB_PREFIX.$InfoFieldList[0];
+				if (!empty($InfoFieldList[4])) {
 
 					// can use SELECT request
-					if (strpos($InfoFieldList[4], '$SEL$')!==false) {
-						$InfoFieldList[4]=str_replace('$SEL$','SELECT',$InfoFieldList[4]);
+					if (strpos($InfoFieldList[4], '$SEL$') !== false) {
+						$InfoFieldList[4] = str_replace('$SEL$', 'SELECT', $InfoFieldList[4]);
 					}
 
 					// current object id can be use into filter
-					if (strpos($InfoFieldList[4], '$ID$')!==false && !empty($objectid)) {
-						$InfoFieldList[4]=str_replace('$ID$',$objectid,$InfoFieldList[4]);
-					} else if (preg_match("#^.*list.php$#",$_SERVER["DOCUMENT_URI"])) {
+					if (strpos($InfoFieldList[4], '$ID$') !== false && !empty($objectid)) {
+						$InfoFieldList[4] = str_replace('$ID$', $objectid, $InfoFieldList[4]);
+					} else if (preg_match("#^.*list.php$#", $_SERVER["DOCUMENT_URI"])) {
 						// Pattern for word=$ID$
 						$word = '\b[a-zA-Z0-9-\.-_]+\b=\$ID\$';
 						
 						// Removing space arount =, ( and )
-						$InfoFieldList[4]=preg_replace('# *(=|\(|\)) *#','$1', $InfoFieldList[4]);
+						$InfoFieldList[4] = preg_replace('# *(=|\(|\)) *#', '$1', $InfoFieldList[4]);
 						
 						$nbPreg = 1;
 						// While we have parenthesis
-						while ($nbPreg!=0) {
+						while ($nbPreg != 0) {
 							// Init des compteurs
 							$nbPregRepl = $nbPregSel = 0;
 							// On retire toutes les parenthèses sans = avant
-							$InfoFieldList[4]=preg_replace( '#([^=])(\([^)^(]*(' . $word .   ')[^)^(]*\))#','$1 $3 ',$InfoFieldList[4],-1,$nbPregRepl);
+							$InfoFieldList[4] = preg_replace('#([^=])(\([^)^(]*('.$word.')[^)^(]*\))#', '$1 $3 ', $InfoFieldList[4], -1, $nbPregRepl);
 							// On retire les espaces autour des = et parenthèses
-							$InfoFieldList[4]=preg_replace('# *(=|\(|\)) *#','$1', $InfoFieldList[4]);
+							$InfoFieldList[4] = preg_replace('# *(=|\(|\)) *#', '$1', $InfoFieldList[4]);
 							// On retire toutes les parenthèses avec = avant
-							$InfoFieldList[4]=preg_replace(  '#\b[a-zA-Z0-9-\.-_]+\b=\([^)^(]*(' . $word .   ')[^)^(]*\)#','$1 ',$InfoFieldList[4], -1, $nbPregSel);
+							$InfoFieldList[4] = preg_replace('#\b[a-zA-Z0-9-\.-_]+\b=\([^)^(]*('.$word.')[^)^(]*\)#', '$1 ', $InfoFieldList[4], -1, $nbPregSel);
 							// On retire les espaces autour des = et parenthèses
-							$InfoFieldList[4]=preg_replace('# *(=|\(|\)) *#','$1', $InfoFieldList[4]);
+							$InfoFieldList[4] = preg_replace('# *(=|\(|\)) *#', '$1', $InfoFieldList[4]);
 							
 							// Calcul du compteur général pour la boucle
 							$nbPreg = $nbPregRepl + $nbPregSel;
 						}
 						
 						// Si l'on a un AND ou un OR, avant ou après
-						preg_match('#(AND|OR|) *('.$word.') *(AND|OR|)#',$InfoFieldList[4],$matchCondition);
-						while(!empty($matchCondition[0])) {
+						preg_match('#(AND|OR|) *('.$word.') *(AND|OR|)#', $InfoFieldList[4], $matchCondition);
+						while (!empty($matchCondition[0])) {
 							// If the two sides differ but are not empty
-							if (! empty($matchCondition[1]) && ! empty($matchCondition[3]) && $matchCondition[1] != $matchCondition[3] ) {
+							if (!empty($matchCondition[1]) && !empty($matchCondition[3]) && $matchCondition[1] != $matchCondition[3]) {
 								// Nobody sain would do that without parentheses
-								$InfoFieldList[4]=str_replace('$ID$','0',$InfoFieldList[4]);
+								$InfoFieldList[4] = str_replace('$ID$', '0', $InfoFieldList[4]);
 							}
 							else {
-								if (! empty($matchCondition[1])) {
-									$boolCond =(( $matchCondition[1] == "AND" )?' AND 1 ':' OR 0 ');
-									$InfoFieldList[4]=str_replace($matchCondition[0],$boolCond.$matchCondition[3],$InfoFieldList[4]);
+								if (!empty($matchCondition[1])) {
+									$boolCond = (($matchCondition[1] == "AND") ? ' AND 1 ' : ' OR 0 ');
+									$InfoFieldList[4] = str_replace($matchCondition[0], $boolCond.$matchCondition[3], $InfoFieldList[4]);
 								}
-								else if (! empty($matchCondition[3])) {
-									$boolCond =(( $matchCondition[3] == "AND" )?' 1 AND ':' 0 OR');
-									$InfoFieldList[4]=str_replace($matchCondition[0],$boolCond,$InfoFieldList[4]);
+								else if (!empty($matchCondition[3])) {
+									$boolCond = (($matchCondition[3] == "AND") ? ' 1 AND ' : ' 0 OR');
+									$InfoFieldList[4] = str_replace($matchCondition[0], $boolCond, $InfoFieldList[4]);
 								}
 								else {
 									$InfoFieldList[4] = 1;
@@ -1381,41 +1381,41 @@ 
 							}
 							
 							// Si l'on a un AND ou un OR, avant ou après
-							preg_match('#(AND|OR|) *('.$word.') *(AND|OR|)#',$InfoFieldList[4],$matchCondition);
+							preg_match('#(AND|OR|) *('.$word.') *(AND|OR|)#', $InfoFieldList[4], $matchCondition);
 						}
 					}
 					else {
-						$InfoFieldList[4]=str_replace('$ID$','0',$InfoFieldList[4]);
+						$InfoFieldList[4] = str_replace('$ID$', '0', $InfoFieldList[4]);
 					}
 
 					// We have to join on extrafield table
 					if (strpos($InfoFieldList[4], 'extra') !== false) {
-						$sql .= ' as main, ' . MAIN_DB_PREFIX . $InfoFieldList[0] . '_extrafields as extra';
-						$sqlwhere .= ' WHERE extra.fk_object=main.' . $InfoFieldList[2] . ' AND ' . $InfoFieldList[4];
+						$sql .= ' as main, '.MAIN_DB_PREFIX.$InfoFieldList[0].'_extrafields as extra';
+						$sqlwhere .= ' WHERE extra.fk_object=main.'.$InfoFieldList[2].' AND '.$InfoFieldList[4];
 					} else {
-						$sqlwhere .= ' WHERE ' . $InfoFieldList[4];
+						$sqlwhere .= ' WHERE '.$InfoFieldList[4];
 					}
 				} else {
 					$sqlwhere .= ' WHERE 1=1';
 				}
 				// Some tables may have field, some other not. For the moment we disable it.
-				if (in_array($InfoFieldList[0], array ('tablewithentity')))
+				if (in_array($InfoFieldList[0], array('tablewithentity')))
 				{
-					$sqlwhere .= ' AND entity = ' . $conf->entity;
+					$sqlwhere .= ' AND entity = '.$conf->entity;
 				}
 				// $sql.=preg_replace('/^ AND /','',$sqlwhere);
 				// print $sql;
 
 				$sql .= $sqlwhere;
-				dol_syslog(get_class($this) . '::showInputField type=chkbxlst',LOG_DEBUG);
+				dol_syslog(get_class($this).'::showInputField type=chkbxlst', LOG_DEBUG);
 				$resql = $this->db->query($sql);
 				if ($resql) {
 					$num = $this->db->num_rows($resql);
 					$i = 0;
 
-					$data=array();
+					$data = array();
 
-					while ( $i < $num ) {
+					while ($i < $num) {
 						$labeltoshow = '';
 						$obj = $this->db->fetch_object($resql);
 
@@ -1424,8 +1424,8 @@ 
 						$fields_label = explode('|', $InfoFieldList[1]);
 						if (is_array($fields_label)) {
 							$notrans = true;
-							foreach ( $fields_label as $field_toshow ) {
-								$labeltoshow .= $obj->$field_toshow . ' ';
+							foreach ($fields_label as $field_toshow) {
+								$labeltoshow .= $obj->$field_toshow.' ';
 							}
 						} else {
 							$labeltoshow = $obj->{$InfoFieldList[1]};
@@ -1433,18 +1433,18 @@ 
 						$labeltoshow = dol_trunc($labeltoshow, 45);
 
 						if (is_array($value_arr) && in_array($obj->rowid, $value_arr)) {
-							foreach ( $fields_label as $field_toshow ) {
+							foreach ($fields_label as $field_toshow) {
 								$translabel = $langs->trans($obj->$field_toshow);
 								if ($translabel != $obj->$field_toshow) {
-									$labeltoshow = dol_trunc($translabel, 18) . ' ';
+									$labeltoshow = dol_trunc($translabel, 18).' ';
 								} else {
-									$labeltoshow = dol_trunc($obj->$field_toshow, 18) . ' ';
+									$labeltoshow = dol_trunc($obj->$field_toshow, 18).' ';
 								}
 							}
 
-							$data[$obj->rowid]=$labeltoshow;
+							$data[$obj->rowid] = $labeltoshow;
 						} else {
-							if (! $notrans) {
+							if (!$notrans) {
 								$translabel = $langs->trans($obj->{$InfoFieldList[1]});
 								if ($translabel != $obj->{$InfoFieldList[1]}) {
 									$labeltoshow = dol_trunc($translabel, 18);
@@ -1456,40 +1456,40 @@ 
 								$labeltoshow = '(not defined)';
 
 								if (is_array($value_arr) && in_array($obj->rowid, $value_arr)) {
-									$data[$obj->rowid]=$labeltoshow;
+									$data[$obj->rowid] = $labeltoshow;
 								}
 
-								if (! empty($InfoFieldList[3]) && $parentField) {
-									$parent = $parentName . ':' . $obj->{$parentField};
+								if (!empty($InfoFieldList[3]) && $parentField) {
+									$parent = $parentName.':'.$obj->{$parentField};
 								}
 
-								$data[$obj->rowid]=$labeltoshow;
+								$data[$obj->rowid] = $labeltoshow;
 						}
 
-						$i ++;
+						$i++;
 					}
 					$this->db->free($resql);
 
-					$out=$form->multiselectarray($keyprefix.$key.$keysuffix, $data, $value_arr, '', 0, '', 0, '100%');
+					$out = $form->multiselectarray($keyprefix.$key.$keysuffix, $data, $value_arr, '', 0, '', 0, '100%');
 				} else {
-					print 'Error in request ' . $sql . ' ' . $this->db->lasterror() . '. Check setup of extra parameters.<br>';
+					print 'Error in request '.$sql.' '.$this->db->lasterror().'. Check setup of extra parameters.<br>';
 				}
 			}
 		}
 		elseif ($type == 'link')
 		{
-			$param_list=array_keys($param['options']);				// $param_list='ObjectName:classPath'
-			$showempty=(($required && $default != '')?0:1);
-			$out=$form->selectForForms($param_list[0], $keyprefix.$key.$keysuffix, $value, $showempty);
+			$param_list = array_keys($param['options']); // $param_list='ObjectName:classPath'
+			$showempty = (($required && $default != '') ? 0 : 1);
+			$out = $form->selectForForms($param_list[0], $keyprefix.$key.$keysuffix, $value, $showempty);
 		}
 		elseif ($type == 'password')
 		{
 			// If prefix is 'search_', field is used as a filter, we use a common text field.
-			$out='<input style="display:none" type="text" name="fakeusernameremembered">';	// Hidden field to reduce impact of evil Google Chrome autopopulate bug.
-			$out.='<input autocomplete="new-password" type="'.($keyprefix=='search_'?'text':'password').'" class="flat '.$morecss.'" name="'.$keyprefix.$key.$keysuffix.'" id="'.$keyprefix.$key.$keysuffix.'" value="'.$value.'" '.($moreparam?$moreparam:'').'>';
+			$out = '<input style="display:none" type="text" name="fakeusernameremembered">'; // Hidden field to reduce impact of evil Google Chrome autopopulate bug.
+			$out .= '<input autocomplete="new-password" type="'.($keyprefix == 'search_' ? 'text' : 'password').'" class="flat '.$morecss.'" name="'.$keyprefix.$key.$keysuffix.'" id="'.$keyprefix.$key.$keysuffix.'" value="'.$value.'" '.($moreparam ? $moreparam : '').'>';
 		}
 		if (!empty($hidden)) {
-			$out='<input type="hidden" value="'.$value.'" name="'.$keyprefix.$key.$keysuffix.'" id="'.$keyprefix.$key.$keysuffix.'"/>';
+			$out = '<input type="hidden" value="'.$value.'" name="'.$keyprefix.$key.$keysuffix.'" id="'.$keyprefix.$key.$keysuffix.'"/>';
 		}
 		/* Add comments
 		 if ($type == 'date') $out.=' (YYYY-MM-DD)';
@@ -1508,44 +1508,44 @@ 
 	 * @param	string	$extrafieldsobjectkey	If defined (for example $object->table_element), use the new method to get extrafields data
 	 * @return	string							Formated value
 	 */
-	function showOutputField($key, $value, $moreparam='', $extrafieldsobjectkey='')
+	function showOutputField($key, $value, $moreparam = '', $extrafieldsobjectkey = '')
 	{
-		global $conf,$langs;
-
-		if (! empty($extrafieldsobjectkey))
-		{
-			$label=$this->attributes[$extrafieldsobjectkey]['label'][$key];
-			$type=$this->attributes[$extrafieldsobjectkey]['type'][$key];
-			$size=$this->attributes[$extrafieldsobjectkey]['size'][$key];
-			$default=$this->attributes[$extrafieldsobjectkey]['default'][$key];
-			$computed=$this->attributes[$extrafieldsobjectkey]['computed'][$key];
-			$unique=$this->attributes[$extrafieldsobjectkey]['unique'][$key];
-			$required=$this->attributes[$extrafieldsobjectkey]['required'][$key];
-			$param=$this->attributes[$extrafieldsobjectkey]['param'][$key];
-			$perms=dol_eval($this->attributes[$extrafieldsobjectkey]['perms'][$key], 1);
-			$langfile=$this->attributes[$extrafieldsobjectkey]['langfile'][$key];
-			$list=dol_eval($this->attributes[$extrafieldsobjectkey]['list'][$key], 1);
-			$help=$this->attributes[$extrafieldsobjectkey]['help'][$key];
-			$hidden=(empty($list) ? 1 : 0);		// If $list empty, we are sure it is hidden, otherwise we show. If it depends on mode (view/create/edit form or list, this must be filtered by caller)
+		global $conf, $langs;
+
+		if (!empty($extrafieldsobjectkey))
+		{
+			$label = $this->attributes[$extrafieldsobjectkey]['label'][$key];
+			$type = $this->attributes[$extrafieldsobjectkey]['type'][$key];
+			$size = $this->attributes[$extrafieldsobjectkey]['size'][$key];
+			$default = $this->attributes[$extrafieldsobjectkey]['default'][$key];
+			$computed = $this->attributes[$extrafieldsobjectkey]['computed'][$key];
+			$unique = $this->attributes[$extrafieldsobjectkey]['unique'][$key];
+			$required = $this->attributes[$extrafieldsobjectkey]['required'][$key];
+			$param = $this->attributes[$extrafieldsobjectkey]['param'][$key];
+			$perms = dol_eval($this->attributes[$extrafieldsobjectkey]['perms'][$key], 1);
+			$langfile = $this->attributes[$extrafieldsobjectkey]['langfile'][$key];
+			$list = dol_eval($this->attributes[$extrafieldsobjectkey]['list'][$key], 1);
+			$help = $this->attributes[$extrafieldsobjectkey]['help'][$key];
+			$hidden = (empty($list) ? 1 : 0); // If $list empty, we are sure it is hidden, otherwise we show. If it depends on mode (view/create/edit form or list, this must be filtered by caller)
 		}
 		else	// Old usage
 		{
-			$label=$this->attribute_label[$key];
-			$type=$this->attribute_type[$key];
-			$size=$this->attribute_size[$key];
-			$default=$this->attribute_default[$key];
-			$computed=$this->attribute_computed[$key];
-			$unique=$this->attribute_unique[$key];
-			$required=$this->attribute_required[$key];
-			$param=$this->attribute_param[$key];
-			$perms=dol_eval($this->attribute_perms[$key], 1);
-			$langfile=$this->attribute_langfile[$key];
-			$list=dol_eval($this->attribute_list[$key], 1);
-			$help='';	// Not supported with old syntax
-			$hidden=(empty($list) ? 1 : 0);		// If $list empty, we are sure it is hidden, otherwise we show. If it depends on mode (view/create/edit form or list, this must be filtered by caller)
+			$label = $this->attribute_label[$key];
+			$type = $this->attribute_type[$key];
+			$size = $this->attribute_size[$key];
+			$default = $this->attribute_default[$key];
+			$computed = $this->attribute_computed[$key];
+			$unique = $this->attribute_unique[$key];
+			$required = $this->attribute_required[$key];
+			$param = $this->attribute_param[$key];
+			$perms = dol_eval($this->attribute_perms[$key], 1);
+			$langfile = $this->attribute_langfile[$key];
+			$list = dol_eval($this->attribute_list[$key], 1);
+			$help = ''; // Not supported with old syntax
+			$hidden = (empty($list) ? 1 : 0); // If $list empty, we are sure it is hidden, otherwise we show. If it depends on mode (view/create/edit form or list, this must be filtered by caller)
 		}
 
-		if ($hidden) return '';		// This is a protection. If field is hidden, we should just not call this method.
+		if ($hidden) return ''; // This is a protection. If field is hidden, we should just not call this method.
 
 		// If field is a computed field, value must become result of compute
 		if ($computed)
@@ -1555,88 +1555,88 @@ 
 		    $value = dol_eval($computed, 1, 0);
 		}
 
-		$showsize=0;
+		$showsize = 0;
 		if ($type == 'date')
 		{
-			$showsize=10;
-			$value=dol_print_date($value, 'day');
+			$showsize = 10;
+			$value = dol_print_date($value, 'day');
 		}
 		elseif ($type == 'datetime')
 		{
-			$showsize=19;
-			$value=dol_print_date($value, 'dayhour');
+			$showsize = 19;
+			$value = dol_print_date($value, 'dayhour');
 		}
 		elseif ($type == 'int')
 		{
-			$showsize=10;
+			$showsize = 10;
 		}
 		elseif ($type == 'double')
 		{
 			if (!empty($value)) {
-				$value=price($value);
+				$value = price($value);
 			}
 		}
 		elseif ($type == 'boolean')
 		{
-			$checked='';
+			$checked = '';
 			if (!empty($value)) {
-				$checked=' checked ';
+				$checked = ' checked ';
 			}
-			$value='<input type="checkbox" '.$checked.' '.($moreparam?$moreparam:'').' readonly disabled>';
+			$value = '<input type="checkbox" '.$checked.' '.($moreparam ? $moreparam : '').' readonly disabled>';
 		}
 		elseif ($type == 'mail')
 		{
-			$value=dol_print_email($value, 0, 0, 0, 64, 1, 1);
+			$value = dol_print_email($value, 0, 0, 0, 64, 1, 1);
 		}
 		elseif ($type == 'url')
 		{
-			$value=dol_print_url($value,'_blank',32,1);
+			$value = dol_print_url($value, '_blank', 32, 1);
 		}
 		elseif ($type == 'phone')
 		{
-			$value=dol_print_phone($value, '', 0, 0, '', '&nbsp;', 1);
+			$value = dol_print_phone($value, '', 0, 0, '', '&nbsp;', 1);
 		}
 		elseif ($type == 'price')
 		{
-			$value=price($value, 0, $langs, 0, 0, -1, $conf->currency);
+			$value = price($value, 0, $langs, 0, 0, -1, $conf->currency);
 		}
 		elseif ($type == 'select')
 		{
-			if ($langfile && $param['options'][$value]) $value=$langs->trans($param['options'][$value]);
-			else $value=$param['options'][$value];
+			if ($langfile && $param['options'][$value]) $value = $langs->trans($param['options'][$value]);
+			else $value = $param['options'][$value];
 		}
 		elseif ($type == 'sellist')
 		{
-			$param_list=array_keys($param['options']);
+			$param_list = array_keys($param['options']);
 			$InfoFieldList = explode(":", $param_list[0]);
 
-			$selectkey="rowid";
-			$keyList='rowid';
+			$selectkey = "rowid";
+			$keyList = 'rowid';
 
-			if (count($InfoFieldList)>=3)
+			if (count($InfoFieldList) >= 3)
 			{
 				$selectkey = $InfoFieldList[2];
-				$keyList=$InfoFieldList[2].' as rowid';
+				$keyList = $InfoFieldList[2].' as rowid';
 			}
 
-			$fields_label = explode('|',$InfoFieldList[1]);
-			if(is_array($fields_label)) {
-				$keyList .=', ';
+			$fields_label = explode('|', $InfoFieldList[1]);
+			if (is_array($fields_label)) {
+				$keyList .= ', ';
 				$keyList .= implode(', ', $fields_label);
 			}
 
 			$sql = 'SELECT '.$keyList;
-			$sql.= ' FROM '.MAIN_DB_PREFIX .$InfoFieldList[0];
-			if (strpos($InfoFieldList[4], 'extra')!==false)
+			$sql .= ' FROM '.MAIN_DB_PREFIX.$InfoFieldList[0];
+			if (strpos($InfoFieldList[4], 'extra') !== false)
 			{
-				$sql.= ' as main';
+				$sql .= ' as main';
 			}
-			if ($selectkey=='rowid' && empty($value)) {
-				$sql.= " WHERE ".$selectkey."=0";
-			} elseif ($selectkey=='rowid') {
-				$sql.= " WHERE ".$selectkey."=".$this->db->escape($value);
-			}else {
-				$sql.= " WHERE ".$selectkey."='".$this->db->escape($value)."'";
+			if ($selectkey == 'rowid' && empty($value)) {
+				$sql .= " WHERE ".$selectkey."=0";
+			} elseif ($selectkey == 'rowid') {
+				$sql .= " WHERE ".$selectkey."=".$this->db->escape($value);
+			} else {
+				$sql .= " WHERE ".$selectkey."='".$this->db->escape($value)."'";
 			}
 
 			//$sql.= ' AND entity = '.$conf->entity;
@@ -1645,38 +1645,38 @@ 
 			$resql = $this->db->query($sql);
 			if ($resql)
 			{
-				$value='';	// value was used, so now we reste it to use it to build final output
+				$value = ''; // value was used, so now we reste it to use it to build final output
 
 				$obj = $this->db->fetch_object($resql);
 
 				// Several field into label (eq table:code|libelle:rowid)
-				$fields_label = explode('|',$InfoFieldList[1]);
+				$fields_label = explode('|', $InfoFieldList[1]);
 
-				if(is_array($fields_label) && count($fields_label)>1)
+				if (is_array($fields_label) && count($fields_label) > 1)
 				{
 					foreach ($fields_label as $field_toshow)
 					{
-						$translabel='';
+						$translabel = '';
 						if (!empty($obj->$field_toshow)) {
-							$translabel=$langs->trans($obj->$field_toshow);
+							$translabel = $langs->trans($obj->$field_toshow);
 						}
-						if ($translabel!=$field_toshow) {
-							$value.=dol_trunc($translabel,18).' ';
-						}else {
-							$value.=$obj->$field_toshow.' ';
+						if ($translabel != $field_toshow) {
+							$value .= dol_trunc($translabel, 18).' ';
+						} else {
+							$value .= $obj->$field_toshow.' ';
 						}
 					}
 				}
 				else
 				{
-					$translabel='';
+					$translabel = '';
 					if (!empty($obj->{$InfoFieldList[1]})) {
-						$translabel=$langs->trans($obj->{$InfoFieldList[1]});
+						$translabel = $langs->trans($obj->{$InfoFieldList[1]});
 					}
-					if ($translabel!=$obj->{$InfoFieldList[1]}) {
-						$value=dol_trunc($translabel,18);
-					}else {
-						$value=$obj->{$InfoFieldList[1]};
+					if ($translabel != $obj->{$InfoFieldList[1]}) {
+						$value = dol_trunc($translabel, 18);
+					} else {
+						$value = $obj->{$InfoFieldList[1]};
 					}
 				}
 			}
@@ -1684,20 +1684,20 @@ 
 		}
 		elseif ($type == 'radio')
 		{
-			$value=$param['options'][$value];
+			$value = $param['options'][$value];
 		}
 		elseif ($type == 'checkbox')
 		{
-			$value_arr=explode(',',$value);
-			$value='';
-			$toprint=array();
+			$value_arr = explode(',', $value);
+			$value = '';
+			$toprint = array();
 			if (is_array($value_arr))
 			{
 				foreach ($value_arr as $keyval=>$valueval) {
-					$toprint[]='<li class="select2-search-choice-dolibarr noborderoncategories" style="background: #aaa">'.$param['options'][$valueval].'</li>';
+					$toprint[] = '<li class="select2-search-choice-dolibarr noborderoncategories" style="background: #aaa">'.$param['options'][$valueval].'</li>';
 				}
 			}
-			$value='<div class="select2-container-multi-dolibarr" style="width: 90%;"><ul class="select2-choices-dolibarr">'.implode(' ', $toprint).'</ul></div>';
+			$value = '<div class="select2-container-multi-dolibarr" style="width: 90%;"><ul class="select2-choices-dolibarr">'.implode(' ', $toprint).'</ul></div>';
 		}
 		elseif ($type == 'chkbxlst')
 		{
@@ -1711,7 +1711,7 @@ 
 
 			if (count($InfoFieldList) >= 3) {
 				$selectkey = $InfoFieldList[2];
-				$keyList = $InfoFieldList[2] . ' as rowid';
+				$keyList = $InfoFieldList[2].' as rowid';
 			}
 
 			$fields_label = explode('|', $InfoFieldList[1]);
@@ -1720,74 +1720,74 @@ 
 				$keyList .= implode(', ', $fields_label);
 			}
 
-			$sql = 'SELECT ' . $keyList;
-			$sql .= ' FROM ' . MAIN_DB_PREFIX . $InfoFieldList[0];
+			$sql = 'SELECT '.$keyList;
+			$sql .= ' FROM '.MAIN_DB_PREFIX.$InfoFieldList[0];
 			if (strpos($InfoFieldList[4], 'extra') !== false) {
 				$sql .= ' as main';
 			}
 			// $sql.= " WHERE ".$selectkey."='".$this->db->escape($value)."'";
 			// $sql.= ' AND entity = '.$conf->entity;
 
-			dol_syslog(get_class($this) . ':showOutputField:$type=chkbxlst',LOG_DEBUG);
+			dol_syslog(get_class($this).':showOutputField:$type=chkbxlst', LOG_DEBUG);
 			$resql = $this->db->query($sql);
 			if ($resql) {
 				$value = ''; // value was used, so now we reste it to use it to build final output
-				$toprint=array();
-				while ( $obj = $this->db->fetch_object($resql) ) {
+				$toprint = array();
+				while ($obj = $this->db->fetch_object($resql)) {
 
 					// Several field into label (eq table:code|libelle:rowid)
 					$fields_label = explode('|', $InfoFieldList[1]);
 					if (is_array($value_arr) && in_array($obj->rowid, $value_arr)) {
 						if (is_array($fields_label) && count($fields_label) > 1) {
-							foreach ( $fields_label as $field_toshow ) {
+							foreach ($fields_label as $field_toshow) {
 								$translabel = '';
-								if (! empty($obj->$field_toshow)) {
+								if (!empty($obj->$field_toshow)) {
 									$translabel = $langs->trans($obj->$field_toshow);
 								}
 								if ($translabel != $field_toshow) {
-									$toprint[]='<li class="select2-search-choice-dolibarr noborderoncategories" style="background: #aaa">'.dol_trunc($translabel, 18).'</li>';
+									$toprint[] = '<li class="select2-search-choice-dolibarr noborderoncategories" style="background: #aaa">'.dol_trunc($translabel, 18).'</li>';
 								} else {
-									$toprint[]='<li class="select2-search-choice-dolibarr noborderoncategories" style="background: #aaa">'.$obj->$field_toshow.'</li>';
+									$toprint[] = '<li class="select2-search-choice-dolibarr noborderoncategories" style="background: #aaa">'.$obj->$field_toshow.'</li>';
 								}
 							}
 						} else {
 							$translabel = '';
-							if (! empty($obj->{$InfoFieldList[1]})) {
+							if (!empty($obj->{$InfoFieldList[1]})) {
 								$translabel = $langs->trans($obj->{$InfoFieldList[1]});
 							}
 							if ($translabel != $obj->{$InfoFieldList[1]}) {
-								$toprint[]='<li class="select2-search-choice-dolibarr noborderoncategories" style="background: #aaa">'.dol_trunc($translabel, 18).'</li>';
+								$toprint[] = '<li class="select2-search-choice-dolibarr noborderoncategories" style="background: #aaa">'.dol_trunc($translabel, 18).'</li>';
 							} else {
-								$toprint[]='<li class="select2-search-choice-dolibarr noborderoncategories" style="background: #aaa">'.$obj->{$InfoFieldList[1]}.'</li>';
+								$toprint[] = '<li class="select2-search-choice-dolibarr noborderoncategories" style="background: #aaa">'.$obj->{$InfoFieldList[1]}.'</li>';
 							}
 						}
 					}
 				}
-				$value='<div class="select2-container-multi-dolibarr" style="width: 90%;"><ul class="select2-choices-dolibarr">'.implode(' ', $toprint).'</ul></div>';
+				$value = '<div class="select2-container-multi-dolibarr" style="width: 90%;"><ul class="select2-choices-dolibarr">'.implode(' ', $toprint).'</ul></div>';
 			} else {
-				dol_syslog(get_class($this) . '::showOutputField error ' . $this->db->lasterror(), LOG_WARNING);
+				dol_syslog(get_class($this).'::showOutputField error '.$this->db->lasterror(), LOG_WARNING);
 			}
 		}
 		elseif ($type == 'link')
 		{
-			$out='';
+			$out = '';
 
 			// Only if something to display (perf)
 			if ($value)		// If we have -1 here, pb is into sert, not into ouptu
 			{
-				$param_list=array_keys($param['options']);				// $param_list='ObjectName:classPath'
+				$param_list = array_keys($param['options']); // $param_list='ObjectName:classPath'
 
 				$InfoFieldList = explode(":", $param_list[0]);
-				$classname=$InfoFieldList[0];
-				$classpath=$InfoFieldList[1];
-				if (! empty($classpath))
+				$classname = $InfoFieldList[0];
+				$classpath = $InfoFieldList[1];
+				if (!empty($classpath))
 				{
 					dol_include_once($InfoFieldList[1]);
 					if ($classname && class_exists($classname))
 					{
 						$object = new $classname($this->db);
 						$object->fetch($value);
-						$value=$object->getNomUrl(3);
+						$value = $object->getNomUrl(3);
 					}
 				}
 				else
@@ -1799,24 +1799,24 @@ 
 		}
 		elseif ($type == 'text')
 		{
-			$value=dol_htmlentitiesbr($value);
+			$value = dol_htmlentitiesbr($value);
 		}
 		elseif ($type == 'html')
 		{
-			$value=dol_htmlentitiesbr($value);
+			$value = dol_htmlentitiesbr($value);
 		}
 		elseif ($type == 'password')
 		{
-			$value=dol_trunc(preg_replace('/./i','*',$value), 8, 'right', 'UTF-8', 1);
+			$value = dol_trunc(preg_replace('/./i', '*', $value), 8, 'right', 'UTF-8', 1);
 		}
 		else
 		{
-			$showsize=round($size);
-			if ($showsize > 48) $showsize=48;
+			$showsize = round($size);
+			if ($showsize > 48) $showsize = 48;
 		}
 
 		//print $type.'-'.$size;
-		$out=$value;
+		$out = $value;
 
 		return $out;
 	}
@@ -1828,46 +1828,46 @@ 
 	 * @param	string	$extrafieldsobjectkey	If defined, use the new method to get extrafields data
 	 * @return	string							Formated value
 	 */
-	function getAlignFlag($key, $extrafieldsobjectkey='')
+	function getAlignFlag($key, $extrafieldsobjectkey = '')
 	{
-		global $conf,$langs;
+		global $conf, $langs;
 
-		if (! empty($extrafieldsobjectkey)) $type=$this->attributes[$extrafieldsobjectkey]['type'][$key];
-		else $type=$this->attribute_type[$key];
+		if (!empty($extrafieldsobjectkey)) $type = $this->attributes[$extrafieldsobjectkey]['type'][$key];
+		else $type = $this->attribute_type[$key];
 
-		$align='';
+		$align = '';
 
         if ($type == 'date')
 		{
-			$align="center";
+			$align = "center";
 		}
 		elseif ($type == 'datetime')
 		{
-			$align="center";
+			$align = "center";
 		}
 		elseif ($type == 'int')
 		{
-			$align="right";
+			$align = "right";
 		}
 		elseif ($type == 'double')
 		{
-			$align="right";
+			$align = "right";
 		}
 		elseif ($type == 'boolean')
 		{
-			$align="center";
+			$align = "center";
 		}
 		elseif ($type == 'radio')
 		{
-			$align="center";
+			$align = "center";
 		}
 		elseif ($type == 'checkbox')
 		{
-			$align="center";
+			$align = "center";
 		}
 		elseif ($type == 'price')
 		{
-			$align="right";
+			$align = "right";
 		}
 
 		return $align;
@@ -1885,8 +1885,8 @@ 
 		global $langs;
 
 		$out = '<tr class="trextrafieldseparator trextrafieldseparator'.$key.'"><td colspan="2"><strong>';
-		$out.= $langs->trans($this->attributes[$object->table_element]['label'][$key]);
-		$out.= '</strong></td></tr>';
+		$out .= $langs->trans($this->attributes[$object->table_element]['label'][$key]);
+		$out .= '</strong></td></tr>';
 		return $out;
 	}
 
@@ -1898,20 +1898,20 @@ 
 	 * @param	string	$onlykey		Only following key is filled. When we make update of only one extrafield ($action = 'update_extras'), calling page must must set this to avoid to have other extrafields being reset.
 	 * @return	int						1 if array_options set, 0 if no value, -1 if error (field required missing for example)
 	 */
-	function setOptionalsFromPost($extralabels, &$object, $onlykey='')
+	function setOptionalsFromPost($extralabels, &$object, $onlykey = '')
 	{
 		global $_POST, $langs;
-		$nofillrequired='';// For error when required field left blank
+		$nofillrequired = ''; // For error when required field left blank
 		$error_field_required = array();
 
-		if (is_array($this->attributes[$object->table_element]['label'])) $extralabels=$this->attributes[$object->table_element]['label'];
+		if (is_array($this->attributes[$object->table_element]['label'])) $extralabels = $this->attributes[$object->table_element]['label'];
 
 		if (is_array($extralabels))
 		{
 			// Get extra fields
 			foreach ($extralabels as $key => $value)
 			{
-				if (! empty($onlykey) && $key != $onlykey) continue;
+				if (!empty($onlykey) && $key != $onlykey) continue;
 
 				$key_type = $this->attributes[$object->table_element]['type'][$key];
 				if ($key_type == 'separate') continue;
@@ -1932,7 +1932,7 @@ 
 				if ($this->attributes[$object->table_element]['required'][$key])	// Value is required
 				{
 					// Check if empty without using GETPOST, value can be alpha, int, array, etc...
-					if ((! is_array($_POST["options_".$key]) && empty($_POST["options_".$key]) && $_POST["options_".$key] != '0')
+					if ((!is_array($_POST["options_".$key]) && empty($_POST["options_".$key]) && $_POST["options_".$key] != '0')
 						|| (is_array($_POST["options_".$key]) && empty($_POST["options_".$key])))
 					{
 						//print 'ccc'.$value.'-'.$this->attributes[$object->table_element]['required'][$key];
@@ -1941,43 +1941,43 @@ 
 					}
 				}
 
-				if (in_array($key_type,array('date')))
+				if (in_array($key_type, array('date')))
 				{
 					// Clean parameters
 					// TODO GMT date in memory must be GMT so we should add gm=true in parameters
-					$value_key=dol_mktime(0, 0, 0, $_POST["options_".$key."month"], $_POST["options_".$key."day"], $_POST["options_".$key."year"]);
+					$value_key = dol_mktime(0, 0, 0, $_POST["options_".$key."month"], $_POST["options_".$key."day"], $_POST["options_".$key."year"]);
 				}
-				elseif (in_array($key_type,array('datetime')))
+				elseif (in_array($key_type, array('datetime')))
 				{
 					// Clean parameters
 					// TODO GMT date in memory must be GMT so we should add gm=true in parameters
-					$value_key=dol_mktime($_POST["options_".$key."hour"], $_POST["options_".$key."min"], 0, $_POST["options_".$key."month"], $_POST["options_".$key."day"], $_POST["options_".$key."year"]);
+					$value_key = dol_mktime($_POST["options_".$key."hour"], $_POST["options_".$key."min"], 0, $_POST["options_".$key."month"], $_POST["options_".$key."day"], $_POST["options_".$key."year"]);
 				}
-				else if (in_array($key_type,array('checkbox','chkbxlst')))
+				else if (in_array($key_type, array('checkbox', 'chkbxlst')))
 				{
-					$value_arr=GETPOST("options_".$key, 'array'); // check if an array
+					$value_arr = GETPOST("options_".$key, 'array'); // check if an array
 					if (!empty($value_arr)) {
-						$value_key=implode($value_arr,',');
-					}else {
-						$value_key='';
+						$value_key = implode($value_arr, ',');
+					} else {
+						$value_key = '';
 					}
 				}
-				else if (in_array($key_type,array('price','double')))
+				else if (in_array($key_type, array('price', 'double')))
 				{
-					$value_arr=GETPOST("options_".$key, 'alpha');
-					$value_key=price2num($value_arr);
+					$value_arr = GETPOST("options_".$key, 'alpha');
+					$value_key = price2num($value_arr);
 				}
 				else
 				{
-					$value_key=GETPOST("options_".$key);
+					$value_key = GETPOST("options_".$key);
 				}
 
-				$object->array_options["options_".$key]=$value_key;
+				$object->array_options["options_".$key] = $value_key;
 			}
 
 			if ($nofillrequired) {
 				$langs->load('errors');
-				setEventMessages($langs->trans('ErrorFieldsRequired').' : '.implode(', ',$error_field_required), null, 'errors');
+				setEventMessages($langs->trans('ErrorFieldsRequired').' : '.implode(', ', $error_field_required), null, 'errors');
 				return -1;
 			}
 			else {
@@ -1997,7 +1997,7 @@ 
 	 * @param  string			$keysuffix      		Suffix string to add into name and id of field (can be used to avoid duplicate names)
 	 * @return array|int								array_options set or 0 if no value
 	 */
-	function getOptionalsFromPost($extrafieldsobjectkey, $keyprefix='', $keysuffix='')
+	function getOptionalsFromPost($extrafieldsobjectkey, $keyprefix = '', $keysuffix = '')
 	{
 		global $_POST;
 
@@ -2023,29 +2023,29 @@ 
 					$key_type = $this->attributes[$extrafieldsobjectkey]['type'][$key];
 				}
 
-				if (in_array($key_type,array('date','datetime')))
+				if (in_array($key_type, array('date', 'datetime')))
 				{
 					// Clean parameters
-					$value_key=dol_mktime($_POST[$keysuffix."options_".$key.$keyprefix."hour"], $_POST[$keysuffix."options_".$key.$keyprefix."min"], 0, $_POST[$keysuffix."options_".$key.$keyprefix."month"], $_POST[$keysuffix."options_".$key.$keyprefix."day"], $_POST[$keysuffix."options_".$key.$keyprefix."year"]);
+					$value_key = dol_mktime($_POST[$keysuffix."options_".$key.$keyprefix."hour"], $_POST[$keysuffix."options_".$key.$keyprefix."min"], 0, $_POST[$keysuffix."options_".$key.$keyprefix."month"], $_POST[$keysuffix."options_".$key.$keyprefix."day"], $_POST[$keysuffix."options_".$key.$keyprefix."year"]);
 				}
-				else if (in_array($key_type,array('checkbox', 'chkbxlst')))
+				else if (in_array($key_type, array('checkbox', 'chkbxlst')))
 				{
-					$value_arr=GETPOST($keysuffix."options_".$key.$keyprefix);
+					$value_arr = GETPOST($keysuffix."options_".$key.$keyprefix);
 					// Make sure we get an array even if there's only one checkbox
-					$value_arr=(array) $value_arr;
-					$value_key=implode(',', $value_arr);
+					$value_arr = (array) $value_arr;
+					$value_key = implode(',', $value_arr);
 				}
-				else if (in_array($key_type,array('price','double')))
+				else if (in_array($key_type, array('price', 'double')))
 				{
-					$value_arr=GETPOST($keysuffix."options_".$key.$keyprefix);
-					$value_key=price2num($value_arr);
+					$value_arr = GETPOST($keysuffix."options_".$key.$keyprefix);
+					$value_key = price2num($value_arr);
 				}
 				else
 				{
-					$value_key=GETPOST($keysuffix."options_".$key.$keyprefix);
+					$value_key = GETPOST($keysuffix."options_".$key.$keyprefix);
 				}
 
-				$array_options[$keysuffix."options_".$key]=$value_key;	// No keyprefix here. keyprefix is used only for read.
+				$array_options[$keysuffix."options_".$key] = $value_key; // No keyprefix here. keyprefix is used only for read.
 			}
 
 			return $array_options;

Braces +287 added lines, -258 removed lines

@@ -173,11 +173,19 @@ 
 	 */
 	function addExtraField($attrname, $label, $type, $pos, $size, $elementtype, $unique=0, $required=0, $default_value='', $param='', $alwayseditable=0, $perms='', $list='-1', $help='', $computed='', $entity='', $langfile='', $enabled='1')
 	{
-		if (empty($attrname)) return -1;
-		if (empty($label)) return -1;
+		if (empty($attrname)) {
+		    return -1;
+		}
+		if (empty($label)) {
+		    return -1;
+		}
 
-		if ($elementtype == 'thirdparty') $elementtype='societe';
-		if ($elementtype == 'contact') $elementtype='socpeople';
+		if ($elementtype == 'thirdparty') {
+		    $elementtype='societe';
+		}
+		if ($elementtype == 'contact') {
+		    $elementtype='socpeople';
+		}
 
 		// Create field into database except for separator type which is not stored in database
 		if ($type != 'separate')
@@ -195,10 +203,10 @@ 
 				$this->error='';
 				$this->errno=0;
 				return 1;
+			} else {
+			    return -2;
 			}
-			else return -2;
-		}
-		else
+		} else
 		{
 			return -1;
 		}
@@ -223,11 +231,17 @@ 
 	 */
 	private function create($attrname, $type='varchar', $length=255, $elementtype='member', $unique=0, $required=0, $default_value='',$param='', $perms='', $list='0', $computed='')
 	{
-		if ($elementtype == 'thirdparty') $elementtype='societe';
-		if ($elementtype == 'contact') $elementtype='socpeople';
+		if ($elementtype == 'thirdparty') {
+		    $elementtype='societe';
+		}
+		if ($elementtype == 'contact') {
+		    $elementtype='socpeople';
+		}
 
 		$table=$elementtype.'_extrafields';
-		if ($elementtype == 'categorie') $table='categories_extrafields';
+		if ($elementtype == 'categorie') {
+		    $table='categories_extrafields';
+		}
 
 		if (! empty($attrname) && preg_match("/^\w[a-zA-Z0-9_]*$/",$attrname) && ! is_numeric($attrname))
 		{
@@ -261,7 +275,9 @@ 
 			} else {
 				$typedb=$type;
 				$lengthdb=$length;
-				if ($type == 'varchar' && empty($lengthdb)) $lengthdb='255';
+				if ($type == 'varchar' && empty($lengthdb)) {
+				    $lengthdb='255';
+				}
 			}
 			$field_desc = array(
 				'type'=>$typedb,
@@ -279,15 +295,13 @@ 
 					$resql=$this->db->query($sql,1,'dml');
 				}
 				return 1;
-			}
-			else
+			} else
 			{
 				$this->error=$this->db->lasterror();
 				$this->errno=$this->db->lasterrno();
 				return -1;
 			}
-		}
-		else
+		} else
 		{
 			return 0;
 		}
@@ -322,27 +336,39 @@ 
         // phpcs:enable
 		global $conf,$user;
 
-		if ($elementtype == 'thirdparty') $elementtype='societe';
-		if ($elementtype == 'contact') $elementtype='socpeople';
+		if ($elementtype == 'thirdparty') {
+		    $elementtype='societe';
+		}
+		if ($elementtype == 'contact') {
+		    $elementtype='socpeople';
+		}
 
 		// Clean parameters
-		if (empty($pos)) $pos=0;
-		if (empty($list)) $list='0';
-		if (empty($required)) $required=0;
-		if (empty($unique)) $unique=0;
-		if (empty($alwayseditable)) $alwayseditable=0;
+		if (empty($pos)) {
+		    $pos=0;
+		}
+		if (empty($list)) {
+		    $list='0';
+		}
+		if (empty($required)) {
+		    $required=0;
+		}
+		if (empty($unique)) {
+		    $unique=0;
+		}
+		if (empty($alwayseditable)) {
+		    $alwayseditable=0;
+		}
 
 		if (! empty($attrname) && preg_match("/^\w[a-zA-Z0-9-_]*$/",$attrname) && ! is_numeric($attrname))
 		{
 			if (is_array($param) && count($param) > 0)
 			{
 				$params = serialize($param);
-			}
-			elseif (strlen($param) > 0)
+			} elseif (strlen($param) > 0)
 			{
 				$params = trim($param);
-			}
-			else
+			} else
 			{
 				$params='';
 			}
@@ -397,8 +423,7 @@ 
 			if ($this->db->query($sql))
 			{
 				return 1;
-			}
-			else
+			} else
 			{
 				$this->error=$this->db->lasterror();
 				$this->errno=$this->db->lasterrno();
@@ -416,11 +441,17 @@ 
 	 */
 	function delete($attrname, $elementtype='member')
 	{
-		if ($elementtype == 'thirdparty') $elementtype='societe';
-		if ($elementtype == 'contact') $elementtype='socpeople';
+		if ($elementtype == 'thirdparty') {
+		    $elementtype='societe';
+		}
+		if ($elementtype == 'contact') {
+		    $elementtype='socpeople';
+		}
 
 		$table=$elementtype.'_extrafields';
-		if ($elementtype == 'categorie') $table='categories_extrafields';
+		if ($elementtype == 'categorie') {
+		    $table='categories_extrafields';
+		}
 
 		$error=0;
 
@@ -457,8 +488,7 @@ 
 			}
 
 			return $result;
-		}
-		else
+		} else
 		{
 			return 0;
 		}
@@ -477,8 +507,12 @@ 
         // phpcs:enable
 		global $conf;
 
-		if ($elementtype == 'thirdparty') $elementtype='societe';
-		if ($elementtype == 'contact') $elementtype='socpeople';
+		if ($elementtype == 'thirdparty') {
+		    $elementtype='societe';
+		}
+		if ($elementtype == 'contact') {
+		    $elementtype='socpeople';
+		}
 
 		if (isset($attrname) && $attrname != '' && preg_match("/^\w[a-zA-Z0-9-_]*$/",$attrname))
 		{
@@ -492,14 +526,12 @@ 
 			if ($resql)
 			{
 				return 1;
-			}
-			else
+			} else
 			{
 				print dol_print_error($this->db);
 				return -1;
 			}
-		}
-		else
+		} else
 		{
 			return 0;
 		}
@@ -531,11 +563,17 @@ 
 	 */
 	function update($attrname, $label, $type, $length, $elementtype, $unique=0, $required=0, $pos=0, $param='', $alwayseditable=0, $perms='', $list='', $help='', $default='', $computed='', $entity='', $langfile='', $enabled='1', $totalizable=0)
 	{
-		if ($elementtype == 'thirdparty') $elementtype='societe';
-		if ($elementtype == 'contact') $elementtype='socpeople';
+		if ($elementtype == 'thirdparty') {
+		    $elementtype='societe';
+		}
+		if ($elementtype == 'contact') {
+		    $elementtype='socpeople';
+		}
 
         $table=$elementtype.'_extrafields';
-		if ($elementtype == 'categorie') $table='categories_extrafields';
+		if ($elementtype == 'categorie') {
+		    $table='categories_extrafields';
+		}
 
 		if (isset($attrname) && $attrname != '' && preg_match("/^\w[a-zA-Z0-9-_]*$/",$attrname))
 		{
@@ -571,10 +609,12 @@ 
 			}
 			$field_desc = array('type'=>$typedb, 'value'=>$lengthdb, 'null'=>($required?'NOT NULL':'NULL'), 'default'=>$default);
 
-			if ($type != 'separate') // No table update when separate type
+			if ($type != 'separate') {
+			    // No table update when separate type
 			{
 				$result=$this->db->DDLUpdateField(MAIN_DB_PREFIX.$table, $attrname, $field_desc);
 			}
+			}
 			if ($result > 0 || $type == 'separate')
 			{
 				if ($label)
@@ -587,28 +627,24 @@ 
 					if ($unique)
 					{
 						$sql="ALTER TABLE ".MAIN_DB_PREFIX.$table." ADD UNIQUE INDEX uk_".$table."_".$attrname." (".$attrname.")";
-					}
-					else
+					} else
 					{
 						$sql="ALTER TABLE ".MAIN_DB_PREFIX.$table." DROP INDEX uk_".$table."_".$attrname;
 					}
 					dol_syslog(get_class($this).'::update', LOG_DEBUG);
 					$resql=$this->db->query($sql,1,'dml');
 					return 1;
-				}
-				else
+				} else
 				{
 					$this->error=$this->db->lasterror();
 					return -1;
 				}
-			}
-			else
+			} else
 			{
 				$this->error=$this->db->lasterror();
 				return -1;
 			}
-		}
-		else
+		} else
 		{
 			return 0;
 		}
@@ -646,17 +682,31 @@ 
 		dol_syslog(get_class($this)."::update_label ".$attrname.", ".$label.", ".$type.", ".$size.", ".$elementtype.", ".$unique.", ".$required.", ".$pos.", ".$alwayseditable.", ".$perms.", ".$list.", ".$default.", ".$computed.", ".$entity.", ".$langfile.", ".$enabled.", ".$totalizable);
 
 		// Clean parameters
-		if ($elementtype == 'thirdparty') $elementtype='societe';
-		if ($elementtype == 'contact') $elementtype='socpeople';
+		if ($elementtype == 'thirdparty') {
+		    $elementtype='societe';
+		}
+		if ($elementtype == 'contact') {
+		    $elementtype='socpeople';
+		}
 
-		if (empty($pos)) $pos=0;
-		if (empty($list)) $list='0';
+		if (empty($pos)) {
+		    $pos=0;
+		}
+		if (empty($list)) {
+		    $list='0';
+		}
         if (empty($totalizable)) {
             $totalizable = 0;
         }
-		if (empty($required)) $required=0;
-		if (empty($unique)) $unique=0;
-		if (empty($alwayseditable)) $alwayseditable=0;
+		if (empty($required)) {
+		    $required=0;
+		}
+		if (empty($unique)) {
+		    $unique=0;
+		}
+		if (empty($alwayseditable)) {
+		    $alwayseditable=0;
+		}
 
 		if (isset($attrname) && $attrname != '' && preg_match("/^\w[a-zA-Z0-9-_]*$/",$attrname))
 		{
@@ -665,12 +715,10 @@ 
 			if (is_array($param) && count($param) > 0)
 			{
 				$params = serialize($param);
-			}
-			elseif (strlen($param) > 0)
+			} elseif (strlen($param) > 0)
 			{
 				$params = trim($param);
-			}
-			else
+			} else
 			{
 				$params='';
 			}
@@ -682,8 +730,7 @@ 
 				$sql_del.= " WHERE name = '".$attrname."'";
 				$sql_del.= " AND entity IN (0, ".($entity===''?$conf->entity:$entity).")";
 				$sql_del.= " AND elementtype = '".$elementtype."'";
-			}
-			else
+			} else
 			{
 				// We want on all entities ($entities = '0'), we delete on all only (we keep setup specific to each entity)
 				$sql_del = "DELETE FROM ".MAIN_DB_PREFIX."extrafields";
@@ -747,15 +794,13 @@ 
 			{
 				$this->db->commit();
 				return 1;
-			}
-			else
+			} else
 			{
 				$this->db->rollback();
 				print dol_print_error($this->db);
 				return -1;
 			}
-		}
-		else
+		} else
 		{
 			return 0;
 		}
@@ -775,16 +820,26 @@ 
         // phpcs:enable
 		global $conf;
 
-		if (empty($elementtype)) return array();
+		if (empty($elementtype)) {
+		    return array();
+		}
 
-		if ($elementtype == 'thirdparty') $elementtype='societe';
-		if ($elementtype == 'contact') $elementtype='socpeople';
-		if ($elementtype == 'order_supplier') $elementtype='commande_fournisseur';
+		if ($elementtype == 'thirdparty') {
+		    $elementtype='societe';
+		}
+		if ($elementtype == 'contact') {
+		    $elementtype='socpeople';
+		}
+		if ($elementtype == 'order_supplier') {
+		    $elementtype='commande_fournisseur';
+		}
 
 		$array_name_label=array();
 
 		// To avoid conflicts with external modules. TODO Remove this.
-		if (!$forceload && !empty($conf->global->MAIN_EXTRAFIELDS_DISABLED)) return $array_name_label;
+		if (!$forceload && !empty($conf->global->MAIN_EXTRAFIELDS_DISABLED)) {
+		    return $array_name_label;
+		}
 
 		// Set array of label of entity
 		// TODO Remove completely loading of label. This should be done by presentation.
@@ -808,7 +863,10 @@ 
 		$sql = "SELECT rowid,name,label,type,size,elementtype,fieldunique,fieldrequired,param,pos,alwayseditable,perms,langs,list,totalizable,fielddefault,fieldcomputed,entity,enabled,help";
 		$sql.= " FROM ".MAIN_DB_PREFIX."extrafields";
 		$sql.= " WHERE entity IN (0,".$conf->entity.")";
-		if ($elementtype) $sql.= " AND elementtype = '".$elementtype."'";	// Filed with object->table_element
+		if ($elementtype) {
+		    $sql.= " AND elementtype = '".$elementtype."'";
+		}
+		// Filed with object->table_element
 		$sql.= " ORDER BY pos";
 
 		$resql=$this->db->query($sql);
@@ -867,9 +925,11 @@ 
 					$this->attributes[$tab->elementtype]['loaded']=1;
 				}
 			}
-			if ($elementtype) $this->attributes[$elementtype]['loaded']=1;	// If nothing found, we also save tag 'loaded'
-		}
-		else
+			if ($elementtype) {
+			    $this->attributes[$elementtype]['loaded']=1;
+			}
+			// If nothing found, we also save tag 'loaded'
+		} else
 		{
 			$this->error=$this->db->lasterror();
 			dol_syslog(get_class($this)."::fetch_name_optionals_label ".$this->error, LOG_ERR);
@@ -923,8 +983,7 @@ 
 			$totalizable=$this->attributes[$extrafieldsobjectkey]['totalizable'][$key];
 			$help=$this->attributes[$extrafieldsobjectkey]['help'][$key];
 			$hidden=(empty($list) ? 1 : 0);		// If empty, we are sure it is hidden, otherwise we show. If it depends on mode (view/create/edit form or list, this must be filtered by caller)
-		}
-		else	// Old usage
+		} else	// Old usage
 		{
 			$label=$this->attribute_label[$key];
 			$type =$this->attribute_type[$key];
@@ -943,8 +1002,11 @@ 
 
 		if ($computed)
 		{
-			if (! preg_match('/^search_/', $keyprefix)) return '<span class="opacitymedium">'.$langs->trans("AutomaticallyCalculated").'</span>';
-			else return '';
+			if (! preg_match('/^search_/', $keyprefix)) {
+			    return '<span class="opacitymedium">'.$langs->trans("AutomaticallyCalculated").'</span>';
+			} else {
+			    return '';
+			}
 		}
 
 		if (empty($morecss))
@@ -952,38 +1014,30 @@ 
 			if ($type == 'date')
 			{
 				$morecss = 'minwidth100imp';
-			}
-			elseif ($type == 'datetime')
+			} elseif ($type == 'datetime')
 			{
 				$morecss = 'minwidth200imp';
-			}
-			elseif (in_array($type,array('int','integer','double','price')))
+			} elseif (in_array($type,array('int','integer','double','price')))
 			{
 				$morecss = 'maxwidth75';
-			}
-			elseif ($type == 'password')
+			} elseif ($type == 'password')
 			{
 				$morecss='maxwidth100';
-			}
-			elseif ($type == 'url')
+			} elseif ($type == 'url')
 			{
 				$morecss='minwidth400';
-			}
-			elseif ($type == 'boolean')
+			} elseif ($type == 'boolean')
 			{
 				$morecss='';
-			}
-			else
+			} else
 			{
 				if (round($size) < 12)
 				{
 					$morecss = 'minwidth100';
-				}
-				else if (round($size) <= 48)
+				} else if (round($size) <= 48)
 				{
 					$morecss = 'minwidth200';
-				}
-				else
+				} else
 				{
 					$morecss = 'minwidth400';
 				}
@@ -998,52 +1052,50 @@ 
 			$showtime = in_array($type,array('datetime')) ? 1 : 0;
 
 			// Do not show current date when field not required (see selectDate() method)
-			if (!$required && $value == '') $value = '-1';
+			if (!$required && $value == '') {
+			    $value = '-1';
+			}
 
 			// TODO Must also support $moreparam
 			$out = $form->selectDate($value, $keyprefix.$key.$keysuffix, $showtime, $showtime, $required, '', 1, (($keyprefix != 'search_' && $keyprefix != 'search_options_') ? 1 : 0), 0, 1);
-		}
-		elseif (in_array($type,array('int','integer')))
+		} elseif (in_array($type,array('int','integer')))
 		{
 			$tmp=explode(',',$size);
 			$newsize=$tmp[0];
 			$out='<input type="text" class="flat '.$morecss.' maxwidthonsmartphone" name="'.$keyprefix.$key.$keysuffix.'" id="'.$keyprefix.$key.$keysuffix.'" maxlength="'.$newsize.'" value="'.dol_escape_htmltag($value).'"'.($moreparam?$moreparam:'').'>';
-		}
-		elseif (preg_match('/varchar/', $type))
+		} elseif (preg_match('/varchar/', $type))
 		{
 			$out='<input type="text" class="flat '.$morecss.' maxwidthonsmartphone" name="'.$keyprefix.$key.$keysuffix.'" id="'.$keyprefix.$key.$keysuffix.'" maxlength="'.$size.'" value="'.dol_escape_htmltag($value).'"'.($moreparam?$moreparam:'').'>';
-		}
-		elseif (in_array($type, array('mail', 'phone', 'url')))
+		} elseif (in_array($type, array('mail', 'phone', 'url')))
 		{
 			$out='<input type="text" class="flat '.$morecss.' maxwidthonsmartphone" name="'.$keyprefix.$key.$keysuffix.'" id="'.$keyprefix.$key.$keysuffix.'" value="'.dol_escape_htmltag($value).'" '.($moreparam?$moreparam:'').'>';
-		}
-		elseif ($type == 'text')
+		} elseif ($type == 'text')
 		{
-			if (! preg_match('/search_/', $keyprefix))		// If keyprefix is search_ or search_options_, we must just use a simple text field
+			if (! preg_match('/search_/', $keyprefix)) {
+			    // If keyprefix is search_ or search_options_, we must just use a simple text field
 			{
 				require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
+			}
 				$doleditor=new DolEditor($keyprefix.$key.$keysuffix,$value,'',200,'dolibarr_notes','In',false,false,false,ROWS_5,'90%');
 				$out=$doleditor->Create(1);
-			}
-			else
+			} else
 			{
 				$out='<input type="text" class="flat '.$morecss.' maxwidthonsmartphone" name="'.$keyprefix.$key.$keysuffix.'" id="'.$keyprefix.$key.$keysuffix.'" value="'.dol_escape_htmltag($value).'" '.($moreparam?$moreparam:'').'>';
 			}
-		}
-		elseif ($type == 'html')
+		} elseif ($type == 'html')
 		{
-			if (! preg_match('/search_/', $keyprefix))		// If keyprefix is search_ or search_options_, we must just use a simple text field
+			if (! preg_match('/search_/', $keyprefix)) {
+			    // If keyprefix is search_ or search_options_, we must just use a simple text field
 			{
 				require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
+			}
 				$doleditor=new DolEditor($keyprefix.$key.$keysuffix,$value,'',200,'dolibarr_notes','In',false,false,! empty($conf->fckeditor->enabled) && $conf->global->FCKEDITOR_ENABLE_SOCIETE,ROWS_5,'90%');
 				$out=$doleditor->Create(1);
-			}
-			else
+			} else
 			{
 				$out='<input type="text" class="flat '.$morecss.' maxwidthonsmartphone" name="'.$keyprefix.$key.$keysuffix.'" id="'.$keyprefix.$key.$keysuffix.'" value="'.dol_escape_htmltag($value).'" '.($moreparam?$moreparam:'').'>';
 			}
-		}
-		elseif ($type == 'boolean')
+		} elseif ($type == 'boolean')
 		{
 			$checked='';
 			if (!empty($value)) {
@@ -1052,22 +1104,19 @@ 
 				$checked=' value="1" ';
 			}
 			$out='<input type="checkbox" class="flat '.$morecss.' maxwidthonsmartphone" name="'.$keyprefix.$key.$keysuffix.'" id="'.$keyprefix.$key.$keysuffix.'" '.$checked.' '.($moreparam?$moreparam:'').'>';
-		}
-		elseif ($type == 'price')
+		} elseif ($type == 'price')
 		{
 			if (!empty($value)) {		// $value in memory is a php numeric, we format it into user number format.
 				$value=price($value);
 			}
 			$out='<input type="text" class="flat '.$morecss.' maxwidthonsmartphone" name="'.$keyprefix.$key.$keysuffix.'" id="'.$keyprefix.$key.$keysuffix.'" value="'.$value.'" '.($moreparam?$moreparam:'').'> '.$langs->getCurrencySymbol($conf->currency);
-		}
-		elseif ($type == 'double')
+		} elseif ($type == 'double')
 		{
 			if (!empty($value)) {		// $value in memory is a php numeric, we format it into user number format.
 				$value=price($value);
 			}
 			$out='<input type="text" class="flat '.$morecss.' maxwidthonsmartphone" name="'.$keyprefix.$key.$keysuffix.'" id="'.$keyprefix.$key.$keysuffix.'" value="'.$value.'" '.($moreparam?$moreparam:'').'> ';
-		}
-		elseif ($type == 'select')
+		} elseif ($type == 'select')
 		{
 			$out = '';
 			if (! empty($conf->use_javascript_ajax) && ! empty($conf->global->MAIN_EXTRAFIELDS_USE_SELECT2))
@@ -1080,19 +1129,23 @@ 
 			$out.='<option value="0">&nbsp;</option>';
 			foreach ($param['options'] as $key => $val)
 			{
-				if ((string) $key == '') continue;
+				if ((string) $key == '') {
+				    continue;
+				}
 				list($val, $parent) = explode('|', $val);
 				$out.='<option value="'.$key.'"';
 				$out.= (((string) $value == (string) $key)?' selected':'');
 				$out.= (!empty($parent)?' parent="'.$parent.'"':'');
 				$out.='>';
-				if ($langfile && $val) $out.=$langs->trans($val);
-				else $out.=$val;
+				if ($langfile && $val) {
+				    $out.=$langs->trans($val);
+				} else {
+				    $out.=$val;
+				}
 				$out.='</option>';
 			}
 			$out.='</select>';
-		}
-		elseif ($type == 'sellist')
+		} elseif ($type == 'sellist')
 		{
 			$out = '';
 			if (! empty($conf->use_javascript_ajax) && ! empty($conf->global->MAIN_EXTRAFIELDS_USE_SELECT2))
@@ -1163,13 +1216,11 @@ 
 					{
 						$sql.= ' as main, '.MAIN_DB_PREFIX .$InfoFieldList[0].'_extrafields as extra';
 						$sqlwhere.= ' WHERE extra.fk_object=main.'.$InfoFieldList[2]. ' AND '.$InfoFieldList[4];
-					}
-					else
+					} else
 					{
 						$sqlwhere.= ' WHERE '.$InfoFieldList[4];
 					}
-				}
-				else
+				} else
 				{
 					$sqlwhere.= ' WHERE 1=1';
 				}
@@ -1205,8 +1256,7 @@ 
 							{
 								$labeltoshow.= $obj->$field_toshow.' ';
 							}
-						}
-						else
+						} else
 						{
 							$labeltoshow=$obj->{$InfoFieldList[1]};
 						}
@@ -1219,25 +1269,25 @@ 
 								$translabel=$langs->trans($obj->$field_toshow);
 								if ($translabel!=$obj->$field_toshow) {
 									$labeltoshow=dol_trunc($translabel,18).' ';
-								}else {
+								} else {
 									$labeltoshow=dol_trunc($obj->$field_toshow,18).' ';
 								}
 							}
 							$out.='<option value="'.$obj->rowid.'" selected>'.$labeltoshow.'</option>';
-						}
-						else
+						} else
 						{
 							if (! $notrans)
 							{
 								$translabel=$langs->trans($obj->{$InfoFieldList[1]});
 								if ($translabel!=$obj->{$InfoFieldList[1]}) {
 									$labeltoshow=dol_trunc($translabel,18);
-								}
-								else {
+								} else {
 									$labeltoshow=dol_trunc($obj->{$InfoFieldList[1]},18);
 								}
 							}
-							if (empty($labeltoshow)) $labeltoshow='(not defined)';
+							if (empty($labeltoshow)) {
+							    $labeltoshow='(not defined)';
+							}
 							if ($value==$obj->rowid)
 							{
 								$out.='<option value="'.$obj->rowid.'" selected>'.$labeltoshow.'</option>';
@@ -1257,19 +1307,16 @@ 
 						$i++;
 					}
 					$this->db->free($resql);
-				}
-				else {
+				} else {
 					print 'Error in request '.$sql.' '.$this->db->lasterror().'. Check setup of extra parameters.<br>';
 				}
 			}
 			$out.='</select>';
-		}
-		elseif ($type == 'checkbox')
+		} elseif ($type == 'checkbox')
 		{
 			$value_arr=explode(',',$value);
 			$out=$form->multiselectarray($keyprefix.$key.$keysuffix, (empty($param['options'])?null:$param['options']), $value_arr, '', 0, '', 0, '100%');
-		}
-		elseif ($type == 'radio')
+		} elseif ($type == 'radio')
 		{
 			$out='';
 			foreach ($param['options'] as $keyopt => $val)
@@ -1280,13 +1327,11 @@ 
 				$out.= ($value==$keyopt?'checked':'');
 				$out.='/><label for="'.$keyprefix.$key.$keysuffix.'_'.$keyopt.'">'.$val.'</label><br>';
 			}
-		}
-		elseif ($type == 'chkbxlst')
+		} elseif ($type == 'chkbxlst')
 		{
 			if (is_array($value)) {
 				$value_arr = $value;
-			}
-			else {
+			} else {
 				$value_arr = explode(',', $value);
 			}
 
@@ -1365,17 +1410,14 @@ 
 							if (! empty($matchCondition[1]) && ! empty($matchCondition[3]) && $matchCondition[1] != $matchCondition[3] ) {
 								// Nobody sain would do that without parentheses
 								$InfoFieldList[4]=str_replace('$ID$','0',$InfoFieldList[4]);
-							}
-							else {
+							} else {
 								if (! empty($matchCondition[1])) {
 									$boolCond =(( $matchCondition[1] == "AND" )?' AND 1 ':' OR 0 ');
 									$InfoFieldList[4]=str_replace($matchCondition[0],$boolCond.$matchCondition[3],$InfoFieldList[4]);
-								}
-								else if (! empty($matchCondition[3])) {
+								} else if (! empty($matchCondition[3])) {
 									$boolCond =(( $matchCondition[3] == "AND" )?' 1 AND ':' 0 OR');
 									$InfoFieldList[4]=str_replace($matchCondition[0],$boolCond,$InfoFieldList[4]);
-								}
-								else {
+								} else {
 									$InfoFieldList[4] = 1;
 								}
 							}
@@ -1383,8 +1425,7 @@ 
 							// Si l'on a un AND ou un OR, avant ou après
 							preg_match('#(AND|OR|) *('.$word.') *(AND|OR|)#',$InfoFieldList[4],$matchCondition);
 						}
-					}
-					else {
+					} else {
 						$InfoFieldList[4]=str_replace('$ID$','0',$InfoFieldList[4]);
 					}
 
@@ -1452,8 +1493,9 @@ 
 									$labeltoshow = dol_trunc($obj->{$InfoFieldList[1]}, 18);
 								}
 							}
-							if (empty($labeltoshow))
-								$labeltoshow = '(not defined)';
+							if (empty($labeltoshow)) {
+															$labeltoshow = '(not defined)';
+							}
 
 								if (is_array($value_arr) && in_array($obj->rowid, $value_arr)) {
 									$data[$obj->rowid]=$labeltoshow;
@@ -1475,14 +1517,12 @@ 
 					print 'Error in request ' . $sql . ' ' . $this->db->lasterror() . '. Check setup of extra parameters.<br>';
 				}
 			}
-		}
-		elseif ($type == 'link')
+		} elseif ($type == 'link')
 		{
 			$param_list=array_keys($param['options']);				// $param_list='ObjectName:classPath'
 			$showempty=(($required && $default != '')?0:1);
 			$out=$form->selectForForms($param_list[0], $keyprefix.$key.$keysuffix, $value, $showempty);
-		}
-		elseif ($type == 'password')
+		} elseif ($type == 'password')
 		{
 			// If prefix is 'search_', field is used as a filter, we use a common text field.
 			$out='<input style="display:none" type="text" name="fakeusernameremembered">';	// Hidden field to reduce impact of evil Google Chrome autopopulate bug.
@@ -1527,8 +1567,7 @@ 
 			$list=dol_eval($this->attributes[$extrafieldsobjectkey]['list'][$key], 1);
 			$help=$this->attributes[$extrafieldsobjectkey]['help'][$key];
 			$hidden=(empty($list) ? 1 : 0);		// If $list empty, we are sure it is hidden, otherwise we show. If it depends on mode (view/create/edit form or list, this must be filtered by caller)
-		}
-		else	// Old usage
+		} else	// Old usage
 		{
 			$label=$this->attribute_label[$key];
 			$type=$this->attribute_type[$key];
@@ -1545,7 +1584,10 @@ 
 			$hidden=(empty($list) ? 1 : 0);		// If $list empty, we are sure it is hidden, otherwise we show. If it depends on mode (view/create/edit form or list, this must be filtered by caller)
 		}
 
-		if ($hidden) return '';		// This is a protection. If field is hidden, we should just not call this method.
+		if ($hidden) {
+		    return '';
+		}
+		// This is a protection. If field is hidden, we should just not call this method.
 
 		// If field is a computed field, value must become result of compute
 		if ($computed)
@@ -1560,52 +1602,45 @@ 
 		{
 			$showsize=10;
 			$value=dol_print_date($value, 'day');
-		}
-		elseif ($type == 'datetime')
+		} elseif ($type == 'datetime')
 		{
 			$showsize=19;
 			$value=dol_print_date($value, 'dayhour');
-		}
-		elseif ($type == 'int')
+		} elseif ($type == 'int')
 		{
 			$showsize=10;
-		}
-		elseif ($type == 'double')
+		} elseif ($type == 'double')
 		{
 			if (!empty($value)) {
 				$value=price($value);
 			}
-		}
-		elseif ($type == 'boolean')
+		} elseif ($type == 'boolean')
 		{
 			$checked='';
 			if (!empty($value)) {
 				$checked=' checked ';
 			}
 			$value='<input type="checkbox" '.$checked.' '.($moreparam?$moreparam:'').' readonly disabled>';
-		}
-		elseif ($type == 'mail')
+		} elseif ($type == 'mail')
 		{
 			$value=dol_print_email($value, 0, 0, 0, 64, 1, 1);
-		}
-		elseif ($type == 'url')
+		} elseif ($type == 'url')
 		{
 			$value=dol_print_url($value,'_blank',32,1);
-		}
-		elseif ($type == 'phone')
+		} elseif ($type == 'phone')
 		{
 			$value=dol_print_phone($value, '', 0, 0, '', '&nbsp;', 1);
-		}
-		elseif ($type == 'price')
+		} elseif ($type == 'price')
 		{
 			$value=price($value, 0, $langs, 0, 0, -1, $conf->currency);
-		}
-		elseif ($type == 'select')
+		} elseif ($type == 'select')
 		{
-			if ($langfile && $param['options'][$value]) $value=$langs->trans($param['options'][$value]);
-			else $value=$param['options'][$value];
-		}
-		elseif ($type == 'sellist')
+			if ($langfile && $param['options'][$value]) {
+			    $value=$langs->trans($param['options'][$value]);
+			} else {
+			    $value=$param['options'][$value];
+			}
+		} elseif ($type == 'sellist')
 		{
 			$param_list=array_keys($param['options']);
 			$InfoFieldList = explode(":", $param_list[0]);
@@ -1635,7 +1670,7 @@ 
 				$sql.= " WHERE ".$selectkey."=0";
 			} elseif ($selectkey=='rowid') {
 				$sql.= " WHERE ".$selectkey."=".$this->db->escape($value);
-			}else {
+			} else {
 				$sql.= " WHERE ".$selectkey."='".$this->db->escape($value)."'";
 			}
 
@@ -1662,12 +1697,11 @@ 
 						}
 						if ($translabel!=$field_toshow) {
 							$value.=dol_trunc($translabel,18).' ';
-						}else {
+						} else {
 							$value.=$obj->$field_toshow.' ';
 						}
 					}
-				}
-				else
+				} else
 				{
 					$translabel='';
 					if (!empty($obj->{$InfoFieldList[1]})) {
@@ -1675,18 +1709,17 @@ 
 					}
 					if ($translabel!=$obj->{$InfoFieldList[1]}) {
 						$value=dol_trunc($translabel,18);
-					}else {
+					} else {
 						$value=$obj->{$InfoFieldList[1]};
 					}
 				}
+			} else {
+			    dol_syslog(get_class($this).'::showOutputField error '.$this->db->lasterror(), LOG_WARNING);
 			}
-			else dol_syslog(get_class($this).'::showOutputField error '.$this->db->lasterror(), LOG_WARNING);
-		}
-		elseif ($type == 'radio')
+		} elseif ($type == 'radio')
 		{
 			$value=$param['options'][$value];
-		}
-		elseif ($type == 'checkbox')
+		} elseif ($type == 'checkbox')
 		{
 			$value_arr=explode(',',$value);
 			$value='';
@@ -1698,8 +1731,7 @@ 
 				}
 			}
 			$value='<div class="select2-container-multi-dolibarr" style="width: 90%;"><ul class="select2-choices-dolibarr">'.implode(' ', $toprint).'</ul></div>';
-		}
-		elseif ($type == 'chkbxlst')
+		} elseif ($type == 'chkbxlst')
 		{
 			$value_arr = explode(',', $value);
 
@@ -1767,15 +1799,17 @@ 
 			} else {
 				dol_syslog(get_class($this) . '::showOutputField error ' . $this->db->lasterror(), LOG_WARNING);
 			}
-		}
-		elseif ($type == 'link')
+		} elseif ($type == 'link')
 		{
 			$out='';
 
 			// Only if something to display (perf)
-			if ($value)		// If we have -1 here, pb is into sert, not into ouptu
+			if ($value) {
+			    // If we have -1 here, pb is into sert, not into ouptu
 			{
-				$param_list=array_keys($param['options']);				// $param_list='ObjectName:classPath'
+				$param_list=array_keys($param['options']);
+			}
+			// $param_list='ObjectName:classPath'
 
 				$InfoFieldList = explode(":", $param_list[0]);
 				$classname=$InfoFieldList[0];
@@ -1789,30 +1823,27 @@ 
 						$object->fetch($value);
 						$value=$object->getNomUrl(3);
 					}
-				}
-				else
+				} else
 				{
 					dol_syslog('Error bad setup of extrafield', LOG_WARNING);
 					return 'Error bad setup of extrafield';
 				}
 			}
-		}
-		elseif ($type == 'text')
+		} elseif ($type == 'text')
 		{
 			$value=dol_htmlentitiesbr($value);
-		}
-		elseif ($type == 'html')
+		} elseif ($type == 'html')
 		{
 			$value=dol_htmlentitiesbr($value);
-		}
-		elseif ($type == 'password')
+		} elseif ($type == 'password')
 		{
 			$value=dol_trunc(preg_replace('/./i','*',$value), 8, 'right', 'UTF-8', 1);
-		}
-		else
+		} else
 		{
 			$showsize=round($size);
-			if ($showsize > 48) $showsize=48;
+			if ($showsize > 48) {
+			    $showsize=48;
+			}
 		}
 
 		//print $type.'-'.$size;
@@ -1832,40 +1863,36 @@ 
 	{
 		global $conf,$langs;
 
-		if (! empty($extrafieldsobjectkey)) $type=$this->attributes[$extrafieldsobjectkey]['type'][$key];
-		else $type=$this->attribute_type[$key];
+		if (! empty($extrafieldsobjectkey)) {
+		    $type=$this->attributes[$extrafieldsobjectkey]['type'][$key];
+		} else {
+		    $type=$this->attribute_type[$key];
+		}
 
 		$align='';
 
         if ($type == 'date')
 		{
 			$align="center";
-		}
-		elseif ($type == 'datetime')
+		} elseif ($type == 'datetime')
 		{
 			$align="center";
-		}
-		elseif ($type == 'int')
+		} elseif ($type == 'int')
 		{
 			$align="right";
-		}
-		elseif ($type == 'double')
+		} elseif ($type == 'double')
 		{
 			$align="right";
-		}
-		elseif ($type == 'boolean')
+		} elseif ($type == 'boolean')
 		{
 			$align="center";
-		}
-		elseif ($type == 'radio')
+		} elseif ($type == 'radio')
 		{
 			$align="center";
-		}
-		elseif ($type == 'checkbox')
+		} elseif ($type == 'checkbox')
 		{
 			$align="center";
-		}
-		elseif ($type == 'price')
+		} elseif ($type == 'price')
 		{
 			$align="right";
 		}
@@ -1904,17 +1931,23 @@ 
 		$nofillrequired='';// For error when required field left blank
 		$error_field_required = array();
 
-		if (is_array($this->attributes[$object->table_element]['label'])) $extralabels=$this->attributes[$object->table_element]['label'];
+		if (is_array($this->attributes[$object->table_element]['label'])) {
+		    $extralabels=$this->attributes[$object->table_element]['label'];
+		}
 
 		if (is_array($extralabels))
 		{
 			// Get extra fields
 			foreach ($extralabels as $key => $value)
 			{
-				if (! empty($onlykey) && $key != $onlykey) continue;
+				if (! empty($onlykey) && $key != $onlykey) {
+				    continue;
+				}
 
 				$key_type = $this->attributes[$object->table_element]['type'][$key];
-				if ($key_type == 'separate') continue;
+				if ($key_type == 'separate') {
+				    continue;
+				}
 
 				$enabled = 1;
 				if (isset($this->attributes[$object->table_element]['list'][$key]))
@@ -1926,10 +1959,15 @@ 
 				{
 					$perms = dol_eval($this->attributes[$object->table_element]['perms'][$key], 1);
 				}
-				if (empty($enabled)) continue;
-				if (empty($perms)) continue;
+				if (empty($enabled)) {
+				    continue;
+				}
+				if (empty($perms)) {
+				    continue;
+				}
 
-				if ($this->attributes[$object->table_element]['required'][$key])	// Value is required
+				if ($this->attributes[$object->table_element]['required'][$key]) {
+				    // Value is required
 				{
 					// Check if empty without using GETPOST, value can be alpha, int, array, etc...
 					if ((! is_array($_POST["options_".$key]) && empty($_POST["options_".$key]) && $_POST["options_".$key] != '0')
@@ -1937,6 +1975,7 @@ 
 					{
 						//print 'ccc'.$value.'-'.$this->attributes[$object->table_element]['required'][$key];
 						$nofillrequired++;
+				}
 						$error_field_required[] = $langs->transnoentitiesnoconv($value);
 					}
 				}
@@ -1946,28 +1985,24 @@ 
 					// Clean parameters
 					// TODO GMT date in memory must be GMT so we should add gm=true in parameters
 					$value_key=dol_mktime(0, 0, 0, $_POST["options_".$key."month"], $_POST["options_".$key."day"], $_POST["options_".$key."year"]);
-				}
-				elseif (in_array($key_type,array('datetime')))
+				} elseif (in_array($key_type,array('datetime')))
 				{
 					// Clean parameters
 					// TODO GMT date in memory must be GMT so we should add gm=true in parameters
 					$value_key=dol_mktime($_POST["options_".$key."hour"], $_POST["options_".$key."min"], 0, $_POST["options_".$key."month"], $_POST["options_".$key."day"], $_POST["options_".$key."year"]);
-				}
-				else if (in_array($key_type,array('checkbox','chkbxlst')))
+				} else if (in_array($key_type,array('checkbox','chkbxlst')))
 				{
 					$value_arr=GETPOST("options_".$key, 'array'); // check if an array
 					if (!empty($value_arr)) {
 						$value_key=implode($value_arr,',');
-					}else {
+					} else {
 						$value_key='';
 					}
-				}
-				else if (in_array($key_type,array('price','double')))
+				} else if (in_array($key_type,array('price','double')))
 				{
 					$value_arr=GETPOST("options_".$key, 'alpha');
 					$value_key=price2num($value_arr);
-				}
-				else
+				} else
 				{
 					$value_key=GETPOST("options_".$key);
 				}
@@ -1979,12 +2014,10 @@ 
 				$langs->load('errors');
 				setEventMessages($langs->trans('ErrorFieldsRequired').' : '.implode(', ',$error_field_required), null, 'errors');
 				return -1;
-			}
-			else {
+			} else {
 				return 1;
 			}
-		}
-		else {
+		} else {
 			return 0;
 		}
 	}
@@ -2004,8 +2037,7 @@ 
 		if (is_string($extrafieldsobjectkey) && is_array($this->attributes[$extrafieldsobjectkey]['label']))
 		{
 			$extralabels = $this->attributes[$extrafieldsobjectkey]['label'];
-		}
-		else
+		} else
 		{
 			$extralabels = $extrafieldsobjectkey;
 		}
@@ -2027,20 +2059,17 @@ 
 				{
 					// Clean parameters
 					$value_key=dol_mktime($_POST[$keysuffix."options_".$key.$keyprefix."hour"], $_POST[$keysuffix."options_".$key.$keyprefix."min"], 0, $_POST[$keysuffix."options_".$key.$keyprefix."month"], $_POST[$keysuffix."options_".$key.$keyprefix."day"], $_POST[$keysuffix."options_".$key.$keyprefix."year"]);
-				}
-				else if (in_array($key_type,array('checkbox', 'chkbxlst')))
+				} else if (in_array($key_type,array('checkbox', 'chkbxlst')))
 				{
 					$value_arr=GETPOST($keysuffix."options_".$key.$keyprefix);
 					// Make sure we get an array even if there's only one checkbox
 					$value_arr=(array) $value_arr;
 					$value_key=implode(',', $value_arr);
-				}
-				else if (in_array($key_type,array('price','double')))
+				} else if (in_array($key_type,array('price','double')))
 				{
 					$value_arr=GETPOST($keysuffix."options_".$key.$keyprefix);
 					$value_key=price2num($value_arr);
-				}
-				else
+				} else
 				{
 					$value_key=GETPOST($keysuffix."options_".$key.$keyprefix);
 				}

dolibarr/htdocs/core/class/events.class.php

Indentation +237 added lines, -237 removed lines

@@ -34,62 +34,62 @@ 
  */
 class Events // extends CommonObject
 {
-	/**
-	 * @var string ID to identify managed object
-	 */
-	public $element='events';
+    /**
+     * @var string ID to identify managed object
+     */
+    public $element='events';
 
-	/**
-	 * @var string Name of table without prefix where object is stored
-	 */
-	public $table_element='events';
+    /**
+     * @var string Name of table without prefix where object is stored
+     */
+    public $table_element='events';
 
-	/**
-	 * @var int ID
-	 */
-	public $id;
+    /**
+     * @var int ID
+     */
+    public $id;
 
     /**
      * @var DoliDB Database handler.
      */
     public $db;
 
-	/**
-	 * @var string Error code (or message)
-	 */
-	public $error='';
-
-	public $tms;
-	public $type;
-
-	/**
-	 * @var int Entity
-	 */
-	public $entity;
-
-	public $dateevent;
-
-	/**
-	 * @var string description
-	 */
-	public $description;
-
-	// List of all Audit/Security events supported by triggers
-	public $eventstolog=array(
-		array('id'=>'USER_LOGIN',             'test'=>1),
-		array('id'=>'USER_LOGIN_FAILED',      'test'=>1),
-	    array('id'=>'USER_LOGOUT',            'test'=>1),
-		array('id'=>'USER_CREATE',            'test'=>1),
-		array('id'=>'USER_MODIFY',            'test'=>1),
-		array('id'=>'USER_NEW_PASSWORD',      'test'=>1),
-		array('id'=>'USER_ENABLEDISABLE',     'test'=>1),
-		array('id'=>'USER_DELETE',            'test'=>1),
-	/*    array('id'=>'USER_SETINGROUP',        'test'=>1), deprecated. Replace with USER_MODIFY
+    /**
+     * @var string Error code (or message)
+     */
+    public $error='';
+
+    public $tms;
+    public $type;
+
+    /**
+     * @var int Entity
+     */
+    public $entity;
+
+    public $dateevent;
+
+    /**
+     * @var string description
+     */
+    public $description;
+
+    // List of all Audit/Security events supported by triggers
+    public $eventstolog=array(
+        array('id'=>'USER_LOGIN',             'test'=>1),
+        array('id'=>'USER_LOGIN_FAILED',      'test'=>1),
+        array('id'=>'USER_LOGOUT',            'test'=>1),
+        array('id'=>'USER_CREATE',            'test'=>1),
+        array('id'=>'USER_MODIFY',            'test'=>1),
+        array('id'=>'USER_NEW_PASSWORD',      'test'=>1),
+        array('id'=>'USER_ENABLEDISABLE',     'test'=>1),
+        array('id'=>'USER_DELETE',            'test'=>1),
+    /*    array('id'=>'USER_SETINGROUP',        'test'=>1), deprecated. Replace with USER_MODIFY
 	    array('id'=>'USER_REMOVEFROMGROUP',   'test'=>1), deprecated. Replace with USER_MODIFY */
-		array('id'=>'GROUP_CREATE',           'test'=>1),
-		array('id'=>'GROUP_MODIFY',           'test'=>1),
-		array('id'=>'GROUP_DELETE',           'test'=>1),
-	/*	array('id'=>'ACTION_CREATE',          'test'=>$conf->societe->enabled),
+        array('id'=>'GROUP_CREATE',           'test'=>1),
+        array('id'=>'GROUP_MODIFY',           'test'=>1),
+        array('id'=>'GROUP_DELETE',           'test'=>1),
+    /*	array('id'=>'ACTION_CREATE',          'test'=>$conf->societe->enabled),
 		array('id'=>'COMPANY_CREATE',         'test'=>$conf->societe->enabled),
 		array('id'=>'CONTRACT_VALIDATE',      'test'=>$conf->contrat->enabled),
 		array('id'=>'PROPAL_VALIDATE',        'test'=>$conf->propal->enabled),
@@ -111,199 +111,199 @@ 
 		array('id'=>'MEMBER_RESILIATE',       'test'=>$conf->adherent->enabled),
 		array('id'=>'MEMBER_DELETE',          'test'=>$conf->adherent->enabled),
 	*/
-	);
-
-
-	/**
-	 *	Constructor
-	 *
-	 *  @param		DoliDB		$db      Database handler
-	 */
-	function __construct($db)
-	{
-		$this->db = $db;
-	}
-
-
-	/**
-	 *   Create in database
-	 *
-	 *   @param      User	$user       User that create
-	 *   @return     int     		    <0 if KO, >0 if OK
-	 */
-	function create($user)
-	{
-		global $conf, $langs;
-
-		// Clean parameters
-		$this->description=trim($this->description);
-		if (empty($this->user_agent) && !empty($_SERVER['HTTP_USER_AGENT'])) $this->user_agent=$_SERVER['HTTP_USER_AGENT'];
-
-		// Check parameters
-		if (empty($this->description)) { $this->error='ErrorBadValueForParameterCreateEventDesc'; return -1; }
-
-		// Insert request
-		$sql = "INSERT INTO ".MAIN_DB_PREFIX."events(";
-		$sql.= "type,";
-		$sql.= "entity,";
-		$sql.= "ip,";
-		$sql.= "user_agent,";
-		$sql.= "dateevent,";
-		$sql.= "fk_user,";
-		$sql.= "description";
-		$sql.= ") VALUES (";
-		$sql.= " '".$this->db->escape($this->type)."',";
-		$sql.= " ".$conf->entity.",";
-		$sql.= " '".$this->db->escape(getUserRemoteIP())."',";
-		$sql.= " ".($this->user_agent ? "'".$this->db->escape(dol_trunc($this->user_agent,250))."'" : 'NULL').",";
-		$sql.= " '".$this->db->idate($this->dateevent)."',";
-		$sql.= " ".($user->id?"'".$this->db->escape($user->id)."'":'NULL').",";
-		$sql.= " '".$this->db->escape(dol_trunc($this->description,250))."'";
-		$sql.= ")";
-
-		dol_syslog(get_class($this)."::create", LOG_DEBUG);
-		$resql=$this->db->query($sql);
-		if ($resql)
-		{
-			$this->id = $this->db->last_insert_id(MAIN_DB_PREFIX."events");
-			return $this->id;
-		}
-		else
-		{
-			$this->error="Error ".$this->db->lasterror();
-			return -1;
-		}
-	}
-
-
-	/**
-	 * Update database
-	 *
-	 * @param	User    $user        	User that modify
-	 * @param   int		$notrigger	    0=no, 1=yes (no update trigger)
-	 * @return  int         			<0 if KO, >0 if OK
-	 */
-	function update($user=null, $notrigger=0)
-	{
-		global $conf, $langs;
-
-		// Clean parameters
-		$this->id=trim($this->id);
-		$this->type=trim($this->type);
-		$this->description=trim($this->description);
-
-		// Check parameters
-		// Put here code to add control on parameters values
-
-		// Update request
-		$sql = "UPDATE ".MAIN_DB_PREFIX."events SET";
-		$sql.= " type='".$this->db->escape($this->type)."',";
-		$sql.= " dateevent='".$this->db->idate($this->dateevent)."',";
-		$sql.= " description='".$this->db->escape($this->description)."'";
-		$sql.= " WHERE rowid=".$this->id;
-
-		dol_syslog(get_class($this)."::update", LOG_DEBUG);
-		$resql = $this->db->query($sql);
-		if (! $resql)
-		{
-			$this->error="Error ".$this->db->lasterror();
-			return -1;
-		}
-		return 1;
-	}
-
-
-	/**
-	 *  Load object in memory from database
-	 *
-	 *  @param	int		$id         Id object
-	 *  @param  User	$user       User that load
-	 *  @return int         		<0 if KO, >0 if OK
-	 */
-	function fetch($id, $user=null)
-	{
-		global $langs;
-
-		$sql = "SELECT";
-		$sql.= " t.rowid,";
-		$sql.= " t.tms,";
-		$sql.= " t.type,";
-		$sql.= " t.entity,";
-		$sql.= " t.dateevent,";
-		$sql.= " t.description,";
-		$sql.= " t.ip,";
-		$sql.= " t.user_agent";
-		$sql.= " FROM ".MAIN_DB_PREFIX."events as t";
-		$sql.= " WHERE t.rowid = ".$id;
-
-		dol_syslog(get_class($this)."::fetch", LOG_DEBUG);
-		$resql=$this->db->query($sql);
-		if ($resql)
-		{
-			if ($this->db->num_rows($resql))
-			{
-				$obj = $this->db->fetch_object($resql);
-
-				$this->id    = $obj->rowid;
-				$this->tms = $this->db->jdate($obj->tms);
-				$this->type = $obj->type;
-				$this->entity = $obj->entity;
-				$this->dateevent = $this->db->jdate($obj->dateevent);
-				$this->description = $obj->description;
-				$this->ip = $obj->ip;
-				$this->user_agent = $obj->user_agent;
-			}
-			$this->db->free($resql);
-
-			return 1;
-		}
-		else
-		{
-			$this->error="Error ".$this->db->lasterror();
-			return -1;
-		}
-	}
-
-
-	/**
-	 *  Delete object in database
-	 *
-	 *	@param	User	$user       User that delete
-	 *	@return	int					<0 if KO, >0 if OK
-	 */
-	function delete($user)
-	{
-		global $conf, $langs;
-
-		$sql = "DELETE FROM ".MAIN_DB_PREFIX."events";
-		$sql.= " WHERE rowid=".$this->id;
-
-		dol_syslog(get_class($this)."::delete", LOG_DEBUG);
-		$resql = $this->db->query($sql);
-		if (! $resql)
-		{
-			$this->error="Error ".$this->db->lasterror();
-			return -1;
-		}
-
-		return 1;
-	}
-
-
-	/**
+    );
+
+
+    /**
+     *	Constructor
+     *
+     *  @param		DoliDB		$db      Database handler
+     */
+    function __construct($db)
+    {
+        $this->db = $db;
+    }
+
+
+    /**
+     *   Create in database
+     *
+     *   @param      User	$user       User that create
+     *   @return     int     		    <0 if KO, >0 if OK
+     */
+    function create($user)
+    {
+        global $conf, $langs;
+
+        // Clean parameters
+        $this->description=trim($this->description);
+        if (empty($this->user_agent) && !empty($_SERVER['HTTP_USER_AGENT'])) $this->user_agent=$_SERVER['HTTP_USER_AGENT'];
+
+        // Check parameters
+        if (empty($this->description)) { $this->error='ErrorBadValueForParameterCreateEventDesc'; return -1; }
+
+        // Insert request
+        $sql = "INSERT INTO ".MAIN_DB_PREFIX."events(";
+        $sql.= "type,";
+        $sql.= "entity,";
+        $sql.= "ip,";
+        $sql.= "user_agent,";
+        $sql.= "dateevent,";
+        $sql.= "fk_user,";
+        $sql.= "description";
+        $sql.= ") VALUES (";
+        $sql.= " '".$this->db->escape($this->type)."',";
+        $sql.= " ".$conf->entity.",";
+        $sql.= " '".$this->db->escape(getUserRemoteIP())."',";
+        $sql.= " ".($this->user_agent ? "'".$this->db->escape(dol_trunc($this->user_agent,250))."'" : 'NULL').",";
+        $sql.= " '".$this->db->idate($this->dateevent)."',";
+        $sql.= " ".($user->id?"'".$this->db->escape($user->id)."'":'NULL').",";
+        $sql.= " '".$this->db->escape(dol_trunc($this->description,250))."'";
+        $sql.= ")";
+
+        dol_syslog(get_class($this)."::create", LOG_DEBUG);
+        $resql=$this->db->query($sql);
+        if ($resql)
+        {
+            $this->id = $this->db->last_insert_id(MAIN_DB_PREFIX."events");
+            return $this->id;
+        }
+        else
+        {
+            $this->error="Error ".$this->db->lasterror();
+            return -1;
+        }
+    }
+
+
+    /**
+     * Update database
+     *
+     * @param	User    $user        	User that modify
+     * @param   int		$notrigger	    0=no, 1=yes (no update trigger)
+     * @return  int         			<0 if KO, >0 if OK
+     */
+    function update($user=null, $notrigger=0)
+    {
+        global $conf, $langs;
+
+        // Clean parameters
+        $this->id=trim($this->id);
+        $this->type=trim($this->type);
+        $this->description=trim($this->description);
+
+        // Check parameters
+        // Put here code to add control on parameters values
+
+        // Update request
+        $sql = "UPDATE ".MAIN_DB_PREFIX."events SET";
+        $sql.= " type='".$this->db->escape($this->type)."',";
+        $sql.= " dateevent='".$this->db->idate($this->dateevent)."',";
+        $sql.= " description='".$this->db->escape($this->description)."'";
+        $sql.= " WHERE rowid=".$this->id;
+
+        dol_syslog(get_class($this)."::update", LOG_DEBUG);
+        $resql = $this->db->query($sql);
+        if (! $resql)
+        {
+            $this->error="Error ".$this->db->lasterror();
+            return -1;
+        }
+        return 1;
+    }
+
+
+    /**
+     *  Load object in memory from database
+     *
+     *  @param	int		$id         Id object
+     *  @param  User	$user       User that load
+     *  @return int         		<0 if KO, >0 if OK
+     */
+    function fetch($id, $user=null)
+    {
+        global $langs;
+
+        $sql = "SELECT";
+        $sql.= " t.rowid,";
+        $sql.= " t.tms,";
+        $sql.= " t.type,";
+        $sql.= " t.entity,";
+        $sql.= " t.dateevent,";
+        $sql.= " t.description,";
+        $sql.= " t.ip,";
+        $sql.= " t.user_agent";
+        $sql.= " FROM ".MAIN_DB_PREFIX."events as t";
+        $sql.= " WHERE t.rowid = ".$id;
+
+        dol_syslog(get_class($this)."::fetch", LOG_DEBUG);
+        $resql=$this->db->query($sql);
+        if ($resql)
+        {
+            if ($this->db->num_rows($resql))
+            {
+                $obj = $this->db->fetch_object($resql);
+
+                $this->id    = $obj->rowid;
+                $this->tms = $this->db->jdate($obj->tms);
+                $this->type = $obj->type;
+                $this->entity = $obj->entity;
+                $this->dateevent = $this->db->jdate($obj->dateevent);
+                $this->description = $obj->description;
+                $this->ip = $obj->ip;
+                $this->user_agent = $obj->user_agent;
+            }
+            $this->db->free($resql);
+
+            return 1;
+        }
+        else
+        {
+            $this->error="Error ".$this->db->lasterror();
+            return -1;
+        }
+    }
+
+
+    /**
+     *  Delete object in database
+     *
+     *	@param	User	$user       User that delete
+     *	@return	int					<0 if KO, >0 if OK
+     */
+    function delete($user)
+    {
+        global $conf, $langs;
+
+        $sql = "DELETE FROM ".MAIN_DB_PREFIX."events";
+        $sql.= " WHERE rowid=".$this->id;
+
+        dol_syslog(get_class($this)."::delete", LOG_DEBUG);
+        $resql = $this->db->query($sql);
+        if (! $resql)
+        {
+            $this->error="Error ".$this->db->lasterror();
+            return -1;
+        }
+
+        return 1;
+    }
+
+
+    /**
      *  Initialise an instance with random values.
      *  Used to build previews or test instances.
      *	id must be 0 if object instance is a specimen.
      *
      *  @return	void
-	 */
-	function initAsSpecimen()
-	{
-		$this->id=0;
-
-		$this->tms=time();
-		$this->type='';
-		$this->dateevent=time();
-		$this->description='This is a specimen event';
-	}
+     */
+    function initAsSpecimen()
+    {
+        $this->id=0;
+
+        $this->tms=time();
+        $this->type='';
+        $this->dateevent=time();
+        $this->description='This is a specimen event';
+    }
 }

Spacing +68 added lines, -68 removed lines

@@ -37,12 +37,12 @@ 
 	/**
 	 * @var string ID to identify managed object
 	 */
-	public $element='events';
+	public $element = 'events';
 
 	/**
 	 * @var string Name of table without prefix where object is stored
 	 */
-	public $table_element='events';
+	public $table_element = 'events';
 
 	/**
 	 * @var int ID
@@ -57,7 +57,7 @@ 
 	/**
 	 * @var string Error code (or message)
 	 */
-	public $error='';
+	public $error = '';
 
 	public $tms;
 	public $type;
@@ -75,20 +75,20 @@ 
 	public $description;
 
 	// List of all Audit/Security events supported by triggers
-	public $eventstolog=array(
-		array('id'=>'USER_LOGIN',             'test'=>1),
-		array('id'=>'USER_LOGIN_FAILED',      'test'=>1),
-	    array('id'=>'USER_LOGOUT',            'test'=>1),
-		array('id'=>'USER_CREATE',            'test'=>1),
-		array('id'=>'USER_MODIFY',            'test'=>1),
-		array('id'=>'USER_NEW_PASSWORD',      'test'=>1),
-		array('id'=>'USER_ENABLEDISABLE',     'test'=>1),
-		array('id'=>'USER_DELETE',            'test'=>1),
+	public $eventstolog = array(
+		array('id'=>'USER_LOGIN', 'test'=>1),
+		array('id'=>'USER_LOGIN_FAILED', 'test'=>1),
+	    array('id'=>'USER_LOGOUT', 'test'=>1),
+		array('id'=>'USER_CREATE', 'test'=>1),
+		array('id'=>'USER_MODIFY', 'test'=>1),
+		array('id'=>'USER_NEW_PASSWORD', 'test'=>1),
+		array('id'=>'USER_ENABLEDISABLE', 'test'=>1),
+		array('id'=>'USER_DELETE', 'test'=>1),
 	/*    array('id'=>'USER_SETINGROUP',        'test'=>1), deprecated. Replace with USER_MODIFY
 	    array('id'=>'USER_REMOVEFROMGROUP',   'test'=>1), deprecated. Replace with USER_MODIFY */
-		array('id'=>'GROUP_CREATE',           'test'=>1),
-		array('id'=>'GROUP_MODIFY',           'test'=>1),
-		array('id'=>'GROUP_DELETE',           'test'=>1),
+		array('id'=>'GROUP_CREATE', 'test'=>1),
+		array('id'=>'GROUP_MODIFY', 'test'=>1),
+		array('id'=>'GROUP_DELETE', 'test'=>1),
 	/*	array('id'=>'ACTION_CREATE',          'test'=>$conf->societe->enabled),
 		array('id'=>'COMPANY_CREATE',         'test'=>$conf->societe->enabled),
 		array('id'=>'CONTRACT_VALIDATE',      'test'=>$conf->contrat->enabled),
@@ -136,33 +136,33 @@ 
 		global $conf, $langs;
 
 		// Clean parameters
-		$this->description=trim($this->description);
-		if (empty($this->user_agent) && !empty($_SERVER['HTTP_USER_AGENT'])) $this->user_agent=$_SERVER['HTTP_USER_AGENT'];
+		$this->description = trim($this->description);
+		if (empty($this->user_agent) && !empty($_SERVER['HTTP_USER_AGENT'])) $this->user_agent = $_SERVER['HTTP_USER_AGENT'];
 
 		// Check parameters
-		if (empty($this->description)) { $this->error='ErrorBadValueForParameterCreateEventDesc'; return -1; }
+		if (empty($this->description)) { $this->error = 'ErrorBadValueForParameterCreateEventDesc'; return -1; }
 
 		// Insert request
 		$sql = "INSERT INTO ".MAIN_DB_PREFIX."events(";
-		$sql.= "type,";
-		$sql.= "entity,";
-		$sql.= "ip,";
-		$sql.= "user_agent,";
-		$sql.= "dateevent,";
-		$sql.= "fk_user,";
-		$sql.= "description";
-		$sql.= ") VALUES (";
-		$sql.= " '".$this->db->escape($this->type)."',";
-		$sql.= " ".$conf->entity.",";
-		$sql.= " '".$this->db->escape(getUserRemoteIP())."',";
-		$sql.= " ".($this->user_agent ? "'".$this->db->escape(dol_trunc($this->user_agent,250))."'" : 'NULL').",";
-		$sql.= " '".$this->db->idate($this->dateevent)."',";
-		$sql.= " ".($user->id?"'".$this->db->escape($user->id)."'":'NULL').",";
-		$sql.= " '".$this->db->escape(dol_trunc($this->description,250))."'";
-		$sql.= ")";
+		$sql .= "type,";
+		$sql .= "entity,";
+		$sql .= "ip,";
+		$sql .= "user_agent,";
+		$sql .= "dateevent,";
+		$sql .= "fk_user,";
+		$sql .= "description";
+		$sql .= ") VALUES (";
+		$sql .= " '".$this->db->escape($this->type)."',";
+		$sql .= " ".$conf->entity.",";
+		$sql .= " '".$this->db->escape(getUserRemoteIP())."',";
+		$sql .= " ".($this->user_agent ? "'".$this->db->escape(dol_trunc($this->user_agent, 250))."'" : 'NULL').",";
+		$sql .= " '".$this->db->idate($this->dateevent)."',";
+		$sql .= " ".($user->id ? "'".$this->db->escape($user->id)."'" : 'NULL').",";
+		$sql .= " '".$this->db->escape(dol_trunc($this->description, 250))."'";
+		$sql .= ")";
 
 		dol_syslog(get_class($this)."::create", LOG_DEBUG);
-		$resql=$this->db->query($sql);
+		$resql = $this->db->query($sql);
 		if ($resql)
 		{
 			$this->id = $this->db->last_insert_id(MAIN_DB_PREFIX."events");
@@ -170,7 +170,7 @@ 
 		}
 		else
 		{
-			$this->error="Error ".$this->db->lasterror();
+			$this->error = "Error ".$this->db->lasterror();
 			return -1;
 		}
 	}
@@ -183,30 +183,30 @@ 
 	 * @param   int		$notrigger	    0=no, 1=yes (no update trigger)
 	 * @return  int         			<0 if KO, >0 if OK
 	 */
-	function update($user=null, $notrigger=0)
+	function update($user = null, $notrigger = 0)
 	{
 		global $conf, $langs;
 
 		// Clean parameters
-		$this->id=trim($this->id);
-		$this->type=trim($this->type);
-		$this->description=trim($this->description);
+		$this->id = trim($this->id);
+		$this->type = trim($this->type);
+		$this->description = trim($this->description);
 
 		// Check parameters
 		// Put here code to add control on parameters values
 
 		// Update request
 		$sql = "UPDATE ".MAIN_DB_PREFIX."events SET";
-		$sql.= " type='".$this->db->escape($this->type)."',";
-		$sql.= " dateevent='".$this->db->idate($this->dateevent)."',";
-		$sql.= " description='".$this->db->escape($this->description)."'";
-		$sql.= " WHERE rowid=".$this->id;
+		$sql .= " type='".$this->db->escape($this->type)."',";
+		$sql .= " dateevent='".$this->db->idate($this->dateevent)."',";
+		$sql .= " description='".$this->db->escape($this->description)."'";
+		$sql .= " WHERE rowid=".$this->id;
 
 		dol_syslog(get_class($this)."::update", LOG_DEBUG);
 		$resql = $this->db->query($sql);
-		if (! $resql)
+		if (!$resql)
 		{
-			$this->error="Error ".$this->db->lasterror();
+			$this->error = "Error ".$this->db->lasterror();
 			return -1;
 		}
 		return 1;
@@ -220,31 +220,31 @@ 
 	 *  @param  User	$user       User that load
 	 *  @return int         		<0 if KO, >0 if OK
 	 */
-	function fetch($id, $user=null)
+	function fetch($id, $user = null)
 	{
 		global $langs;
 
 		$sql = "SELECT";
-		$sql.= " t.rowid,";
-		$sql.= " t.tms,";
-		$sql.= " t.type,";
-		$sql.= " t.entity,";
-		$sql.= " t.dateevent,";
-		$sql.= " t.description,";
-		$sql.= " t.ip,";
-		$sql.= " t.user_agent";
-		$sql.= " FROM ".MAIN_DB_PREFIX."events as t";
-		$sql.= " WHERE t.rowid = ".$id;
+		$sql .= " t.rowid,";
+		$sql .= " t.tms,";
+		$sql .= " t.type,";
+		$sql .= " t.entity,";
+		$sql .= " t.dateevent,";
+		$sql .= " t.description,";
+		$sql .= " t.ip,";
+		$sql .= " t.user_agent";
+		$sql .= " FROM ".MAIN_DB_PREFIX."events as t";
+		$sql .= " WHERE t.rowid = ".$id;
 
 		dol_syslog(get_class($this)."::fetch", LOG_DEBUG);
-		$resql=$this->db->query($sql);
+		$resql = $this->db->query($sql);
 		if ($resql)
 		{
 			if ($this->db->num_rows($resql))
 			{
 				$obj = $this->db->fetch_object($resql);
 
-				$this->id    = $obj->rowid;
+				$this->id = $obj->rowid;
 				$this->tms = $this->db->jdate($obj->tms);
 				$this->type = $obj->type;
 				$this->entity = $obj->entity;
@@ -259,7 +259,7 @@ 
 		}
 		else
 		{
-			$this->error="Error ".$this->db->lasterror();
+			$this->error = "Error ".$this->db->lasterror();
 			return -1;
 		}
 	}
@@ -276,13 +276,13 @@ 
 		global $conf, $langs;
 
 		$sql = "DELETE FROM ".MAIN_DB_PREFIX."events";
-		$sql.= " WHERE rowid=".$this->id;
+		$sql .= " WHERE rowid=".$this->id;
 
 		dol_syslog(get_class($this)."::delete", LOG_DEBUG);
 		$resql = $this->db->query($sql);
-		if (! $resql)
+		if (!$resql)
 		{
-			$this->error="Error ".$this->db->lasterror();
+			$this->error = "Error ".$this->db->lasterror();
 			return -1;
 		}
 
@@ -299,11 +299,11 @@ 
 	 */
 	function initAsSpecimen()
 	{
-		$this->id=0;
+		$this->id = 0;
 
-		$this->tms=time();
-		$this->type='';
-		$this->dateevent=time();
-		$this->description='This is a specimen event';
+		$this->tms = time();
+		$this->type = '';
+		$this->dateevent = time();
+		$this->description = 'This is a specimen event';
 	}
 }

Braces +5 added lines, -5 removed lines

@@ -137,7 +137,9 @@ 
 
 		// Clean parameters
 		$this->description=trim($this->description);
-		if (empty($this->user_agent) && !empty($_SERVER['HTTP_USER_AGENT'])) $this->user_agent=$_SERVER['HTTP_USER_AGENT'];
+		if (empty($this->user_agent) && !empty($_SERVER['HTTP_USER_AGENT'])) {
+		    $this->user_agent=$_SERVER['HTTP_USER_AGENT'];
+		}
 
 		// Check parameters
 		if (empty($this->description)) { $this->error='ErrorBadValueForParameterCreateEventDesc'; return -1; }
@@ -167,8 +169,7 @@ 
 		{
 			$this->id = $this->db->last_insert_id(MAIN_DB_PREFIX."events");
 			return $this->id;
-		}
-		else
+		} else
 		{
 			$this->error="Error ".$this->db->lasterror();
 			return -1;
@@ -256,8 +257,7 @@ 
 			$this->db->free($resql);
 
 			return 1;
-		}
-		else
+		} else
 		{
 			$this->error="Error ".$this->db->lasterror();
 			return -1;

dolibarr/htdocs/core/class/ctyperesource.class.php

Indentation +418 added lines, -418 removed lines

@@ -32,436 +32,436 @@ 
  */
 class Ctyperesource
 {
-	/**
-	 * @var string Id to identify managed objects
-	 */
-	public $element = 'ctyperesource';
+    /**
+     * @var string Id to identify managed objects
+     */
+    public $element = 'ctyperesource';
 
-	/**
-	 * @var string Name of table without prefix where object is stored
-	 */
-	public $table_element = 'c_type_resource';
+    /**
+     * @var string Name of table without prefix where object is stored
+     */
+    public $table_element = 'c_type_resource';
 
-	/**
-	 * @var CtyperesourceLine[] Lines
-	 */
-	public $lines = array();
+    /**
+     * @var CtyperesourceLine[] Lines
+     */
+    public $lines = array();
 
-	public $code;
+    public $code;
 
-	/**
+    /**
      * @var string Type resource label
      */
     public $label;
 
-	public $active;
+    public $active;
+
+
+    /**
+     * Constructor
+     *
+     * @param DoliDb $db Database handler
+     */
+    public function __construct(DoliDB $db)
+    {
+        $this->db = $db;
+    }
+
+    /**
+     * Create object into database
+     *
+     * @param  User $user      User that creates
+     * @param  bool $notrigger false=launch triggers after, true=disable triggers
+     *
+     * @return int <0 if KO, Id of created object if OK
+     */
+    public function create(User $user, $notrigger = false)
+    {
+        dol_syslog(__METHOD__, LOG_DEBUG);
+
+        $error = 0;
+
+        // Clean parameters
+
+        if (isset($this->code)) {
+                $this->code = trim($this->code);
+        }
+        if (isset($this->label)) {
+                $this->label = trim($this->label);
+        }
+        if (isset($this->active)) {
+                $this->active = trim($this->active);
+        }
+
 
 
-	/**
-	 * Constructor
-	 *
-	 * @param DoliDb $db Database handler
-	 */
-	public function __construct(DoliDB $db)
-	{
-		$this->db = $db;
-	}
+        // Check parameters
+        // Put here code to add control on parameters values
 
-	/**
-	 * Create object into database
-	 *
-	 * @param  User $user      User that creates
-	 * @param  bool $notrigger false=launch triggers after, true=disable triggers
-	 *
-	 * @return int <0 if KO, Id of created object if OK
-	 */
-	public function create(User $user, $notrigger = false)
-	{
-		dol_syslog(__METHOD__, LOG_DEBUG);
+        // Insert request
+        $sql = 'INSERT INTO ' . MAIN_DB_PREFIX . $this->table_element . '(';
 
-		$error = 0;
+        $sql.= 'code,';
+        $sql.= 'label';
+        $sql.= 'active';
 
-		// Clean parameters
 
-		if (isset($this->code)) {
-			 $this->code = trim($this->code);
-		}
-		if (isset($this->label)) {
-			 $this->label = trim($this->label);
-		}
-		if (isset($this->active)) {
-			 $this->active = trim($this->active);
-		}
+        $sql .= ') VALUES (';
 
+        $sql .= ' '.(! isset($this->code)?'NULL':"'".$this->db->escape($this->code)."'").',';
+        $sql .= ' '.(! isset($this->label)?'NULL':"'".$this->db->escape($this->label)."'").',';
+        $sql .= ' '.(! isset($this->active)?'NULL':$this->active);
 
 
-		// Check parameters
-		// Put here code to add control on parameters values
+        $sql .= ')';
 
-		// Insert request
-		$sql = 'INSERT INTO ' . MAIN_DB_PREFIX . $this->table_element . '(';
+        $this->db->begin();
 
-		$sql.= 'code,';
-		$sql.= 'label';
-		$sql.= 'active';
+        $resql = $this->db->query($sql);
+        if (!$resql) {
+            $error ++;
+            $this->errors[] = 'Error ' . $this->db->lasterror();
+            dol_syslog(__METHOD__ . ' ' . implode(',', $this->errors), LOG_ERR);
+        }
 
+        if (!$error) {
+            $this->id = $this->db->last_insert_id(MAIN_DB_PREFIX . $this->table_element);
 
-		$sql .= ') VALUES (';
+            // Uncomment this and change MYOBJECT to your own tag if you
+            // want this action to call a trigger.
+            //if (!$notrigger) {
 
-		$sql .= ' '.(! isset($this->code)?'NULL':"'".$this->db->escape($this->code)."'").',';
-		$sql .= ' '.(! isset($this->label)?'NULL':"'".$this->db->escape($this->label)."'").',';
-		$sql .= ' '.(! isset($this->active)?'NULL':$this->active);
+            //  // Call triggers
+            //  $result=$this->call_trigger('MYOBJECT_CREATE',$user);
+            //  if ($result < 0) $error++;
+            //  // End call triggers
+            //}
+        }
 
+        // Commit or rollback
+        if ($error) {
+            $this->db->rollback();
 
-		$sql .= ')';
+            return - 1 * $error;
+        } else {
+            $this->db->commit();
 
-		$this->db->begin();
-
-		$resql = $this->db->query($sql);
-		if (!$resql) {
-			$error ++;
-			$this->errors[] = 'Error ' . $this->db->lasterror();
-			dol_syslog(__METHOD__ . ' ' . implode(',', $this->errors), LOG_ERR);
-		}
-
-		if (!$error) {
-			$this->id = $this->db->last_insert_id(MAIN_DB_PREFIX . $this->table_element);
-
-			// Uncomment this and change MYOBJECT to your own tag if you
-			// want this action to call a trigger.
-			//if (!$notrigger) {
-
-			//  // Call triggers
-			//  $result=$this->call_trigger('MYOBJECT_CREATE',$user);
-			//  if ($result < 0) $error++;
-			//  // End call triggers
-			//}
-		}
-
-		// Commit or rollback
-		if ($error) {
-			$this->db->rollback();
-
-			return - 1 * $error;
-		} else {
-			$this->db->commit();
-
-			return $this->id;
-		}
-	}
-
-	/**
-	 * Load object in memory from the database
-	 *
-	 * @param int    $id  Id object
-	 * @param string $code code
-	 * @param string $label Label
-	 *
-	 * @return int <0 if KO, 0 if not found, >0 if OK
-	 */
-	public function fetch($id,$code='',$label='')
-	{
-		dol_syslog(__METHOD__, LOG_DEBUG);
-
-		$sql = 'SELECT';
-		$sql .= ' t.rowid,';
-
-		$sql .= " t.code,";
-		$sql .= " t.label,";
-		$sql .= " t.active";
-
-
-		$sql .= ' FROM ' . MAIN_DB_PREFIX . $this->table_element . ' as t';
-		if ($id)   $sql.= " WHERE t.id = ".$id;
-		elseif ($code) $sql.= " WHERE t.code = '".$this->db->escape($code)."'";
-		elseif ($label) $sql.= " WHERE t.label = '".$this->db->escape($label)."'";
-
-
-		$resql = $this->db->query($sql);
-		if ($resql) {
-			$numrows = $this->db->num_rows($resql);
-			if ($numrows) {
-				$obj = $this->db->fetch_object($resql);
-
-				$this->id = $obj->rowid;
-
-				$this->code = $obj->code;
-				$this->label = $obj->label;
-				$this->active = $obj->active;
-			}
-
-			// Retrieve all extrafields for invoice
-			// fetch optionals attributes and labels
-			// $this->fetch_optionals();
-
-			// $this->fetch_lines();
-
-			$this->db->free($resql);
-
-			if ($numrows) {
-				return 1;
-			} else {
-				return 0;
-			}
-		} else {
-			$this->errors[] = 'Error ' . $this->db->lasterror();
-			dol_syslog(__METHOD__ . ' ' . implode(',', $this->errors), LOG_ERR);
-
-			return - 1;
-		}
-	}
-
-	/**
-	 * Load object in memory from the database
-	 *
-	 * @param string $sortorder Sort Order
-	 * @param string $sortfield Sort field
-	 * @param int    $limit     offset limit
-	 * @param int    $offset    offset limit
-	 * @param array  $filter    filter array
-	 * @param string $filtermode filter mode (AND or OR)
-	 *
-	 * @return int <0 if KO, >0 if OK
-	 */
-	public function fetchAll($sortorder='', $sortfield='', $limit=0, $offset=0, array $filter = array(), $filtermode='AND')
-	{
-		dol_syslog(__METHOD__, LOG_DEBUG);
-
-		$sql = 'SELECT';
-		$sql .= ' t.rowid,';
-
-		$sql .= " t.code,";
-		$sql .= " t.label,";
-		$sql .= " t.active";
-
-
-		$sql .= ' FROM ' . MAIN_DB_PREFIX . $this->table_element. ' as t';
-
-		// Manage filter
-		$sqlwhere = array();
-		if (count($filter) > 0) {
-			foreach ($filter as $key => $value) {
-				$sqlwhere [] = $key . ' LIKE \'%' . $this->db->escape($value) . '%\'';
-			}
-		}
-
-		if (count($sqlwhere) > 0) {
-			$sql .= ' WHERE ' . implode(' '.$filtermode.' ', $sqlwhere);
-		}
-		if (!empty($sortfield)) {
-			$sql .= $this->db->order($sortfield,$sortorder);
-		}
-		if (!empty($limit)) {
-		 $sql .=  ' ' . $this->db->plimit($limit, $offset);
-		}
-
-		$resql = $this->db->query($sql);
-		if ($resql) {
-			$num = $this->db->num_rows($resql);
-
-			while ($obj = $this->db->fetch_object($resql)) {
-				$line = new self($this->db);
-
-				$line->id = $obj->rowid;
-
-				$line->code = $obj->code;
-				$line->label = $obj->label;
-				$line->active = $obj->active;
-			}
-			$this->db->free($resql);
-
-			return $num;
-		} else {
-			$this->errors[] = 'Error ' . $this->db->lasterror();
-			dol_syslog(__METHOD__ . ' ' . implode(',', $this->errors), LOG_ERR);
-
-			return - 1;
-		}
-	}
-
-	/**
-	 * Update object into database
-	 *
-	 * @param  User $user      User that modifies
-	 * @param  bool $notrigger false=launch triggers after, true=disable triggers
-	 *
-	 * @return int <0 if KO, >0 if OK
-	 */
-	public function update(User $user, $notrigger = false)
-	{
-		$error = 0;
-
-		dol_syslog(__METHOD__, LOG_DEBUG);
-
-		// Clean parameters
-
-		if (isset($this->code)) {
-			 $this->code = trim($this->code);
-		}
-		if (isset($this->label)) {
-			 $this->label = trim($this->label);
-		}
-		if (isset($this->active)) {
-			 $this->active = trim($this->active);
-		}
-
-		// Check parameters
-		// Put here code to add a control on parameters values
-
-		// Update request
-		$sql = 'UPDATE ' . MAIN_DB_PREFIX . $this->table_element . ' SET';
-
-		$sql .= ' code = '.(isset($this->code)?"'".$this->db->escape($this->code)."'":"null").',';
-		$sql .= ' label = '.(isset($this->label)?"'".$this->db->escape($this->label)."'":"null").',';
-		$sql .= ' active = '.(isset($this->active)?$this->active:"null");
-
-
-		$sql .= ' WHERE rowid=' . $this->id;
-
-		$this->db->begin();
-
-		$resql = $this->db->query($sql);
-		if (!$resql) {
-			$error ++;
-			$this->errors[] = 'Error ' . $this->db->lasterror();
-			dol_syslog(__METHOD__ . ' ' . implode(',', $this->errors), LOG_ERR);
-		}
-
-		// Uncomment this and change MYOBJECT to your own tag if you
-		// want this action calls a trigger.
-		//if (!$error && !$notrigger) {
-
-		//  // Call triggers
-		//  $result=$this->call_trigger('MYOBJECT_MODIFY',$user);
-		//  if ($result < 0) { $error++; //Do also what you must do to rollback action if trigger fail}
-		//  // End call triggers
-		//}
-
-		// Commit or rollback
-		if ($error) {
-			$this->db->rollback();
-
-			return - 1 * $error;
-		} else {
-			$this->db->commit();
-
-			return 1;
-		}
-	}
-
-	/**
-	 * Delete object in database
-	 *
-	 * @param User $user      User that deletes
-	 * @param bool $notrigger false=launch triggers after, true=disable triggers
-	 *
-	 * @return int <0 if KO, >0 if OK
-	 */
-	public function delete(User $user, $notrigger = false)
-	{
-		dol_syslog(__METHOD__, LOG_DEBUG);
-
-		$error = 0;
-
-		$this->db->begin();
-
-		// Uncomment this and change MYOBJECT to your own tag if you
-		// want this action calls a trigger.
-		//if (!$error && !$notrigger) {
-
-		//  // Call triggers
-		//  $result=$this->call_trigger('MYOBJECT_DELETE',$user);
-		//  if ($result < 0) { $error++; //Do also what you must do to rollback action if trigger fail}
-		//  // End call triggers
-		//}
-
-		// If you need to delete child tables to, you can insert them here
-
-		if (!$error) {
-			$sql = 'DELETE FROM ' . MAIN_DB_PREFIX . $this->table_element;
-			$sql .= ' WHERE rowid=' . $this->id;
-
-			$resql = $this->db->query($sql);
-			if (!$resql) {
-				$error ++;
-				$this->errors[] = 'Error ' . $this->db->lasterror();
-				dol_syslog(__METHOD__ . ' ' . implode(',', $this->errors), LOG_ERR);
-			}
-		}
-
-		// Commit or rollback
-		if ($error) {
-			$this->db->rollback();
-
-			return - 1 * $error;
-		} else {
-			$this->db->commit();
-
-			return 1;
-		}
-	}
-
-	/**
-	 * Load an object from its id and create a new one in database
-	 *
-	 * @param int $fromid Id of object to clone
-	 *
-	 * @return int New id of clone
-	 */
-	public function createFromClone($fromid)
-	{
-		dol_syslog(__METHOD__, LOG_DEBUG);
-
-		global $user;
-		$error = 0;
-		$object = new Ctyperesource($this->db);
-
-		$this->db->begin();
-
-		// Load source object
-		$object->fetch($fromid);
-		// Reset object
-		$object->id = 0;
-
-		// Clear fields
-		// ...
-
-		// Create clone
-		$result = $object->create($user);
-
-		// Other options
-		if ($result < 0) {
-			$error ++;
-			$this->errors = $object->errors;
-			dol_syslog(__METHOD__ . ' ' . implode(',', $this->errors), LOG_ERR);
-		}
-
-		// End
-		if (!$error) {
-			$this->db->commit();
-
-			return $object->id;
-		} else {
-			$this->db->rollback();
-
-			return - 1;
-		}
-	}
-
-	/**
-	 * Initialise object with example values
-	 * Id must be 0 if object instance is a specimen
-	 *
-	 * @return void
-	 */
-	public function initAsSpecimen()
-	{
-		$this->id = 0;
-
-		$this->code = '';
-		$this->label = '';
-		$this->active = '';
-	}
+            return $this->id;
+        }
+    }
+
+    /**
+     * Load object in memory from the database
+     *
+     * @param int    $id  Id object
+     * @param string $code code
+     * @param string $label Label
+     *
+     * @return int <0 if KO, 0 if not found, >0 if OK
+     */
+    public function fetch($id,$code='',$label='')
+    {
+        dol_syslog(__METHOD__, LOG_DEBUG);
+
+        $sql = 'SELECT';
+        $sql .= ' t.rowid,';
+
+        $sql .= " t.code,";
+        $sql .= " t.label,";
+        $sql .= " t.active";
+
+
+        $sql .= ' FROM ' . MAIN_DB_PREFIX . $this->table_element . ' as t';
+        if ($id)   $sql.= " WHERE t.id = ".$id;
+        elseif ($code) $sql.= " WHERE t.code = '".$this->db->escape($code)."'";
+        elseif ($label) $sql.= " WHERE t.label = '".$this->db->escape($label)."'";
+
+
+        $resql = $this->db->query($sql);
+        if ($resql) {
+            $numrows = $this->db->num_rows($resql);
+            if ($numrows) {
+                $obj = $this->db->fetch_object($resql);
+
+                $this->id = $obj->rowid;
+
+                $this->code = $obj->code;
+                $this->label = $obj->label;
+                $this->active = $obj->active;
+            }
+
+            // Retrieve all extrafields for invoice
+            // fetch optionals attributes and labels
+            // $this->fetch_optionals();
+
+            // $this->fetch_lines();
+
+            $this->db->free($resql);
+
+            if ($numrows) {
+                return 1;
+            } else {
+                return 0;
+            }
+        } else {
+            $this->errors[] = 'Error ' . $this->db->lasterror();
+            dol_syslog(__METHOD__ . ' ' . implode(',', $this->errors), LOG_ERR);
+
+            return - 1;
+        }
+    }
+
+    /**
+     * Load object in memory from the database
+     *
+     * @param string $sortorder Sort Order
+     * @param string $sortfield Sort field
+     * @param int    $limit     offset limit
+     * @param int    $offset    offset limit
+     * @param array  $filter    filter array
+     * @param string $filtermode filter mode (AND or OR)
+     *
+     * @return int <0 if KO, >0 if OK
+     */
+    public function fetchAll($sortorder='', $sortfield='', $limit=0, $offset=0, array $filter = array(), $filtermode='AND')
+    {
+        dol_syslog(__METHOD__, LOG_DEBUG);
+
+        $sql = 'SELECT';
+        $sql .= ' t.rowid,';
+
+        $sql .= " t.code,";
+        $sql .= " t.label,";
+        $sql .= " t.active";
+
+
+        $sql .= ' FROM ' . MAIN_DB_PREFIX . $this->table_element. ' as t';
+
+        // Manage filter
+        $sqlwhere = array();
+        if (count($filter) > 0) {
+            foreach ($filter as $key => $value) {
+                $sqlwhere [] = $key . ' LIKE \'%' . $this->db->escape($value) . '%\'';
+            }
+        }
+
+        if (count($sqlwhere) > 0) {
+            $sql .= ' WHERE ' . implode(' '.$filtermode.' ', $sqlwhere);
+        }
+        if (!empty($sortfield)) {
+            $sql .= $this->db->order($sortfield,$sortorder);
+        }
+        if (!empty($limit)) {
+            $sql .=  ' ' . $this->db->plimit($limit, $offset);
+        }
+
+        $resql = $this->db->query($sql);
+        if ($resql) {
+            $num = $this->db->num_rows($resql);
+
+            while ($obj = $this->db->fetch_object($resql)) {
+                $line = new self($this->db);
+
+                $line->id = $obj->rowid;
+
+                $line->code = $obj->code;
+                $line->label = $obj->label;
+                $line->active = $obj->active;
+            }
+            $this->db->free($resql);
+
+            return $num;
+        } else {
+            $this->errors[] = 'Error ' . $this->db->lasterror();
+            dol_syslog(__METHOD__ . ' ' . implode(',', $this->errors), LOG_ERR);
+
+            return - 1;
+        }
+    }
+
+    /**
+     * Update object into database
+     *
+     * @param  User $user      User that modifies
+     * @param  bool $notrigger false=launch triggers after, true=disable triggers
+     *
+     * @return int <0 if KO, >0 if OK
+     */
+    public function update(User $user, $notrigger = false)
+    {
+        $error = 0;
+
+        dol_syslog(__METHOD__, LOG_DEBUG);
+
+        // Clean parameters
+
+        if (isset($this->code)) {
+                $this->code = trim($this->code);
+        }
+        if (isset($this->label)) {
+                $this->label = trim($this->label);
+        }
+        if (isset($this->active)) {
+                $this->active = trim($this->active);
+        }
+
+        // Check parameters
+        // Put here code to add a control on parameters values
+
+        // Update request
+        $sql = 'UPDATE ' . MAIN_DB_PREFIX . $this->table_element . ' SET';
+
+        $sql .= ' code = '.(isset($this->code)?"'".$this->db->escape($this->code)."'":"null").',';
+        $sql .= ' label = '.(isset($this->label)?"'".$this->db->escape($this->label)."'":"null").',';
+        $sql .= ' active = '.(isset($this->active)?$this->active:"null");
+
+
+        $sql .= ' WHERE rowid=' . $this->id;
+
+        $this->db->begin();
+
+        $resql = $this->db->query($sql);
+        if (!$resql) {
+            $error ++;
+            $this->errors[] = 'Error ' . $this->db->lasterror();
+            dol_syslog(__METHOD__ . ' ' . implode(',', $this->errors), LOG_ERR);
+        }
+
+        // Uncomment this and change MYOBJECT to your own tag if you
+        // want this action calls a trigger.
+        //if (!$error && !$notrigger) {
+
+        //  // Call triggers
+        //  $result=$this->call_trigger('MYOBJECT_MODIFY',$user);
+        //  if ($result < 0) { $error++; //Do also what you must do to rollback action if trigger fail}
+        //  // End call triggers
+        //}
+
+        // Commit or rollback
+        if ($error) {
+            $this->db->rollback();
+
+            return - 1 * $error;
+        } else {
+            $this->db->commit();
+
+            return 1;
+        }
+    }
+
+    /**
+     * Delete object in database
+     *
+     * @param User $user      User that deletes
+     * @param bool $notrigger false=launch triggers after, true=disable triggers
+     *
+     * @return int <0 if KO, >0 if OK
+     */
+    public function delete(User $user, $notrigger = false)
+    {
+        dol_syslog(__METHOD__, LOG_DEBUG);
+
+        $error = 0;
+
+        $this->db->begin();
+
+        // Uncomment this and change MYOBJECT to your own tag if you
+        // want this action calls a trigger.
+        //if (!$error && !$notrigger) {
+
+        //  // Call triggers
+        //  $result=$this->call_trigger('MYOBJECT_DELETE',$user);
+        //  if ($result < 0) { $error++; //Do also what you must do to rollback action if trigger fail}
+        //  // End call triggers
+        //}
+
+        // If you need to delete child tables to, you can insert them here
+
+        if (!$error) {
+            $sql = 'DELETE FROM ' . MAIN_DB_PREFIX . $this->table_element;
+            $sql .= ' WHERE rowid=' . $this->id;
+
+            $resql = $this->db->query($sql);
+            if (!$resql) {
+                $error ++;
+                $this->errors[] = 'Error ' . $this->db->lasterror();
+                dol_syslog(__METHOD__ . ' ' . implode(',', $this->errors), LOG_ERR);
+            }
+        }
+
+        // Commit or rollback
+        if ($error) {
+            $this->db->rollback();
+
+            return - 1 * $error;
+        } else {
+            $this->db->commit();
+
+            return 1;
+        }
+    }
+
+    /**
+     * Load an object from its id and create a new one in database
+     *
+     * @param int $fromid Id of object to clone
+     *
+     * @return int New id of clone
+     */
+    public function createFromClone($fromid)
+    {
+        dol_syslog(__METHOD__, LOG_DEBUG);
+
+        global $user;
+        $error = 0;
+        $object = new Ctyperesource($this->db);
+
+        $this->db->begin();
+
+        // Load source object
+        $object->fetch($fromid);
+        // Reset object
+        $object->id = 0;
+
+        // Clear fields
+        // ...
+
+        // Create clone
+        $result = $object->create($user);
+
+        // Other options
+        if ($result < 0) {
+            $error ++;
+            $this->errors = $object->errors;
+            dol_syslog(__METHOD__ . ' ' . implode(',', $this->errors), LOG_ERR);
+        }
+
+        // End
+        if (!$error) {
+            $this->db->commit();
+
+            return $object->id;
+        } else {
+            $this->db->rollback();
+
+            return - 1;
+        }
+    }
+
+    /**
+     * Initialise object with example values
+     * Id must be 0 if object instance is a specimen
+     *
+     * @return void
+     */
+    public function initAsSpecimen()
+    {
+        $this->id = 0;
+
+        $this->code = '';
+        $this->label = '';
+        $this->active = '';
+    }
 }
 
 /**
@@ -469,24 +469,24 @@ 
  */
 class CtyperesourceLine
 {
-	/**
-	 * @var int ID
-	 */
-	public $id;
+    /**
+     * @var int ID
+     */
+    public $id;
 
-	/**
-	 * @var mixed Sample line property 1
-	 */
-	public $code;
+    /**
+     * @var mixed Sample line property 1
+     */
+    public $code;
 
-	/**
+    /**
      * @var string Type resource line label
      */
     public $label;
 
-	public $active;
+    public $active;
 
-	/**
-	 * @var mixed Sample line property 2
-	 */
+    /**
+     * @var mixed Sample line property 2
+     */
 }

Spacing +47 added lines, -47 removed lines

@@ -99,18 +99,18 @@ 
 		// Put here code to add control on parameters values
 
 		// Insert request
-		$sql = 'INSERT INTO ' . MAIN_DB_PREFIX . $this->table_element . '(';
+		$sql = 'INSERT INTO '.MAIN_DB_PREFIX.$this->table_element.'(';
 
-		$sql.= 'code,';
-		$sql.= 'label';
-		$sql.= 'active';
+		$sql .= 'code,';
+		$sql .= 'label';
+		$sql .= 'active';
 
 
 		$sql .= ') VALUES (';
 
-		$sql .= ' '.(! isset($this->code)?'NULL':"'".$this->db->escape($this->code)."'").',';
-		$sql .= ' '.(! isset($this->label)?'NULL':"'".$this->db->escape($this->label)."'").',';
-		$sql .= ' '.(! isset($this->active)?'NULL':$this->active);
+		$sql .= ' '.(!isset($this->code) ? 'NULL' : "'".$this->db->escape($this->code)."'").',';
+		$sql .= ' '.(!isset($this->label) ? 'NULL' : "'".$this->db->escape($this->label)."'").',';
+		$sql .= ' '.(!isset($this->active) ? 'NULL' : $this->active);
 
 
 		$sql .= ')';
@@ -119,13 +119,13 @@ 
 
 		$resql = $this->db->query($sql);
 		if (!$resql) {
-			$error ++;
-			$this->errors[] = 'Error ' . $this->db->lasterror();
-			dol_syslog(__METHOD__ . ' ' . implode(',', $this->errors), LOG_ERR);
+			$error++;
+			$this->errors[] = 'Error '.$this->db->lasterror();
+			dol_syslog(__METHOD__.' '.implode(',', $this->errors), LOG_ERR);
 		}
 
 		if (!$error) {
-			$this->id = $this->db->last_insert_id(MAIN_DB_PREFIX . $this->table_element);
+			$this->id = $this->db->last_insert_id(MAIN_DB_PREFIX.$this->table_element);
 
 			// Uncomment this and change MYOBJECT to your own tag if you
 			// want this action to call a trigger.
@@ -142,7 +142,7 @@ 
 		if ($error) {
 			$this->db->rollback();
 
-			return - 1 * $error;
+			return -1 * $error;
 		} else {
 			$this->db->commit();
 
@@ -159,7 +159,7 @@ 
 	 *
 	 * @return int <0 if KO, 0 if not found, >0 if OK
 	 */
-	public function fetch($id,$code='',$label='')
+	public function fetch($id, $code = '', $label = '')
 	{
 		dol_syslog(__METHOD__, LOG_DEBUG);
 
@@ -171,10 +171,10 @@ 
 		$sql .= " t.active";
 
 
-		$sql .= ' FROM ' . MAIN_DB_PREFIX . $this->table_element . ' as t';
-		if ($id)   $sql.= " WHERE t.id = ".$id;
-		elseif ($code) $sql.= " WHERE t.code = '".$this->db->escape($code)."'";
-		elseif ($label) $sql.= " WHERE t.label = '".$this->db->escape($label)."'";
+		$sql .= ' FROM '.MAIN_DB_PREFIX.$this->table_element.' as t';
+		if ($id)   $sql .= " WHERE t.id = ".$id;
+		elseif ($code) $sql .= " WHERE t.code = '".$this->db->escape($code)."'";
+		elseif ($label) $sql .= " WHERE t.label = '".$this->db->escape($label)."'";
 
 
 		$resql = $this->db->query($sql);
@@ -204,10 +204,10 @@ 
 				return 0;
 			}
 		} else {
-			$this->errors[] = 'Error ' . $this->db->lasterror();
-			dol_syslog(__METHOD__ . ' ' . implode(',', $this->errors), LOG_ERR);
+			$this->errors[] = 'Error '.$this->db->lasterror();
+			dol_syslog(__METHOD__.' '.implode(',', $this->errors), LOG_ERR);
 
-			return - 1;
+			return -1;
 		}
 	}
 
@@ -223,7 +223,7 @@ 
 	 *
 	 * @return int <0 if KO, >0 if OK
 	 */
-	public function fetchAll($sortorder='', $sortfield='', $limit=0, $offset=0, array $filter = array(), $filtermode='AND')
+	public function fetchAll($sortorder = '', $sortfield = '', $limit = 0, $offset = 0, array $filter = array(), $filtermode = 'AND')
 	{
 		dol_syslog(__METHOD__, LOG_DEBUG);
 
@@ -235,24 +235,24 @@ 
 		$sql .= " t.active";
 
 
-		$sql .= ' FROM ' . MAIN_DB_PREFIX . $this->table_element. ' as t';
+		$sql .= ' FROM '.MAIN_DB_PREFIX.$this->table_element.' as t';
 
 		// Manage filter
 		$sqlwhere = array();
 		if (count($filter) > 0) {
 			foreach ($filter as $key => $value) {
-				$sqlwhere [] = $key . ' LIKE \'%' . $this->db->escape($value) . '%\'';
+				$sqlwhere [] = $key.' LIKE \'%'.$this->db->escape($value).'%\'';
 			}
 		}
 
 		if (count($sqlwhere) > 0) {
-			$sql .= ' WHERE ' . implode(' '.$filtermode.' ', $sqlwhere);
+			$sql .= ' WHERE '.implode(' '.$filtermode.' ', $sqlwhere);
 		}
 		if (!empty($sortfield)) {
-			$sql .= $this->db->order($sortfield,$sortorder);
+			$sql .= $this->db->order($sortfield, $sortorder);
 		}
 		if (!empty($limit)) {
-		 $sql .=  ' ' . $this->db->plimit($limit, $offset);
+		 $sql .= ' '.$this->db->plimit($limit, $offset);
 		}
 
 		$resql = $this->db->query($sql);
@@ -272,10 +272,10 @@ 
 
 			return $num;
 		} else {
-			$this->errors[] = 'Error ' . $this->db->lasterror();
-			dol_syslog(__METHOD__ . ' ' . implode(',', $this->errors), LOG_ERR);
+			$this->errors[] = 'Error '.$this->db->lasterror();
+			dol_syslog(__METHOD__.' '.implode(',', $this->errors), LOG_ERR);
 
-			return - 1;
+			return -1;
 		}
 	}
 
@@ -309,22 +309,22 @@ 
 		// Put here code to add a control on parameters values
 
 		// Update request
-		$sql = 'UPDATE ' . MAIN_DB_PREFIX . $this->table_element . ' SET';
+		$sql = 'UPDATE '.MAIN_DB_PREFIX.$this->table_element.' SET';
 
-		$sql .= ' code = '.(isset($this->code)?"'".$this->db->escape($this->code)."'":"null").',';
-		$sql .= ' label = '.(isset($this->label)?"'".$this->db->escape($this->label)."'":"null").',';
-		$sql .= ' active = '.(isset($this->active)?$this->active:"null");
+		$sql .= ' code = '.(isset($this->code) ? "'".$this->db->escape($this->code)."'" : "null").',';
+		$sql .= ' label = '.(isset($this->label) ? "'".$this->db->escape($this->label)."'" : "null").',';
+		$sql .= ' active = '.(isset($this->active) ? $this->active : "null");
 
 
-		$sql .= ' WHERE rowid=' . $this->id;
+		$sql .= ' WHERE rowid='.$this->id;
 
 		$this->db->begin();
 
 		$resql = $this->db->query($sql);
 		if (!$resql) {
-			$error ++;
-			$this->errors[] = 'Error ' . $this->db->lasterror();
-			dol_syslog(__METHOD__ . ' ' . implode(',', $this->errors), LOG_ERR);
+			$error++;
+			$this->errors[] = 'Error '.$this->db->lasterror();
+			dol_syslog(__METHOD__.' '.implode(',', $this->errors), LOG_ERR);
 		}
 
 		// Uncomment this and change MYOBJECT to your own tag if you
@@ -341,7 +341,7 @@ 
 		if ($error) {
 			$this->db->rollback();
 
-			return - 1 * $error;
+			return -1 * $error;
 		} else {
 			$this->db->commit();
 
@@ -378,14 +378,14 @@ 
 		// If you need to delete child tables to, you can insert them here
 
 		if (!$error) {
-			$sql = 'DELETE FROM ' . MAIN_DB_PREFIX . $this->table_element;
-			$sql .= ' WHERE rowid=' . $this->id;
+			$sql = 'DELETE FROM '.MAIN_DB_PREFIX.$this->table_element;
+			$sql .= ' WHERE rowid='.$this->id;
 
 			$resql = $this->db->query($sql);
 			if (!$resql) {
-				$error ++;
-				$this->errors[] = 'Error ' . $this->db->lasterror();
-				dol_syslog(__METHOD__ . ' ' . implode(',', $this->errors), LOG_ERR);
+				$error++;
+				$this->errors[] = 'Error '.$this->db->lasterror();
+				dol_syslog(__METHOD__.' '.implode(',', $this->errors), LOG_ERR);
 			}
 		}
 
@@ -393,7 +393,7 @@ 
 		if ($error) {
 			$this->db->rollback();
 
-			return - 1 * $error;
+			return -1 * $error;
 		} else {
 			$this->db->commit();
 
@@ -431,9 +431,9 @@ 
 
 		// Other options
 		if ($result < 0) {
-			$error ++;
+			$error++;
 			$this->errors = $object->errors;
-			dol_syslog(__METHOD__ . ' ' . implode(',', $this->errors), LOG_ERR);
+			dol_syslog(__METHOD__.' '.implode(',', $this->errors), LOG_ERR);
 		}
 
 		// End
@@ -444,7 +444,7 @@ 
 		} else {
 			$this->db->rollback();
 
-			return - 1;
+			return -1;
 		}
 	}
 

Braces +7 added lines, -3 removed lines

@@ -172,9 +172,13 @@
 
 
 		$sql .= ' FROM ' . MAIN_DB_PREFIX . $this->table_element . ' as t';
-		if ($id)   $sql.= " WHERE t.id = ".$id;
-		elseif ($code) $sql.= " WHERE t.code = '".$this->db->escape($code)."'";
-		elseif ($label) $sql.= " WHERE t.label = '".$this->db->escape($label)."'";
+		if ($id) {
+		    $sql.= " WHERE t.id = ".$id;
+		} elseif ($code) {
+		    $sql.= " WHERE t.code = '".$this->db->escape($code)."'";
+		} elseif ($label) {
+		    $sql.= " WHERE t.label = '".$this->db->escape($label)."'";
+		}
 
 
 		$resql = $this->db->query($sql);

dolibarr/htdocs/core/class/html.formsms.class.php

Indentation +6 added lines, -6 removed lines

@@ -102,7 +102,7 @@ 
      */
     function show_form($morecss='titlefield', $showform=1)
     {
-     // phpcs:enable
+        // phpcs:enable
         global $conf, $langs, $user, $form;
 
         if (! is_object($form)) $form=new Form($this->db);
@@ -218,13 +218,13 @@ 
                         $classname=ucfirst($classfile);
                         if (class_exists($classname))
                         {
-                        	$sms = new $classname($this->db);
-                        	$resultsender = $sms->SmsSenderList();
+                            $sms = new $classname($this->db);
+                            $resultsender = $sms->SmsSenderList();
                         }
                         else
                         {
-                        	$sms = new stdClass();
-                        	$sms->error='The SMS manager "'.$classfile.'" defined into SMS setup MAIN_SMS_SENDMODE is not found';
+                            $sms = new stdClass();
+                            $sms->error='The SMS manager "'.$classfile.'" defined into SMS setup MAIN_SMS_SENDMODE is not found';
                         }
                     }
                     catch(Exception $e)
@@ -236,7 +236,7 @@ 
                 else
                 {
                     dol_syslog("Warning: The SMS sending method has not been defined into MAIN_SMS_SENDMODE", LOG_WARNING);
-	                $resultsender=array();
+                    $resultsender=array();
                     $resultsender[0]->number=$this->fromsms;
                 }
 

Spacing +50 added lines, -50 removed lines

@@ -22,7 +22,7 @@ 
  *       \ingroup    core
  *       \brief      Fichier de la classe permettant la generation du formulaire html d'envoi de mail unitaire
  */
-require_once DOL_DOCUMENT_ROOT .'/core/class/html.form.class.php';
+require_once DOL_DOCUMENT_ROOT.'/core/class/html.form.class.php';
 
 
 /**
@@ -45,7 +45,7 @@ 
     public $toname;
     public $tomail;
 
-    public $withsubstit;			// Show substitution array
+    public $withsubstit; // Show substitution array
     public $withfrom;
     public $withto;
     public $withtopic;
@@ -57,18 +57,18 @@ 
     public $withtopicreadonly;
     public $withcancel;
 
-    public $substit=array();
-    public $param=array();
+    public $substit = array();
+    public $param = array();
 
     /**
      * @var string Error code (or message)
      */
-    public $error='';
+    public $error = '';
 
     /**
      * @var string[]	Array of error strings
      */
-    public $errors=array();
+    public $errors = array();
 
 
     /**
@@ -80,16 +80,16 @@ 
     {
         $this->db = $db;
 
-        $this->withfrom=1;
-        $this->withto=1;
-        $this->withtopic=1;
-        $this->withbody=1;
+        $this->withfrom = 1;
+        $this->withto = 1;
+        $this->withtopic = 1;
+        $this->withbody = 1;
 
-        $this->withfromreadonly=1;
-        $this->withreplytoreadonly=1;
-        $this->withtoreadonly=0;
-        $this->withtopicreadonly=0;
-        $this->withbodyreadonly=0;
+        $this->withfromreadonly = 1;
+        $this->withreplytoreadonly = 1;
+        $this->withtoreadonly = 0;
+        $this->withtopicreadonly = 0;
+        $this->withbodyreadonly = 0;
     }
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
@@ -100,17 +100,17 @@ 
      *  @param int $showform Show form tags and submit button (recommanded is to use with value 0)
      *	@return	void
      */
-    function show_form($morecss='titlefield', $showform=1)
+    function show_form($morecss = 'titlefield', $showform = 1)
     {
      // phpcs:enable
         global $conf, $langs, $user, $form;
 
-        if (! is_object($form)) $form=new Form($this->db);
+        if (!is_object($form)) $form = new Form($this->db);
 
         // Load translation files required by the page
         $langs->loadLangs(array('other', 'mails', 'sms'));
 
-        $soc=new Societe($this->db);
+        $soc = new Societe($this->db);
         if (!empty($this->withtosocid) && $this->withtosocid > 0)
         {
             $soc->fetch($this->withtosocid);
@@ -141,15 +141,15 @@ 
         print "<table class=\"border centpercent\">\n";
 
         // Substitution array
-        if (! empty($this->withsubstit))		// Unset or set ->withsubstit=0 to disable this.
+        if (!empty($this->withsubstit))		// Unset or set ->withsubstit=0 to disable this.
         {
             print "<tr><td colspan=\"2\">";
-            $help="";
-            foreach($this->substit as $key => $val)
+            $help = "";
+            foreach ($this->substit as $key => $val)
             {
-                $help.=$key.' -> '.$langs->trans($val).'<br>';
+                $help .= $key.' -> '.$langs->trans($val).'<br>';
             }
-            print $form->textwithpicto($langs->trans("SmsTestSubstitutionReplacedByGenericValues"),$help);
+            print $form->textwithpicto($langs->trans("SmsTestSubstitutionReplacedByGenericValues"), $help);
             print "</td></tr>\n";
         }
 
@@ -164,7 +164,7 @@ 
                 if ($this->fromtype == 'user')
                 {
                     $langs->load("users");
-                    $fuser=new User($this->db);
+                    $fuser = new User($this->db);
                     $fuser->fetch($this->fromid);
                     print $fuser->getNomUrl(1);
                     print ' &nbsp; ';
@@ -203,19 +203,19 @@ 
                             $resultsender = $sms->SmsSenderList();
                         }
                     }
-                    catch(Exception $e)
+                    catch (Exception $e)
                     {
-                        dol_print_error('','Error to get list of senders: '.$e->getMessage());
+                        dol_print_error('', 'Error to get list of senders: '.$e->getMessage());
                     }
                 }
                 else if (!empty($conf->global->MAIN_SMS_SENDMODE))    // $conf->global->MAIN_SMS_SENDMODE looks like a value 'class@module'
                 {
-                    $tmp=explode('@',$conf->global->MAIN_SMS_SENDMODE);
-                    $classfile=$tmp[0]; $module=(empty($tmp[1])?$tmp[0]:$tmp[1]);
+                    $tmp = explode('@', $conf->global->MAIN_SMS_SENDMODE);
+                    $classfile = $tmp[0]; $module = (empty($tmp[1]) ? $tmp[0] : $tmp[1]);
                     dol_include_once('/'.$module.'/class/'.$classfile.'.class.php');
                     try
                     {
-                        $classname=ucfirst($classfile);
+                        $classname = ucfirst($classfile);
                         if (class_exists($classname))
                         {
                         	$sms = new $classname($this->db);
@@ -224,26 +224,26 @@ 
                         else
                         {
                         	$sms = new stdClass();
-                        	$sms->error='The SMS manager "'.$classfile.'" defined into SMS setup MAIN_SMS_SENDMODE is not found';
+                        	$sms->error = 'The SMS manager "'.$classfile.'" defined into SMS setup MAIN_SMS_SENDMODE is not found';
                         }
                     }
-                    catch(Exception $e)
+                    catch (Exception $e)
                     {
-                        dol_print_error('','Error to get list of senders: '.$e->getMessage());
+                        dol_print_error('', 'Error to get list of senders: '.$e->getMessage());
                         exit;
                     }
                 }
                 else
                 {
                     dol_syslog("Warning: The SMS sending method has not been defined into MAIN_SMS_SENDMODE", LOG_WARNING);
-	                $resultsender=array();
-                    $resultsender[0]->number=$this->fromsms;
+	                $resultsender = array();
+                    $resultsender[0]->number = $this->fromsms;
                 }
 
                 if (is_array($resultsender) && count($resultsender) > 0)
                 {
                     print '<select name="fromsms" id="fromsms" class="flat">';
-                    foreach($resultsender as $obj)
+                    foreach ($resultsender as $obj)
                     {
                         print '<option value="'.$obj->number.'">'.$obj->number.'</option>';
                     }
@@ -252,7 +252,7 @@ 
                 else
                 {
                     print '<span class="error">'.$langs->trans("SmsNoPossibleSenderFound");
-                    if (is_object($sms) && ! empty($sms->error)) print ' '.$sms->error;
+                    if (is_object($sms) && !empty($sms->error)) print ' '.$sms->error;
                     print '</span>';
                 }
                 print '</td>';
@@ -265,22 +265,22 @@ 
         {
             print '<tr><td>';
             //$moretext=$langs->trans("YouCanUseCommaSeparatorForSeveralRecipients");
-            $moretext='';
-            print $form->textwithpicto($langs->trans("SmsTo"),$moretext);
+            $moretext = '';
+            print $form->textwithpicto($langs->trans("SmsTo"), $moretext);
             print '</td><td>';
             if ($this->withtoreadonly)
             {
-                print (! is_array($this->withto) && ! is_numeric($this->withto))?$this->withto:"";
+                print (!is_array($this->withto) && !is_numeric($this->withto)) ? $this->withto : "";
             }
             else
             {
-                print "<input size=\"16\" id=\"sendto\" name=\"sendto\" value=\"".dol_escape_htmltag(! is_array($this->withto) && $this->withto != '1'? (isset($_REQUEST["sendto"])?GETPOST("sendto"):$this->withto):"+")."\">";
-                if (! empty($this->withtosocid) && $this->withtosocid > 0)
+                print "<input size=\"16\" id=\"sendto\" name=\"sendto\" value=\"".dol_escape_htmltag(!is_array($this->withto) && $this->withto != '1' ? (isset($_REQUEST["sendto"]) ?GETPOST("sendto") : $this->withto) : "+")."\">";
+                if (!empty($this->withtosocid) && $this->withtosocid > 0)
                 {
-                    $liste=array();
+                    $liste = array();
                     foreach ($soc->thirdparty_and_contact_phone_array() as $key => $value)
                     {
-                        $liste[$key]=$value;
+                        $liste[$key] = $value;
                     }
                     print " ".$langs->trans("or")." ";
                     //var_dump($_REQUEST);exit;
@@ -294,14 +294,14 @@ 
         // Message
         if ($this->withbody)
         {
-            $defaultmessage='';
-            if ($this->param["models"]=='body')
+            $defaultmessage = '';
+            if ($this->param["models"] == 'body')
             {
-                $defaultmessage=$this->withbody;
+                $defaultmessage = $this->withbody;
             }
-            $defaultmessage=make_substitutions($defaultmessage,$this->substit);
-            if (isset($_POST["message"])) $defaultmessage=$_POST["message"];
-            $defaultmessage=str_replace('\n',"\n",$defaultmessage);
+            $defaultmessage = make_substitutions($defaultmessage, $this->substit);
+            if (isset($_POST["message"])) $defaultmessage = $_POST["message"];
+            $defaultmessage = str_replace('\n', "\n", $defaultmessage);
 
             print "<tr>";
             print '<td class="tdtop">'.$langs->trans("SmsText")."</td>";
@@ -314,7 +314,7 @@ 
             else
             {
                 print '<textarea class="quatrevingtpercent" name="message" id="message" rows="'.ROWS_4.'" onkeyup="limitChars(this, 160, \'charlimitinfospan\')">'.$defaultmessage.'</textarea>';
-                print '<div id="charlimitinfo">'.$langs->trans("SmsInfoCharRemain").': <span id="charlimitinfospan">'.(160-dol_strlen($defaultmessage)).'</span></div></td>';
+                print '<div id="charlimitinfo">'.$langs->trans("SmsInfoCharRemain").': <span id="charlimitinfospan">'.(160 - dol_strlen($defaultmessage)).'</span></div></td>';
             }
             print "</td></tr>\n";
         }

Braces +31 added lines, -28 removed lines

@@ -105,7 +105,9 @@ 
      // phpcs:enable
         global $conf, $langs, $user, $form;
 
-        if (! is_object($form)) $form=new Form($this->db);
+        if (! is_object($form)) {
+            $form=new Form($this->db);
+        }
 
         // Load translation files required by the page
         $langs->loadLangs(array('other', 'mails', 'sms'));
@@ -131,7 +133,9 @@ 
 }
 </script>';
 
-        if ($showform) print "<form method=\"POST\" name=\"smsform\" enctype=\"multipart/form-data\" action=\"".$this->param["returnurl"]."\">\n";
+        if ($showform) {
+            print "<form method=\"POST\" name=\"smsform\" enctype=\"multipart/form-data\" action=\"".$this->param["returnurl"]."\">\n";
+        }
 
         print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
         foreach ($this->param as $key=>$value)
@@ -141,9 +145,11 @@ 
         print "<table class=\"border centpercent\">\n";
 
         // Substitution array
-        if (! empty($this->withsubstit))		// Unset or set ->withsubstit=0 to disable this.
+        if (! empty($this->withsubstit)) {
+            // Unset or set ->withsubstit=0 to disable this.
         {
             print "<tr><td colspan=\"2\">";
+        }
             $help="";
             foreach($this->substit as $key => $val)
             {
@@ -172,8 +178,7 @@ 
                 if ($this->fromsms)
                 {
                     print $this->fromsms;
-                }
-                else
+                } else
                 {
                     if ($this->fromtype)
                     {
@@ -183,34 +188,34 @@ 
                 }
                 print "</td></tr>\n";
                 print "</td></tr>\n";
-            }
-            else
+            } else
             {
                 print '<tr><td class="'.$morecss.'">'.$langs->trans("SmsFrom")."</td><td>";
                 //print '<input type="text" name="fromname" size="30" value="'.$this->fromsms.'">';
-                if ($conf->global->MAIN_SMS_SENDMODE == 'ovh')        // For backward compatibility        @deprecated
+                if ($conf->global->MAIN_SMS_SENDMODE == 'ovh') {
+                    // For backward compatibility        @deprecated
                 {
                     dol_include_once('/ovh/class/ovhsms.class.php');
+                }
                     try
                     {
                         $sms = new OvhSms($this->db);
                         if (empty($conf->global->OVHSMS_ACCOUNT))
                         {
                             $resultsender = 'ErrorOVHSMS_ACCOUNT not defined';
-                        }
-                        else
+                        } else
                         {
                             $resultsender = $sms->SmsSenderList();
                         }
-                    }
-                    catch(Exception $e)
+                    } catch(Exception $e)
                     {
                         dol_print_error('','Error to get list of senders: '.$e->getMessage());
                     }
-                }
-                else if (!empty($conf->global->MAIN_SMS_SENDMODE))    // $conf->global->MAIN_SMS_SENDMODE looks like a value 'class@module'
+                } else if (!empty($conf->global->MAIN_SMS_SENDMODE)) {
+                    // $conf->global->MAIN_SMS_SENDMODE looks like a value 'class@module'
                 {
                     $tmp=explode('@',$conf->global->MAIN_SMS_SENDMODE);
+                }
                     $classfile=$tmp[0]; $module=(empty($tmp[1])?$tmp[0]:$tmp[1]);
                     dol_include_once('/'.$module.'/class/'.$classfile.'.class.php');
                     try
@@ -220,20 +225,17 @@ 
                         {
                         	$sms = new $classname($this->db);
                         	$resultsender = $sms->SmsSenderList();
-                        }
-                        else
+                        } else
                         {
                         	$sms = new stdClass();
                         	$sms->error='The SMS manager "'.$classfile.'" defined into SMS setup MAIN_SMS_SENDMODE is not found';
                         }
-                    }
-                    catch(Exception $e)
+                    } catch(Exception $e)
                     {
                         dol_print_error('','Error to get list of senders: '.$e->getMessage());
                         exit;
                     }
-                }
-                else
+                } else
                 {
                     dol_syslog("Warning: The SMS sending method has not been defined into MAIN_SMS_SENDMODE", LOG_WARNING);
 	                $resultsender=array();
@@ -248,11 +250,12 @@ 
                         print '<option value="'.$obj->number.'">'.$obj->number.'</option>';
                     }
                     print '</select>';
-                }
-                else
+                } else
                 {
                     print '<span class="error">'.$langs->trans("SmsNoPossibleSenderFound");
-                    if (is_object($sms) && ! empty($sms->error)) print ' '.$sms->error;
+                    if (is_object($sms) && ! empty($sms->error)) {
+                        print ' '.$sms->error;
+                    }
                     print '</span>';
                 }
                 print '</td>';
@@ -271,8 +274,7 @@ 
             if ($this->withtoreadonly)
             {
                 print (! is_array($this->withto) && ! is_numeric($this->withto))?$this->withto:"";
-            }
-            else
+            } else
             {
                 print "<input size=\"16\" id=\"sendto\" name=\"sendto\" value=\"".dol_escape_htmltag(! is_array($this->withto) && $this->withto != '1'? (isset($_REQUEST["sendto"])?GETPOST("sendto"):$this->withto):"+")."\">";
                 if (! empty($this->withtosocid) && $this->withtosocid > 0)
@@ -300,7 +302,9 @@ 
                 $defaultmessage=$this->withbody;
             }
             $defaultmessage=make_substitutions($defaultmessage,$this->substit);
-            if (isset($_POST["message"])) $defaultmessage=$_POST["message"];
+            if (isset($_POST["message"])) {
+                $defaultmessage=$_POST["message"];
+            }
             $defaultmessage=str_replace('\n',"\n",$defaultmessage);
 
             print "<tr>";
@@ -310,8 +314,7 @@ 
             {
                 print nl2br($defaultmessage);
                 print '<input type="hidden" name="message" value="'.dol_escape_htmltag($defaultmessage).'">';
-            }
-            else
+            } else
             {
                 print '<textarea class="quatrevingtpercent" name="message" id="message" rows="'.ROWS_4.'" onkeyup="limitChars(this, 160, \'charlimitinfospan\')">'.$defaultmessage.'</textarea>';
                 print '<div id="charlimitinfo">'.$langs->trans("SmsInfoCharRemain").': <span id="charlimitinfospan">'.(160-dol_strlen($defaultmessage)).'</span></div></td>';

dolibarr/htdocs/core/class/rssparser.class.php

Indentation +39 added lines, -39 removed lines

@@ -32,9 +32,9 @@ 
     public $db;
 
     /**
-	 * @var string Error code (or message)
-	 */
-	public $error='';
+     * @var string Error code (or message)
+     */
+    public $error='';
 
     private $_format='';
     private $_urlRSS;
@@ -61,7 +61,7 @@ 
      */
     public function __construct($db)
     {
-    	$this->db = $db;
+        $this->db = $db;
     }
 
     /**
@@ -252,28 +252,28 @@ 
 
         if ($str !== false)
         {
-	        // Convert $str into xml
-	        if (! empty($conf->global->EXTERNALRSS_USE_SIMPLEXML))
-	        {
-	            //print 'xx'.LIBXML_NOCDATA;
-	            libxml_use_internal_errors(false);
-	            $rss = simplexml_load_string($str, "SimpleXMLElement", LIBXML_NOCDATA);
-	        }
-	        else
-	        {
-	            $xmlparser=xml_parser_create('');
-	            if (!is_resource($xmlparser)) {
-	                $this->error="ErrorFailedToCreateParser"; return -1;
-	            }
-
-	            xml_set_object($xmlparser, $this);
-	            xml_set_element_handler($xmlparser, 'feed_start_element', 'feed_end_element');
-	            xml_set_character_data_handler($xmlparser, 'feed_cdata');
-	            $status = xml_parse($xmlparser, $str);
-	            xml_parser_free($xmlparser);
-	            $rss=$this;
-	            //var_dump($rss->_format);exit;
-	        }
+            // Convert $str into xml
+            if (! empty($conf->global->EXTERNALRSS_USE_SIMPLEXML))
+            {
+                //print 'xx'.LIBXML_NOCDATA;
+                libxml_use_internal_errors(false);
+                $rss = simplexml_load_string($str, "SimpleXMLElement", LIBXML_NOCDATA);
+            }
+            else
+            {
+                $xmlparser=xml_parser_create('');
+                if (!is_resource($xmlparser)) {
+                    $this->error="ErrorFailedToCreateParser"; return -1;
+                }
+
+                xml_set_object($xmlparser, $this);
+                xml_set_element_handler($xmlparser, 'feed_start_element', 'feed_end_element');
+                xml_set_character_data_handler($xmlparser, 'feed_cdata');
+                $status = xml_parse($xmlparser, $str);
+                xml_parser_free($xmlparser);
+                $rss=$this;
+                //var_dump($rss->_format);exit;
+            }
         }
 
         // If $rss loaded
@@ -287,16 +287,16 @@ 
                 $fp = fopen($newpathofdestfile, 'w');
                 if ($fp)
                 {
-                	fwrite($fp, $str);
-                	fclose($fp);
-                	if (! empty($conf->global->MAIN_UMASK)) $newmask=$conf->global->MAIN_UMASK;
-                	@chmod($newpathofdestfile, octdec($newmask));
+                    fwrite($fp, $str);
+                    fclose($fp);
+                    if (! empty($conf->global->MAIN_UMASK)) $newmask=$conf->global->MAIN_UMASK;
+                    @chmod($newpathofdestfile, octdec($newmask));
 
-	                $this->_lastfetchdate=$nowgmt;
+                    $this->_lastfetchdate=$nowgmt;
                 }
                 else
                 {
-                	print 'Error, failed to open file '.$newpathofdestfile.' for write';
+                    print 'Error, failed to open file '.$newpathofdestfile.' for write';
                 }
             }
 
@@ -435,13 +435,13 @@ 
 
                     // Add record to result array
                     $this->_rssarray[$i] = array(
-    					'link'=>$itemLink,
-    					'title'=>$itemTitle,
-    					'description'=>$itemDescription,
-    					'pubDate'=>$itemPubDate,
-    					'category'=>$itemCategory,
-    				    'id'=>$itemId,
-    				    'author'=>$itemAuthor);
+                        'link'=>$itemLink,
+                        'title'=>$itemTitle,
+                        'description'=>$itemDescription,
+                        'pubDate'=>$itemPubDate,
+                        'category'=>$itemCategory,
+                        'id'=>$itemId,
+                        'author'=>$itemAuthor);
                     //var_dump($this->_rssarray);
 
                     $i++;

Spacing +86 added lines, -86 removed lines

@@ -34,9 +34,9 @@ 
     /**
 	 * @var string Error code (or message)
 	 */
-	public $error='';
+	public $error = '';
 
-    private $_format='';
+    private $_format = '';
     private $_urlRSS;
     private $_language;
     private $_generator;
@@ -46,8 +46,8 @@ 
     private $_link;
     private $_title;
     private $_description;
-    private $_lastfetchdate;    // Last successful fetch
-    private $_rssarray=array();
+    private $_lastfetchdate; // Last successful fetch
+    private $_rssarray = array();
 
     // For parsing with xmlparser
     var $stack               = array(); // parser stack
@@ -184,40 +184,40 @@ 
      * 	@param	string	$cachedir	Directory where to save cache file
      *	@return	int					<0 if KO, >0 if OK
      */
-    public function parser($urlRSS, $maxNb=0, $cachedelay=60, $cachedir='')
+    public function parser($urlRSS, $maxNb = 0, $cachedelay = 60, $cachedir = '')
     {
         global $conf;
 
         include_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
 
-        $rss='';
-        $str='';    // This will contain content of feed
+        $rss = '';
+        $str = ''; // This will contain content of feed
 
         // Check parameters
-        if (! dol_is_url($urlRSS))
+        if (!dol_is_url($urlRSS))
         {
-            $this->error="ErrorBadUrl";
+            $this->error = "ErrorBadUrl";
             return -1;
         }
 
         $this->_urlRSS = $urlRSS;
-        $newpathofdestfile=$cachedir.'/'.dol_hash($this->_urlRSS,3);	// Force md5 hash (does not contains special chars)
-        $newmask='0644';
+        $newpathofdestfile = $cachedir.'/'.dol_hash($this->_urlRSS, 3); // Force md5 hash (does not contains special chars)
+        $newmask = '0644';
 
         //dol_syslog("RssPArser::parser parse url=".$urlRSS." => cache file=".$newpathofdestfile);
         $nowgmt = dol_now();
 
         // Search into cache
-        $foundintocache=0;
+        $foundintocache = 0;
         if ($cachedelay > 0 && $cachedir)
         {
-            $filedate=dol_filemtime($newpathofdestfile);
+            $filedate = dol_filemtime($newpathofdestfile);
             if ($filedate >= ($nowgmt - $cachedelay))
             {
                 //dol_syslog("RssParser::parser cache file ".$newpathofdestfile." is not older than now - cachedelay (".$nowgmt." - ".$cachedelay.") so we use it.");
-                $foundintocache=1;
+                $foundintocache = 1;
 
-                $this->_lastfetchdate=$filedate;
+                $this->_lastfetchdate = $filedate;
             }
             else
             {
@@ -233,13 +233,13 @@ 
         else
         {
             try {
-                ini_set("user_agent","Dolibarr ERP-CRM RSS reader");
+                ini_set("user_agent", "Dolibarr ERP-CRM RSS reader");
                 ini_set("max_execution_time", $conf->global->MAIN_USE_RESPONSE_TIMEOUT);
                 ini_set("default_socket_timeout", $conf->global->MAIN_USE_RESPONSE_TIMEOUT);
 
                 $opts = array('http'=>array('method'=>"GET"));
-                if (! empty($conf->global->MAIN_USE_CONNECT_TIMEOUT)) $opts['http']['timeout']=$conf->global->MAIN_USE_CONNECT_TIMEOUT;
-                if (! empty($conf->global->MAIN_PROXY_USE))           $opts['http']['proxy']='tcp://'.$conf->global->MAIN_PROXY_HOST.':'.$conf->global->MAIN_PROXY_PORT;
+                if (!empty($conf->global->MAIN_USE_CONNECT_TIMEOUT)) $opts['http']['timeout'] = $conf->global->MAIN_USE_CONNECT_TIMEOUT;
+                if (!empty($conf->global->MAIN_PROXY_USE))           $opts['http']['proxy'] = 'tcp://'.$conf->global->MAIN_PROXY_HOST.':'.$conf->global->MAIN_PROXY_PORT;
                 //var_dump($opts);exit;
                 $context = stream_context_create($opts);
 
@@ -253,7 +253,7 @@ 
         if ($str !== false)
         {
 	        // Convert $str into xml
-	        if (! empty($conf->global->EXTERNALRSS_USE_SIMPLEXML))
+	        if (!empty($conf->global->EXTERNALRSS_USE_SIMPLEXML))
 	        {
 	            //print 'xx'.LIBXML_NOCDATA;
 	            libxml_use_internal_errors(false);
@@ -261,9 +261,9 @@ 
 	        }
 	        else
 	        {
-	            $xmlparser=xml_parser_create('');
+	            $xmlparser = xml_parser_create('');
 	            if (!is_resource($xmlparser)) {
-	                $this->error="ErrorFailedToCreateParser"; return -1;
+	                $this->error = "ErrorFailedToCreateParser"; return -1;
 	            }
 
 	            xml_set_object($xmlparser, $this);
@@ -271,7 +271,7 @@ 
 	            xml_set_character_data_handler($xmlparser, 'feed_cdata');
 	            $status = xml_parse($xmlparser, $str);
 	            xml_parser_free($xmlparser);
-	            $rss=$this;
+	            $rss = $this;
 	            //var_dump($rss->_format);exit;
 	        }
         }
@@ -283,16 +283,16 @@ 
             if (empty($foundintocache) && $cachedir)
             {
                 dol_syslog(get_class($this)."::parser cache file ".$newpathofdestfile." is saved onto disk.");
-                if (! dol_is_dir($cachedir)) dol_mkdir($cachedir);
+                if (!dol_is_dir($cachedir)) dol_mkdir($cachedir);
                 $fp = fopen($newpathofdestfile, 'w');
                 if ($fp)
                 {
                 	fwrite($fp, $str);
                 	fclose($fp);
-                	if (! empty($conf->global->MAIN_UMASK)) $newmask=$conf->global->MAIN_UMASK;
+                	if (!empty($conf->global->MAIN_UMASK)) $newmask = $conf->global->MAIN_UMASK;
                 	@chmod($newpathofdestfile, octdec($newmask));
 
-	                $this->_lastfetchdate=$nowgmt;
+	                $this->_lastfetchdate = $nowgmt;
                 }
                 else
                 {
@@ -300,21 +300,21 @@ 
                 }
             }
 
-            unset($str);    // Free memory
+            unset($str); // Free memory
 
             if (empty($rss->_format))    // If format not detected automatically
             {
-                $rss->_format='rss';
-                if (empty($rss->channel)) $rss->_format='atom';
+                $rss->_format = 'rss';
+                if (empty($rss->channel)) $rss->_format = 'atom';
             }
 
-            $items=array();
+            $items = array();
 
             // Save description entries
             if ($rss->_format == 'rss')
             {
                 //var_dump($rss);
-                if (! empty($conf->global->EXTERNALRSS_USE_SIMPLEXML))
+                if (!empty($conf->global->EXTERNALRSS_USE_SIMPLEXML))
                 {
                     if (!empty($rss->channel->language))      $this->_language = (string) $rss->channel->language;
                     if (!empty($rss->channel->generator))     $this->_generator = (string) $rss->channel->generator;
@@ -338,14 +338,14 @@ 
                     if (!empty($rss->channel['description']))   $this->_description = (string) $rss->channel['description'];
                 }
 
-                if (! empty($conf->global->EXTERNALRSS_USE_SIMPLEXML)) $items=$rss->channel->item;    // With simplexml
-                else $items=$rss->items;                                                              // With xmlparse
+                if (!empty($conf->global->EXTERNALRSS_USE_SIMPLEXML)) $items = $rss->channel->item; // With simplexml
+                else $items = $rss->items; // With xmlparse
                 //var_dump($items);exit;
             }
             else if ($rss->_format == 'atom')
             {
                 //var_dump($rss);
-                if (! empty($conf->global->EXTERNALRSS_USE_SIMPLEXML))
+                if (!empty($conf->global->EXTERNALRSS_USE_SIMPLEXML))
                 {
                     if (!empty($rss->generator))     $this->_generator = (string) $rss->generator;
                     if (!empty($rss->lastbuilddate)) $this->_lastbuilddate = (string) $rss->modified;
@@ -364,10 +364,10 @@ 
                     if (!empty($rss->channel['title']))         $this->_title = (string) $rss->channel['title'];
                     //if (!empty($rss->channel['rss_description']))   $this->_description = (string) $rss->channel['rss_description'];
                 }
-                if (! empty($conf->global->EXTERNALRSS_USE_SIMPLEXML))  {
-                    $tmprss=xml2php($rss); $items=$tmprss['entry'];
+                if (!empty($conf->global->EXTERNALRSS_USE_SIMPLEXML)) {
+                    $tmprss = xml2php($rss); $items = $tmprss['entry'];
                 } // With simplexml
-                else $items=$rss->items;                                                              // With xmlparse
+                else $items = $rss->items; // With xmlparse
                 //var_dump($items);exit;
             }
 
@@ -376,12 +376,12 @@ 
             // Loop on each record
             if (is_array($items))
             {
-                foreach($items as $item)
+                foreach ($items as $item)
                 {
                     //var_dump($item);exit;
                     if ($rss->_format == 'rss')
                     {
-                        if (! empty($conf->global->EXTERNALRSS_USE_SIMPLEXML))
+                        if (!empty($conf->global->EXTERNALRSS_USE_SIMPLEXML))
                         {
                             $itemLink = (string) $item->link;
                             $itemTitle = (string) $item->title;
@@ -401,7 +401,7 @@ 
                         }
 
                         // Loop on each category
-                        $itemCategory=array();
+                        $itemCategory = array();
                         if (is_array($item->category))
                         {
                             foreach ($item->category as $cat)
@@ -412,14 +412,14 @@ 
                     }
                     else if ($rss->_format == 'atom')
                     {
-                        if (! empty($conf->global->EXTERNALRSS_USE_SIMPLEXML))
+                        if (!empty($conf->global->EXTERNALRSS_USE_SIMPLEXML))
                         {
                             $itemLink = (isset($item['link']['href']) ? (string) $item['link']['href'] : '');
                             $itemTitle = (string) $item['title'];
                             $itemDescription = (string) $item['summary'];
                             $itemPubDate = (string) $item['created'];
                             $itemId = (string) $item['id'];
-                            $itemAuthor = (string) ($item['author']?$item['author']:$item['author_name']);
+                            $itemAuthor = (string) ($item['author'] ? $item['author'] : $item['author_name']);
                         }
                         else
                         {
@@ -428,7 +428,7 @@ 
                             $itemDescription = (string) $item['summary'];
                             $itemPubDate = (string) $item['created'];
                             $itemId = (string) $item['id'];
-                            $itemAuthor = (string) ($item['author']?$item['author']:$item['author_name']);
+                            $itemAuthor = (string) ($item['author'] ? $item['author'] : $item['author_name']);
                         }
                     }
                     else print 'ErrorBadFeedFormat';
@@ -446,7 +446,7 @@ 
 
                     $i++;
 
-                    if ($i > $maxNb)    break;    // We get all records we want
+                    if ($i > $maxNb)    break; // We get all records we want
                 }
             }
 
@@ -454,7 +454,7 @@ 
         }
         else
         {
-            $this->error='ErrorFailedToLoadRSSFile';
+            $this->error = 'ErrorFailedToLoadRSSFile';
             return -1;
         }
     }
@@ -482,7 +482,7 @@ 
         {
             list($ns, $el) = explode(':', $element, 2);
         }
-        if ( $ns and $ns != 'rdf' )
+        if ($ns and $ns != 'rdf')
         {
             $this->current_namespace = $ns;
         }
@@ -490,15 +490,15 @@ 
         // if feed type isn't set, then this is first element of feed identify feed from root element
         if (empty($this->_format))
         {
-            if ( $el == 'rdf' ) {
+            if ($el == 'rdf') {
                 $this->_format = 'rss';
                 $this->feed_version = '1.0';
             }
-            elseif ( $el == 'rss' ) {
+            elseif ($el == 'rss') {
                 $this->_format = 'rss';
                 $this->feed_version = $attrs['version'];
             }
-            elseif ( $el == 'feed' ) {
+            elseif ($el == 'feed') {
                 $this->_format = 'atom';
                 $this->feed_version = $attrs['version'];
                 $this->inchannel = true;
@@ -506,14 +506,14 @@ 
             return;
         }
 
-        if ( $el == 'channel' )
+        if ($el == 'channel')
         {
             $this->inchannel = true;
         }
-        elseif ($el == 'item' or $el == 'entry' )
+        elseif ($el == 'item' or $el == 'entry')
         {
             $this->initem = true;
-            if ( isset($attrs['rdf:about']) ) {
+            if (isset($attrs['rdf:about'])) {
                 $this->current_item['about'] = $attrs['rdf:about'];
             }
         }
@@ -537,10 +537,10 @@ 
         }
 
         // handle atom content constructs
-        elseif ( $this->_format == 'atom' and in_array($el, $this->_CONTENT_CONSTRUCTS) )
+        elseif ($this->_format == 'atom' and in_array($el, $this->_CONTENT_CONSTRUCTS))
         {
             // avoid clashing w/ RSS mod_content
-            if ($el == 'content' ) {
+            if ($el == 'content') {
                 $el = 'atom_content';
             }
 
@@ -548,7 +548,7 @@ 
         }
 
         // if inside an Atom content construct (e.g. content or summary) field treat tags as text
-        elseif ($this->_format == 'atom' and $this->incontent )
+        elseif ($this->_format == 'atom' and $this->incontent)
         {
             // if tags are inlined, then flatten
             $attrs_str = join(' ', array_map('map_attrs', array_keys($attrs), array_values($attrs)));
@@ -562,14 +562,14 @@ 
         // Magpie treats link elements of type rel='alternate'
         // as being equivalent to RSS's simple link element.
         //
-        elseif ($this->_format == 'atom' and $el == 'link' )
+        elseif ($this->_format == 'atom' and $el == 'link')
         {
-            if ( isset($attrs['rel']) && $attrs['rel'] == 'alternate' )
+            if (isset($attrs['rel']) && $attrs['rel'] == 'alternate')
             {
                 $link_el = 'link';
             }
             else {
-                $link_el = 'link_' . $attrs['rel'];
+                $link_el = 'link_'.$attrs['rel'];
             }
 
             $this->append($link_el, $attrs['href']);
@@ -622,26 +622,26 @@ 
             $this->current_item = array();
             $this->initem = false;
         }
-        elseif ($this->_format == 'rss' and $this->current_namespace == '' and $el == 'textinput' )
+        elseif ($this->_format == 'rss' and $this->current_namespace == '' and $el == 'textinput')
         {
             $this->intextinput = false;
         }
-        elseif ($this->_format == 'rss' and $this->current_namespace == '' and $el == 'image' )
+        elseif ($this->_format == 'rss' and $this->current_namespace == '' and $el == 'image')
         {
             $this->inimage = false;
         }
-        elseif ($this->_format == 'atom' and in_array($el, $this->_CONTENT_CONSTRUCTS) )
+        elseif ($this->_format == 'atom' and in_array($el, $this->_CONTENT_CONSTRUCTS))
         {
             $this->incontent = false;
         }
-        elseif ($el == 'channel' or $el == 'feed' )
+        elseif ($el == 'channel' or $el == 'feed')
         {
             $this->inchannel = false;
         }
-        elseif ($this->_format == 'atom' and $this->incontent  ) {
+        elseif ($this->_format == 'atom' and $this->incontent) {
             // balance tags properly
             // note:  i don't think this is actually neccessary
-            if ( $this->stack[0] == $el )
+            if ($this->stack[0] == $el)
             {
                 $this->append_content("</$el>");
             }
@@ -666,10 +666,10 @@ 
      *  @param	string	$str2		Str2
      *  @return	string				String cancatenated
      */
-    function concat(&$str1, $str2="")
+    function concat(&$str1, $str2 = "")
     {
-        if (!isset($str1) ) {
-            $str1="";
+        if (!isset($str1)) {
+            $str1 = "";
         }
         $str1 .= $str2;
     }
@@ -684,11 +684,11 @@ 
     function append_content($text)
     {
         // phpcs:enable
-        if ( $this->initem ) {
-            $this->concat($this->current_item[ $this->incontent ], $text);
+        if ($this->initem) {
+            $this->concat($this->current_item[$this->incontent], $text);
         }
-        elseif ( $this->inchannel ) {
-            $this->concat($this->channel[ $this->incontent ], $text);
+        elseif ($this->inchannel) {
+            $this->concat($this->channel[$this->incontent], $text);
         }
     }
 
@@ -704,33 +704,33 @@ 
         if (!$el) {
             return;
         }
-        if ( $this->current_namespace )
+        if ($this->current_namespace)
         {
-            if ( $this->initem ) {
-                $this->concat($this->current_item[ $this->current_namespace ][ $el ], $text);
+            if ($this->initem) {
+                $this->concat($this->current_item[$this->current_namespace][$el], $text);
             }
             elseif ($this->inchannel) {
-                $this->concat($this->channel[ $this->current_namespace][ $el ], $text);
+                $this->concat($this->channel[$this->current_namespace][$el], $text);
             }
             elseif ($this->intextinput) {
-                $this->concat($this->textinput[ $this->current_namespace][ $el ], $text);
+                $this->concat($this->textinput[$this->current_namespace][$el], $text);
             }
             elseif ($this->inimage) {
-                $this->concat($this->image[ $this->current_namespace ][ $el ], $text);
+                $this->concat($this->image[$this->current_namespace][$el], $text);
             }
         }
         else {
-            if ( $this->initem ) {
-                $this->concat($this->current_item[ $el ], $text);
+            if ($this->initem) {
+                $this->concat($this->current_item[$el], $text);
             }
             elseif ($this->intextinput) {
-                $this->concat($this->textinput[ $el ], $text);
+                $this->concat($this->textinput[$el], $text);
             }
             elseif ($this->inimage) {
-                $this->concat($this->image[ $el ], $text);
+                $this->concat($this->image[$el], $text);
             }
             elseif ($this->inchannel) {
-                $this->concat($this->channel[ $el ], $text);
+                $this->concat($this->channel[$el], $text);
             }
         }
     }
@@ -748,18 +748,18 @@ 
     $fils = 0;
     $tab = false;
     $array = array();
-    foreach($xml->children() as $key => $value)
+    foreach ($xml->children() as $key => $value)
     {
         $child = xml2php($value);
 
         //To deal with the attributes
-        foreach($value->attributes() as $ak=>$av)
+        foreach ($value->attributes() as $ak=>$av)
         {
             $child[$ak] = (string) $av;
         }
 
         //Let see if the new child is not in the array
-        if ($tab === false && in_array($key,array_keys($array)))
+        if ($tab === false && in_array($key, array_keys($array)))
         {
             //If this element is already in the array we will create an indexed array
             $tmp = $array[$key];
@@ -768,7 +768,7 @@ 
             $array[$key][] = $child;
             $tab = true;
         }
-        elseif($tab === true)
+        elseif ($tab === true)
         {
             //Add an element in an existing array
             $array[$key][] = $child;
@@ -783,7 +783,7 @@ 
     }
 
 
-    if ($fils==0)
+    if ($fils == 0)
     {
         return (string) $xml;
     }

Braces +148 added lines, -107 removed lines

@@ -218,19 +218,19 @@ 
                 $foundintocache=1;
 
                 $this->_lastfetchdate=$filedate;
-            }
-            else
+            } else
             {
                 dol_syslog(get_class($this)."::parser cache file ".$newpathofdestfile." is not found or older than now - cachedelay (".$nowgmt." - ".$cachedelay.") so we can't use it.");
             }
         }
 
         // Load file into $str
-        if ($foundintocache)    // Cache file found and is not too old
+        if ($foundintocache) {
+            // Cache file found and is not too old
         {
             $str = file_get_contents($newpathofdestfile);
         }
-        else
+        } else
         {
             try {
                 ini_set("user_agent","Dolibarr ERP-CRM RSS reader");
@@ -238,14 +238,17 @@ 
                 ini_set("default_socket_timeout", $conf->global->MAIN_USE_RESPONSE_TIMEOUT);
 
                 $opts = array('http'=>array('method'=>"GET"));
-                if (! empty($conf->global->MAIN_USE_CONNECT_TIMEOUT)) $opts['http']['timeout']=$conf->global->MAIN_USE_CONNECT_TIMEOUT;
-                if (! empty($conf->global->MAIN_PROXY_USE))           $opts['http']['proxy']='tcp://'.$conf->global->MAIN_PROXY_HOST.':'.$conf->global->MAIN_PROXY_PORT;
+                if (! empty($conf->global->MAIN_USE_CONNECT_TIMEOUT)) {
+                    $opts['http']['timeout']=$conf->global->MAIN_USE_CONNECT_TIMEOUT;
+                }
+                if (! empty($conf->global->MAIN_PROXY_USE)) {
+                    $opts['http']['proxy']='tcp://'.$conf->global->MAIN_PROXY_HOST.':'.$conf->global->MAIN_PROXY_PORT;
+                }
                 //var_dump($opts);exit;
                 $context = stream_context_create($opts);
 
                 $str = file_get_contents($this->_urlRSS, false, $context);
-            }
-            catch (Exception $e) {
+            } catch (Exception $e) {
                 print 'Error retrieving URL '.$this->urlRSS.' - '.$e->getMessage();
             }
         }
@@ -258,8 +261,7 @@ 
 	            //print 'xx'.LIBXML_NOCDATA;
 	            libxml_use_internal_errors(false);
 	            $rss = simplexml_load_string($str, "SimpleXMLElement", LIBXML_NOCDATA);
-	        }
-	        else
+	        } else
 	        {
 	            $xmlparser=xml_parser_create('');
 	            if (!is_resource($xmlparser)) {
@@ -283,18 +285,21 @@ 
             if (empty($foundintocache) && $cachedir)
             {
                 dol_syslog(get_class($this)."::parser cache file ".$newpathofdestfile." is saved onto disk.");
-                if (! dol_is_dir($cachedir)) dol_mkdir($cachedir);
+                if (! dol_is_dir($cachedir)) {
+                    dol_mkdir($cachedir);
+                }
                 $fp = fopen($newpathofdestfile, 'w');
                 if ($fp)
                 {
                 	fwrite($fp, $str);
                 	fclose($fp);
-                	if (! empty($conf->global->MAIN_UMASK)) $newmask=$conf->global->MAIN_UMASK;
+                	if (! empty($conf->global->MAIN_UMASK)) {
+                	    $newmask=$conf->global->MAIN_UMASK;
+                	}
                 	@chmod($newpathofdestfile, octdec($newmask));
 
 	                $this->_lastfetchdate=$nowgmt;
-                }
-                else
+                } else
                 {
                 	print 'Error, failed to open file '.$newpathofdestfile.' for write';
                 }
@@ -302,10 +307,14 @@ 
 
             unset($str);    // Free memory
 
-            if (empty($rss->_format))    // If format not detected automatically
+            if (empty($rss->_format)) {
+                // If format not detected automatically
             {
                 $rss->_format='rss';
-                if (empty($rss->channel)) $rss->_format='atom';
+            }
+                if (empty($rss->channel)) {
+                    $rss->_format='atom';
+                }
             }
 
             $items=array();
@@ -316,58 +325,114 @@ 
                 //var_dump($rss);
                 if (! empty($conf->global->EXTERNALRSS_USE_SIMPLEXML))
                 {
-                    if (!empty($rss->channel->language))      $this->_language = (string) $rss->channel->language;
-                    if (!empty($rss->channel->generator))     $this->_generator = (string) $rss->channel->generator;
-                    if (!empty($rss->channel->copyright))     $this->_copyright = (string) $rss->channel->copyright;
-                    if (!empty($rss->channel->lastbuilddate)) $this->_lastbuilddate = (string) $rss->channel->lastbuilddate;
-                    if (!empty($rss->channel->image->url[0])) $this->_imageurl = (string) $rss->channel->image->url[0];
-                    if (!empty($rss->channel->link))		  $this->_link = (string) $rss->channel->link;
-                    if (!empty($rss->channel->title))         $this->_title = (string) $rss->channel->title;
-                    if (!empty($rss->channel->description))	  $this->_description = (string) $rss->channel->description;
-                }
-                else
+                    if (!empty($rss->channel->language)) {
+                        $this->_language = (string) $rss->channel->language;
+                    }
+                    if (!empty($rss->channel->generator)) {
+                        $this->_generator = (string) $rss->channel->generator;
+                    }
+                    if (!empty($rss->channel->copyright)) {
+                        $this->_copyright = (string) $rss->channel->copyright;
+                    }
+                    if (!empty($rss->channel->lastbuilddate)) {
+                        $this->_lastbuilddate = (string) $rss->channel->lastbuilddate;
+                    }
+                    if (!empty($rss->channel->image->url[0])) {
+                        $this->_imageurl = (string) $rss->channel->image->url[0];
+                    }
+                    if (!empty($rss->channel->link)) {
+                        $this->_link = (string) $rss->channel->link;
+                    }
+                    if (!empty($rss->channel->title)) {
+                        $this->_title = (string) $rss->channel->title;
+                    }
+                    if (!empty($rss->channel->description)) {
+                        $this->_description = (string) $rss->channel->description;
+                    }
+                } else
                 {
                     //var_dump($rss->channel);
-                    if (!empty($rss->channel['language']))      $this->_language = (string) $rss->channel['language'];
-                    if (!empty($rss->channel['generator']))     $this->_generator = (string) $rss->channel['generator'];
-                    if (!empty($rss->channel['copyright']))     $this->_copyright = (string) $rss->channel['copyright'];
-                    if (!empty($rss->channel['lastbuilddate'])) $this->_lastbuilddate = (string) $rss->channel['lastbuilddate'];
-                    if (!empty($rss->image['url']))             $this->_imageurl = (string) $rss->image['url'];
-                    if (!empty($rss->channel['link']))		    $this->_link = (string) $rss->channel['link'];
-                    if (!empty($rss->channel['title']))         $this->_title = (string) $rss->channel['title'];
-                    if (!empty($rss->channel['description']))   $this->_description = (string) $rss->channel['description'];
+                    if (!empty($rss->channel['language'])) {
+                        $this->_language = (string) $rss->channel['language'];
+                    }
+                    if (!empty($rss->channel['generator'])) {
+                        $this->_generator = (string) $rss->channel['generator'];
+                    }
+                    if (!empty($rss->channel['copyright'])) {
+                        $this->_copyright = (string) $rss->channel['copyright'];
+                    }
+                    if (!empty($rss->channel['lastbuilddate'])) {
+                        $this->_lastbuilddate = (string) $rss->channel['lastbuilddate'];
+                    }
+                    if (!empty($rss->image['url'])) {
+                        $this->_imageurl = (string) $rss->image['url'];
+                    }
+                    if (!empty($rss->channel['link'])) {
+                        $this->_link = (string) $rss->channel['link'];
+                    }
+                    if (!empty($rss->channel['title'])) {
+                        $this->_title = (string) $rss->channel['title'];
+                    }
+                    if (!empty($rss->channel['description'])) {
+                        $this->_description = (string) $rss->channel['description'];
+                    }
                 }
 
-                if (! empty($conf->global->EXTERNALRSS_USE_SIMPLEXML)) $items=$rss->channel->item;    // With simplexml
-                else $items=$rss->items;                                                              // With xmlparse
+                if (! empty($conf->global->EXTERNALRSS_USE_SIMPLEXML)) {
+                    $items=$rss->channel->item;
+                }
+                // With simplexml
+                else {
+                    $items=$rss->items;
+                }
+                // With xmlparse
                 //var_dump($items);exit;
-            }
-            else if ($rss->_format == 'atom')
+            } else if ($rss->_format == 'atom')
             {
                 //var_dump($rss);
                 if (! empty($conf->global->EXTERNALRSS_USE_SIMPLEXML))
                 {
-                    if (!empty($rss->generator))     $this->_generator = (string) $rss->generator;
-                    if (!empty($rss->lastbuilddate)) $this->_lastbuilddate = (string) $rss->modified;
-                    if (!empty($rss->link->href))    $this->_link = (string) $rss->link->href;
-                    if (!empty($rss->title))         $this->_title = (string) $rss->title;
-                    if (!empty($rss->description))	 $this->_description = (string) $rss->description;
-                }
-                else
+                    if (!empty($rss->generator)) {
+                        $this->_generator = (string) $rss->generator;
+                    }
+                    if (!empty($rss->lastbuilddate)) {
+                        $this->_lastbuilddate = (string) $rss->modified;
+                    }
+                    if (!empty($rss->link->href)) {
+                        $this->_link = (string) $rss->link->href;
+                    }
+                    if (!empty($rss->title)) {
+                        $this->_title = (string) $rss->title;
+                    }
+                    if (!empty($rss->description)) {
+                        $this->_description = (string) $rss->description;
+                    }
+                } else
                 {
                     //if (!empty($rss->channel['rss_language']))      $this->_language = (string) $rss->channel['rss_language'];
-                    if (!empty($rss->channel['generator']))     $this->_generator = (string) $rss->channel['generator'];
+                    if (!empty($rss->channel['generator'])) {
+                        $this->_generator = (string) $rss->channel['generator'];
+                    }
                     //if (!empty($rss->channel['rss_copyright']))     $this->_copyright = (string) $rss->channel['rss_copyright'];
-                    if (!empty($rss->channel['modified'])) $this->_lastbuilddate = (string) $rss->channel['modified'];
+                    if (!empty($rss->channel['modified'])) {
+                        $this->_lastbuilddate = (string) $rss->channel['modified'];
+                    }
                     //if (!empty($rss->image['rss_url']))             $this->_imageurl = (string) $rss->image['rss_url'];
-                    if (!empty($rss->channel['link']))		    $this->_link = (string) $rss->channel['link'];
-                    if (!empty($rss->channel['title']))         $this->_title = (string) $rss->channel['title'];
+                    if (!empty($rss->channel['link'])) {
+                        $this->_link = (string) $rss->channel['link'];
+                    }
+                    if (!empty($rss->channel['title'])) {
+                        $this->_title = (string) $rss->channel['title'];
+                    }
                     //if (!empty($rss->channel['rss_description']))   $this->_description = (string) $rss->channel['rss_description'];
                 }
                 if (! empty($conf->global->EXTERNALRSS_USE_SIMPLEXML))  {
                     $tmprss=xml2php($rss); $items=$tmprss['entry'];
                 } // With simplexml
-                else $items=$rss->items;                                                              // With xmlparse
+                else {
+                    $items=$rss->items;
+                }
+                // With xmlparse
                 //var_dump($items);exit;
             }
 
@@ -389,8 +454,7 @@ 
                             $itemPubDate = (string) $item->pubDate;
                             $itemId = '';
                             $itemAuthor = '';
-                        }
-                        else
+                        } else
                         {
                             $itemLink = (string) $item['link'];
                             $itemTitle = (string) $item['title'];
@@ -409,8 +473,7 @@ 
                                 $itemCategory[] = (string) $cat;
                             }
                         }
-                    }
-                    else if ($rss->_format == 'atom')
+                    } else if ($rss->_format == 'atom')
                     {
                         if (! empty($conf->global->EXTERNALRSS_USE_SIMPLEXML))
                         {
@@ -420,8 +483,7 @@ 
                             $itemPubDate = (string) $item['created'];
                             $itemId = (string) $item['id'];
                             $itemAuthor = (string) ($item['author']?$item['author']:$item['author_name']);
-                        }
-                        else
+                        } else
                         {
                             $itemLink = (isset($item['link']['href']) ? (string) $item['link']['href'] : '');
                             $itemTitle = (string) $item['title'];
@@ -430,8 +492,9 @@ 
                             $itemId = (string) $item['id'];
                             $itemAuthor = (string) ($item['author']?$item['author']:$item['author_name']);
                         }
+                    } else {
+                        print 'ErrorBadFeedFormat';
                     }
-                    else print 'ErrorBadFeedFormat';
 
                     // Add record to result array
                     $this->_rssarray[$i] = array(
@@ -446,13 +509,15 @@ 
 
                     $i++;
 
-                    if ($i > $maxNb)    break;    // We get all records we want
+                    if ($i > $maxNb) {
+                        break;
+                    }
+                    // We get all records we want
                 }
             }
 
             return 1;
-        }
-        else
+        } else
         {
             $this->error='ErrorFailedToLoadRSSFile';
             return -1;
@@ -493,12 +558,10 @@ 
             if ( $el == 'rdf' ) {
                 $this->_format = 'rss';
                 $this->feed_version = '1.0';
-            }
-            elseif ( $el == 'rss' ) {
+            } elseif ( $el == 'rss' ) {
                 $this->_format = 'rss';
                 $this->feed_version = $attrs['version'];
-            }
-            elseif ( $el == 'feed' ) {
+            } elseif ( $el == 'feed' ) {
                 $this->_format = 'atom';
                 $this->feed_version = $attrs['version'];
                 $this->inchannel = true;
@@ -509,8 +572,7 @@ 
         if ( $el == 'channel' )
         {
             $this->inchannel = true;
-        }
-        elseif ($el == 'item' or $el == 'entry' )
+        } elseif ($el == 'item' or $el == 'entry' )
         {
             $this->initem = true;
             if ( isset($attrs['rdf:about']) ) {
@@ -526,9 +588,7 @@ 
         $el == 'textinput' )
         {
             $this->intextinput = true;
-        }
-
-        elseif (
+        } elseif (
         $this->_format == 'rss' and
         $this->current_namespace == '' and
         $el == 'image' )
@@ -567,8 +627,7 @@ 
             if ( isset($attrs['rel']) && $attrs['rel'] == 'alternate' )
             {
                 $link_el = 'link';
-            }
-            else {
+            } else {
                 $link_el = 'link_' . $attrs['rel'];
             }
 
@@ -595,8 +654,7 @@ 
         if ($this->_format == 'atom' and $this->incontent)
         {
             $this->append_content($text);
-        }
-        else
+        } else
         {
             $current_el = join('_', array_reverse($this->stack));
             $this->append($current_el, $text);
@@ -621,37 +679,30 @@ 
             $this->items[] = $this->current_item;
             $this->current_item = array();
             $this->initem = false;
-        }
-        elseif ($this->_format == 'rss' and $this->current_namespace == '' and $el == 'textinput' )
+        } elseif ($this->_format == 'rss' and $this->current_namespace == '' and $el == 'textinput' )
         {
             $this->intextinput = false;
-        }
-        elseif ($this->_format == 'rss' and $this->current_namespace == '' and $el == 'image' )
+        } elseif ($this->_format == 'rss' and $this->current_namespace == '' and $el == 'image' )
         {
             $this->inimage = false;
-        }
-        elseif ($this->_format == 'atom' and in_array($el, $this->_CONTENT_CONSTRUCTS) )
+        } elseif ($this->_format == 'atom' and in_array($el, $this->_CONTENT_CONSTRUCTS) )
         {
             $this->incontent = false;
-        }
-        elseif ($el == 'channel' or $el == 'feed' )
+        } elseif ($el == 'channel' or $el == 'feed' )
         {
             $this->inchannel = false;
-        }
-        elseif ($this->_format == 'atom' and $this->incontent  ) {
+        } elseif ($this->_format == 'atom' and $this->incontent  ) {
             // balance tags properly
             // note:  i don't think this is actually neccessary
             if ( $this->stack[0] == $el )
             {
                 $this->append_content("</$el>");
-            }
-            else {
+            } else {
                 $this->append_content("<$el />");
             }
 
             array_shift($this->stack);
-        }
-        else {
+        } else {
             array_shift($this->stack);
         }
 
@@ -686,8 +737,7 @@ 
         // phpcs:enable
         if ( $this->initem ) {
             $this->concat($this->current_item[ $this->incontent ], $text);
-        }
-        elseif ( $this->inchannel ) {
+        } elseif ( $this->inchannel ) {
             $this->concat($this->channel[ $this->incontent ], $text);
         }
     }
@@ -708,28 +758,21 @@ 
         {
             if ( $this->initem ) {
                 $this->concat($this->current_item[ $this->current_namespace ][ $el ], $text);
-            }
-            elseif ($this->inchannel) {
+            } elseif ($this->inchannel) {
                 $this->concat($this->channel[ $this->current_namespace][ $el ], $text);
-            }
-            elseif ($this->intextinput) {
+            } elseif ($this->intextinput) {
                 $this->concat($this->textinput[ $this->current_namespace][ $el ], $text);
-            }
-            elseif ($this->inimage) {
+            } elseif ($this->inimage) {
                 $this->concat($this->image[ $this->current_namespace ][ $el ], $text);
             }
-        }
-        else {
+        } else {
             if ( $this->initem ) {
                 $this->concat($this->current_item[ $el ], $text);
-            }
-            elseif ($this->intextinput) {
+            } elseif ($this->intextinput) {
                 $this->concat($this->textinput[ $el ], $text);
-            }
-            elseif ($this->inimage) {
+            } elseif ($this->inimage) {
                 $this->concat($this->image[ $el ], $text);
-            }
-            elseif ($this->inchannel) {
+            } elseif ($this->inchannel) {
                 $this->concat($this->channel[ $el ], $text);
             }
         }
@@ -767,13 +810,11 @@ 
             $array[$key][] = $tmp;
             $array[$key][] = $child;
             $tab = true;
-        }
-        elseif($tab === true)
+        } elseif($tab === true)
         {
             //Add an element in an existing array
             $array[$key][] = $child;
-        }
-        else
+        } else
         {
             //Add a simple element
             $array[$key] = $child;

dolibarr/htdocs/core/class/genericobject.class.php

Spacing +2 added lines, -2 removed lines

@@ -20,7 +20,7 @@ 
  *	\ingroup    core
  *	\brief      File of class of generic business class
  */
-require_once DOL_DOCUMENT_ROOT .'/core/class/commonobject.class.php';
+require_once DOL_DOCUMENT_ROOT.'/core/class/commonobject.class.php';
 
 
 /**
@@ -36,6 +36,6 @@ 
      */
     function __construct($db)
     {
-        $this->db=$db;
+        $this->db = $db;
     }
 }

dolibarr/htdocs/core/class/menu.class.php

Indentation +3 added lines, -3 removed lines

@@ -31,11 +31,11 @@ 
     var $liste;
 
     /**
-	 *	Constructor
+     *	Constructor
      */
     function __construct()
     {
-      	$this->liste = array();
+            $this->liste = array();
     }
 
     /**
@@ -67,7 +67,7 @@ 
      */
     function add($url, $titre, $level=0, $enabled=1, $target='',$mainmenu='',$leftmenu='',$position=0, $id='', $idsel='', $classname='', $prefix='')
     {
-    	$this->liste[]=array('url'=>$url,'titre'=>$titre,'level'=>$level,'enabled'=>$enabled,'target'=>$target,'mainmenu'=>$mainmenu,'leftmenu'=>$leftmenu, 'position'=>$position, 'id'=>$id, 'idsel'=>$idsel, 'classname'=>$classname, 'prefix'=>$prefix);
+        $this->liste[]=array('url'=>$url,'titre'=>$titre,'level'=>$level,'enabled'=>$enabled,'target'=>$target,'mainmenu'=>$mainmenu,'leftmenu'=>$leftmenu, 'position'=>$position, 'id'=>$id, 'idsel'=>$idsel, 'classname'=>$classname, 'prefix'=>$prefix);
     }
 
     /**

Spacing +10 added lines, -10 removed lines

@@ -65,9 +65,9 @@ 
      * @param	string	$prefix		Prefix to title (image or picto)
      * @return	void
      */
-    function add($url, $titre, $level=0, $enabled=1, $target='',$mainmenu='',$leftmenu='',$position=0, $id='', $idsel='', $classname='', $prefix='')
+    function add($url, $titre, $level = 0, $enabled = 1, $target = '', $mainmenu = '', $leftmenu = '', $position = 0, $id = '', $idsel = '', $classname = '', $prefix = '')
     {
-    	$this->liste[]=array('url'=>$url,'titre'=>$titre,'level'=>$level,'enabled'=>$enabled,'target'=>$target,'mainmenu'=>$mainmenu,'leftmenu'=>$leftmenu, 'position'=>$position, 'id'=>$id, 'idsel'=>$idsel, 'classname'=>$classname, 'prefix'=>$prefix);
+    	$this->liste[] = array('url'=>$url, 'titre'=>$titre, 'level'=>$level, 'enabled'=>$enabled, 'target'=>$target, 'mainmenu'=>$mainmenu, 'leftmenu'=>$leftmenu, 'position'=>$position, 'id'=>$id, 'idsel'=>$idsel, 'classname'=>$classname, 'prefix'=>$prefix);
     }
 
     /**
@@ -88,12 +88,12 @@ 
      * @param	string	$prefix		Prefix to title (image or picto)
      * @return	void
      */
-    function insert($idafter, $url, $titre, $level=0, $enabled=1, $target='',$mainmenu='',$leftmenu='',$position=0, $id='', $idsel='', $classname='', $prefix='')
+    function insert($idafter, $url, $titre, $level = 0, $enabled = 1, $target = '', $mainmenu = '', $leftmenu = '', $position = 0, $id = '', $idsel = '', $classname = '', $prefix = '')
     {
-        $array_start = array_slice($this->liste,0,($idafter+1));
-        $array_new   = array(0=>array('url'=>$url,'titre'=>$titre,'level'=>$level,'enabled'=>$enabled,'target'=>$target,'mainmenu'=>$mainmenu,'leftmenu'=>$leftmenu,'position'=>$position, 'id'=>$id, 'idsel'=>$idsel, 'classname'=>$classname, 'prefix'=>$prefix));
-        $array_end   = array_slice($this->liste,($idafter+1));
-        $this->liste=array_merge($array_start,$array_new,$array_end);
+        $array_start = array_slice($this->liste, 0, ($idafter + 1));
+        $array_new   = array(0=>array('url'=>$url, 'titre'=>$titre, 'level'=>$level, 'enabled'=>$enabled, 'target'=>$target, 'mainmenu'=>$mainmenu, 'leftmenu'=>$leftmenu, 'position'=>$position, 'id'=>$id, 'idsel'=>$idsel, 'classname'=>$classname, 'prefix'=>$prefix));
+        $array_end   = array_slice($this->liste, ($idafter + 1));
+        $this->liste = array_merge($array_start, $array_new, $array_end);
     }
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
@@ -117,10 +117,10 @@ 
      */
     function getNbOfVisibleMenuEntries()
     {
-        $nb=0;
-        foreach($this->liste as $val)
+        $nb = 0;
+        foreach ($this->liste as $val)
         {
-            if (! empty($val['enabled'])) $nb++;
+            if (!empty($val['enabled'])) $nb++;
         }
         return $nb;
     }

Braces +3 added lines, -1 removed lines

@@ -120,7 +120,9 @@
         $nb=0;
         foreach($this->liste as $val)
         {
-            if (! empty($val['enabled'])) $nb++;
+            if (! empty($val['enabled'])) {
+                $nb++;
+            }
         }
         return $nb;
     }

dolibarr/htdocs/core/class/CMailFile.class.php

Indentation +1425 added lines, -1425 removed lines

@@ -36,323 +36,323 @@ 
  */
 class CMailFile
 {
-	public $sendcontext;
-	public $sendmode;
-	public $sendsetup;
-
-	var $subject;      	// Topic:       Subject of email
-	var $addr_from;    	// From:		Label and EMail of sender (must include '<>'). For example '<myemail@example.com>' or 'John Doe <myemail@example.com>' or '<myemail+trackingid@example.com>'). Note that with gmail smtps, value here is forced by google to account (but not the reply-to).
-	// Sender:      Who send the email ("Sender" has sent emails on behalf of "From").
-	//              Use it when the "From" is an email of a domain that is a SPF protected domain, and sending smtp server is not this domain. In such case, add Sender field with an email of the protected domain.
-	// Return-Path: Email where to send bounds.
-	var $reply_to;		// Reply-To:	Email where to send replies from mailer software (mailer use From if reply-to not defined, Gmail use gmail account if reply-to not defined)
-	var $errors_to;		// Errors-To:	Email where to send errors.
-	var $addr_to;
-	var $addr_cc;
-	var $addr_bcc;
-	var $trackid;
-
-	var $mixed_boundary;
-	var $related_boundary;
-	var $alternative_boundary;
-	var $deliveryreceipt;
-
-	var $eol;
-	var $eol2;
-
-	/**
-	 * @var string Error code (or message)
-	 */
-	public $error='';
-
-	var $smtps;			// Contains SMTPs object (if this method is used)
-	var $phpmailer;		// Contains PHPMailer object (if this method is used)
-
-	/**
-	 * @var string CSS
-	 */
-	public $css;
-	//! Defined css style for body background
-	var $styleCSS;
-	//! Defined background directly in body tag
-	var $bodyCSS;
-
-	var $headers;
-	var $message;
-
-	// Image
-	var $html;
-	var $image_boundary;
-	var $atleastoneimage=0;    // at least one image file with file=xxx.ext into content (TODO Debug this. How can this case be tested. Remove if not used).
-	var $html_images=array();
-	var $images_encoded=array();
-	var $image_types = array(
+    public $sendcontext;
+    public $sendmode;
+    public $sendsetup;
+
+    var $subject;      	// Topic:       Subject of email
+    var $addr_from;    	// From:		Label and EMail of sender (must include '<>'). For example '<myemail@example.com>' or 'John Doe <myemail@example.com>' or '<myemail+trackingid@example.com>'). Note that with gmail smtps, value here is forced by google to account (but not the reply-to).
+    // Sender:      Who send the email ("Sender" has sent emails on behalf of "From").
+    //              Use it when the "From" is an email of a domain that is a SPF protected domain, and sending smtp server is not this domain. In such case, add Sender field with an email of the protected domain.
+    // Return-Path: Email where to send bounds.
+    var $reply_to;		// Reply-To:	Email where to send replies from mailer software (mailer use From if reply-to not defined, Gmail use gmail account if reply-to not defined)
+    var $errors_to;		// Errors-To:	Email where to send errors.
+    var $addr_to;
+    var $addr_cc;
+    var $addr_bcc;
+    var $trackid;
+
+    var $mixed_boundary;
+    var $related_boundary;
+    var $alternative_boundary;
+    var $deliveryreceipt;
+
+    var $eol;
+    var $eol2;
+
+    /**
+     * @var string Error code (or message)
+     */
+    public $error='';
+
+    var $smtps;			// Contains SMTPs object (if this method is used)
+    var $phpmailer;		// Contains PHPMailer object (if this method is used)
+
+    /**
+     * @var string CSS
+     */
+    public $css;
+    //! Defined css style for body background
+    var $styleCSS;
+    //! Defined background directly in body tag
+    var $bodyCSS;
+
+    var $headers;
+    var $message;
+
+    // Image
+    var $html;
+    var $image_boundary;
+    var $atleastoneimage=0;    // at least one image file with file=xxx.ext into content (TODO Debug this. How can this case be tested. Remove if not used).
+    var $html_images=array();
+    var $images_encoded=array();
+    var $image_types = array(
         'gif'  => 'image/gif',
-		'jpg'  => 'image/jpeg',
-		'jpeg' => 'image/jpeg',
-		'jpe'  => 'image/jpeg',
-		'bmp'  => 'image/bmp',
-		'png'  => 'image/png',
-		'tif'  => 'image/tiff',
+        'jpg'  => 'image/jpeg',
+        'jpeg' => 'image/jpeg',
+        'jpe'  => 'image/jpeg',
+        'bmp'  => 'image/bmp',
+        'png'  => 'image/png',
+        'tif'  => 'image/tiff',
         'tiff' => 'image/tiff',
     );
 
 
-	/**
-	 *	CMailFile
-	 *
-	 *	@param 	string	$subject             Topic/Subject of mail
-	 *	@param 	string	$to                  Recipients emails (RFC 2822: "Name firstname <email>[, ...]" or "email[, ...]" or "<email>[, ...]"). Note: the keyword '__SUPERVISOREMAIL__' is not allowed here and must be replaced by caller.
-	 *	@param 	string	$from                Sender email      (RFC 2822: "Name firstname <email>[, ...]" or "email[, ...]" or "<email>[, ...]")
-	 *	@param 	string	$msg                 Message
-	 *	@param 	array	$filename_list       List of files to attach (full path of filename on file system)
-	 *	@param 	array	$mimetype_list       List of MIME type of attached files
-	 *	@param 	array	$mimefilename_list   List of attached file name in message
-	 *	@param 	string	$addr_cc             Email cc
-	 *	@param 	string	$addr_bcc            Email bcc (Note: This is autocompleted with MAIN_MAIL_AUTOCOPY_TO if defined)
-	 *	@param 	int		$deliveryreceipt     Ask a delivery receipt
-	 *	@param 	int		$msgishtml           1=String IS already html, 0=String IS NOT html, -1=Unknown make autodetection (with fast mode, not reliable)
-	 *	@param 	string	$errors_to      	 Email for errors-to
-	 *	@param	string	$css                 Css option
-	 *	@param	string	$trackid             Tracking string (contains type and id of related element)
-	 *  @param  string  $moreinheader        More in header. $moreinheader must contains the "\r\n" (TODO not supported for other MAIL_SEND_MODE different than 'phpmail' and 'smtps' for the moment)
-	 *  @param  string  $sendcontext      	 'standard', 'emailing', ... (used to define with sending mode and parameters to use)
-	 *  @param	string	$replyto			 Reply-to email (will be set to same value than From by default if not provided)
-	 */
-	function __construct($subject, $to, $from, $msg, $filename_list=array(), $mimetype_list=array(), $mimefilename_list=array(), $addr_cc="", $addr_bcc="", $deliveryreceipt=0, $msgishtml=0, $errors_to='', $css='', $trackid='', $moreinheader='', $sendcontext='standard', $replyto='')
-	{
-		global $conf, $dolibarr_main_data_root;
-
-		$this->sendcontext = $sendcontext;
-
-		if (empty($replyto)) $replyto=$from;
-
-		// Define this->sendmode
-		$this->sendmode = '';
-		if ($this->sendcontext == 'emailing' && !empty($conf->global->MAIN_MAIL_SENDMODE_EMAILING) && $conf->global->MAIN_MAIL_SENDMODE_EMAILING != 'default')
-		{
-			$this->sendmode = $conf->global->MAIN_MAIL_SENDMODE_EMAILING;
-		}
-		if (empty($this->sendmode)) $this->sendmode=$conf->global->MAIN_MAIL_SENDMODE;
-		if (empty($this->sendmode)) $this->sendmode='mail';
-
-		// We define end of line (RFC 821).
-		$this->eol="\r\n";
-		// We define end of line for header fields (RFC 822bis section 2.3 says header must contains \r\n).
-		$this->eol2="\r\n";
-		if (! empty($conf->global->MAIN_FIX_FOR_BUGGED_MTA))
-		{
-			$this->eol="\n";
-			$this->eol2="\n";
-			$moreinheader = str_replace("\r\n","\n",$moreinheader);
-		}
-
-		// On defini mixed_boundary
-		$this->mixed_boundary = "multipart_x." . time() . ".x_boundary";
-
-		// On defini related_boundary
-		$this->related_boundary = 'mul_'.dol_hash(uniqid("dolibarr2"), 3);	// Force md5 hash (does not contains special chars)
-
-		// On defini alternative_boundary
-		$this->alternative_boundary = 'mul_'.dol_hash(uniqid("dolibarr3"), 3);	// Force md5 hash (does not contains special chars)
-
-		dol_syslog("CMailFile::CMailfile: sendmode=".$this->sendmode." charset=".$conf->file->character_set_client." from=$from, to=$to, addr_cc=$addr_cc, addr_bcc=$addr_bcc, errors_to=$errors_to, trackid=$trackid sendcontext=$sendcontext", LOG_DEBUG);
-		dol_syslog("CMailFile::CMailfile: subject=".$subject.", deliveryreceipt=".$deliveryreceipt.", msgishtml=".$msgishtml, LOG_DEBUG);
-
-		if (empty($subject))
-		{
-			dol_syslog("CMailFile::CMailfile: Try to send an email with empty subject");
-			$this->error='ErrorSubjectIsRequired';
-			return;
-		}
-		if (empty($msg))
-		{
-		    dol_syslog("CMailFile::CMailfile: Try to send an email with empty body");
-		    $msg='.';     // Avoid empty message (with empty message conten show a multipart structure)
-		}
-
-		// Detect if message is HTML (use fast method)
-		if ($msgishtml == -1)
-		{
-			$this->msgishtml = 0;
-			if (dol_textishtml($msg)) $this->msgishtml = 1;
-		}
-		else
-		{
-			$this->msgishtml = $msgishtml;
-		}
-
-		global $dolibarr_main_url_root;
-
-		// Define $urlwithroot
-		$urlwithouturlroot=preg_replace('/'.preg_quote(DOL_URL_ROOT,'/').'$/i','',trim($dolibarr_main_url_root));
-		$urlwithroot=$urlwithouturlroot.DOL_URL_ROOT;		// This is to use external domain name found into config file
-		//$urlwithroot=DOL_MAIN_URL_ROOT;					// This is to use same domain name than current
-
-		// Replace relative /viewimage to absolute path
-		$msg = preg_replace('/src="'.preg_quote(DOL_URL_ROOT,'/').'\/viewimage\.php/ims', 'src="'.$urlwithroot.'/viewimage.php', $msg, -1, $nbrep);
-
-		if (! empty($conf->global->MAIN_MAIL_FORCE_CONTENT_TYPE_TO_HTML)) $this->msgishtml=1; // To force to send everything with content type html.
-
-		// Detect images
-		if ($this->msgishtml)
-		{
-			$this->html = $msg;
-
-			if (! empty($conf->global->MAIN_MAIL_ADD_INLINE_IMAGES_IF_IN_MEDIAS))
-			{
-				$findimg = $this->findHtmlImages($dolibarr_main_data_root.'/medias');
-			}
-
-			// Define if there is at least one file
-			if ($findimg)
-			{
-				foreach ($this->html_images as $i => $val)
-				{
-					if ($this->html_images[$i])
-					{
-						$this->atleastoneimage=1;
-						dol_syslog("CMailFile::CMailfile: html_images[$i]['name']=".$this->html_images[$i]['name'], LOG_DEBUG);
-					}
-				}
-			}
-		}
-
-		// Define if there is at least one file
-		if (is_array($filename_list))
-		{
-			foreach ($filename_list as $i => $val)
-			{
-				if ($filename_list[$i])
-				{
-					$this->atleastonefile=1;
-					dol_syslog("CMailFile::CMailfile: filename_list[$i]=".$filename_list[$i].", mimetype_list[$i]=".$mimetype_list[$i]." mimefilename_list[$i]=".$mimefilename_list[$i], LOG_DEBUG);
-				}
-			}
-		}
-
-		// Add autocopy to (Note: Adding bcc for specific modules are also done from pages)
-		if (! empty($conf->global->MAIN_MAIL_AUTOCOPY_TO)) $addr_bcc.=($addr_bcc?', ':'').$conf->global->MAIN_MAIL_AUTOCOPY_TO;
-
-		// Action according to choosed sending method
-		if ($this->sendmode == 'mail')
-		{
-			// Use mail php function (default PHP method)
-			// ------------------------------------------
-
-			$smtp_headers = "";
-			$mime_headers = "";
-			$text_body = "";
-			$files_encoded = "";
-
-			// Define smtp_headers
-			$this->subject = $subject;
-			$this->addr_from = $from;
-			$this->reply_to = $replyto;
-			$this->errors_to = $errors_to;
-			$this->addr_to = $to;
-			$this->addr_cc = $addr_cc;
-			$this->addr_bcc = $addr_bcc;
-			$this->deliveryreceipt = $deliveryreceipt;
-			$this->trackid = $trackid;
-
-			$smtp_headers = $this->write_smtpheaders();
-			if (! empty($moreinheader)) $smtp_headers.=$moreinheader;   // $moreinheader contains the \r\n
-
-			// Define mime_headers
-			$mime_headers = $this->write_mimeheaders($filename_list, $mimefilename_list);
-
-			if (! empty($this->html))
-			{
-				if (!empty($css))
-				{
-					$this->css = $css;
-					$this->buildCSS();    // Build a css style (mode = all) into this->styleCSS and this->bodyCSS
-				}
-
-				$msg = $this->html;
-			}
-
-			// Define body in text_body
-			$text_body = $this->write_body($msg);
-
-			// Add attachments to text_encoded
-			if ($this->atleastonefile)
-			{
-				$files_encoded = $this->write_files($filename_list,$mimetype_list,$mimefilename_list);
-			}
-
-			// We now define $this->headers and $this->message
-			$this->headers = $smtp_headers . $mime_headers;
-			// On nettoie le header pour qu'il ne se termine pas par un retour chariot.
-			// Ceci evite aussi les lignes vides en fin qui peuvent etre interpretees
-			// comme des injections mail par les serveurs de messagerie.
-			$this->headers = preg_replace("/([\r\n]+)$/i","",$this->headers);
-
-			//$this->message = $this->eol.'This is a message with multiple parts in MIME format.'.$this->eol;
-			$this->message = 'This is a message with multiple parts in MIME format.'.$this->eol;
-			$this->message.= $text_body . $files_encoded;
-			$this->message.= "--" . $this->mixed_boundary . "--" . $this->eol;
-		}
-		else if ($this->sendmode == 'smtps')
-		{
-			// Use SMTPS library
-			// ------------------------------------------
-
-			require_once DOL_DOCUMENT_ROOT.'/core/class/smtps.class.php';
-			$smtps = new SMTPs();
-			$smtps->setCharSet($conf->file->character_set_client);
-
-			$smtps->setSubject($this->encodetorfc2822($subject));
-			$smtps->setTO($this->getValidAddress($to,0,1));
-			$smtps->setFrom($this->getValidAddress($from,0,1));
-			$smtps->setTrackId($trackid);
-			$smtps->setReplyTo($this->getValidAddress($replyto,0,1));
-
-			if (! empty($moreinheader)) $smtps->setMoreInHeader($moreinheader);
-
-			if (! empty($this->html))
-			{
-				if (!empty($css))
-				{
-					$this->css = $css;
-					$this->buildCSS();
-				}
-				$msg = $this->html;
-				$msg = $this->checkIfHTML($msg);
-			}
-
-			if ($this->msgishtml) $smtps->setBodyContent($msg,'html');
-			else $smtps->setBodyContent($msg,'plain');
-
-			if ($this->atleastoneimage)
-			{
-				foreach ($this->images_encoded as $img)
-				{
-					$smtps->setImageInline($img['image_encoded'],$img['name'],$img['content_type'],$img['cid']);
-				}
-			}
-
-			if ($this->atleastonefile)
-			{
-				foreach ($filename_list as $i => $val)
-				{
-					$content=file_get_contents($filename_list[$i]);
-					$smtps->setAttachment($content,$mimefilename_list[$i],$mimetype_list[$i]);
-				}
-			}
-
-			$smtps->setCC($addr_cc);
-			$smtps->setBCC($addr_bcc);
-			$smtps->setErrorsTo($errors_to);
-			$smtps->setDeliveryReceipt($deliveryreceipt);
-
-			$this->smtps=$smtps;
-		}
-		else if ($this->sendmode == 'swiftmailer')
-		{
-			// Use Swift Mailer library
-			// ------------------------------------------
+    /**
+     *	CMailFile
+     *
+     *	@param 	string	$subject             Topic/Subject of mail
+     *	@param 	string	$to                  Recipients emails (RFC 2822: "Name firstname <email>[, ...]" or "email[, ...]" or "<email>[, ...]"). Note: the keyword '__SUPERVISOREMAIL__' is not allowed here and must be replaced by caller.
+     *	@param 	string	$from                Sender email      (RFC 2822: "Name firstname <email>[, ...]" or "email[, ...]" or "<email>[, ...]")
+     *	@param 	string	$msg                 Message
+     *	@param 	array	$filename_list       List of files to attach (full path of filename on file system)
+     *	@param 	array	$mimetype_list       List of MIME type of attached files
+     *	@param 	array	$mimefilename_list   List of attached file name in message
+     *	@param 	string	$addr_cc             Email cc
+     *	@param 	string	$addr_bcc            Email bcc (Note: This is autocompleted with MAIN_MAIL_AUTOCOPY_TO if defined)
+     *	@param 	int		$deliveryreceipt     Ask a delivery receipt
+     *	@param 	int		$msgishtml           1=String IS already html, 0=String IS NOT html, -1=Unknown make autodetection (with fast mode, not reliable)
+     *	@param 	string	$errors_to      	 Email for errors-to
+     *	@param	string	$css                 Css option
+     *	@param	string	$trackid             Tracking string (contains type and id of related element)
+     *  @param  string  $moreinheader        More in header. $moreinheader must contains the "\r\n" (TODO not supported for other MAIL_SEND_MODE different than 'phpmail' and 'smtps' for the moment)
+     *  @param  string  $sendcontext      	 'standard', 'emailing', ... (used to define with sending mode and parameters to use)
+     *  @param	string	$replyto			 Reply-to email (will be set to same value than From by default if not provided)
+     */
+    function __construct($subject, $to, $from, $msg, $filename_list=array(), $mimetype_list=array(), $mimefilename_list=array(), $addr_cc="", $addr_bcc="", $deliveryreceipt=0, $msgishtml=0, $errors_to='', $css='', $trackid='', $moreinheader='', $sendcontext='standard', $replyto='')
+    {
+        global $conf, $dolibarr_main_data_root;
+
+        $this->sendcontext = $sendcontext;
+
+        if (empty($replyto)) $replyto=$from;
+
+        // Define this->sendmode
+        $this->sendmode = '';
+        if ($this->sendcontext == 'emailing' && !empty($conf->global->MAIN_MAIL_SENDMODE_EMAILING) && $conf->global->MAIN_MAIL_SENDMODE_EMAILING != 'default')
+        {
+            $this->sendmode = $conf->global->MAIN_MAIL_SENDMODE_EMAILING;
+        }
+        if (empty($this->sendmode)) $this->sendmode=$conf->global->MAIN_MAIL_SENDMODE;
+        if (empty($this->sendmode)) $this->sendmode='mail';
+
+        // We define end of line (RFC 821).
+        $this->eol="\r\n";
+        // We define end of line for header fields (RFC 822bis section 2.3 says header must contains \r\n).
+        $this->eol2="\r\n";
+        if (! empty($conf->global->MAIN_FIX_FOR_BUGGED_MTA))
+        {
+            $this->eol="\n";
+            $this->eol2="\n";
+            $moreinheader = str_replace("\r\n","\n",$moreinheader);
+        }
+
+        // On defini mixed_boundary
+        $this->mixed_boundary = "multipart_x." . time() . ".x_boundary";
+
+        // On defini related_boundary
+        $this->related_boundary = 'mul_'.dol_hash(uniqid("dolibarr2"), 3);	// Force md5 hash (does not contains special chars)
+
+        // On defini alternative_boundary
+        $this->alternative_boundary = 'mul_'.dol_hash(uniqid("dolibarr3"), 3);	// Force md5 hash (does not contains special chars)
+
+        dol_syslog("CMailFile::CMailfile: sendmode=".$this->sendmode." charset=".$conf->file->character_set_client." from=$from, to=$to, addr_cc=$addr_cc, addr_bcc=$addr_bcc, errors_to=$errors_to, trackid=$trackid sendcontext=$sendcontext", LOG_DEBUG);
+        dol_syslog("CMailFile::CMailfile: subject=".$subject.", deliveryreceipt=".$deliveryreceipt.", msgishtml=".$msgishtml, LOG_DEBUG);
+
+        if (empty($subject))
+        {
+            dol_syslog("CMailFile::CMailfile: Try to send an email with empty subject");
+            $this->error='ErrorSubjectIsRequired';
+            return;
+        }
+        if (empty($msg))
+        {
+            dol_syslog("CMailFile::CMailfile: Try to send an email with empty body");
+            $msg='.';     // Avoid empty message (with empty message conten show a multipart structure)
+        }
+
+        // Detect if message is HTML (use fast method)
+        if ($msgishtml == -1)
+        {
+            $this->msgishtml = 0;
+            if (dol_textishtml($msg)) $this->msgishtml = 1;
+        }
+        else
+        {
+            $this->msgishtml = $msgishtml;
+        }
+
+        global $dolibarr_main_url_root;
+
+        // Define $urlwithroot
+        $urlwithouturlroot=preg_replace('/'.preg_quote(DOL_URL_ROOT,'/').'$/i','',trim($dolibarr_main_url_root));
+        $urlwithroot=$urlwithouturlroot.DOL_URL_ROOT;		// This is to use external domain name found into config file
+        //$urlwithroot=DOL_MAIN_URL_ROOT;					// This is to use same domain name than current
+
+        // Replace relative /viewimage to absolute path
+        $msg = preg_replace('/src="'.preg_quote(DOL_URL_ROOT,'/').'\/viewimage\.php/ims', 'src="'.$urlwithroot.'/viewimage.php', $msg, -1, $nbrep);
+
+        if (! empty($conf->global->MAIN_MAIL_FORCE_CONTENT_TYPE_TO_HTML)) $this->msgishtml=1; // To force to send everything with content type html.
+
+        // Detect images
+        if ($this->msgishtml)
+        {
+            $this->html = $msg;
+
+            if (! empty($conf->global->MAIN_MAIL_ADD_INLINE_IMAGES_IF_IN_MEDIAS))
+            {
+                $findimg = $this->findHtmlImages($dolibarr_main_data_root.'/medias');
+            }
+
+            // Define if there is at least one file
+            if ($findimg)
+            {
+                foreach ($this->html_images as $i => $val)
+                {
+                    if ($this->html_images[$i])
+                    {
+                        $this->atleastoneimage=1;
+                        dol_syslog("CMailFile::CMailfile: html_images[$i]['name']=".$this->html_images[$i]['name'], LOG_DEBUG);
+                    }
+                }
+            }
+        }
+
+        // Define if there is at least one file
+        if (is_array($filename_list))
+        {
+            foreach ($filename_list as $i => $val)
+            {
+                if ($filename_list[$i])
+                {
+                    $this->atleastonefile=1;
+                    dol_syslog("CMailFile::CMailfile: filename_list[$i]=".$filename_list[$i].", mimetype_list[$i]=".$mimetype_list[$i]." mimefilename_list[$i]=".$mimefilename_list[$i], LOG_DEBUG);
+                }
+            }
+        }
+
+        // Add autocopy to (Note: Adding bcc for specific modules are also done from pages)
+        if (! empty($conf->global->MAIN_MAIL_AUTOCOPY_TO)) $addr_bcc.=($addr_bcc?', ':'').$conf->global->MAIN_MAIL_AUTOCOPY_TO;
+
+        // Action according to choosed sending method
+        if ($this->sendmode == 'mail')
+        {
+            // Use mail php function (default PHP method)
+            // ------------------------------------------
+
+            $smtp_headers = "";
+            $mime_headers = "";
+            $text_body = "";
+            $files_encoded = "";
+
+            // Define smtp_headers
+            $this->subject = $subject;
+            $this->addr_from = $from;
+            $this->reply_to = $replyto;
+            $this->errors_to = $errors_to;
+            $this->addr_to = $to;
+            $this->addr_cc = $addr_cc;
+            $this->addr_bcc = $addr_bcc;
+            $this->deliveryreceipt = $deliveryreceipt;
+            $this->trackid = $trackid;
+
+            $smtp_headers = $this->write_smtpheaders();
+            if (! empty($moreinheader)) $smtp_headers.=$moreinheader;   // $moreinheader contains the \r\n
+
+            // Define mime_headers
+            $mime_headers = $this->write_mimeheaders($filename_list, $mimefilename_list);
+
+            if (! empty($this->html))
+            {
+                if (!empty($css))
+                {
+                    $this->css = $css;
+                    $this->buildCSS();    // Build a css style (mode = all) into this->styleCSS and this->bodyCSS
+                }
+
+                $msg = $this->html;
+            }
+
+            // Define body in text_body
+            $text_body = $this->write_body($msg);
+
+            // Add attachments to text_encoded
+            if ($this->atleastonefile)
+            {
+                $files_encoded = $this->write_files($filename_list,$mimetype_list,$mimefilename_list);
+            }
+
+            // We now define $this->headers and $this->message
+            $this->headers = $smtp_headers . $mime_headers;
+            // On nettoie le header pour qu'il ne se termine pas par un retour chariot.
+            // Ceci evite aussi les lignes vides en fin qui peuvent etre interpretees
+            // comme des injections mail par les serveurs de messagerie.
+            $this->headers = preg_replace("/([\r\n]+)$/i","",$this->headers);
+
+            //$this->message = $this->eol.'This is a message with multiple parts in MIME format.'.$this->eol;
+            $this->message = 'This is a message with multiple parts in MIME format.'.$this->eol;
+            $this->message.= $text_body . $files_encoded;
+            $this->message.= "--" . $this->mixed_boundary . "--" . $this->eol;
+        }
+        else if ($this->sendmode == 'smtps')
+        {
+            // Use SMTPS library
+            // ------------------------------------------
+
+            require_once DOL_DOCUMENT_ROOT.'/core/class/smtps.class.php';
+            $smtps = new SMTPs();
+            $smtps->setCharSet($conf->file->character_set_client);
+
+            $smtps->setSubject($this->encodetorfc2822($subject));
+            $smtps->setTO($this->getValidAddress($to,0,1));
+            $smtps->setFrom($this->getValidAddress($from,0,1));
+            $smtps->setTrackId($trackid);
+            $smtps->setReplyTo($this->getValidAddress($replyto,0,1));
+
+            if (! empty($moreinheader)) $smtps->setMoreInHeader($moreinheader);
+
+            if (! empty($this->html))
+            {
+                if (!empty($css))
+                {
+                    $this->css = $css;
+                    $this->buildCSS();
+                }
+                $msg = $this->html;
+                $msg = $this->checkIfHTML($msg);
+            }
+
+            if ($this->msgishtml) $smtps->setBodyContent($msg,'html');
+            else $smtps->setBodyContent($msg,'plain');
+
+            if ($this->atleastoneimage)
+            {
+                foreach ($this->images_encoded as $img)
+                {
+                    $smtps->setImageInline($img['image_encoded'],$img['name'],$img['content_type'],$img['cid']);
+                }
+            }
+
+            if ($this->atleastonefile)
+            {
+                foreach ($filename_list as $i => $val)
+                {
+                    $content=file_get_contents($filename_list[$i]);
+                    $smtps->setAttachment($content,$mimefilename_list[$i],$mimetype_list[$i]);
+                }
+            }
+
+            $smtps->setCC($addr_cc);
+            $smtps->setBCC($addr_bcc);
+            $smtps->setErrorsTo($errors_to);
+            $smtps->setDeliveryReceipt($deliveryreceipt);
+
+            $this->smtps=$smtps;
+        }
+        else if ($this->sendmode == 'swiftmailer')
+        {
+            // Use Swift Mailer library
+            // ------------------------------------------
 
             $host = dol_getprefix('email');
 
@@ -361,419 +361,419 @@ 
             require_once DOL_DOCUMENT_ROOT.'/includes/swiftmailer/egulias/email-validator/EmailValidator/Exception/InvalidEmail.php';
             require_once DOL_DOCUMENT_ROOT.'/includes/swiftmailer/egulias/email-validator/EmailValidator/Exception/NoDomainPart.php';
             require_once DOL_DOCUMENT_ROOT.'/includes/swiftmailer/egulias/email-validator/EmailValidator/EmailParser.php';
-			require_once DOL_DOCUMENT_ROOT.'/includes/swiftmailer/egulias/email-validator/EmailValidator/EmailLexer.php';
-			require_once DOL_DOCUMENT_ROOT.'/includes/swiftmailer/egulias/email-validator/EmailValidator/EmailValidator.php';
-			require_once DOL_DOCUMENT_ROOT.'/includes/swiftmailer/egulias/email-validator/EmailValidator/Warning/Warning.php';
-			require_once DOL_DOCUMENT_ROOT.'/includes/swiftmailer/egulias/email-validator/EmailValidator/Warning/LocalTooLong.php';
-			require_once DOL_DOCUMENT_ROOT.'/includes/swiftmailer/egulias/email-validator/EmailValidator/Parser/Parser.php';
-			require_once DOL_DOCUMENT_ROOT.'/includes/swiftmailer/egulias/email-validator/EmailValidator/Parser/DomainPart.php';
-			require_once DOL_DOCUMENT_ROOT.'/includes/swiftmailer/egulias/email-validator/EmailValidator/Parser/LocalPart.php';
-			require_once DOL_DOCUMENT_ROOT.'/includes/swiftmailer/egulias/email-validator/EmailValidator/Validation/EmailValidation.php';
-			require_once DOL_DOCUMENT_ROOT.'/includes/swiftmailer/egulias/email-validator/EmailValidator/Validation/RFCValidation.php';
+            require_once DOL_DOCUMENT_ROOT.'/includes/swiftmailer/egulias/email-validator/EmailValidator/EmailLexer.php';
+            require_once DOL_DOCUMENT_ROOT.'/includes/swiftmailer/egulias/email-validator/EmailValidator/EmailValidator.php';
+            require_once DOL_DOCUMENT_ROOT.'/includes/swiftmailer/egulias/email-validator/EmailValidator/Warning/Warning.php';
+            require_once DOL_DOCUMENT_ROOT.'/includes/swiftmailer/egulias/email-validator/EmailValidator/Warning/LocalTooLong.php';
+            require_once DOL_DOCUMENT_ROOT.'/includes/swiftmailer/egulias/email-validator/EmailValidator/Parser/Parser.php';
+            require_once DOL_DOCUMENT_ROOT.'/includes/swiftmailer/egulias/email-validator/EmailValidator/Parser/DomainPart.php';
+            require_once DOL_DOCUMENT_ROOT.'/includes/swiftmailer/egulias/email-validator/EmailValidator/Parser/LocalPart.php';
+            require_once DOL_DOCUMENT_ROOT.'/includes/swiftmailer/egulias/email-validator/EmailValidator/Validation/EmailValidation.php';
+            require_once DOL_DOCUMENT_ROOT.'/includes/swiftmailer/egulias/email-validator/EmailValidator/Validation/RFCValidation.php';
 
             require_once DOL_DOCUMENT_ROOT.'/includes/swiftmailer/lib/classes/Swift/InputByteStream.php';
-			require_once DOL_DOCUMENT_ROOT.'/includes/swiftmailer/lib/classes/Swift/Signer.php';
-			require_once DOL_DOCUMENT_ROOT.'/includes/swiftmailer/lib/classes/Swift/Signers/HeaderSigner.php';
-			require_once DOL_DOCUMENT_ROOT.'/includes/swiftmailer/lib/classes/Swift/Signers/DKIMSigner.php';
-			//require_once DOL_DOCUMENT_ROOT.'/includes/swiftmailer/lib/classes/Swift/SignedMessage.php';
-			require_once DOL_DOCUMENT_ROOT.'/includes/swiftmailer/lib/swift_required.php';
-			// Create the message
-			//$this->message = Swift_Message::newInstance();
-			$this->message = new Swift_Message();
+            require_once DOL_DOCUMENT_ROOT.'/includes/swiftmailer/lib/classes/Swift/Signer.php';
+            require_once DOL_DOCUMENT_ROOT.'/includes/swiftmailer/lib/classes/Swift/Signers/HeaderSigner.php';
+            require_once DOL_DOCUMENT_ROOT.'/includes/swiftmailer/lib/classes/Swift/Signers/DKIMSigner.php';
+            //require_once DOL_DOCUMENT_ROOT.'/includes/swiftmailer/lib/classes/Swift/SignedMessage.php';
+            require_once DOL_DOCUMENT_ROOT.'/includes/swiftmailer/lib/swift_required.php';
+            // Create the message
+            //$this->message = Swift_Message::newInstance();
+            $this->message = new Swift_Message();
             //$this->message = new Swift_SignedMessage();
             // Adding a trackid header to a message
-			$headers = $this->message->getHeaders();
-			$headers->addTextHeader('X-Dolibarr-TRACKID', $trackid . '@' . $host);
-			$headerID = time() . '.swiftmailer-dolibarr-' . $trackid . '@' . $host;
-			$msgid = $headers->get('Message-ID');
-			$msgid->setId($headerID);
-			$headers->addIdHeader('References', $headerID);
-			// TODO if (! empty($moreinheader)) ...
-
-			// Give the message a subject
-			try {
-				$result = $this->message->setSubject($subject);
-			} catch (Exception $e) {
-				$this->errors[] =  $e->getMessage();
-			}
-
-			// Set the From address with an associative array
-			//$this->message->setFrom(array('john@doe.com' => 'John Doe'));
-			if (! empty($from)) {
+            $headers = $this->message->getHeaders();
+            $headers->addTextHeader('X-Dolibarr-TRACKID', $trackid . '@' . $host);
+            $headerID = time() . '.swiftmailer-dolibarr-' . $trackid . '@' . $host;
+            $msgid = $headers->get('Message-ID');
+            $msgid->setId($headerID);
+            $headers->addIdHeader('References', $headerID);
+            // TODO if (! empty($moreinheader)) ...
+
+            // Give the message a subject
+            try {
+                $result = $this->message->setSubject($subject);
+            } catch (Exception $e) {
+                $this->errors[] =  $e->getMessage();
+            }
+
+            // Set the From address with an associative array
+            //$this->message->setFrom(array('john@doe.com' => 'John Doe'));
+            if (! empty($from)) {
                 try {
-                	$result = $this->message->setFrom($this->getArrayAddress($from));
+                    $result = $this->message->setFrom($this->getArrayAddress($from));
                 } catch (Exception $e) {
                     $this->errors[] = $e->getMessage();
                 }
             }
 
-			// Set the To addresses with an associative array
-			if (! empty($to)) {
+            // Set the To addresses with an associative array
+            if (! empty($to)) {
                 try {
-                	$result = $this->message->setTo($this->getArrayAddress($to));
+                    $result = $this->message->setTo($this->getArrayAddress($to));
                 } catch (Exception $e) {
                     $this->errors[] = $e->getMessage();
                 }
             }
 
-			if (! empty($replyto)) {
+            if (! empty($replyto)) {
                 try {
-                	$result = $this->message->SetReplyTo($this->getArrayAddress($replyto));
+                    $result = $this->message->SetReplyTo($this->getArrayAddress($replyto));
                 } catch (Exception $e) {
                     $this->errors[] = $e->getMessage();
                 }
             }
 
-			try {
-				$result = $this->message->setCharSet($conf->file->character_set_client);
-			} catch (Exception $e) {
-				$this->errors[] =  $e->getMessage();
-			}
-
-			if (! empty($this->html))
-			{
-				if (!empty($css))
-				{
-					$this->css = $css;
-					$this->buildCSS();
-				}
-				$msg = $this->html;
-				$msg = $this->checkIfHTML($msg);
-			}
-
-			if ($this->atleastoneimage)
-			{
-				foreach ($this->images_encoded as $img)
-				{
-					//$img['fullpath'],$img['image_encoded'],$img['name'],$img['content_type'],$img['cid']
-					$attachment = Swift_Image::fromPath($img['fullpath'], $img['content_type']);
-					// embed image
-					$imgcid = $this->message->embed($attachment);
-					// replace cid by the one created by swiftmail in html message
-					$msg = str_replace("cid:".$img['cid'], $imgcid, $msg);
-				}
-			}
-
-			if ($this->msgishtml) {
-				$this->message->setBody($msg,'text/html');
-				// And optionally an alternative body
-				$this->message->addPart(html_entity_decode(strip_tags($msg)), 'text/plain');
-			} else {
-				$this->message->setBody($msg,'text/plain');
-				// And optionally an alternative body
-				$this->message->addPart($msg, 'text/html');
-			}
-
-			if ($this->atleastonefile)
-			{
-				foreach ($filename_list as $i => $val)
-				{
-					//$this->message->attach(Swift_Attachment::fromPath($filename_list[$i],$mimetype_list[$i]));
-					$attachment = Swift_Attachment::fromPath($filename_list[$i],$mimetype_list[$i]);
-					$this->message->attach($attachment);
-				}
-			}
-
-			if (! empty($addr_cc)) $this->message->setCc($this->getArrayAddress($addr_cc));
-			if (! empty($addr_bcc)) $this->message->setBcc($this->getArrayAddress($addr_bcc));
-			//if (! empty($errors_to)) $this->message->setErrorsTo($this->getArrayAddress($errors_to);
-			if (isset($deliveryreceipt) && $deliveryreceipt == 1) $this->message->setReadReceiptTo($this->getArrayAddress($from));
-		}
-		else
-		{
-			// Send mail method not correctly defined
-			// --------------------------------------
-			$this->error = 'Bad value for sendmode';
-		}
-	}
-
-
-	/**
-	 * Send mail that was prepared by constructor.
-	 *
-	 * @return    boolean     True if mail sent, false otherwise
-	 */
-	function sendfile()
-	{
-		global $conf,$db,$langs;
-
-		$errorlevel=error_reporting();
-		//error_reporting($errorlevel ^ E_WARNING);   // Desactive warnings
-
-		$res=false;
-
-		if (empty($conf->global->MAIN_DISABLE_ALL_MAILS) || !empty($conf->global->MAIN_MAIL_FORCE_SENDTO))
-		{
-			require_once DOL_DOCUMENT_ROOT . '/core/class/hookmanager.class.php';
-			$hookmanager = new HookManager($db);
-			$hookmanager->initHooks(array('mail'));
-
-			$parameters=array(); $action='';
-			$reshook = $hookmanager->executeHooks('sendMail', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
-			if ($reshook < 0)
-			{
-				$this->error = "Error in hook maildao sendMail " . $reshook;
-				dol_syslog("CMailFile::sendfile: mail end error=" . $this->error, LOG_ERR);
-
-				return $reshook;
-			}
-			if ($reshook == 1)	// Hook replace standard code
-			{
-				return true;
-			}
-
-			// Check number of recipient is lower or equal than MAIL_MAX_NB_OF_RECIPIENTS_IN_SAME_EMAIL
-			if (empty($conf->global->MAIL_MAX_NB_OF_RECIPIENTS_TO_IN_SAME_EMAIL)) $conf->global->MAIL_MAX_NB_OF_RECIPIENTS_TO_IN_SAME_EMAIL=10;
-			$tmparray1 = explode(',', $this->addr_to);
-			if (count($tmparray1) > $conf->global->MAIL_MAX_NB_OF_RECIPIENTS_TO_IN_SAME_EMAIL)
-			{
-				$this->error = 'Too much recipients in to:';
-				dol_syslog("CMailFile::sendfile: mail end error=" . $this->error, LOG_WARNING);
-				return false;
-			}
-			if (empty($conf->global->MAIL_MAX_NB_OF_RECIPIENTS_CC_IN_SAME_EMAIL)) $conf->global->MAIL_MAX_NB_OF_RECIPIENTS_CC_IN_SAME_EMAIL=10;
-			$tmparray2 = explode(',', $this->addr_cc);
-			if (count($tmparray2) > $conf->global->MAIL_MAX_NB_OF_RECIPIENTS_CC_IN_SAME_EMAIL)
-			{
-				$this->error = 'Too much recipients in cc:';
-				dol_syslog("CMailFile::sendfile: mail end error=" . $this->error, LOG_WARNING);
-				return false;
-			}
-			if (empty($conf->global->MAIL_MAX_NB_OF_RECIPIENTS_BCC_IN_SAME_EMAIL)) $conf->global->MAIL_MAX_NB_OF_RECIPIENTS_BCC_IN_SAME_EMAIL=10;
-			$tmparray3 = explode(',', $this->addr_bcc);
-			if (count($tmparray3) > $conf->global->MAIL_MAX_NB_OF_RECIPIENTS_BCC_IN_SAME_EMAIL)
-			{
-				$this->error = 'Too much recipients in bcc:';
-				dol_syslog("CMailFile::sendfile: mail end error=" . $this->error, LOG_WARNING);
-				return false;
-			}
-			if (empty($conf->global->MAIL_MAX_NB_OF_RECIPIENTS_IN_SAME_EMAIL)) $conf->global->MAIL_MAX_NB_OF_RECIPIENTS_IN_SAME_EMAIL=10;
-			if ((count($tmparray1)+count($tmparray2)+count($tmparray3)) > $conf->global->MAIL_MAX_NB_OF_RECIPIENTS_IN_SAME_EMAIL)
-			{
-				$this->error = 'Too much recipients in to:, cc:, bcc:';
-				dol_syslog("CMailFile::sendfile: mail end error=" . $this->error, LOG_WARNING);
-				return false;
-			}
-
-			$keyforsmtpserver='MAIN_MAIL_SMTP_SERVER';
-			$keyforsmtpport  ='MAIN_MAIL_SMTP_PORT';
-			$keyforsmtpid    ='MAIN_MAIL_SMTPS_ID';
-			$keyforsmtppw    ='MAIN_MAIL_SMTPS_PW';
-			$keyfortls       ='MAIN_MAIL_EMAIL_TLS';
-			$keyforstarttls  ='MAIN_MAIL_EMAIL_STARTTLS';
-			if ($this->sendcontext == 'emailing' && !empty($conf->global->MAIN_MAIL_SENDMODE_EMAILING) && $conf->global->MAIN_MAIL_SENDMODE_EMAILING != 'default')
-			{
-				$keyforsmtpserver='MAIN_MAIL_SMTP_SERVER_EMAILING';
-				$keyforsmtpport  ='MAIN_MAIL_SMTP_PORT_EMAILING';
-				$keyforsmtpid    ='MAIN_MAIL_SMTPS_ID_EMAILING';
-				$keyforsmtppw    ='MAIN_MAIL_SMTPS_PW_EMAILING';
-				$keyfortls       ='MAIN_MAIL_EMAIL_TLS_EMAILING';
-				$keyforstarttls  ='MAIN_MAIL_EMAIL_STARTTLS_EMAILING';
-			}
-
-			if (!empty($conf->global->MAIN_MAIL_FORCE_SENDTO))
-			{
-				$this->addr_to = $conf->global->MAIN_MAIL_FORCE_SENDTO;
-				$this->addr_cc = '';
-				$this->addr_bcc = '';
-			}
-
-			// Action according to choosed sending method
-			if ($this->sendmode == 'mail')
-			{
-				// Use mail php function (default PHP method)
-				// ------------------------------------------
-				dol_syslog("CMailFile::sendfile addr_to=".$this->addr_to.", subject=".$this->subject, LOG_DEBUG);
-				dol_syslog("CMailFile::sendfile header=\n".$this->headers, LOG_DEBUG);
-				//dol_syslog("CMailFile::sendfile message=\n".$message);
-
-				// If Windows, sendmail_from must be defined
-				if (isset($_SERVER["WINDIR"]))
-				{
-					if (empty($this->addr_from)) $this->addr_from = 'robot@example.com';
-					@ini_set('sendmail_from',$this->getValidAddress($this->addr_from,2));
-				}
-
-				// Force parameters
-				if (! empty($conf->global->$keyforsmtpserver)) ini_set('SMTP',$conf->global->$keyforsmtpserver);
-				if (! empty($conf->global->$keyforsmtpport))   ini_set('smtp_port',$conf->global->$keyforsmtpport);
-
-				$res=true;
-				if ($res && ! $this->subject)
-				{
-					$this->error="Failed to send mail with php mail to HOST=".ini_get('SMTP').", PORT=".ini_get('smtp_port')."<br>Subject is empty";
-					dol_syslog("CMailFile::sendfile: mail end error=".$this->error, LOG_ERR);
-					$res=false;
-				}
-				$dest=$this->getValidAddress($this->addr_to,2);
-				if ($res && ! $dest)
-				{
-					$this->error="Failed to send mail with php mail to HOST=".ini_get('SMTP').", PORT=".ini_get('smtp_port')."<br>Recipient address '$dest' invalid";
-					dol_syslog("CMailFile::sendfile: mail end error=".$this->error, LOG_ERR);
-					$res=false;
-				}
-
-				if ($res)
-				{
-					$additionnalparam = '';	// By default
-					if (! empty($conf->global->MAIN_MAIL_ALLOW_SENDMAIL_F))
-					{
-						// le "Return-Path" (retour des messages bounced) dans les header ne fonctionne pas avec tous les MTA
-						// Le forcage de la valeur grace à l'option -f de sendmail est donc possible si la constante MAIN_MAIL_ALLOW_SENDMAIL_F est definie.
-						// Having this variable defined may create problems with some sendmail (option -f refused)
-						// Having this variable not defined may create problems with some other sendmail (option -f required)
-						$additionnalparam .= ($additionnalparam?' ':'').(! empty($conf->global->MAIN_MAIL_ERRORS_TO) ? '-f' . $this->getValidAddress($conf->global->MAIN_MAIL_ERRORS_TO,2) : ($this->addr_from != '' ? '-f' . $this->getValidAddress($this->addr_from,2) : '') );
-					}
-					if (! empty($conf->global->MAIN_MAIL_SENDMAIL_FORCE_BA))    // To force usage of -ba option. This option tells sendmail to read From: or Sender: to setup sender
-					{
-						$additionnalparam .= ($additionnalparam?' ':'').'-ba';
-					}
-
-					if (! empty($conf->global->MAIN_MAIL_SENDMAIL_FORCE_ADDPARAM)) $additionnalparam .= ($additionnalparam?' ':'').'-U '.$additionnalparam; // Use -U to add additionnal params
-
-					dol_syslog("CMailFile::sendfile: mail start HOST=".ini_get('SMTP').", PORT=".ini_get('smtp_port').", additionnal_parameters=".$additionnalparam, LOG_DEBUG);
-
-					$this->message=stripslashes($this->message);
-
-					if (! empty($conf->global->MAIN_MAIL_DEBUG)) $this->dump_mail();
-
-					if (! empty($additionnalparam)) $res = mail($dest, $this->encodetorfc2822($this->subject), $this->message, $this->headers, $additionnalparam);
-					else $res = mail($dest, $this->encodetorfc2822($this->subject), $this->message, $this->headers);
-
-					if (! $res)
-					{
-						$langs->load("errors");
-						$this->error="Failed to send mail with php mail";
-						$linuxlike=1;
-						if (preg_match('/^win/i',PHP_OS)) $linuxlike=0;
-						if (preg_match('/^mac/i',PHP_OS)) $linuxlike=0;
-						if (! $linuxlike)
-						{
-							$this->error.=" to HOST=".ini_get('SMTP').", PORT=".ini_get('smtp_port');	// This values are value used only for non linuxlike systems
-						}
-						$this->error.=".<br>";
-						$this->error.=$langs->trans("ErrorPhpMailDelivery");
-						dol_syslog("CMailFile::sendfile: mail end error=".$this->error, LOG_ERR);
-					}
-					else
-					{
-						dol_syslog("CMailFile::sendfile: mail end success", LOG_DEBUG);
-					}
-				}
-
-				if (isset($_SERVER["WINDIR"]))
-				{
-					@ini_restore('sendmail_from');
-				}
-
-				// Restore parameters
-				if (! empty($conf->global->$keyforsmtpserver))	ini_restore('SMTP');
-				if (! empty($conf->global->$keyforsmtpport)) 	ini_restore('smtp_port');
-			}
-			else if ($this->sendmode == 'smtps')
-			{
-				if (! is_object($this->smtps))
-				{
-					$this->error="Failed to send mail with smtps lib to HOST=".$server.", PORT=".$conf->global->$keyforsmtpport."<br>Constructor of object CMailFile was not initialized without errors.";
-					dol_syslog("CMailFile::sendfile: mail end error=".$this->error, LOG_ERR);
-					return false;
-				}
-
-				// Use SMTPS library
-				// ------------------------------------------
-				$this->smtps->setTransportType(0);	// Only this method is coded in SMTPs library
-
-				// Clean parameters
-				if (empty($conf->global->$keyforsmtpserver)) $conf->global->$keyforsmtpserver=ini_get('SMTP');
-				if (empty($conf->global->$keyforsmtpport))   $conf->global->$keyforsmtpport=ini_get('smtp_port');
-
-				// If we use SSL/TLS
-				$server=$conf->global->$keyforsmtpserver;
-				$secure='';
-				if (! empty($conf->global->$keyfortls) && function_exists('openssl_open')) $secure='ssl';
-				if (! empty($conf->global->$keyforstarttls) && function_exists('openssl_open')) $secure='tls';
-				$server=($secure?$secure.'://':'').$server;
-
-				$port=$conf->global->$keyforsmtpport;
-
-				$this->smtps->setHost($server);
-				$this->smtps->setPort($port); // 25, 465...;
-
-				$loginid=''; $loginpass='';
-				if (! empty($conf->global->$keyforsmtpid))
-				{
-					$loginid = $conf->global->$keyforsmtpid;
-					$this->smtps->setID($loginid);
-				}
-				if (! empty($conf->global->$keyforsmtppw))
-				{
-					$loginpass = $conf->global->$keyforsmtppw;
-					$this->smtps->setPW($loginpass);
-				}
-
-				$res=true;
-				$from=$this->smtps->getFrom('org');
-				if ($res && ! $from)
-				{
-					$this->error="Failed to send mail with smtps lib to HOST=".$server.", PORT=".$conf->global->$keyforsmtpport."<br>Sender address '$from' invalid";
-					dol_syslog("CMailFile::sendfile: mail end error=".$this->error, LOG_ERR);
-					$res=false;
-				}
-				$dest=$this->smtps->getTo();
-				if ($res && ! $dest)
-				{
-					$this->error="Failed to send mail with smtps lib to HOST=".$server.", PORT=".$conf->global->$keyforsmtpport."<br>Recipient address '$dest' invalid";
-					dol_syslog("CMailFile::sendfile: mail end error=".$this->error, LOG_ERR);
-					$res=false;
-				}
-
-				if ($res)
-				{
-					if (! empty($conf->global->MAIN_MAIL_DEBUG)) $this->smtps->setDebug(true);
-
-					$result=$this->smtps->sendMsg();
-					//print $result;
-
-					if (! empty($conf->global->MAIN_MAIL_DEBUG)) $this->dump_mail();
-
-					$result=$this->smtps->getErrors();
-					if (empty($this->error) && empty($result))
-					{
-						dol_syslog("CMailFile::sendfile: mail end success", LOG_DEBUG);
-						$res=true;
-					}
-					else
-					{
-						if (empty($this->error)) $this->error=$result;
-						dol_syslog("CMailFile::sendfile: mail end error=".$this->error, LOG_ERR);
-						$res=false;
-					}
-				}
-			}
-			else if ($this->sendmode == 'swiftmailer')
-			{
-				// Use Swift Mailer library
-				// ------------------------------------------
-				require_once DOL_DOCUMENT_ROOT.'/includes/swiftmailer/lib/swift_required.php';
-
-				// Clean parameters
-				if (empty($conf->global->$keyforsmtpserver)) $conf->global->$keyforsmtpserver=ini_get('SMTP');
-				if (empty($conf->global->$keyforsmtpport))   $conf->global->$keyforsmtpport=ini_get('smtp_port');
-
-				// If we use SSL/TLS
-				$server = $conf->global->$keyforsmtpserver;
-				$secure = '';
-				if (! empty($conf->global->$keyfortls) && function_exists('openssl_open')) $secure='ssl';
-				if (! empty($conf->global->$keyforstarttls) && function_exists('openssl_open')) $secure='tls';
-
-				$this->transport = new Swift_SmtpTransport($server, $conf->global->$keyforsmtpport, $secure);
-
-				if (! empty($conf->global->$keyforsmtpid)) $this->transport->setUsername($conf->global->$keyforsmtpid);
-				if (! empty($conf->global->$keyforsmtppw)) $this->transport->setPassword($conf->global->$keyforsmtppw);
-				//$smtps->_msgReplyTo  = 'reply@web.com';
-
-				// Create the Mailer using your created Transport
-				$this->mailer = new Swift_Mailer($this->transport);
+            try {
+                $result = $this->message->setCharSet($conf->file->character_set_client);
+            } catch (Exception $e) {
+                $this->errors[] =  $e->getMessage();
+            }
+
+            if (! empty($this->html))
+            {
+                if (!empty($css))
+                {
+                    $this->css = $css;
+                    $this->buildCSS();
+                }
+                $msg = $this->html;
+                $msg = $this->checkIfHTML($msg);
+            }
+
+            if ($this->atleastoneimage)
+            {
+                foreach ($this->images_encoded as $img)
+                {
+                    //$img['fullpath'],$img['image_encoded'],$img['name'],$img['content_type'],$img['cid']
+                    $attachment = Swift_Image::fromPath($img['fullpath'], $img['content_type']);
+                    // embed image
+                    $imgcid = $this->message->embed($attachment);
+                    // replace cid by the one created by swiftmail in html message
+                    $msg = str_replace("cid:".$img['cid'], $imgcid, $msg);
+                }
+            }
+
+            if ($this->msgishtml) {
+                $this->message->setBody($msg,'text/html');
+                // And optionally an alternative body
+                $this->message->addPart(html_entity_decode(strip_tags($msg)), 'text/plain');
+            } else {
+                $this->message->setBody($msg,'text/plain');
+                // And optionally an alternative body
+                $this->message->addPart($msg, 'text/html');
+            }
+
+            if ($this->atleastonefile)
+            {
+                foreach ($filename_list as $i => $val)
+                {
+                    //$this->message->attach(Swift_Attachment::fromPath($filename_list[$i],$mimetype_list[$i]));
+                    $attachment = Swift_Attachment::fromPath($filename_list[$i],$mimetype_list[$i]);
+                    $this->message->attach($attachment);
+                }
+            }
+
+            if (! empty($addr_cc)) $this->message->setCc($this->getArrayAddress($addr_cc));
+            if (! empty($addr_bcc)) $this->message->setBcc($this->getArrayAddress($addr_bcc));
+            //if (! empty($errors_to)) $this->message->setErrorsTo($this->getArrayAddress($errors_to);
+            if (isset($deliveryreceipt) && $deliveryreceipt == 1) $this->message->setReadReceiptTo($this->getArrayAddress($from));
+        }
+        else
+        {
+            // Send mail method not correctly defined
+            // --------------------------------------
+            $this->error = 'Bad value for sendmode';
+        }
+    }
+
+
+    /**
+     * Send mail that was prepared by constructor.
+     *
+     * @return    boolean     True if mail sent, false otherwise
+     */
+    function sendfile()
+    {
+        global $conf,$db,$langs;
+
+        $errorlevel=error_reporting();
+        //error_reporting($errorlevel ^ E_WARNING);   // Desactive warnings
+
+        $res=false;
+
+        if (empty($conf->global->MAIN_DISABLE_ALL_MAILS) || !empty($conf->global->MAIN_MAIL_FORCE_SENDTO))
+        {
+            require_once DOL_DOCUMENT_ROOT . '/core/class/hookmanager.class.php';
+            $hookmanager = new HookManager($db);
+            $hookmanager->initHooks(array('mail'));
+
+            $parameters=array(); $action='';
+            $reshook = $hookmanager->executeHooks('sendMail', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
+            if ($reshook < 0)
+            {
+                $this->error = "Error in hook maildao sendMail " . $reshook;
+                dol_syslog("CMailFile::sendfile: mail end error=" . $this->error, LOG_ERR);
+
+                return $reshook;
+            }
+            if ($reshook == 1)	// Hook replace standard code
+            {
+                return true;
+            }
+
+            // Check number of recipient is lower or equal than MAIL_MAX_NB_OF_RECIPIENTS_IN_SAME_EMAIL
+            if (empty($conf->global->MAIL_MAX_NB_OF_RECIPIENTS_TO_IN_SAME_EMAIL)) $conf->global->MAIL_MAX_NB_OF_RECIPIENTS_TO_IN_SAME_EMAIL=10;
+            $tmparray1 = explode(',', $this->addr_to);
+            if (count($tmparray1) > $conf->global->MAIL_MAX_NB_OF_RECIPIENTS_TO_IN_SAME_EMAIL)
+            {
+                $this->error = 'Too much recipients in to:';
+                dol_syslog("CMailFile::sendfile: mail end error=" . $this->error, LOG_WARNING);
+                return false;
+            }
+            if (empty($conf->global->MAIL_MAX_NB_OF_RECIPIENTS_CC_IN_SAME_EMAIL)) $conf->global->MAIL_MAX_NB_OF_RECIPIENTS_CC_IN_SAME_EMAIL=10;
+            $tmparray2 = explode(',', $this->addr_cc);
+            if (count($tmparray2) > $conf->global->MAIL_MAX_NB_OF_RECIPIENTS_CC_IN_SAME_EMAIL)
+            {
+                $this->error = 'Too much recipients in cc:';
+                dol_syslog("CMailFile::sendfile: mail end error=" . $this->error, LOG_WARNING);
+                return false;
+            }
+            if (empty($conf->global->MAIL_MAX_NB_OF_RECIPIENTS_BCC_IN_SAME_EMAIL)) $conf->global->MAIL_MAX_NB_OF_RECIPIENTS_BCC_IN_SAME_EMAIL=10;
+            $tmparray3 = explode(',', $this->addr_bcc);
+            if (count($tmparray3) > $conf->global->MAIL_MAX_NB_OF_RECIPIENTS_BCC_IN_SAME_EMAIL)
+            {
+                $this->error = 'Too much recipients in bcc:';
+                dol_syslog("CMailFile::sendfile: mail end error=" . $this->error, LOG_WARNING);
+                return false;
+            }
+            if (empty($conf->global->MAIL_MAX_NB_OF_RECIPIENTS_IN_SAME_EMAIL)) $conf->global->MAIL_MAX_NB_OF_RECIPIENTS_IN_SAME_EMAIL=10;
+            if ((count($tmparray1)+count($tmparray2)+count($tmparray3)) > $conf->global->MAIL_MAX_NB_OF_RECIPIENTS_IN_SAME_EMAIL)
+            {
+                $this->error = 'Too much recipients in to:, cc:, bcc:';
+                dol_syslog("CMailFile::sendfile: mail end error=" . $this->error, LOG_WARNING);
+                return false;
+            }
+
+            $keyforsmtpserver='MAIN_MAIL_SMTP_SERVER';
+            $keyforsmtpport  ='MAIN_MAIL_SMTP_PORT';
+            $keyforsmtpid    ='MAIN_MAIL_SMTPS_ID';
+            $keyforsmtppw    ='MAIN_MAIL_SMTPS_PW';
+            $keyfortls       ='MAIN_MAIL_EMAIL_TLS';
+            $keyforstarttls  ='MAIN_MAIL_EMAIL_STARTTLS';
+            if ($this->sendcontext == 'emailing' && !empty($conf->global->MAIN_MAIL_SENDMODE_EMAILING) && $conf->global->MAIN_MAIL_SENDMODE_EMAILING != 'default')
+            {
+                $keyforsmtpserver='MAIN_MAIL_SMTP_SERVER_EMAILING';
+                $keyforsmtpport  ='MAIN_MAIL_SMTP_PORT_EMAILING';
+                $keyforsmtpid    ='MAIN_MAIL_SMTPS_ID_EMAILING';
+                $keyforsmtppw    ='MAIN_MAIL_SMTPS_PW_EMAILING';
+                $keyfortls       ='MAIN_MAIL_EMAIL_TLS_EMAILING';
+                $keyforstarttls  ='MAIN_MAIL_EMAIL_STARTTLS_EMAILING';
+            }
+
+            if (!empty($conf->global->MAIN_MAIL_FORCE_SENDTO))
+            {
+                $this->addr_to = $conf->global->MAIN_MAIL_FORCE_SENDTO;
+                $this->addr_cc = '';
+                $this->addr_bcc = '';
+            }
+
+            // Action according to choosed sending method
+            if ($this->sendmode == 'mail')
+            {
+                // Use mail php function (default PHP method)
+                // ------------------------------------------
+                dol_syslog("CMailFile::sendfile addr_to=".$this->addr_to.", subject=".$this->subject, LOG_DEBUG);
+                dol_syslog("CMailFile::sendfile header=\n".$this->headers, LOG_DEBUG);
+                //dol_syslog("CMailFile::sendfile message=\n".$message);
+
+                // If Windows, sendmail_from must be defined
+                if (isset($_SERVER["WINDIR"]))
+                {
+                    if (empty($this->addr_from)) $this->addr_from = 'robot@example.com';
+                    @ini_set('sendmail_from',$this->getValidAddress($this->addr_from,2));
+                }
+
+                // Force parameters
+                if (! empty($conf->global->$keyforsmtpserver)) ini_set('SMTP',$conf->global->$keyforsmtpserver);
+                if (! empty($conf->global->$keyforsmtpport))   ini_set('smtp_port',$conf->global->$keyforsmtpport);
+
+                $res=true;
+                if ($res && ! $this->subject)
+                {
+                    $this->error="Failed to send mail with php mail to HOST=".ini_get('SMTP').", PORT=".ini_get('smtp_port')."<br>Subject is empty";
+                    dol_syslog("CMailFile::sendfile: mail end error=".$this->error, LOG_ERR);
+                    $res=false;
+                }
+                $dest=$this->getValidAddress($this->addr_to,2);
+                if ($res && ! $dest)
+                {
+                    $this->error="Failed to send mail with php mail to HOST=".ini_get('SMTP').", PORT=".ini_get('smtp_port')."<br>Recipient address '$dest' invalid";
+                    dol_syslog("CMailFile::sendfile: mail end error=".$this->error, LOG_ERR);
+                    $res=false;
+                }
+
+                if ($res)
+                {
+                    $additionnalparam = '';	// By default
+                    if (! empty($conf->global->MAIN_MAIL_ALLOW_SENDMAIL_F))
+                    {
+                        // le "Return-Path" (retour des messages bounced) dans les header ne fonctionne pas avec tous les MTA
+                        // Le forcage de la valeur grace à l'option -f de sendmail est donc possible si la constante MAIN_MAIL_ALLOW_SENDMAIL_F est definie.
+                        // Having this variable defined may create problems with some sendmail (option -f refused)
+                        // Having this variable not defined may create problems with some other sendmail (option -f required)
+                        $additionnalparam .= ($additionnalparam?' ':'').(! empty($conf->global->MAIN_MAIL_ERRORS_TO) ? '-f' . $this->getValidAddress($conf->global->MAIN_MAIL_ERRORS_TO,2) : ($this->addr_from != '' ? '-f' . $this->getValidAddress($this->addr_from,2) : '') );
+                    }
+                    if (! empty($conf->global->MAIN_MAIL_SENDMAIL_FORCE_BA))    // To force usage of -ba option. This option tells sendmail to read From: or Sender: to setup sender
+                    {
+                        $additionnalparam .= ($additionnalparam?' ':'').'-ba';
+                    }
+
+                    if (! empty($conf->global->MAIN_MAIL_SENDMAIL_FORCE_ADDPARAM)) $additionnalparam .= ($additionnalparam?' ':'').'-U '.$additionnalparam; // Use -U to add additionnal params
+
+                    dol_syslog("CMailFile::sendfile: mail start HOST=".ini_get('SMTP').", PORT=".ini_get('smtp_port').", additionnal_parameters=".$additionnalparam, LOG_DEBUG);
+
+                    $this->message=stripslashes($this->message);
+
+                    if (! empty($conf->global->MAIN_MAIL_DEBUG)) $this->dump_mail();
+
+                    if (! empty($additionnalparam)) $res = mail($dest, $this->encodetorfc2822($this->subject), $this->message, $this->headers, $additionnalparam);
+                    else $res = mail($dest, $this->encodetorfc2822($this->subject), $this->message, $this->headers);
+
+                    if (! $res)
+                    {
+                        $langs->load("errors");
+                        $this->error="Failed to send mail with php mail";
+                        $linuxlike=1;
+                        if (preg_match('/^win/i',PHP_OS)) $linuxlike=0;
+                        if (preg_match('/^mac/i',PHP_OS)) $linuxlike=0;
+                        if (! $linuxlike)
+                        {
+                            $this->error.=" to HOST=".ini_get('SMTP').", PORT=".ini_get('smtp_port');	// This values are value used only for non linuxlike systems
+                        }
+                        $this->error.=".<br>";
+                        $this->error.=$langs->trans("ErrorPhpMailDelivery");
+                        dol_syslog("CMailFile::sendfile: mail end error=".$this->error, LOG_ERR);
+                    }
+                    else
+                    {
+                        dol_syslog("CMailFile::sendfile: mail end success", LOG_DEBUG);
+                    }
+                }
+
+                if (isset($_SERVER["WINDIR"]))
+                {
+                    @ini_restore('sendmail_from');
+                }
+
+                // Restore parameters
+                if (! empty($conf->global->$keyforsmtpserver))	ini_restore('SMTP');
+                if (! empty($conf->global->$keyforsmtpport)) 	ini_restore('smtp_port');
+            }
+            else if ($this->sendmode == 'smtps')
+            {
+                if (! is_object($this->smtps))
+                {
+                    $this->error="Failed to send mail with smtps lib to HOST=".$server.", PORT=".$conf->global->$keyforsmtpport."<br>Constructor of object CMailFile was not initialized without errors.";
+                    dol_syslog("CMailFile::sendfile: mail end error=".$this->error, LOG_ERR);
+                    return false;
+                }
+
+                // Use SMTPS library
+                // ------------------------------------------
+                $this->smtps->setTransportType(0);	// Only this method is coded in SMTPs library
+
+                // Clean parameters
+                if (empty($conf->global->$keyforsmtpserver)) $conf->global->$keyforsmtpserver=ini_get('SMTP');
+                if (empty($conf->global->$keyforsmtpport))   $conf->global->$keyforsmtpport=ini_get('smtp_port');
+
+                // If we use SSL/TLS
+                $server=$conf->global->$keyforsmtpserver;
+                $secure='';
+                if (! empty($conf->global->$keyfortls) && function_exists('openssl_open')) $secure='ssl';
+                if (! empty($conf->global->$keyforstarttls) && function_exists('openssl_open')) $secure='tls';
+                $server=($secure?$secure.'://':'').$server;
+
+                $port=$conf->global->$keyforsmtpport;
+
+                $this->smtps->setHost($server);
+                $this->smtps->setPort($port); // 25, 465...;
+
+                $loginid=''; $loginpass='';
+                if (! empty($conf->global->$keyforsmtpid))
+                {
+                    $loginid = $conf->global->$keyforsmtpid;
+                    $this->smtps->setID($loginid);
+                }
+                if (! empty($conf->global->$keyforsmtppw))
+                {
+                    $loginpass = $conf->global->$keyforsmtppw;
+                    $this->smtps->setPW($loginpass);
+                }
+
+                $res=true;
+                $from=$this->smtps->getFrom('org');
+                if ($res && ! $from)
+                {
+                    $this->error="Failed to send mail with smtps lib to HOST=".$server.", PORT=".$conf->global->$keyforsmtpport."<br>Sender address '$from' invalid";
+                    dol_syslog("CMailFile::sendfile: mail end error=".$this->error, LOG_ERR);
+                    $res=false;
+                }
+                $dest=$this->smtps->getTo();
+                if ($res && ! $dest)
+                {
+                    $this->error="Failed to send mail with smtps lib to HOST=".$server.", PORT=".$conf->global->$keyforsmtpport."<br>Recipient address '$dest' invalid";
+                    dol_syslog("CMailFile::sendfile: mail end error=".$this->error, LOG_ERR);
+                    $res=false;
+                }
+
+                if ($res)
+                {
+                    if (! empty($conf->global->MAIN_MAIL_DEBUG)) $this->smtps->setDebug(true);
+
+                    $result=$this->smtps->sendMsg();
+                    //print $result;
+
+                    if (! empty($conf->global->MAIN_MAIL_DEBUG)) $this->dump_mail();
+
+                    $result=$this->smtps->getErrors();
+                    if (empty($this->error) && empty($result))
+                    {
+                        dol_syslog("CMailFile::sendfile: mail end success", LOG_DEBUG);
+                        $res=true;
+                    }
+                    else
+                    {
+                        if (empty($this->error)) $this->error=$result;
+                        dol_syslog("CMailFile::sendfile: mail end error=".$this->error, LOG_ERR);
+                        $res=false;
+                    }
+                }
+            }
+            else if ($this->sendmode == 'swiftmailer')
+            {
+                // Use Swift Mailer library
+                // ------------------------------------------
+                require_once DOL_DOCUMENT_ROOT.'/includes/swiftmailer/lib/swift_required.php';
+
+                // Clean parameters
+                if (empty($conf->global->$keyforsmtpserver)) $conf->global->$keyforsmtpserver=ini_get('SMTP');
+                if (empty($conf->global->$keyforsmtpport))   $conf->global->$keyforsmtpport=ini_get('smtp_port');
+
+                // If we use SSL/TLS
+                $server = $conf->global->$keyforsmtpserver;
+                $secure = '';
+                if (! empty($conf->global->$keyfortls) && function_exists('openssl_open')) $secure='ssl';
+                if (! empty($conf->global->$keyforstarttls) && function_exists('openssl_open')) $secure='tls';
+
+                $this->transport = new Swift_SmtpTransport($server, $conf->global->$keyforsmtpport, $secure);
+
+                if (! empty($conf->global->$keyforsmtpid)) $this->transport->setUsername($conf->global->$keyforsmtpid);
+                if (! empty($conf->global->$keyforsmtppw)) $this->transport->setPassword($conf->global->$keyforsmtppw);
+                //$smtps->_msgReplyTo  = 'reply@web.com';
+
+                // Create the Mailer using your created Transport
+                $this->mailer = new Swift_Mailer($this->transport);
 
                 // DKIM SIGN
                 if ($conf->global->MAIN_MAIL_EMAIL_DKIM_ENABLED) {
@@ -785,770 +785,770 @@ 
                 }
 
                 if (! empty($conf->global->MAIN_MAIL_DEBUG)) {
-					// To use the ArrayLogger
-					$this->logger = new Swift_Plugins_Loggers_ArrayLogger();
-					// Or to use the Echo Logger
-					//$this->logger = new Swift_Plugins_Loggers_EchoLogger();
-					$this->mailer->registerPlugin(new Swift_Plugins_LoggerPlugin($this->logger));
-				}
-				// send mail
-				try {
-					$result = $this->mailer->send($this->message);
-				} catch (Exception $e) {
-					$this->error =  $e->getMessage();
-				}
-				if (! empty($conf->global->MAIN_MAIL_DEBUG)) $this->dump_mail();
-
-				$res = true;
-				if (! empty($this->error) || ! $result) {
-					dol_syslog("CMailFile::sendfile: mail end error=".$this->error, LOG_ERR);
-					$res=false;
-				}
-				else
-				{
-					dol_syslog("CMailFile::sendfile: mail end success", LOG_DEBUG);
-				}
-			}
-			else
-			{
-				// Send mail method not correctly defined
-				// --------------------------------------
-
-				return 'Bad value for sendmode';
-			}
-
-			$parameters=array(); $action='';
-			$reshook = $hookmanager->executeHooks('sendMailAfter', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
-			if ($reshook < 0)
-			{
-				$this->error = "Error in hook maildao sendMailAfter " . $reshook;
-				dol_syslog("CMailFile::sendfile: mail end error=" . $this->error, LOG_ERR);
-
-				return $reshook;
-			}
-		}
-		else
-		{
-			$this->error='No mail sent. Feature is disabled by option MAIN_DISABLE_ALL_MAILS';
-			dol_syslog("CMailFile::sendfile: ".$this->error, LOG_WARNING);
-		}
-
-		error_reporting($errorlevel);              // Reactive niveau erreur origine
-
-		return $res;
-	}
-
-	/**
-	 * Encode subject according to RFC 2822 - http://en.wikipedia.org/wiki/MIME#Encoded-Word
-	 *
-	 * @param string $stringtoencode String to encode
-	 * @return string                string encoded
-	 */
-	static function encodetorfc2822($stringtoencode)
-	{
-		global $conf;
-		return '=?'.$conf->file->character_set_client.'?B?'.base64_encode($stringtoencode).'?=';
-	}
+                    // To use the ArrayLogger
+                    $this->logger = new Swift_Plugins_Loggers_ArrayLogger();
+                    // Or to use the Echo Logger
+                    //$this->logger = new Swift_Plugins_Loggers_EchoLogger();
+                    $this->mailer->registerPlugin(new Swift_Plugins_LoggerPlugin($this->logger));
+                }
+                // send mail
+                try {
+                    $result = $this->mailer->send($this->message);
+                } catch (Exception $e) {
+                    $this->error =  $e->getMessage();
+                }
+                if (! empty($conf->global->MAIN_MAIL_DEBUG)) $this->dump_mail();
+
+                $res = true;
+                if (! empty($this->error) || ! $result) {
+                    dol_syslog("CMailFile::sendfile: mail end error=".$this->error, LOG_ERR);
+                    $res=false;
+                }
+                else
+                {
+                    dol_syslog("CMailFile::sendfile: mail end success", LOG_DEBUG);
+                }
+            }
+            else
+            {
+                // Send mail method not correctly defined
+                // --------------------------------------
+
+                return 'Bad value for sendmode';
+            }
+
+            $parameters=array(); $action='';
+            $reshook = $hookmanager->executeHooks('sendMailAfter', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
+            if ($reshook < 0)
+            {
+                $this->error = "Error in hook maildao sendMailAfter " . $reshook;
+                dol_syslog("CMailFile::sendfile: mail end error=" . $this->error, LOG_ERR);
+
+                return $reshook;
+            }
+        }
+        else
+        {
+            $this->error='No mail sent. Feature is disabled by option MAIN_DISABLE_ALL_MAILS';
+            dol_syslog("CMailFile::sendfile: ".$this->error, LOG_WARNING);
+        }
+
+        error_reporting($errorlevel);              // Reactive niveau erreur origine
+
+        return $res;
+    }
+
+    /**
+     * Encode subject according to RFC 2822 - http://en.wikipedia.org/wiki/MIME#Encoded-Word
+     *
+     * @param string $stringtoencode String to encode
+     * @return string                string encoded
+     */
+    static function encodetorfc2822($stringtoencode)
+    {
+        global $conf;
+        return '=?'.$conf->file->character_set_client.'?B?'.base64_encode($stringtoencode).'?=';
+    }
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
-	/**
-	 * Read a file on disk and return encoded content for emails (mode = 'mail')
-	 *
-	 * @param	string	$sourcefile		Path to file to encode
-	 * @return 	int					    <0 if KO, encoded string if OK
-	 */
-	function _encode_file($sourcefile)
-	{
+    /**
+     * Read a file on disk and return encoded content for emails (mode = 'mail')
+     *
+     * @param	string	$sourcefile		Path to file to encode
+     * @return 	int					    <0 if KO, encoded string if OK
+     */
+    function _encode_file($sourcefile)
+    {
         // phpcs:enable
-		$newsourcefile=dol_osencode($sourcefile);
-
-		if (is_readable($newsourcefile))
-		{
-			$contents = file_get_contents($newsourcefile);	// Need PHP 4.3
-			$encoded = chunk_split(base64_encode($contents), 76, $this->eol);    // 76 max is defined into http://tools.ietf.org/html/rfc2047
-			return $encoded;
-		}
-		else
-		{
-			$this->error="Error: Can't read file '".$sourcefile."' into _encode_file";
-			dol_syslog("CMailFile::encode_file: ".$this->error, LOG_ERR);
-			return -1;
-		}
-	}
+        $newsourcefile=dol_osencode($sourcefile);
+
+        if (is_readable($newsourcefile))
+        {
+            $contents = file_get_contents($newsourcefile);	// Need PHP 4.3
+            $encoded = chunk_split(base64_encode($contents), 76, $this->eol);    // 76 max is defined into http://tools.ietf.org/html/rfc2047
+            return $encoded;
+        }
+        else
+        {
+            $this->error="Error: Can't read file '".$sourcefile."' into _encode_file";
+            dol_syslog("CMailFile::encode_file: ".$this->error, LOG_ERR);
+            return -1;
+        }
+    }
 
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
-	/**
-	 *  Write content of a SMTP request into a dump file (mode = all)
-	 *  Used for debugging.
-	 *  Note that to see full SMTP protocol, you can use tcpdump -w /tmp/smtp -s 2000 port 25"
-	 *
-	 *  @return	void
-	 */
-	function dump_mail()
-	{
+    /**
+     *  Write content of a SMTP request into a dump file (mode = all)
+     *  Used for debugging.
+     *  Note that to see full SMTP protocol, you can use tcpdump -w /tmp/smtp -s 2000 port 25"
+     *
+     *  @return	void
+     */
+    function dump_mail()
+    {
         // phpcs:enable
-		global $conf,$dolibarr_main_data_root;
-
-		if (@is_writeable($dolibarr_main_data_root))	// Avoid fatal error on fopen with open_basedir
-		{
-			$outputfile=$dolibarr_main_data_root."/dolibarr_mail.log";
-			$fp = fopen($outputfile,"w");
-
-			if ($this->sendmode == 'mail')
-			{
-				fputs($fp, $this->headers);
-				fputs($fp, $this->eol);			// This eol is added by the mail function, so we add it in log
-				fputs($fp, $this->message);
-			}
-			elseif ($this->sendmode == 'smtps')
-			{
-				fputs($fp, $this->smtps->log);	// this->smtps->log is filled only if MAIN_MAIL_DEBUG was set to on
-			}
-			elseif ($this->sendmode == 'swiftmailer')
-			{
-				fputs($fp, $this->logger->dump());	// this->logger is filled only if MAIN_MAIL_DEBUG was set to on
-			}
-
-			fclose($fp);
-			if (! empty($conf->global->MAIN_UMASK))
-				@chmod($outputfile, octdec($conf->global->MAIN_UMASK));
-		}
-	}
-
-
-	/**
-	 * Correct an uncomplete html string
-	 *
-	 * @param	string	$msg	String
-	 * @return	string			Completed string
-	 */
-	function checkIfHTML($msg)
-	{
-		if (!preg_match('/^[\s\t]*<html/i',$msg))
-		{
-			$out = "<html><head><title></title>";
-			if (!empty($this->styleCSS)) $out.= $this->styleCSS;
-			$out.= "</head><body";
-			if (!empty($this->bodyCSS)) $out.= $this->bodyCSS;
-			$out.= ">";
-			$out.= $msg;
-			$out.= "</body></html>";
-		}
-		else
-		{
-			$out = $msg;
-		}
-
-		return $out;
-	}
-
-	/**
-	 * Build a css style (mode = all) into this->styleCSS and this->bodyCSS
-	 *
-	 * @return string
-	 */
-	function buildCSS()
-	{
-		if (! empty($this->css))
-		{
-			// Style CSS
-			$this->styleCSS = '<style type="text/css">';
-			$this->styleCSS.= 'body {';
-
-			if ($this->css['bgcolor'])
-			{
-				$this->styleCSS.= '  background-color: '.$this->css['bgcolor'].';';
-				$this->bodyCSS.= ' bgcolor="'.$this->css['bgcolor'].'"';
-			}
-			if ($this->css['bgimage'])
-			{
-				// TODO recuperer cid
-				$this->styleCSS.= ' background-image: url("cid:'.$this->css['bgimage_cid'].'");';
-			}
-			$this->styleCSS.= '}';
-			$this->styleCSS.= '</style>';
-		}
-	}
+        global $conf,$dolibarr_main_data_root;
+
+        if (@is_writeable($dolibarr_main_data_root))	// Avoid fatal error on fopen with open_basedir
+        {
+            $outputfile=$dolibarr_main_data_root."/dolibarr_mail.log";
+            $fp = fopen($outputfile,"w");
+
+            if ($this->sendmode == 'mail')
+            {
+                fputs($fp, $this->headers);
+                fputs($fp, $this->eol);			// This eol is added by the mail function, so we add it in log
+                fputs($fp, $this->message);
+            }
+            elseif ($this->sendmode == 'smtps')
+            {
+                fputs($fp, $this->smtps->log);	// this->smtps->log is filled only if MAIN_MAIL_DEBUG was set to on
+            }
+            elseif ($this->sendmode == 'swiftmailer')
+            {
+                fputs($fp, $this->logger->dump());	// this->logger is filled only if MAIN_MAIL_DEBUG was set to on
+            }
+
+            fclose($fp);
+            if (! empty($conf->global->MAIN_UMASK))
+                @chmod($outputfile, octdec($conf->global->MAIN_UMASK));
+        }
+    }
+
+
+    /**
+     * Correct an uncomplete html string
+     *
+     * @param	string	$msg	String
+     * @return	string			Completed string
+     */
+    function checkIfHTML($msg)
+    {
+        if (!preg_match('/^[\s\t]*<html/i',$msg))
+        {
+            $out = "<html><head><title></title>";
+            if (!empty($this->styleCSS)) $out.= $this->styleCSS;
+            $out.= "</head><body";
+            if (!empty($this->bodyCSS)) $out.= $this->bodyCSS;
+            $out.= ">";
+            $out.= $msg;
+            $out.= "</body></html>";
+        }
+        else
+        {
+            $out = $msg;
+        }
+
+        return $out;
+    }
+
+    /**
+     * Build a css style (mode = all) into this->styleCSS and this->bodyCSS
+     *
+     * @return string
+     */
+    function buildCSS()
+    {
+        if (! empty($this->css))
+        {
+            // Style CSS
+            $this->styleCSS = '<style type="text/css">';
+            $this->styleCSS.= 'body {';
+
+            if ($this->css['bgcolor'])
+            {
+                $this->styleCSS.= '  background-color: '.$this->css['bgcolor'].';';
+                $this->bodyCSS.= ' bgcolor="'.$this->css['bgcolor'].'"';
+            }
+            if ($this->css['bgimage'])
+            {
+                // TODO recuperer cid
+                $this->styleCSS.= ' background-image: url("cid:'.$this->css['bgimage_cid'].'");';
+            }
+            $this->styleCSS.= '}';
+            $this->styleCSS.= '</style>';
+        }
+    }
 
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
-	/**
-	 * Create SMTP headers (mode = 'mail')
-	 *
-	 * @return	string headers
-	 */
-	function write_smtpheaders()
-	{
+    /**
+     * Create SMTP headers (mode = 'mail')
+     *
+     * @return	string headers
+     */
+    function write_smtpheaders()
+    {
         // phpcs:enable
-		global $conf;
-		$out = "";
+        global $conf;
+        $out = "";
 
-		$host = dol_getprefix('email');
+        $host = dol_getprefix('email');
 
-		// Sender
-		//$out.= "Sender: ".getValidAddress($this->addr_from,2)).$this->eol2;
-		$out.= "From: ".$this->getValidAddress($this->addr_from,3,1).$this->eol2;
-		if (! empty($conf->global->MAIN_MAIL_SENDMAIL_FORCE_BA))
-		{
-			$out.= "To: ".$this->getValidAddress($this->addr_to,0,1).$this->eol2;
-		}
-		// Return-Path is important because it is used by SPF. Some MTA does not read Return-Path from header but from command line. See option MAIN_MAIL_ALLOW_SENDMAIL_F for that.
-		$out.= "Return-Path: ".$this->getValidAddress($this->addr_from,0,1).$this->eol2;
-		if (isset($this->reply_to)  && $this->reply_to)  $out.= "Reply-To: ".$this->getValidAddress($this->reply_to,2).$this->eol2;
-		if (isset($this->errors_to) && $this->errors_to) $out.= "Errors-To: ".$this->getValidAddress($this->errors_to,2).$this->eol2;
+        // Sender
+        //$out.= "Sender: ".getValidAddress($this->addr_from,2)).$this->eol2;
+        $out.= "From: ".$this->getValidAddress($this->addr_from,3,1).$this->eol2;
+        if (! empty($conf->global->MAIN_MAIL_SENDMAIL_FORCE_BA))
+        {
+            $out.= "To: ".$this->getValidAddress($this->addr_to,0,1).$this->eol2;
+        }
+        // Return-Path is important because it is used by SPF. Some MTA does not read Return-Path from header but from command line. See option MAIN_MAIL_ALLOW_SENDMAIL_F for that.
+        $out.= "Return-Path: ".$this->getValidAddress($this->addr_from,0,1).$this->eol2;
+        if (isset($this->reply_to)  && $this->reply_to)  $out.= "Reply-To: ".$this->getValidAddress($this->reply_to,2).$this->eol2;
+        if (isset($this->errors_to) && $this->errors_to) $out.= "Errors-To: ".$this->getValidAddress($this->errors_to,2).$this->eol2;
 
-		// Receiver
-		if (isset($this->addr_cc)   && $this->addr_cc)   $out.= "Cc: ".$this->getValidAddress($this->addr_cc,2).$this->eol2;
-		if (isset($this->addr_bcc)  && $this->addr_bcc)  $out.= "Bcc: ".$this->getValidAddress($this->addr_bcc,2).$this->eol2;    // TODO Question: bcc must not be into header, only into SMTP command "RCPT TO". Does php mail support this ?
+        // Receiver
+        if (isset($this->addr_cc)   && $this->addr_cc)   $out.= "Cc: ".$this->getValidAddress($this->addr_cc,2).$this->eol2;
+        if (isset($this->addr_bcc)  && $this->addr_bcc)  $out.= "Bcc: ".$this->getValidAddress($this->addr_bcc,2).$this->eol2;    // TODO Question: bcc must not be into header, only into SMTP command "RCPT TO". Does php mail support this ?
 
-		// Delivery receipt
-		if (isset($this->deliveryreceipt) && $this->deliveryreceipt == 1) $out.= "Disposition-Notification-To: ".$this->getValidAddress($this->addr_from,2).$this->eol2;
+        // Delivery receipt
+        if (isset($this->deliveryreceipt) && $this->deliveryreceipt == 1) $out.= "Disposition-Notification-To: ".$this->getValidAddress($this->addr_from,2).$this->eol2;
 
-		//$out.= "X-Priority: 3".$this->eol2;
+        //$out.= "X-Priority: 3".$this->eol2;
 
-		$out.= 'Date: ' . date("r") . $this->eol2;
+        $out.= 'Date: ' . date("r") . $this->eol2;
 
-		$trackid = $this->trackid;
-		if ($trackid)
-		{
-			// References is kept in response and Message-ID is returned into In-Reply-To:
-			$out.= 'Message-ID: <' . time() . '.phpmail-dolibarr-'. $trackid . '@' . $host . ">" . $this->eol2;	// Uppercase seems replaced by phpmail
-			$out.= 'References: <' . time() . '.phpmail-dolibarr-'. $trackid . '@' . $host . ">" . $this->eol2;
-			$out.= 'X-Dolibarr-TRACKID: ' . $trackid . '@' . $host. $this->eol2;
-		}
-		else
-		{
-			$out.= 'Message-ID: <' . time() . '.phpmail@' . $host . ">" . $this->eol2;
-		}
+        $trackid = $this->trackid;
+        if ($trackid)
+        {
+            // References is kept in response and Message-ID is returned into In-Reply-To:
+            $out.= 'Message-ID: <' . time() . '.phpmail-dolibarr-'. $trackid . '@' . $host . ">" . $this->eol2;	// Uppercase seems replaced by phpmail
+            $out.= 'References: <' . time() . '.phpmail-dolibarr-'. $trackid . '@' . $host . ">" . $this->eol2;
+            $out.= 'X-Dolibarr-TRACKID: ' . $trackid . '@' . $host. $this->eol2;
+        }
+        else
+        {
+            $out.= 'Message-ID: <' . time() . '.phpmail@' . $host . ">" . $this->eol2;
+        }
 
-		if (! empty($_SERVER['REMOTE_ADDR'])) $out.= "X-RemoteAddr: " . $_SERVER['REMOTE_ADDR']. $this->eol2;
-		$out.= "X-Mailer: Dolibarr version " . DOL_VERSION ." (using php mail)".$this->eol2;
-		$out.= "Mime-Version: 1.0".$this->eol2;
+        if (! empty($_SERVER['REMOTE_ADDR'])) $out.= "X-RemoteAddr: " . $_SERVER['REMOTE_ADDR']. $this->eol2;
+        $out.= "X-Mailer: Dolibarr version " . DOL_VERSION ." (using php mail)".$this->eol2;
+        $out.= "Mime-Version: 1.0".$this->eol2;
 
-		//$out.= "From: ".$this->getValidAddress($this->addr_from,3,1).$this->eol;
+        //$out.= "From: ".$this->getValidAddress($this->addr_from,3,1).$this->eol;
 
-		$out.= "Content-Type: multipart/mixed;".$this->eol2." boundary=\"".$this->mixed_boundary."\"".$this->eol2;
-		$out.= "Content-Transfer-Encoding: 8bit".$this->eol2;		// TODO Seems to be ignored. Header is 7bit once received.
+        $out.= "Content-Type: multipart/mixed;".$this->eol2." boundary=\"".$this->mixed_boundary."\"".$this->eol2;
+        $out.= "Content-Transfer-Encoding: 8bit".$this->eol2;		// TODO Seems to be ignored. Header is 7bit once received.
 
-		dol_syslog("CMailFile::write_smtpheaders smtp_header=\n".$out);
-		return $out;
-	}
+        dol_syslog("CMailFile::write_smtpheaders smtp_header=\n".$out);
+        return $out;
+    }
 
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
-	/**
-	 * Create header MIME (mode = 'mail')
-	 *
-	 * @param	array	$filename_list			Array of filenames
-	 * @param 	array	$mimefilename_list		Array of mime types
-	 * @return	string							mime headers
-	 */
-	function write_mimeheaders($filename_list, $mimefilename_list)
-	{
+    /**
+     * Create header MIME (mode = 'mail')
+     *
+     * @param	array	$filename_list			Array of filenames
+     * @param 	array	$mimefilename_list		Array of mime types
+     * @return	string							mime headers
+     */
+    function write_mimeheaders($filename_list, $mimefilename_list)
+    {
         // phpcs:enable
-		$mimedone=0;
-		$out = "";
-
-		if (is_array($filename_list))
-		{
-			$filename_list_size=count($filename_list);
-			for($i=0;$i < $filename_list_size;$i++)
-			{
-				if ($filename_list[$i])
-				{
-					if ($mimefilename_list[$i]) $filename_list[$i] = $mimefilename_list[$i];
-					$out.= "X-attachments: $filename_list[$i]".$this->eol2;
-				}
-			}
-		}
-
-		dol_syslog("CMailFile::write_mimeheaders mime_header=\n".$out, LOG_DEBUG);
-		return $out;
-	}
+        $mimedone=0;
+        $out = "";
+
+        if (is_array($filename_list))
+        {
+            $filename_list_size=count($filename_list);
+            for($i=0;$i < $filename_list_size;$i++)
+            {
+                if ($filename_list[$i])
+                {
+                    if ($mimefilename_list[$i]) $filename_list[$i] = $mimefilename_list[$i];
+                    $out.= "X-attachments: $filename_list[$i]".$this->eol2;
+                }
+            }
+        }
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
-	/**
-	 * Return email content (mode = 'mail')
-	 *
-	 * @param	string		$msgtext		Message string
-	 * @return	string						String content
-	 */
-	function write_body($msgtext)
-	{
-        // phpcs:enable
-		global $conf;
-
-		$out='';
-
-		$out.= "--" . $this->mixed_boundary . $this->eol;
-
-		if ($this->atleastoneimage)
-		{
-			$out.= "Content-Type: multipart/alternative;".$this->eol." boundary=\"".$this->alternative_boundary."\"".$this->eol;
-			$out.= $this->eol;
-			$out.= "--" . $this->alternative_boundary . $this->eol;
-		}
-
-		// Make RFC821 Compliant, replace bare linefeeds
-		$strContent = preg_replace("/(?<!\r)\n/si", "\r\n", $msgtext);	// PCRE modifier /s means new lines are common chars
-		if (! empty($conf->global->MAIN_FIX_FOR_BUGGED_MTA))
-		{
-			$strContent = preg_replace("/\r\n/si", "\n", $strContent);	// PCRE modifier /s means new lines are common chars
-		}
-
-		$strContentAltText = '';
-		if ($this->msgishtml)
-		{
-			// Similar code to forge a text from html is also in CMailFile.class.php
-			$strContentAltText = preg_replace("/<br\s*[^>]*>/"," ", $strContent);
-			$strContentAltText = html_entity_decode(strip_tags($strContentAltText));
-			$strContentAltText = rtrim(wordwrap($strContentAltText, 75, empty($conf->global->MAIN_FIX_FOR_BUGGED_MTA)?"\r\n":"\n"));
-
-			// Check if html header already in message, if not complete the message
-			$strContent = $this->checkIfHTML($strContent);
-		}
-
-		// Make RFC2045 Compliant, split lines
-		//$strContent = rtrim(chunk_split($strContent));    // Function chunck_split seems ko if not used on a base64 content
-		// TODO Encode main content into base64 and use the chunk_split, or quoted-printable
-		$strContent = rtrim(wordwrap($strContent, 75, empty($conf->global->MAIN_FIX_FOR_BUGGED_MTA)?"\r\n":"\n"));   // TODO Using this method creates unexpected line break on text/plain content.
-
-		if ($this->msgishtml)
-		{
-			if ($this->atleastoneimage)
-			{
-				$out.= "Content-Type: text/plain; charset=".$conf->file->character_set_client.$this->eol;
-				//$out.= "Content-Transfer-Encoding: 7bit".$this->eol;
-				$out.= $this->eol.($strContentAltText?$strContentAltText:strip_tags($strContent)).$this->eol; // Add plain text message
-				$out.= "--" . $this->alternative_boundary . $this->eol;
-				$out.= "Content-Type: multipart/related;".$this->eol." boundary=\"".$this->related_boundary."\"".$this->eol;
-				$out.= $this->eol;
-				$out.= "--" . $this->related_boundary . $this->eol;
-			}
-
-			if (! $this->atleastoneimage && $strContentAltText && ! empty($conf->global->MAIN_MAIL_USE_MULTI_PART))    // Add plain text message part before html part
-			{
-				$out.= "Content-Type: multipart/alternative;".$this->eol." boundary=\"".$this->alternative_boundary."\"".$this->eol;
-				$out.= $this->eol;
-				$out.= "--" . $this->alternative_boundary . $this->eol;
-				$out.= "Content-Type: text/plain; charset=".$conf->file->character_set_client.$this->eol;
-				//$out.= "Content-Transfer-Encoding: 7bit".$this->eol;
-				$out.= $this->eol.$strContentAltText.$this->eol;
-				$out.= "--" . $this->alternative_boundary . $this->eol;
-			}
-
-			$out.= "Content-Type: text/html; charset=".$conf->file->character_set_client.$this->eol;
-			//$out.= "Content-Transfer-Encoding: 7bit".$this->eol;	// TODO Use base64
-			$out.= $this->eol.$strContent.$this->eol;
-
-			if (! $this->atleastoneimage && $strContentAltText && ! empty($conf->global->MAIN_MAIL_USE_MULTI_PART))    // Add plain text message part after html part
-			{
-				$out.= "--" . $this->alternative_boundary . "--". $this->eol;
-			}
-		}
-		else
-		{
-			$out.= "Content-Type: text/plain; charset=".$conf->file->character_set_client.$this->eol;
-			//$out.= "Content-Transfer-Encoding: 7bit".$this->eol;
-			$out.= $this->eol.$strContent.$this->eol;
-		}
-
-		$out.= $this->eol;
-
-		// Encode images
-		if ($this->atleastoneimage)
-		{
-			$out .= $this->write_images($this->images_encoded);
-			// always end related and end alternative after inline images
-			$out .= "--" . $this->related_boundary . "--" . $this->eol;
-			$out .= $this->eol . "--" . $this->alternative_boundary . "--" . $this->eol;
-			$out .= $this->eol;
-		}
-
-		return $out;
-	}
+        dol_syslog("CMailFile::write_mimeheaders mime_header=\n".$out, LOG_DEBUG);
+        return $out;
+    }
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
-	/**
-	 * Attach file to email (mode = 'mail')
-	 *
-	 * @param	array	$filename_list		Tableau
-	 * @param	array	$mimetype_list		Tableau
-	 * @param 	array	$mimefilename_list	Tableau
-	 * @return	string						Chaine fichiers encodes
-	 */
-	function write_files($filename_list,$mimetype_list,$mimefilename_list)
-	{
+    /**
+     * Return email content (mode = 'mail')
+     *
+     * @param	string		$msgtext		Message string
+     * @return	string						String content
+     */
+    function write_body($msgtext)
+    {
         // phpcs:enable
-		$out = '';
-
-		$filename_list_size=count($filename_list);
-		for($i=0;$i < $filename_list_size;$i++)
-		{
-			if ($filename_list[$i])
-			{
-				dol_syslog("CMailFile::write_files: i=$i");
-				$encoded = $this->_encode_file($filename_list[$i]);
-				if ($encoded >= 0)
-				{
-					if ($mimefilename_list[$i]) $filename_list[$i] = $mimefilename_list[$i];
-					if (! $mimetype_list[$i]) {
-						$mimetype_list[$i] = "application/octet-stream";
-					}
-
-					$out.= "--" . $this->mixed_boundary . $this->eol;
-					$out.= "Content-Disposition: attachment; filename=\"".$filename_list[$i]."\"".$this->eol;
-					$out.= "Content-Type: " . $mimetype_list[$i] . "; name=\"".$filename_list[$i]."\"".$this->eol;
-					$out.= "Content-Transfer-Encoding: base64".$this->eol;
-					$out.= "Content-Description: ".$filename_list[$i].$this->eol;
-					$out.= $this->eol;
-					$out.= $encoded;
-					$out.= $this->eol;
-					//$out.= $this->eol;
-				}
-				else
-				{
-					return $encoded;
-				}
-			}
-		}
-
-		return $out;
-	}
+        global $conf;
+
+        $out='';
+
+        $out.= "--" . $this->mixed_boundary . $this->eol;
+
+        if ($this->atleastoneimage)
+        {
+            $out.= "Content-Type: multipart/alternative;".$this->eol." boundary=\"".$this->alternative_boundary."\"".$this->eol;
+            $out.= $this->eol;
+            $out.= "--" . $this->alternative_boundary . $this->eol;
+        }
+
+        // Make RFC821 Compliant, replace bare linefeeds
+        $strContent = preg_replace("/(?<!\r)\n/si", "\r\n", $msgtext);	// PCRE modifier /s means new lines are common chars
+        if (! empty($conf->global->MAIN_FIX_FOR_BUGGED_MTA))
+        {
+            $strContent = preg_replace("/\r\n/si", "\n", $strContent);	// PCRE modifier /s means new lines are common chars
+        }
+
+        $strContentAltText = '';
+        if ($this->msgishtml)
+        {
+            // Similar code to forge a text from html is also in CMailFile.class.php
+            $strContentAltText = preg_replace("/<br\s*[^>]*>/"," ", $strContent);
+            $strContentAltText = html_entity_decode(strip_tags($strContentAltText));
+            $strContentAltText = rtrim(wordwrap($strContentAltText, 75, empty($conf->global->MAIN_FIX_FOR_BUGGED_MTA)?"\r\n":"\n"));
+
+            // Check if html header already in message, if not complete the message
+            $strContent = $this->checkIfHTML($strContent);
+        }
+
+        // Make RFC2045 Compliant, split lines
+        //$strContent = rtrim(chunk_split($strContent));    // Function chunck_split seems ko if not used on a base64 content
+        // TODO Encode main content into base64 and use the chunk_split, or quoted-printable
+        $strContent = rtrim(wordwrap($strContent, 75, empty($conf->global->MAIN_FIX_FOR_BUGGED_MTA)?"\r\n":"\n"));   // TODO Using this method creates unexpected line break on text/plain content.
+
+        if ($this->msgishtml)
+        {
+            if ($this->atleastoneimage)
+            {
+                $out.= "Content-Type: text/plain; charset=".$conf->file->character_set_client.$this->eol;
+                //$out.= "Content-Transfer-Encoding: 7bit".$this->eol;
+                $out.= $this->eol.($strContentAltText?$strContentAltText:strip_tags($strContent)).$this->eol; // Add plain text message
+                $out.= "--" . $this->alternative_boundary . $this->eol;
+                $out.= "Content-Type: multipart/related;".$this->eol." boundary=\"".$this->related_boundary."\"".$this->eol;
+                $out.= $this->eol;
+                $out.= "--" . $this->related_boundary . $this->eol;
+            }
+
+            if (! $this->atleastoneimage && $strContentAltText && ! empty($conf->global->MAIN_MAIL_USE_MULTI_PART))    // Add plain text message part before html part
+            {
+                $out.= "Content-Type: multipart/alternative;".$this->eol." boundary=\"".$this->alternative_boundary."\"".$this->eol;
+                $out.= $this->eol;
+                $out.= "--" . $this->alternative_boundary . $this->eol;
+                $out.= "Content-Type: text/plain; charset=".$conf->file->character_set_client.$this->eol;
+                //$out.= "Content-Transfer-Encoding: 7bit".$this->eol;
+                $out.= $this->eol.$strContentAltText.$this->eol;
+                $out.= "--" . $this->alternative_boundary . $this->eol;
+            }
+
+            $out.= "Content-Type: text/html; charset=".$conf->file->character_set_client.$this->eol;
+            //$out.= "Content-Transfer-Encoding: 7bit".$this->eol;	// TODO Use base64
+            $out.= $this->eol.$strContent.$this->eol;
 
+            if (! $this->atleastoneimage && $strContentAltText && ! empty($conf->global->MAIN_MAIL_USE_MULTI_PART))    // Add plain text message part after html part
+            {
+                $out.= "--" . $this->alternative_boundary . "--". $this->eol;
+            }
+        }
+        else
+        {
+            $out.= "Content-Type: text/plain; charset=".$conf->file->character_set_client.$this->eol;
+            //$out.= "Content-Transfer-Encoding: 7bit".$this->eol;
+            $out.= $this->eol.$strContent.$this->eol;
+        }
+
+        $out.= $this->eol;
+
+        // Encode images
+        if ($this->atleastoneimage)
+        {
+            $out .= $this->write_images($this->images_encoded);
+            // always end related and end alternative after inline images
+            $out .= "--" . $this->related_boundary . "--" . $this->eol;
+            $out .= $this->eol . "--" . $this->alternative_boundary . "--" . $this->eol;
+            $out .= $this->eol;
+        }
+
+        return $out;
+    }
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
-	/**
-	 * Attach an image to email (mode = 'mail')
-	 *
-	 * @param	array	$images_list	Array of array image
-	 * @return	string					Chaine images encodees
-	 */
-	function write_images($images_list)
-	{
+    /**
+     * Attach file to email (mode = 'mail')
+     *
+     * @param	array	$filename_list		Tableau
+     * @param	array	$mimetype_list		Tableau
+     * @param 	array	$mimefilename_list	Tableau
+     * @return	string						Chaine fichiers encodes
+     */
+    function write_files($filename_list,$mimetype_list,$mimefilename_list)
+    {
         // phpcs:enable
-		$out = '';
+        $out = '';
+
+        $filename_list_size=count($filename_list);
+        for($i=0;$i < $filename_list_size;$i++)
+        {
+            if ($filename_list[$i])
+            {
+                dol_syslog("CMailFile::write_files: i=$i");
+                $encoded = $this->_encode_file($filename_list[$i]);
+                if ($encoded >= 0)
+                {
+                    if ($mimefilename_list[$i]) $filename_list[$i] = $mimefilename_list[$i];
+                    if (! $mimetype_list[$i]) {
+                        $mimetype_list[$i] = "application/octet-stream";
+                    }
+
+                    $out.= "--" . $this->mixed_boundary . $this->eol;
+                    $out.= "Content-Disposition: attachment; filename=\"".$filename_list[$i]."\"".$this->eol;
+                    $out.= "Content-Type: " . $mimetype_list[$i] . "; name=\"".$filename_list[$i]."\"".$this->eol;
+                    $out.= "Content-Transfer-Encoding: base64".$this->eol;
+                    $out.= "Content-Description: ".$filename_list[$i].$this->eol;
+                    $out.= $this->eol;
+                    $out.= $encoded;
+                    $out.= $this->eol;
+                    //$out.= $this->eol;
+                }
+                else
+                {
+                    return $encoded;
+                }
+            }
+        }
 
-		if (is_array($images_list))
-		{
-			foreach ($images_list as $img)
-			{
-				dol_syslog("CMailFile::write_images: ".$img["name"]);
+        return $out;
+    }
 
-				$out.= "--" . $this->related_boundary . $this->eol; // always related for an inline image
-				$out.= "Content-Type: " . $img["content_type"] . "; name=\"".$img["name"]."\"".$this->eol;
-				$out.= "Content-Transfer-Encoding: base64".$this->eol;
-				$out.= "Content-Disposition: inline; filename=\"".$img["name"]."\"".$this->eol;
-				$out.= "Content-ID: <".$img["cid"].">".$this->eol;
-				$out.= $this->eol;
-				$out.= $img["image_encoded"];
-				$out.= $this->eol;
-			}
-		}
 
-		return $out;
-	}
+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
+    /**
+     * Attach an image to email (mode = 'mail')
+     *
+     * @param	array	$images_list	Array of array image
+     * @return	string					Chaine images encodees
+     */
+    function write_images($images_list)
+    {
+        // phpcs:enable
+        $out = '';
+
+        if (is_array($images_list))
+        {
+            foreach ($images_list as $img)
+            {
+                dol_syslog("CMailFile::write_images: ".$img["name"]);
+
+                $out.= "--" . $this->related_boundary . $this->eol; // always related for an inline image
+                $out.= "Content-Type: " . $img["content_type"] . "; name=\"".$img["name"]."\"".$this->eol;
+                $out.= "Content-Transfer-Encoding: base64".$this->eol;
+                $out.= "Content-Disposition: inline; filename=\"".$img["name"]."\"".$this->eol;
+                $out.= "Content-ID: <".$img["cid"].">".$this->eol;
+                $out.= $this->eol;
+                $out.= $img["image_encoded"];
+                $out.= $this->eol;
+            }
+        }
+
+        return $out;
+    }
 
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
-	/**
-	 * Try to create a socket connection
-	 *
-	 * @param 	string		$host		Add ssl:// for SSL/TLS.
-	 * @param 	int			$port		Example: 25, 465
-	 * @return	int						Socket id if ok, 0 if KO
-	 */
-	function check_server_port($host,$port)
-	{
+    /**
+     * Try to create a socket connection
+     *
+     * @param 	string		$host		Add ssl:// for SSL/TLS.
+     * @param 	int			$port		Example: 25, 465
+     * @return	int						Socket id if ok, 0 if KO
+     */
+    function check_server_port($host,$port)
+    {
         // phpcs:enable
-		global $conf;
-
-		$_retVal=0;
-		$timeout=5;	// Timeout in seconds
-
-		if (function_exists('fsockopen'))
-		{
-			$keyforsmtpserver='MAIN_MAIL_SMTP_SERVER';
-			$keyforsmtpport  ='MAIN_MAIL_SMTP_PORT';
-			$keyforsmtpid    ='MAIN_MAIL_SMTPS_ID';
-			$keyforsmtppw    ='MAIN_MAIL_SMTPS_PW';
-			$keyfortls       ='MAIN_MAIL_EMAIL_TLS';
-			$keyforstarttls  ='MAIN_MAIL_EMAIL_STARTTLS';
-			if ($this->sendcontext == 'emailing' && !empty($conf->global->MAIN_MAIL_SENDMODE_EMAILING) && $conf->global->MAIN_MAIL_SENDMODE_EMAILING != 'default')
-			{
-				$keyforsmtpserver='MAIN_MAIL_SMTP_SERVER_EMAILING';
-				$keyforsmtpport  ='MAIN_MAIL_SMTP_PORT_EMAILING';
-				$keyforsmtpid    ='MAIN_MAIL_SMTPS_ID_EMAILING';
-				$keyforsmtppw    ='MAIN_MAIL_SMTPS_PW_EMAILING';
-				$keyfortls       ='MAIN_MAIL_EMAIL_TLS_EMAILING';
-				$keyforstarttls  ='MAIN_MAIL_EMAIL_STARTTLS_EMAILING';
-			}
-
-			// If we use SSL/TLS
-			if (! empty($conf->global->$keyfortls) && function_exists('openssl_open')) $host='ssl://'.$host;
-			// tls smtp start with no encryption
-			//if (! empty($conf->global->MAIN_MAIL_EMAIL_STARTTLS) && function_exists('openssl_open')) $host='tls://'.$host;
-
-			dol_syslog("Try socket connection to host=".$host." port=".$port);
-			//See if we can connect to the SMTP server
-			if ($socket = @fsockopen(
-					$host,       // Host to test, IP or domain. Add ssl:// for SSL/TLS.
-					$port,       // which Port number to use
-					$errno,      // actual system level error
-					$errstr,     // and any text that goes with the error
-					$timeout
-			))  // timeout for reading/writing data over the socket
-			{
-				// Windows still does not have support for this timeout function
-				if (function_exists('stream_set_timeout')) stream_set_timeout($socket, $timeout, 0);
-
-				dol_syslog("Now we wait for answer 220");
-
-				// Check response from Server
-				if ( $_retVal = $this->server_parse($socket, "220") ) $_retVal = $socket;
-			}
-			else
-			{
-				$this->error = utf8_check('Error '.$errno.' - '.$errstr)?'Error '.$errno.' - '.$errstr:utf8_encode('Error '.$errno.' - '.$errstr);
-			}
-		}
-		return $_retVal;
-	}
+        global $conf;
+
+        $_retVal=0;
+        $timeout=5;	// Timeout in seconds
+
+        if (function_exists('fsockopen'))
+        {
+            $keyforsmtpserver='MAIN_MAIL_SMTP_SERVER';
+            $keyforsmtpport  ='MAIN_MAIL_SMTP_PORT';
+            $keyforsmtpid    ='MAIN_MAIL_SMTPS_ID';
+            $keyforsmtppw    ='MAIN_MAIL_SMTPS_PW';
+            $keyfortls       ='MAIN_MAIL_EMAIL_TLS';
+            $keyforstarttls  ='MAIN_MAIL_EMAIL_STARTTLS';
+            if ($this->sendcontext == 'emailing' && !empty($conf->global->MAIN_MAIL_SENDMODE_EMAILING) && $conf->global->MAIN_MAIL_SENDMODE_EMAILING != 'default')
+            {
+                $keyforsmtpserver='MAIN_MAIL_SMTP_SERVER_EMAILING';
+                $keyforsmtpport  ='MAIN_MAIL_SMTP_PORT_EMAILING';
+                $keyforsmtpid    ='MAIN_MAIL_SMTPS_ID_EMAILING';
+                $keyforsmtppw    ='MAIN_MAIL_SMTPS_PW_EMAILING';
+                $keyfortls       ='MAIN_MAIL_EMAIL_TLS_EMAILING';
+                $keyforstarttls  ='MAIN_MAIL_EMAIL_STARTTLS_EMAILING';
+            }
+
+            // If we use SSL/TLS
+            if (! empty($conf->global->$keyfortls) && function_exists('openssl_open')) $host='ssl://'.$host;
+            // tls smtp start with no encryption
+            //if (! empty($conf->global->MAIN_MAIL_EMAIL_STARTTLS) && function_exists('openssl_open')) $host='tls://'.$host;
+
+            dol_syslog("Try socket connection to host=".$host." port=".$port);
+            //See if we can connect to the SMTP server
+            if ($socket = @fsockopen(
+                    $host,       // Host to test, IP or domain. Add ssl:// for SSL/TLS.
+                    $port,       // which Port number to use
+                    $errno,      // actual system level error
+                    $errstr,     // and any text that goes with the error
+                    $timeout
+            ))  // timeout for reading/writing data over the socket
+            {
+                // Windows still does not have support for this timeout function
+                if (function_exists('stream_set_timeout')) stream_set_timeout($socket, $timeout, 0);
+
+                dol_syslog("Now we wait for answer 220");
+
+                // Check response from Server
+                if ( $_retVal = $this->server_parse($socket, "220") ) $_retVal = $socket;
+            }
+            else
+            {
+                $this->error = utf8_check('Error '.$errno.' - '.$errstr)?'Error '.$errno.' - '.$errstr:utf8_encode('Error '.$errno.' - '.$errstr);
+            }
+        }
+        return $_retVal;
+    }
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
-	/**
-	 * This function has been modified as provided by SirSir to allow multiline responses when
-	 * using SMTP Extensions.
-	 *
-	 * @param	Socket	$socket			Socket
-	 * @param   string	$response		Response string
-	 * @return  boolean					true if success
-	 */
-	function server_parse($socket, $response)
-	{
+    /**
+     * This function has been modified as provided by SirSir to allow multiline responses when
+     * using SMTP Extensions.
+     *
+     * @param	Socket	$socket			Socket
+     * @param   string	$response		Response string
+     * @return  boolean					true if success
+     */
+    function server_parse($socket, $response)
+    {
         // phpcs:enable
-		$_retVal = true;	// Indicates if Object was created or not
-		$server_response = '';
-
-		while (substr($server_response,3,1) != ' ')
-		{
-			if (! ($server_response = fgets($socket, 256)) )
-			{
-				$this->error="Couldn't get mail server response codes";
-				return false;
-			}
-		}
-
-		if( !( substr($server_response, 0, 3) == $response ) )
-		{
-			$this->error="Ran into problems sending Mail.\r\nResponse: $server_response";
-			$_retVal = false;
-		}
-
-		return $_retVal;
-	}
-
-	/**
-	 * Seearch images into html message and init array this->images_encoded if found
-	 *
-	 * @param	string	$images_dir		Location of physical images files
-	 * @return	int 		        	>0 if OK, <0 if KO
-	 */
-	function findHtmlImages($images_dir)
-	{
-		// Build the list of image extensions
-		$extensions = array_keys($this->image_types);
-
-		$matches = array();
-		preg_match_all('/(?:"|\')([^"\']+\.('.implode('|', $extensions).'))(?:"|\')/Ui', $this->html, $matches);  // If "xxx.ext" or 'xxx.ext' found
-
-		if (! empty($matches))
-		{
-			$i=0;
-			foreach ($matches[1] as $full)
-			{
-
-				if (preg_match('/file=([A-Za-z0-9_\-\/]+[\.]?[A-Za-z0-9]+)?$/i',$full,$regs))   // If xxx is 'file=aaa'
-				{
-					$img = $regs[1];
-
-					if (file_exists($images_dir.'/'.$img))
-					{
-						// Image path in src
-						$src = preg_quote($full,'/');
-
-						// Image full path
-						$this->html_images[$i]["fullpath"] = $images_dir.'/'.$img;
-
-						// Image name
-						$this->html_images[$i]["name"] = $img;
-
-						// Content type
-						if (preg_match('/^.+\.(\w{3,4})$/', $img, $reg))
-						{
-							$ext=strtolower($reg[1]);
-							$this->html_images[$i]["content_type"] = $this->image_types[$ext];
-						}
-
-						// cid
-						$this->html_images[$i]["cid"] = dol_hash(uniqid(time()), 3);	// Force md5 hash (does not contains special chars)
-						$this->html = preg_replace("/src=\"$src\"|src='$src'/i", "src=\"cid:".$this->html_images[$i]["cid"]."\"", $this->html);
-					}
-					$i++;
-				}
-			}
-
-			if (!empty($this->html_images))
-			{
-				$inline = array();
-
-				$i=0;
-
-				foreach ($this->html_images as $img)
-				{
-					$fullpath = $images_dir.'/'.$img["name"];
-
-					// If duplicate images are embedded, they may show up as attachments, so remove them.
-					if (!in_array($fullpath,$inline))
-					{
-						// Read image file
-						if ($image = file_get_contents($fullpath))
-						{
-							// On garde que le nom de l'image
-							preg_match('/([A-Za-z0-9_-]+[\.]?[A-Za-z0-9]+)?$/i',$img["name"],$regs);
-							$imgName = $regs[1];
-
-							$this->images_encoded[$i]['name'] = $imgName;
-							$this->images_encoded[$i]['fullpath'] = $fullpath;
-							$this->images_encoded[$i]['content_type'] = $img["content_type"];
-							$this->images_encoded[$i]['cid'] = $img["cid"];
-							// Encodage de l'image
-							$this->images_encoded[$i]["image_encoded"] = chunk_split(base64_encode($image), 68, $this->eol);
-							$inline[] = $fullpath;
-						}
-					}
-					$i++;
-				}
-			}
-			else
-			{
-				return -1;
-			}
-
-			return 1;
-		}
-		else
-		{
-			return 0;
-		}
-	}
-
-	/**
-	 * Return a formatted address string for SMTP protocol
-	 *
-	 * @param	string		$address		     Example: 'John Doe <john@doe.com>, Alan Smith <alan@smith.com>' or 'john@doe.com, alan@smith.com'
-	 * @param	int			$format			     0=auto, 1=emails with <>, 2=emails without <>, 3=auto + label between "
-	 * @param	int			$encode			     0=No encode name, 1=Encode name to RFC2822
-	 * @param   int         $maxnumberofemail    0=No limit. Otherwise, maximum number of emails returned ($address may contains several email separated with ','). Add '...' if there is more.
-	 * @return	string						     If format 0: '<john@doe.com>' or 'John Doe <john@doe.com>' or '=?UTF-8?B?Sm9obiBEb2U=?= <john@doe.com>'
-	 * 										     If format 1: '<john@doe.com>'
-	 *										     If format 2: 'john@doe.com'
-	 *										     If format 3: '<john@doe.com>' or '"John Doe" <john@doe.com>' or '"=?UTF-8?B?Sm9obiBEb2U=?=" <john@doe.com>'
-	 *                                           If format 4: 'John Doe' or 'john@doe.com' if no label exists
-	 */
-	static function getValidAddress($address,$format,$encode=0,$maxnumberofemail=0)
-	{
-		global $conf;
-
-		$ret='';
-
-		$arrayaddress=explode(',',$address);
-
-		// Boucle sur chaque composant de l'adresse
-		$i=0;
-		foreach($arrayaddress as $val)
-		{
-			if (preg_match('/^(.*)<(.*)>$/i',trim($val),$regs))
-			{
-				$name  = trim($regs[1]);
-				$email = trim($regs[2]);
-			}
-			else
-			{
-				$name  = '';
-				$email = trim($val);
-			}
-
-			if ($email)
-			{
-				$i++;
-
-				$newemail='';
-				if ($format == 4)
-				{
-					$newemail = $name?$name:$email;
-				}
-				if ($format == 2)
-				{
-					$newemail=$email;
-				}
-				if ($format == 1 || $format == 3)
-				{
-					$newemail='<'.$email.'>';
-				}
-				if ($format == 0 || $format == 3)
-				{
-					if (! empty($conf->global->MAIN_MAIL_NO_FULL_EMAIL)) $newemail='<'.$email.'>';
-					elseif (! $name) $newemail='<'.$email.'>';
-					else $newemail=($format==3?'"':'').($encode?self::encodetorfc2822($name):$name).($format==3?'"':'').' <'.$email.'>';
-				}
-
-				$ret=($ret ? $ret.',' : '').$newemail;
-
-				// Stop if we have too much records
-				if ($maxnumberofemail && $i >= $maxnumberofemail)
-				{
-					if (count($arrayaddress) > $maxnumberofemail) $ret.='...';
-					break;
-				}
-			}
-		}
-
-		return $ret;
-	}
-
-	/**
-	 * Return a formatted array of address string for SMTP protocol
-	 *
-	 * @param   string      $address        Example: 'John Doe <john@doe.com>, Alan Smith <alan@smith.com>' or 'john@doe.com, alan@smith.com'
-	 * @return  array                       array of email => name
-	 */
-	function getArrayAddress($address)
-	{
-		global $conf;
-
-		$ret=array();
-
-		$arrayaddress=explode(',',$address);
-
-		// Boucle sur chaque composant de l'adresse
-		foreach($arrayaddress as $val)
-		{
-			if (preg_match('/^(.*)<(.*)>$/i',trim($val),$regs))
-			{
-				$name  = trim($regs[1]);
-				$email = trim($regs[2]);
-			}
-			else
-			{
-				$name  = null;
-				$email = trim($val);
-			}
-
-			$ret[$email]=empty($conf->global->MAIN_MAIL_NO_FULL_EMAIL)?$name:null;
-		}
-
-		return $ret;
-	}
+        $_retVal = true;	// Indicates if Object was created or not
+        $server_response = '';
+
+        while (substr($server_response,3,1) != ' ')
+        {
+            if (! ($server_response = fgets($socket, 256)) )
+            {
+                $this->error="Couldn't get mail server response codes";
+                return false;
+            }
+        }
+
+        if( !( substr($server_response, 0, 3) == $response ) )
+        {
+            $this->error="Ran into problems sending Mail.\r\nResponse: $server_response";
+            $_retVal = false;
+        }
+
+        return $_retVal;
+    }
+
+    /**
+     * Seearch images into html message and init array this->images_encoded if found
+     *
+     * @param	string	$images_dir		Location of physical images files
+     * @return	int 		        	>0 if OK, <0 if KO
+     */
+    function findHtmlImages($images_dir)
+    {
+        // Build the list of image extensions
+        $extensions = array_keys($this->image_types);
+
+        $matches = array();
+        preg_match_all('/(?:"|\')([^"\']+\.('.implode('|', $extensions).'))(?:"|\')/Ui', $this->html, $matches);  // If "xxx.ext" or 'xxx.ext' found
+
+        if (! empty($matches))
+        {
+            $i=0;
+            foreach ($matches[1] as $full)
+            {
+
+                if (preg_match('/file=([A-Za-z0-9_\-\/]+[\.]?[A-Za-z0-9]+)?$/i',$full,$regs))   // If xxx is 'file=aaa'
+                {
+                    $img = $regs[1];
+
+                    if (file_exists($images_dir.'/'.$img))
+                    {
+                        // Image path in src
+                        $src = preg_quote($full,'/');
+
+                        // Image full path
+                        $this->html_images[$i]["fullpath"] = $images_dir.'/'.$img;
+
+                        // Image name
+                        $this->html_images[$i]["name"] = $img;
+
+                        // Content type
+                        if (preg_match('/^.+\.(\w{3,4})$/', $img, $reg))
+                        {
+                            $ext=strtolower($reg[1]);
+                            $this->html_images[$i]["content_type"] = $this->image_types[$ext];
+                        }
+
+                        // cid
+                        $this->html_images[$i]["cid"] = dol_hash(uniqid(time()), 3);	// Force md5 hash (does not contains special chars)
+                        $this->html = preg_replace("/src=\"$src\"|src='$src'/i", "src=\"cid:".$this->html_images[$i]["cid"]."\"", $this->html);
+                    }
+                    $i++;
+                }
+            }
+
+            if (!empty($this->html_images))
+            {
+                $inline = array();
+
+                $i=0;
+
+                foreach ($this->html_images as $img)
+                {
+                    $fullpath = $images_dir.'/'.$img["name"];
+
+                    // If duplicate images are embedded, they may show up as attachments, so remove them.
+                    if (!in_array($fullpath,$inline))
+                    {
+                        // Read image file
+                        if ($image = file_get_contents($fullpath))
+                        {
+                            // On garde que le nom de l'image
+                            preg_match('/([A-Za-z0-9_-]+[\.]?[A-Za-z0-9]+)?$/i',$img["name"],$regs);
+                            $imgName = $regs[1];
+
+                            $this->images_encoded[$i]['name'] = $imgName;
+                            $this->images_encoded[$i]['fullpath'] = $fullpath;
+                            $this->images_encoded[$i]['content_type'] = $img["content_type"];
+                            $this->images_encoded[$i]['cid'] = $img["cid"];
+                            // Encodage de l'image
+                            $this->images_encoded[$i]["image_encoded"] = chunk_split(base64_encode($image), 68, $this->eol);
+                            $inline[] = $fullpath;
+                        }
+                    }
+                    $i++;
+                }
+            }
+            else
+            {
+                return -1;
+            }
+
+            return 1;
+        }
+        else
+        {
+            return 0;
+        }
+    }
+
+    /**
+     * Return a formatted address string for SMTP protocol
+     *
+     * @param	string		$address		     Example: 'John Doe <john@doe.com>, Alan Smith <alan@smith.com>' or 'john@doe.com, alan@smith.com'
+     * @param	int			$format			     0=auto, 1=emails with <>, 2=emails without <>, 3=auto + label between "
+     * @param	int			$encode			     0=No encode name, 1=Encode name to RFC2822
+     * @param   int         $maxnumberofemail    0=No limit. Otherwise, maximum number of emails returned ($address may contains several email separated with ','). Add '...' if there is more.
+     * @return	string						     If format 0: '<john@doe.com>' or 'John Doe <john@doe.com>' or '=?UTF-8?B?Sm9obiBEb2U=?= <john@doe.com>'
+     * 										     If format 1: '<john@doe.com>'
+     *										     If format 2: 'john@doe.com'
+     *										     If format 3: '<john@doe.com>' or '"John Doe" <john@doe.com>' or '"=?UTF-8?B?Sm9obiBEb2U=?=" <john@doe.com>'
+     *                                           If format 4: 'John Doe' or 'john@doe.com' if no label exists
+     */
+    static function getValidAddress($address,$format,$encode=0,$maxnumberofemail=0)
+    {
+        global $conf;
+
+        $ret='';
+
+        $arrayaddress=explode(',',$address);
+
+        // Boucle sur chaque composant de l'adresse
+        $i=0;
+        foreach($arrayaddress as $val)
+        {
+            if (preg_match('/^(.*)<(.*)>$/i',trim($val),$regs))
+            {
+                $name  = trim($regs[1]);
+                $email = trim($regs[2]);
+            }
+            else
+            {
+                $name  = '';
+                $email = trim($val);
+            }
+
+            if ($email)
+            {
+                $i++;
+
+                $newemail='';
+                if ($format == 4)
+                {
+                    $newemail = $name?$name:$email;
+                }
+                if ($format == 2)
+                {
+                    $newemail=$email;
+                }
+                if ($format == 1 || $format == 3)
+                {
+                    $newemail='<'.$email.'>';
+                }
+                if ($format == 0 || $format == 3)
+                {
+                    if (! empty($conf->global->MAIN_MAIL_NO_FULL_EMAIL)) $newemail='<'.$email.'>';
+                    elseif (! $name) $newemail='<'.$email.'>';
+                    else $newemail=($format==3?'"':'').($encode?self::encodetorfc2822($name):$name).($format==3?'"':'').' <'.$email.'>';
+                }
+
+                $ret=($ret ? $ret.',' : '').$newemail;
+
+                // Stop if we have too much records
+                if ($maxnumberofemail && $i >= $maxnumberofemail)
+                {
+                    if (count($arrayaddress) > $maxnumberofemail) $ret.='...';
+                    break;
+                }
+            }
+        }
+
+        return $ret;
+    }
+
+    /**
+     * Return a formatted array of address string for SMTP protocol
+     *
+     * @param   string      $address        Example: 'John Doe <john@doe.com>, Alan Smith <alan@smith.com>' or 'john@doe.com, alan@smith.com'
+     * @return  array                       array of email => name
+     */
+    function getArrayAddress($address)
+    {
+        global $conf;
+
+        $ret=array();
+
+        $arrayaddress=explode(',',$address);
+
+        // Boucle sur chaque composant de l'adresse
+        foreach($arrayaddress as $val)
+        {
+            if (preg_match('/^(.*)<(.*)>$/i',trim($val),$regs))
+            {
+                $name  = trim($regs[1]);
+                $email = trim($regs[2]);
+            }
+            else
+            {
+                $name  = null;
+                $email = trim($val);
+            }
+
+            $ret[$email]=empty($conf->global->MAIN_MAIL_NO_FULL_EMAIL)?$name:null;
+        }
+
+        return $ret;
+    }
 }

Spacing +329 added lines, -329 removed lines

@@ -40,13 +40,13 @@ 
 	public $sendmode;
 	public $sendsetup;
 
-	var $subject;      	// Topic:       Subject of email
-	var $addr_from;    	// From:		Label and EMail of sender (must include '<>'). For example '<myemail@example.com>' or 'John Doe <myemail@example.com>' or '<myemail+trackingid@example.com>'). Note that with gmail smtps, value here is forced by google to account (but not the reply-to).
+	var $subject; // Topic:       Subject of email
+	var $addr_from; // From:		Label and EMail of sender (must include '<>'). For example '<myemail@example.com>' or 'John Doe <myemail@example.com>' or '<myemail+trackingid@example.com>'). Note that with gmail smtps, value here is forced by google to account (but not the reply-to).
 	// Sender:      Who send the email ("Sender" has sent emails on behalf of "From").
 	//              Use it when the "From" is an email of a domain that is a SPF protected domain, and sending smtp server is not this domain. In such case, add Sender field with an email of the protected domain.
 	// Return-Path: Email where to send bounds.
-	var $reply_to;		// Reply-To:	Email where to send replies from mailer software (mailer use From if reply-to not defined, Gmail use gmail account if reply-to not defined)
-	var $errors_to;		// Errors-To:	Email where to send errors.
+	var $reply_to; // Reply-To:	Email where to send replies from mailer software (mailer use From if reply-to not defined, Gmail use gmail account if reply-to not defined)
+	var $errors_to; // Errors-To:	Email where to send errors.
 	var $addr_to;
 	var $addr_cc;
 	var $addr_bcc;
@@ -63,10 +63,10 @@ 
 	/**
 	 * @var string Error code (or message)
 	 */
-	public $error='';
+	public $error = '';
 
-	var $smtps;			// Contains SMTPs object (if this method is used)
-	var $phpmailer;		// Contains PHPMailer object (if this method is used)
+	var $smtps; // Contains SMTPs object (if this method is used)
+	var $phpmailer; // Contains PHPMailer object (if this method is used)
 
 	/**
 	 * @var string CSS
@@ -83,9 +83,9 @@ 
 	// Image
 	var $html;
 	var $image_boundary;
-	var $atleastoneimage=0;    // at least one image file with file=xxx.ext into content (TODO Debug this. How can this case be tested. Remove if not used).
-	var $html_images=array();
-	var $images_encoded=array();
+	var $atleastoneimage = 0; // at least one image file with file=xxx.ext into content (TODO Debug this. How can this case be tested. Remove if not used).
+	var $html_images = array();
+	var $images_encoded = array();
 	var $image_types = array(
         'gif'  => 'image/gif',
 		'jpg'  => 'image/jpeg',
@@ -119,13 +119,13 @@ 
 	 *  @param  string  $sendcontext      	 'standard', 'emailing', ... (used to define with sending mode and parameters to use)
 	 *  @param	string	$replyto			 Reply-to email (will be set to same value than From by default if not provided)
 	 */
-	function __construct($subject, $to, $from, $msg, $filename_list=array(), $mimetype_list=array(), $mimefilename_list=array(), $addr_cc="", $addr_bcc="", $deliveryreceipt=0, $msgishtml=0, $errors_to='', $css='', $trackid='', $moreinheader='', $sendcontext='standard', $replyto='')
+	function __construct($subject, $to, $from, $msg, $filename_list = array(), $mimetype_list = array(), $mimefilename_list = array(), $addr_cc = "", $addr_bcc = "", $deliveryreceipt = 0, $msgishtml = 0, $errors_to = '', $css = '', $trackid = '', $moreinheader = '', $sendcontext = 'standard', $replyto = '')
 	{
 		global $conf, $dolibarr_main_data_root;
 
 		$this->sendcontext = $sendcontext;
 
-		if (empty($replyto)) $replyto=$from;
+		if (empty($replyto)) $replyto = $from;
 
 		// Define this->sendmode
 		$this->sendmode = '';
@@ -133,28 +133,28 @@ 
 		{
 			$this->sendmode = $conf->global->MAIN_MAIL_SENDMODE_EMAILING;
 		}
-		if (empty($this->sendmode)) $this->sendmode=$conf->global->MAIN_MAIL_SENDMODE;
-		if (empty($this->sendmode)) $this->sendmode='mail';
+		if (empty($this->sendmode)) $this->sendmode = $conf->global->MAIN_MAIL_SENDMODE;
+		if (empty($this->sendmode)) $this->sendmode = 'mail';
 
 		// We define end of line (RFC 821).
-		$this->eol="\r\n";
+		$this->eol = "\r\n";
 		// We define end of line for header fields (RFC 822bis section 2.3 says header must contains \r\n).
-		$this->eol2="\r\n";
-		if (! empty($conf->global->MAIN_FIX_FOR_BUGGED_MTA))
+		$this->eol2 = "\r\n";
+		if (!empty($conf->global->MAIN_FIX_FOR_BUGGED_MTA))
 		{
-			$this->eol="\n";
-			$this->eol2="\n";
-			$moreinheader = str_replace("\r\n","\n",$moreinheader);
+			$this->eol = "\n";
+			$this->eol2 = "\n";
+			$moreinheader = str_replace("\r\n", "\n", $moreinheader);
 		}
 
 		// On defini mixed_boundary
-		$this->mixed_boundary = "multipart_x." . time() . ".x_boundary";
+		$this->mixed_boundary = "multipart_x.".time().".x_boundary";
 
 		// On defini related_boundary
-		$this->related_boundary = 'mul_'.dol_hash(uniqid("dolibarr2"), 3);	// Force md5 hash (does not contains special chars)
+		$this->related_boundary = 'mul_'.dol_hash(uniqid("dolibarr2"), 3); // Force md5 hash (does not contains special chars)
 
 		// On defini alternative_boundary
-		$this->alternative_boundary = 'mul_'.dol_hash(uniqid("dolibarr3"), 3);	// Force md5 hash (does not contains special chars)
+		$this->alternative_boundary = 'mul_'.dol_hash(uniqid("dolibarr3"), 3); // Force md5 hash (does not contains special chars)
 
 		dol_syslog("CMailFile::CMailfile: sendmode=".$this->sendmode." charset=".$conf->file->character_set_client." from=$from, to=$to, addr_cc=$addr_cc, addr_bcc=$addr_bcc, errors_to=$errors_to, trackid=$trackid sendcontext=$sendcontext", LOG_DEBUG);
 		dol_syslog("CMailFile::CMailfile: subject=".$subject.", deliveryreceipt=".$deliveryreceipt.", msgishtml=".$msgishtml, LOG_DEBUG);
@@ -162,13 +162,13 @@ 
 		if (empty($subject))
 		{
 			dol_syslog("CMailFile::CMailfile: Try to send an email with empty subject");
-			$this->error='ErrorSubjectIsRequired';
+			$this->error = 'ErrorSubjectIsRequired';
 			return;
 		}
 		if (empty($msg))
 		{
 		    dol_syslog("CMailFile::CMailfile: Try to send an email with empty body");
-		    $msg='.';     // Avoid empty message (with empty message conten show a multipart structure)
+		    $msg = '.'; // Avoid empty message (with empty message conten show a multipart structure)
 		}
 
 		// Detect if message is HTML (use fast method)
@@ -185,21 +185,21 @@ 
 		global $dolibarr_main_url_root;
 
 		// Define $urlwithroot
-		$urlwithouturlroot=preg_replace('/'.preg_quote(DOL_URL_ROOT,'/').'$/i','',trim($dolibarr_main_url_root));
-		$urlwithroot=$urlwithouturlroot.DOL_URL_ROOT;		// This is to use external domain name found into config file
+		$urlwithouturlroot = preg_replace('/'.preg_quote(DOL_URL_ROOT, '/').'$/i', '', trim($dolibarr_main_url_root));
+		$urlwithroot = $urlwithouturlroot.DOL_URL_ROOT; // This is to use external domain name found into config file
 		//$urlwithroot=DOL_MAIN_URL_ROOT;					// This is to use same domain name than current
 
 		// Replace relative /viewimage to absolute path
-		$msg = preg_replace('/src="'.preg_quote(DOL_URL_ROOT,'/').'\/viewimage\.php/ims', 'src="'.$urlwithroot.'/viewimage.php', $msg, -1, $nbrep);
+		$msg = preg_replace('/src="'.preg_quote(DOL_URL_ROOT, '/').'\/viewimage\.php/ims', 'src="'.$urlwithroot.'/viewimage.php', $msg, -1, $nbrep);
 
-		if (! empty($conf->global->MAIN_MAIL_FORCE_CONTENT_TYPE_TO_HTML)) $this->msgishtml=1; // To force to send everything with content type html.
+		if (!empty($conf->global->MAIN_MAIL_FORCE_CONTENT_TYPE_TO_HTML)) $this->msgishtml = 1; // To force to send everything with content type html.
 
 		// Detect images
 		if ($this->msgishtml)
 		{
 			$this->html = $msg;
 
-			if (! empty($conf->global->MAIN_MAIL_ADD_INLINE_IMAGES_IF_IN_MEDIAS))
+			if (!empty($conf->global->MAIN_MAIL_ADD_INLINE_IMAGES_IF_IN_MEDIAS))
 			{
 				$findimg = $this->findHtmlImages($dolibarr_main_data_root.'/medias');
 			}
@@ -211,7 +211,7 @@ 
 				{
 					if ($this->html_images[$i])
 					{
-						$this->atleastoneimage=1;
+						$this->atleastoneimage = 1;
 						dol_syslog("CMailFile::CMailfile: html_images[$i]['name']=".$this->html_images[$i]['name'], LOG_DEBUG);
 					}
 				}
@@ -225,14 +225,14 @@ 
 			{
 				if ($filename_list[$i])
 				{
-					$this->atleastonefile=1;
+					$this->atleastonefile = 1;
 					dol_syslog("CMailFile::CMailfile: filename_list[$i]=".$filename_list[$i].", mimetype_list[$i]=".$mimetype_list[$i]." mimefilename_list[$i]=".$mimefilename_list[$i], LOG_DEBUG);
 				}
 			}
 		}
 
 		// Add autocopy to (Note: Adding bcc for specific modules are also done from pages)
-		if (! empty($conf->global->MAIN_MAIL_AUTOCOPY_TO)) $addr_bcc.=($addr_bcc?', ':'').$conf->global->MAIN_MAIL_AUTOCOPY_TO;
+		if (!empty($conf->global->MAIN_MAIL_AUTOCOPY_TO)) $addr_bcc .= ($addr_bcc ? ', ' : '').$conf->global->MAIN_MAIL_AUTOCOPY_TO;
 
 		// Action according to choosed sending method
 		if ($this->sendmode == 'mail')
@@ -257,17 +257,17 @@ 
 			$this->trackid = $trackid;
 
 			$smtp_headers = $this->write_smtpheaders();
-			if (! empty($moreinheader)) $smtp_headers.=$moreinheader;   // $moreinheader contains the \r\n
+			if (!empty($moreinheader)) $smtp_headers .= $moreinheader; // $moreinheader contains the \r\n
 
 			// Define mime_headers
 			$mime_headers = $this->write_mimeheaders($filename_list, $mimefilename_list);
 
-			if (! empty($this->html))
+			if (!empty($this->html))
 			{
 				if (!empty($css))
 				{
 					$this->css = $css;
-					$this->buildCSS();    // Build a css style (mode = all) into this->styleCSS and this->bodyCSS
+					$this->buildCSS(); // Build a css style (mode = all) into this->styleCSS and this->bodyCSS
 				}
 
 				$msg = $this->html;
@@ -279,20 +279,20 @@ 
 			// Add attachments to text_encoded
 			if ($this->atleastonefile)
 			{
-				$files_encoded = $this->write_files($filename_list,$mimetype_list,$mimefilename_list);
+				$files_encoded = $this->write_files($filename_list, $mimetype_list, $mimefilename_list);
 			}
 
 			// We now define $this->headers and $this->message
-			$this->headers = $smtp_headers . $mime_headers;
+			$this->headers = $smtp_headers.$mime_headers;
 			// On nettoie le header pour qu'il ne se termine pas par un retour chariot.
 			// Ceci evite aussi les lignes vides en fin qui peuvent etre interpretees
 			// comme des injections mail par les serveurs de messagerie.
-			$this->headers = preg_replace("/([\r\n]+)$/i","",$this->headers);
+			$this->headers = preg_replace("/([\r\n]+)$/i", "", $this->headers);
 
 			//$this->message = $this->eol.'This is a message with multiple parts in MIME format.'.$this->eol;
 			$this->message = 'This is a message with multiple parts in MIME format.'.$this->eol;
-			$this->message.= $text_body . $files_encoded;
-			$this->message.= "--" . $this->mixed_boundary . "--" . $this->eol;
+			$this->message .= $text_body.$files_encoded;
+			$this->message .= "--".$this->mixed_boundary."--".$this->eol;
 		}
 		else if ($this->sendmode == 'smtps')
 		{
@@ -304,14 +304,14 @@ 
 			$smtps->setCharSet($conf->file->character_set_client);
 
 			$smtps->setSubject($this->encodetorfc2822($subject));
-			$smtps->setTO($this->getValidAddress($to,0,1));
-			$smtps->setFrom($this->getValidAddress($from,0,1));
+			$smtps->setTO($this->getValidAddress($to, 0, 1));
+			$smtps->setFrom($this->getValidAddress($from, 0, 1));
 			$smtps->setTrackId($trackid);
-			$smtps->setReplyTo($this->getValidAddress($replyto,0,1));
+			$smtps->setReplyTo($this->getValidAddress($replyto, 0, 1));
 
-			if (! empty($moreinheader)) $smtps->setMoreInHeader($moreinheader);
+			if (!empty($moreinheader)) $smtps->setMoreInHeader($moreinheader);
 
-			if (! empty($this->html))
+			if (!empty($this->html))
 			{
 				if (!empty($css))
 				{
@@ -322,14 +322,14 @@ 
 				$msg = $this->checkIfHTML($msg);
 			}
 
-			if ($this->msgishtml) $smtps->setBodyContent($msg,'html');
-			else $smtps->setBodyContent($msg,'plain');
+			if ($this->msgishtml) $smtps->setBodyContent($msg, 'html');
+			else $smtps->setBodyContent($msg, 'plain');
 
 			if ($this->atleastoneimage)
 			{
 				foreach ($this->images_encoded as $img)
 				{
-					$smtps->setImageInline($img['image_encoded'],$img['name'],$img['content_type'],$img['cid']);
+					$smtps->setImageInline($img['image_encoded'], $img['name'], $img['content_type'], $img['cid']);
 				}
 			}
 
@@ -337,8 +337,8 @@ 
 			{
 				foreach ($filename_list as $i => $val)
 				{
-					$content=file_get_contents($filename_list[$i]);
-					$smtps->setAttachment($content,$mimefilename_list[$i],$mimetype_list[$i]);
+					$content = file_get_contents($filename_list[$i]);
+					$smtps->setAttachment($content, $mimefilename_list[$i], $mimetype_list[$i]);
 				}
 			}
 
@@ -347,7 +347,7 @@ 
 			$smtps->setErrorsTo($errors_to);
 			$smtps->setDeliveryReceipt($deliveryreceipt);
 
-			$this->smtps=$smtps;
+			$this->smtps = $smtps;
 		}
 		else if ($this->sendmode == 'swiftmailer')
 		{
@@ -383,8 +383,8 @@ 
             //$this->message = new Swift_SignedMessage();
             // Adding a trackid header to a message
 			$headers = $this->message->getHeaders();
-			$headers->addTextHeader('X-Dolibarr-TRACKID', $trackid . '@' . $host);
-			$headerID = time() . '.swiftmailer-dolibarr-' . $trackid . '@' . $host;
+			$headers->addTextHeader('X-Dolibarr-TRACKID', $trackid.'@'.$host);
+			$headerID = time().'.swiftmailer-dolibarr-'.$trackid.'@'.$host;
 			$msgid = $headers->get('Message-ID');
 			$msgid->setId($headerID);
 			$headers->addIdHeader('References', $headerID);
@@ -394,12 +394,12 @@ 
 			try {
 				$result = $this->message->setSubject($subject);
 			} catch (Exception $e) {
-				$this->errors[] =  $e->getMessage();
+				$this->errors[] = $e->getMessage();
 			}
 
 			// Set the From address with an associative array
 			//$this->message->setFrom(array('john@doe.com' => 'John Doe'));
-			if (! empty($from)) {
+			if (!empty($from)) {
                 try {
                 	$result = $this->message->setFrom($this->getArrayAddress($from));
                 } catch (Exception $e) {
@@ -408,7 +408,7 @@ 
             }
 
 			// Set the To addresses with an associative array
-			if (! empty($to)) {
+			if (!empty($to)) {
                 try {
                 	$result = $this->message->setTo($this->getArrayAddress($to));
                 } catch (Exception $e) {
@@ -416,7 +416,7 @@ 
                 }
             }
 
-			if (! empty($replyto)) {
+			if (!empty($replyto)) {
                 try {
                 	$result = $this->message->SetReplyTo($this->getArrayAddress($replyto));
                 } catch (Exception $e) {
@@ -427,10 +427,10 @@ 
 			try {
 				$result = $this->message->setCharSet($conf->file->character_set_client);
 			} catch (Exception $e) {
-				$this->errors[] =  $e->getMessage();
+				$this->errors[] = $e->getMessage();
 			}
 
-			if (! empty($this->html))
+			if (!empty($this->html))
 			{
 				if (!empty($css))
 				{
@@ -455,11 +455,11 @@ 
 			}
 
 			if ($this->msgishtml) {
-				$this->message->setBody($msg,'text/html');
+				$this->message->setBody($msg, 'text/html');
 				// And optionally an alternative body
 				$this->message->addPart(html_entity_decode(strip_tags($msg)), 'text/plain');
 			} else {
-				$this->message->setBody($msg,'text/plain');
+				$this->message->setBody($msg, 'text/plain');
 				// And optionally an alternative body
 				$this->message->addPart($msg, 'text/html');
 			}
@@ -469,13 +469,13 @@ 
 				foreach ($filename_list as $i => $val)
 				{
 					//$this->message->attach(Swift_Attachment::fromPath($filename_list[$i],$mimetype_list[$i]));
-					$attachment = Swift_Attachment::fromPath($filename_list[$i],$mimetype_list[$i]);
+					$attachment = Swift_Attachment::fromPath($filename_list[$i], $mimetype_list[$i]);
 					$this->message->attach($attachment);
 				}
 			}
 
-			if (! empty($addr_cc)) $this->message->setCc($this->getArrayAddress($addr_cc));
-			if (! empty($addr_bcc)) $this->message->setBcc($this->getArrayAddress($addr_bcc));
+			if (!empty($addr_cc)) $this->message->setCc($this->getArrayAddress($addr_cc));
+			if (!empty($addr_bcc)) $this->message->setBcc($this->getArrayAddress($addr_bcc));
 			//if (! empty($errors_to)) $this->message->setErrorsTo($this->getArrayAddress($errors_to);
 			if (isset($deliveryreceipt) && $deliveryreceipt == 1) $this->message->setReadReceiptTo($this->getArrayAddress($from));
 		}
@@ -495,25 +495,25 @@ 
 	 */
 	function sendfile()
 	{
-		global $conf,$db,$langs;
+		global $conf, $db, $langs;
 
-		$errorlevel=error_reporting();
+		$errorlevel = error_reporting();
 		//error_reporting($errorlevel ^ E_WARNING);   // Desactive warnings
 
-		$res=false;
+		$res = false;
 
 		if (empty($conf->global->MAIN_DISABLE_ALL_MAILS) || !empty($conf->global->MAIN_MAIL_FORCE_SENDTO))
 		{
-			require_once DOL_DOCUMENT_ROOT . '/core/class/hookmanager.class.php';
+			require_once DOL_DOCUMENT_ROOT.'/core/class/hookmanager.class.php';
 			$hookmanager = new HookManager($db);
 			$hookmanager->initHooks(array('mail'));
 
-			$parameters=array(); $action='';
+			$parameters = array(); $action = '';
 			$reshook = $hookmanager->executeHooks('sendMail', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
 			if ($reshook < 0)
 			{
-				$this->error = "Error in hook maildao sendMail " . $reshook;
-				dol_syslog("CMailFile::sendfile: mail end error=" . $this->error, LOG_ERR);
+				$this->error = "Error in hook maildao sendMail ".$reshook;
+				dol_syslog("CMailFile::sendfile: mail end error=".$this->error, LOG_ERR);
 
 				return $reshook;
 			}
@@ -523,52 +523,52 @@ 
 			}
 
 			// Check number of recipient is lower or equal than MAIL_MAX_NB_OF_RECIPIENTS_IN_SAME_EMAIL
-			if (empty($conf->global->MAIL_MAX_NB_OF_RECIPIENTS_TO_IN_SAME_EMAIL)) $conf->global->MAIL_MAX_NB_OF_RECIPIENTS_TO_IN_SAME_EMAIL=10;
+			if (empty($conf->global->MAIL_MAX_NB_OF_RECIPIENTS_TO_IN_SAME_EMAIL)) $conf->global->MAIL_MAX_NB_OF_RECIPIENTS_TO_IN_SAME_EMAIL = 10;
 			$tmparray1 = explode(',', $this->addr_to);
 			if (count($tmparray1) > $conf->global->MAIL_MAX_NB_OF_RECIPIENTS_TO_IN_SAME_EMAIL)
 			{
 				$this->error = 'Too much recipients in to:';
-				dol_syslog("CMailFile::sendfile: mail end error=" . $this->error, LOG_WARNING);
+				dol_syslog("CMailFile::sendfile: mail end error=".$this->error, LOG_WARNING);
 				return false;
 			}
-			if (empty($conf->global->MAIL_MAX_NB_OF_RECIPIENTS_CC_IN_SAME_EMAIL)) $conf->global->MAIL_MAX_NB_OF_RECIPIENTS_CC_IN_SAME_EMAIL=10;
+			if (empty($conf->global->MAIL_MAX_NB_OF_RECIPIENTS_CC_IN_SAME_EMAIL)) $conf->global->MAIL_MAX_NB_OF_RECIPIENTS_CC_IN_SAME_EMAIL = 10;
 			$tmparray2 = explode(',', $this->addr_cc);
 			if (count($tmparray2) > $conf->global->MAIL_MAX_NB_OF_RECIPIENTS_CC_IN_SAME_EMAIL)
 			{
 				$this->error = 'Too much recipients in cc:';
-				dol_syslog("CMailFile::sendfile: mail end error=" . $this->error, LOG_WARNING);
+				dol_syslog("CMailFile::sendfile: mail end error=".$this->error, LOG_WARNING);
 				return false;
 			}
-			if (empty($conf->global->MAIL_MAX_NB_OF_RECIPIENTS_BCC_IN_SAME_EMAIL)) $conf->global->MAIL_MAX_NB_OF_RECIPIENTS_BCC_IN_SAME_EMAIL=10;
+			if (empty($conf->global->MAIL_MAX_NB_OF_RECIPIENTS_BCC_IN_SAME_EMAIL)) $conf->global->MAIL_MAX_NB_OF_RECIPIENTS_BCC_IN_SAME_EMAIL = 10;
 			$tmparray3 = explode(',', $this->addr_bcc);
 			if (count($tmparray3) > $conf->global->MAIL_MAX_NB_OF_RECIPIENTS_BCC_IN_SAME_EMAIL)
 			{
 				$this->error = 'Too much recipients in bcc:';
-				dol_syslog("CMailFile::sendfile: mail end error=" . $this->error, LOG_WARNING);
+				dol_syslog("CMailFile::sendfile: mail end error=".$this->error, LOG_WARNING);
 				return false;
 			}
-			if (empty($conf->global->MAIL_MAX_NB_OF_RECIPIENTS_IN_SAME_EMAIL)) $conf->global->MAIL_MAX_NB_OF_RECIPIENTS_IN_SAME_EMAIL=10;
-			if ((count($tmparray1)+count($tmparray2)+count($tmparray3)) > $conf->global->MAIL_MAX_NB_OF_RECIPIENTS_IN_SAME_EMAIL)
+			if (empty($conf->global->MAIL_MAX_NB_OF_RECIPIENTS_IN_SAME_EMAIL)) $conf->global->MAIL_MAX_NB_OF_RECIPIENTS_IN_SAME_EMAIL = 10;
+			if ((count($tmparray1) + count($tmparray2) + count($tmparray3)) > $conf->global->MAIL_MAX_NB_OF_RECIPIENTS_IN_SAME_EMAIL)
 			{
 				$this->error = 'Too much recipients in to:, cc:, bcc:';
-				dol_syslog("CMailFile::sendfile: mail end error=" . $this->error, LOG_WARNING);
+				dol_syslog("CMailFile::sendfile: mail end error=".$this->error, LOG_WARNING);
 				return false;
 			}
 
-			$keyforsmtpserver='MAIN_MAIL_SMTP_SERVER';
-			$keyforsmtpport  ='MAIN_MAIL_SMTP_PORT';
-			$keyforsmtpid    ='MAIN_MAIL_SMTPS_ID';
-			$keyforsmtppw    ='MAIN_MAIL_SMTPS_PW';
-			$keyfortls       ='MAIN_MAIL_EMAIL_TLS';
-			$keyforstarttls  ='MAIN_MAIL_EMAIL_STARTTLS';
+			$keyforsmtpserver = 'MAIN_MAIL_SMTP_SERVER';
+			$keyforsmtpport  = 'MAIN_MAIL_SMTP_PORT';
+			$keyforsmtpid    = 'MAIN_MAIL_SMTPS_ID';
+			$keyforsmtppw    = 'MAIN_MAIL_SMTPS_PW';
+			$keyfortls       = 'MAIN_MAIL_EMAIL_TLS';
+			$keyforstarttls  = 'MAIN_MAIL_EMAIL_STARTTLS';
 			if ($this->sendcontext == 'emailing' && !empty($conf->global->MAIN_MAIL_SENDMODE_EMAILING) && $conf->global->MAIN_MAIL_SENDMODE_EMAILING != 'default')
 			{
-				$keyforsmtpserver='MAIN_MAIL_SMTP_SERVER_EMAILING';
-				$keyforsmtpport  ='MAIN_MAIL_SMTP_PORT_EMAILING';
-				$keyforsmtpid    ='MAIN_MAIL_SMTPS_ID_EMAILING';
-				$keyforsmtppw    ='MAIN_MAIL_SMTPS_PW_EMAILING';
-				$keyfortls       ='MAIN_MAIL_EMAIL_TLS_EMAILING';
-				$keyforstarttls  ='MAIN_MAIL_EMAIL_STARTTLS_EMAILING';
+				$keyforsmtpserver = 'MAIN_MAIL_SMTP_SERVER_EMAILING';
+				$keyforsmtpport  = 'MAIN_MAIL_SMTP_PORT_EMAILING';
+				$keyforsmtpid    = 'MAIN_MAIL_SMTPS_ID_EMAILING';
+				$keyforsmtppw    = 'MAIN_MAIL_SMTPS_PW_EMAILING';
+				$keyfortls       = 'MAIN_MAIL_EMAIL_TLS_EMAILING';
+				$keyforstarttls  = 'MAIN_MAIL_EMAIL_STARTTLS_EMAILING';
 			}
 
 			if (!empty($conf->global->MAIN_MAIL_FORCE_SENDTO))
@@ -591,68 +591,68 @@ 
 				if (isset($_SERVER["WINDIR"]))
 				{
 					if (empty($this->addr_from)) $this->addr_from = 'robot@example.com';
-					@ini_set('sendmail_from',$this->getValidAddress($this->addr_from,2));
+					@ini_set('sendmail_from', $this->getValidAddress($this->addr_from, 2));
 				}
 
 				// Force parameters
-				if (! empty($conf->global->$keyforsmtpserver)) ini_set('SMTP',$conf->global->$keyforsmtpserver);
-				if (! empty($conf->global->$keyforsmtpport))   ini_set('smtp_port',$conf->global->$keyforsmtpport);
+				if (!empty($conf->global->$keyforsmtpserver)) ini_set('SMTP', $conf->global->$keyforsmtpserver);
+				if (!empty($conf->global->$keyforsmtpport))   ini_set('smtp_port', $conf->global->$keyforsmtpport);
 
-				$res=true;
-				if ($res && ! $this->subject)
+				$res = true;
+				if ($res && !$this->subject)
 				{
-					$this->error="Failed to send mail with php mail to HOST=".ini_get('SMTP').", PORT=".ini_get('smtp_port')."<br>Subject is empty";
+					$this->error = "Failed to send mail with php mail to HOST=".ini_get('SMTP').", PORT=".ini_get('smtp_port')."<br>Subject is empty";
 					dol_syslog("CMailFile::sendfile: mail end error=".$this->error, LOG_ERR);
-					$res=false;
+					$res = false;
 				}
-				$dest=$this->getValidAddress($this->addr_to,2);
-				if ($res && ! $dest)
+				$dest = $this->getValidAddress($this->addr_to, 2);
+				if ($res && !$dest)
 				{
-					$this->error="Failed to send mail with php mail to HOST=".ini_get('SMTP').", PORT=".ini_get('smtp_port')."<br>Recipient address '$dest' invalid";
+					$this->error = "Failed to send mail with php mail to HOST=".ini_get('SMTP').", PORT=".ini_get('smtp_port')."<br>Recipient address '$dest' invalid";
 					dol_syslog("CMailFile::sendfile: mail end error=".$this->error, LOG_ERR);
-					$res=false;
+					$res = false;
 				}
 
 				if ($res)
 				{
-					$additionnalparam = '';	// By default
-					if (! empty($conf->global->MAIN_MAIL_ALLOW_SENDMAIL_F))
+					$additionnalparam = ''; // By default
+					if (!empty($conf->global->MAIN_MAIL_ALLOW_SENDMAIL_F))
 					{
 						// le "Return-Path" (retour des messages bounced) dans les header ne fonctionne pas avec tous les MTA
 						// Le forcage de la valeur grace à l'option -f de sendmail est donc possible si la constante MAIN_MAIL_ALLOW_SENDMAIL_F est definie.
 						// Having this variable defined may create problems with some sendmail (option -f refused)
 						// Having this variable not defined may create problems with some other sendmail (option -f required)
-						$additionnalparam .= ($additionnalparam?' ':'').(! empty($conf->global->MAIN_MAIL_ERRORS_TO) ? '-f' . $this->getValidAddress($conf->global->MAIN_MAIL_ERRORS_TO,2) : ($this->addr_from != '' ? '-f' . $this->getValidAddress($this->addr_from,2) : '') );
+						$additionnalparam .= ($additionnalparam ? ' ' : '').(!empty($conf->global->MAIN_MAIL_ERRORS_TO) ? '-f'.$this->getValidAddress($conf->global->MAIN_MAIL_ERRORS_TO, 2) : ($this->addr_from != '' ? '-f'.$this->getValidAddress($this->addr_from, 2) : ''));
 					}
-					if (! empty($conf->global->MAIN_MAIL_SENDMAIL_FORCE_BA))    // To force usage of -ba option. This option tells sendmail to read From: or Sender: to setup sender
+					if (!empty($conf->global->MAIN_MAIL_SENDMAIL_FORCE_BA))    // To force usage of -ba option. This option tells sendmail to read From: or Sender: to setup sender
 					{
-						$additionnalparam .= ($additionnalparam?' ':'').'-ba';
+						$additionnalparam .= ($additionnalparam ? ' ' : '').'-ba';
 					}
 
-					if (! empty($conf->global->MAIN_MAIL_SENDMAIL_FORCE_ADDPARAM)) $additionnalparam .= ($additionnalparam?' ':'').'-U '.$additionnalparam; // Use -U to add additionnal params
+					if (!empty($conf->global->MAIN_MAIL_SENDMAIL_FORCE_ADDPARAM)) $additionnalparam .= ($additionnalparam ? ' ' : '').'-U '.$additionnalparam; // Use -U to add additionnal params
 
 					dol_syslog("CMailFile::sendfile: mail start HOST=".ini_get('SMTP').", PORT=".ini_get('smtp_port').", additionnal_parameters=".$additionnalparam, LOG_DEBUG);
 
-					$this->message=stripslashes($this->message);
+					$this->message = stripslashes($this->message);
 
-					if (! empty($conf->global->MAIN_MAIL_DEBUG)) $this->dump_mail();
+					if (!empty($conf->global->MAIN_MAIL_DEBUG)) $this->dump_mail();
 
-					if (! empty($additionnalparam)) $res = mail($dest, $this->encodetorfc2822($this->subject), $this->message, $this->headers, $additionnalparam);
+					if (!empty($additionnalparam)) $res = mail($dest, $this->encodetorfc2822($this->subject), $this->message, $this->headers, $additionnalparam);
 					else $res = mail($dest, $this->encodetorfc2822($this->subject), $this->message, $this->headers);
 
-					if (! $res)
+					if (!$res)
 					{
 						$langs->load("errors");
-						$this->error="Failed to send mail with php mail";
-						$linuxlike=1;
-						if (preg_match('/^win/i',PHP_OS)) $linuxlike=0;
-						if (preg_match('/^mac/i',PHP_OS)) $linuxlike=0;
-						if (! $linuxlike)
+						$this->error = "Failed to send mail with php mail";
+						$linuxlike = 1;
+						if (preg_match('/^win/i', PHP_OS)) $linuxlike = 0;
+						if (preg_match('/^mac/i', PHP_OS)) $linuxlike = 0;
+						if (!$linuxlike)
 						{
-							$this->error.=" to HOST=".ini_get('SMTP').", PORT=".ini_get('smtp_port');	// This values are value used only for non linuxlike systems
+							$this->error .= " to HOST=".ini_get('SMTP').", PORT=".ini_get('smtp_port'); // This values are value used only for non linuxlike systems
 						}
-						$this->error.=".<br>";
-						$this->error.=$langs->trans("ErrorPhpMailDelivery");
+						$this->error .= ".<br>";
+						$this->error .= $langs->trans("ErrorPhpMailDelivery");
 						dol_syslog("CMailFile::sendfile: mail end error=".$this->error, LOG_ERR);
 					}
 					else
@@ -667,86 +667,86 @@ 
 				}
 
 				// Restore parameters
-				if (! empty($conf->global->$keyforsmtpserver))	ini_restore('SMTP');
-				if (! empty($conf->global->$keyforsmtpport)) 	ini_restore('smtp_port');
+				if (!empty($conf->global->$keyforsmtpserver))	ini_restore('SMTP');
+				if (!empty($conf->global->$keyforsmtpport)) 	ini_restore('smtp_port');
 			}
 			else if ($this->sendmode == 'smtps')
 			{
-				if (! is_object($this->smtps))
+				if (!is_object($this->smtps))
 				{
-					$this->error="Failed to send mail with smtps lib to HOST=".$server.", PORT=".$conf->global->$keyforsmtpport."<br>Constructor of object CMailFile was not initialized without errors.";
+					$this->error = "Failed to send mail with smtps lib to HOST=".$server.", PORT=".$conf->global->$keyforsmtpport."<br>Constructor of object CMailFile was not initialized without errors.";
 					dol_syslog("CMailFile::sendfile: mail end error=".$this->error, LOG_ERR);
 					return false;
 				}
 
 				// Use SMTPS library
 				// ------------------------------------------
-				$this->smtps->setTransportType(0);	// Only this method is coded in SMTPs library
+				$this->smtps->setTransportType(0); // Only this method is coded in SMTPs library
 
 				// Clean parameters
-				if (empty($conf->global->$keyforsmtpserver)) $conf->global->$keyforsmtpserver=ini_get('SMTP');
-				if (empty($conf->global->$keyforsmtpport))   $conf->global->$keyforsmtpport=ini_get('smtp_port');
+				if (empty($conf->global->$keyforsmtpserver)) $conf->global->$keyforsmtpserver = ini_get('SMTP');
+				if (empty($conf->global->$keyforsmtpport))   $conf->global->$keyforsmtpport = ini_get('smtp_port');
 
 				// If we use SSL/TLS
-				$server=$conf->global->$keyforsmtpserver;
-				$secure='';
-				if (! empty($conf->global->$keyfortls) && function_exists('openssl_open')) $secure='ssl';
-				if (! empty($conf->global->$keyforstarttls) && function_exists('openssl_open')) $secure='tls';
-				$server=($secure?$secure.'://':'').$server;
+				$server = $conf->global->$keyforsmtpserver;
+				$secure = '';
+				if (!empty($conf->global->$keyfortls) && function_exists('openssl_open')) $secure = 'ssl';
+				if (!empty($conf->global->$keyforstarttls) && function_exists('openssl_open')) $secure = 'tls';
+				$server = ($secure ? $secure.'://' : '').$server;
 
-				$port=$conf->global->$keyforsmtpport;
+				$port = $conf->global->$keyforsmtpport;
 
 				$this->smtps->setHost($server);
 				$this->smtps->setPort($port); // 25, 465...;
 
-				$loginid=''; $loginpass='';
-				if (! empty($conf->global->$keyforsmtpid))
+				$loginid = ''; $loginpass = '';
+				if (!empty($conf->global->$keyforsmtpid))
 				{
 					$loginid = $conf->global->$keyforsmtpid;
 					$this->smtps->setID($loginid);
 				}
-				if (! empty($conf->global->$keyforsmtppw))
+				if (!empty($conf->global->$keyforsmtppw))
 				{
 					$loginpass = $conf->global->$keyforsmtppw;
 					$this->smtps->setPW($loginpass);
 				}
 
-				$res=true;
-				$from=$this->smtps->getFrom('org');
-				if ($res && ! $from)
+				$res = true;
+				$from = $this->smtps->getFrom('org');
+				if ($res && !$from)
 				{
-					$this->error="Failed to send mail with smtps lib to HOST=".$server.", PORT=".$conf->global->$keyforsmtpport."<br>Sender address '$from' invalid";
+					$this->error = "Failed to send mail with smtps lib to HOST=".$server.", PORT=".$conf->global->$keyforsmtpport."<br>Sender address '$from' invalid";
 					dol_syslog("CMailFile::sendfile: mail end error=".$this->error, LOG_ERR);
-					$res=false;
+					$res = false;
 				}
-				$dest=$this->smtps->getTo();
-				if ($res && ! $dest)
+				$dest = $this->smtps->getTo();
+				if ($res && !$dest)
 				{
-					$this->error="Failed to send mail with smtps lib to HOST=".$server.", PORT=".$conf->global->$keyforsmtpport."<br>Recipient address '$dest' invalid";
+					$this->error = "Failed to send mail with smtps lib to HOST=".$server.", PORT=".$conf->global->$keyforsmtpport."<br>Recipient address '$dest' invalid";
 					dol_syslog("CMailFile::sendfile: mail end error=".$this->error, LOG_ERR);
-					$res=false;
+					$res = false;
 				}
 
 				if ($res)
 				{
-					if (! empty($conf->global->MAIN_MAIL_DEBUG)) $this->smtps->setDebug(true);
+					if (!empty($conf->global->MAIN_MAIL_DEBUG)) $this->smtps->setDebug(true);
 
-					$result=$this->smtps->sendMsg();
+					$result = $this->smtps->sendMsg();
 					//print $result;
 
-					if (! empty($conf->global->MAIN_MAIL_DEBUG)) $this->dump_mail();
+					if (!empty($conf->global->MAIN_MAIL_DEBUG)) $this->dump_mail();
 
-					$result=$this->smtps->getErrors();
+					$result = $this->smtps->getErrors();
 					if (empty($this->error) && empty($result))
 					{
 						dol_syslog("CMailFile::sendfile: mail end success", LOG_DEBUG);
-						$res=true;
+						$res = true;
 					}
 					else
 					{
-						if (empty($this->error)) $this->error=$result;
+						if (empty($this->error)) $this->error = $result;
 						dol_syslog("CMailFile::sendfile: mail end error=".$this->error, LOG_ERR);
-						$res=false;
+						$res = false;
 					}
 				}
 			}
@@ -757,19 +757,19 @@ 
 				require_once DOL_DOCUMENT_ROOT.'/includes/swiftmailer/lib/swift_required.php';
 
 				// Clean parameters
-				if (empty($conf->global->$keyforsmtpserver)) $conf->global->$keyforsmtpserver=ini_get('SMTP');
-				if (empty($conf->global->$keyforsmtpport))   $conf->global->$keyforsmtpport=ini_get('smtp_port');
+				if (empty($conf->global->$keyforsmtpserver)) $conf->global->$keyforsmtpserver = ini_get('SMTP');
+				if (empty($conf->global->$keyforsmtpport))   $conf->global->$keyforsmtpport = ini_get('smtp_port');
 
 				// If we use SSL/TLS
 				$server = $conf->global->$keyforsmtpserver;
 				$secure = '';
-				if (! empty($conf->global->$keyfortls) && function_exists('openssl_open')) $secure='ssl';
-				if (! empty($conf->global->$keyforstarttls) && function_exists('openssl_open')) $secure='tls';
+				if (!empty($conf->global->$keyfortls) && function_exists('openssl_open')) $secure = 'ssl';
+				if (!empty($conf->global->$keyforstarttls) && function_exists('openssl_open')) $secure = 'tls';
 
 				$this->transport = new Swift_SmtpTransport($server, $conf->global->$keyforsmtpport, $secure);
 
-				if (! empty($conf->global->$keyforsmtpid)) $this->transport->setUsername($conf->global->$keyforsmtpid);
-				if (! empty($conf->global->$keyforsmtppw)) $this->transport->setPassword($conf->global->$keyforsmtppw);
+				if (!empty($conf->global->$keyforsmtpid)) $this->transport->setUsername($conf->global->$keyforsmtpid);
+				if (!empty($conf->global->$keyforsmtppw)) $this->transport->setPassword($conf->global->$keyforsmtppw);
 				//$smtps->_msgReplyTo  = 'reply@web.com';
 
 				// Create the Mailer using your created Transport
@@ -784,7 +784,7 @@ 
                     $this->message->attachSigner($signer->ignoreHeader('Return-Path'));
                 }
 
-                if (! empty($conf->global->MAIN_MAIL_DEBUG)) {
+                if (!empty($conf->global->MAIN_MAIL_DEBUG)) {
 					// To use the ArrayLogger
 					$this->logger = new Swift_Plugins_Loggers_ArrayLogger();
 					// Or to use the Echo Logger
@@ -795,14 +795,14 @@ 
 				try {
 					$result = $this->mailer->send($this->message);
 				} catch (Exception $e) {
-					$this->error =  $e->getMessage();
+					$this->error = $e->getMessage();
 				}
-				if (! empty($conf->global->MAIN_MAIL_DEBUG)) $this->dump_mail();
+				if (!empty($conf->global->MAIN_MAIL_DEBUG)) $this->dump_mail();
 
 				$res = true;
-				if (! empty($this->error) || ! $result) {
+				if (!empty($this->error) || !$result) {
 					dol_syslog("CMailFile::sendfile: mail end error=".$this->error, LOG_ERR);
-					$res=false;
+					$res = false;
 				}
 				else
 				{
@@ -817,23 +817,23 @@ 
 				return 'Bad value for sendmode';
 			}
 
-			$parameters=array(); $action='';
+			$parameters = array(); $action = '';
 			$reshook = $hookmanager->executeHooks('sendMailAfter', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
 			if ($reshook < 0)
 			{
-				$this->error = "Error in hook maildao sendMailAfter " . $reshook;
-				dol_syslog("CMailFile::sendfile: mail end error=" . $this->error, LOG_ERR);
+				$this->error = "Error in hook maildao sendMailAfter ".$reshook;
+				dol_syslog("CMailFile::sendfile: mail end error=".$this->error, LOG_ERR);
 
 				return $reshook;
 			}
 		}
 		else
 		{
-			$this->error='No mail sent. Feature is disabled by option MAIN_DISABLE_ALL_MAILS';
+			$this->error = 'No mail sent. Feature is disabled by option MAIN_DISABLE_ALL_MAILS';
 			dol_syslog("CMailFile::sendfile: ".$this->error, LOG_WARNING);
 		}
 
-		error_reporting($errorlevel);              // Reactive niveau erreur origine
+		error_reporting($errorlevel); // Reactive niveau erreur origine
 
 		return $res;
 	}
@@ -860,17 +860,17 @@ 
 	function _encode_file($sourcefile)
 	{
         // phpcs:enable
-		$newsourcefile=dol_osencode($sourcefile);
+		$newsourcefile = dol_osencode($sourcefile);
 
 		if (is_readable($newsourcefile))
 		{
-			$contents = file_get_contents($newsourcefile);	// Need PHP 4.3
-			$encoded = chunk_split(base64_encode($contents), 76, $this->eol);    // 76 max is defined into http://tools.ietf.org/html/rfc2047
+			$contents = file_get_contents($newsourcefile); // Need PHP 4.3
+			$encoded = chunk_split(base64_encode($contents), 76, $this->eol); // 76 max is defined into http://tools.ietf.org/html/rfc2047
 			return $encoded;
 		}
 		else
 		{
-			$this->error="Error: Can't read file '".$sourcefile."' into _encode_file";
+			$this->error = "Error: Can't read file '".$sourcefile."' into _encode_file";
 			dol_syslog("CMailFile::encode_file: ".$this->error, LOG_ERR);
 			return -1;
 		}
@@ -888,30 +888,30 @@ 
 	function dump_mail()
 	{
         // phpcs:enable
-		global $conf,$dolibarr_main_data_root;
+		global $conf, $dolibarr_main_data_root;
 
 		if (@is_writeable($dolibarr_main_data_root))	// Avoid fatal error on fopen with open_basedir
 		{
-			$outputfile=$dolibarr_main_data_root."/dolibarr_mail.log";
-			$fp = fopen($outputfile,"w");
+			$outputfile = $dolibarr_main_data_root."/dolibarr_mail.log";
+			$fp = fopen($outputfile, "w");
 
 			if ($this->sendmode == 'mail')
 			{
 				fputs($fp, $this->headers);
-				fputs($fp, $this->eol);			// This eol is added by the mail function, so we add it in log
+				fputs($fp, $this->eol); // This eol is added by the mail function, so we add it in log
 				fputs($fp, $this->message);
 			}
 			elseif ($this->sendmode == 'smtps')
 			{
-				fputs($fp, $this->smtps->log);	// this->smtps->log is filled only if MAIN_MAIL_DEBUG was set to on
+				fputs($fp, $this->smtps->log); // this->smtps->log is filled only if MAIN_MAIL_DEBUG was set to on
 			}
 			elseif ($this->sendmode == 'swiftmailer')
 			{
-				fputs($fp, $this->logger->dump());	// this->logger is filled only if MAIN_MAIL_DEBUG was set to on
+				fputs($fp, $this->logger->dump()); // this->logger is filled only if MAIN_MAIL_DEBUG was set to on
 			}
 
 			fclose($fp);
-			if (! empty($conf->global->MAIN_UMASK))
+			if (!empty($conf->global->MAIN_UMASK))
 				@chmod($outputfile, octdec($conf->global->MAIN_UMASK));
 		}
 	}
@@ -925,15 +925,15 @@ 
 	 */
 	function checkIfHTML($msg)
 	{
-		if (!preg_match('/^[\s\t]*<html/i',$msg))
+		if (!preg_match('/^[\s\t]*<html/i', $msg))
 		{
 			$out = "<html><head><title></title>";
-			if (!empty($this->styleCSS)) $out.= $this->styleCSS;
-			$out.= "</head><body";
-			if (!empty($this->bodyCSS)) $out.= $this->bodyCSS;
-			$out.= ">";
-			$out.= $msg;
-			$out.= "</body></html>";
+			if (!empty($this->styleCSS)) $out .= $this->styleCSS;
+			$out .= "</head><body";
+			if (!empty($this->bodyCSS)) $out .= $this->bodyCSS;
+			$out .= ">";
+			$out .= $msg;
+			$out .= "</body></html>";
 		}
 		else
 		{
@@ -950,24 +950,24 @@ 
 	 */
 	function buildCSS()
 	{
-		if (! empty($this->css))
+		if (!empty($this->css))
 		{
 			// Style CSS
 			$this->styleCSS = '<style type="text/css">';
-			$this->styleCSS.= 'body {';
+			$this->styleCSS .= 'body {';
 
 			if ($this->css['bgcolor'])
 			{
-				$this->styleCSS.= '  background-color: '.$this->css['bgcolor'].';';
-				$this->bodyCSS.= ' bgcolor="'.$this->css['bgcolor'].'"';
+				$this->styleCSS .= '  background-color: '.$this->css['bgcolor'].';';
+				$this->bodyCSS .= ' bgcolor="'.$this->css['bgcolor'].'"';
 			}
 			if ($this->css['bgimage'])
 			{
 				// TODO recuperer cid
-				$this->styleCSS.= ' background-image: url("cid:'.$this->css['bgimage_cid'].'");';
+				$this->styleCSS .= ' background-image: url("cid:'.$this->css['bgimage_cid'].'");';
 			}
-			$this->styleCSS.= '}';
-			$this->styleCSS.= '</style>';
+			$this->styleCSS .= '}';
+			$this->styleCSS .= '</style>';
 		}
 	}
 
@@ -988,48 +988,48 @@ 
 
 		// Sender
 		//$out.= "Sender: ".getValidAddress($this->addr_from,2)).$this->eol2;
-		$out.= "From: ".$this->getValidAddress($this->addr_from,3,1).$this->eol2;
-		if (! empty($conf->global->MAIN_MAIL_SENDMAIL_FORCE_BA))
+		$out .= "From: ".$this->getValidAddress($this->addr_from, 3, 1).$this->eol2;
+		if (!empty($conf->global->MAIN_MAIL_SENDMAIL_FORCE_BA))
 		{
-			$out.= "To: ".$this->getValidAddress($this->addr_to,0,1).$this->eol2;
+			$out .= "To: ".$this->getValidAddress($this->addr_to, 0, 1).$this->eol2;
 		}
 		// Return-Path is important because it is used by SPF. Some MTA does not read Return-Path from header but from command line. See option MAIN_MAIL_ALLOW_SENDMAIL_F for that.
-		$out.= "Return-Path: ".$this->getValidAddress($this->addr_from,0,1).$this->eol2;
-		if (isset($this->reply_to)  && $this->reply_to)  $out.= "Reply-To: ".$this->getValidAddress($this->reply_to,2).$this->eol2;
-		if (isset($this->errors_to) && $this->errors_to) $out.= "Errors-To: ".$this->getValidAddress($this->errors_to,2).$this->eol2;
+		$out .= "Return-Path: ".$this->getValidAddress($this->addr_from, 0, 1).$this->eol2;
+		if (isset($this->reply_to) && $this->reply_to)  $out .= "Reply-To: ".$this->getValidAddress($this->reply_to, 2).$this->eol2;
+		if (isset($this->errors_to) && $this->errors_to) $out .= "Errors-To: ".$this->getValidAddress($this->errors_to, 2).$this->eol2;
 
 		// Receiver
-		if (isset($this->addr_cc)   && $this->addr_cc)   $out.= "Cc: ".$this->getValidAddress($this->addr_cc,2).$this->eol2;
-		if (isset($this->addr_bcc)  && $this->addr_bcc)  $out.= "Bcc: ".$this->getValidAddress($this->addr_bcc,2).$this->eol2;    // TODO Question: bcc must not be into header, only into SMTP command "RCPT TO". Does php mail support this ?
+		if (isset($this->addr_cc) && $this->addr_cc)   $out .= "Cc: ".$this->getValidAddress($this->addr_cc, 2).$this->eol2;
+		if (isset($this->addr_bcc) && $this->addr_bcc)  $out .= "Bcc: ".$this->getValidAddress($this->addr_bcc, 2).$this->eol2; // TODO Question: bcc must not be into header, only into SMTP command "RCPT TO". Does php mail support this ?
 
 		// Delivery receipt
-		if (isset($this->deliveryreceipt) && $this->deliveryreceipt == 1) $out.= "Disposition-Notification-To: ".$this->getValidAddress($this->addr_from,2).$this->eol2;
+		if (isset($this->deliveryreceipt) && $this->deliveryreceipt == 1) $out .= "Disposition-Notification-To: ".$this->getValidAddress($this->addr_from, 2).$this->eol2;
 
 		//$out.= "X-Priority: 3".$this->eol2;
 
-		$out.= 'Date: ' . date("r") . $this->eol2;
+		$out .= 'Date: '.date("r").$this->eol2;
 
 		$trackid = $this->trackid;
 		if ($trackid)
 		{
 			// References is kept in response and Message-ID is returned into In-Reply-To:
-			$out.= 'Message-ID: <' . time() . '.phpmail-dolibarr-'. $trackid . '@' . $host . ">" . $this->eol2;	// Uppercase seems replaced by phpmail
-			$out.= 'References: <' . time() . '.phpmail-dolibarr-'. $trackid . '@' . $host . ">" . $this->eol2;
-			$out.= 'X-Dolibarr-TRACKID: ' . $trackid . '@' . $host. $this->eol2;
+			$out .= 'Message-ID: <'.time().'.phpmail-dolibarr-'.$trackid.'@'.$host.">".$this->eol2; // Uppercase seems replaced by phpmail
+			$out .= 'References: <'.time().'.phpmail-dolibarr-'.$trackid.'@'.$host.">".$this->eol2;
+			$out .= 'X-Dolibarr-TRACKID: '.$trackid.'@'.$host.$this->eol2;
 		}
 		else
 		{
-			$out.= 'Message-ID: <' . time() . '.phpmail@' . $host . ">" . $this->eol2;
+			$out .= 'Message-ID: <'.time().'.phpmail@'.$host.">".$this->eol2;
 		}
 
-		if (! empty($_SERVER['REMOTE_ADDR'])) $out.= "X-RemoteAddr: " . $_SERVER['REMOTE_ADDR']. $this->eol2;
-		$out.= "X-Mailer: Dolibarr version " . DOL_VERSION ." (using php mail)".$this->eol2;
-		$out.= "Mime-Version: 1.0".$this->eol2;
+		if (!empty($_SERVER['REMOTE_ADDR'])) $out .= "X-RemoteAddr: ".$_SERVER['REMOTE_ADDR'].$this->eol2;
+		$out .= "X-Mailer: Dolibarr version ".DOL_VERSION." (using php mail)".$this->eol2;
+		$out .= "Mime-Version: 1.0".$this->eol2;
 
 		//$out.= "From: ".$this->getValidAddress($this->addr_from,3,1).$this->eol;
 
-		$out.= "Content-Type: multipart/mixed;".$this->eol2." boundary=\"".$this->mixed_boundary."\"".$this->eol2;
-		$out.= "Content-Transfer-Encoding: 8bit".$this->eol2;		// TODO Seems to be ignored. Header is 7bit once received.
+		$out .= "Content-Type: multipart/mixed;".$this->eol2." boundary=\"".$this->mixed_boundary."\"".$this->eol2;
+		$out .= "Content-Transfer-Encoding: 8bit".$this->eol2; // TODO Seems to be ignored. Header is 7bit once received.
 
 		dol_syslog("CMailFile::write_smtpheaders smtp_header=\n".$out);
 		return $out;
@@ -1047,18 +1047,18 @@ 
 	function write_mimeheaders($filename_list, $mimefilename_list)
 	{
         // phpcs:enable
-		$mimedone=0;
+		$mimedone = 0;
 		$out = "";
 
 		if (is_array($filename_list))
 		{
-			$filename_list_size=count($filename_list);
-			for($i=0;$i < $filename_list_size;$i++)
+			$filename_list_size = count($filename_list);
+			for ($i = 0; $i < $filename_list_size; $i++)
 			{
 				if ($filename_list[$i])
 				{
 					if ($mimefilename_list[$i]) $filename_list[$i] = $mimefilename_list[$i];
-					$out.= "X-attachments: $filename_list[$i]".$this->eol2;
+					$out .= "X-attachments: $filename_list[$i]".$this->eol2;
 				}
 			}
 		}
@@ -1079,31 +1079,31 @@ 
         // phpcs:enable
 		global $conf;
 
-		$out='';
+		$out = '';
 
-		$out.= "--" . $this->mixed_boundary . $this->eol;
+		$out .= "--".$this->mixed_boundary.$this->eol;
 
 		if ($this->atleastoneimage)
 		{
-			$out.= "Content-Type: multipart/alternative;".$this->eol." boundary=\"".$this->alternative_boundary."\"".$this->eol;
-			$out.= $this->eol;
-			$out.= "--" . $this->alternative_boundary . $this->eol;
+			$out .= "Content-Type: multipart/alternative;".$this->eol." boundary=\"".$this->alternative_boundary."\"".$this->eol;
+			$out .= $this->eol;
+			$out .= "--".$this->alternative_boundary.$this->eol;
 		}
 
 		// Make RFC821 Compliant, replace bare linefeeds
-		$strContent = preg_replace("/(?<!\r)\n/si", "\r\n", $msgtext);	// PCRE modifier /s means new lines are common chars
-		if (! empty($conf->global->MAIN_FIX_FOR_BUGGED_MTA))
+		$strContent = preg_replace("/(?<!\r)\n/si", "\r\n", $msgtext); // PCRE modifier /s means new lines are common chars
+		if (!empty($conf->global->MAIN_FIX_FOR_BUGGED_MTA))
 		{
-			$strContent = preg_replace("/\r\n/si", "\n", $strContent);	// PCRE modifier /s means new lines are common chars
+			$strContent = preg_replace("/\r\n/si", "\n", $strContent); // PCRE modifier /s means new lines are common chars
 		}
 
 		$strContentAltText = '';
 		if ($this->msgishtml)
 		{
 			// Similar code to forge a text from html is also in CMailFile.class.php
-			$strContentAltText = preg_replace("/<br\s*[^>]*>/"," ", $strContent);
+			$strContentAltText = preg_replace("/<br\s*[^>]*>/", " ", $strContent);
 			$strContentAltText = html_entity_decode(strip_tags($strContentAltText));
-			$strContentAltText = rtrim(wordwrap($strContentAltText, 75, empty($conf->global->MAIN_FIX_FOR_BUGGED_MTA)?"\r\n":"\n"));
+			$strContentAltText = rtrim(wordwrap($strContentAltText, 75, empty($conf->global->MAIN_FIX_FOR_BUGGED_MTA) ? "\r\n" : "\n"));
 
 			// Check if html header already in message, if not complete the message
 			$strContent = $this->checkIfHTML($strContent);
@@ -1112,57 +1112,57 @@ 
 		// Make RFC2045 Compliant, split lines
 		//$strContent = rtrim(chunk_split($strContent));    // Function chunck_split seems ko if not used on a base64 content
 		// TODO Encode main content into base64 and use the chunk_split, or quoted-printable
-		$strContent = rtrim(wordwrap($strContent, 75, empty($conf->global->MAIN_FIX_FOR_BUGGED_MTA)?"\r\n":"\n"));   // TODO Using this method creates unexpected line break on text/plain content.
+		$strContent = rtrim(wordwrap($strContent, 75, empty($conf->global->MAIN_FIX_FOR_BUGGED_MTA) ? "\r\n" : "\n")); // TODO Using this method creates unexpected line break on text/plain content.
 
 		if ($this->msgishtml)
 		{
 			if ($this->atleastoneimage)
 			{
-				$out.= "Content-Type: text/plain; charset=".$conf->file->character_set_client.$this->eol;
+				$out .= "Content-Type: text/plain; charset=".$conf->file->character_set_client.$this->eol;
 				//$out.= "Content-Transfer-Encoding: 7bit".$this->eol;
-				$out.= $this->eol.($strContentAltText?$strContentAltText:strip_tags($strContent)).$this->eol; // Add plain text message
-				$out.= "--" . $this->alternative_boundary . $this->eol;
-				$out.= "Content-Type: multipart/related;".$this->eol." boundary=\"".$this->related_boundary."\"".$this->eol;
-				$out.= $this->eol;
-				$out.= "--" . $this->related_boundary . $this->eol;
+				$out .= $this->eol.($strContentAltText ? $strContentAltText : strip_tags($strContent)).$this->eol; // Add plain text message
+				$out .= "--".$this->alternative_boundary.$this->eol;
+				$out .= "Content-Type: multipart/related;".$this->eol." boundary=\"".$this->related_boundary."\"".$this->eol;
+				$out .= $this->eol;
+				$out .= "--".$this->related_boundary.$this->eol;
 			}
 
-			if (! $this->atleastoneimage && $strContentAltText && ! empty($conf->global->MAIN_MAIL_USE_MULTI_PART))    // Add plain text message part before html part
+			if (!$this->atleastoneimage && $strContentAltText && !empty($conf->global->MAIN_MAIL_USE_MULTI_PART))    // Add plain text message part before html part
 			{
-				$out.= "Content-Type: multipart/alternative;".$this->eol." boundary=\"".$this->alternative_boundary."\"".$this->eol;
-				$out.= $this->eol;
-				$out.= "--" . $this->alternative_boundary . $this->eol;
-				$out.= "Content-Type: text/plain; charset=".$conf->file->character_set_client.$this->eol;
+				$out .= "Content-Type: multipart/alternative;".$this->eol." boundary=\"".$this->alternative_boundary."\"".$this->eol;
+				$out .= $this->eol;
+				$out .= "--".$this->alternative_boundary.$this->eol;
+				$out .= "Content-Type: text/plain; charset=".$conf->file->character_set_client.$this->eol;
 				//$out.= "Content-Transfer-Encoding: 7bit".$this->eol;
-				$out.= $this->eol.$strContentAltText.$this->eol;
-				$out.= "--" . $this->alternative_boundary . $this->eol;
+				$out .= $this->eol.$strContentAltText.$this->eol;
+				$out .= "--".$this->alternative_boundary.$this->eol;
 			}
 
-			$out.= "Content-Type: text/html; charset=".$conf->file->character_set_client.$this->eol;
+			$out .= "Content-Type: text/html; charset=".$conf->file->character_set_client.$this->eol;
 			//$out.= "Content-Transfer-Encoding: 7bit".$this->eol;	// TODO Use base64
-			$out.= $this->eol.$strContent.$this->eol;
+			$out .= $this->eol.$strContent.$this->eol;
 
-			if (! $this->atleastoneimage && $strContentAltText && ! empty($conf->global->MAIN_MAIL_USE_MULTI_PART))    // Add plain text message part after html part
+			if (!$this->atleastoneimage && $strContentAltText && !empty($conf->global->MAIN_MAIL_USE_MULTI_PART))    // Add plain text message part after html part
 			{
-				$out.= "--" . $this->alternative_boundary . "--". $this->eol;
+				$out .= "--".$this->alternative_boundary."--".$this->eol;
 			}
 		}
 		else
 		{
-			$out.= "Content-Type: text/plain; charset=".$conf->file->character_set_client.$this->eol;
+			$out .= "Content-Type: text/plain; charset=".$conf->file->character_set_client.$this->eol;
 			//$out.= "Content-Transfer-Encoding: 7bit".$this->eol;
-			$out.= $this->eol.$strContent.$this->eol;
+			$out .= $this->eol.$strContent.$this->eol;
 		}
 
-		$out.= $this->eol;
+		$out .= $this->eol;
 
 		// Encode images
 		if ($this->atleastoneimage)
 		{
 			$out .= $this->write_images($this->images_encoded);
 			// always end related and end alternative after inline images
-			$out .= "--" . $this->related_boundary . "--" . $this->eol;
-			$out .= $this->eol . "--" . $this->alternative_boundary . "--" . $this->eol;
+			$out .= "--".$this->related_boundary."--".$this->eol;
+			$out .= $this->eol."--".$this->alternative_boundary."--".$this->eol;
 			$out .= $this->eol;
 		}
 
@@ -1178,13 +1178,13 @@ 
 	 * @param 	array	$mimefilename_list	Tableau
 	 * @return	string						Chaine fichiers encodes
 	 */
-	function write_files($filename_list,$mimetype_list,$mimefilename_list)
+	function write_files($filename_list, $mimetype_list, $mimefilename_list)
 	{
         // phpcs:enable
 		$out = '';
 
-		$filename_list_size=count($filename_list);
-		for($i=0;$i < $filename_list_size;$i++)
+		$filename_list_size = count($filename_list);
+		for ($i = 0; $i < $filename_list_size; $i++)
 		{
 			if ($filename_list[$i])
 			{
@@ -1193,18 +1193,18 @@ 
 				if ($encoded >= 0)
 				{
 					if ($mimefilename_list[$i]) $filename_list[$i] = $mimefilename_list[$i];
-					if (! $mimetype_list[$i]) {
+					if (!$mimetype_list[$i]) {
 						$mimetype_list[$i] = "application/octet-stream";
 					}
 
-					$out.= "--" . $this->mixed_boundary . $this->eol;
-					$out.= "Content-Disposition: attachment; filename=\"".$filename_list[$i]."\"".$this->eol;
-					$out.= "Content-Type: " . $mimetype_list[$i] . "; name=\"".$filename_list[$i]."\"".$this->eol;
-					$out.= "Content-Transfer-Encoding: base64".$this->eol;
-					$out.= "Content-Description: ".$filename_list[$i].$this->eol;
-					$out.= $this->eol;
-					$out.= $encoded;
-					$out.= $this->eol;
+					$out .= "--".$this->mixed_boundary.$this->eol;
+					$out .= "Content-Disposition: attachment; filename=\"".$filename_list[$i]."\"".$this->eol;
+					$out .= "Content-Type: ".$mimetype_list[$i]."; name=\"".$filename_list[$i]."\"".$this->eol;
+					$out .= "Content-Transfer-Encoding: base64".$this->eol;
+					$out .= "Content-Description: ".$filename_list[$i].$this->eol;
+					$out .= $this->eol;
+					$out .= $encoded;
+					$out .= $this->eol;
 					//$out.= $this->eol;
 				}
 				else
@@ -1236,14 +1236,14 @@ 
 			{
 				dol_syslog("CMailFile::write_images: ".$img["name"]);
 
-				$out.= "--" . $this->related_boundary . $this->eol; // always related for an inline image
-				$out.= "Content-Type: " . $img["content_type"] . "; name=\"".$img["name"]."\"".$this->eol;
-				$out.= "Content-Transfer-Encoding: base64".$this->eol;
-				$out.= "Content-Disposition: inline; filename=\"".$img["name"]."\"".$this->eol;
-				$out.= "Content-ID: <".$img["cid"].">".$this->eol;
-				$out.= $this->eol;
-				$out.= $img["image_encoded"];
-				$out.= $this->eol;
+				$out .= "--".$this->related_boundary.$this->eol; // always related for an inline image
+				$out .= "Content-Type: ".$img["content_type"]."; name=\"".$img["name"]."\"".$this->eol;
+				$out .= "Content-Transfer-Encoding: base64".$this->eol;
+				$out .= "Content-Disposition: inline; filename=\"".$img["name"]."\"".$this->eol;
+				$out .= "Content-ID: <".$img["cid"].">".$this->eol;
+				$out .= $this->eol;
+				$out .= $img["image_encoded"];
+				$out .= $this->eol;
 			}
 		}
 
@@ -1259,44 +1259,44 @@ 
 	 * @param 	int			$port		Example: 25, 465
 	 * @return	int						Socket id if ok, 0 if KO
 	 */
-	function check_server_port($host,$port)
+	function check_server_port($host, $port)
 	{
         // phpcs:enable
 		global $conf;
 
-		$_retVal=0;
-		$timeout=5;	// Timeout in seconds
+		$_retVal = 0;
+		$timeout = 5; // Timeout in seconds
 
 		if (function_exists('fsockopen'))
 		{
-			$keyforsmtpserver='MAIN_MAIL_SMTP_SERVER';
-			$keyforsmtpport  ='MAIN_MAIL_SMTP_PORT';
-			$keyforsmtpid    ='MAIN_MAIL_SMTPS_ID';
-			$keyforsmtppw    ='MAIN_MAIL_SMTPS_PW';
-			$keyfortls       ='MAIN_MAIL_EMAIL_TLS';
-			$keyforstarttls  ='MAIN_MAIL_EMAIL_STARTTLS';
+			$keyforsmtpserver = 'MAIN_MAIL_SMTP_SERVER';
+			$keyforsmtpport  = 'MAIN_MAIL_SMTP_PORT';
+			$keyforsmtpid    = 'MAIN_MAIL_SMTPS_ID';
+			$keyforsmtppw    = 'MAIN_MAIL_SMTPS_PW';
+			$keyfortls       = 'MAIN_MAIL_EMAIL_TLS';
+			$keyforstarttls  = 'MAIN_MAIL_EMAIL_STARTTLS';
 			if ($this->sendcontext == 'emailing' && !empty($conf->global->MAIN_MAIL_SENDMODE_EMAILING) && $conf->global->MAIN_MAIL_SENDMODE_EMAILING != 'default')
 			{
-				$keyforsmtpserver='MAIN_MAIL_SMTP_SERVER_EMAILING';
-				$keyforsmtpport  ='MAIN_MAIL_SMTP_PORT_EMAILING';
-				$keyforsmtpid    ='MAIN_MAIL_SMTPS_ID_EMAILING';
-				$keyforsmtppw    ='MAIN_MAIL_SMTPS_PW_EMAILING';
-				$keyfortls       ='MAIN_MAIL_EMAIL_TLS_EMAILING';
-				$keyforstarttls  ='MAIN_MAIL_EMAIL_STARTTLS_EMAILING';
+				$keyforsmtpserver = 'MAIN_MAIL_SMTP_SERVER_EMAILING';
+				$keyforsmtpport  = 'MAIN_MAIL_SMTP_PORT_EMAILING';
+				$keyforsmtpid    = 'MAIN_MAIL_SMTPS_ID_EMAILING';
+				$keyforsmtppw    = 'MAIN_MAIL_SMTPS_PW_EMAILING';
+				$keyfortls       = 'MAIN_MAIL_EMAIL_TLS_EMAILING';
+				$keyforstarttls  = 'MAIN_MAIL_EMAIL_STARTTLS_EMAILING';
 			}
 
 			// If we use SSL/TLS
-			if (! empty($conf->global->$keyfortls) && function_exists('openssl_open')) $host='ssl://'.$host;
+			if (!empty($conf->global->$keyfortls) && function_exists('openssl_open')) $host = 'ssl://'.$host;
 			// tls smtp start with no encryption
 			//if (! empty($conf->global->MAIN_MAIL_EMAIL_STARTTLS) && function_exists('openssl_open')) $host='tls://'.$host;
 
 			dol_syslog("Try socket connection to host=".$host." port=".$port);
 			//See if we can connect to the SMTP server
 			if ($socket = @fsockopen(
-					$host,       // Host to test, IP or domain. Add ssl:// for SSL/TLS.
-					$port,       // which Port number to use
-					$errno,      // actual system level error
-					$errstr,     // and any text that goes with the error
+					$host, // Host to test, IP or domain. Add ssl:// for SSL/TLS.
+					$port, // which Port number to use
+					$errno, // actual system level error
+					$errstr, // and any text that goes with the error
 					$timeout
 			))  // timeout for reading/writing data over the socket
 			{
@@ -1306,11 +1306,11 @@ 
 				dol_syslog("Now we wait for answer 220");
 
 				// Check response from Server
-				if ( $_retVal = $this->server_parse($socket, "220") ) $_retVal = $socket;
+				if ($_retVal = $this->server_parse($socket, "220")) $_retVal = $socket;
 			}
 			else
 			{
-				$this->error = utf8_check('Error '.$errno.' - '.$errstr)?'Error '.$errno.' - '.$errstr:utf8_encode('Error '.$errno.' - '.$errstr);
+				$this->error = utf8_check('Error '.$errno.' - '.$errstr) ? 'Error '.$errno.' - '.$errstr : utf8_encode('Error '.$errno.' - '.$errstr);
 			}
 		}
 		return $_retVal;
@@ -1328,21 +1328,21 @@ 
 	function server_parse($socket, $response)
 	{
         // phpcs:enable
-		$_retVal = true;	// Indicates if Object was created or not
+		$_retVal = true; // Indicates if Object was created or not
 		$server_response = '';
 
-		while (substr($server_response,3,1) != ' ')
+		while (substr($server_response, 3, 1) != ' ')
 		{
-			if (! ($server_response = fgets($socket, 256)) )
+			if (!($server_response = fgets($socket, 256)))
 			{
-				$this->error="Couldn't get mail server response codes";
+				$this->error = "Couldn't get mail server response codes";
 				return false;
 			}
 		}
 
-		if( !( substr($server_response, 0, 3) == $response ) )
+		if (!(substr($server_response, 0, 3) == $response))
 		{
-			$this->error="Ran into problems sending Mail.\r\nResponse: $server_response";
+			$this->error = "Ran into problems sending Mail.\r\nResponse: $server_response";
 			$_retVal = false;
 		}
 
@@ -1361,22 +1361,22 @@ 
 		$extensions = array_keys($this->image_types);
 
 		$matches = array();
-		preg_match_all('/(?:"|\')([^"\']+\.('.implode('|', $extensions).'))(?:"|\')/Ui', $this->html, $matches);  // If "xxx.ext" or 'xxx.ext' found
+		preg_match_all('/(?:"|\')([^"\']+\.('.implode('|', $extensions).'))(?:"|\')/Ui', $this->html, $matches); // If "xxx.ext" or 'xxx.ext' found
 
-		if (! empty($matches))
+		if (!empty($matches))
 		{
-			$i=0;
+			$i = 0;
 			foreach ($matches[1] as $full)
 			{
 
-				if (preg_match('/file=([A-Za-z0-9_\-\/]+[\.]?[A-Za-z0-9]+)?$/i',$full,$regs))   // If xxx is 'file=aaa'
+				if (preg_match('/file=([A-Za-z0-9_\-\/]+[\.]?[A-Za-z0-9]+)?$/i', $full, $regs))   // If xxx is 'file=aaa'
 				{
 					$img = $regs[1];
 
 					if (file_exists($images_dir.'/'.$img))
 					{
 						// Image path in src
-						$src = preg_quote($full,'/');
+						$src = preg_quote($full, '/');
 
 						// Image full path
 						$this->html_images[$i]["fullpath"] = $images_dir.'/'.$img;
@@ -1387,12 +1387,12 @@ 
 						// Content type
 						if (preg_match('/^.+\.(\w{3,4})$/', $img, $reg))
 						{
-							$ext=strtolower($reg[1]);
+							$ext = strtolower($reg[1]);
 							$this->html_images[$i]["content_type"] = $this->image_types[$ext];
 						}
 
 						// cid
-						$this->html_images[$i]["cid"] = dol_hash(uniqid(time()), 3);	// Force md5 hash (does not contains special chars)
+						$this->html_images[$i]["cid"] = dol_hash(uniqid(time()), 3); // Force md5 hash (does not contains special chars)
 						$this->html = preg_replace("/src=\"$src\"|src='$src'/i", "src=\"cid:".$this->html_images[$i]["cid"]."\"", $this->html);
 					}
 					$i++;
@@ -1403,20 +1403,20 @@ 
 			{
 				$inline = array();
 
-				$i=0;
+				$i = 0;
 
 				foreach ($this->html_images as $img)
 				{
 					$fullpath = $images_dir.'/'.$img["name"];
 
 					// If duplicate images are embedded, they may show up as attachments, so remove them.
-					if (!in_array($fullpath,$inline))
+					if (!in_array($fullpath, $inline))
 					{
 						// Read image file
 						if ($image = file_get_contents($fullpath))
 						{
 							// On garde que le nom de l'image
-							preg_match('/([A-Za-z0-9_-]+[\.]?[A-Za-z0-9]+)?$/i',$img["name"],$regs);
+							preg_match('/([A-Za-z0-9_-]+[\.]?[A-Za-z0-9]+)?$/i', $img["name"], $regs);
 							$imgName = $regs[1];
 
 							$this->images_encoded[$i]['name'] = $imgName;
@@ -1457,19 +1457,19 @@ 
 	 *										     If format 3: '<john@doe.com>' or '"John Doe" <john@doe.com>' or '"=?UTF-8?B?Sm9obiBEb2U=?=" <john@doe.com>'
 	 *                                           If format 4: 'John Doe' or 'john@doe.com' if no label exists
 	 */
-	static function getValidAddress($address,$format,$encode=0,$maxnumberofemail=0)
+	static function getValidAddress($address, $format, $encode = 0, $maxnumberofemail = 0)
 	{
 		global $conf;
 
-		$ret='';
+		$ret = '';
 
-		$arrayaddress=explode(',',$address);
+		$arrayaddress = explode(',', $address);
 
 		// Boucle sur chaque composant de l'adresse
-		$i=0;
-		foreach($arrayaddress as $val)
+		$i = 0;
+		foreach ($arrayaddress as $val)
 		{
-			if (preg_match('/^(.*)<(.*)>$/i',trim($val),$regs))
+			if (preg_match('/^(.*)<(.*)>$/i', trim($val), $regs))
 			{
 				$name  = trim($regs[1]);
 				$email = trim($regs[2]);
@@ -1484,32 +1484,32 @@ 
 			{
 				$i++;
 
-				$newemail='';
+				$newemail = '';
 				if ($format == 4)
 				{
-					$newemail = $name?$name:$email;
+					$newemail = $name ? $name : $email;
 				}
 				if ($format == 2)
 				{
-					$newemail=$email;
+					$newemail = $email;
 				}
 				if ($format == 1 || $format == 3)
 				{
-					$newemail='<'.$email.'>';
+					$newemail = '<'.$email.'>';
 				}
 				if ($format == 0 || $format == 3)
 				{
-					if (! empty($conf->global->MAIN_MAIL_NO_FULL_EMAIL)) $newemail='<'.$email.'>';
-					elseif (! $name) $newemail='<'.$email.'>';
-					else $newemail=($format==3?'"':'').($encode?self::encodetorfc2822($name):$name).($format==3?'"':'').' <'.$email.'>';
+					if (!empty($conf->global->MAIN_MAIL_NO_FULL_EMAIL)) $newemail = '<'.$email.'>';
+					elseif (!$name) $newemail = '<'.$email.'>';
+					else $newemail = ($format == 3 ? '"' : '').($encode ?self::encodetorfc2822($name) : $name).($format == 3 ? '"' : '').' <'.$email.'>';
 				}
 
-				$ret=($ret ? $ret.',' : '').$newemail;
+				$ret = ($ret ? $ret.',' : '').$newemail;
 
 				// Stop if we have too much records
 				if ($maxnumberofemail && $i >= $maxnumberofemail)
 				{
-					if (count($arrayaddress) > $maxnumberofemail) $ret.='...';
+					if (count($arrayaddress) > $maxnumberofemail) $ret .= '...';
 					break;
 				}
 			}
@@ -1528,14 +1528,14 @@ 
 	{
 		global $conf;
 
-		$ret=array();
+		$ret = array();
 
-		$arrayaddress=explode(',',$address);
+		$arrayaddress = explode(',', $address);
 
 		// Boucle sur chaque composant de l'adresse
-		foreach($arrayaddress as $val)
+		foreach ($arrayaddress as $val)
 		{
-			if (preg_match('/^(.*)<(.*)>$/i',trim($val),$regs))
+			if (preg_match('/^(.*)<(.*)>$/i', trim($val), $regs))
 			{
 				$name  = trim($regs[1]);
 				$email = trim($regs[2]);
@@ -1546,7 +1546,7 @@ 
 				$email = trim($val);
 			}
 
-			$ret[$email]=empty($conf->global->MAIN_MAIL_NO_FULL_EMAIL)?$name:null;
+			$ret[$email] = empty($conf->global->MAIN_MAIL_NO_FULL_EMAIL) ? $name : null;
 		}
 
 		return $ret;

Braces +221 added lines, -113 removed lines

@@ -125,7 +125,9 @@ 
 
 		$this->sendcontext = $sendcontext;
 
-		if (empty($replyto)) $replyto=$from;
+		if (empty($replyto)) {
+		    $replyto=$from;
+		}
 
 		// Define this->sendmode
 		$this->sendmode = '';
@@ -133,8 +135,12 @@ 
 		{
 			$this->sendmode = $conf->global->MAIN_MAIL_SENDMODE_EMAILING;
 		}
-		if (empty($this->sendmode)) $this->sendmode=$conf->global->MAIN_MAIL_SENDMODE;
-		if (empty($this->sendmode)) $this->sendmode='mail';
+		if (empty($this->sendmode)) {
+		    $this->sendmode=$conf->global->MAIN_MAIL_SENDMODE;
+		}
+		if (empty($this->sendmode)) {
+		    $this->sendmode='mail';
+		}
 
 		// We define end of line (RFC 821).
 		$this->eol="\r\n";
@@ -175,9 +181,10 @@ 
 		if ($msgishtml == -1)
 		{
 			$this->msgishtml = 0;
-			if (dol_textishtml($msg)) $this->msgishtml = 1;
-		}
-		else
+			if (dol_textishtml($msg)) {
+			    $this->msgishtml = 1;
+			}
+		} else
 		{
 			$this->msgishtml = $msgishtml;
 		}
@@ -192,7 +199,10 @@ 
 		// Replace relative /viewimage to absolute path
 		$msg = preg_replace('/src="'.preg_quote(DOL_URL_ROOT,'/').'\/viewimage\.php/ims', 'src="'.$urlwithroot.'/viewimage.php', $msg, -1, $nbrep);
 
-		if (! empty($conf->global->MAIN_MAIL_FORCE_CONTENT_TYPE_TO_HTML)) $this->msgishtml=1; // To force to send everything with content type html.
+		if (! empty($conf->global->MAIN_MAIL_FORCE_CONTENT_TYPE_TO_HTML)) {
+		    $this->msgishtml=1;
+		}
+		// To force to send everything with content type html.
 
 		// Detect images
 		if ($this->msgishtml)
@@ -232,7 +242,9 @@ 
 		}
 
 		// Add autocopy to (Note: Adding bcc for specific modules are also done from pages)
-		if (! empty($conf->global->MAIN_MAIL_AUTOCOPY_TO)) $addr_bcc.=($addr_bcc?', ':'').$conf->global->MAIN_MAIL_AUTOCOPY_TO;
+		if (! empty($conf->global->MAIN_MAIL_AUTOCOPY_TO)) {
+		    $addr_bcc.=($addr_bcc?', ':'').$conf->global->MAIN_MAIL_AUTOCOPY_TO;
+		}
 
 		// Action according to choosed sending method
 		if ($this->sendmode == 'mail')
@@ -257,7 +269,10 @@ 
 			$this->trackid = $trackid;
 
 			$smtp_headers = $this->write_smtpheaders();
-			if (! empty($moreinheader)) $smtp_headers.=$moreinheader;   // $moreinheader contains the \r\n
+			if (! empty($moreinheader)) {
+			    $smtp_headers.=$moreinheader;
+			}
+			// $moreinheader contains the \r\n
 
 			// Define mime_headers
 			$mime_headers = $this->write_mimeheaders($filename_list, $mimefilename_list);
@@ -293,8 +308,7 @@ 
 			$this->message = 'This is a message with multiple parts in MIME format.'.$this->eol;
 			$this->message.= $text_body . $files_encoded;
 			$this->message.= "--" . $this->mixed_boundary . "--" . $this->eol;
-		}
-		else if ($this->sendmode == 'smtps')
+		} else if ($this->sendmode == 'smtps')
 		{
 			// Use SMTPS library
 			// ------------------------------------------
@@ -309,7 +323,9 @@ 
 			$smtps->setTrackId($trackid);
 			$smtps->setReplyTo($this->getValidAddress($replyto,0,1));
 
-			if (! empty($moreinheader)) $smtps->setMoreInHeader($moreinheader);
+			if (! empty($moreinheader)) {
+			    $smtps->setMoreInHeader($moreinheader);
+			}
 
 			if (! empty($this->html))
 			{
@@ -322,8 +338,11 @@ 
 				$msg = $this->checkIfHTML($msg);
 			}
 
-			if ($this->msgishtml) $smtps->setBodyContent($msg,'html');
-			else $smtps->setBodyContent($msg,'plain');
+			if ($this->msgishtml) {
+			    $smtps->setBodyContent($msg,'html');
+			} else {
+			    $smtps->setBodyContent($msg,'plain');
+			}
 
 			if ($this->atleastoneimage)
 			{
@@ -348,8 +367,7 @@ 
 			$smtps->setDeliveryReceipt($deliveryreceipt);
 
 			$this->smtps=$smtps;
-		}
-		else if ($this->sendmode == 'swiftmailer')
+		} else if ($this->sendmode == 'swiftmailer')
 		{
 			// Use Swift Mailer library
 			// ------------------------------------------
@@ -474,12 +492,17 @@ 
 				}
 			}
 
-			if (! empty($addr_cc)) $this->message->setCc($this->getArrayAddress($addr_cc));
-			if (! empty($addr_bcc)) $this->message->setBcc($this->getArrayAddress($addr_bcc));
+			if (! empty($addr_cc)) {
+			    $this->message->setCc($this->getArrayAddress($addr_cc));
+			}
+			if (! empty($addr_bcc)) {
+			    $this->message->setBcc($this->getArrayAddress($addr_bcc));
+			}
 			//if (! empty($errors_to)) $this->message->setErrorsTo($this->getArrayAddress($errors_to);
-			if (isset($deliveryreceipt) && $deliveryreceipt == 1) $this->message->setReadReceiptTo($this->getArrayAddress($from));
-		}
-		else
+			if (isset($deliveryreceipt) && $deliveryreceipt == 1) {
+			    $this->message->setReadReceiptTo($this->getArrayAddress($from));
+			}
+		} else
 		{
 			// Send mail method not correctly defined
 			// --------------------------------------
@@ -517,13 +540,17 @@ 
 
 				return $reshook;
 			}
-			if ($reshook == 1)	// Hook replace standard code
+			if ($reshook == 1) {
+			    // Hook replace standard code
 			{
 				return true;
 			}
+			}
 
 			// Check number of recipient is lower or equal than MAIL_MAX_NB_OF_RECIPIENTS_IN_SAME_EMAIL
-			if (empty($conf->global->MAIL_MAX_NB_OF_RECIPIENTS_TO_IN_SAME_EMAIL)) $conf->global->MAIL_MAX_NB_OF_RECIPIENTS_TO_IN_SAME_EMAIL=10;
+			if (empty($conf->global->MAIL_MAX_NB_OF_RECIPIENTS_TO_IN_SAME_EMAIL)) {
+			    $conf->global->MAIL_MAX_NB_OF_RECIPIENTS_TO_IN_SAME_EMAIL=10;
+			}
 			$tmparray1 = explode(',', $this->addr_to);
 			if (count($tmparray1) > $conf->global->MAIL_MAX_NB_OF_RECIPIENTS_TO_IN_SAME_EMAIL)
 			{
@@ -531,7 +558,9 @@ 
 				dol_syslog("CMailFile::sendfile: mail end error=" . $this->error, LOG_WARNING);
 				return false;
 			}
-			if (empty($conf->global->MAIL_MAX_NB_OF_RECIPIENTS_CC_IN_SAME_EMAIL)) $conf->global->MAIL_MAX_NB_OF_RECIPIENTS_CC_IN_SAME_EMAIL=10;
+			if (empty($conf->global->MAIL_MAX_NB_OF_RECIPIENTS_CC_IN_SAME_EMAIL)) {
+			    $conf->global->MAIL_MAX_NB_OF_RECIPIENTS_CC_IN_SAME_EMAIL=10;
+			}
 			$tmparray2 = explode(',', $this->addr_cc);
 			if (count($tmparray2) > $conf->global->MAIL_MAX_NB_OF_RECIPIENTS_CC_IN_SAME_EMAIL)
 			{
@@ -539,7 +568,9 @@ 
 				dol_syslog("CMailFile::sendfile: mail end error=" . $this->error, LOG_WARNING);
 				return false;
 			}
-			if (empty($conf->global->MAIL_MAX_NB_OF_RECIPIENTS_BCC_IN_SAME_EMAIL)) $conf->global->MAIL_MAX_NB_OF_RECIPIENTS_BCC_IN_SAME_EMAIL=10;
+			if (empty($conf->global->MAIL_MAX_NB_OF_RECIPIENTS_BCC_IN_SAME_EMAIL)) {
+			    $conf->global->MAIL_MAX_NB_OF_RECIPIENTS_BCC_IN_SAME_EMAIL=10;
+			}
 			$tmparray3 = explode(',', $this->addr_bcc);
 			if (count($tmparray3) > $conf->global->MAIL_MAX_NB_OF_RECIPIENTS_BCC_IN_SAME_EMAIL)
 			{
@@ -547,7 +578,9 @@ 
 				dol_syslog("CMailFile::sendfile: mail end error=" . $this->error, LOG_WARNING);
 				return false;
 			}
-			if (empty($conf->global->MAIL_MAX_NB_OF_RECIPIENTS_IN_SAME_EMAIL)) $conf->global->MAIL_MAX_NB_OF_RECIPIENTS_IN_SAME_EMAIL=10;
+			if (empty($conf->global->MAIL_MAX_NB_OF_RECIPIENTS_IN_SAME_EMAIL)) {
+			    $conf->global->MAIL_MAX_NB_OF_RECIPIENTS_IN_SAME_EMAIL=10;
+			}
 			if ((count($tmparray1)+count($tmparray2)+count($tmparray3)) > $conf->global->MAIL_MAX_NB_OF_RECIPIENTS_IN_SAME_EMAIL)
 			{
 				$this->error = 'Too much recipients in to:, cc:, bcc:';
@@ -590,13 +623,19 @@ 
 				// If Windows, sendmail_from must be defined
 				if (isset($_SERVER["WINDIR"]))
 				{
-					if (empty($this->addr_from)) $this->addr_from = 'robot@example.com';
+					if (empty($this->addr_from)) {
+					    $this->addr_from = 'robot@example.com';
+					}
 					@ini_set('sendmail_from',$this->getValidAddress($this->addr_from,2));
 				}
 
 				// Force parameters
-				if (! empty($conf->global->$keyforsmtpserver)) ini_set('SMTP',$conf->global->$keyforsmtpserver);
-				if (! empty($conf->global->$keyforsmtpport))   ini_set('smtp_port',$conf->global->$keyforsmtpport);
+				if (! empty($conf->global->$keyforsmtpserver)) {
+				    ini_set('SMTP',$conf->global->$keyforsmtpserver);
+				}
+				if (! empty($conf->global->$keyforsmtpport)) {
+				    ini_set('smtp_port',$conf->global->$keyforsmtpport);
+				}
 
 				$res=true;
 				if ($res && ! $this->subject)
@@ -624,29 +663,43 @@ 
 						// Having this variable not defined may create problems with some other sendmail (option -f required)
 						$additionnalparam .= ($additionnalparam?' ':'').(! empty($conf->global->MAIN_MAIL_ERRORS_TO) ? '-f' . $this->getValidAddress($conf->global->MAIN_MAIL_ERRORS_TO,2) : ($this->addr_from != '' ? '-f' . $this->getValidAddress($this->addr_from,2) : '') );
 					}
-					if (! empty($conf->global->MAIN_MAIL_SENDMAIL_FORCE_BA))    // To force usage of -ba option. This option tells sendmail to read From: or Sender: to setup sender
+					if (! empty($conf->global->MAIN_MAIL_SENDMAIL_FORCE_BA)) {
+					    // To force usage of -ba option. This option tells sendmail to read From: or Sender: to setup sender
 					{
 						$additionnalparam .= ($additionnalparam?' ':'').'-ba';
 					}
+					}
 
-					if (! empty($conf->global->MAIN_MAIL_SENDMAIL_FORCE_ADDPARAM)) $additionnalparam .= ($additionnalparam?' ':'').'-U '.$additionnalparam; // Use -U to add additionnal params
+					if (! empty($conf->global->MAIN_MAIL_SENDMAIL_FORCE_ADDPARAM)) {
+					    $additionnalparam .= ($additionnalparam?' ':'').'-U '.$additionnalparam;
+					}
+					// Use -U to add additionnal params
 
 					dol_syslog("CMailFile::sendfile: mail start HOST=".ini_get('SMTP').", PORT=".ini_get('smtp_port').", additionnal_parameters=".$additionnalparam, LOG_DEBUG);
 
 					$this->message=stripslashes($this->message);
 
-					if (! empty($conf->global->MAIN_MAIL_DEBUG)) $this->dump_mail();
+					if (! empty($conf->global->MAIN_MAIL_DEBUG)) {
+					    $this->dump_mail();
+					}
 
-					if (! empty($additionnalparam)) $res = mail($dest, $this->encodetorfc2822($this->subject), $this->message, $this->headers, $additionnalparam);
-					else $res = mail($dest, $this->encodetorfc2822($this->subject), $this->message, $this->headers);
+					if (! empty($additionnalparam)) {
+					    $res = mail($dest, $this->encodetorfc2822($this->subject), $this->message, $this->headers, $additionnalparam);
+					} else {
+					    $res = mail($dest, $this->encodetorfc2822($this->subject), $this->message, $this->headers);
+					}
 
 					if (! $res)
 					{
 						$langs->load("errors");
 						$this->error="Failed to send mail with php mail";
 						$linuxlike=1;
-						if (preg_match('/^win/i',PHP_OS)) $linuxlike=0;
-						if (preg_match('/^mac/i',PHP_OS)) $linuxlike=0;
+						if (preg_match('/^win/i',PHP_OS)) {
+						    $linuxlike=0;
+						}
+						if (preg_match('/^mac/i',PHP_OS)) {
+						    $linuxlike=0;
+						}
 						if (! $linuxlike)
 						{
 							$this->error.=" to HOST=".ini_get('SMTP').", PORT=".ini_get('smtp_port');	// This values are value used only for non linuxlike systems
@@ -654,8 +707,7 @@ 
 						$this->error.=".<br>";
 						$this->error.=$langs->trans("ErrorPhpMailDelivery");
 						dol_syslog("CMailFile::sendfile: mail end error=".$this->error, LOG_ERR);
-					}
-					else
+					} else
 					{
 						dol_syslog("CMailFile::sendfile: mail end success", LOG_DEBUG);
 					}
@@ -667,10 +719,13 @@ 
 				}
 
 				// Restore parameters
-				if (! empty($conf->global->$keyforsmtpserver))	ini_restore('SMTP');
-				if (! empty($conf->global->$keyforsmtpport)) 	ini_restore('smtp_port');
-			}
-			else if ($this->sendmode == 'smtps')
+				if (! empty($conf->global->$keyforsmtpserver)) {
+				    ini_restore('SMTP');
+				}
+				if (! empty($conf->global->$keyforsmtpport)) {
+				    ini_restore('smtp_port');
+				}
+			} else if ($this->sendmode == 'smtps')
 			{
 				if (! is_object($this->smtps))
 				{
@@ -684,14 +739,22 @@ 
 				$this->smtps->setTransportType(0);	// Only this method is coded in SMTPs library
 
 				// Clean parameters
-				if (empty($conf->global->$keyforsmtpserver)) $conf->global->$keyforsmtpserver=ini_get('SMTP');
-				if (empty($conf->global->$keyforsmtpport))   $conf->global->$keyforsmtpport=ini_get('smtp_port');
+				if (empty($conf->global->$keyforsmtpserver)) {
+				    $conf->global->$keyforsmtpserver=ini_get('SMTP');
+				}
+				if (empty($conf->global->$keyforsmtpport)) {
+				    $conf->global->$keyforsmtpport=ini_get('smtp_port');
+				}
 
 				// If we use SSL/TLS
 				$server=$conf->global->$keyforsmtpserver;
 				$secure='';
-				if (! empty($conf->global->$keyfortls) && function_exists('openssl_open')) $secure='ssl';
-				if (! empty($conf->global->$keyforstarttls) && function_exists('openssl_open')) $secure='tls';
+				if (! empty($conf->global->$keyfortls) && function_exists('openssl_open')) {
+				    $secure='ssl';
+				}
+				if (! empty($conf->global->$keyforstarttls) && function_exists('openssl_open')) {
+				    $secure='tls';
+				}
 				$server=($secure?$secure.'://':'').$server;
 
 				$port=$conf->global->$keyforsmtpport;
@@ -729,47 +792,63 @@ 
 
 				if ($res)
 				{
-					if (! empty($conf->global->MAIN_MAIL_DEBUG)) $this->smtps->setDebug(true);
+					if (! empty($conf->global->MAIN_MAIL_DEBUG)) {
+					    $this->smtps->setDebug(true);
+					}
 
 					$result=$this->smtps->sendMsg();
 					//print $result;
 
-					if (! empty($conf->global->MAIN_MAIL_DEBUG)) $this->dump_mail();
+					if (! empty($conf->global->MAIN_MAIL_DEBUG)) {
+					    $this->dump_mail();
+					}
 
 					$result=$this->smtps->getErrors();
 					if (empty($this->error) && empty($result))
 					{
 						dol_syslog("CMailFile::sendfile: mail end success", LOG_DEBUG);
 						$res=true;
-					}
-					else
+					} else
 					{
-						if (empty($this->error)) $this->error=$result;
+						if (empty($this->error)) {
+						    $this->error=$result;
+						}
 						dol_syslog("CMailFile::sendfile: mail end error=".$this->error, LOG_ERR);
 						$res=false;
 					}
 				}
-			}
-			else if ($this->sendmode == 'swiftmailer')
+			} else if ($this->sendmode == 'swiftmailer')
 			{
 				// Use Swift Mailer library
 				// ------------------------------------------
 				require_once DOL_DOCUMENT_ROOT.'/includes/swiftmailer/lib/swift_required.php';
 
 				// Clean parameters
-				if (empty($conf->global->$keyforsmtpserver)) $conf->global->$keyforsmtpserver=ini_get('SMTP');
-				if (empty($conf->global->$keyforsmtpport))   $conf->global->$keyforsmtpport=ini_get('smtp_port');
+				if (empty($conf->global->$keyforsmtpserver)) {
+				    $conf->global->$keyforsmtpserver=ini_get('SMTP');
+				}
+				if (empty($conf->global->$keyforsmtpport)) {
+				    $conf->global->$keyforsmtpport=ini_get('smtp_port');
+				}
 
 				// If we use SSL/TLS
 				$server = $conf->global->$keyforsmtpserver;
 				$secure = '';
-				if (! empty($conf->global->$keyfortls) && function_exists('openssl_open')) $secure='ssl';
-				if (! empty($conf->global->$keyforstarttls) && function_exists('openssl_open')) $secure='tls';
+				if (! empty($conf->global->$keyfortls) && function_exists('openssl_open')) {
+				    $secure='ssl';
+				}
+				if (! empty($conf->global->$keyforstarttls) && function_exists('openssl_open')) {
+				    $secure='tls';
+				}
 
 				$this->transport = new Swift_SmtpTransport($server, $conf->global->$keyforsmtpport, $secure);
 
-				if (! empty($conf->global->$keyforsmtpid)) $this->transport->setUsername($conf->global->$keyforsmtpid);
-				if (! empty($conf->global->$keyforsmtppw)) $this->transport->setPassword($conf->global->$keyforsmtppw);
+				if (! empty($conf->global->$keyforsmtpid)) {
+				    $this->transport->setUsername($conf->global->$keyforsmtpid);
+				}
+				if (! empty($conf->global->$keyforsmtppw)) {
+				    $this->transport->setPassword($conf->global->$keyforsmtppw);
+				}
 				//$smtps->_msgReplyTo  = 'reply@web.com';
 
 				// Create the Mailer using your created Transport
@@ -797,19 +876,19 @@ 
 				} catch (Exception $e) {
 					$this->error =  $e->getMessage();
 				}
-				if (! empty($conf->global->MAIN_MAIL_DEBUG)) $this->dump_mail();
+				if (! empty($conf->global->MAIN_MAIL_DEBUG)) {
+				    $this->dump_mail();
+				}
 
 				$res = true;
 				if (! empty($this->error) || ! $result) {
 					dol_syslog("CMailFile::sendfile: mail end error=".$this->error, LOG_ERR);
 					$res=false;
-				}
-				else
+				} else
 				{
 					dol_syslog("CMailFile::sendfile: mail end success", LOG_DEBUG);
 				}
-			}
-			else
+			} else
 			{
 				// Send mail method not correctly defined
 				// --------------------------------------
@@ -826,8 +905,7 @@ 
 
 				return $reshook;
 			}
-		}
-		else
+		} else
 		{
 			$this->error='No mail sent. Feature is disabled by option MAIN_DISABLE_ALL_MAILS';
 			dol_syslog("CMailFile::sendfile: ".$this->error, LOG_WARNING);
@@ -867,8 +945,7 @@ 
 			$contents = file_get_contents($newsourcefile);	// Need PHP 4.3
 			$encoded = chunk_split(base64_encode($contents), 76, $this->eol);    // 76 max is defined into http://tools.ietf.org/html/rfc2047
 			return $encoded;
-		}
-		else
+		} else
 		{
 			$this->error="Error: Can't read file '".$sourcefile."' into _encode_file";
 			dol_syslog("CMailFile::encode_file: ".$this->error, LOG_ERR);
@@ -890,9 +967,11 @@ 
         // phpcs:enable
 		global $conf,$dolibarr_main_data_root;
 
-		if (@is_writeable($dolibarr_main_data_root))	// Avoid fatal error on fopen with open_basedir
+		if (@is_writeable($dolibarr_main_data_root)) {
+		    // Avoid fatal error on fopen with open_basedir
 		{
 			$outputfile=$dolibarr_main_data_root."/dolibarr_mail.log";
+		}
 			$fp = fopen($outputfile,"w");
 
 			if ($this->sendmode == 'mail')
@@ -900,19 +979,18 @@ 
 				fputs($fp, $this->headers);
 				fputs($fp, $this->eol);			// This eol is added by the mail function, so we add it in log
 				fputs($fp, $this->message);
-			}
-			elseif ($this->sendmode == 'smtps')
+			} elseif ($this->sendmode == 'smtps')
 			{
 				fputs($fp, $this->smtps->log);	// this->smtps->log is filled only if MAIN_MAIL_DEBUG was set to on
-			}
-			elseif ($this->sendmode == 'swiftmailer')
+			} elseif ($this->sendmode == 'swiftmailer')
 			{
 				fputs($fp, $this->logger->dump());	// this->logger is filled only if MAIN_MAIL_DEBUG was set to on
 			}
 
 			fclose($fp);
-			if (! empty($conf->global->MAIN_UMASK))
-				@chmod($outputfile, octdec($conf->global->MAIN_UMASK));
+			if (! empty($conf->global->MAIN_UMASK)) {
+							@chmod($outputfile, octdec($conf->global->MAIN_UMASK));
+			}
 		}
 	}
 
@@ -928,14 +1006,17 @@ 
 		if (!preg_match('/^[\s\t]*<html/i',$msg))
 		{
 			$out = "<html><head><title></title>";
-			if (!empty($this->styleCSS)) $out.= $this->styleCSS;
+			if (!empty($this->styleCSS)) {
+			    $out.= $this->styleCSS;
+			}
 			$out.= "</head><body";
-			if (!empty($this->bodyCSS)) $out.= $this->bodyCSS;
+			if (!empty($this->bodyCSS)) {
+			    $out.= $this->bodyCSS;
+			}
 			$out.= ">";
 			$out.= $msg;
 			$out.= "</body></html>";
-		}
-		else
+		} else
 		{
 			$out = $msg;
 		}
@@ -995,15 +1076,26 @@ 
 		}
 		// Return-Path is important because it is used by SPF. Some MTA does not read Return-Path from header but from command line. See option MAIN_MAIL_ALLOW_SENDMAIL_F for that.
 		$out.= "Return-Path: ".$this->getValidAddress($this->addr_from,0,1).$this->eol2;
-		if (isset($this->reply_to)  && $this->reply_to)  $out.= "Reply-To: ".$this->getValidAddress($this->reply_to,2).$this->eol2;
-		if (isset($this->errors_to) && $this->errors_to) $out.= "Errors-To: ".$this->getValidAddress($this->errors_to,2).$this->eol2;
+		if (isset($this->reply_to)  && $this->reply_to) {
+		    $out.= "Reply-To: ".$this->getValidAddress($this->reply_to,2).$this->eol2;
+		}
+		if (isset($this->errors_to) && $this->errors_to) {
+		    $out.= "Errors-To: ".$this->getValidAddress($this->errors_to,2).$this->eol2;
+		}
 
 		// Receiver
-		if (isset($this->addr_cc)   && $this->addr_cc)   $out.= "Cc: ".$this->getValidAddress($this->addr_cc,2).$this->eol2;
-		if (isset($this->addr_bcc)  && $this->addr_bcc)  $out.= "Bcc: ".$this->getValidAddress($this->addr_bcc,2).$this->eol2;    // TODO Question: bcc must not be into header, only into SMTP command "RCPT TO". Does php mail support this ?
+		if (isset($this->addr_cc)   && $this->addr_cc) {
+		    $out.= "Cc: ".$this->getValidAddress($this->addr_cc,2).$this->eol2;
+		}
+		if (isset($this->addr_bcc)  && $this->addr_bcc) {
+		    $out.= "Bcc: ".$this->getValidAddress($this->addr_bcc,2).$this->eol2;
+		}
+		// TODO Question: bcc must not be into header, only into SMTP command "RCPT TO". Does php mail support this ?
 
 		// Delivery receipt
-		if (isset($this->deliveryreceipt) && $this->deliveryreceipt == 1) $out.= "Disposition-Notification-To: ".$this->getValidAddress($this->addr_from,2).$this->eol2;
+		if (isset($this->deliveryreceipt) && $this->deliveryreceipt == 1) {
+		    $out.= "Disposition-Notification-To: ".$this->getValidAddress($this->addr_from,2).$this->eol2;
+		}
 
 		//$out.= "X-Priority: 3".$this->eol2;
 
@@ -1016,13 +1108,14 @@ 
 			$out.= 'Message-ID: <' . time() . '.phpmail-dolibarr-'. $trackid . '@' . $host . ">" . $this->eol2;	// Uppercase seems replaced by phpmail
 			$out.= 'References: <' . time() . '.phpmail-dolibarr-'. $trackid . '@' . $host . ">" . $this->eol2;
 			$out.= 'X-Dolibarr-TRACKID: ' . $trackid . '@' . $host. $this->eol2;
-		}
-		else
+		} else
 		{
 			$out.= 'Message-ID: <' . time() . '.phpmail@' . $host . ">" . $this->eol2;
 		}
 
-		if (! empty($_SERVER['REMOTE_ADDR'])) $out.= "X-RemoteAddr: " . $_SERVER['REMOTE_ADDR']. $this->eol2;
+		if (! empty($_SERVER['REMOTE_ADDR'])) {
+		    $out.= "X-RemoteAddr: " . $_SERVER['REMOTE_ADDR']. $this->eol2;
+		}
 		$out.= "X-Mailer: Dolibarr version " . DOL_VERSION ." (using php mail)".$this->eol2;
 		$out.= "Mime-Version: 1.0".$this->eol2;
 
@@ -1057,7 +1150,9 @@ 
 			{
 				if ($filename_list[$i])
 				{
-					if ($mimefilename_list[$i]) $filename_list[$i] = $mimefilename_list[$i];
+					if ($mimefilename_list[$i]) {
+					    $filename_list[$i] = $mimefilename_list[$i];
+					}
 					$out.= "X-attachments: $filename_list[$i]".$this->eol2;
 				}
 			}
@@ -1127,9 +1222,11 @@ 
 				$out.= "--" . $this->related_boundary . $this->eol;
 			}
 
-			if (! $this->atleastoneimage && $strContentAltText && ! empty($conf->global->MAIN_MAIL_USE_MULTI_PART))    // Add plain text message part before html part
+			if (! $this->atleastoneimage && $strContentAltText && ! empty($conf->global->MAIN_MAIL_USE_MULTI_PART)) {
+			    // Add plain text message part before html part
 			{
 				$out.= "Content-Type: multipart/alternative;".$this->eol." boundary=\"".$this->alternative_boundary."\"".$this->eol;
+			}
 				$out.= $this->eol;
 				$out.= "--" . $this->alternative_boundary . $this->eol;
 				$out.= "Content-Type: text/plain; charset=".$conf->file->character_set_client.$this->eol;
@@ -1142,12 +1239,13 @@ 
 			//$out.= "Content-Transfer-Encoding: 7bit".$this->eol;	// TODO Use base64
 			$out.= $this->eol.$strContent.$this->eol;
 
-			if (! $this->atleastoneimage && $strContentAltText && ! empty($conf->global->MAIN_MAIL_USE_MULTI_PART))    // Add plain text message part after html part
+			if (! $this->atleastoneimage && $strContentAltText && ! empty($conf->global->MAIN_MAIL_USE_MULTI_PART)) {
+			    // Add plain text message part after html part
 			{
 				$out.= "--" . $this->alternative_boundary . "--". $this->eol;
 			}
-		}
-		else
+			}
+		} else
 		{
 			$out.= "Content-Type: text/plain; charset=".$conf->file->character_set_client.$this->eol;
 			//$out.= "Content-Transfer-Encoding: 7bit".$this->eol;
@@ -1192,7 +1290,9 @@ 
 				$encoded = $this->_encode_file($filename_list[$i]);
 				if ($encoded >= 0)
 				{
-					if ($mimefilename_list[$i]) $filename_list[$i] = $mimefilename_list[$i];
+					if ($mimefilename_list[$i]) {
+					    $filename_list[$i] = $mimefilename_list[$i];
+					}
 					if (! $mimetype_list[$i]) {
 						$mimetype_list[$i] = "application/octet-stream";
 					}
@@ -1206,8 +1306,7 @@ 
 					$out.= $encoded;
 					$out.= $this->eol;
 					//$out.= $this->eol;
-				}
-				else
+				} else
 				{
 					return $encoded;
 				}
@@ -1286,7 +1385,9 @@ 
 			}
 
 			// If we use SSL/TLS
-			if (! empty($conf->global->$keyfortls) && function_exists('openssl_open')) $host='ssl://'.$host;
+			if (! empty($conf->global->$keyfortls) && function_exists('openssl_open')) {
+			    $host='ssl://'.$host;
+			}
 			// tls smtp start with no encryption
 			//if (! empty($conf->global->MAIN_MAIL_EMAIL_STARTTLS) && function_exists('openssl_open')) $host='tls://'.$host;
 
@@ -1298,17 +1399,20 @@ 
 					$errno,      // actual system level error
 					$errstr,     // and any text that goes with the error
 					$timeout
-			))  // timeout for reading/writing data over the socket
+			)) {
+			    // timeout for reading/writing data over the socket
 			{
 				// Windows still does not have support for this timeout function
 				if (function_exists('stream_set_timeout')) stream_set_timeout($socket, $timeout, 0);
+			}
 
 				dol_syslog("Now we wait for answer 220");
 
 				// Check response from Server
-				if ( $_retVal = $this->server_parse($socket, "220") ) $_retVal = $socket;
-			}
-			else
+				if ( $_retVal = $this->server_parse($socket, "220") ) {
+				    $_retVal = $socket;
+				}
+			} else
 			{
 				$this->error = utf8_check('Error '.$errno.' - '.$errstr)?'Error '.$errno.' - '.$errstr:utf8_encode('Error '.$errno.' - '.$errstr);
 			}
@@ -1369,9 +1473,11 @@ 
 			foreach ($matches[1] as $full)
 			{
 
-				if (preg_match('/file=([A-Za-z0-9_\-\/]+[\.]?[A-Za-z0-9]+)?$/i',$full,$regs))   // If xxx is 'file=aaa'
+				if (preg_match('/file=([A-Za-z0-9_\-\/]+[\.]?[A-Za-z0-9]+)?$/i',$full,$regs)) {
+				    // If xxx is 'file=aaa'
 				{
 					$img = $regs[1];
+				}
 
 					if (file_exists($images_dir.'/'.$img))
 					{
@@ -1430,15 +1536,13 @@ 
 					}
 					$i++;
 				}
-			}
-			else
+			} else
 			{
 				return -1;
 			}
 
 			return 1;
-		}
-		else
+		} else
 		{
 			return 0;
 		}
@@ -1473,8 +1577,7 @@ 
 			{
 				$name  = trim($regs[1]);
 				$email = trim($regs[2]);
-			}
-			else
+			} else
 			{
 				$name  = '';
 				$email = trim($val);
@@ -1499,9 +1602,13 @@ 
 				}
 				if ($format == 0 || $format == 3)
 				{
-					if (! empty($conf->global->MAIN_MAIL_NO_FULL_EMAIL)) $newemail='<'.$email.'>';
-					elseif (! $name) $newemail='<'.$email.'>';
-					else $newemail=($format==3?'"':'').($encode?self::encodetorfc2822($name):$name).($format==3?'"':'').' <'.$email.'>';
+					if (! empty($conf->global->MAIN_MAIL_NO_FULL_EMAIL)) {
+					    $newemail='<'.$email.'>';
+					} elseif (! $name) {
+					    $newemail='<'.$email.'>';
+					} else {
+					    $newemail=($format==3?'"':'').($encode?self::encodetorfc2822($name):$name).($format==3?'"':'').' <'.$email.'>';
+					}
 				}
 
 				$ret=($ret ? $ret.',' : '').$newemail;
@@ -1509,7 +1616,9 @@ 
 				// Stop if we have too much records
 				if ($maxnumberofemail && $i >= $maxnumberofemail)
 				{
-					if (count($arrayaddress) > $maxnumberofemail) $ret.='...';
+					if (count($arrayaddress) > $maxnumberofemail) {
+					    $ret.='...';
+					}
 					break;
 				}
 			}
@@ -1539,8 +1648,7 @@ 
 			{
 				$name  = trim($regs[1]);
 				$email = trim($regs[2]);
-			}
-			else
+			} else
 			{
 				$name  = null;
 				$email = trim($val);