alxarafe / alixar

dolibarr/htdocs/core/class/vcard.class.php

Spacing +34 added lines, -34 removed lines

@@ -30,7 +30,7 @@ 
  */
 function encode($string)
 {
-    return str_replace(";","\;",(dol_quoted_printable_encode(utf8_decode($string))));
+    return str_replace(";", "\;", (dol_quoted_printable_encode(utf8_decode($string))));
 }
 
 
@@ -42,9 +42,9 @@ 
  * @param	int		$line_max	Max length of lines
  * @return	string				Encoded string
  */
-function dol_quoted_printable_encode($input, $line_max=76)
+function dol_quoted_printable_encode($input, $line_max = 76)
 {
-    $hex = array('0','1','2','3','4','5','6','7','8','9','A','B','C','D','E','F');
+    $hex = array('0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'A', 'B', 'C', 'D', 'E', 'F');
     $lines = preg_split("/(\?:\r\n|\r|\n)/", $input);
     $eol = "\r\n";
     $linebreak = "=0D=0A";
@@ -57,23 +57,23 @@ 
         $line = $lines[$j];
         $linlen = strlen($line);
         $newline = "";
-        for($i = 0; $i < $linlen; $i++) {
+        for ($i = 0; $i < $linlen; $i++) {
             $c = substr($line, $i, 1);
             $dec = ord($c);
-            if ( ($dec == 32) && ($i == ($linlen - 1)) ) { // convert space at eol only
+            if (($dec == 32) && ($i == ($linlen - 1))) { // convert space at eol only
                 $c = "=20";
-            } elseif ( ($dec == 61) || ($dec < 32 ) || ($dec > 126) ) { // always encode "\t", which is *not* required
-                $h2 = floor($dec/16); $h1 = floor($dec%16);
+            } elseif (($dec == 61) || ($dec < 32) || ($dec > 126)) { // always encode "\t", which is *not* required
+                $h2 = floor($dec / 16); $h1 = floor($dec % 16);
                 $c = $escape.$hex["$h2"].$hex["$h1"];
             }
-            if ( (strlen($newline) + strlen($c)) >= $line_max ) { // CRLF is not counted
+            if ((strlen($newline) + strlen($c)) >= $line_max) { // CRLF is not counted
                 $output .= $newline.$escape.$eol; // soft line break; " =\r\n" is okay
                 $newline = "    ";
             }
             $newline .= $c;
         } // end of for
         $output .= $newline;
-        if ($j<count($lines)-1) $output .= $linebreak;
+        if ($j < count($lines) - 1) $output .= $linebreak;
     }
     return trim($output);
 }
@@ -88,7 +88,7 @@ 
     var $filename;
 
     //var $encoding="UTF-8";
-    var $encoding="ISO-8859-1;ENCODING=QUOTED-PRINTABLE";
+    var $encoding = "ISO-8859-1;ENCODING=QUOTED-PRINTABLE";
 
 
     /**
@@ -98,12 +98,12 @@ 
      *	@param	string	$type		Type
      *	@return	void
      */
-    function setPhoneNumber($number, $type="")
+    function setPhoneNumber($number, $type = "")
     {
         // type may be PREF | WORK | HOME | VOICE | FAX | MSG | CELL | PAGER | BBS | CAR | MODEM | ISDN | VIDEO or any senseful combination, e.g. "PREF;WORK;VOICE"
         $key = "TEL";
-        if ($type!="") $key .= ";".$type;
-        $key.= ";CHARSET=".$this->encoding;
+        if ($type != "") $key .= ";".$type;
+        $key .= ";CHARSET=".$this->encoding;
         $this->properties[$key] = encode($number);
     }
 
@@ -142,7 +142,7 @@ 
      *	@param	string	$suffix			Suffix
      *	@return	void
      */
-    function setName($family="", $first="", $additional="", $prefix="", $suffix="")
+    function setName($family = "", $first = "", $additional = "", $prefix = "", $suffix = "")
     {
         $this->properties["N;CHARSET=".$this->encoding] = encode($family).";".encode($first).";".encode($additional).";".encode($prefix).";".encode($suffix);
         $this->filename = "$first%20$family.vcf";
@@ -174,12 +174,12 @@ 
      *	@param	string	$type			Type
      *	@return	void
      */
-    function setAddress($postoffice="", $extended="", $street="", $city="", $region="", $zip="", $country="", $type="HOME;POSTAL")
+    function setAddress($postoffice = "", $extended = "", $street = "", $city = "", $region = "", $zip = "", $country = "", $type = "HOME;POSTAL")
     {
         // $type may be DOM | INTL | POSTAL | PARCEL | HOME | WORK or any combination of these: e.g. "WORK;PARCEL;POSTAL"
         $key = "ADR";
-        if ($type!="") $key.= ";$type";
-        $key.= ";CHARSET=".$this->encoding;
+        if ($type != "") $key .= ";$type";
+        $key .= ";CHARSET=".$this->encoding;
         $this->properties[$key] = ";".encode($extended).";".encode($street).";".encode($city).";".encode($region).";".encode($zip).";".encode($country);
 
         if ($this->properties["LABEL;$type;CHARSET=".$this->encoding] == "")
@@ -201,16 +201,16 @@ 
      *	@param	string	$type			Type
      *	@return	void
      */
-    function setLabel($postoffice="", $extended="", $street="", $city="", $region="", $zip="", $country="", $type="HOME;POSTAL")
+    function setLabel($postoffice = "", $extended = "", $street = "", $city = "", $region = "", $zip = "", $country = "", $type = "HOME;POSTAL")
     {
         $label = "";
-        if ($postoffice!="") $label.= "$postoffice\r\n";
-        if ($extended!="") $label.= "$extended\r\n";
-        if ($street!="") $label.= "$street\r\n";
-        if ($zip!="") $label.= "$zip ";
-        if ($city!="") $label.= "$city\r\n";
-        if ($region!="") $label.= "$region\r\n";
-        if ($country!="") $country.= "$country\r\n";
+        if ($postoffice != "") $label .= "$postoffice\r\n";
+        if ($extended != "") $label .= "$extended\r\n";
+        if ($street != "") $label .= "$street\r\n";
+        if ($zip != "") $label .= "$zip ";
+        if ($city != "") $label .= "$city\r\n";
+        if ($region != "") $label .= "$region\r\n";
+        if ($country != "") $country .= "$country\r\n";
 
         $this->properties["LABEL;$type;CHARSET=".$this->encoding] = encode($label);
     }
@@ -222,7 +222,7 @@ 
      *	@param	string	$type			Vcard type
      *	@return	void
      */
-    function setEmail($address,$type="internet,pref")
+    function setEmail($address, $type = "internet,pref")
     {
         $this->properties["EMAIL;TYPE=".$type] = $address;
     }
@@ -293,11 +293,11 @@ 
      *  @param	string	$type		Type
      *	@return	void
      */
-    function setURL($url, $type="")
+    function setURL($url, $type = "")
     {
         // $type may be WORK | HOME
         $key = "URL";
-        if ($type!="") $key.= ";$type";
+        if ($type != "") $key .= ";$type";
         $this->properties[$key] = $url;
     }
 
@@ -309,15 +309,15 @@ 
     function getVCard()
     {
         $text = "BEGIN:VCARD\r\n";
-        $text.= "VERSION:3.0\r\n";
+        $text .= "VERSION:3.0\r\n";
         //$text.= "VERSION:2.1\r\n";
-        foreach($this->properties as $key => $value)
+        foreach ($this->properties as $key => $value)
         {
-            $text.= "$key:$value\r\n";
+            $text .= "$key:$value\r\n";
         }
-        $text.= "REV:".date("Y-m-d")."T".date("H:i:s")."Z\r\n";
-        $text.= "MAILER: Dolibarr\r\n";
-        $text.= "END:VCARD\r\n";
+        $text .= "REV:".date("Y-m-d")."T".date("H:i:s")."Z\r\n";
+        $text .= "MAILER: Dolibarr\r\n";
+        $text .= "END:VCARD\r\n";
         return $text;
     }
 

Braces +36 added lines, -12 removed lines

@@ -73,7 +73,9 @@ 
             $newline .= $c;
         } // end of for
         $output .= $newline;
-        if ($j<count($lines)-1) $output .= $linebreak;
+        if ($j<count($lines)-1) {
+            $output .= $linebreak;
+        }
     }
     return trim($output);
 }
@@ -102,7 +104,9 @@ 
     {
         // type may be PREF | WORK | HOME | VOICE | FAX | MSG | CELL | PAGER | BBS | CAR | MODEM | ISDN | VIDEO or any senseful combination, e.g. "PREF;WORK;VOICE"
         $key = "TEL";
-        if ($type!="") $key .= ";".$type;
+        if ($type!="") {
+            $key .= ";".$type;
+        }
         $key.= ";CHARSET=".$this->encoding;
         $this->properties[$key] = encode($number);
     }
@@ -146,7 +150,9 @@ 
     {
         $this->properties["N;CHARSET=".$this->encoding] = encode($family).";".encode($first).";".encode($additional).";".encode($prefix).";".encode($suffix);
         $this->filename = "$first%20$family.vcf";
-        if (empty($this->properties["FN"])) $this->setFormattedName(trim("$prefix $first $additional $family $suffix"));
+        if (empty($this->properties["FN"])) {
+            $this->setFormattedName(trim("$prefix $first $additional $family $suffix"));
+        }
     }
 
     /**
@@ -178,7 +184,9 @@ 
     {
         // $type may be DOM | INTL | POSTAL | PARCEL | HOME | WORK or any combination of these: e.g. "WORK;PARCEL;POSTAL"
         $key = "ADR";
-        if ($type!="") $key.= ";$type";
+        if ($type!="") {
+            $key.= ";$type";
+        }
         $key.= ";CHARSET=".$this->encoding;
         $this->properties[$key] = ";".encode($extended).";".encode($street).";".encode($city).";".encode($region).";".encode($zip).";".encode($country);
 
@@ -204,13 +212,27 @@ 
     function setLabel($postoffice="", $extended="", $street="", $city="", $region="", $zip="", $country="", $type="HOME;POSTAL")
     {
         $label = "";
-        if ($postoffice!="") $label.= "$postoffice\r\n";
-        if ($extended!="") $label.= "$extended\r\n";
-        if ($street!="") $label.= "$street\r\n";
-        if ($zip!="") $label.= "$zip ";
-        if ($city!="") $label.= "$city\r\n";
-        if ($region!="") $label.= "$region\r\n";
-        if ($country!="") $country.= "$country\r\n";
+        if ($postoffice!="") {
+            $label.= "$postoffice\r\n";
+        }
+        if ($extended!="") {
+            $label.= "$extended\r\n";
+        }
+        if ($street!="") {
+            $label.= "$street\r\n";
+        }
+        if ($zip!="") {
+            $label.= "$zip ";
+        }
+        if ($city!="") {
+            $label.= "$city\r\n";
+        }
+        if ($region!="") {
+            $label.= "$region\r\n";
+        }
+        if ($country!="") {
+            $country.= "$country\r\n";
+        }
 
         $this->properties["LABEL;$type;CHARSET=".$this->encoding] = encode($label);
     }
@@ -297,7 +319,9 @@ 
     {
         // $type may be WORK | HOME
         $key = "URL";
-        if ($type!="") $key.= ";$type";
+        if ($type!="") {
+            $key.= ";$type";
+        }
         $this->properties[$key] = $url;
     }
 

dolibarr/htdocs/core/class/commonstickergenerator.class.php

Indentation +192 added lines, -192 removed lines

@@ -61,226 +61,226 @@
  */
 abstract class CommonStickerGenerator
 {
-	public $code;   // Code of format
+    public $code;   // Code of format
 
-	/**
+    /**
      * @var array format Array with informations
      */
     public $format;
 
-	// protected
-	var $_Avery_Name	= '';	// Nom du format de l'etiquette
-	var $_Margin_Left	= 0;	// Marge de gauche de l'etiquette
-	var $_Margin_Top	= 0;	// marge en haut de la page avant la premiere etiquette
-	var $_X_Space 	= 0;	// Espace horizontal entre 2 bandes d'etiquettes
-	var $_Y_Space 	= 0;	// Espace vertical entre 2 bandes d'etiquettes
-	var $_X_Number 	= 0;	// NX Nombre d'etiquettes sur la largeur de la page
-	var $_Y_Number 	= 0;	// NY Nombre d'etiquettes sur la hauteur de la page
-	var $_Width 		= 0;	// Largeur de chaque etiquette
-	var $_Height 		= 0;	// Hauteur de chaque etiquette
-	var $_Char_Size	= 10;	// Hauteur des caracteres
-	var $_Line_Height	= 10;	// Hauteur par defaut d'une ligne
-	var $_Metric 		= 'mm';	// Type of metric.. Will help to calculate good values
-	var $_Metric_Doc 	= 'mm';	// Type of metric for the doc..
-	var $_COUNTX = 1;
-	var $_COUNTY = 1;
-	var $_First = 1;
-	var $Tformat;
+    // protected
+    var $_Avery_Name	= '';	// Nom du format de l'etiquette
+    var $_Margin_Left	= 0;	// Marge de gauche de l'etiquette
+    var $_Margin_Top	= 0;	// marge en haut de la page avant la premiere etiquette
+    var $_X_Space 	= 0;	// Espace horizontal entre 2 bandes d'etiquettes
+    var $_Y_Space 	= 0;	// Espace vertical entre 2 bandes d'etiquettes
+    var $_X_Number 	= 0;	// NX Nombre d'etiquettes sur la largeur de la page
+    var $_Y_Number 	= 0;	// NY Nombre d'etiquettes sur la hauteur de la page
+    var $_Width 		= 0;	// Largeur de chaque etiquette
+    var $_Height 		= 0;	// Hauteur de chaque etiquette
+    var $_Char_Size	= 10;	// Hauteur des caracteres
+    var $_Line_Height	= 10;	// Hauteur par defaut d'une ligne
+    var $_Metric 		= 'mm';	// Type of metric.. Will help to calculate good values
+    var $_Metric_Doc 	= 'mm';	// Type of metric for the doc..
+    var $_COUNTX = 1;
+    var $_COUNTY = 1;
+    var $_First = 1;
+    var $Tformat;
 
-	/**
-	 *	Constructor
-	 *
-	 *  @param		DoliDB		$db      Database handler
-	 */
-	function __construct($db)
-	{
-		$this->db = $db;
-	}
+    /**
+     *	Constructor
+     *
+     *  @param		DoliDB		$db      Database handler
+     */
+    function __construct($db)
+    {
+        $this->db = $db;
+    }
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
-	/**
-	 *  Function to build PDF on disk, then output on HTTP strem.
-	 *
-	 *  @param	array		$arrayofrecords  	Array of record informations (array('textleft'=>,'textheader'=>, ..., 'id'=>,'photo'=>)
-	 *  @param  Translate	$outputlangs     	Lang object for output language
-	 *  @param	string		$srctemplatepath	Full path of source filename for generator using a template file
-	 *	@param	string		$outputdir			Output directory for pdf file
-	 *  @return int             				1=OK, 0=KO
-	 */
-	abstract function write_file($arrayofrecords,$outputlangs,$srctemplatepath,$outputdir='');
+    /**
+     *  Function to build PDF on disk, then output on HTTP strem.
+     *
+     *  @param	array		$arrayofrecords  	Array of record informations (array('textleft'=>,'textheader'=>, ..., 'id'=>,'photo'=>)
+     *  @param  Translate	$outputlangs     	Lang object for output language
+     *  @param	string		$srctemplatepath	Full path of source filename for generator using a template file
+     *	@param	string		$outputdir			Output directory for pdf file
+     *  @return int             				1=OK, 0=KO
+     */
+    abstract function write_file($arrayofrecords,$outputlangs,$srctemplatepath,$outputdir='');
     // phpcs:enable
 
-	/**
-	 * Output a sticker on page at position _COUNTX, _COUNTY (_COUNTX and _COUNTY start from 0)
-	 *
-	 * @param   PDF         $pdf            PDF reference
-	 * @param   Translate  	$outputlangs    Output langs
-	 * @param   array     	$param          Associative array containing label content and optional parameters
-	 * @return  void
-	 */
-	abstract function addSticker(&$pdf,$outputlangs,$param);
+    /**
+     * Output a sticker on page at position _COUNTX, _COUNTY (_COUNTX and _COUNTY start from 0)
+     *
+     * @param   PDF         $pdf            PDF reference
+     * @param   Translate  	$outputlangs    Output langs
+     * @param   array     	$param          Associative array containing label content and optional parameters
+     * @return  void
+     */
+    abstract function addSticker(&$pdf,$outputlangs,$param);
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
-	/**
-	 * Methode qui permet de modifier la taille des caracteres
-	 * Cela modiera aussi l'espace entre chaque ligne
-	 *
-	 * @param    PDF        $pdf   PDF reference
-	 * @param    int        $pt    point
-	 * @return   void
-	 */
-	function Set_Char_Size(&$pdf,$pt)
-	{
+    /**
+     * Methode qui permet de modifier la taille des caracteres
+     * Cela modiera aussi l'espace entre chaque ligne
+     *
+     * @param    PDF        $pdf   PDF reference
+     * @param    int        $pt    point
+     * @return   void
+     */
+    function Set_Char_Size(&$pdf,$pt)
+    {
         // phpcs:enable
-		if ($pt > 3) {
-			$this->_Char_Size = $pt;
-			$this->_Line_Height = $this->_Get_Height_Chars($pt);
-			$pdf->SetFont('','',$pt);
-		}
-	}
+        if ($pt > 3) {
+            $this->_Char_Size = $pt;
+            $this->_Line_Height = $this->_Get_Height_Chars($pt);
+            $pdf->SetFont('','',$pt);
+        }
+    }
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
-	/**
-	 * protected Print dot line
-	 *
-	 * @param	PDF     $pdf                PDF reference
-	 * @param 	int		$x1					X1
-	 * @param 	int		$y1					Y1
-	 * @param 	int		$x2					X2
-	 * @param 	int		$y2					Y2
-	 * @param 	int		$epaisseur			Epaisseur
-	 * @param 	int		$nbPointilles		Nb pointilles
-	 * @return	void
-	 */
+    /**
+     * protected Print dot line
+     *
+     * @param	PDF     $pdf                PDF reference
+     * @param 	int		$x1					X1
+     * @param 	int		$y1					Y1
+     * @param 	int		$x2					X2
+     * @param 	int		$y2					Y2
+     * @param 	int		$epaisseur			Epaisseur
+     * @param 	int		$nbPointilles		Nb pointilles
+     * @return	void
+     */
     function _Pointille(&$pdf,$x1=0,$y1=0,$x2=210,$y2=297,$epaisseur=1,$nbPointilles=15)
-	{
+    {
         // phpcs:enable
-		$pdf->SetLineWidth($epaisseur);
-		$length=abs($x1-$x2);
-		$hauteur=abs($y1-$y2);
-		if($length>$hauteur) {
-			$Pointilles=($length/$nbPointilles)/2; // taille des pointilles
-		}
-		else {
-			$Pointilles=($hauteur/$nbPointilles)/2;
-		}
-		for($i=$x1;$i<=$x2;$i+=$Pointilles+$Pointilles) {
-			for($j=$i;$j<=($i+$Pointilles);$j++) {
-				if($j<=($x2-1)) {
-		$pdf->Line($j,$y1,$j+1,$y1); // on trace le pointill? du haut, point par point
-		$pdf->Line($j,$y2,$j+1,$y2); // on trace le pointill? du bas, point par point
-				}
-			}
-		}
-		for($i=$y1;$i<=$y2;$i+=$Pointilles+$Pointilles) {
-			for($j=$i;$j<=($i+$Pointilles);$j++) {
-				if($j<=($y2-1)) {
-		$pdf->Line($x1,$j,$x1,$j+1); // on trace le pointill? du haut, point par point
-		$pdf->Line($x2,$j,$x2,$j+1); // on trace le pointill? du bas, point par point
-				}
-			}
-		}
-	}
+        $pdf->SetLineWidth($epaisseur);
+        $length=abs($x1-$x2);
+        $hauteur=abs($y1-$y2);
+        if($length>$hauteur) {
+            $Pointilles=($length/$nbPointilles)/2; // taille des pointilles
+        }
+        else {
+            $Pointilles=($hauteur/$nbPointilles)/2;
+        }
+        for($i=$x1;$i<=$x2;$i+=$Pointilles+$Pointilles) {
+            for($j=$i;$j<=($i+$Pointilles);$j++) {
+                if($j<=($x2-1)) {
+        $pdf->Line($j,$y1,$j+1,$y1); // on trace le pointill? du haut, point par point
+        $pdf->Line($j,$y2,$j+1,$y2); // on trace le pointill? du bas, point par point
+                }
+            }
+        }
+        for($i=$y1;$i<=$y2;$i+=$Pointilles+$Pointilles) {
+            for($j=$i;$j<=($i+$Pointilles);$j++) {
+                if($j<=($y2-1)) {
+        $pdf->Line($x1,$j,$x1,$j+1); // on trace le pointill? du haut, point par point
+        $pdf->Line($x2,$j,$x2,$j+1); // on trace le pointill? du bas, point par point
+                }
+            }
+        }
+    }
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
-	/**
-	 * protected Function realisant une croix aux 4 coins des cartes
-	 *
-	 * @param PDF   $pdf                PDF reference
-	 * @param int   $x1					X1
-	 * @param int	$y1					Y1
-	 * @param int	$x2					X2
-	 * @param int	$y2					Y2
-	 * @param int	$epaisseur			Epaisseur
-	 * @param int	$taille             Size
-	 * @return void
-	 */
-	function _Croix(&$pdf,$x1=0,$y1=0,$x2=210,$y2=297,$epaisseur=1,$taille=4)
-	{
+    /**
+     * protected Function realisant une croix aux 4 coins des cartes
+     *
+     * @param PDF   $pdf                PDF reference
+     * @param int   $x1					X1
+     * @param int	$y1					Y1
+     * @param int	$x2					X2
+     * @param int	$y2					Y2
+     * @param int	$epaisseur			Epaisseur
+     * @param int	$taille             Size
+     * @return void
+     */
+    function _Croix(&$pdf,$x1=0,$y1=0,$x2=210,$y2=297,$epaisseur=1,$taille=4)
+    {
         // phpcs:enable
-		$pdf->SetDrawColor(192,192,192);
+        $pdf->SetDrawColor(192,192,192);
 
-		$pdf->SetLineWidth($epaisseur);
-		$lg=$taille/2;
-		// croix haut gauche
-		$pdf->Line($x1,$y1-$lg,$x1,$y1+$lg);
-		$pdf->Line($x1-$lg,$y1,$x1+$lg,$y1);
-		// croix bas gauche
-		$pdf->Line($x1,$y2-$lg,$x1,$y2+$lg);
-		$pdf->Line($x1-$lg,$y2,$x1+$lg,$y2);
-		// croix haut droit
-		$pdf->Line($x2,$y1-$lg,$x2,$y1+$lg);
-		$pdf->Line($x2-$lg,$y1,$x2+$lg,$y1);
-		// croix bas droit
-		$pdf->Line($x2,$y2-$lg,$x2,$y2+$lg);
-		$pdf->Line($x2-$lg,$y2,$x2+$lg,$y2);
+        $pdf->SetLineWidth($epaisseur);
+        $lg=$taille/2;
+        // croix haut gauche
+        $pdf->Line($x1,$y1-$lg,$x1,$y1+$lg);
+        $pdf->Line($x1-$lg,$y1,$x1+$lg,$y1);
+        // croix bas gauche
+        $pdf->Line($x1,$y2-$lg,$x1,$y2+$lg);
+        $pdf->Line($x1-$lg,$y2,$x1+$lg,$y2);
+        // croix haut droit
+        $pdf->Line($x2,$y1-$lg,$x2,$y1+$lg);
+        $pdf->Line($x2-$lg,$y1,$x2+$lg,$y1);
+        // croix bas droit
+        $pdf->Line($x2,$y2-$lg,$x2,$y2+$lg);
+        $pdf->Line($x2-$lg,$y2,$x2+$lg,$y2);
 
-		$pdf->SetDrawColor(0,0,0);
-	}
+        $pdf->SetDrawColor(0,0,0);
+    }
 
-	/**
-	 * Convert units (in to mm, mm to in)
-	 * $src and $dest must be 'in' or 'mm'
-	 *
-	 * @param int       $value  value
-	 * @param string    $src    from ('in' or 'mm')
-	 * @param string    $dest   to ('in' or 'mm')
-	 * @return float    value   value after conversion
-	 */
-	private function convertMetric($value, $src, $dest)
-	{
-		if ($src != $dest) {
-			$tab = array(
-				'in'=>39.37008,
-				'mm'=>1000
-			);
-			return $value * $tab[$dest] / $tab[$src];
-		}
+    /**
+     * Convert units (in to mm, mm to in)
+     * $src and $dest must be 'in' or 'mm'
+     *
+     * @param int       $value  value
+     * @param string    $src    from ('in' or 'mm')
+     * @param string    $dest   to ('in' or 'mm')
+     * @return float    value   value after conversion
+     */
+    private function convertMetric($value, $src, $dest)
+    {
+        if ($src != $dest) {
+            $tab = array(
+                'in'=>39.37008,
+                'mm'=>1000
+            );
+            return $value * $tab[$dest] / $tab[$src];
+        }
 
-		return $value;
-	}
+        return $value;
+    }
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
-	/**
-	 * protected Give the height for a char size given.
-	 *
-	 * @param  int    $pt    Point
-	 * @return int           Height chars
-	 */
-	function _Get_Height_Chars($pt)
-	{
+    /**
+     * protected Give the height for a char size given.
+     *
+     * @param  int    $pt    Point
+     * @return int           Height chars
+     */
+    function _Get_Height_Chars($pt)
+    {
         // phpcs:enable
-		// Tableau de concordance entre la hauteur des caracteres et de l'espacement entre les lignes
-		$_Table_Hauteur_Chars = array(6=>2, 7=>2.5, 8=>3, 9=>3.5, 10=>4, 11=>6, 12=>7, 13=>8, 14=>9, 15=>10);
-		if (in_array($pt, array_keys($_Table_Hauteur_Chars))) {
-			return $_Table_Hauteur_Chars[$pt];
-		} else {
-			return 100; // There is a prob..
-		}
-	}
+        // Tableau de concordance entre la hauteur des caracteres et de l'espacement entre les lignes
+        $_Table_Hauteur_Chars = array(6=>2, 7=>2.5, 8=>3, 9=>3.5, 10=>4, 11=>6, 12=>7, 13=>8, 14=>9, 15=>10);
+        if (in_array($pt, array_keys($_Table_Hauteur_Chars))) {
+            return $_Table_Hauteur_Chars[$pt];
+        } else {
+            return 100; // There is a prob..
+        }
+    }
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
-	/**
-	 * protected Set format
-	 *
-	 * @param    PDF       $pdf     PDF reference
-	 * @param    string    $format  Format
-	 * @return   void
-	 */
-	function _Set_Format(&$pdf, $format)
-	{
+    /**
+     * protected Set format
+     *
+     * @param    PDF       $pdf     PDF reference
+     * @param    string    $format  Format
+     * @return   void
+     */
+    function _Set_Format(&$pdf, $format)
+    {
         // phpcs:enable
-		$this->_Metric = $format['metric'];
-		$this->_Avery_Name = $format['name'];
-		$this->_Avery_Code = $format['code'];
-		$this->_Margin_Left	= $this->convertMetric($format['marginLeft'], $this->_Metric, $this->_Metric_Doc);
-		$this->_Margin_Top = $this->convertMetric($format['marginTop'], $this->_Metric, $this->_Metric_Doc);
-		$this->_X_Space = $this->convertMetric($format['SpaceX'], $this->_Metric, $this->_Metric_Doc);
-		$this->_Y_Space = $this->convertMetric($format['SpaceY'], $this->_Metric, $this->_Metric_Doc);
-		$this->_X_Number = $format['NX'];
-		$this->_Y_Number = $format['NY'];
-		$this->_Width = $this->convertMetric($format['width'], $this->_Metric, $this->_Metric_Doc);
-		$this->_Height = $this->convertMetric($format['height'], $this->_Metric, $this->_Metric_Doc);
-		$this->Set_Char_Size($pdf, $format['font-size']);
-	}
+        $this->_Metric = $format['metric'];
+        $this->_Avery_Name = $format['name'];
+        $this->_Avery_Code = $format['code'];
+        $this->_Margin_Left	= $this->convertMetric($format['marginLeft'], $this->_Metric, $this->_Metric_Doc);
+        $this->_Margin_Top = $this->convertMetric($format['marginTop'], $this->_Metric, $this->_Metric_Doc);
+        $this->_X_Space = $this->convertMetric($format['SpaceX'], $this->_Metric, $this->_Metric_Doc);
+        $this->_Y_Space = $this->convertMetric($format['SpaceY'], $this->_Metric, $this->_Metric_Doc);
+        $this->_X_Number = $format['NX'];
+        $this->_Y_Number = $format['NY'];
+        $this->_Width = $this->convertMetric($format['width'], $this->_Metric, $this->_Metric_Doc);
+        $this->_Height = $this->convertMetric($format['height'], $this->_Metric, $this->_Metric_Doc);
+        $this->Set_Char_Size($pdf, $format['font-size']);
+    }
 }

Spacing +47 added lines, -47 removed lines

@@ -61,7 +61,7 @@ 
  */
 abstract class CommonStickerGenerator
 {
-	public $code;   // Code of format
+	public $code; // Code of format
 
 	/**
      * @var array format Array with informations
@@ -69,19 +69,19 @@ 
     public $format;
 
 	// protected
-	var $_Avery_Name	= '';	// Nom du format de l'etiquette
-	var $_Margin_Left	= 0;	// Marge de gauche de l'etiquette
-	var $_Margin_Top	= 0;	// marge en haut de la page avant la premiere etiquette
-	var $_X_Space 	= 0;	// Espace horizontal entre 2 bandes d'etiquettes
-	var $_Y_Space 	= 0;	// Espace vertical entre 2 bandes d'etiquettes
-	var $_X_Number 	= 0;	// NX Nombre d'etiquettes sur la largeur de la page
-	var $_Y_Number 	= 0;	// NY Nombre d'etiquettes sur la hauteur de la page
-	var $_Width 		= 0;	// Largeur de chaque etiquette
-	var $_Height 		= 0;	// Hauteur de chaque etiquette
-	var $_Char_Size	= 10;	// Hauteur des caracteres
-	var $_Line_Height	= 10;	// Hauteur par defaut d'une ligne
-	var $_Metric 		= 'mm';	// Type of metric.. Will help to calculate good values
-	var $_Metric_Doc 	= 'mm';	// Type of metric for the doc..
+	var $_Avery_Name	= ''; // Nom du format de l'etiquette
+	var $_Margin_Left = 0; // Marge de gauche de l'etiquette
+	var $_Margin_Top	= 0; // marge en haut de la page avant la premiere etiquette
+	var $_X_Space 	= 0; // Espace horizontal entre 2 bandes d'etiquettes
+	var $_Y_Space 	= 0; // Espace vertical entre 2 bandes d'etiquettes
+	var $_X_Number 	= 0; // NX Nombre d'etiquettes sur la largeur de la page
+	var $_Y_Number 	= 0; // NY Nombre d'etiquettes sur la hauteur de la page
+	var $_Width = 0; // Largeur de chaque etiquette
+	var $_Height 		= 0; // Hauteur de chaque etiquette
+	var $_Char_Size	= 10; // Hauteur des caracteres
+	var $_Line_Height	= 10; // Hauteur par defaut d'une ligne
+	var $_Metric 		= 'mm'; // Type of metric.. Will help to calculate good values
+	var $_Metric_Doc 	= 'mm'; // Type of metric for the doc..
 	var $_COUNTX = 1;
 	var $_COUNTY = 1;
 	var $_First = 1;
@@ -107,7 +107,7 @@ 
 	 *	@param	string		$outputdir			Output directory for pdf file
 	 *  @return int             				1=OK, 0=KO
 	 */
-	abstract function write_file($arrayofrecords,$outputlangs,$srctemplatepath,$outputdir='');
+	abstract function write_file($arrayofrecords, $outputlangs, $srctemplatepath, $outputdir = '');
     // phpcs:enable
 
 	/**
@@ -118,7 +118,7 @@ 
 	 * @param   array     	$param          Associative array containing label content and optional parameters
 	 * @return  void
 	 */
-	abstract function addSticker(&$pdf,$outputlangs,$param);
+	abstract function addSticker(&$pdf, $outputlangs, $param);
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
 	/**
@@ -129,13 +129,13 @@ 
 	 * @param    int        $pt    point
 	 * @return   void
 	 */
-	function Set_Char_Size(&$pdf,$pt)
+	function Set_Char_Size(&$pdf, $pt)
 	{
         // phpcs:enable
 		if ($pt > 3) {
 			$this->_Char_Size = $pt;
 			$this->_Line_Height = $this->_Get_Height_Chars($pt);
-			$pdf->SetFont('','',$pt);
+			$pdf->SetFont('', '', $pt);
 		}
 	}
 
@@ -152,31 +152,31 @@ 
 	 * @param 	int		$nbPointilles		Nb pointilles
 	 * @return	void
 	 */
-    function _Pointille(&$pdf,$x1=0,$y1=0,$x2=210,$y2=297,$epaisseur=1,$nbPointilles=15)
+    function _Pointille(&$pdf, $x1 = 0, $y1 = 0, $x2 = 210, $y2 = 297, $epaisseur = 1, $nbPointilles = 15)
 	{
         // phpcs:enable
 		$pdf->SetLineWidth($epaisseur);
-		$length=abs($x1-$x2);
-		$hauteur=abs($y1-$y2);
-		if($length>$hauteur) {
-			$Pointilles=($length/$nbPointilles)/2; // taille des pointilles
+		$length = abs($x1 - $x2);
+		$hauteur = abs($y1 - $y2);
+		if ($length > $hauteur) {
+			$Pointilles = ($length / $nbPointilles) / 2; // taille des pointilles
 		}
 		else {
-			$Pointilles=($hauteur/$nbPointilles)/2;
+			$Pointilles = ($hauteur / $nbPointilles) / 2;
 		}
-		for($i=$x1;$i<=$x2;$i+=$Pointilles+$Pointilles) {
-			for($j=$i;$j<=($i+$Pointilles);$j++) {
-				if($j<=($x2-1)) {
-		$pdf->Line($j,$y1,$j+1,$y1); // on trace le pointill? du haut, point par point
-		$pdf->Line($j,$y2,$j+1,$y2); // on trace le pointill? du bas, point par point
+		for ($i = $x1; $i <= $x2; $i += $Pointilles + $Pointilles) {
+			for ($j = $i; $j <= ($i + $Pointilles); $j++) {
+				if ($j <= ($x2 - 1)) {
+		$pdf->Line($j, $y1, $j + 1, $y1); // on trace le pointill? du haut, point par point
+		$pdf->Line($j, $y2, $j + 1, $y2); // on trace le pointill? du bas, point par point
 				}
 			}
 		}
-		for($i=$y1;$i<=$y2;$i+=$Pointilles+$Pointilles) {
-			for($j=$i;$j<=($i+$Pointilles);$j++) {
-				if($j<=($y2-1)) {
-		$pdf->Line($x1,$j,$x1,$j+1); // on trace le pointill? du haut, point par point
-		$pdf->Line($x2,$j,$x2,$j+1); // on trace le pointill? du bas, point par point
+		for ($i = $y1; $i <= $y2; $i += $Pointilles + $Pointilles) {
+			for ($j = $i; $j <= ($i + $Pointilles); $j++) {
+				if ($j <= ($y2 - 1)) {
+		$pdf->Line($x1, $j, $x1, $j + 1); // on trace le pointill? du haut, point par point
+		$pdf->Line($x2, $j, $x2, $j + 1); // on trace le pointill? du bas, point par point
 				}
 			}
 		}
@@ -195,27 +195,27 @@ 
 	 * @param int	$taille             Size
 	 * @return void
 	 */
-	function _Croix(&$pdf,$x1=0,$y1=0,$x2=210,$y2=297,$epaisseur=1,$taille=4)
+	function _Croix(&$pdf, $x1 = 0, $y1 = 0, $x2 = 210, $y2 = 297, $epaisseur = 1, $taille = 4)
 	{
         // phpcs:enable
-		$pdf->SetDrawColor(192,192,192);
+		$pdf->SetDrawColor(192, 192, 192);
 
 		$pdf->SetLineWidth($epaisseur);
-		$lg=$taille/2;
+		$lg = $taille / 2;
 		// croix haut gauche
-		$pdf->Line($x1,$y1-$lg,$x1,$y1+$lg);
-		$pdf->Line($x1-$lg,$y1,$x1+$lg,$y1);
+		$pdf->Line($x1, $y1 - $lg, $x1, $y1 + $lg);
+		$pdf->Line($x1 - $lg, $y1, $x1 + $lg, $y1);
 		// croix bas gauche
-		$pdf->Line($x1,$y2-$lg,$x1,$y2+$lg);
-		$pdf->Line($x1-$lg,$y2,$x1+$lg,$y2);
+		$pdf->Line($x1, $y2 - $lg, $x1, $y2 + $lg);
+		$pdf->Line($x1 - $lg, $y2, $x1 + $lg, $y2);
 		// croix haut droit
-		$pdf->Line($x2,$y1-$lg,$x2,$y1+$lg);
-		$pdf->Line($x2-$lg,$y1,$x2+$lg,$y1);
+		$pdf->Line($x2, $y1 - $lg, $x2, $y1 + $lg);
+		$pdf->Line($x2 - $lg, $y1, $x2 + $lg, $y1);
 		// croix bas droit
-		$pdf->Line($x2,$y2-$lg,$x2,$y2+$lg);
-		$pdf->Line($x2-$lg,$y2,$x2+$lg,$y2);
+		$pdf->Line($x2, $y2 - $lg, $x2, $y2 + $lg);
+		$pdf->Line($x2 - $lg, $y2, $x2 + $lg, $y2);
 
-		$pdf->SetDrawColor(0,0,0);
+		$pdf->SetDrawColor(0, 0, 0);
 	}
 
 	/**
@@ -273,7 +273,7 @@ 
 		$this->_Metric = $format['metric'];
 		$this->_Avery_Name = $format['name'];
 		$this->_Avery_Code = $format['code'];
-		$this->_Margin_Left	= $this->convertMetric($format['marginLeft'], $this->_Metric, $this->_Metric_Doc);
+		$this->_Margin_Left = $this->convertMetric($format['marginLeft'], $this->_Metric, $this->_Metric_Doc);
 		$this->_Margin_Top = $this->convertMetric($format['marginTop'], $this->_Metric, $this->_Metric_Doc);
 		$this->_X_Space = $this->convertMetric($format['SpaceX'], $this->_Metric, $this->_Metric_Doc);
 		$this->_Y_Space = $this->convertMetric($format['SpaceY'], $this->_Metric, $this->_Metric_Doc);

Braces +1 added lines, -2 removed lines

@@ -160,8 +160,7 @@
 		$hauteur=abs($y1-$y2);
 		if($length>$hauteur) {
 			$Pointilles=($length/$nbPointilles)/2; // taille des pointilles
-		}
-		else {
+		} else {
 			$Pointilles=($hauteur/$nbPointilles)/2;
 		}
 		for($i=$x1;$i<=$x2;$i+=$Pointilles+$Pointilles) {

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

Indentation +15 added lines, -15 removed lines

@@ -27,26 +27,26 @@ 
  */
 class FormSocialContrib
 {
-	/**
+    /**
      * @var DoliDB Database handler.
      */
     public $db;
 
-	/**
-	 * @var string Error code (or message)
-	 */
-	public $error='';
+    /**
+     * @var string Error code (or message)
+     */
+    public $error='';
 
 
-	/**
-	* Constructor
-	*
-	* @param		DoliDB		$db      Database handler
-	*/
-	public function __construct($db)
-	{
-	    $this->db = $db;
-	}
+    /**
+     * Constructor
+     *
+     * @param		DoliDB		$db      Database handler
+     */
+    public function __construct($db)
+    {
+        $this->db = $db;
+    }
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
     /**
@@ -96,7 +96,7 @@ 
             $num = $db->num_rows($resql);
             if ($num)
             {
-            	print '<select class="'.($morecss?$morecss:'').'" id="'.$htmlname.'" name="'.$htmlname.'">';
+                print '<select class="'.($morecss?$morecss:'').'" id="'.$htmlname.'" name="'.$htmlname.'">';
                 $i = 0;
 
                 if ($useempty) print '<option value="0">&nbsp;</option>';

Spacing +20 added lines, -20 removed lines

@@ -35,7 +35,7 @@ 
 	/**
 	 * @var string Error code (or message)
 	 */
-	public $error='';
+	public $error = '';
 
 
 	/**
@@ -61,42 +61,42 @@ 
      *  @param	string	$morecss		Add more CSS on select
      * 	@return	void
      */
-    function select_type_socialcontrib($selected='',$htmlname='actioncode', $useempty=0, $maxlen=40, $help=1, $morecss='minwidth300')
+    function select_type_socialcontrib($selected = '', $htmlname = 'actioncode', $useempty = 0, $maxlen = 40, $help = 1, $morecss = 'minwidth300')
     {
         // phpcs:enable
-        global $conf,$db,$langs,$user,$mysoc;
+        global $conf, $db, $langs, $user, $mysoc;
 
         if (empty($mysoc->country_id) && empty($mysoc->country_code))
         {
-            dol_print_error('','Call to select_type_socialcontrib with mysoc country not yet defined');
+            dol_print_error('', 'Call to select_type_socialcontrib with mysoc country not yet defined');
             exit;
         }
 
-        if (! empty($mysoc->country_id))
+        if (!empty($mysoc->country_id))
         {
             $sql = "SELECT c.id, c.libelle as type";
-            $sql.= " FROM ".MAIN_DB_PREFIX."c_chargesociales as c";
-            $sql.= " WHERE c.active = 1";
-            $sql.= " AND c.fk_pays = ".$mysoc->country_id;
-            $sql.= " ORDER BY c.libelle ASC";
+            $sql .= " FROM ".MAIN_DB_PREFIX."c_chargesociales as c";
+            $sql .= " WHERE c.active = 1";
+            $sql .= " AND c.fk_pays = ".$mysoc->country_id;
+            $sql .= " ORDER BY c.libelle ASC";
         }
         else
         {
             $sql = "SELECT c.id, c.libelle as type";
-            $sql.= " FROM ".MAIN_DB_PREFIX."c_chargesociales as c, ".MAIN_DB_PREFIX."c_country as co";
-            $sql.= " WHERE c.active = 1 AND c.fk_pays = co.rowid";
-            $sql.= " AND co.code = '".$mysoc->country_code."'";
-            $sql.= " ORDER BY c.libelle ASC";
+            $sql .= " FROM ".MAIN_DB_PREFIX."c_chargesociales as c, ".MAIN_DB_PREFIX."c_country as co";
+            $sql .= " WHERE c.active = 1 AND c.fk_pays = co.rowid";
+            $sql .= " AND co.code = '".$mysoc->country_code."'";
+            $sql .= " ORDER BY c.libelle ASC";
         }
 
         dol_syslog("Form::select_type_socialcontrib", LOG_DEBUG);
-        $resql=$db->query($sql);
+        $resql = $db->query($sql);
         if ($resql)
         {
             $num = $db->num_rows($resql);
             if ($num)
             {
-            	print '<select class="'.($morecss?$morecss:'').'" id="'.$htmlname.'" name="'.$htmlname.'">';
+            	print '<select class="'.($morecss ? $morecss : '').'" id="'.$htmlname.'" name="'.$htmlname.'">';
                 $i = 0;
 
                 if ($useempty) print '<option value="0">&nbsp;</option>';
@@ -105,21 +105,21 @@ 
                     $obj = $db->fetch_object($resql);
                     print '<option value="'.$obj->id.'"';
                     if ($obj->id == $selected) print ' selected';
-                    print '>'.dol_trunc($obj->type,$maxlen);
+                    print '>'.dol_trunc($obj->type, $maxlen);
                     $i++;
                 }
                 print '</select>';
-                if ($user->admin && $help) print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"),1);
-                if (! empty($conf->use_javascript_ajax)) print ajax_combobox($htmlname);
+                if ($user->admin && $help) print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"), 1);
+                if (!empty($conf->use_javascript_ajax)) print ajax_combobox($htmlname);
             }
             else
             {
-                print $langs->trans("ErrorNoSocialContributionForSellerCountry",$mysoc->country_code);
+                print $langs->trans("ErrorNoSocialContributionForSellerCountry", $mysoc->country_code);
             }
         }
         else
         {
-            dol_print_error($db,$db->lasterror());
+            dol_print_error($db, $db->lasterror());
         }
     }
 }

Braces +15 added lines, -10 removed lines

@@ -79,8 +79,7 @@ 
             $sql.= " WHERE c.active = 1";
             $sql.= " AND c.fk_pays = ".$mysoc->country_id;
             $sql.= " ORDER BY c.libelle ASC";
-        }
-        else
+        } else
         {
             $sql = "SELECT c.id, c.libelle as type";
             $sql.= " FROM ".MAIN_DB_PREFIX."c_chargesociales as c, ".MAIN_DB_PREFIX."c_country as co";
@@ -99,25 +98,31 @@ 
             	print '<select class="'.($morecss?$morecss:'').'" id="'.$htmlname.'" name="'.$htmlname.'">';
                 $i = 0;
 
-                if ($useempty) print '<option value="0">&nbsp;</option>';
+                if ($useempty) {
+                    print '<option value="0">&nbsp;</option>';
+                }
                 while ($i < $num)
                 {
                     $obj = $db->fetch_object($resql);
                     print '<option value="'.$obj->id.'"';
-                    if ($obj->id == $selected) print ' selected';
+                    if ($obj->id == $selected) {
+                        print ' selected';
+                    }
                     print '>'.dol_trunc($obj->type,$maxlen);
                     $i++;
                 }
                 print '</select>';
-                if ($user->admin && $help) print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"),1);
-                if (! empty($conf->use_javascript_ajax)) print ajax_combobox($htmlname);
-            }
-            else
+                if ($user->admin && $help) {
+                    print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"),1);
+                }
+                if (! empty($conf->use_javascript_ajax)) {
+                    print ajax_combobox($htmlname);
+                }
+            } else
             {
                 print $langs->trans("ErrorNoSocialContributionForSellerCountry",$mysoc->country_code);
             }
-        }
-        else
+        } else
         {
             dol_print_error($db,$db->lasterror());
         }

dolibarr/htdocs/core/class/ccountry.class.php

Indentation +179 added lines, -179 removed lines

@@ -32,38 +32,38 @@ 
  */
 class Ccountry // extends CommonObject
 {
-	/**
+    /**
      * @var DoliDB Database handler.
      */
     public $db;
 
-	/**
-	 * @var string Error code (or message)
-	 */
-	public $error='';
+    /**
+     * @var string Error code (or message)
+     */
+    public $error='';
 
-	/**
-	 * @var string[] Error codes (or messages)
-	 */
-	public $errors = array();
+    /**
+     * @var string[] Error codes (or messages)
+     */
+    public $errors = array();
 
-	//var $element='ccountry';			//!< Id that identify managed objects
-	//var $table_element='ccountry';	//!< Name of table without prefix where object is stored
+    //var $element='ccountry';			//!< Id that identify managed objects
+    //var $table_element='ccountry';	//!< Name of table without prefix where object is stored
 
     /**
-	 * @var int ID
-	 */
-	public $id;
+     * @var int ID
+     */
+    public $id;
 
-	public $code;
-	public $code_iso;
+    public $code;
+    public $code_iso;
 
-	/**
+    /**
      * @var string Countries label
      */
     public $label;
 
-	public $active;
+    public $active;
 
 
 
@@ -88,73 +88,73 @@ 
      */
     function create($user, $notrigger=0)
     {
-    	global $conf, $langs;
-		$error=0;
+        global $conf, $langs;
+        $error=0;
 
-		// Clean parameters
-		if (isset($this->code)) $this->code=trim($this->code);
-		if (isset($this->code_iso)) $this->code_iso=trim($this->code_iso);
-		if (isset($this->label)) $this->label=trim($this->label);
-		if (isset($this->active)) $this->active=trim($this->active);
+        // Clean parameters
+        if (isset($this->code)) $this->code=trim($this->code);
+        if (isset($this->code_iso)) $this->code_iso=trim($this->code_iso);
+        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 control on parameters values
+        // Check parameters
+        // Put here code to add control on parameters values
 
         // Insert request
-		$sql = "INSERT INTO ".MAIN_DB_PREFIX."c_country(";
-		$sql.= "rowid,";
-		$sql.= "code,";
-		$sql.= "code_iso,";
-		$sql.= "label,";
-		$sql.= "active";
+        $sql = "INSERT INTO ".MAIN_DB_PREFIX."c_country(";
+        $sql.= "rowid,";
+        $sql.= "code,";
+        $sql.= "code_iso,";
+        $sql.= "label,";
+        $sql.= "active";
         $sql.= ") VALUES (";
-		$sql.= " ".(! isset($this->rowid)?'NULL':"'".$this->db->escape($this->rowid)."'").",";
-		$sql.= " ".(! isset($this->code)?'NULL':"'".$this->db->escape($this->code)."'").",";
-		$sql.= " ".(! isset($this->code_iso)?'NULL':"'".$this->db->escape($this->code_iso)."'").",";
-		$sql.= " ".(! isset($this->label)?'NULL':"'".$this->db->escape($this->label)."'").",";
-		$sql.= " ".(! isset($this->active)?'NULL':"'".$this->db->escape($this->active)."'")."";
-		$sql.= ")";
+        $sql.= " ".(! isset($this->rowid)?'NULL':"'".$this->db->escape($this->rowid)."'").",";
+        $sql.= " ".(! isset($this->code)?'NULL':"'".$this->db->escape($this->code)."'").",";
+        $sql.= " ".(! isset($this->code_iso)?'NULL':"'".$this->db->escape($this->code_iso)."'").",";
+        $sql.= " ".(! isset($this->label)?'NULL':"'".$this->db->escape($this->label)."'").",";
+        $sql.= " ".(! isset($this->active)?'NULL':"'".$this->db->escape($this->active)."'")."";
+        $sql.= ")";
 
-		$this->db->begin();
+        $this->db->begin();
 
-	   	dol_syslog(get_class($this)."::create", LOG_DEBUG);
+            dol_syslog(get_class($this)."::create", LOG_DEBUG);
         $resql=$this->db->query($sql);
-    	if (! $resql) { $error++; $this->errors[]="Error ".$this->db->lasterror(); }
+        if (! $resql) { $error++; $this->errors[]="Error ".$this->db->lasterror(); }
 
-		if (! $error)
+        if (! $error)
         {
             $this->id = $this->db->last_insert_id(MAIN_DB_PREFIX."c_country");
 
-			if (! $notrigger)
-			{
-	            // Uncomment this and change MYOBJECT to your own tag if you
-	            // want this action call a trigger.
-
-	            //// Call triggers
-	            //include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php';
-	            //$interface=new Interfaces($this->db);
-	            //$result=$interface->run_triggers('MYOBJECT_CREATE',$this,$user,$langs,$conf);
-	            //if ($result < 0) { $error++; $this->errors=$interface->errors; }
-	            //// End call triggers
-			}
+            if (! $notrigger)
+            {
+                // Uncomment this and change MYOBJECT to your own tag if you
+                // want this action call a trigger.
+
+                //// Call triggers
+                //include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php';
+                //$interface=new Interfaces($this->db);
+                //$result=$interface->run_triggers('MYOBJECT_CREATE',$this,$user,$langs,$conf);
+                //if ($result < 0) { $error++; $this->errors=$interface->errors; }
+                //// End call triggers
+            }
         }
 
         // Commit or rollback
         if ($error)
-		{
-			foreach($this->errors as $errmsg)
-			{
-	            dol_syslog(get_class($this)."::create ".$errmsg, LOG_ERR);
-	            $this->error.=($this->error?', '.$errmsg:$errmsg);
-			}
-			$this->db->rollback();
-			return -1*$error;
-		}
-		else
-		{
-			$this->db->commit();
+        {
+            foreach($this->errors as $errmsg)
+            {
+                dol_syslog(get_class($this)."::create ".$errmsg, LOG_ERR);
+                $this->error.=($this->error?', '.$errmsg:$errmsg);
+            }
+            $this->db->rollback();
+            return -1*$error;
+        }
+        else
+        {
+            $this->db->commit();
             return $this->id;
-		}
+        }
     }
 
 
@@ -167,18 +167,18 @@ 
      */
     function fetch($id,$code='')
     {
-    	global $langs;
+        global $langs;
         $sql = "SELECT";
-		$sql.= " t.rowid,";
-		$sql.= " t.code,";
-		$sql.= " t.code_iso,";
-		$sql.= " t.label,";
-		$sql.= " t.active";
+        $sql.= " t.rowid,";
+        $sql.= " t.code,";
+        $sql.= " t.code_iso,";
+        $sql.= " t.label,";
+        $sql.= " t.active";
         $sql.= " FROM ".MAIN_DB_PREFIX."c_country as t";
         if ($id)   $sql.= " WHERE t.rowid = ".$id;
         elseif ($code) $sql.= " WHERE t.code = '".$this->db->escape($code)."'";
 
-    	dol_syslog(get_class($this)."::fetch", LOG_DEBUG);
+        dol_syslog(get_class($this)."::fetch", LOG_DEBUG);
         $resql=$this->db->query($sql);
         if ($resql)
         {
@@ -187,10 +187,10 @@ 
                 $obj = $this->db->fetch_object($resql);
 
                 $this->id    = $obj->rowid;
-				$this->code = $obj->code;
-				$this->code_iso = $obj->code_iso;
-				$this->label = $obj->label;
-				$this->active = $obj->active;
+                $this->code = $obj->code;
+                $this->code_iso = $obj->code_iso;
+                $this->label = $obj->label;
+                $this->active = $obj->active;
 
                 $this->db->free($resql);
                 return 1;
@@ -201,7 +201,7 @@ 
         }
         else
         {
-      	    $this->error="Error ".$this->db->lasterror();
+                $this->error="Error ".$this->db->lasterror();
             return -1;
         }
     }
@@ -216,120 +216,120 @@ 
      */
     function update($user=null, $notrigger=0)
     {
-    	global $conf, $langs;
-		$error=0;
+        global $conf, $langs;
+        $error=0;
 
-		// Clean parameters
-		if (isset($this->code)) $this->code=trim($this->code);
-		if (isset($this->code_iso)) $this->code_iso=trim($this->code_iso);
-		if (isset($this->label)) $this->label=trim($this->label);
-		if (isset($this->active)) $this->active=trim($this->active);
+        // Clean parameters
+        if (isset($this->code)) $this->code=trim($this->code);
+        if (isset($this->code_iso)) $this->code_iso=trim($this->code_iso);
+        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 control on parameters values
+        // Check parameters
+        // Put here code to add control on parameters values
 
         // Update request
         $sql = "UPDATE ".MAIN_DB_PREFIX."c_country SET";
-		$sql.= " code=".(isset($this->code)?"'".$this->db->escape($this->code)."'":"null").",";
-		$sql.= " code_iso=".(isset($this->code_iso)?"'".$this->db->escape($this->code_iso)."'":"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.= " code_iso=".(isset($this->code_iso)?"'".$this->db->escape($this->code_iso)."'":"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();
+        $this->db->begin();
 
-		dol_syslog(get_class($this)."::update", LOG_DEBUG);
+        dol_syslog(get_class($this)."::update", LOG_DEBUG);
         $resql = $this->db->query($sql);
-    	if (! $resql) { $error++; $this->errors[]="Error ".$this->db->lasterror(); }
-
-		if (! $error)
-		{
-			if (! $notrigger)
-			{
-	            // Uncomment this and change MYOBJECT to your own tag if you
-	            // want this action call a trigger.
-
-	            //// Call triggers
-	            //include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php';
-	            //$interface=new Interfaces($this->db);
-	            //$result=$interface->run_triggers('MYOBJECT_MODIFY',$this,$user,$langs,$conf);
-	            //if ($result < 0) { $error++; $this->errors=$interface->errors; }
-	            //// End call triggers
-	    	}
-		}
+        if (! $resql) { $error++; $this->errors[]="Error ".$this->db->lasterror(); }
+
+        if (! $error)
+        {
+            if (! $notrigger)
+            {
+                // Uncomment this and change MYOBJECT to your own tag if you
+                // want this action call a trigger.
+
+                //// Call triggers
+                //include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php';
+                //$interface=new Interfaces($this->db);
+                //$result=$interface->run_triggers('MYOBJECT_MODIFY',$this,$user,$langs,$conf);
+                //if ($result < 0) { $error++; $this->errors=$interface->errors; }
+                //// End call triggers
+            }
+        }
 
         // Commit or rollback
-		if ($error)
-		{
-			foreach($this->errors as $errmsg)
-			{
-	            dol_syslog(get_class($this)."::update ".$errmsg, LOG_ERR);
-	            $this->error.=($this->error?', '.$errmsg:$errmsg);
-			}
-			$this->db->rollback();
-			return -1*$error;
-		}
-		else
-		{
-			$this->db->commit();
-			return 1;
-		}
+        if ($error)
+        {
+            foreach($this->errors as $errmsg)
+            {
+                dol_syslog(get_class($this)."::update ".$errmsg, LOG_ERR);
+                $this->error.=($this->error?', '.$errmsg:$errmsg);
+            }
+            $this->db->rollback();
+            return -1*$error;
+        }
+        else
+        {
+            $this->db->commit();
+            return 1;
+        }
     }
 
 
- 	/**
- 	 *  Delete object in database
-	 *
-     *	@param  User	$user        User that delete
-     *  @param	int		$notrigger	 0=launch triggers after, 1=disable triggers
-	 *  @return	int					 <0 if KO, >0 if OK
-	 */
-	function delete($user, $notrigger=0)
-	{
-		global $conf, $langs;
-		$error=0;
-
-		$sql = "DELETE FROM ".MAIN_DB_PREFIX."c_country";
-		$sql.= " WHERE rowid=".$this->id;
-
-		$this->db->begin();
-
-		dol_syslog(get_class($this)."::delete", LOG_DEBUG);
-		$resql = $this->db->query($sql);
-    	if (! $resql) { $error++; $this->errors[]="Error ".$this->db->lasterror(); }
-
-		if (! $error)
-		{
-			if (! $notrigger)
-			{
-				// Uncomment this and change MYOBJECT to your own tag if you
-		        // want this action call a trigger.
-
-		        //// Call triggers
-		        //include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php';
-		        //$interface=new Interfaces($this->db);
-		        //$result=$interface->run_triggers('MYOBJECT_DELETE',$this,$user,$langs,$conf);
-		        //if ($result < 0) { $error++; $this->errors=$interface->errors; }
-		        //// End call triggers
-			}
-		}
+        /**
+         *  Delete object in database
+         *
+         *	@param  User	$user        User that delete
+         *  @param	int		$notrigger	 0=launch triggers after, 1=disable triggers
+         *  @return	int					 <0 if KO, >0 if OK
+         */
+    function delete($user, $notrigger=0)
+    {
+        global $conf, $langs;
+        $error=0;
+
+        $sql = "DELETE FROM ".MAIN_DB_PREFIX."c_country";
+        $sql.= " WHERE rowid=".$this->id;
+
+        $this->db->begin();
+
+        dol_syslog(get_class($this)."::delete", LOG_DEBUG);
+        $resql = $this->db->query($sql);
+        if (! $resql) { $error++; $this->errors[]="Error ".$this->db->lasterror(); }
+
+        if (! $error)
+        {
+            if (! $notrigger)
+            {
+                // Uncomment this and change MYOBJECT to your own tag if you
+                // want this action call a trigger.
+
+                //// Call triggers
+                //include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php';
+                //$interface=new Interfaces($this->db);
+                //$result=$interface->run_triggers('MYOBJECT_DELETE',$this,$user,$langs,$conf);
+                //if ($result < 0) { $error++; $this->errors=$interface->errors; }
+                //// End call triggers
+            }
+        }
 
         // Commit or rollback
-		if ($error)
-		{
-			foreach($this->errors as $errmsg)
-			{
-	            dol_syslog(get_class($this)."::delete ".$errmsg, LOG_ERR);
-	            $this->error.=($this->error?', '.$errmsg:$errmsg);
-			}
-			$this->db->rollback();
-			return -1*$error;
-		}
-		else
-		{
-			$this->db->commit();
-			return 1;
-		}
-	}
+        if ($error)
+        {
+            foreach($this->errors as $errmsg)
+            {
+                dol_syslog(get_class($this)."::delete ".$errmsg, LOG_ERR);
+                $this->error.=($this->error?', '.$errmsg:$errmsg);
+            }
+            $this->db->rollback();
+            return -1*$error;
+        }
+        else
+        {
+            $this->db->commit();
+            return 1;
+        }
+    }
 }

Spacing +64 added lines, -64 removed lines

@@ -40,7 +40,7 @@ 
 	/**
 	 * @var string Error code (or message)
 	 */
-	public $error='';
+	public $error = '';
 
 	/**
 	 * @var string[] Error codes (or messages)
@@ -86,46 +86,46 @@ 
      *  @param      int		$notrigger   0=launch triggers after, 1=disable triggers
      *  @return     int      		   	 <0 if KO, Id of created object if OK
      */
-    function create($user, $notrigger=0)
+    function create($user, $notrigger = 0)
     {
     	global $conf, $langs;
-		$error=0;
+		$error = 0;
 
 		// Clean parameters
-		if (isset($this->code)) $this->code=trim($this->code);
-		if (isset($this->code_iso)) $this->code_iso=trim($this->code_iso);
-		if (isset($this->label)) $this->label=trim($this->label);
-		if (isset($this->active)) $this->active=trim($this->active);
+		if (isset($this->code)) $this->code = trim($this->code);
+		if (isset($this->code_iso)) $this->code_iso = trim($this->code_iso);
+		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 control on parameters values
 
         // Insert request
 		$sql = "INSERT INTO ".MAIN_DB_PREFIX."c_country(";
-		$sql.= "rowid,";
-		$sql.= "code,";
-		$sql.= "code_iso,";
-		$sql.= "label,";
-		$sql.= "active";
-        $sql.= ") VALUES (";
-		$sql.= " ".(! isset($this->rowid)?'NULL':"'".$this->db->escape($this->rowid)."'").",";
-		$sql.= " ".(! isset($this->code)?'NULL':"'".$this->db->escape($this->code)."'").",";
-		$sql.= " ".(! isset($this->code_iso)?'NULL':"'".$this->db->escape($this->code_iso)."'").",";
-		$sql.= " ".(! isset($this->label)?'NULL':"'".$this->db->escape($this->label)."'").",";
-		$sql.= " ".(! isset($this->active)?'NULL':"'".$this->db->escape($this->active)."'")."";
-		$sql.= ")";
+		$sql .= "rowid,";
+		$sql .= "code,";
+		$sql .= "code_iso,";
+		$sql .= "label,";
+		$sql .= "active";
+        $sql .= ") VALUES (";
+		$sql .= " ".(!isset($this->rowid) ? 'NULL' : "'".$this->db->escape($this->rowid)."'").",";
+		$sql .= " ".(!isset($this->code) ? 'NULL' : "'".$this->db->escape($this->code)."'").",";
+		$sql .= " ".(!isset($this->code_iso) ? 'NULL' : "'".$this->db->escape($this->code_iso)."'").",";
+		$sql .= " ".(!isset($this->label) ? 'NULL' : "'".$this->db->escape($this->label)."'").",";
+		$sql .= " ".(!isset($this->active) ? 'NULL' : "'".$this->db->escape($this->active)."'")."";
+		$sql .= ")";
 
 		$this->db->begin();
 
 	   	dol_syslog(get_class($this)."::create", LOG_DEBUG);
-        $resql=$this->db->query($sql);
-    	if (! $resql) { $error++; $this->errors[]="Error ".$this->db->lasterror(); }
+        $resql = $this->db->query($sql);
+    	if (!$resql) { $error++; $this->errors[] = "Error ".$this->db->lasterror(); }
 
-		if (! $error)
+		if (!$error)
         {
             $this->id = $this->db->last_insert_id(MAIN_DB_PREFIX."c_country");
 
-			if (! $notrigger)
+			if (!$notrigger)
 			{
 	            // Uncomment this and change MYOBJECT to your own tag if you
 	            // want this action call a trigger.
@@ -142,13 +142,13 @@ 
         // Commit or rollback
         if ($error)
 		{
-			foreach($this->errors as $errmsg)
+			foreach ($this->errors as $errmsg)
 			{
 	            dol_syslog(get_class($this)."::create ".$errmsg, LOG_ERR);
-	            $this->error.=($this->error?', '.$errmsg:$errmsg);
+	            $this->error .= ($this->error ? ', '.$errmsg : $errmsg);
 			}
 			$this->db->rollback();
-			return -1*$error;
+			return -1 * $error;
 		}
 		else
 		{
@@ -165,28 +165,28 @@ 
      *  @param		string	$code	Code
      *  @return     int          	>0 if OK, 0 if not found, <0 if KO
      */
-    function fetch($id,$code='')
+    function fetch($id, $code = '')
     {
     	global $langs;
         $sql = "SELECT";
-		$sql.= " t.rowid,";
-		$sql.= " t.code,";
-		$sql.= " t.code_iso,";
-		$sql.= " t.label,";
-		$sql.= " t.active";
-        $sql.= " FROM ".MAIN_DB_PREFIX."c_country as t";
-        if ($id)   $sql.= " WHERE t.rowid = ".$id;
-        elseif ($code) $sql.= " WHERE t.code = '".$this->db->escape($code)."'";
+		$sql .= " t.rowid,";
+		$sql .= " t.code,";
+		$sql .= " t.code_iso,";
+		$sql .= " t.label,";
+		$sql .= " t.active";
+        $sql .= " FROM ".MAIN_DB_PREFIX."c_country as t";
+        if ($id)   $sql .= " WHERE t.rowid = ".$id;
+        elseif ($code) $sql .= " WHERE t.code = '".$this->db->escape($code)."'";
 
     	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->code = $obj->code;
 				$this->code_iso = $obj->code_iso;
 				$this->label = $obj->label;
@@ -201,7 +201,7 @@ 
         }
         else
         {
-      	    $this->error="Error ".$this->db->lasterror();
+      	    $this->error = "Error ".$this->db->lasterror();
             return -1;
         }
     }
@@ -214,16 +214,16 @@ 
      *  @param      int		$notrigger	 0=launch triggers after, 1=disable triggers
      *  @return     int     		   	 <0 if KO, >0 if OK
      */
-    function update($user=null, $notrigger=0)
+    function update($user = null, $notrigger = 0)
     {
     	global $conf, $langs;
-		$error=0;
+		$error = 0;
 
 		// Clean parameters
-		if (isset($this->code)) $this->code=trim($this->code);
-		if (isset($this->code_iso)) $this->code_iso=trim($this->code_iso);
-		if (isset($this->label)) $this->label=trim($this->label);
-		if (isset($this->active)) $this->active=trim($this->active);
+		if (isset($this->code)) $this->code = trim($this->code);
+		if (isset($this->code_iso)) $this->code_iso = trim($this->code_iso);
+		if (isset($this->label)) $this->label = trim($this->label);
+		if (isset($this->active)) $this->active = trim($this->active);
 
 
 		// Check parameters
@@ -231,21 +231,21 @@ 
 
         // Update request
         $sql = "UPDATE ".MAIN_DB_PREFIX."c_country SET";
-		$sql.= " code=".(isset($this->code)?"'".$this->db->escape($this->code)."'":"null").",";
-		$sql.= " code_iso=".(isset($this->code_iso)?"'".$this->db->escape($this->code_iso)."'":"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 .= " code=".(isset($this->code) ? "'".$this->db->escape($this->code)."'" : "null").",";
+		$sql .= " code_iso=".(isset($this->code_iso) ? "'".$this->db->escape($this->code_iso)."'" : "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();
 
 		dol_syslog(get_class($this)."::update", LOG_DEBUG);
         $resql = $this->db->query($sql);
-    	if (! $resql) { $error++; $this->errors[]="Error ".$this->db->lasterror(); }
+    	if (!$resql) { $error++; $this->errors[] = "Error ".$this->db->lasterror(); }
 
-		if (! $error)
+		if (!$error)
 		{
-			if (! $notrigger)
+			if (!$notrigger)
 			{
 	            // Uncomment this and change MYOBJECT to your own tag if you
 	            // want this action call a trigger.
@@ -262,13 +262,13 @@ 
         // Commit or rollback
 		if ($error)
 		{
-			foreach($this->errors as $errmsg)
+			foreach ($this->errors as $errmsg)
 			{
 	            dol_syslog(get_class($this)."::update ".$errmsg, LOG_ERR);
-	            $this->error.=($this->error?', '.$errmsg:$errmsg);
+	            $this->error .= ($this->error ? ', '.$errmsg : $errmsg);
 			}
 			$this->db->rollback();
-			return -1*$error;
+			return -1 * $error;
 		}
 		else
 		{
@@ -285,23 +285,23 @@ 
      *  @param	int		$notrigger	 0=launch triggers after, 1=disable triggers
 	 *  @return	int					 <0 if KO, >0 if OK
 	 */
-	function delete($user, $notrigger=0)
+	function delete($user, $notrigger = 0)
 	{
 		global $conf, $langs;
-		$error=0;
+		$error = 0;
 
 		$sql = "DELETE FROM ".MAIN_DB_PREFIX."c_country";
-		$sql.= " WHERE rowid=".$this->id;
+		$sql .= " WHERE rowid=".$this->id;
 
 		$this->db->begin();
 
 		dol_syslog(get_class($this)."::delete", LOG_DEBUG);
 		$resql = $this->db->query($sql);
-    	if (! $resql) { $error++; $this->errors[]="Error ".$this->db->lasterror(); }
+    	if (!$resql) { $error++; $this->errors[] = "Error ".$this->db->lasterror(); }
 
-		if (! $error)
+		if (!$error)
 		{
-			if (! $notrigger)
+			if (!$notrigger)
 			{
 				// Uncomment this and change MYOBJECT to your own tag if you
 		        // want this action call a trigger.
@@ -318,13 +318,13 @@ 
         // Commit or rollback
 		if ($error)
 		{
-			foreach($this->errors as $errmsg)
+			foreach ($this->errors as $errmsg)
 			{
 	            dol_syslog(get_class($this)."::delete ".$errmsg, LOG_ERR);
-	            $this->error.=($this->error?', '.$errmsg:$errmsg);
+	            $this->error .= ($this->error ? ', '.$errmsg : $errmsg);
 			}
 			$this->db->rollback();
-			return -1*$error;
+			return -1 * $error;
 		}
 		else
 		{

Braces +34 added lines, -20 removed lines

@@ -92,10 +92,18 @@ 
 		$error=0;
 
 		// Clean parameters
-		if (isset($this->code)) $this->code=trim($this->code);
-		if (isset($this->code_iso)) $this->code_iso=trim($this->code_iso);
-		if (isset($this->label)) $this->label=trim($this->label);
-		if (isset($this->active)) $this->active=trim($this->active);
+		if (isset($this->code)) {
+		    $this->code=trim($this->code);
+		}
+		if (isset($this->code_iso)) {
+		    $this->code_iso=trim($this->code_iso);
+		}
+		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 control on parameters values
@@ -149,8 +157,7 @@ 
 			}
 			$this->db->rollback();
 			return -1*$error;
-		}
-		else
+		} else
 		{
 			$this->db->commit();
             return $this->id;
@@ -175,8 +182,11 @@ 
 		$sql.= " t.label,";
 		$sql.= " t.active";
         $sql.= " FROM ".MAIN_DB_PREFIX."c_country as t";
-        if ($id)   $sql.= " WHERE t.rowid = ".$id;
-        elseif ($code) $sql.= " WHERE t.code = '".$this->db->escape($code)."'";
+        if ($id) {
+            $sql.= " WHERE t.rowid = ".$id;
+        } elseif ($code) {
+            $sql.= " WHERE t.code = '".$this->db->escape($code)."'";
+        }
 
     	dol_syslog(get_class($this)."::fetch", LOG_DEBUG);
         $resql=$this->db->query($sql);
@@ -194,12 +204,10 @@ 
 
                 $this->db->free($resql);
                 return 1;
-            }
-            else {
+            } else {
                 return 0;
             }
-        }
-        else
+        } else
         {
       	    $this->error="Error ".$this->db->lasterror();
             return -1;
@@ -220,10 +228,18 @@ 
 		$error=0;
 
 		// Clean parameters
-		if (isset($this->code)) $this->code=trim($this->code);
-		if (isset($this->code_iso)) $this->code_iso=trim($this->code_iso);
-		if (isset($this->label)) $this->label=trim($this->label);
-		if (isset($this->active)) $this->active=trim($this->active);
+		if (isset($this->code)) {
+		    $this->code=trim($this->code);
+		}
+		if (isset($this->code_iso)) {
+		    $this->code_iso=trim($this->code_iso);
+		}
+		if (isset($this->label)) {
+		    $this->label=trim($this->label);
+		}
+		if (isset($this->active)) {
+		    $this->active=trim($this->active);
+		}
 
 
 		// Check parameters
@@ -269,8 +285,7 @@ 
 			}
 			$this->db->rollback();
 			return -1*$error;
-		}
-		else
+		} else
 		{
 			$this->db->commit();
 			return 1;
@@ -325,8 +340,7 @@ 
 			}
 			$this->db->rollback();
 			return -1*$error;
-		}
-		else
+		} else
 		{
 			$this->db->commit();
 			return 1;

dolibarr/htdocs/core/class/commondocgenerator.class.php

Indentation +490 added lines, -490 removed lines

@@ -34,27 +34,27 @@ 
  */
 abstract class CommonDocGenerator
 {
-	/**
-	 * @var string Error code (or message)
-	 */
-	public $error='';
+    /**
+     * @var string Error code (or message)
+     */
+    public $error='';
 
     /**
      * @var string[]    Array of error strings
      */
     public $errors = array();
 
-	/**
+    /**
      * @var DoliDB Database handler.
      */
-	protected $db;
+    protected $db;
 
 
-	/**
-	 *	Constructor
-	 *
-	 *  @param		DoliDB		$db      Database handler
-	*/
+    /**
+     *	Constructor
+     *
+     *  @param		DoliDB		$db      Database handler
+     */
     public function __construct($db)
     {
         $this->db = $db;
@@ -82,18 +82,18 @@ 
             'myuser_fullname'=>$user->getFullName($outputlangs,1),
             'myuser_login'=>$user->login,
             'myuser_phone'=>$user->office_phone,
-       		'myuser_address'=>$user->address,
-       		'myuser_zip'=>$user->zip,
-       		'myuser_town'=>$user->town,
-       		'myuser_country'=>$user->country,
-        	'myuser_country_code'=>$user->country_code,
-       		'myuser_state'=>$user->state,
-        	'myuser_state_code'=>$user->state_code,
-        	'myuser_fax'=>$user->office_fax,
+                'myuser_address'=>$user->address,
+                'myuser_zip'=>$user->zip,
+                'myuser_town'=>$user->town,
+                'myuser_country'=>$user->country,
+            'myuser_country_code'=>$user->country_code,
+                'myuser_state'=>$user->state,
+            'myuser_state_code'=>$user->state_code,
+            'myuser_fax'=>$user->office_fax,
             'myuser_mobile'=>$user->user_mobile,
             'myuser_email'=>$user->email,
-        	'myuser_logo'=>$logotouse,
-        	'myuser_job'=>$user->job,
+            'myuser_logo'=>$logotouse,
+            'myuser_job'=>$user->job,
             'myuser_web'=>''	// url not exist in $user object
         );
     }
@@ -118,11 +118,11 @@ 
         }
         if (empty($mysoc->country) && ! empty($mysoc->country_code))
         {
-        	$mysoc->country=$outputlangs->transnoentitiesnoconv("Country".$mysoc->country_code);
+            $mysoc->country=$outputlangs->transnoentitiesnoconv("Country".$mysoc->country_code);
         }
         if (empty($mysoc->state) && ! empty($mysoc->state_code))
         {
-        	$mysoc->state=getState($mysoc->state_code,0);
+            $mysoc->state=getState($mysoc->state_code,0);
         }
 
         $logotouse=$conf->mycompany->dir_output.'/logos/thumbs/'.$mysoc->logo_small;
@@ -140,7 +140,7 @@ 
             'mycompany_country_code'=>$mysoc->country_code,
             'mycompany_state'=>$mysoc->state,
             'mycompany_state_code'=>$mysoc->state_code,
-        	'mycompany_web'=>$mysoc->url,
+            'mycompany_web'=>$mysoc->url,
             'mycompany_juridicalstatus'=>$mysoc->forme_juridique,
             'mycompany_managers'=>$mysoc->managers,
             'mycompany_capital'=>$mysoc->capital,
@@ -151,8 +151,8 @@ 
             'mycompany_idprof4'=>$mysoc->idprof4,
             'mycompany_idprof5'=>$mysoc->idprof5,
             'mycompany_idprof6'=>$mysoc->idprof6,
-        	'mycompany_vatnumber'=>$mysoc->tva_intra,
-			'mycompany_object'=>$mysoc->object,
+            'mycompany_vatnumber'=>$mysoc->tva_intra,
+            'mycompany_object'=>$mysoc->object,
             'mycompany_note_private'=>$mysoc->note_private,
             //'mycompany_note_public'=>$mysoc->note_public,        // Only private not exists for "mysoc" but both for thirdparties
         );
@@ -174,16 +174,16 @@ 
 
         if (empty($object->country) && ! empty($object->country_code))
         {
-        	$object->country=$outputlangs->transnoentitiesnoconv("Country".$object->country_code);
+            $object->country=$outputlangs->transnoentitiesnoconv("Country".$object->country_code);
         }
         if (empty($object->state) && ! empty($object->state_code))
         {
-        	$object->state=getState($object->state_code,0);
+            $object->state=getState($object->state_code,0);
         }
 
         $array_thirdparty = array(
             'company_name'=>$object->name,
-	        'company_name_alias' => $object->name_alias,
+            'company_name_alias' => $object->name_alias,
             'company_email'=>$object->email,
             'company_phone'=>$object->phone,
             'company_fax'=>$object->fax,
@@ -191,10 +191,10 @@ 
             'company_zip'=>$object->zip,
             'company_town'=>$object->town,
             'company_country'=>$object->country,
-        	'company_country_code'=>$object->country_code,
+            'company_country_code'=>$object->country_code,
             'company_state'=>$object->state,
-        	'company_state_code'=>$object->state_code,
-        	'company_web'=>$object->url,
+            'company_state_code'=>$object->state_code,
+            'company_web'=>$object->url,
             'company_barcode'=>$object->barcode,
             'company_vatnumber'=>$object->tva_intra,
             'company_customercode'=>$object->code_client,
@@ -219,52 +219,52 @@ 
         // Retrieve extrafields
         if(is_array($object->array_options) && count($object->array_options))
         {
-        	require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php';
-        	$extrafields = new ExtraFields($this->db);
-        	$extralabels = $extrafields->fetch_name_optionals_label('societe',true);
-        	$object->fetch_optionals();
-
-        	foreach($extrafields->attribute_label as $key=>$label)
-        	{
-        		if($extrafields->attribute_type[$key] == 'price')
-        		{
-        			$object->array_options['options_'.$key] = price($object->array_options['options_'.$key],0,$outputlangs,0,0,-1,$conf->currency);
-        		}
-        		else if($extrafields->attribute_type[$key] == 'select' || $extrafields->attribute_type[$key] == 'checkbox')
-        		{
-        			$object->array_options['options_'.$key] = $extrafields->attribute_param[$key]['options'][$object->array_options['options_'.$key]];
-        		}
-        		$array_thirdparty = array_merge($array_thirdparty, array ('company_options_'.$key => $object->array_options ['options_' . $key]));
-			}
-		}
-		return $array_thirdparty;
-	}
+            require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php';
+            $extrafields = new ExtraFields($this->db);
+            $extralabels = $extrafields->fetch_name_optionals_label('societe',true);
+            $object->fetch_optionals();
+
+            foreach($extrafields->attribute_label as $key=>$label)
+            {
+                if($extrafields->attribute_type[$key] == 'price')
+                {
+                    $object->array_options['options_'.$key] = price($object->array_options['options_'.$key],0,$outputlangs,0,0,-1,$conf->currency);
+                }
+                else if($extrafields->attribute_type[$key] == 'select' || $extrafields->attribute_type[$key] == 'checkbox')
+                {
+                    $object->array_options['options_'.$key] = $extrafields->attribute_param[$key]['options'][$object->array_options['options_'.$key]];
+                }
+                $array_thirdparty = array_merge($array_thirdparty, array ('company_options_'.$key => $object->array_options ['options_' . $key]));
+            }
+        }
+        return $array_thirdparty;
+    }
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
-	/**
-	 * Define array with couple subtitution key => subtitution value
-	 *
-	 * @param	Contact 	$object        	contact
-	 * @param	Translate 	$outputlangs   	object for output
-	 * @param   array		$array_key	    Name of the key for return array
-	 * @return	array 						Array of substitution key->code
-	 */
+    /**
+     * Define array with couple subtitution key => subtitution value
+     *
+     * @param	Contact 	$object        	contact
+     * @param	Translate 	$outputlangs   	object for output
+     * @param   array		$array_key	    Name of the key for return array
+     * @return	array 						Array of substitution key->code
+     */
     function get_substitutionarray_contact($object, $outputlangs, $array_key = 'object')
     {
         // phpcs:enable
-		global $conf;
-
-		if(empty($object->country) && ! empty($object->country_code))
-		{
-			$object->country = $outputlangs->transnoentitiesnoconv("Country" . $object->country_code);
-		}
-		if(empty($object->state) && ! empty($object->state_code))
-		{
-			$object->state = getState($object->state_code, 0);
-		}
-
-		$array_contact = array (
-		    $array_key . '_fullname' => $object->getFullName($outputlangs, 1),
+        global $conf;
+
+        if(empty($object->country) && ! empty($object->country_code))
+        {
+            $object->country = $outputlangs->transnoentitiesnoconv("Country" . $object->country_code);
+        }
+        if(empty($object->state) && ! empty($object->state_code))
+        {
+            $object->state = getState($object->state_code, 0);
+        }
+
+        $array_contact = array (
+            $array_key . '_fullname' => $object->getFullName($outputlangs, 1),
             $array_key . '_lastname' => $object->lastname,
             $array_key . '_firstname' => $object->firstname,
             $array_key . '_address' => $object->address,
@@ -290,28 +290,28 @@ 
             $array_key . '_default_lang' => $object->default_lang,
             $array_key . '_note_public' => $object->note_public,
             $array_key . '_note_private' => $object->note_private
-		);
-
-		// Retrieve extrafields
-		require_once DOL_DOCUMENT_ROOT . '/core/class/extrafields.class.php';
-		$extrafields = new ExtraFields($this->db);
-		$extralabels = $extrafields->fetch_name_optionals_label('socpeople', true);
-		$object->fetch_optionals();
-
-		foreach($extrafields->attribute_label as $key => $label)
-		{
-			if ($extrafields->attribute_type[$key] == 'price')
-			{
-				$object->array_options['options_' . $key] = price($object->array_options ['options_' . $key], 0, $outputlangs, 0, 0, - 1, $conf->currency);
-			}
-			elseif($extrafields->attribute_type[$key] == 'select' || $extrafields->attribute_type[$key] == 'checkbox')
-			{
-				$object->array_options['options_' . $key] = $extrafields->attribute_param[$key]['options'][$object->array_options['options_' . $key]];
-			}
-			$array_contact = array_merge($array_contact, array($array_key.'_options_' . $key => $object->array_options['options_'. $key]));
-		}
-		return $array_contact;
-	}
+        );
+
+        // Retrieve extrafields
+        require_once DOL_DOCUMENT_ROOT . '/core/class/extrafields.class.php';
+        $extrafields = new ExtraFields($this->db);
+        $extralabels = $extrafields->fetch_name_optionals_label('socpeople', true);
+        $object->fetch_optionals();
+
+        foreach($extrafields->attribute_label as $key => $label)
+        {
+            if ($extrafields->attribute_type[$key] == 'price')
+            {
+                $object->array_options['options_' . $key] = price($object->array_options ['options_' . $key], 0, $outputlangs, 0, 0, - 1, $conf->currency);
+            }
+            elseif($extrafields->attribute_type[$key] == 'select' || $extrafields->attribute_type[$key] == 'checkbox')
+            {
+                $object->array_options['options_' . $key] = $extrafields->attribute_param[$key]['options'][$object->array_options['options_' . $key]];
+            }
+            $array_contact = array_merge($array_contact, array($array_key.'_options_' . $key => $object->array_options['options_'. $key]));
+        }
+        return $array_contact;
+    }
 
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
@@ -324,260 +324,260 @@ 
     function get_substitutionarray_other($outputlangs)
     {
         // phpcs:enable
-    	global $conf;
-
-    	$now=dol_now('gmt');	// gmt
-    	$array_other = array(
-    	    // Date in default language
-    	    'current_date'=>dol_print_date($now,'day','tzuser'),
-    	    'current_datehour'=>dol_print_date($now,'dayhour','tzuser'),
-   			'current_server_date'=>dol_print_date($now,'day','tzserver'),
-   			'current_server_datehour'=>dol_print_date($now,'dayhour','tzserver'),
-    	    // Date in requested output language
-    	    'current_date_locale'=>dol_print_date($now,'day','tzuser',$outputlangs),
-   			'current_datehour_locale'=>dol_print_date($now,'dayhour','tzuser',$outputlangs),
-   			'current_server_date_locale'=>dol_print_date($now,'day','tzserver',$outputlangs),
-   			'current_server_datehour_locale'=>dol_print_date($now,'dayhour','tzserver',$outputlangs),
-    	);
-
-
-    	foreach($conf->global as $key => $val)
-    	{
-    		if (preg_match('/(_pass|password|secret|_key|key$)/i', $key)) $newval = '*****forbidden*****';
-    		else $newval = $val;
-    		$array_other['__['.$key.']__'] = $newval;
-    	}
-
-    	return $array_other;
+        global $conf;
+
+        $now=dol_now('gmt');	// gmt
+        $array_other = array(
+            // Date in default language
+            'current_date'=>dol_print_date($now,'day','tzuser'),
+            'current_datehour'=>dol_print_date($now,'dayhour','tzuser'),
+                'current_server_date'=>dol_print_date($now,'day','tzserver'),
+                'current_server_datehour'=>dol_print_date($now,'dayhour','tzserver'),
+            // Date in requested output language
+            'current_date_locale'=>dol_print_date($now,'day','tzuser',$outputlangs),
+                'current_datehour_locale'=>dol_print_date($now,'dayhour','tzuser',$outputlangs),
+                'current_server_date_locale'=>dol_print_date($now,'day','tzserver',$outputlangs),
+                'current_server_datehour_locale'=>dol_print_date($now,'dayhour','tzserver',$outputlangs),
+        );
+
+
+        foreach($conf->global as $key => $val)
+        {
+            if (preg_match('/(_pass|password|secret|_key|key$)/i', $key)) $newval = '*****forbidden*****';
+            else $newval = $val;
+            $array_other['__['.$key.']__'] = $newval;
+        }
+
+        return $array_other;
     }
 
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
-	/**
-	 * Define array with couple substitution key => substitution value
-	 *
-	 * @param   Object			$object             Main object to use as data source
-	 * @param   Translate		$outputlangs        Lang object to use for output
+    /**
+     * Define array with couple substitution key => substitution value
+     *
+     * @param   Object			$object             Main object to use as data source
+     * @param   Translate		$outputlangs        Lang object to use for output
      * @param   string		    $array_key	        Name of the key for return array
-	 * @return	array								Array of substitution
-	 */
-	function get_substitutionarray_object($object,$outputlangs,$array_key='object')
-	{
+     * @return	array								Array of substitution
+     */
+    function get_substitutionarray_object($object,$outputlangs,$array_key='object')
+    {
         // phpcs:enable
-		global $conf;
-
-		$sumpayed=$sumdeposit=$sumcreditnote='';
-		if ($object->element == 'facture')
-		{
-			$invoice_source=new Facture($this->db);
-			if ($object->fk_facture_source > 0)
-			{
-				$invoice_source->fetch($object->fk_facture_source);
-			}
-			$sumpayed = $object->getSommePaiement();
-			$sumdeposit = $object->getSumDepositsUsed();
-			$sumcreditnote = $object->getSumCreditNotesUsed();
-		}
-
-		$date = ($object->element == 'contrat' ? $object->date_contrat : $object->date);
-
-		$resarray=array(
-		$array_key.'_id'=>$object->id,
-		$array_key.'_ref'=>$object->ref,
-		$array_key.'_ref_ext'=>$object->ref_ext,
-		$array_key.'_ref_customer'=>(! empty($object->ref_client) ? $object->ref_client : (empty($object->ref_customer) ? '' : $object->ref_customer)),
-		$array_key.'_ref_supplier'=>(! empty($object->ref_fournisseur) ? $object->ref_fournisseur : (empty($object->ref_supplier) ? '' : $object->ref_supplier)),
-		$array_key.'_source_invoice_ref'=>$invoice_source->ref,
-		// Dates
+        global $conf;
+
+        $sumpayed=$sumdeposit=$sumcreditnote='';
+        if ($object->element == 'facture')
+        {
+            $invoice_source=new Facture($this->db);
+            if ($object->fk_facture_source > 0)
+            {
+                $invoice_source->fetch($object->fk_facture_source);
+            }
+            $sumpayed = $object->getSommePaiement();
+            $sumdeposit = $object->getSumDepositsUsed();
+            $sumcreditnote = $object->getSumCreditNotesUsed();
+        }
+
+        $date = ($object->element == 'contrat' ? $object->date_contrat : $object->date);
+
+        $resarray=array(
+        $array_key.'_id'=>$object->id,
+        $array_key.'_ref'=>$object->ref,
+        $array_key.'_ref_ext'=>$object->ref_ext,
+        $array_key.'_ref_customer'=>(! empty($object->ref_client) ? $object->ref_client : (empty($object->ref_customer) ? '' : $object->ref_customer)),
+        $array_key.'_ref_supplier'=>(! empty($object->ref_fournisseur) ? $object->ref_fournisseur : (empty($object->ref_supplier) ? '' : $object->ref_supplier)),
+        $array_key.'_source_invoice_ref'=>$invoice_source->ref,
+        // Dates
         $array_key.'_hour'=>dol_print_date($date,'hour'),
-		$array_key.'_date'=>dol_print_date($date,'day'),
-		$array_key.'_date_rfc'=>dol_print_date($date,'dayrfc'),
-		$array_key.'_date_limit'=>(! empty($object->date_lim_reglement)?dol_print_date($object->date_lim_reglement,'day'):''),
-	    $array_key.'_date_end'=>(! empty($object->fin_validite)?dol_print_date($object->fin_validite,'day'):''),
-		$array_key.'_date_creation'=>dol_print_date($object->date_creation,'day'),
-		$array_key.'_date_modification'=>(! empty($object->date_modification)?dol_print_date($object->date_modification,'day'):''),
-		$array_key.'_date_validation'=>(! empty($object->date_validation)?dol_print_date($object->date_validation,'dayhour'):''),
-		$array_key.'_date_delivery_planed'=>(! empty($object->date_livraison)?dol_print_date($object->date_livraison,'day'):''),
-		$array_key.'_date_close'=>(! empty($object->date_cloture)?dol_print_date($object->date_cloture,'dayhour'):''),
-
-		$array_key.'_payment_mode_code'=>$object->mode_reglement_code,
-		$array_key.'_payment_mode'=>($outputlangs->transnoentitiesnoconv('PaymentType'.$object->mode_reglement_code)!='PaymentType'.$object->mode_reglement_code?$outputlangs->transnoentitiesnoconv('PaymentType'.$object->mode_reglement_code):$object->mode_reglement),
-		$array_key.'_payment_term_code'=>$object->cond_reglement_code,
-		$array_key.'_payment_term'=>($outputlangs->transnoentitiesnoconv('PaymentCondition'.$object->cond_reglement_code)!='PaymentCondition'.$object->cond_reglement_code?$outputlangs->transnoentitiesnoconv('PaymentCondition'.$object->cond_reglement_code):($object->cond_reglement_doc?$object->cond_reglement_doc:$object->cond_reglement)),
-
-		$array_key.'_total_ht_locale'=>price($object->total_ht, 0, $outputlangs),
-		$array_key.'_total_vat_locale'=>(! empty($object->total_vat)?price($object->total_vat, 0, $outputlangs):price($object->total_tva, 0, $outputlangs)),
-		$array_key.'_total_localtax1_locale'=>price($object->total_localtax1, 0, $outputlangs),
-		$array_key.'_total_localtax2_locale'=>price($object->total_localtax2, 0, $outputlangs),
-		$array_key.'_total_ttc_locale'=>price($object->total_ttc, 0, $outputlangs),
-
-		$array_key.'_total_ht'=>price2num($object->total_ht),
-		$array_key.'_total_vat'=>(! empty($object->total_vat)?price2num($object->total_vat):price2num($object->total_tva)),
-		$array_key.'_total_localtax1'=>price2num($object->total_localtax1),
-		$array_key.'_total_localtax2'=>price2num($object->total_localtax2),
-		$array_key.'_total_ttc'=>price2num($object->total_ttc),
-
-		$array_key.'_multicurrency_code' => price2num($object->multicurrency_code),
-		$array_key.'_multicurrency_tx' => price2num($object->multicurrency_tx),
-	    $array_key.'_multicurrency_total_ht' => price2num($object->multicurrency_total_ht),
-	    $array_key.'_multicurrency_total_tva' => price2num($object->multicurrency_total_tva),
-		$array_key.'_multicurrency_total_ttc' => price2num($object->multicurrency_total_ttc),
-		$array_key.'_multicurrency_total_ht_locale' => price($object->multicurrency_total_ht, 0, $outputlangs),
-		$array_key.'_multicurrency_total_tva_locale' => price($object->multicurrency_total_tva, 0, $outputlangs),
-		$array_key.'_multicurrency_total_ttc_locale' => price($object->multicurrency_total_ttc, 0, $outputlangs),
-
-		$array_key.'_note_private'=>$object->note,
-		$array_key.'_note_public'=>$object->note_public,
-		$array_key.'_note'=>$object->note_public,			// For backward compatibility
-
-		// Payments
-		$array_key.'_already_payed_locale'=>price($sumpayed, 0, $outputlangs),
-		$array_key.'_already_payed'=>price2num($sumpayed),
-		$array_key.'_already_deposit_locale'=>price($sumdeposit, 0, $outputlangs),
-		$array_key.'_already_deposit'=>price2num($sumdeposit),
-		$array_key.'_already_creditnote_locale'=>price($sumcreditnote, 0, $outputlangs),
-		$array_key.'_already_creditnote'=>price2num($sumcreditnote),
-
-		$array_key.'_already_payed_all_locale'=>price(price2num($sumpayed + $sumdeposit + $sumcreditnote, 'MT'), 0, $outputlangs),
-		$array_key.'_already_payed_all'=> price2num(($sumpayed + $sumdeposit + $sumcreditnote), 'MT'),
-
-		// Remain to pay with all know infrmation (except open direct debit requests)
-		$array_key.'_remain_to_pay_locale'=>price(price2num($object->total_ttc - $sumpayed - $sumdeposit - $sumcreditnote, 'MT'), 0, $outputlangs),
-		$array_key.'_remain_to_pay'=>price2num($object->total_ttc - $sumpayed - $sumdeposit - $sumcreditnote, 'MT')
-		);
-
-		if (method_exists($object, 'getTotalDiscount')) {
-			$resarray[$array_key.'_total_discount_ht_locale'] = price($object->getTotalDiscount(), 0, $outputlangs);
-			$resarray[$array_key.'_total_discount_ht'] = price2num($object->getTotalDiscount());
-		} else {
-			$resarray[$array_key.'_total_discount_ht_locale'] = '';
-			$resarray[$array_key.'_total_discount_ht'] = '';
-		}
-
-		// Fetch project information if there is a project assigned to this object
-		if ($object->element != "project" && ! empty($object->fk_project) && $object->fk_project > 0)
-		{
-			if (! is_object($object->project))
-			{
-				$object->fetch_projet();
-			}
-
-			$resarray[$array_key.'_project_ref'] = $object->project->ref;
-			$resarray[$array_key.'_project_title'] = $object->project->title;
-			$resarray[$array_key.'_project_description'] = $object->project->description;
-			$resarray[$array_key.'_project_date_start'] = dol_print_date($object->project->date_start, 'day');
-			$resarray[$array_key.'_project_date_end'] = dol_print_date($object->project->date_end, 'day');
-		}
-
-		// Add vat by rates
-		if (is_array($object->lines) && count($object->lines)>0)
-		{
-			foreach ($object->lines as $line)
-			{
-			    // $line->tva_tx format depends on database field accuraty, no reliable. This is kept for backward comaptibility
-				if (empty($resarray[$array_key.'_total_vat_'.$line->tva_tx])) $resarray[$array_key.'_total_vat_'.$line->tva_tx]=0;
-				$resarray[$array_key.'_total_vat_'.$line->tva_tx]+=$line->total_tva;
-				$resarray[$array_key.'_total_vat_locale_'.$line->tva_tx]=price($resarray[$array_key.'_total_vat_'.$line->tva_tx]);
-			    // $vatformated is vat without not expected chars (so 20, or 8.5 or 5.99 for example)
-				$vatformated=vatrate($line->tva_tx);
-				if (empty($resarray[$array_key.'_total_vat_'.$vatformated])) $resarray[$array_key.'_total_vat_'.$vatformated]=0;
-				$resarray[$array_key.'_total_vat_'.$vatformated]+=$line->total_tva;
-				$resarray[$array_key.'_total_vat_locale_'.$vatformated]=price($resarray[$array_key.'_total_vat_'.$vatformated]);
-			}
-		}
-		// Retrieve extrafields
-		if (is_array($object->array_options) && count($object->array_options))
-		{
-			$extrafieldkey=$object->element;
-
-			require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php';
-			$extrafields = new ExtraFields($this->db);
-			$extralabels = $extrafields->fetch_name_optionals_label($extrafieldkey,true);
-			$object->fetch_optionals();
-
-			$resarray = $this->fill_substitutionarray_with_extrafields($object,$resarray,$extrafields,$array_key,$outputlangs);
-		}
-		return $resarray;
-	}
+        $array_key.'_date'=>dol_print_date($date,'day'),
+        $array_key.'_date_rfc'=>dol_print_date($date,'dayrfc'),
+        $array_key.'_date_limit'=>(! empty($object->date_lim_reglement)?dol_print_date($object->date_lim_reglement,'day'):''),
+        $array_key.'_date_end'=>(! empty($object->fin_validite)?dol_print_date($object->fin_validite,'day'):''),
+        $array_key.'_date_creation'=>dol_print_date($object->date_creation,'day'),
+        $array_key.'_date_modification'=>(! empty($object->date_modification)?dol_print_date($object->date_modification,'day'):''),
+        $array_key.'_date_validation'=>(! empty($object->date_validation)?dol_print_date($object->date_validation,'dayhour'):''),
+        $array_key.'_date_delivery_planed'=>(! empty($object->date_livraison)?dol_print_date($object->date_livraison,'day'):''),
+        $array_key.'_date_close'=>(! empty($object->date_cloture)?dol_print_date($object->date_cloture,'dayhour'):''),
+
+        $array_key.'_payment_mode_code'=>$object->mode_reglement_code,
+        $array_key.'_payment_mode'=>($outputlangs->transnoentitiesnoconv('PaymentType'.$object->mode_reglement_code)!='PaymentType'.$object->mode_reglement_code?$outputlangs->transnoentitiesnoconv('PaymentType'.$object->mode_reglement_code):$object->mode_reglement),
+        $array_key.'_payment_term_code'=>$object->cond_reglement_code,
+        $array_key.'_payment_term'=>($outputlangs->transnoentitiesnoconv('PaymentCondition'.$object->cond_reglement_code)!='PaymentCondition'.$object->cond_reglement_code?$outputlangs->transnoentitiesnoconv('PaymentCondition'.$object->cond_reglement_code):($object->cond_reglement_doc?$object->cond_reglement_doc:$object->cond_reglement)),
+
+        $array_key.'_total_ht_locale'=>price($object->total_ht, 0, $outputlangs),
+        $array_key.'_total_vat_locale'=>(! empty($object->total_vat)?price($object->total_vat, 0, $outputlangs):price($object->total_tva, 0, $outputlangs)),
+        $array_key.'_total_localtax1_locale'=>price($object->total_localtax1, 0, $outputlangs),
+        $array_key.'_total_localtax2_locale'=>price($object->total_localtax2, 0, $outputlangs),
+        $array_key.'_total_ttc_locale'=>price($object->total_ttc, 0, $outputlangs),
+
+        $array_key.'_total_ht'=>price2num($object->total_ht),
+        $array_key.'_total_vat'=>(! empty($object->total_vat)?price2num($object->total_vat):price2num($object->total_tva)),
+        $array_key.'_total_localtax1'=>price2num($object->total_localtax1),
+        $array_key.'_total_localtax2'=>price2num($object->total_localtax2),
+        $array_key.'_total_ttc'=>price2num($object->total_ttc),
+
+        $array_key.'_multicurrency_code' => price2num($object->multicurrency_code),
+        $array_key.'_multicurrency_tx' => price2num($object->multicurrency_tx),
+        $array_key.'_multicurrency_total_ht' => price2num($object->multicurrency_total_ht),
+        $array_key.'_multicurrency_total_tva' => price2num($object->multicurrency_total_tva),
+        $array_key.'_multicurrency_total_ttc' => price2num($object->multicurrency_total_ttc),
+        $array_key.'_multicurrency_total_ht_locale' => price($object->multicurrency_total_ht, 0, $outputlangs),
+        $array_key.'_multicurrency_total_tva_locale' => price($object->multicurrency_total_tva, 0, $outputlangs),
+        $array_key.'_multicurrency_total_ttc_locale' => price($object->multicurrency_total_ttc, 0, $outputlangs),
+
+        $array_key.'_note_private'=>$object->note,
+        $array_key.'_note_public'=>$object->note_public,
+        $array_key.'_note'=>$object->note_public,			// For backward compatibility
+
+        // Payments
+        $array_key.'_already_payed_locale'=>price($sumpayed, 0, $outputlangs),
+        $array_key.'_already_payed'=>price2num($sumpayed),
+        $array_key.'_already_deposit_locale'=>price($sumdeposit, 0, $outputlangs),
+        $array_key.'_already_deposit'=>price2num($sumdeposit),
+        $array_key.'_already_creditnote_locale'=>price($sumcreditnote, 0, $outputlangs),
+        $array_key.'_already_creditnote'=>price2num($sumcreditnote),
+
+        $array_key.'_already_payed_all_locale'=>price(price2num($sumpayed + $sumdeposit + $sumcreditnote, 'MT'), 0, $outputlangs),
+        $array_key.'_already_payed_all'=> price2num(($sumpayed + $sumdeposit + $sumcreditnote), 'MT'),
+
+        // Remain to pay with all know infrmation (except open direct debit requests)
+        $array_key.'_remain_to_pay_locale'=>price(price2num($object->total_ttc - $sumpayed - $sumdeposit - $sumcreditnote, 'MT'), 0, $outputlangs),
+        $array_key.'_remain_to_pay'=>price2num($object->total_ttc - $sumpayed - $sumdeposit - $sumcreditnote, 'MT')
+        );
+
+        if (method_exists($object, 'getTotalDiscount')) {
+            $resarray[$array_key.'_total_discount_ht_locale'] = price($object->getTotalDiscount(), 0, $outputlangs);
+            $resarray[$array_key.'_total_discount_ht'] = price2num($object->getTotalDiscount());
+        } else {
+            $resarray[$array_key.'_total_discount_ht_locale'] = '';
+            $resarray[$array_key.'_total_discount_ht'] = '';
+        }
+
+        // Fetch project information if there is a project assigned to this object
+        if ($object->element != "project" && ! empty($object->fk_project) && $object->fk_project > 0)
+        {
+            if (! is_object($object->project))
+            {
+                $object->fetch_projet();
+            }
+
+            $resarray[$array_key.'_project_ref'] = $object->project->ref;
+            $resarray[$array_key.'_project_title'] = $object->project->title;
+            $resarray[$array_key.'_project_description'] = $object->project->description;
+            $resarray[$array_key.'_project_date_start'] = dol_print_date($object->project->date_start, 'day');
+            $resarray[$array_key.'_project_date_end'] = dol_print_date($object->project->date_end, 'day');
+        }
+
+        // Add vat by rates
+        if (is_array($object->lines) && count($object->lines)>0)
+        {
+            foreach ($object->lines as $line)
+            {
+                // $line->tva_tx format depends on database field accuraty, no reliable. This is kept for backward comaptibility
+                if (empty($resarray[$array_key.'_total_vat_'.$line->tva_tx])) $resarray[$array_key.'_total_vat_'.$line->tva_tx]=0;
+                $resarray[$array_key.'_total_vat_'.$line->tva_tx]+=$line->total_tva;
+                $resarray[$array_key.'_total_vat_locale_'.$line->tva_tx]=price($resarray[$array_key.'_total_vat_'.$line->tva_tx]);
+                // $vatformated is vat without not expected chars (so 20, or 8.5 or 5.99 for example)
+                $vatformated=vatrate($line->tva_tx);
+                if (empty($resarray[$array_key.'_total_vat_'.$vatformated])) $resarray[$array_key.'_total_vat_'.$vatformated]=0;
+                $resarray[$array_key.'_total_vat_'.$vatformated]+=$line->total_tva;
+                $resarray[$array_key.'_total_vat_locale_'.$vatformated]=price($resarray[$array_key.'_total_vat_'.$vatformated]);
+            }
+        }
+        // Retrieve extrafields
+        if (is_array($object->array_options) && count($object->array_options))
+        {
+            $extrafieldkey=$object->element;
+
+            require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php';
+            $extrafields = new ExtraFields($this->db);
+            $extralabels = $extrafields->fetch_name_optionals_label($extrafieldkey,true);
+            $object->fetch_optionals();
+
+            $resarray = $this->fill_substitutionarray_with_extrafields($object,$resarray,$extrafields,$array_key,$outputlangs);
+        }
+        return $resarray;
+    }
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
-	/**
-	 *	Define array with couple substitution key => substitution value
-	 *
-	 *	@param  Object			$line				Object line
-	 *	@param  Translate		$outputlangs        Lang object to use for output
-	 *  @return	array								Return a substitution array
-	 */
-	function get_substitutionarray_lines($line, $outputlangs)
-	{
+    /**
+     *	Define array with couple substitution key => substitution value
+     *
+     *	@param  Object			$line				Object line
+     *	@param  Translate		$outputlangs        Lang object to use for output
+     *  @return	array								Return a substitution array
+     */
+    function get_substitutionarray_lines($line, $outputlangs)
+    {
         // phpcs:enable
-		global $conf;
-
-		$resarray= array(
-			'line_fulldesc'=>doc_getlinedesc($line,$outputlangs),
-			'line_product_ref'=>$line->product_ref,
-			'line_product_ref_fourn'=>$line->ref_fourn, // for supplier doc lines
-			'line_product_label'=>$line->product_label,
-			'line_product_type'=>$line->product_type,
-			'line_desc'=>$line->desc,
-			'line_vatrate'=>vatrate($line->tva_tx,true,$line->info_bits),
-			'line_up'=>price2num($line->subprice),
-			'line_up_locale'=>price($line->subprice, 0, $outputlangs),
-			'line_qty'=>$line->qty,
-			'line_discount_percent'=>($line->remise_percent?$line->remise_percent.'%':''),
-			'line_price_ht'=>price2num($line->total_ht),
-			'line_price_ttc'=>price2num($line->total_ttc),
-			'line_price_vat'=>price2num($line->total_tva),
-			'line_price_ht_locale'=>price($line->total_ht, 0, $outputlangs),
-			'line_price_ttc_locale'=>price($line->total_ttc, 0, $outputlangs),
-			'line_price_vat_locale'=>price($line->total_tva, 0, $outputlangs),
-		    // Dates
-			'line_date_start'=>dol_print_date($line->date_start, 'day', 'tzuser'),
-			'line_date_start_locale'=>dol_print_date($line->date_start, 'day', 'tzuser', $outputlangs),
-		    'line_date_start_rfc'=>dol_print_date($line->date_start, 'dayrfc', 'tzuser'),
-		    'line_date_end'=>dol_print_date($line->date_end, 'day', 'tzuser'),
-		    'line_date_end_locale'=>dol_print_date($line->date_end, 'day', 'tzuser', $outputlangs),
-		    'line_date_end_rfc'=>dol_print_date($line->date_end, 'dayrfc', 'tzuser'),
-
-		    'line_multicurrency_code' => price2num($line->multicurrency_code),
-		    'line_multicurrency_subprice' => price2num($line->multicurrency_subprice),
-		    'line_multicurrency_total_ht' => price2num($line->multicurrency_total_ht),
-		    'line_multicurrency_total_tva' => price2num($line->multicurrency_total_tva),
-		    'line_multicurrency_total_ttc' => price2num($line->multicurrency_total_ttc),
-		    'line_multicurrency_subprice_locale' => price($line->multicurrency_subprice, 0, $outputlangs),
-		    'line_multicurrency_total_ht_locale' => price($line->multicurrency_total_ht, 0, $outputlangs),
-		    'line_multicurrency_total_tva_locale' => price($line->multicurrency_total_tva, 0, $outputlangs),
-		    'line_multicurrency_total_ttc_locale' => price($line->multicurrency_total_ttc, 0, $outputlangs),
-		);
-
-		    // Units
-		if ($conf->global->PRODUCT_USE_UNITS)
-		{
-		      $resarray['line_unit']=$outputlangs->trans($line->getLabelOfUnit('long'));
-		      $resarray['line_unit_short']=$outputlangs->trans($line->getLabelOfUnit('short'));
-		}
-
-		// Retrieve extrafields
-		$extrafieldkey=$line->element;
-		$array_key="line";
-		require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php';
-		$extrafields = new ExtraFields($this->db);
-		$extralabels = $extrafields->fetch_name_optionals_label($extrafieldkey,true);
-		$line->fetch_optionals();
-
-		$resarray = $this->fill_substitutionarray_with_extrafields($line,$resarray,$extrafields,$array_key=$array_key,$outputlangs);
-
-		// Load product data optional fields to the line -> enables to use "line_options_{extrafield}"
-		if (isset($line->fk_product) && $line->fk_product > 0)
-		{
-			$tmpproduct = new Product($this->db);
-			$result = $tmpproduct->fetch($line->fk_product);
-			foreach($tmpproduct->array_options as $key=>$label)
-				$resarray["line_product_".$key] = $label;
-		}
-
-		return $resarray;
-	}
+        global $conf;
+
+        $resarray= array(
+            'line_fulldesc'=>doc_getlinedesc($line,$outputlangs),
+            'line_product_ref'=>$line->product_ref,
+            'line_product_ref_fourn'=>$line->ref_fourn, // for supplier doc lines
+            'line_product_label'=>$line->product_label,
+            'line_product_type'=>$line->product_type,
+            'line_desc'=>$line->desc,
+            'line_vatrate'=>vatrate($line->tva_tx,true,$line->info_bits),
+            'line_up'=>price2num($line->subprice),
+            'line_up_locale'=>price($line->subprice, 0, $outputlangs),
+            'line_qty'=>$line->qty,
+            'line_discount_percent'=>($line->remise_percent?$line->remise_percent.'%':''),
+            'line_price_ht'=>price2num($line->total_ht),
+            'line_price_ttc'=>price2num($line->total_ttc),
+            'line_price_vat'=>price2num($line->total_tva),
+            'line_price_ht_locale'=>price($line->total_ht, 0, $outputlangs),
+            'line_price_ttc_locale'=>price($line->total_ttc, 0, $outputlangs),
+            'line_price_vat_locale'=>price($line->total_tva, 0, $outputlangs),
+            // Dates
+            'line_date_start'=>dol_print_date($line->date_start, 'day', 'tzuser'),
+            'line_date_start_locale'=>dol_print_date($line->date_start, 'day', 'tzuser', $outputlangs),
+            'line_date_start_rfc'=>dol_print_date($line->date_start, 'dayrfc', 'tzuser'),
+            'line_date_end'=>dol_print_date($line->date_end, 'day', 'tzuser'),
+            'line_date_end_locale'=>dol_print_date($line->date_end, 'day', 'tzuser', $outputlangs),
+            'line_date_end_rfc'=>dol_print_date($line->date_end, 'dayrfc', 'tzuser'),
+
+            'line_multicurrency_code' => price2num($line->multicurrency_code),
+            'line_multicurrency_subprice' => price2num($line->multicurrency_subprice),
+            'line_multicurrency_total_ht' => price2num($line->multicurrency_total_ht),
+            'line_multicurrency_total_tva' => price2num($line->multicurrency_total_tva),
+            'line_multicurrency_total_ttc' => price2num($line->multicurrency_total_ttc),
+            'line_multicurrency_subprice_locale' => price($line->multicurrency_subprice, 0, $outputlangs),
+            'line_multicurrency_total_ht_locale' => price($line->multicurrency_total_ht, 0, $outputlangs),
+            'line_multicurrency_total_tva_locale' => price($line->multicurrency_total_tva, 0, $outputlangs),
+            'line_multicurrency_total_ttc_locale' => price($line->multicurrency_total_ttc, 0, $outputlangs),
+        );
+
+            // Units
+        if ($conf->global->PRODUCT_USE_UNITS)
+        {
+                $resarray['line_unit']=$outputlangs->trans($line->getLabelOfUnit('long'));
+                $resarray['line_unit_short']=$outputlangs->trans($line->getLabelOfUnit('short'));
+        }
+
+        // Retrieve extrafields
+        $extrafieldkey=$line->element;
+        $array_key="line";
+        require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php';
+        $extrafields = new ExtraFields($this->db);
+        $extralabels = $extrafields->fetch_name_optionals_label($extrafieldkey,true);
+        $line->fetch_optionals();
+
+        $resarray = $this->fill_substitutionarray_with_extrafields($line,$resarray,$extrafields,$array_key=$array_key,$outputlangs);
+
+        // Load product data optional fields to the line -> enables to use "line_options_{extrafield}"
+        if (isset($line->fk_product) && $line->fk_product > 0)
+        {
+            $tmpproduct = new Product($this->db);
+            $result = $tmpproduct->fetch($line->fk_product);
+            foreach($tmpproduct->array_options as $key=>$label)
+                $resarray["line_product_".$key] = $label;
+        }
+
+        return $resarray;
+    }
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
     /**
@@ -591,54 +591,54 @@ 
     function get_substitutionarray_shipment($object,$outputlangs,$array_key='object')
     {
         // phpcs:enable
-    	global $conf;
-		dol_include_once('/core/lib/product.lib.php');
-		$object->list_delivery_methods($object->shipping_method_id);
-		$calculatedVolume=($object->trueWidth * $object->trueHeight * $object->trueDepth);
-
-    	$array_shipment=array(
-	    	$array_key.'_id'=>$object->id,
-	    	$array_key.'_ref'=>$object->ref,
-	    	$array_key.'_ref_ext'=>$object->ref_ext,
-	    	$array_key.'_ref_customer'=>$object->ref_customer,
-	    	$array_key.'_date_delivery'=>dol_print_date($object->date_delivery,'day'),
-	    	$array_key.'_hour_delivery'=>dol_print_date($object->date_delivery,'hour'),
-	    	$array_key.'_date_creation'=>dol_print_date($object->date_creation,'day'),
-	    	$array_key.'_total_ht'=>price($object->total_ht),
-	    	$array_key.'_total_vat'=>price($object->total_tva),
-	    	$array_key.'_total_ttc'=>price($object->total_ttc),
-	    	$array_key.'_total_discount_ht' => price($object->getTotalDiscount()),
-	    	$array_key.'_note_private'=>$object->note_private,
-	    	$array_key.'_note'=>$object->note_public,
-	    	$array_key.'_tracking_number'=>$object->tracking_number,
-	    	$array_key.'_tracking_url'=>$object->tracking_url,
-	    	$array_key.'_shipping_method'=>$object->listmeths[0]['libelle'],
-	    	$array_key.'_weight'=>$object->trueWeight.' '.measuring_units_string($object->weight_units, 'weight'),
-	    	$array_key.'_width'=>$object->trueWidth.' '.measuring_units_string($object->width_units, 'size'),
-	    	$array_key.'_height'=>$object->trueHeight.' '.measuring_units_string($object->height_units, 'size'),
-	    	$array_key.'_depth'=>$object->trueDepth.' '.measuring_units_string($object->depth_units, 'size'),
-	    	$array_key.'_size'=>$calculatedVolume.' '.measuring_units_string(0, 'volume'),
-    	);
-
-    	// Add vat by rates
-    	foreach ($object->lines as $line)
-    	{
-    		if (empty($array_shipment[$array_key.'_total_vat_'.$line->tva_tx])) $array_shipment[$array_key.'_total_vat_'.$line->tva_tx]=0;
-    		$array_shipment[$array_key.'_total_vat_'.$line->tva_tx]+=$line->total_tva;
-    	}
-
-    	// Retrieve extrafields
-    	if (is_array($object->array_options) && count($object->array_options))
-    	{
-    		require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php';
-    		$extrafields = new ExtraFields($this->db);
-    		$extralabels = $extrafields->fetch_name_optionals_label('expedition',true);
-    		$object->fetch_optionals();
-
-    		$array_shipment = $this->fill_substitutionarray_with_extrafields($object,$array_shipment,$extrafields,$array_key,$outputlangs);
-    	}
-
-    	return $array_shipment;
+        global $conf;
+        dol_include_once('/core/lib/product.lib.php');
+        $object->list_delivery_methods($object->shipping_method_id);
+        $calculatedVolume=($object->trueWidth * $object->trueHeight * $object->trueDepth);
+
+        $array_shipment=array(
+            $array_key.'_id'=>$object->id,
+            $array_key.'_ref'=>$object->ref,
+            $array_key.'_ref_ext'=>$object->ref_ext,
+            $array_key.'_ref_customer'=>$object->ref_customer,
+            $array_key.'_date_delivery'=>dol_print_date($object->date_delivery,'day'),
+            $array_key.'_hour_delivery'=>dol_print_date($object->date_delivery,'hour'),
+            $array_key.'_date_creation'=>dol_print_date($object->date_creation,'day'),
+            $array_key.'_total_ht'=>price($object->total_ht),
+            $array_key.'_total_vat'=>price($object->total_tva),
+            $array_key.'_total_ttc'=>price($object->total_ttc),
+            $array_key.'_total_discount_ht' => price($object->getTotalDiscount()),
+            $array_key.'_note_private'=>$object->note_private,
+            $array_key.'_note'=>$object->note_public,
+            $array_key.'_tracking_number'=>$object->tracking_number,
+            $array_key.'_tracking_url'=>$object->tracking_url,
+            $array_key.'_shipping_method'=>$object->listmeths[0]['libelle'],
+            $array_key.'_weight'=>$object->trueWeight.' '.measuring_units_string($object->weight_units, 'weight'),
+            $array_key.'_width'=>$object->trueWidth.' '.measuring_units_string($object->width_units, 'size'),
+            $array_key.'_height'=>$object->trueHeight.' '.measuring_units_string($object->height_units, 'size'),
+            $array_key.'_depth'=>$object->trueDepth.' '.measuring_units_string($object->depth_units, 'size'),
+            $array_key.'_size'=>$calculatedVolume.' '.measuring_units_string(0, 'volume'),
+        );
+
+        // Add vat by rates
+        foreach ($object->lines as $line)
+        {
+            if (empty($array_shipment[$array_key.'_total_vat_'.$line->tva_tx])) $array_shipment[$array_key.'_total_vat_'.$line->tva_tx]=0;
+            $array_shipment[$array_key.'_total_vat_'.$line->tva_tx]+=$line->total_tva;
+        }
+
+        // Retrieve extrafields
+        if (is_array($object->array_options) && count($object->array_options))
+        {
+            require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php';
+            $extrafields = new ExtraFields($this->db);
+            $extralabels = $extrafields->fetch_name_optionals_label('expedition',true);
+            $object->fetch_optionals();
+
+            $array_shipment = $this->fill_substitutionarray_with_extrafields($object,$array_shipment,$extrafields,$array_key,$outputlangs);
+        }
+
+        return $array_shipment;
     }
 
 
@@ -657,24 +657,24 @@ 
         dol_include_once('/core/lib/product.lib.php');
 
         $resarray = array(
-	    	'line_fulldesc'=>doc_getlinedesc($line,$outputlangs),
-	    	'line_product_ref'=>$line->product_ref,
-	    	'line_product_label'=>$line->product_label,
-	    	'line_desc'=>$line->desc,
-	    	'line_vatrate'=>vatrate($line->tva_tx,true,$line->info_bits),
-	    	'line_up'=>price($line->subprice),
-	    	'line_qty'=>$line->qty,
-	    	'line_qty_shipped'=>$line->qty_shipped,
-	    	'line_qty_asked'=>$line->qty_asked,
-	    	'line_discount_percent'=>($line->remise_percent?$line->remise_percent.'%':''),
-	    	'line_price_ht'=>price($line->total_ht),
-	    	'line_price_ttc'=>price($line->total_ttc),
-	    	'line_price_vat'=>price($line->total_tva),
-	    	'line_weight'=>empty($line->weight) ? '' : $line->weight*$line->qty_shipped.' '.measuring_units_string($line->weight_units, 'weight'),
-	    	'line_length'=>empty($line->length) ? '' : $line->length*$line->qty_shipped.' '.measuring_units_string($line->length_units, 'size'),
-	    	'line_surface'=>empty($line->surface) ? '' : $line->surface*$line->qty_shipped.' '.measuring_units_string($line->surface_units, 'surface'),
-	    	'line_volume'=>empty($line->volume) ? '' : $line->volume*$line->qty_shipped.' '.measuring_units_string($line->volume_units, 'volume'),
-    	);
+            'line_fulldesc'=>doc_getlinedesc($line,$outputlangs),
+            'line_product_ref'=>$line->product_ref,
+            'line_product_label'=>$line->product_label,
+            'line_desc'=>$line->desc,
+            'line_vatrate'=>vatrate($line->tva_tx,true,$line->info_bits),
+            'line_up'=>price($line->subprice),
+            'line_qty'=>$line->qty,
+            'line_qty_shipped'=>$line->qty_shipped,
+            'line_qty_asked'=>$line->qty_asked,
+            'line_discount_percent'=>($line->remise_percent?$line->remise_percent.'%':''),
+            'line_price_ht'=>price($line->total_ht),
+            'line_price_ttc'=>price($line->total_ttc),
+            'line_price_vat'=>price($line->total_tva),
+            'line_weight'=>empty($line->weight) ? '' : $line->weight*$line->qty_shipped.' '.measuring_units_string($line->weight_units, 'weight'),
+            'line_length'=>empty($line->length) ? '' : $line->length*$line->qty_shipped.' '.measuring_units_string($line->length_units, 'size'),
+            'line_surface'=>empty($line->surface) ? '' : $line->surface*$line->qty_shipped.' '.measuring_units_string($line->surface_units, 'surface'),
+            'line_volume'=>empty($line->volume) ? '' : $line->volume*$line->qty_shipped.' '.measuring_units_string($line->volume_units, 'volume'),
+        );
 
         // Retrieve extrafields
         $extrafieldkey = $line->element;
@@ -731,92 +731,92 @@ 
      *	@return	array								Substitution array
      */
     function fill_substitutionarray_with_extrafields($object,$array_to_fill,$extrafields,$array_key,$outputlangs)
-	{
+    {
         // phpcs:enable
-		global $conf;
-		foreach($extrafields->attribute_label as $key=>$label)
-		{
-			if($extrafields->attribute_type[$key] == 'price')
-			{
-				$object->array_options['options_'.$key] = price2num($object->array_options['options_'.$key]);
-				$object->array_options['options_'.$key.'_currency'] = price($object->array_options['options_'.$key],0,$outputlangs,0,0,-1,$conf->currency);
-				//Add value to store price with currency
-				$array_to_fill=array_merge($array_to_fill,array($array_key.'_options_'.$key.'_currency' => $object->array_options['options_'.$key.'_currency']));
-			}
-			else if($extrafields->attribute_type[$key] == 'select' || $extrafields->attribute_type[$key] == 'checkbox')
-			{
-				$object->array_options['options_'.$key] = $extrafields->attribute_param[$key]['options'][$object->array_options['options_'.$key]];
-			}
-			else if($extrafields->attribute_type[$key] == 'date')
-			{
-				if (strlen($object->array_options['options_'.$key])>0)
-				{
-					$date = $object->array_options['options_'.$key];
-					$object->array_options['options_'.$key] = dol_print_date($date,'day');                                       // using company output language
-					$object->array_options['options_'.$key.'_locale'] = dol_print_date($date,'day','tzserver',$outputlangs);     // using output language format
-					$object->array_options['options_'.$key.'_rfc'] = dol_print_date($date,'dayrfc');                             // international format
-				}
-				else
-				{
-					$object->array_options['options_'.$key] = '';
-					$object->array_options['options_'.$key.'_locale'] = '';
-					$object->array_options['options_'.$key.'_rfc'] = '';
-				}
-				$array_to_fill=array_merge($array_to_fill,array($array_key.'_options_'.$key.'_locale' => $object->array_options['options_'.$key.'_locale']));
-				$array_to_fill=array_merge($array_to_fill,array($array_key.'_options_'.$key.'_rfc' => $object->array_options['options_'.$key.'_rfc']));
-			}
-			else if($extrafields->attribute_type[$key] == 'datetime')
-			{
-				$datetime = $object->array_options['options_'.$key];
-				$object->array_options['options_'.$key] = ($datetime!="0000-00-00 00:00:00"?dol_print_date($object->array_options['options_'.$key],'dayhour'):'');                            // using company output language
-				$object->array_options['options_'.$key.'_locale'] = ($datetime!="0000-00-00 00:00:00"?dol_print_date($object->array_options['options_'.$key],'dayhour','tzserver',$outputlangs):'');    // using output language format
-				$object->array_options['options_'.$key.'_rfc'] = ($datetime!="0000-00-00 00:00:00"?dol_print_date($object->array_options['options_'.$key],'dayhourrfc'):'');                             // international format
-				$array_to_fill=array_merge($array_to_fill,array($array_key.'_options_'.$key.'_locale' => $object->array_options['options_'.$key.'_locale']));
-				$array_to_fill=array_merge($array_to_fill,array($array_key.'_options_'.$key.'_rfc' => $object->array_options['options_'.$key.'_rfc']));
-			}
-			else if($extrafields->attribute_type[$key] == 'link')
-			{
-				$id = $object->array_options['options_'.$key];
-				if ($id != "")
-				{
-					$param = $extrafields->attribute_param[$key];
-					$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))
-						{
-							$tmpobject = new $classname($this->db);
-							$tmpobject->fetch($id);
-							// completely replace the id with the linked object name
-							$object->array_options['options_'.$key] = $tmpobject->name;
-						}
-					}
-				}
-			}
-
-			$array_to_fill=array_merge($array_to_fill,array($array_key.'_options_'.$key => $object->array_options['options_'.$key]));
-		}
-
-		return $array_to_fill;
-	}
-
-
-	/**
-	 * Rect pdf
-	 *
-	 * @param	TCPDF	$pdf			Object PDF
-	 * @param	float	$x				Abscissa of first point
-	 * @param	float	$y		        Ordinate of first point
-	 * @param	float	$l				??
-	 * @param	float	$h				??
-	 * @param	int		$hidetop		1=Hide top bar of array and title, 0=Hide nothing, -1=Hide only title
-	 * @param	int		$hidebottom		Hide bottom
-	 * @return	void
-	 */
+        global $conf;
+        foreach($extrafields->attribute_label as $key=>$label)
+        {
+            if($extrafields->attribute_type[$key] == 'price')
+            {
+                $object->array_options['options_'.$key] = price2num($object->array_options['options_'.$key]);
+                $object->array_options['options_'.$key.'_currency'] = price($object->array_options['options_'.$key],0,$outputlangs,0,0,-1,$conf->currency);
+                //Add value to store price with currency
+                $array_to_fill=array_merge($array_to_fill,array($array_key.'_options_'.$key.'_currency' => $object->array_options['options_'.$key.'_currency']));
+            }
+            else if($extrafields->attribute_type[$key] == 'select' || $extrafields->attribute_type[$key] == 'checkbox')
+            {
+                $object->array_options['options_'.$key] = $extrafields->attribute_param[$key]['options'][$object->array_options['options_'.$key]];
+            }
+            else if($extrafields->attribute_type[$key] == 'date')
+            {
+                if (strlen($object->array_options['options_'.$key])>0)
+                {
+                    $date = $object->array_options['options_'.$key];
+                    $object->array_options['options_'.$key] = dol_print_date($date,'day');                                       // using company output language
+                    $object->array_options['options_'.$key.'_locale'] = dol_print_date($date,'day','tzserver',$outputlangs);     // using output language format
+                    $object->array_options['options_'.$key.'_rfc'] = dol_print_date($date,'dayrfc');                             // international format
+                }
+                else
+                {
+                    $object->array_options['options_'.$key] = '';
+                    $object->array_options['options_'.$key.'_locale'] = '';
+                    $object->array_options['options_'.$key.'_rfc'] = '';
+                }
+                $array_to_fill=array_merge($array_to_fill,array($array_key.'_options_'.$key.'_locale' => $object->array_options['options_'.$key.'_locale']));
+                $array_to_fill=array_merge($array_to_fill,array($array_key.'_options_'.$key.'_rfc' => $object->array_options['options_'.$key.'_rfc']));
+            }
+            else if($extrafields->attribute_type[$key] == 'datetime')
+            {
+                $datetime = $object->array_options['options_'.$key];
+                $object->array_options['options_'.$key] = ($datetime!="0000-00-00 00:00:00"?dol_print_date($object->array_options['options_'.$key],'dayhour'):'');                            // using company output language
+                $object->array_options['options_'.$key.'_locale'] = ($datetime!="0000-00-00 00:00:00"?dol_print_date($object->array_options['options_'.$key],'dayhour','tzserver',$outputlangs):'');    // using output language format
+                $object->array_options['options_'.$key.'_rfc'] = ($datetime!="0000-00-00 00:00:00"?dol_print_date($object->array_options['options_'.$key],'dayhourrfc'):'');                             // international format
+                $array_to_fill=array_merge($array_to_fill,array($array_key.'_options_'.$key.'_locale' => $object->array_options['options_'.$key.'_locale']));
+                $array_to_fill=array_merge($array_to_fill,array($array_key.'_options_'.$key.'_rfc' => $object->array_options['options_'.$key.'_rfc']));
+            }
+            else if($extrafields->attribute_type[$key] == 'link')
+            {
+                $id = $object->array_options['options_'.$key];
+                if ($id != "")
+                {
+                    $param = $extrafields->attribute_param[$key];
+                    $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))
+                        {
+                            $tmpobject = new $classname($this->db);
+                            $tmpobject->fetch($id);
+                            // completely replace the id with the linked object name
+                            $object->array_options['options_'.$key] = $tmpobject->name;
+                        }
+                    }
+                }
+            }
+
+            $array_to_fill=array_merge($array_to_fill,array($array_key.'_options_'.$key => $object->array_options['options_'.$key]));
+        }
+
+        return $array_to_fill;
+    }
+
+
+    /**
+     * Rect pdf
+     *
+     * @param	TCPDF	$pdf			Object PDF
+     * @param	float	$x				Abscissa of first point
+     * @param	float	$y		        Ordinate of first point
+     * @param	float	$l				??
+     * @param	float	$h				??
+     * @param	int		$hidetop		1=Hide top bar of array and title, 0=Hide nothing, -1=Hide only title
+     * @param	int		$hidebottom		Hide bottom
+     * @return	void
+     */
     function printRect($pdf, $x, $y, $l, $h, $hidetop=0, $hidebottom=0)
     {
         if (empty($hidetop) || $hidetop==-1) $pdf->line($x, $y, $x+$l, $y);

Spacing +196 added lines, -196 removed lines

@@ -37,7 +37,7 @@ 
 	/**
 	 * @var string Error code (or message)
 	 */
-	public $error='';
+	public $error = '';
 
     /**
      * @var string[]    Array of error strings
@@ -69,17 +69,17 @@ 
      * @param   Translate	$outputlangs    Language object for output
      * @return	array						Array of substitution key->code
      */
-    function get_substitutionarray_user($user,$outputlangs)
+    function get_substitutionarray_user($user, $outputlangs)
     {
         // phpcs:enable
         global $conf;
 
-        $logotouse=$conf->user->dir_output.'/'.get_exdir($user->id, 2, 0, 1, $user, 'user').'/'.$user->photo;
+        $logotouse = $conf->user->dir_output.'/'.get_exdir($user->id, 2, 0, 1, $user, 'user').'/'.$user->photo;
 
         return array(
             'myuser_lastname'=>$user->lastname,
             'myuser_firstname'=>$user->firstname,
-            'myuser_fullname'=>$user->getFullName($outputlangs,1),
+            'myuser_fullname'=>$user->getFullName($outputlangs, 1),
             'myuser_login'=>$user->login,
             'myuser_phone'=>$user->office_phone,
        		'myuser_address'=>$user->address,
@@ -107,25 +107,25 @@ 
      * @param   Translate	$outputlangs    Language object for output
      * @return	array						Array of substitution key->code
      */
-    function get_substitutionarray_mysoc($mysoc,$outputlangs)
+    function get_substitutionarray_mysoc($mysoc, $outputlangs)
     {
         // phpcs:enable
         global $conf;
 
-        if (empty($mysoc->forme_juridique) && ! empty($mysoc->forme_juridique_code))
+        if (empty($mysoc->forme_juridique) && !empty($mysoc->forme_juridique_code))
         {
-            $mysoc->forme_juridique=getFormeJuridiqueLabel($mysoc->forme_juridique_code);
+            $mysoc->forme_juridique = getFormeJuridiqueLabel($mysoc->forme_juridique_code);
         }
-        if (empty($mysoc->country) && ! empty($mysoc->country_code))
+        if (empty($mysoc->country) && !empty($mysoc->country_code))
         {
-        	$mysoc->country=$outputlangs->transnoentitiesnoconv("Country".$mysoc->country_code);
+        	$mysoc->country = $outputlangs->transnoentitiesnoconv("Country".$mysoc->country_code);
         }
-        if (empty($mysoc->state) && ! empty($mysoc->state_code))
+        if (empty($mysoc->state) && !empty($mysoc->state_code))
         {
-        	$mysoc->state=getState($mysoc->state_code,0);
+        	$mysoc->state = getState($mysoc->state_code, 0);
         }
 
-        $logotouse=$conf->mycompany->dir_output.'/logos/thumbs/'.$mysoc->logo_small;
+        $logotouse = $conf->mycompany->dir_output.'/logos/thumbs/'.$mysoc->logo_small;
 
         return array(
             'mycompany_logo'=>$logotouse,
@@ -167,18 +167,18 @@ 
      * @param   Translate	$outputlangs    Language object for output
      * @return	array						Array of substitution key->code
      */
-    function get_substitutionarray_thirdparty($object,$outputlangs)
+    function get_substitutionarray_thirdparty($object, $outputlangs)
     {
         // phpcs:enable
         global $conf;
 
-        if (empty($object->country) && ! empty($object->country_code))
+        if (empty($object->country) && !empty($object->country_code))
         {
-        	$object->country=$outputlangs->transnoentitiesnoconv("Country".$object->country_code);
+        	$object->country = $outputlangs->transnoentitiesnoconv("Country".$object->country_code);
         }
-        if (empty($object->state) && ! empty($object->state_code))
+        if (empty($object->state) && !empty($object->state_code))
         {
-        	$object->state=getState($object->state_code,0);
+        	$object->state = getState($object->state_code, 0);
         }
 
         $array_thirdparty = array(
@@ -217,24 +217,24 @@ 
         );
 
         // Retrieve extrafields
-        if(is_array($object->array_options) && count($object->array_options))
+        if (is_array($object->array_options) && count($object->array_options))
         {
         	require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php';
         	$extrafields = new ExtraFields($this->db);
-        	$extralabels = $extrafields->fetch_name_optionals_label('societe',true);
+        	$extralabels = $extrafields->fetch_name_optionals_label('societe', true);
         	$object->fetch_optionals();
 
-        	foreach($extrafields->attribute_label as $key=>$label)
+        	foreach ($extrafields->attribute_label as $key=>$label)
         	{
-        		if($extrafields->attribute_type[$key] == 'price')
+        		if ($extrafields->attribute_type[$key] == 'price')
         		{
-        			$object->array_options['options_'.$key] = price($object->array_options['options_'.$key],0,$outputlangs,0,0,-1,$conf->currency);
+        			$object->array_options['options_'.$key] = price($object->array_options['options_'.$key], 0, $outputlangs, 0, 0, -1, $conf->currency);
         		}
-        		else if($extrafields->attribute_type[$key] == 'select' || $extrafields->attribute_type[$key] == 'checkbox')
+        		else if ($extrafields->attribute_type[$key] == 'select' || $extrafields->attribute_type[$key] == 'checkbox')
         		{
         			$object->array_options['options_'.$key] = $extrafields->attribute_param[$key]['options'][$object->array_options['options_'.$key]];
         		}
-        		$array_thirdparty = array_merge($array_thirdparty, array ('company_options_'.$key => $object->array_options ['options_' . $key]));
+        		$array_thirdparty = array_merge($array_thirdparty, array('company_options_'.$key => $object->array_options ['options_'.$key]));
 			}
 		}
 		return $array_thirdparty;
@@ -254,61 +254,61 @@ 
         // phpcs:enable
 		global $conf;
 
-		if(empty($object->country) && ! empty($object->country_code))
+		if (empty($object->country) && !empty($object->country_code))
 		{
-			$object->country = $outputlangs->transnoentitiesnoconv("Country" . $object->country_code);
+			$object->country = $outputlangs->transnoentitiesnoconv("Country".$object->country_code);
 		}
-		if(empty($object->state) && ! empty($object->state_code))
+		if (empty($object->state) && !empty($object->state_code))
 		{
 			$object->state = getState($object->state_code, 0);
 		}
 
-		$array_contact = array (
-		    $array_key . '_fullname' => $object->getFullName($outputlangs, 1),
-            $array_key . '_lastname' => $object->lastname,
-            $array_key . '_firstname' => $object->firstname,
-            $array_key . '_address' => $object->address,
-            $array_key . '_zip' => $object->zip,
-            $array_key . '_town' => $object->town,
-            $array_key . '_state_id' => $object->state_id,
-            $array_key . '_state_code' => $object->state_code,
-            $array_key . '_state' => $object->state,
-            $array_key . '_country_id' => $object->country_id,
-            $array_key . '_country_code' => $object->country_code,
-            $array_key . '_country' => $object->country,
-            $array_key . '_poste' => $object->poste,
-            $array_key . '_socid' => $object->socid,
-            $array_key . '_statut' => $object->statut,
-            $array_key . '_code' => $object->code,
-            $array_key . '_email' => $object->email,
-            $array_key . '_jabberid' => $object->jabberid,
-            $array_key . '_phone_pro' => $object->phone_pro,
-            $array_key . '_phone_perso' => $object->phone_perso,
-            $array_key . '_phone_mobile' => $object->phone_mobile,
-            $array_key . '_fax' => $object->fax,
-            $array_key . '_birthday' => $object->birthday,
-            $array_key . '_default_lang' => $object->default_lang,
-            $array_key . '_note_public' => $object->note_public,
-            $array_key . '_note_private' => $object->note_private
+		$array_contact = array(
+		    $array_key.'_fullname' => $object->getFullName($outputlangs, 1),
+            $array_key.'_lastname' => $object->lastname,
+            $array_key.'_firstname' => $object->firstname,
+            $array_key.'_address' => $object->address,
+            $array_key.'_zip' => $object->zip,
+            $array_key.'_town' => $object->town,
+            $array_key.'_state_id' => $object->state_id,
+            $array_key.'_state_code' => $object->state_code,
+            $array_key.'_state' => $object->state,
+            $array_key.'_country_id' => $object->country_id,
+            $array_key.'_country_code' => $object->country_code,
+            $array_key.'_country' => $object->country,
+            $array_key.'_poste' => $object->poste,
+            $array_key.'_socid' => $object->socid,
+            $array_key.'_statut' => $object->statut,
+            $array_key.'_code' => $object->code,
+            $array_key.'_email' => $object->email,
+            $array_key.'_jabberid' => $object->jabberid,
+            $array_key.'_phone_pro' => $object->phone_pro,
+            $array_key.'_phone_perso' => $object->phone_perso,
+            $array_key.'_phone_mobile' => $object->phone_mobile,
+            $array_key.'_fax' => $object->fax,
+            $array_key.'_birthday' => $object->birthday,
+            $array_key.'_default_lang' => $object->default_lang,
+            $array_key.'_note_public' => $object->note_public,
+            $array_key.'_note_private' => $object->note_private
 		);
 
 		// Retrieve extrafields
-		require_once DOL_DOCUMENT_ROOT . '/core/class/extrafields.class.php';
+		require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php';
 		$extrafields = new ExtraFields($this->db);
 		$extralabels = $extrafields->fetch_name_optionals_label('socpeople', true);
 		$object->fetch_optionals();
 
-		foreach($extrafields->attribute_label as $key => $label)
+		foreach ($extrafields->attribute_label as $key => $label)
 		{
 			if ($extrafields->attribute_type[$key] == 'price')
 			{
-				$object->array_options['options_' . $key] = price($object->array_options ['options_' . $key], 0, $outputlangs, 0, 0, - 1, $conf->currency);
+				$object->array_options['options_'.$key] = price($object->array_options ['options_'.$key], 0, $outputlangs, 0, 0, - 1, $conf->currency);
 			}
-			elseif($extrafields->attribute_type[$key] == 'select' || $extrafields->attribute_type[$key] == 'checkbox')
+			elseif ($extrafields->attribute_type[$key] == 'select' || $extrafields->attribute_type[$key] == 'checkbox')
 			{
-				$object->array_options['options_' . $key] = $extrafields->attribute_param[$key]['options'][$object->array_options['options_' . $key]];
+				$object->array_options['options_'.$key] = $extrafields->attribute_param[$key]['options'][$object->array_options['options_'.$key]];
 			}
-			$array_contact = array_merge($array_contact, array($array_key.'_options_' . $key => $object->array_options['options_'. $key]));
+			$array_contact = array_merge($array_contact, array($array_key.'_options_'.$key => $object->array_options['options_'.$key]));
 		}
 		return $array_contact;
 	}
@@ -326,22 +326,22 @@ 
         // phpcs:enable
     	global $conf;
 
-    	$now=dol_now('gmt');	// gmt
+    	$now = dol_now('gmt'); // gmt
     	$array_other = array(
     	    // Date in default language
-    	    'current_date'=>dol_print_date($now,'day','tzuser'),
-    	    'current_datehour'=>dol_print_date($now,'dayhour','tzuser'),
-   			'current_server_date'=>dol_print_date($now,'day','tzserver'),
-   			'current_server_datehour'=>dol_print_date($now,'dayhour','tzserver'),
+    	    'current_date'=>dol_print_date($now, 'day', 'tzuser'),
+    	    'current_datehour'=>dol_print_date($now, 'dayhour', 'tzuser'),
+   			'current_server_date'=>dol_print_date($now, 'day', 'tzserver'),
+   			'current_server_datehour'=>dol_print_date($now, 'dayhour', 'tzserver'),
     	    // Date in requested output language
-    	    'current_date_locale'=>dol_print_date($now,'day','tzuser',$outputlangs),
-   			'current_datehour_locale'=>dol_print_date($now,'dayhour','tzuser',$outputlangs),
-   			'current_server_date_locale'=>dol_print_date($now,'day','tzserver',$outputlangs),
-   			'current_server_datehour_locale'=>dol_print_date($now,'dayhour','tzserver',$outputlangs),
+    	    'current_date_locale'=>dol_print_date($now, 'day', 'tzuser', $outputlangs),
+   			'current_datehour_locale'=>dol_print_date($now, 'dayhour', 'tzuser', $outputlangs),
+   			'current_server_date_locale'=>dol_print_date($now, 'day', 'tzserver', $outputlangs),
+   			'current_server_datehour_locale'=>dol_print_date($now, 'dayhour', 'tzserver', $outputlangs),
     	);
 
 
-    	foreach($conf->global as $key => $val)
+    	foreach ($conf->global as $key => $val)
     	{
     		if (preg_match('/(_pass|password|secret|_key|key$)/i', $key)) $newval = '*****forbidden*****';
     		else $newval = $val;
@@ -361,15 +361,15 @@ 
      * @param   string		    $array_key	        Name of the key for return array
 	 * @return	array								Array of substitution
 	 */
-	function get_substitutionarray_object($object,$outputlangs,$array_key='object')
+	function get_substitutionarray_object($object, $outputlangs, $array_key = 'object')
 	{
         // phpcs:enable
 		global $conf;
 
-		$sumpayed=$sumdeposit=$sumcreditnote='';
+		$sumpayed = $sumdeposit = $sumcreditnote = '';
 		if ($object->element == 'facture')
 		{
-			$invoice_source=new Facture($this->db);
+			$invoice_source = new Facture($this->db);
 			if ($object->fk_facture_source > 0)
 			{
 				$invoice_source->fetch($object->fk_facture_source);
@@ -381,38 +381,38 @@ 
 
 		$date = ($object->element == 'contrat' ? $object->date_contrat : $object->date);
 
-		$resarray=array(
+		$resarray = array(
 		$array_key.'_id'=>$object->id,
 		$array_key.'_ref'=>$object->ref,
 		$array_key.'_ref_ext'=>$object->ref_ext,
-		$array_key.'_ref_customer'=>(! empty($object->ref_client) ? $object->ref_client : (empty($object->ref_customer) ? '' : $object->ref_customer)),
-		$array_key.'_ref_supplier'=>(! empty($object->ref_fournisseur) ? $object->ref_fournisseur : (empty($object->ref_supplier) ? '' : $object->ref_supplier)),
+		$array_key.'_ref_customer'=>(!empty($object->ref_client) ? $object->ref_client : (empty($object->ref_customer) ? '' : $object->ref_customer)),
+		$array_key.'_ref_supplier'=>(!empty($object->ref_fournisseur) ? $object->ref_fournisseur : (empty($object->ref_supplier) ? '' : $object->ref_supplier)),
 		$array_key.'_source_invoice_ref'=>$invoice_source->ref,
 		// Dates
-        $array_key.'_hour'=>dol_print_date($date,'hour'),
-		$array_key.'_date'=>dol_print_date($date,'day'),
-		$array_key.'_date_rfc'=>dol_print_date($date,'dayrfc'),
-		$array_key.'_date_limit'=>(! empty($object->date_lim_reglement)?dol_print_date($object->date_lim_reglement,'day'):''),
-	    $array_key.'_date_end'=>(! empty($object->fin_validite)?dol_print_date($object->fin_validite,'day'):''),
-		$array_key.'_date_creation'=>dol_print_date($object->date_creation,'day'),
-		$array_key.'_date_modification'=>(! empty($object->date_modification)?dol_print_date($object->date_modification,'day'):''),
-		$array_key.'_date_validation'=>(! empty($object->date_validation)?dol_print_date($object->date_validation,'dayhour'):''),
-		$array_key.'_date_delivery_planed'=>(! empty($object->date_livraison)?dol_print_date($object->date_livraison,'day'):''),
-		$array_key.'_date_close'=>(! empty($object->date_cloture)?dol_print_date($object->date_cloture,'dayhour'):''),
+        $array_key.'_hour'=>dol_print_date($date, 'hour'),
+		$array_key.'_date'=>dol_print_date($date, 'day'),
+		$array_key.'_date_rfc'=>dol_print_date($date, 'dayrfc'),
+		$array_key.'_date_limit'=>(!empty($object->date_lim_reglement) ?dol_print_date($object->date_lim_reglement, 'day') : ''),
+	    $array_key.'_date_end'=>(!empty($object->fin_validite) ?dol_print_date($object->fin_validite, 'day') : ''),
+		$array_key.'_date_creation'=>dol_print_date($object->date_creation, 'day'),
+		$array_key.'_date_modification'=>(!empty($object->date_modification) ?dol_print_date($object->date_modification, 'day') : ''),
+		$array_key.'_date_validation'=>(!empty($object->date_validation) ?dol_print_date($object->date_validation, 'dayhour') : ''),
+		$array_key.'_date_delivery_planed'=>(!empty($object->date_livraison) ?dol_print_date($object->date_livraison, 'day') : ''),
+		$array_key.'_date_close'=>(!empty($object->date_cloture) ?dol_print_date($object->date_cloture, 'dayhour') : ''),
 
 		$array_key.'_payment_mode_code'=>$object->mode_reglement_code,
-		$array_key.'_payment_mode'=>($outputlangs->transnoentitiesnoconv('PaymentType'.$object->mode_reglement_code)!='PaymentType'.$object->mode_reglement_code?$outputlangs->transnoentitiesnoconv('PaymentType'.$object->mode_reglement_code):$object->mode_reglement),
+		$array_key.'_payment_mode'=>($outputlangs->transnoentitiesnoconv('PaymentType'.$object->mode_reglement_code) != 'PaymentType'.$object->mode_reglement_code ? $outputlangs->transnoentitiesnoconv('PaymentType'.$object->mode_reglement_code) : $object->mode_reglement),
 		$array_key.'_payment_term_code'=>$object->cond_reglement_code,
-		$array_key.'_payment_term'=>($outputlangs->transnoentitiesnoconv('PaymentCondition'.$object->cond_reglement_code)!='PaymentCondition'.$object->cond_reglement_code?$outputlangs->transnoentitiesnoconv('PaymentCondition'.$object->cond_reglement_code):($object->cond_reglement_doc?$object->cond_reglement_doc:$object->cond_reglement)),
+		$array_key.'_payment_term'=>($outputlangs->transnoentitiesnoconv('PaymentCondition'.$object->cond_reglement_code) != 'PaymentCondition'.$object->cond_reglement_code ? $outputlangs->transnoentitiesnoconv('PaymentCondition'.$object->cond_reglement_code) : ($object->cond_reglement_doc ? $object->cond_reglement_doc : $object->cond_reglement)),
 
 		$array_key.'_total_ht_locale'=>price($object->total_ht, 0, $outputlangs),
-		$array_key.'_total_vat_locale'=>(! empty($object->total_vat)?price($object->total_vat, 0, $outputlangs):price($object->total_tva, 0, $outputlangs)),
+		$array_key.'_total_vat_locale'=>(!empty($object->total_vat) ?price($object->total_vat, 0, $outputlangs) : price($object->total_tva, 0, $outputlangs)),
 		$array_key.'_total_localtax1_locale'=>price($object->total_localtax1, 0, $outputlangs),
 		$array_key.'_total_localtax2_locale'=>price($object->total_localtax2, 0, $outputlangs),
 		$array_key.'_total_ttc_locale'=>price($object->total_ttc, 0, $outputlangs),
 
 		$array_key.'_total_ht'=>price2num($object->total_ht),
-		$array_key.'_total_vat'=>(! empty($object->total_vat)?price2num($object->total_vat):price2num($object->total_tva)),
+		$array_key.'_total_vat'=>(!empty($object->total_vat) ?price2num($object->total_vat) : price2num($object->total_tva)),
 		$array_key.'_total_localtax1'=>price2num($object->total_localtax1),
 		$array_key.'_total_localtax2'=>price2num($object->total_localtax2),
 		$array_key.'_total_ttc'=>price2num($object->total_ttc),
@@ -428,7 +428,7 @@ 
 
 		$array_key.'_note_private'=>$object->note,
 		$array_key.'_note_public'=>$object->note_public,
-		$array_key.'_note'=>$object->note_public,			// For backward compatibility
+		$array_key.'_note'=>$object->note_public, // For backward compatibility
 
 		// Payments
 		$array_key.'_already_payed_locale'=>price($sumpayed, 0, $outputlangs),
@@ -455,9 +455,9 @@ 
 		}
 
 		// Fetch project information if there is a project assigned to this object
-		if ($object->element != "project" && ! empty($object->fk_project) && $object->fk_project > 0)
+		if ($object->element != "project" && !empty($object->fk_project) && $object->fk_project > 0)
 		{
-			if (! is_object($object->project))
+			if (!is_object($object->project))
 			{
 				$object->fetch_projet();
 			}
@@ -470,32 +470,32 @@ 
 		}
 
 		// Add vat by rates
-		if (is_array($object->lines) && count($object->lines)>0)
+		if (is_array($object->lines) && count($object->lines) > 0)
 		{
 			foreach ($object->lines as $line)
 			{
 			    // $line->tva_tx format depends on database field accuraty, no reliable. This is kept for backward comaptibility
-				if (empty($resarray[$array_key.'_total_vat_'.$line->tva_tx])) $resarray[$array_key.'_total_vat_'.$line->tva_tx]=0;
-				$resarray[$array_key.'_total_vat_'.$line->tva_tx]+=$line->total_tva;
-				$resarray[$array_key.'_total_vat_locale_'.$line->tva_tx]=price($resarray[$array_key.'_total_vat_'.$line->tva_tx]);
+				if (empty($resarray[$array_key.'_total_vat_'.$line->tva_tx])) $resarray[$array_key.'_total_vat_'.$line->tva_tx] = 0;
+				$resarray[$array_key.'_total_vat_'.$line->tva_tx] += $line->total_tva;
+				$resarray[$array_key.'_total_vat_locale_'.$line->tva_tx] = price($resarray[$array_key.'_total_vat_'.$line->tva_tx]);
 			    // $vatformated is vat without not expected chars (so 20, or 8.5 or 5.99 for example)
-				$vatformated=vatrate($line->tva_tx);
-				if (empty($resarray[$array_key.'_total_vat_'.$vatformated])) $resarray[$array_key.'_total_vat_'.$vatformated]=0;
-				$resarray[$array_key.'_total_vat_'.$vatformated]+=$line->total_tva;
-				$resarray[$array_key.'_total_vat_locale_'.$vatformated]=price($resarray[$array_key.'_total_vat_'.$vatformated]);
+				$vatformated = vatrate($line->tva_tx);
+				if (empty($resarray[$array_key.'_total_vat_'.$vatformated])) $resarray[$array_key.'_total_vat_'.$vatformated] = 0;
+				$resarray[$array_key.'_total_vat_'.$vatformated] += $line->total_tva;
+				$resarray[$array_key.'_total_vat_locale_'.$vatformated] = price($resarray[$array_key.'_total_vat_'.$vatformated]);
 			}
 		}
 		// Retrieve extrafields
 		if (is_array($object->array_options) && count($object->array_options))
 		{
-			$extrafieldkey=$object->element;
+			$extrafieldkey = $object->element;
 
 			require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php';
 			$extrafields = new ExtraFields($this->db);
-			$extralabels = $extrafields->fetch_name_optionals_label($extrafieldkey,true);
+			$extralabels = $extrafields->fetch_name_optionals_label($extrafieldkey, true);
 			$object->fetch_optionals();
 
-			$resarray = $this->fill_substitutionarray_with_extrafields($object,$resarray,$extrafields,$array_key,$outputlangs);
+			$resarray = $this->fill_substitutionarray_with_extrafields($object, $resarray, $extrafields, $array_key, $outputlangs);
 		}
 		return $resarray;
 	}
@@ -513,18 +513,18 @@ 
         // phpcs:enable
 		global $conf;
 
-		$resarray= array(
-			'line_fulldesc'=>doc_getlinedesc($line,$outputlangs),
+		$resarray = array(
+			'line_fulldesc'=>doc_getlinedesc($line, $outputlangs),
 			'line_product_ref'=>$line->product_ref,
 			'line_product_ref_fourn'=>$line->ref_fourn, // for supplier doc lines
 			'line_product_label'=>$line->product_label,
 			'line_product_type'=>$line->product_type,
 			'line_desc'=>$line->desc,
-			'line_vatrate'=>vatrate($line->tva_tx,true,$line->info_bits),
+			'line_vatrate'=>vatrate($line->tva_tx, true, $line->info_bits),
 			'line_up'=>price2num($line->subprice),
 			'line_up_locale'=>price($line->subprice, 0, $outputlangs),
 			'line_qty'=>$line->qty,
-			'line_discount_percent'=>($line->remise_percent?$line->remise_percent.'%':''),
+			'line_discount_percent'=>($line->remise_percent ? $line->remise_percent.'%' : ''),
 			'line_price_ht'=>price2num($line->total_ht),
 			'line_price_ttc'=>price2num($line->total_ttc),
 			'line_price_vat'=>price2num($line->total_tva),
@@ -553,26 +553,26 @@ 
 		    // Units
 		if ($conf->global->PRODUCT_USE_UNITS)
 		{
-		      $resarray['line_unit']=$outputlangs->trans($line->getLabelOfUnit('long'));
-		      $resarray['line_unit_short']=$outputlangs->trans($line->getLabelOfUnit('short'));
+		      $resarray['line_unit'] = $outputlangs->trans($line->getLabelOfUnit('long'));
+		      $resarray['line_unit_short'] = $outputlangs->trans($line->getLabelOfUnit('short'));
 		}
 
 		// Retrieve extrafields
-		$extrafieldkey=$line->element;
-		$array_key="line";
+		$extrafieldkey = $line->element;
+		$array_key = "line";
 		require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php';
 		$extrafields = new ExtraFields($this->db);
-		$extralabels = $extrafields->fetch_name_optionals_label($extrafieldkey,true);
+		$extralabels = $extrafields->fetch_name_optionals_label($extrafieldkey, true);
 		$line->fetch_optionals();
 
-		$resarray = $this->fill_substitutionarray_with_extrafields($line,$resarray,$extrafields,$array_key=$array_key,$outputlangs);
+		$resarray = $this->fill_substitutionarray_with_extrafields($line, $resarray, $extrafields, $array_key = $array_key, $outputlangs);
 
 		// Load product data optional fields to the line -> enables to use "line_options_{extrafield}"
 		if (isset($line->fk_product) && $line->fk_product > 0)
 		{
 			$tmpproduct = new Product($this->db);
 			$result = $tmpproduct->fetch($line->fk_product);
-			foreach($tmpproduct->array_options as $key=>$label)
+			foreach ($tmpproduct->array_options as $key=>$label)
 				$resarray["line_product_".$key] = $label;
 		}
 
@@ -588,22 +588,22 @@ 
      * @param   array			$array_key	        Name of the key for return array
      * @return	array								Array of substitution
      */
-    function get_substitutionarray_shipment($object,$outputlangs,$array_key='object')
+    function get_substitutionarray_shipment($object, $outputlangs, $array_key = 'object')
     {
         // phpcs:enable
     	global $conf;
 		dol_include_once('/core/lib/product.lib.php');
 		$object->list_delivery_methods($object->shipping_method_id);
-		$calculatedVolume=($object->trueWidth * $object->trueHeight * $object->trueDepth);
+		$calculatedVolume = ($object->trueWidth * $object->trueHeight * $object->trueDepth);
 
-    	$array_shipment=array(
+    	$array_shipment = array(
 	    	$array_key.'_id'=>$object->id,
 	    	$array_key.'_ref'=>$object->ref,
 	    	$array_key.'_ref_ext'=>$object->ref_ext,
 	    	$array_key.'_ref_customer'=>$object->ref_customer,
-	    	$array_key.'_date_delivery'=>dol_print_date($object->date_delivery,'day'),
-	    	$array_key.'_hour_delivery'=>dol_print_date($object->date_delivery,'hour'),
-	    	$array_key.'_date_creation'=>dol_print_date($object->date_creation,'day'),
+	    	$array_key.'_date_delivery'=>dol_print_date($object->date_delivery, 'day'),
+	    	$array_key.'_hour_delivery'=>dol_print_date($object->date_delivery, 'hour'),
+	    	$array_key.'_date_creation'=>dol_print_date($object->date_creation, 'day'),
 	    	$array_key.'_total_ht'=>price($object->total_ht),
 	    	$array_key.'_total_vat'=>price($object->total_tva),
 	    	$array_key.'_total_ttc'=>price($object->total_ttc),
@@ -623,8 +623,8 @@ 
     	// Add vat by rates
     	foreach ($object->lines as $line)
     	{
-    		if (empty($array_shipment[$array_key.'_total_vat_'.$line->tva_tx])) $array_shipment[$array_key.'_total_vat_'.$line->tva_tx]=0;
-    		$array_shipment[$array_key.'_total_vat_'.$line->tva_tx]+=$line->total_tva;
+    		if (empty($array_shipment[$array_key.'_total_vat_'.$line->tva_tx])) $array_shipment[$array_key.'_total_vat_'.$line->tva_tx] = 0;
+    		$array_shipment[$array_key.'_total_vat_'.$line->tva_tx] += $line->total_tva;
     	}
 
     	// Retrieve extrafields
@@ -632,10 +632,10 @@ 
     	{
     		require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php';
     		$extrafields = new ExtraFields($this->db);
-    		$extralabels = $extrafields->fetch_name_optionals_label('expedition',true);
+    		$extralabels = $extrafields->fetch_name_optionals_label('expedition', true);
     		$object->fetch_optionals();
 
-    		$array_shipment = $this->fill_substitutionarray_with_extrafields($object,$array_shipment,$extrafields,$array_key,$outputlangs);
+    		$array_shipment = $this->fill_substitutionarray_with_extrafields($object, $array_shipment, $extrafields, $array_key, $outputlangs);
     	}
 
     	return $array_shipment;
@@ -657,23 +657,23 @@ 
         dol_include_once('/core/lib/product.lib.php');
 
         $resarray = array(
-	    	'line_fulldesc'=>doc_getlinedesc($line,$outputlangs),
+	    	'line_fulldesc'=>doc_getlinedesc($line, $outputlangs),
 	    	'line_product_ref'=>$line->product_ref,
 	    	'line_product_label'=>$line->product_label,
 	    	'line_desc'=>$line->desc,
-	    	'line_vatrate'=>vatrate($line->tva_tx,true,$line->info_bits),
+	    	'line_vatrate'=>vatrate($line->tva_tx, true, $line->info_bits),
 	    	'line_up'=>price($line->subprice),
 	    	'line_qty'=>$line->qty,
 	    	'line_qty_shipped'=>$line->qty_shipped,
 	    	'line_qty_asked'=>$line->qty_asked,
-	    	'line_discount_percent'=>($line->remise_percent?$line->remise_percent.'%':''),
+	    	'line_discount_percent'=>($line->remise_percent ? $line->remise_percent.'%' : ''),
 	    	'line_price_ht'=>price($line->total_ht),
 	    	'line_price_ttc'=>price($line->total_ttc),
 	    	'line_price_vat'=>price($line->total_tva),
-	    	'line_weight'=>empty($line->weight) ? '' : $line->weight*$line->qty_shipped.' '.measuring_units_string($line->weight_units, 'weight'),
-	    	'line_length'=>empty($line->length) ? '' : $line->length*$line->qty_shipped.' '.measuring_units_string($line->length_units, 'size'),
-	    	'line_surface'=>empty($line->surface) ? '' : $line->surface*$line->qty_shipped.' '.measuring_units_string($line->surface_units, 'surface'),
-	    	'line_volume'=>empty($line->volume) ? '' : $line->volume*$line->qty_shipped.' '.measuring_units_string($line->volume_units, 'volume'),
+	    	'line_weight'=>empty($line->weight) ? '' : $line->weight * $line->qty_shipped.' '.measuring_units_string($line->weight_units, 'weight'),
+	    	'line_length'=>empty($line->length) ? '' : $line->length * $line->qty_shipped.' '.measuring_units_string($line->length_units, 'size'),
+	    	'line_surface'=>empty($line->surface) ? '' : $line->surface * $line->qty_shipped.' '.measuring_units_string($line->surface_units, 'surface'),
+	    	'line_volume'=>empty($line->volume) ? '' : $line->volume * $line->qty_shipped.' '.measuring_units_string($line->volume_units, 'volume'),
     	);
 
         // Retrieve extrafields
@@ -699,18 +699,18 @@ 
      * @param   boolean		$recursive    	Want to fetch child array or child object
      * @return	array						Array of substitution key->code
      */
-    function get_substitutionarray_each_var_object(&$object,$outputlangs,$recursive=true)
+    function get_substitutionarray_each_var_object(&$object, $outputlangs, $recursive = true)
     {
         // phpcs:enable
         $array_other = array();
         if (!empty($object)) {
-            foreach($object as $key => $value) {
+            foreach ($object as $key => $value) {
                 if (!empty($value)) {
                     if (!is_array($value) && !is_object($value)) {
                         $array_other['object_'.$key] = $value;
                     }
                     if (is_array($value) && $recursive) {
-                        $array_other['object_'.$key] = $this->get_substitutionarray_each_var_object($value,$outputlangs,false);
+                        $array_other['object_'.$key] = $this->get_substitutionarray_each_var_object($value, $outputlangs, false);
                     }
                 }
             }
@@ -730,31 +730,31 @@ 
      *  @param  Translate		$outputlangs        Lang object to use for output
      *	@return	array								Substitution array
      */
-    function fill_substitutionarray_with_extrafields($object,$array_to_fill,$extrafields,$array_key,$outputlangs)
+    function fill_substitutionarray_with_extrafields($object, $array_to_fill, $extrafields, $array_key, $outputlangs)
 	{
         // phpcs:enable
 		global $conf;
-		foreach($extrafields->attribute_label as $key=>$label)
+		foreach ($extrafields->attribute_label as $key=>$label)
 		{
-			if($extrafields->attribute_type[$key] == 'price')
+			if ($extrafields->attribute_type[$key] == 'price')
 			{
 				$object->array_options['options_'.$key] = price2num($object->array_options['options_'.$key]);
-				$object->array_options['options_'.$key.'_currency'] = price($object->array_options['options_'.$key],0,$outputlangs,0,0,-1,$conf->currency);
+				$object->array_options['options_'.$key.'_currency'] = price($object->array_options['options_'.$key], 0, $outputlangs, 0, 0, -1, $conf->currency);
 				//Add value to store price with currency
-				$array_to_fill=array_merge($array_to_fill,array($array_key.'_options_'.$key.'_currency' => $object->array_options['options_'.$key.'_currency']));
+				$array_to_fill = array_merge($array_to_fill, array($array_key.'_options_'.$key.'_currency' => $object->array_options['options_'.$key.'_currency']));
 			}
-			else if($extrafields->attribute_type[$key] == 'select' || $extrafields->attribute_type[$key] == 'checkbox')
+			else if ($extrafields->attribute_type[$key] == 'select' || $extrafields->attribute_type[$key] == 'checkbox')
 			{
 				$object->array_options['options_'.$key] = $extrafields->attribute_param[$key]['options'][$object->array_options['options_'.$key]];
 			}
-			else if($extrafields->attribute_type[$key] == 'date')
+			else if ($extrafields->attribute_type[$key] == 'date')
 			{
-				if (strlen($object->array_options['options_'.$key])>0)
+				if (strlen($object->array_options['options_'.$key]) > 0)
 				{
 					$date = $object->array_options['options_'.$key];
-					$object->array_options['options_'.$key] = dol_print_date($date,'day');                                       // using company output language
-					$object->array_options['options_'.$key.'_locale'] = dol_print_date($date,'day','tzserver',$outputlangs);     // using output language format
-					$object->array_options['options_'.$key.'_rfc'] = dol_print_date($date,'dayrfc');                             // international format
+					$object->array_options['options_'.$key] = dol_print_date($date, 'day'); // using company output language
+					$object->array_options['options_'.$key.'_locale'] = dol_print_date($date, 'day', 'tzserver', $outputlangs); // using output language format
+					$object->array_options['options_'.$key.'_rfc'] = dol_print_date($date, 'dayrfc'); // international format
 				}
 				else
 				{
@@ -762,29 +762,29 @@ 
 					$object->array_options['options_'.$key.'_locale'] = '';
 					$object->array_options['options_'.$key.'_rfc'] = '';
 				}
-				$array_to_fill=array_merge($array_to_fill,array($array_key.'_options_'.$key.'_locale' => $object->array_options['options_'.$key.'_locale']));
-				$array_to_fill=array_merge($array_to_fill,array($array_key.'_options_'.$key.'_rfc' => $object->array_options['options_'.$key.'_rfc']));
+				$array_to_fill = array_merge($array_to_fill, array($array_key.'_options_'.$key.'_locale' => $object->array_options['options_'.$key.'_locale']));
+				$array_to_fill = array_merge($array_to_fill, array($array_key.'_options_'.$key.'_rfc' => $object->array_options['options_'.$key.'_rfc']));
 			}
-			else if($extrafields->attribute_type[$key] == 'datetime')
+			else if ($extrafields->attribute_type[$key] == 'datetime')
 			{
 				$datetime = $object->array_options['options_'.$key];
-				$object->array_options['options_'.$key] = ($datetime!="0000-00-00 00:00:00"?dol_print_date($object->array_options['options_'.$key],'dayhour'):'');                            // using company output language
-				$object->array_options['options_'.$key.'_locale'] = ($datetime!="0000-00-00 00:00:00"?dol_print_date($object->array_options['options_'.$key],'dayhour','tzserver',$outputlangs):'');    // using output language format
-				$object->array_options['options_'.$key.'_rfc'] = ($datetime!="0000-00-00 00:00:00"?dol_print_date($object->array_options['options_'.$key],'dayhourrfc'):'');                             // international format
-				$array_to_fill=array_merge($array_to_fill,array($array_key.'_options_'.$key.'_locale' => $object->array_options['options_'.$key.'_locale']));
-				$array_to_fill=array_merge($array_to_fill,array($array_key.'_options_'.$key.'_rfc' => $object->array_options['options_'.$key.'_rfc']));
+				$object->array_options['options_'.$key] = ($datetime != "0000-00-00 00:00:00" ?dol_print_date($object->array_options['options_'.$key], 'dayhour') : ''); // using company output language
+				$object->array_options['options_'.$key.'_locale'] = ($datetime != "0000-00-00 00:00:00" ?dol_print_date($object->array_options['options_'.$key], 'dayhour', 'tzserver', $outputlangs) : ''); // using output language format
+				$object->array_options['options_'.$key.'_rfc'] = ($datetime != "0000-00-00 00:00:00" ?dol_print_date($object->array_options['options_'.$key], 'dayhourrfc') : ''); // international format
+				$array_to_fill = array_merge($array_to_fill, array($array_key.'_options_'.$key.'_locale' => $object->array_options['options_'.$key.'_locale']));
+				$array_to_fill = array_merge($array_to_fill, array($array_key.'_options_'.$key.'_rfc' => $object->array_options['options_'.$key.'_rfc']));
 			}
-			else if($extrafields->attribute_type[$key] == 'link')
+			else if ($extrafields->attribute_type[$key] == 'link')
 			{
 				$id = $object->array_options['options_'.$key];
 				if ($id != "")
 				{
 					$param = $extrafields->attribute_param[$key];
-					$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))
@@ -798,7 +798,7 @@ 
 				}
 			}
 
-			$array_to_fill=array_merge($array_to_fill,array($array_key.'_options_'.$key => $object->array_options['options_'.$key]));
+			$array_to_fill = array_merge($array_to_fill, array($array_key.'_options_'.$key => $object->array_options['options_'.$key]));
 		}
 
 		return $array_to_fill;
@@ -817,12 +817,12 @@ 
 	 * @param	int		$hidebottom		Hide bottom
 	 * @return	void
 	 */
-    function printRect($pdf, $x, $y, $l, $h, $hidetop=0, $hidebottom=0)
+    function printRect($pdf, $x, $y, $l, $h, $hidetop = 0, $hidebottom = 0)
     {
-        if (empty($hidetop) || $hidetop==-1) $pdf->line($x, $y, $x+$l, $y);
-        $pdf->line($x+$l, $y, $x+$l, $y+$h);
-        if (empty($hidebottom)) $pdf->line($x+$l, $y+$h, $x, $y+$h);
-        $pdf->line($x, $y+$h, $x, $y);
+        if (empty($hidetop) || $hidetop == -1) $pdf->line($x, $y, $x + $l, $y);
+        $pdf->line($x + $l, $y, $x + $l, $y + $h);
+        if (empty($hidebottom)) $pdf->line($x + $l, $y + $h, $x, $y + $h);
+        $pdf->line($x, $y + $h, $x, $y);
     }
 
 
@@ -835,8 +835,8 @@ 
      */
     function columnSort($a, $b)
     {
-        if(empty($a['rank'])){ $a['rank'] = 0; }
-        if(empty($b['rank'])){ $b['rank'] = 0; }
+        if (empty($a['rank'])) { $a['rank'] = 0; }
+        if (empty($b['rank'])) { $b['rank'] = 0; }
         if ($a['rank'] == $b['rank']) {
             return 0;
         }
@@ -853,38 +853,38 @@ 
      *      @param	int				$hideref			Do not show ref
      *      @return	null
      */
-    function prepareArrayColumnField($object,$outputlangs,$hidedetails=0,$hidedesc=0,$hideref=0)
+    function prepareArrayColumnField($object, $outputlangs, $hidedetails = 0, $hidedesc = 0, $hideref = 0)
     {
         global $conf;
 
-        $this->defineColumnField($object,$outputlangs,$hidedetails,$hidedesc,$hideref);
+        $this->defineColumnField($object, $outputlangs, $hidedetails, $hidedesc, $hideref);
 
 
         // Sorting
-        uasort ( $this->cols, array( $this, 'columnSort' ) );
+        uasort($this->cols, array($this, 'columnSort'));
 
         // Positionning
-        $curX = $this->page_largeur-$this->marge_droite; // start from right
+        $curX = $this->page_largeur - $this->marge_droite; // start from right
 
         // Array witdh
-        $arrayWidth = $this->page_largeur-$this->marge_droite-$this->marge_gauche;
+        $arrayWidth = $this->page_largeur - $this->marge_droite - $this->marge_gauche;
 
         // Count flexible column
         $totalDefinedColWidth = 0;
         $countFlexCol = 0;
         foreach ($this->cols as $colKey =>& $colDef)
         {
-            if(!$this->getColumnStatus($colKey)) continue; // continue if desable
+            if (!$this->getColumnStatus($colKey)) continue; // continue if desable
 
-            if(!empty($colDef['scale'])){
+            if (!empty($colDef['scale'])) {
                 // In case of column widht is defined by percentage
-                $colDef['width'] = abs($arrayWidth * $colDef['scale'] / 100 );
+                $colDef['width'] = abs($arrayWidth * $colDef['scale'] / 100);
             }
 
-            if(empty($colDef['width'])){
+            if (empty($colDef['width'])) {
                 $countFlexCol++;
             }
-            else{
+            else {
                 $totalDefinedColWidth += $colDef['width'];
             }
         }
@@ -892,25 +892,25 @@ 
         foreach ($this->cols as $colKey =>& $colDef)
         {
             // setting empty conf with default
-            if(!empty($colDef['title'])){
+            if (!empty($colDef['title'])) {
                 $colDef['title'] = array_replace($this->defaultTitlesFieldsStyle, $colDef['title']);
             }
-            else{
+            else {
                 $colDef['title'] = $this->defaultTitlesFieldsStyle;
             }
 
             // setting empty conf with default
-            if(!empty($colDef['content'])){
+            if (!empty($colDef['content'])) {
                 $colDef['content'] = array_replace($this->defaultContentsFieldsStyle, $colDef['content']);
             }
-            else{
+            else {
                 $colDef['content'] = $this->defaultContentsFieldsStyle;
             }
 
-            if($this->getColumnStatus($colKey))
+            if ($this->getColumnStatus($colKey))
             {
                 // In case of flexible column
-                if(empty($colDef['width'])){
+                if (empty($colDef['width'])) {
                     $colDef['width'] = abs(($arrayWidth - $totalDefinedColWidth)) / $countFlexCol;
                 }
 
@@ -956,7 +956,7 @@ 
      */
     function getColumnRank($colKey)
     {
-        if(!isset($this->cols[$colKey]['rank'])) return -1;
+        if (!isset($this->cols[$colKey]['rank'])) return -1;
         return  $this->cols[$colKey]['rank'];
     }
 
@@ -975,22 +975,22 @@ 
         $rank = -1;
 
         // try to get rank from target column
-        if(!empty($targetCol)){
+        if (!empty($targetCol)) {
             $rank = $this->getColumnRank($targetCol);
-            if($rank>=0 && $insertAfterTarget){ $rank++; }
+            if ($rank >= 0 && $insertAfterTarget) { $rank++; }
         }
 
         // get rank from new column definition
-        if($rank<0 && !empty($defArray['rank'])){
+        if ($rank < 0 && !empty($defArray['rank'])) {
             $rank = $defArray['rank'];
         }
 
         // error: no rank
-        if($rank<0){ return -1; }
+        if ($rank < 0) { return -1; }
 
         foreach ($this->cols as $colKey =>& $colDef)
         {
-            if( $rank <= $colDef['rank'])
+            if ($rank <= $colDef['rank'])
             {
                 $colDef['rank'] = $colDef['rank'] + 1;
             }
@@ -1016,19 +1016,19 @@ 
     {
         global $hookmanager;
 
-        $parameters=array(
+        $parameters = array(
             'curY' => &$curY,
             'columnText' => $columnText,
             'colKey' => $colKey
         );
-        $reshook=$hookmanager->executeHooks('printStdColumnContent',$parameters,$this);    // Note that $action and $object may have been modified by hook
-        if ($reshook < 0) setEventMessages($hookmanager->error,$hookmanager->errors,'errors');
+        $reshook = $hookmanager->executeHooks('printStdColumnContent', $parameters, $this); // Note that $action and $object may have been modified by hook
+        if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
         if (!$reshook)
         {
-            if(empty($columnText)) return;
-            $pdf->SetXY($this->getColumnContentXStart($colKey),$curY); // Set curent position
+            if (empty($columnText)) return;
+            $pdf->SetXY($this->getColumnContentXStart($colKey), $curY); // Set curent position
             $colDef = $this->cols[$colKey];
-            $pdf->writeHTMLCell( $this->getColumnContentWidth($colKey),2,$this->getColumnContentXStart($colKey),$curY, $columnText,0,0,0,true,$colDef['content']['align']);
+            $pdf->writeHTMLCell($this->getColumnContentWidth($colKey), 2, $this->getColumnContentXStart($colKey), $curY, $columnText, 0, 0, 0, true, $colDef['content']['align']);
         }
     }
 
@@ -1041,7 +1041,7 @@ 
      */
     function getColumnStatus($colKey)
     {
-        if( !empty($this->cols[$colKey]['status'])){
+        if (!empty($this->cols[$colKey]['status'])) {
             return true;
         }
         else  return  false;

Braces +48 added lines, -34 removed lines

@@ -229,8 +229,7 @@ 
         		if($extrafields->attribute_type[$key] == 'price')
         		{
         			$object->array_options['options_'.$key] = price($object->array_options['options_'.$key],0,$outputlangs,0,0,-1,$conf->currency);
-        		}
-        		else if($extrafields->attribute_type[$key] == 'select' || $extrafields->attribute_type[$key] == 'checkbox')
+        		} else if($extrafields->attribute_type[$key] == 'select' || $extrafields->attribute_type[$key] == 'checkbox')
         		{
         			$object->array_options['options_'.$key] = $extrafields->attribute_param[$key]['options'][$object->array_options['options_'.$key]];
         		}
@@ -303,8 +302,7 @@ 
 			if ($extrafields->attribute_type[$key] == 'price')
 			{
 				$object->array_options['options_' . $key] = price($object->array_options ['options_' . $key], 0, $outputlangs, 0, 0, - 1, $conf->currency);
-			}
-			elseif($extrafields->attribute_type[$key] == 'select' || $extrafields->attribute_type[$key] == 'checkbox')
+			} elseif($extrafields->attribute_type[$key] == 'select' || $extrafields->attribute_type[$key] == 'checkbox')
 			{
 				$object->array_options['options_' . $key] = $extrafields->attribute_param[$key]['options'][$object->array_options['options_' . $key]];
 			}
@@ -343,8 +341,11 @@ 
 
     	foreach($conf->global as $key => $val)
     	{
-    		if (preg_match('/(_pass|password|secret|_key|key$)/i', $key)) $newval = '*****forbidden*****';
-    		else $newval = $val;
+    		if (preg_match('/(_pass|password|secret|_key|key$)/i', $key)) {
+    		    $newval = '*****forbidden*****';
+    		} else {
+    		    $newval = $val;
+    		}
     		$array_other['__['.$key.']__'] = $newval;
     	}
 
@@ -475,12 +476,16 @@ 
 			foreach ($object->lines as $line)
 			{
 			    // $line->tva_tx format depends on database field accuraty, no reliable. This is kept for backward comaptibility
-				if (empty($resarray[$array_key.'_total_vat_'.$line->tva_tx])) $resarray[$array_key.'_total_vat_'.$line->tva_tx]=0;
+				if (empty($resarray[$array_key.'_total_vat_'.$line->tva_tx])) {
+				    $resarray[$array_key.'_total_vat_'.$line->tva_tx]=0;
+				}
 				$resarray[$array_key.'_total_vat_'.$line->tva_tx]+=$line->total_tva;
 				$resarray[$array_key.'_total_vat_locale_'.$line->tva_tx]=price($resarray[$array_key.'_total_vat_'.$line->tva_tx]);
 			    // $vatformated is vat without not expected chars (so 20, or 8.5 or 5.99 for example)
 				$vatformated=vatrate($line->tva_tx);
-				if (empty($resarray[$array_key.'_total_vat_'.$vatformated])) $resarray[$array_key.'_total_vat_'.$vatformated]=0;
+				if (empty($resarray[$array_key.'_total_vat_'.$vatformated])) {
+				    $resarray[$array_key.'_total_vat_'.$vatformated]=0;
+				}
 				$resarray[$array_key.'_total_vat_'.$vatformated]+=$line->total_tva;
 				$resarray[$array_key.'_total_vat_locale_'.$vatformated]=price($resarray[$array_key.'_total_vat_'.$vatformated]);
 			}
@@ -572,8 +577,9 @@ 
 		{
 			$tmpproduct = new Product($this->db);
 			$result = $tmpproduct->fetch($line->fk_product);
-			foreach($tmpproduct->array_options as $key=>$label)
-				$resarray["line_product_".$key] = $label;
+			foreach($tmpproduct->array_options as $key=>$label) {
+							$resarray["line_product_".$key] = $label;
+			}
 		}
 
 		return $resarray;
@@ -623,7 +629,9 @@ 
     	// Add vat by rates
     	foreach ($object->lines as $line)
     	{
-    		if (empty($array_shipment[$array_key.'_total_vat_'.$line->tva_tx])) $array_shipment[$array_key.'_total_vat_'.$line->tva_tx]=0;
+    		if (empty($array_shipment[$array_key.'_total_vat_'.$line->tva_tx])) {
+    		    $array_shipment[$array_key.'_total_vat_'.$line->tva_tx]=0;
+    		}
     		$array_shipment[$array_key.'_total_vat_'.$line->tva_tx]+=$line->total_tva;
     	}
 
@@ -742,12 +750,10 @@ 
 				$object->array_options['options_'.$key.'_currency'] = price($object->array_options['options_'.$key],0,$outputlangs,0,0,-1,$conf->currency);
 				//Add value to store price with currency
 				$array_to_fill=array_merge($array_to_fill,array($array_key.'_options_'.$key.'_currency' => $object->array_options['options_'.$key.'_currency']));
-			}
-			else if($extrafields->attribute_type[$key] == 'select' || $extrafields->attribute_type[$key] == 'checkbox')
+			} else if($extrafields->attribute_type[$key] == 'select' || $extrafields->attribute_type[$key] == 'checkbox')
 			{
 				$object->array_options['options_'.$key] = $extrafields->attribute_param[$key]['options'][$object->array_options['options_'.$key]];
-			}
-			else if($extrafields->attribute_type[$key] == 'date')
+			} else if($extrafields->attribute_type[$key] == 'date')
 			{
 				if (strlen($object->array_options['options_'.$key])>0)
 				{
@@ -755,8 +761,7 @@ 
 					$object->array_options['options_'.$key] = dol_print_date($date,'day');                                       // using company output language
 					$object->array_options['options_'.$key.'_locale'] = dol_print_date($date,'day','tzserver',$outputlangs);     // using output language format
 					$object->array_options['options_'.$key.'_rfc'] = dol_print_date($date,'dayrfc');                             // international format
-				}
-				else
+				} else
 				{
 					$object->array_options['options_'.$key] = '';
 					$object->array_options['options_'.$key.'_locale'] = '';
@@ -764,8 +769,7 @@ 
 				}
 				$array_to_fill=array_merge($array_to_fill,array($array_key.'_options_'.$key.'_locale' => $object->array_options['options_'.$key.'_locale']));
 				$array_to_fill=array_merge($array_to_fill,array($array_key.'_options_'.$key.'_rfc' => $object->array_options['options_'.$key.'_rfc']));
-			}
-			else if($extrafields->attribute_type[$key] == 'datetime')
+			} else if($extrafields->attribute_type[$key] == 'datetime')
 			{
 				$datetime = $object->array_options['options_'.$key];
 				$object->array_options['options_'.$key] = ($datetime!="0000-00-00 00:00:00"?dol_print_date($object->array_options['options_'.$key],'dayhour'):'');                            // using company output language
@@ -773,8 +777,7 @@ 
 				$object->array_options['options_'.$key.'_rfc'] = ($datetime!="0000-00-00 00:00:00"?dol_print_date($object->array_options['options_'.$key],'dayhourrfc'):'');                             // international format
 				$array_to_fill=array_merge($array_to_fill,array($array_key.'_options_'.$key.'_locale' => $object->array_options['options_'.$key.'_locale']));
 				$array_to_fill=array_merge($array_to_fill,array($array_key.'_options_'.$key.'_rfc' => $object->array_options['options_'.$key.'_rfc']));
-			}
-			else if($extrafields->attribute_type[$key] == 'link')
+			} else if($extrafields->attribute_type[$key] == 'link')
 			{
 				$id = $object->array_options['options_'.$key];
 				if ($id != "")
@@ -819,9 +822,13 @@ 
 	 */
     function printRect($pdf, $x, $y, $l, $h, $hidetop=0, $hidebottom=0)
     {
-        if (empty($hidetop) || $hidetop==-1) $pdf->line($x, $y, $x+$l, $y);
+        if (empty($hidetop) || $hidetop==-1) {
+            $pdf->line($x, $y, $x+$l, $y);
+        }
         $pdf->line($x+$l, $y, $x+$l, $y+$h);
-        if (empty($hidebottom)) $pdf->line($x+$l, $y+$h, $x, $y+$h);
+        if (empty($hidebottom)) {
+            $pdf->line($x+$l, $y+$h, $x, $y+$h);
+        }
         $pdf->line($x, $y+$h, $x, $y);
     }
 
@@ -874,7 +881,10 @@ 
         $countFlexCol = 0;
         foreach ($this->cols as $colKey =>& $colDef)
         {
-            if(!$this->getColumnStatus($colKey)) continue; // continue if desable
+            if(!$this->getColumnStatus($colKey)) {
+                continue;
+            }
+            // continue if desable
 
             if(!empty($colDef['scale'])){
                 // In case of column widht is defined by percentage
@@ -883,8 +893,7 @@ 
 
             if(empty($colDef['width'])){
                 $countFlexCol++;
-            }
-            else{
+            } else{
                 $totalDefinedColWidth += $colDef['width'];
             }
         }
@@ -894,16 +903,14 @@ 
             // setting empty conf with default
             if(!empty($colDef['title'])){
                 $colDef['title'] = array_replace($this->defaultTitlesFieldsStyle, $colDef['title']);
-            }
-            else{
+            } else{
                 $colDef['title'] = $this->defaultTitlesFieldsStyle;
             }
 
             // setting empty conf with default
             if(!empty($colDef['content'])){
                 $colDef['content'] = array_replace($this->defaultContentsFieldsStyle, $colDef['content']);
-            }
-            else{
+            } else{
                 $colDef['content'] = $this->defaultContentsFieldsStyle;
             }
 
@@ -956,7 +963,9 @@ 
      */
     function getColumnRank($colKey)
     {
-        if(!isset($this->cols[$colKey]['rank'])) return -1;
+        if(!isset($this->cols[$colKey]['rank'])) {
+            return -1;
+        }
         return  $this->cols[$colKey]['rank'];
     }
 
@@ -1022,10 +1031,14 @@ 
             'colKey' => $colKey
         );
         $reshook=$hookmanager->executeHooks('printStdColumnContent',$parameters,$this);    // Note that $action and $object may have been modified by hook
-        if ($reshook < 0) setEventMessages($hookmanager->error,$hookmanager->errors,'errors');
+        if ($reshook < 0) {
+            setEventMessages($hookmanager->error,$hookmanager->errors,'errors');
+        }
         if (!$reshook)
         {
-            if(empty($columnText)) return;
+            if(empty($columnText)) {
+                return;
+            }
             $pdf->SetXY($this->getColumnContentXStart($colKey),$curY); // Set curent position
             $colDef = $this->cols[$colKey];
             $pdf->writeHTMLCell( $this->getColumnContentWidth($colKey),2,$this->getColumnContentXStart($colKey),$curY, $columnText,0,0,0,true,$colDef['content']['align']);
@@ -1043,7 +1056,8 @@ 
     {
         if( !empty($this->cols[$colKey]['status'])){
             return true;
+        } else {
+            return  false;
         }
-        else  return  false;
     }
 }

dolibarr/htdocs/core/class/canvas.class.php

Indentation +118 added lines, -118 removed lines

@@ -28,22 +28,22 @@ 
  */
 class Canvas
 {
-	/**
+    /**
      * @var DoliDB Database handler.
      */
     public $db;
 
-	/**
-	 * @var string Error code (or message)
-	 */
-	public $error='';
+    /**
+     * @var string Error code (or message)
+     */
+    public $error='';
 
-	/**
-	 * @var string[] Error codes (or messages)
-	 */
-	public $errors = array();
+    /**
+     * @var string[] Error codes (or messages)
+     */
+    public $errors = array();
 
-	public $actiontype;
+    public $actiontype;
 
     public $dirmodule;			// Module directory
     public $targetmodule;      // Module concerned by canvas (ex: thirdparty, contact, ...)
@@ -54,65 +54,65 @@ 
     public $control;           	// Initialized by getCanvas with controller instance
 
 
-   /**
-	*   Constructor
-	*
-	*   @param     DoliDB	$db          	Database handler
-	*   @param     string   $actiontype		Action type ('create', 'view', 'edit', 'list')
-	*/
-	function __construct($db, $actiontype='view')
-	{
-		$this->db = $db;
-
-		$this->actiontype = $this->_cleanaction($actiontype);
-	}
-
-	/**
-	 * Return action code cleaned
-	 *
-	 * @param	string	$action		Action type ('create', 'view', 'edit', 'list', 'add', 'update')
-	 * @return 	string				Cleaned action type ('create', 'view', 'edit', 'list')
-	 */
-	private function _cleanaction($action)
-	{
-	    $newaction = $action;
-	    if ($newaction == 'add')    $newaction='create';
-	    if ($newaction == 'update') $newaction='edit';
-	    if (empty($newaction) || $newaction == 'delete' || $newaction == 'create_user' || $newaction == 'presend' || $newaction == 'send') $newaction='view';
-	    return $newaction;
-	}
-
-
-	/**
-	 * 	Initialize properties: ->targetmodule, ->canvas, ->card, ->dirmodule, ->template_dir
-	 *
-	 * 	@param	string	$module		Name of target module (thirdparty, contact, ...)
-	 * 	@param	string	$card	 	Tab name of card (ex: 'card', 'info', 'contactcard', ...) or '' for a list page
-	 * 	@param	string	$canvas		Name of canvas (ex: mycanvas, default, or mycanvas@myexternalmodule)
-	 * 	@return	void
-	 */
-	function getCanvas($module, $card, $canvas)
-	{
-		global $conf, $langs;
-
-		// Set properties with value specific to dolibarr core: this->targetmodule, this->card, this->canvas
+    /**
+     *   Constructor
+     *
+     *   @param     DoliDB	$db          	Database handler
+     *   @param     string   $actiontype		Action type ('create', 'view', 'edit', 'list')
+     */
+    function __construct($db, $actiontype='view')
+    {
+        $this->db = $db;
+
+        $this->actiontype = $this->_cleanaction($actiontype);
+    }
+
+    /**
+     * Return action code cleaned
+     *
+     * @param	string	$action		Action type ('create', 'view', 'edit', 'list', 'add', 'update')
+     * @return 	string				Cleaned action type ('create', 'view', 'edit', 'list')
+     */
+    private function _cleanaction($action)
+    {
+        $newaction = $action;
+        if ($newaction == 'add')    $newaction='create';
+        if ($newaction == 'update') $newaction='edit';
+        if (empty($newaction) || $newaction == 'delete' || $newaction == 'create_user' || $newaction == 'presend' || $newaction == 'send') $newaction='view';
+        return $newaction;
+    }
+
+
+    /**
+     * 	Initialize properties: ->targetmodule, ->canvas, ->card, ->dirmodule, ->template_dir
+     *
+     * 	@param	string	$module		Name of target module (thirdparty, contact, ...)
+     * 	@param	string	$card	 	Tab name of card (ex: 'card', 'info', 'contactcard', ...) or '' for a list page
+     * 	@param	string	$canvas		Name of canvas (ex: mycanvas, default, or mycanvas@myexternalmodule)
+     * 	@return	void
+     */
+    function getCanvas($module, $card, $canvas)
+    {
+        global $conf, $langs;
+
+        // Set properties with value specific to dolibarr core: this->targetmodule, this->card, this->canvas
         $this->targetmodule = $module;
         $this->canvas = $canvas;
         $this->card = $card;
         $this->dirmodule = $module;
         // Correct values if canvas is into an external module
-		if (preg_match('/^([^@]+)@([^@]+)$/i',$canvas,$regs))
-		{
+        if (preg_match('/^([^@]+)@([^@]+)$/i',$canvas,$regs))
+        {
             $this->canvas = $regs[1];
-		    $this->dirmodule = $regs[2];
-		}
-		// For compatibility
+            $this->dirmodule = $regs[2];
+        }
+        // For compatibility
         if ($this->dirmodule == 'thirdparty') { $this->dirmodule = 'societe'; }
 
         // Control file
-		$controlclassfile = dol_buildpath('/'.$this->dirmodule.'/canvas/'.$this->canvas.'/actions_'.$this->card.'_'.$this->canvas.'.class.php');
-		if (file_exists($controlclassfile))
-		{
+        $controlclassfile = dol_buildpath('/'.$this->dirmodule.'/canvas/'.$this->canvas.'/actions_'.$this->card.'_'.$this->canvas.'.class.php');
+        if (file_exists($controlclassfile))
+        {
             // Include actions class (controller)
             $this->control_file=$controlclassfile;
             require_once $controlclassfile;
@@ -120,10 +120,10 @@ 
             // Instantiate actions class (controller)
             $controlclassname = 'Actions'.ucfirst($this->card).ucfirst($this->canvas);
             $this->control = new $controlclassname($this->db, $this->dirmodule, $this->targetmodule, $this->canvas, $this->card);
-		}
+        }
 
-		// Template dir
-		$this->template_dir = dol_buildpath('/'.$this->dirmodule.'/canvas/'.$this->canvas.'/tpl/');
+        // Template dir
+        $this->template_dir = dol_buildpath('/'.$this->dirmodule.'/canvas/'.$this->canvas.'/tpl/');
         if (! is_dir($this->template_dir))
         {
             $this->template_dir='';
@@ -131,27 +131,27 @@ 
 
         //print 'dimodule='.$dirmodule.' canvas='.$this->canvas.'<br>';
         //print ' => template_dir='.$this->template_dir.'<br>';
-	}
+    }
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
     /**
-	 * 	Shared method for canvas to assign values for templates
-	 *
-	 * 	@param		string		$action	Action string
-	 * 	@param		int			$id			Object id (if ref not provided)
-	 * 	@param		string		$ref		Object ref (if id not provided)
-	 * 	@return		void
-	 */
-	function assign_values(&$action='view', $id=0, $ref='')
-	{
+     * 	Shared method for canvas to assign values for templates
+     *
+     * 	@param		string		$action	Action string
+     * 	@param		int			$id			Object id (if ref not provided)
+     * 	@param		string		$ref		Object ref (if id not provided)
+     * 	@return		void
+     */
+    function assign_values(&$action='view', $id=0, $ref='')
+    {
         // phpcs:enable
-		if (method_exists($this->control,'assign_values')) $this->control->assign_values($action, $id, $ref);
-	}
+        if (method_exists($this->control,'assign_values')) $this->control->assign_values($action, $id, $ref);
+    }
 
     /**
      *	Return the template to display canvas (if it exists)
-	 *
-	 *	@param	string	$action		Action code
+     *
+     *	@param	string	$action		Action code
      *	@return	int		0=Canvas template file does not exist, 1=Canvas template file exists
      */
     function displayCanvasExists($action)
@@ -163,53 +163,53 @@ 
     }
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
-	/**
-	 *	Display a canvas page. This will include the template for output.
-	 *	Variables used by templates may have been defined or loaded before into the assign_values function.
-	 *
-	 *	@param	string	$action		Action code
-	 *	@return	void
-	 */
-	function display_canvas($action)
-	{
+    /**
+     *	Display a canvas page. This will include the template for output.
+     *	Variables used by templates may have been defined or loaded before into the assign_values function.
+     *
+     *	@param	string	$action		Action code
+     *	@return	void
+     */
+    function display_canvas($action)
+    {
         // phpcs:enable
-		global $db, $conf, $langs, $user, $canvas;
-		global $form, $formfile;
+        global $db, $conf, $langs, $user, $canvas;
+        global $form, $formfile;
 
-		include $this->template_dir.(!empty($this->card)?$this->card.'_':'').$this->_cleanaction($action).'.tpl.php';        // Include native PHP template
-	}
+        include $this->template_dir.(!empty($this->card)?$this->card.'_':'').$this->_cleanaction($action).'.tpl.php';        // Include native PHP template
+    }
 
 
-	// This functions should not be used anymore because canvas should contains only templates.
-	// http://wiki.dolibarr.org/index.php/Canvas_development
+    // This functions should not be used anymore because canvas should contains only templates.
+    // http://wiki.dolibarr.org/index.php/Canvas_development
 
-	/**
-	 * 	Return if a canvas contains an action controller
-	 *
-	 * 	@return		boolean		Return if canvas contains actions (old feature. now actions should be inside hooks)
-	 */
-	function hasActions()
-	{
+    /**
+     * 	Return if a canvas contains an action controller
+     *
+     * 	@return		boolean		Return if canvas contains actions (old feature. now actions should be inside hooks)
+     */
+    function hasActions()
+    {
         return (is_object($this->control));
-	}
+    }
 
-	/**
-	 * 	Shared method for canvas to execute actions.
+    /**
+     * 	Shared method for canvas to execute actions.
      *  @deprecated Use the doActions of hooks instead of this.
-	 * 	            This function is called if you add a doActions class inside your canvas. Try to not
-	 * 				do that and add action code into a hook instead.
-	 *
-	 * 	@param		string		$action	Action string
-	 * 	@param		int			$id			Object id
-	 * 	@return		mixed					Return return code of doActions of canvas
-	 * 	@see		http://wiki.dolibarr.org/index.php/Canvas_development
-	 */
-	function doActions(&$action='view', $id=0)
-	{
-		if (method_exists($this->control,'doActions'))
-		{
-			$ret = $this->control->doActions($action, $id);
-			return $ret;
-		}
-	}
+     * 	            This function is called if you add a doActions class inside your canvas. Try to not
+     * 				do that and add action code into a hook instead.
+     *
+     * 	@param		string		$action	Action string
+     * 	@param		int			$id			Object id
+     * 	@return		mixed					Return return code of doActions of canvas
+     * 	@see		http://wiki.dolibarr.org/index.php/Canvas_development
+     */
+    function doActions(&$action='view', $id=0)
+    {
+        if (method_exists($this->control,'doActions'))
+        {
+            $ret = $this->control->doActions($action, $id);
+            return $ret;
+        }
+    }
 }

Spacing +21 added lines, -21 removed lines

@@ -36,7 +36,7 @@ 
 	/**
 	 * @var string Error code (or message)
 	 */
-	public $error='';
+	public $error = '';
 
 	/**
 	 * @var string[] Error codes (or messages)
@@ -45,13 +45,13 @@ 
 
 	public $actiontype;
 
-    public $dirmodule;			// Module directory
-    public $targetmodule;      // Module concerned by canvas (ex: thirdparty, contact, ...)
-    public $canvas;            // Name of canvas (ex: company, individual, product, service, ...)
-    public $card;              // Tab (sub-canvas)
+    public $dirmodule; // Module directory
+    public $targetmodule; // Module concerned by canvas (ex: thirdparty, contact, ...)
+    public $canvas; // Name of canvas (ex: company, individual, product, service, ...)
+    public $card; // Tab (sub-canvas)
 
-    public $template_dir;		// Initialized by getCanvas with templates directory
-    public $control;           	// Initialized by getCanvas with controller instance
+    public $template_dir; // Initialized by getCanvas with templates directory
+    public $control; // Initialized by getCanvas with controller instance
 
 
    /**
@@ -60,7 +60,7 @@ 
 	*   @param     DoliDB	$db          	Database handler
 	*   @param     string   $actiontype		Action type ('create', 'view', 'edit', 'list')
 	*/
-	function __construct($db, $actiontype='view')
+	function __construct($db, $actiontype = 'view')
 	{
 		$this->db = $db;
 
@@ -76,9 +76,9 @@ 
 	private function _cleanaction($action)
 	{
 	    $newaction = $action;
-	    if ($newaction == 'add')    $newaction='create';
-	    if ($newaction == 'update') $newaction='edit';
-	    if (empty($newaction) || $newaction == 'delete' || $newaction == 'create_user' || $newaction == 'presend' || $newaction == 'send') $newaction='view';
+	    if ($newaction == 'add')    $newaction = 'create';
+	    if ($newaction == 'update') $newaction = 'edit';
+	    if (empty($newaction) || $newaction == 'delete' || $newaction == 'create_user' || $newaction == 'presend' || $newaction == 'send') $newaction = 'view';
 	    return $newaction;
 	}
 
@@ -101,7 +101,7 @@ 
         $this->card = $card;
         $this->dirmodule = $module;
         // Correct values if canvas is into an external module
-		if (preg_match('/^([^@]+)@([^@]+)$/i',$canvas,$regs))
+		if (preg_match('/^([^@]+)@([^@]+)$/i', $canvas, $regs))
 		{
             $this->canvas = $regs[1];
 		    $this->dirmodule = $regs[2];
@@ -114,7 +114,7 @@ 
 		if (file_exists($controlclassfile))
 		{
             // Include actions class (controller)
-            $this->control_file=$controlclassfile;
+            $this->control_file = $controlclassfile;
             require_once $controlclassfile;
 
             // Instantiate actions class (controller)
@@ -124,9 +124,9 @@ 
 
 		// Template dir
 		$this->template_dir = dol_buildpath('/'.$this->dirmodule.'/canvas/'.$this->canvas.'/tpl/');
-        if (! is_dir($this->template_dir))
+        if (!is_dir($this->template_dir))
         {
-            $this->template_dir='';
+            $this->template_dir = '';
         }
 
         //print 'dimodule='.$dirmodule.' canvas='.$this->canvas.'<br>';
@@ -142,10 +142,10 @@ 
 	 * 	@param		string		$ref		Object ref (if id not provided)
 	 * 	@return		void
 	 */
-	function assign_values(&$action='view', $id=0, $ref='')
+	function assign_values(&$action = 'view', $id = 0, $ref = '')
 	{
         // phpcs:enable
-		if (method_exists($this->control,'assign_values')) $this->control->assign_values($action, $id, $ref);
+		if (method_exists($this->control, 'assign_values')) $this->control->assign_values($action, $id, $ref);
 	}
 
     /**
@@ -158,7 +158,7 @@ 
     {
         if (empty($this->template_dir)) return 0;
 
-        if (file_exists($this->template_dir.(!empty($this->card)?$this->card.'_':'').$this->_cleanaction($action).'.tpl.php')) return 1;
+        if (file_exists($this->template_dir.(!empty($this->card) ? $this->card.'_' : '').$this->_cleanaction($action).'.tpl.php')) return 1;
         else return 0;
     }
 
@@ -176,7 +176,7 @@ 
 		global $db, $conf, $langs, $user, $canvas;
 		global $form, $formfile;
 
-		include $this->template_dir.(!empty($this->card)?$this->card.'_':'').$this->_cleanaction($action).'.tpl.php';        // Include native PHP template
+		include $this->template_dir.(!empty($this->card) ? $this->card.'_' : '').$this->_cleanaction($action).'.tpl.php'; // Include native PHP template
 	}
 
 
@@ -204,9 +204,9 @@ 
 	 * 	@return		mixed					Return return code of doActions of canvas
 	 * 	@see		http://wiki.dolibarr.org/index.php/Canvas_development
 	 */
-	function doActions(&$action='view', $id=0)
+	function doActions(&$action = 'view', $id = 0)
 	{
-		if (method_exists($this->control,'doActions'))
+		if (method_exists($this->control, 'doActions'))
 		{
 			$ret = $this->control->doActions($action, $id);
 			return $ret;

Braces +20 added lines, -7 removed lines

@@ -76,9 +76,15 @@ 
 	private function _cleanaction($action)
 	{
 	    $newaction = $action;
-	    if ($newaction == 'add')    $newaction='create';
-	    if ($newaction == 'update') $newaction='edit';
-	    if (empty($newaction) || $newaction == 'delete' || $newaction == 'create_user' || $newaction == 'presend' || $newaction == 'send') $newaction='view';
+	    if ($newaction == 'add') {
+	        $newaction='create';
+	    }
+	    if ($newaction == 'update') {
+	        $newaction='edit';
+	    }
+	    if (empty($newaction) || $newaction == 'delete' || $newaction == 'create_user' || $newaction == 'presend' || $newaction == 'send') {
+	        $newaction='view';
+	    }
 	    return $newaction;
 	}
 
@@ -145,7 +151,9 @@ 
 	function assign_values(&$action='view', $id=0, $ref='')
 	{
         // phpcs:enable
-		if (method_exists($this->control,'assign_values')) $this->control->assign_values($action, $id, $ref);
+		if (method_exists($this->control,'assign_values')) {
+		    $this->control->assign_values($action, $id, $ref);
+		}
 	}
 
     /**
@@ -156,10 +164,15 @@ 
      */
     function displayCanvasExists($action)
     {
-        if (empty($this->template_dir)) return 0;
+        if (empty($this->template_dir)) {
+            return 0;
+        }
 
-        if (file_exists($this->template_dir.(!empty($this->card)?$this->card.'_':'').$this->_cleanaction($action).'.tpl.php')) return 1;
-        else return 0;
+        if (file_exists($this->template_dir.(!empty($this->card)?$this->card.'_':'').$this->_cleanaction($action).'.tpl.php')) {
+            return 1;
+        } else {
+            return 0;
+        }
     }
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps

dolibarr/htdocs/core/class/coreobject.class.php

Indentation +149 added lines, -149 removed lines

@@ -27,55 +27,55 @@ 
 
 class CoreObject extends CommonObject
 {
-	public $withChild = true;
+    public $withChild = true;
 
-	/**
-	 *  @var Array $_fields Fields to synchronize with Database
-	 */
-	protected $fields=array();
+    /**
+     *  @var Array $_fields Fields to synchronize with Database
+     */
+    protected $fields=array();
 
     /**
-	 *  Constructor
-	 *
-	 *  @param      DoliDB		$db      Database handler
-	 */
-	function __construct(DoliDB &$db)
+     *  Constructor
+     *
+     *  @param      DoliDB		$db      Database handler
+     */
+    function __construct(DoliDB &$db)
     {
         $this->db = $db;
-	}
+    }
 
     /**
      * Function to init fields
      *
      * @return bool
      */
-	protected function init()
+    protected function init()
     {
-		$this->id = 0;
-		$this->datec = 0;
-		$this->tms = 0;
-
-		if (!empty($this->fields))
-		{
-			foreach ($this->fields as $field=>$info)
-			{
-		        if ($this->isDate($info)) $this->{$field} = time();
-		        elseif ($this->isArray($info)) $this->{$field} = array();
-		        elseif ($this->isInt($info)) $this->{$field} = (int) 0;
-		        elseif ($this->isFloat($info)) $this->{$field} = (double) 0;
-				else $this->{$field} = '';
-		    }
+        $this->id = 0;
+        $this->datec = 0;
+        $this->tms = 0;
+
+        if (!empty($this->fields))
+        {
+            foreach ($this->fields as $field=>$info)
+            {
+                if ($this->isDate($info)) $this->{$field} = time();
+                elseif ($this->isArray($info)) $this->{$field} = array();
+                elseif ($this->isInt($info)) $this->{$field} = (int) 0;
+                elseif ($this->isFloat($info)) $this->{$field} = (double) 0;
+                else $this->{$field} = '';
+            }
 
             $this->to_delete=false;
             $this->is_clone=false;
 
-			return true;
-		}
-		else
+            return true;
+        }
+        else
         {
-			return false;
-		}
-	}
+            return false;
+        }
+    }
 
     /**
      * Test type of field
@@ -86,15 +86,15 @@ 
      */
     private function checkFieldType($field, $type)
     {
-		if (isset($this->fields[$field]) && method_exists($this, 'is_'.$type))
-		{
-			return $this->{'is_'.$type}($this->fields[$field]);
-		}
-		else
+        if (isset($this->fields[$field]) && method_exists($this, 'is_'.$type))
+        {
+            return $this->{'is_'.$type}($this->fields[$field]);
+        }
+        else
         {
             return false;
         }
-	}
+    }
 
     /**
      *	Get object and children from database
@@ -103,15 +103,15 @@ 
      * 	@param		bool		$loadChild		used to load children from database
      *	@return     int         				>0 if OK, <0 if KO, 0 if not found
      */
-	public function fetch($id, $loadChild = true)
+    public function fetch($id, $loadChild = true)
     {
-    	$res = $this->fetchCommon($id);
-    	if($res>0) {
-    		if ($loadChild) $this->fetchChild();
-    	}
+        $res = $this->fetchCommon($id);
+        if($res>0) {
+            if ($loadChild) $this->fetchChild();
+        }
 
-    	return $res;
-	}
+        return $res;
+    }
 
 
     /**
@@ -125,25 +125,25 @@ 
      */
     public function addChild($tabName, $id=0, $key='id', $try_to_load = false)
     {
-		if(!empty($id))
-		{
-			foreach($this->{$tabName} as $k=>&$object)
-			{
-				if($object->{$key} === $id) return $k;
-			}
-		}
+        if(!empty($id))
+        {
+            foreach($this->{$tabName} as $k=>&$object)
+            {
+                if($object->{$key} === $id) return $k;
+            }
+        }
 
-		$k = count($this->{$tabName});
+        $k = count($this->{$tabName});
 
-		$className = ucfirst($tabName);
-		$this->{$tabName}[$k] = new $className($this->db);
-		if($id>0 && $key==='id' && $try_to_load)
-		{
-			$this->{$tabName}[$k]->fetch($id);
-		}
+        $className = ucfirst($tabName);
+        $this->{$tabName}[$k] = new $className($this->db);
+        if($id>0 && $key==='id' && $try_to_load)
+        {
+            $this->{$tabName}[$k]->fetch($id);
+        }
 
-		return $k;
-	}
+        return $k;
+    }
 
 
     /**
@@ -156,16 +156,16 @@ 
      */
     public function removeChild($tabName, $id, $key='id')
     {
-		foreach ($this->{$tabName} as &$object)
-		{
-			if ($object->{$key} == $id)
-			{
-				$object->to_delete = true;
-				return true;
-			}
-		}
-		return false;
-	}
+        foreach ($this->{$tabName} as &$object)
+        {
+            if ($object->{$key} == $id)
+            {
+                $object->to_delete = true;
+                return true;
+            }
+        }
+        return false;
+    }
 
 
     /**
@@ -175,10 +175,10 @@ 
      */
     public function fetchChild()
     {
-		if($this->withChild && !empty($this->childtables) && !empty($this->fk_element))
-		{
-			foreach($this->childtables as &$childTable)
-			{
+        if($this->withChild && !empty($this->childtables) && !empty($this->fk_element))
+        {
+            foreach($this->childtables as &$childTable)
+            {
                 $className = ucfirst($childTable);
 
                 $this->{$className}=array();
@@ -200,9 +200,9 @@ 
                 {
                     $this->errors[] = $this->db->lasterror();
                 }
-			}
-		}
-	}
+            }
+        }
+    }
 
     /**
      * Function to update children data
@@ -210,26 +210,26 @@ 
      * @param   User    $user   user object
      * @return void
      */
-	public function saveChild(User &$user)
+    public function saveChild(User &$user)
     {
-		if($this->withChild && !empty($this->childtables) && !empty($this->fk_element))
-		{
-			foreach($this->childtables as &$childTable)
-			{
-				$className = ucfirst($childTable);
-				if(!empty($this->{$className}))
-				{
-					foreach($this->{$className} as $i => &$object)
-					{
-						$object->{$this->fk_element} = $this->id;
-
-						$object->update($user);
-						if($this->unsetChildDeleted && isset($object->to_delete) && $object->to_delete==true) unset($this->{$className}[$i]);
-					}
-				}
-			}
-		}
-	}
+        if($this->withChild && !empty($this->childtables) && !empty($this->fk_element))
+        {
+            foreach($this->childtables as &$childTable)
+            {
+                $className = ucfirst($childTable);
+                if(!empty($this->{$className}))
+                {
+                    foreach($this->{$className} as $i => &$object)
+                    {
+                        $object->{$this->fk_element} = $this->id;
+
+                        $object->update($user);
+                        if($this->unsetChildDeleted && isset($object->to_delete) && $object->to_delete==true) unset($this->{$className}[$i]);
+                    }
+                }
+            }
+        }
+    }
 
 
     /**
@@ -240,7 +240,7 @@ 
      */
     public function update(User &$user)
     {
-		if (empty($this->id)) return $this->create($user); // To test, with that, no need to test on high level object, the core decide it, update just needed
+        if (empty($this->id)) return $this->create($user); // To test, with that, no need to test on high level object, the core decide it, update just needed
         elseif (isset($this->to_delete) && $this->to_delete==true) return $this->delete($user);
 
         $error = 0;
@@ -270,7 +270,7 @@ 
             $this->db->rollback();
             return -1;
         }
-	}
+    }
 
     /**
      * Function to create object in database
@@ -280,26 +280,26 @@ 
      */
     public function create(User &$user)
     {
-		if($this->id > 0) return $this->update($user);
+        if($this->id > 0) return $this->update($user);
 
         $error = 0;
         $this->db->begin();
 
         $res = $this->createCommon($user);
-		if($res)
-		{
-			$this->id = $this->db->last_insert_id($this->table_element);
+        if($res)
+        {
+            $this->id = $this->db->last_insert_id($this->table_element);
 
-			$result = $this->call_trigger(strtoupper($this->element). '_CREATE', $user);
+            $result = $this->call_trigger(strtoupper($this->element). '_CREATE', $user);
             if ($result < 0) $error++;
             else $this->saveChild($user);
-		}
-		else
+        }
+        else
         {
             $error++;
             $this->error = $this->db->lasterror();
             $this->errors[] = $this->error;
-		}
+        }
 
         if (empty($error))
         {
@@ -311,7 +311,7 @@ 
             $this->db->rollback();
             return -1;
         }
-	}
+    }
 
     /**
      * Function to delete object in database
@@ -319,9 +319,9 @@ 
      * @param   User    $user   user object
      * @return                  < 0 if ko, > 0 if ok
      */
-	public function delete(User &$user)
+    public function delete(User &$user)
     {
-		if ($this->id <= 0) return 0;
+        if ($this->id <= 0) return 0;
 
         $error = 0;
         $this->db->begin();
@@ -360,7 +360,7 @@ 
             $this->db->rollback();
             return -1;
         }
-	}
+    }
 
 
     /**
@@ -372,12 +372,12 @@ 
      */
     public function getDate($field, $format='')
     {
-		if(empty($this->{$field})) return '';
-		else
+        if(empty($this->{$field})) return '';
+        else
         {
-			return dol_print_date($this->{$field}, $format);
-		}
-	}
+            return dol_print_date($this->{$field}, $format);
+        }
+    }
 
     /**
      * Function to set date in field
@@ -388,18 +388,18 @@ 
      */
     public function setDate($field, $date)
     {
-	  	if (empty($date))
-	  	{
-	  		$this->{$field} = 0;
-	  	}
-		else
+            if (empty($date))
+            {
+                $this->{$field} = 0;
+            }
+        else
         {
-			require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
-			$this->{$field} = dol_stringtotime($date);
-		}
+            require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
+            $this->{$field} = dol_stringtotime($date);
+        }
 
-		return $this->{$field};
-	}
+        return $this->{$field};
+    }
 
 
     /**
@@ -410,29 +410,29 @@ 
      */
     public function setValues(&$Tab)
     {
-		foreach ($Tab as $key => $value)
-		{
-			if($this->checkFieldType($key, 'date'))
-			{
-				$this->setDate($key, $value);
-			}
-			else if( $this->checkFieldType($key, 'array'))
-			{
-				$this->{$key} = $value;
-			}
-			else if( $this->checkFieldType($key, 'float') )
-			{
-				$this->{$key} = (double) price2num($value);
-			}
-			else if( $this->checkFieldType($key, 'int') ) {
-				$this->{$key} = (int) price2num($value);
-			}
-			else
+        foreach ($Tab as $key => $value)
+        {
+            if($this->checkFieldType($key, 'date'))
+            {
+                $this->setDate($key, $value);
+            }
+            else if( $this->checkFieldType($key, 'array'))
             {
-				$this->{$key} = $value;
-			}
-		}
+                $this->{$key} = $value;
+            }
+            else if( $this->checkFieldType($key, 'float') )
+            {
+                $this->{$key} = (double) price2num($value);
+            }
+            else if( $this->checkFieldType($key, 'int') ) {
+                $this->{$key} = (int) price2num($value);
+            }
+            else
+            {
+                $this->{$key} = $value;
+            }
+        }
 
-		return 1;
-	}
+        return 1;
+    }
 }

Spacing +36 added lines, -36 removed lines

@@ -32,7 +32,7 @@ 
 	/**
 	 *  @var Array $_fields Fields to synchronize with Database
 	 */
-	protected $fields=array();
+	protected $fields = array();
 
     /**
 	 *  Constructor
@@ -66,8 +66,8 @@ 
 				else $this->{$field} = '';
 		    }
 
-            $this->to_delete=false;
-            $this->is_clone=false;
+            $this->to_delete = false;
+            $this->is_clone = false;
 
 			return true;
 		}
@@ -106,7 +106,7 @@ 
 	public function fetch($id, $loadChild = true)
     {
     	$res = $this->fetchCommon($id);
-    	if($res>0) {
+    	if ($res > 0) {
     		if ($loadChild) $this->fetchChild();
     	}
 
@@ -123,13 +123,13 @@ 
      * @param   bool    $try_to_load    Force the fetch if an id is given
      * @return                          int
      */
-    public function addChild($tabName, $id=0, $key='id', $try_to_load = false)
+    public function addChild($tabName, $id = 0, $key = 'id', $try_to_load = false)
     {
-		if(!empty($id))
+		if (!empty($id))
 		{
-			foreach($this->{$tabName} as $k=>&$object)
+			foreach ($this->{$tabName} as $k=>&$object)
 			{
-				if($object->{$key} === $id) return $k;
+				if ($object->{$key} === $id) return $k;
 			}
 		}
 
@@ -137,7 +137,7 @@ 
 
 		$className = ucfirst($tabName);
 		$this->{$tabName}[$k] = new $className($this->db);
-		if($id>0 && $key==='id' && $try_to_load)
+		if ($id > 0 && $key === 'id' && $try_to_load)
 		{
 			$this->{$tabName}[$k]->fetch($id);
 		}
@@ -154,7 +154,7 @@ 
      * @param   string  $key            Attribute name of the object id
      * @return                          bool
      */
-    public function removeChild($tabName, $id, $key='id')
+    public function removeChild($tabName, $id, $key = 'id')
     {
 		foreach ($this->{$tabName} as &$object)
 		{
@@ -175,22 +175,22 @@ 
      */
     public function fetchChild()
     {
-		if($this->withChild && !empty($this->childtables) && !empty($this->fk_element))
+		if ($this->withChild && !empty($this->childtables) && !empty($this->fk_element))
 		{
-			foreach($this->childtables as &$childTable)
+			foreach ($this->childtables as &$childTable)
 			{
                 $className = ucfirst($childTable);
 
-                $this->{$className}=array();
+                $this->{$className} = array();
 
                 $sql = 'SELECT rowid FROM '.MAIN_DB_PREFIX.$childTable.' WHERE '.$this->fk_element.' = '.$this->id;
                 $res = $this->db->query($sql);
 
-                if($res)
+                if ($res)
                 {
-                    while($obj = $this->db->fetch_object($res))
+                    while ($obj = $this->db->fetch_object($res))
                     {
-                        $o=new $className($this->db);
+                        $o = new $className($this->db);
                         $o->fetch($obj->rowid);
 
                         $this->{$className}[] = $o;
@@ -212,19 +212,19 @@ 
      */
 	public function saveChild(User &$user)
     {
-		if($this->withChild && !empty($this->childtables) && !empty($this->fk_element))
+		if ($this->withChild && !empty($this->childtables) && !empty($this->fk_element))
 		{
-			foreach($this->childtables as &$childTable)
+			foreach ($this->childtables as &$childTable)
 			{
 				$className = ucfirst($childTable);
-				if(!empty($this->{$className}))
+				if (!empty($this->{$className}))
 				{
-					foreach($this->{$className} as $i => &$object)
+					foreach ($this->{$className} as $i => &$object)
 					{
 						$object->{$this->fk_element} = $this->id;
 
 						$object->update($user);
-						if($this->unsetChildDeleted && isset($object->to_delete) && $object->to_delete==true) unset($this->{$className}[$i]);
+						if ($this->unsetChildDeleted && isset($object->to_delete) && $object->to_delete == true) unset($this->{$className}[$i]);
 					}
 				}
 			}
@@ -241,7 +241,7 @@ 
     public function update(User &$user)
     {
 		if (empty($this->id)) return $this->create($user); // To test, with that, no need to test on high level object, the core decide it, update just needed
-        elseif (isset($this->to_delete) && $this->to_delete==true) return $this->delete($user);
+        elseif (isset($this->to_delete) && $this->to_delete == true) return $this->delete($user);
 
         $error = 0;
         $this->db->begin();
@@ -249,7 +249,7 @@ 
         $res = $this->updateCommon($user);
         if ($res)
         {
-            $result = $this->call_trigger(strtoupper($this->element). '_UPDATE', $user);
+            $result = $this->call_trigger(strtoupper($this->element).'_UPDATE', $user);
             if ($result < 0) $error++;
             else $this->saveChild($user);
         }
@@ -280,17 +280,17 @@ 
      */
     public function create(User &$user)
     {
-		if($this->id > 0) return $this->update($user);
+		if ($this->id > 0) return $this->update($user);
 
         $error = 0;
         $this->db->begin();
 
         $res = $this->createCommon($user);
-		if($res)
+		if ($res)
 		{
 			$this->id = $this->db->last_insert_id($this->table_element);
 
-			$result = $this->call_trigger(strtoupper($this->element). '_CREATE', $user);
+			$result = $this->call_trigger(strtoupper($this->element).'_CREATE', $user);
             if ($result < 0) $error++;
             else $this->saveChild($user);
 		}
@@ -326,20 +326,20 @@ 
         $error = 0;
         $this->db->begin();
 
-        $result = $this->call_trigger(strtoupper($this->element). '_DELETE', $user);
+        $result = $this->call_trigger(strtoupper($this->element).'_DELETE', $user);
         if ($result < 0) $error++;
 
         if (!$error)
         {
             $this->deleteCommon($user);
-            if($this->withChild && !empty($this->childtables))
+            if ($this->withChild && !empty($this->childtables))
             {
-                foreach($this->childtables as &$childTable)
+                foreach ($this->childtables as &$childTable)
                 {
                     $className = ucfirst($childTable);
                     if (!empty($this->{$className}))
                     {
-                        foreach($this->{$className} as &$object)
+                        foreach ($this->{$className} as &$object)
                         {
                             $object->delete($user);
                         }
@@ -370,9 +370,9 @@ 
      * @param   string  $format Output date format
      * @return          string
      */
-    public function getDate($field, $format='')
+    public function getDate($field, $format = '')
     {
-		if(empty($this->{$field})) return '';
+		if (empty($this->{$field})) return '';
 		else
         {
 			return dol_print_date($this->{$field}, $format);
@@ -412,19 +412,19 @@ 
     {
 		foreach ($Tab as $key => $value)
 		{
-			if($this->checkFieldType($key, 'date'))
+			if ($this->checkFieldType($key, 'date'))
 			{
 				$this->setDate($key, $value);
 			}
-			else if( $this->checkFieldType($key, 'array'))
+			else if ($this->checkFieldType($key, 'array'))
 			{
 				$this->{$key} = $value;
 			}
-			else if( $this->checkFieldType($key, 'float') )
+			else if ($this->checkFieldType($key, 'float'))
 			{
 				$this->{$key} = (double) price2num($value);
 			}
-			else if( $this->checkFieldType($key, 'int') ) {
+			else if ($this->checkFieldType($key, 'int')) {
 				$this->{$key} = (int) price2num($value);
 			}
 			else

Braces +62 added lines, -45 removed lines

@@ -59,19 +59,24 @@ 
 		{
 			foreach ($this->fields as $field=>$info)
 			{
-		        if ($this->isDate($info)) $this->{$field} = time();
-		        elseif ($this->isArray($info)) $this->{$field} = array();
-		        elseif ($this->isInt($info)) $this->{$field} = (int) 0;
-		        elseif ($this->isFloat($info)) $this->{$field} = (double) 0;
-				else $this->{$field} = '';
+		        if ($this->isDate($info)) {
+		            $this->{$field} = time();
+		        } elseif ($this->isArray($info)) {
+		            $this->{$field} = array();
+		        } elseif ($this->isInt($info)) {
+		            $this->{$field} = (int) 0;
+		        } elseif ($this->isFloat($info)) {
+		            $this->{$field} = (double) 0;
+		        } else {
+				    $this->{$field} = '';
+				}
 		    }
 
             $this->to_delete=false;
             $this->is_clone=false;
 
 			return true;
-		}
-		else
+		} else
         {
 			return false;
 		}
@@ -89,8 +94,7 @@ 
 		if (isset($this->fields[$field]) && method_exists($this, 'is_'.$type))
 		{
 			return $this->{'is_'.$type}($this->fields[$field]);
-		}
-		else
+		} else
         {
             return false;
         }
@@ -107,7 +111,9 @@ 
     {
     	$res = $this->fetchCommon($id);
     	if($res>0) {
-    		if ($loadChild) $this->fetchChild();
+    		if ($loadChild) {
+    		    $this->fetchChild();
+    		}
     	}
 
     	return $res;
@@ -129,7 +135,9 @@ 
 		{
 			foreach($this->{$tabName} as $k=>&$object)
 			{
-				if($object->{$key} === $id) return $k;
+				if($object->{$key} === $id) {
+				    return $k;
+				}
 			}
 		}
 
@@ -195,8 +203,7 @@ 
 
                         $this->{$className}[] = $o;
                     }
-                }
-                else
+                } else
                 {
                     $this->errors[] = $this->db->lasterror();
                 }
@@ -224,7 +231,9 @@ 
 						$object->{$this->fk_element} = $this->id;
 
 						$object->update($user);
-						if($this->unsetChildDeleted && isset($object->to_delete) && $object->to_delete==true) unset($this->{$className}[$i]);
+						if($this->unsetChildDeleted && isset($object->to_delete) && $object->to_delete==true) {
+						    unset($this->{$className}[$i]);
+						}
 					}
 				}
 			}
@@ -240,8 +249,13 @@ 
      */
     public function update(User &$user)
     {
-		if (empty($this->id)) return $this->create($user); // To test, with that, no need to test on high level object, the core decide it, update just needed
-        elseif (isset($this->to_delete) && $this->to_delete==true) return $this->delete($user);
+		if (empty($this->id)) {
+		    return $this->create($user);
+		}
+		// To test, with that, no need to test on high level object, the core decide it, update just needed
+        elseif (isset($this->to_delete) && $this->to_delete==true) {
+            return $this->delete($user);
+        }
 
         $error = 0;
         $this->db->begin();
@@ -250,10 +264,12 @@ 
         if ($res)
         {
             $result = $this->call_trigger(strtoupper($this->element). '_UPDATE', $user);
-            if ($result < 0) $error++;
-            else $this->saveChild($user);
-        }
-        else
+            if ($result < 0) {
+                $error++;
+            } else {
+                $this->saveChild($user);
+            }
+        } else
         {
             $error++;
             $this->error = $this->db->lasterror();
@@ -264,8 +280,7 @@ 
         {
             $this->db->commit();
             return $this->id;
-        }
-        else
+        } else
         {
             $this->db->rollback();
             return -1;
@@ -280,7 +295,9 @@ 
      */
     public function create(User &$user)
     {
-		if($this->id > 0) return $this->update($user);
+		if($this->id > 0) {
+		    return $this->update($user);
+		}
 
         $error = 0;
         $this->db->begin();
@@ -291,10 +308,12 @@ 
 			$this->id = $this->db->last_insert_id($this->table_element);
 
 			$result = $this->call_trigger(strtoupper($this->element). '_CREATE', $user);
-            if ($result < 0) $error++;
-            else $this->saveChild($user);
-		}
-		else
+            if ($result < 0) {
+                $error++;
+            } else {
+                $this->saveChild($user);
+            }
+		} else
         {
             $error++;
             $this->error = $this->db->lasterror();
@@ -305,8 +324,7 @@ 
         {
             $this->db->commit();
             return $this->id;
-        }
-        else
+        } else
         {
             $this->db->rollback();
             return -1;
@@ -321,13 +339,17 @@ 
      */
 	public function delete(User &$user)
     {
-		if ($this->id <= 0) return 0;
+		if ($this->id <= 0) {
+		    return 0;
+		}
 
         $error = 0;
         $this->db->begin();
 
         $result = $this->call_trigger(strtoupper($this->element). '_DELETE', $user);
-        if ($result < 0) $error++;
+        if ($result < 0) {
+            $error++;
+        }
 
         if (!$error)
         {
@@ -352,8 +374,7 @@ 
         {
             $this->db->commit();
             return 1;
-        }
-        else
+        } else
         {
             $this->error = $this->db->lasterror();
             $this->errors[] = $this->error;
@@ -372,8 +393,9 @@ 
      */
     public function getDate($field, $format='')
     {
-		if(empty($this->{$field})) return '';
-		else
+		if(empty($this->{$field})) {
+		    return '';
+		} else
         {
 			return dol_print_date($this->{$field}, $format);
 		}
@@ -391,8 +413,7 @@ 
 	  	if (empty($date))
 	  	{
 	  		$this->{$field} = 0;
-	  	}
-		else
+	  	} else
         {
 			require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
 			$this->{$field} = dol_stringtotime($date);
@@ -415,19 +436,15 @@ 
 			if($this->checkFieldType($key, 'date'))
 			{
 				$this->setDate($key, $value);
-			}
-			else if( $this->checkFieldType($key, 'array'))
+			} else if( $this->checkFieldType($key, 'array'))
 			{
 				$this->{$key} = $value;
-			}
-			else if( $this->checkFieldType($key, 'float') )
+			} else if( $this->checkFieldType($key, 'float') )
 			{
 				$this->{$key} = (double) price2num($value);
-			}
-			else if( $this->checkFieldType($key, 'int') ) {
+			} else if( $this->checkFieldType($key, 'int') ) {
 				$this->{$key} = (int) price2num($value);
-			}
-			else
+			} else
             {
 				$this->{$key} = $value;
 			}

dolibarr/htdocs/core/class/cstate.class.php

Indentation +180 added lines, -180 removed lines

@@ -32,44 +32,44 @@ 
  */
 class Cstate // extends CommonObject
 {
-	/**
+    /**
      * @var DoliDB Database handler.
      */
     public $db;
 
-	/**
-	 * @var string Error code (or message)
-	 */
-	public $error='';
+    /**
+     * @var string Error code (or message)
+     */
+    public $error='';
 
-	/**
-	 * @var string[] Error codes (or messages)
-	 */
-	public $errors = array();
+    /**
+     * @var string[] Error codes (or messages)
+     */
+    public $errors = array();
 
-	//var $element='cstate';			//!< Id that identify managed objects
-	//var $table_element='cstate';	    //!< Name of table without prefix where object is stored
+    //var $element='cstate';			//!< Id that identify managed objects
+    //var $table_element='cstate';	    //!< Name of table without prefix where object is stored
 
     /**
-	 * @var int ID
-	 */
-	public $id;
+     * @var int ID
+     */
+    public $id;
 
-	public $code_departement;
+    public $code_departement;
 
-	/**
-	 * @var string
-	 * @deprecated
-	 * @see name
-	 */
-	public $nom='';
+    /**
+     * @var string
+     * @deprecated
+     * @see name
+     */
+    public $nom='';
 
-	/**
-	 * @var string name
-	 */
-	public $name='';
+    /**
+     * @var string name
+     */
+    public $name='';
 
-	public $active;
+    public $active;
 
 
 
@@ -94,70 +94,70 @@ 
      */
     function create($user, $notrigger=0)
     {
-    	global $conf, $langs;
-		$error=0;
+        global $conf, $langs;
+        $error=0;
 
-		// Clean parameters
-		if (isset($this->code_departement)) $this->code_departement=trim($this->code_departement);
-		if (isset($this->nom)) $this->nom=trim($this->nom);
-		if (isset($this->active)) $this->active=trim($this->active);
+        // Clean parameters
+        if (isset($this->code_departement)) $this->code_departement=trim($this->code_departement);
+        if (isset($this->nom)) $this->nom=trim($this->nom);
+        if (isset($this->active)) $this->active=trim($this->active);
 
-		// Check parameters
-		// Put here code to add control on parameters values
+        // Check parameters
+        // Put here code to add control on parameters values
 
         // Insert request
-		$sql = "INSERT INTO ".MAIN_DB_PREFIX."c_departements(";
-		$sql.= "rowid,";
-		$sql.= "code_departement,";
-		$sql.= "nom,";
-		$sql.= "active";
+        $sql = "INSERT INTO ".MAIN_DB_PREFIX."c_departements(";
+        $sql.= "rowid,";
+        $sql.= "code_departement,";
+        $sql.= "nom,";
+        $sql.= "active";
         $sql.= ") VALUES (";
-		$sql.= " ".(! isset($this->rowid)?'NULL':"'".$this->db->escape($this->rowid)."'").",";
-		$sql.= " ".(! isset($this->code_departement)?'NULL':"'".$this->db->escape($this->code_departement)."'").",";
-		$sql.= " ".(! isset($this->nom)?'NULL':"'".$this->db->escape($this->nom)."'").",";
-		$sql.= " ".(! isset($this->active)?'NULL':"'".$this->db->escape($this->active)."'")."";
-		$sql.= ")";
+        $sql.= " ".(! isset($this->rowid)?'NULL':"'".$this->db->escape($this->rowid)."'").",";
+        $sql.= " ".(! isset($this->code_departement)?'NULL':"'".$this->db->escape($this->code_departement)."'").",";
+        $sql.= " ".(! isset($this->nom)?'NULL':"'".$this->db->escape($this->nom)."'").",";
+        $sql.= " ".(! isset($this->active)?'NULL':"'".$this->db->escape($this->active)."'")."";
+        $sql.= ")";
 
-		$this->db->begin();
+        $this->db->begin();
 
-	   	dol_syslog(get_class($this)."::create", LOG_DEBUG);
+            dol_syslog(get_class($this)."::create", LOG_DEBUG);
         $resql=$this->db->query($sql);
-    	if (! $resql) { $error++; $this->errors[]="Error ".$this->db->lasterror(); }
+        if (! $resql) { $error++; $this->errors[]="Error ".$this->db->lasterror(); }
 
-		if (! $error)
+        if (! $error)
         {
             $this->id = $this->db->last_insert_id(MAIN_DB_PREFIX."c_departements");
 
-			if (! $notrigger)
-			{
-	            // Uncomment this and change MYOBJECT to your own tag if you
-	            // want this action call a trigger.
-
-	            //// Call triggers
-	            //include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php';
-	            //$interface=new Interfaces($this->db);
-	            //$result=$interface->run_triggers('MYOBJECT_CREATE',$this,$user,$langs,$conf);
-	            //if ($result < 0) { $error++; $this->errors=$interface->errors; }
-	            //// End call triggers
-			}
+            if (! $notrigger)
+            {
+                // Uncomment this and change MYOBJECT to your own tag if you
+                // want this action call a trigger.
+
+                //// Call triggers
+                //include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php';
+                //$interface=new Interfaces($this->db);
+                //$result=$interface->run_triggers('MYOBJECT_CREATE',$this,$user,$langs,$conf);
+                //if ($result < 0) { $error++; $this->errors=$interface->errors; }
+                //// End call triggers
+            }
         }
 
         // Commit or rollback
         if ($error)
-		{
-			foreach($this->errors as $errmsg)
-			{
-	            dol_syslog(get_class($this)."::create ".$errmsg, LOG_ERR);
-	            $this->error.=($this->error?', '.$errmsg:$errmsg);
-			}
-			$this->db->rollback();
-			return -1*$error;
-		}
-		else
-		{
-			$this->db->commit();
+        {
+            foreach($this->errors as $errmsg)
+            {
+                dol_syslog(get_class($this)."::create ".$errmsg, LOG_ERR);
+                $this->error.=($this->error?', '.$errmsg:$errmsg);
+            }
+            $this->db->rollback();
+            return -1*$error;
+        }
+        else
+        {
+            $this->db->commit();
             return $this->id;
-		}
+        }
     }
 
 
@@ -170,17 +170,17 @@ 
      */
     function fetch($id,$code='')
     {
-    	global $langs;
+        global $langs;
         $sql = "SELECT";
-		$sql.= " t.rowid,";
-		$sql.= " t.code_departement,";
-		$sql.= " t.nom,";
-		$sql.= " t.active";
+        $sql.= " t.rowid,";
+        $sql.= " t.code_departement,";
+        $sql.= " t.nom,";
+        $sql.= " t.active";
         $sql.= " FROM ".MAIN_DB_PREFIX."c_departements as t";
         if ($id)   $sql.= " WHERE t.rowid = ".$id;
         elseif ($code) $sql.= " WHERE t.code_departement = '".$this->db->escape($code)."'";
 
-    	dol_syslog(get_class($this)."::fetch", LOG_DEBUG);
+        dol_syslog(get_class($this)."::fetch", LOG_DEBUG);
         $resql=$this->db->query($sql);
         if ($resql)
         {
@@ -189,9 +189,9 @@ 
                 $obj = $this->db->fetch_object($resql);
 
                 $this->id    = $obj->rowid;
-				$this->code_departement = $obj->code_departement;
-				$this->nom = $obj->nom;
-				$this->active = $obj->active;
+                $this->code_departement = $obj->code_departement;
+                $this->nom = $obj->nom;
+                $this->active = $obj->active;
             }
             $this->db->free($resql);
 
@@ -199,7 +199,7 @@ 
         }
         else
         {
-      	    $this->error="Error ".$this->db->lasterror();
+                $this->error="Error ".$this->db->lasterror();
             return -1;
         }
     }
@@ -214,118 +214,118 @@ 
      */
     function update($user=null, $notrigger=0)
     {
-    	global $conf, $langs;
-		$error=0;
+        global $conf, $langs;
+        $error=0;
 
-		// Clean parameters
-		if (isset($this->code_departement)) $this->code_departement=trim($this->code_departement);
-		if (isset($this->nom)) $this->nom=trim($this->nom);
-		if (isset($this->active)) $this->active=trim($this->active);
+        // Clean parameters
+        if (isset($this->code_departement)) $this->code_departement=trim($this->code_departement);
+        if (isset($this->nom)) $this->nom=trim($this->nom);
+        if (isset($this->active)) $this->active=trim($this->active);
 
 
-		// Check parameters
-		// Put here code to add control on parameters values
+        // Check parameters
+        // Put here code to add control on parameters values
 
         // Update request
         $sql = "UPDATE ".MAIN_DB_PREFIX."c_departements SET";
-		$sql.= " code_departement=".(isset($this->code_departement)?"'".$this->db->escape($this->code_departement)."'":"null").",";
-		$sql.= " nom=".(isset($this->nom)?"'".$this->db->escape($this->nom)."'":"null").",";
-		$sql.= " active=".(isset($this->active)?$this->active:"null")."";
+        $sql.= " code_departement=".(isset($this->code_departement)?"'".$this->db->escape($this->code_departement)."'":"null").",";
+        $sql.= " nom=".(isset($this->nom)?"'".$this->db->escape($this->nom)."'":"null").",";
+        $sql.= " active=".(isset($this->active)?$this->active:"null")."";
         $sql.= " WHERE rowid=".$this->id;
 
-		$this->db->begin();
+        $this->db->begin();
 
-		dol_syslog(get_class($this)."::update", LOG_DEBUG);
+        dol_syslog(get_class($this)."::update", LOG_DEBUG);
         $resql = $this->db->query($sql);
-    	if (! $resql) { $error++; $this->errors[]="Error ".$this->db->lasterror(); }
-
-		if (! $error)
-		{
-			if (! $notrigger)
-			{
-	            // Uncomment this and change MYOBJECT to your own tag if you
-	            // want this action call a trigger.
-
-	            //// Call triggers
-	            //include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php';
-	            //$interface=new Interfaces($this->db);
-	            //$result=$interface->run_triggers('MYOBJECT_MODIFY',$this,$user,$langs,$conf);
-	            //if ($result < 0) { $error++; $this->errors=$interface->errors; }
-	            //// End call triggers
-	    	}
-		}
+        if (! $resql) { $error++; $this->errors[]="Error ".$this->db->lasterror(); }
+
+        if (! $error)
+        {
+            if (! $notrigger)
+            {
+                // Uncomment this and change MYOBJECT to your own tag if you
+                // want this action call a trigger.
+
+                //// Call triggers
+                //include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php';
+                //$interface=new Interfaces($this->db);
+                //$result=$interface->run_triggers('MYOBJECT_MODIFY',$this,$user,$langs,$conf);
+                //if ($result < 0) { $error++; $this->errors=$interface->errors; }
+                //// End call triggers
+            }
+        }
 
         // Commit or rollback
-		if ($error)
-		{
-			foreach($this->errors as $errmsg)
-			{
-	            dol_syslog(get_class($this)."::update ".$errmsg, LOG_ERR);
-	            $this->error.=($this->error?', '.$errmsg:$errmsg);
-			}
-			$this->db->rollback();
-			return -1*$error;
-		}
-		else
-		{
-			$this->db->commit();
-			return 1;
-		}
+        if ($error)
+        {
+            foreach($this->errors as $errmsg)
+            {
+                dol_syslog(get_class($this)."::update ".$errmsg, LOG_ERR);
+                $this->error.=($this->error?', '.$errmsg:$errmsg);
+            }
+            $this->db->rollback();
+            return -1*$error;
+        }
+        else
+        {
+            $this->db->commit();
+            return 1;
+        }
     }
 
 
- 	/**
- 	 *  Delete object in database
-	 *
-     *	@param  User	$user        User that delete
-     *  @param	int		$notrigger	 0=launch triggers after, 1=disable triggers
-	 *  @return	int					 <0 if KO, >0 if OK
-	 */
-	function delete($user, $notrigger=0)
-	{
-		global $conf, $langs;
-		$error=0;
-
-		$sql = "DELETE FROM ".MAIN_DB_PREFIX."c_departements";
-		$sql.= " WHERE rowid=".$this->id;
-
-		$this->db->begin();
-
-		dol_syslog(get_class($this)."::delete", LOG_DEBUG);
-		$resql = $this->db->query($sql);
-    	if (! $resql) { $error++; $this->errors[]="Error ".$this->db->lasterror(); }
-
-		if (! $error)
-		{
-			if (! $notrigger)
-			{
-				// Uncomment this and change MYOBJECT to your own tag if you
-		        // want this action call a trigger.
-
-		        //// Call triggers
-		        //include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php';
-		        //$interface=new Interfaces($this->db);
-		        //$result=$interface->run_triggers('MYOBJECT_DELETE',$this,$user,$langs,$conf);
-		        //if ($result < 0) { $error++; $this->errors=$interface->errors; }
-		        //// End call triggers
-			}
-		}
+        /**
+         *  Delete object in database
+         *
+         *	@param  User	$user        User that delete
+         *  @param	int		$notrigger	 0=launch triggers after, 1=disable triggers
+         *  @return	int					 <0 if KO, >0 if OK
+         */
+    function delete($user, $notrigger=0)
+    {
+        global $conf, $langs;
+        $error=0;
+
+        $sql = "DELETE FROM ".MAIN_DB_PREFIX."c_departements";
+        $sql.= " WHERE rowid=".$this->id;
+
+        $this->db->begin();
+
+        dol_syslog(get_class($this)."::delete", LOG_DEBUG);
+        $resql = $this->db->query($sql);
+        if (! $resql) { $error++; $this->errors[]="Error ".$this->db->lasterror(); }
+
+        if (! $error)
+        {
+            if (! $notrigger)
+            {
+                // Uncomment this and change MYOBJECT to your own tag if you
+                // want this action call a trigger.
+
+                //// Call triggers
+                //include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php';
+                //$interface=new Interfaces($this->db);
+                //$result=$interface->run_triggers('MYOBJECT_DELETE',$this,$user,$langs,$conf);
+                //if ($result < 0) { $error++; $this->errors=$interface->errors; }
+                //// End call triggers
+            }
+        }
 
         // Commit or rollback
-		if ($error)
-		{
-			foreach($this->errors as $errmsg)
-			{
-	            dol_syslog(get_class($this)."::delete ".$errmsg, LOG_ERR);
-	            $this->error.=($this->error?', '.$errmsg:$errmsg);
-			}
-			$this->db->rollback();
-			return -1*$error;
-		}
-		else
-		{
-			$this->db->commit();
-			return 1;
-		}
-	}
+        if ($error)
+        {
+            foreach($this->errors as $errmsg)
+            {
+                dol_syslog(get_class($this)."::delete ".$errmsg, LOG_ERR);
+                $this->error.=($this->error?', '.$errmsg:$errmsg);
+            }
+            $this->db->rollback();
+            return -1*$error;
+        }
+        else
+        {
+            $this->db->commit();
+            return 1;
+        }
+    }
 }

Spacing +60 added lines, -60 removed lines

@@ -40,7 +40,7 @@ 
 	/**
 	 * @var string Error code (or message)
 	 */
-	public $error='';
+	public $error = '';
 
 	/**
 	 * @var string[] Error codes (or messages)
@@ -62,12 +62,12 @@ 
 	 * @deprecated
 	 * @see name
 	 */
-	public $nom='';
+	public $nom = '';
 
 	/**
 	 * @var string name
 	 */
-	public $name='';
+	public $name = '';
 
 	public $active;
 
@@ -92,43 +92,43 @@ 
      *  @param      int		$notrigger   0=launch triggers after, 1=disable triggers
      *  @return     int      		   	 <0 if KO, Id of created object if OK
      */
-    function create($user, $notrigger=0)
+    function create($user, $notrigger = 0)
     {
     	global $conf, $langs;
-		$error=0;
+		$error = 0;
 
 		// Clean parameters
-		if (isset($this->code_departement)) $this->code_departement=trim($this->code_departement);
-		if (isset($this->nom)) $this->nom=trim($this->nom);
-		if (isset($this->active)) $this->active=trim($this->active);
+		if (isset($this->code_departement)) $this->code_departement = trim($this->code_departement);
+		if (isset($this->nom)) $this->nom = trim($this->nom);
+		if (isset($this->active)) $this->active = trim($this->active);
 
 		// Check parameters
 		// Put here code to add control on parameters values
 
         // Insert request
 		$sql = "INSERT INTO ".MAIN_DB_PREFIX."c_departements(";
-		$sql.= "rowid,";
-		$sql.= "code_departement,";
-		$sql.= "nom,";
-		$sql.= "active";
-        $sql.= ") VALUES (";
-		$sql.= " ".(! isset($this->rowid)?'NULL':"'".$this->db->escape($this->rowid)."'").",";
-		$sql.= " ".(! isset($this->code_departement)?'NULL':"'".$this->db->escape($this->code_departement)."'").",";
-		$sql.= " ".(! isset($this->nom)?'NULL':"'".$this->db->escape($this->nom)."'").",";
-		$sql.= " ".(! isset($this->active)?'NULL':"'".$this->db->escape($this->active)."'")."";
-		$sql.= ")";
+		$sql .= "rowid,";
+		$sql .= "code_departement,";
+		$sql .= "nom,";
+		$sql .= "active";
+        $sql .= ") VALUES (";
+		$sql .= " ".(!isset($this->rowid) ? 'NULL' : "'".$this->db->escape($this->rowid)."'").",";
+		$sql .= " ".(!isset($this->code_departement) ? 'NULL' : "'".$this->db->escape($this->code_departement)."'").",";
+		$sql .= " ".(!isset($this->nom) ? 'NULL' : "'".$this->db->escape($this->nom)."'").",";
+		$sql .= " ".(!isset($this->active) ? 'NULL' : "'".$this->db->escape($this->active)."'")."";
+		$sql .= ")";
 
 		$this->db->begin();
 
 	   	dol_syslog(get_class($this)."::create", LOG_DEBUG);
-        $resql=$this->db->query($sql);
-    	if (! $resql) { $error++; $this->errors[]="Error ".$this->db->lasterror(); }
+        $resql = $this->db->query($sql);
+    	if (!$resql) { $error++; $this->errors[] = "Error ".$this->db->lasterror(); }
 
-		if (! $error)
+		if (!$error)
         {
             $this->id = $this->db->last_insert_id(MAIN_DB_PREFIX."c_departements");
 
-			if (! $notrigger)
+			if (!$notrigger)
 			{
 	            // Uncomment this and change MYOBJECT to your own tag if you
 	            // want this action call a trigger.
@@ -145,13 +145,13 @@ 
         // Commit or rollback
         if ($error)
 		{
-			foreach($this->errors as $errmsg)
+			foreach ($this->errors as $errmsg)
 			{
 	            dol_syslog(get_class($this)."::create ".$errmsg, LOG_ERR);
-	            $this->error.=($this->error?', '.$errmsg:$errmsg);
+	            $this->error .= ($this->error ? ', '.$errmsg : $errmsg);
 			}
 			$this->db->rollback();
-			return -1*$error;
+			return -1 * $error;
 		}
 		else
 		{
@@ -168,27 +168,27 @@ 
      *  @param		string	$code	Code
      *  @return     int          	<0 if KO, >0 if OK
      */
-    function fetch($id,$code='')
+    function fetch($id, $code = '')
     {
     	global $langs;
         $sql = "SELECT";
-		$sql.= " t.rowid,";
-		$sql.= " t.code_departement,";
-		$sql.= " t.nom,";
-		$sql.= " t.active";
-        $sql.= " FROM ".MAIN_DB_PREFIX."c_departements as t";
-        if ($id)   $sql.= " WHERE t.rowid = ".$id;
-        elseif ($code) $sql.= " WHERE t.code_departement = '".$this->db->escape($code)."'";
+		$sql .= " t.rowid,";
+		$sql .= " t.code_departement,";
+		$sql .= " t.nom,";
+		$sql .= " t.active";
+        $sql .= " FROM ".MAIN_DB_PREFIX."c_departements as t";
+        if ($id)   $sql .= " WHERE t.rowid = ".$id;
+        elseif ($code) $sql .= " WHERE t.code_departement = '".$this->db->escape($code)."'";
 
     	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->code_departement = $obj->code_departement;
 				$this->nom = $obj->nom;
 				$this->active = $obj->active;
@@ -199,7 +199,7 @@ 
         }
         else
         {
-      	    $this->error="Error ".$this->db->lasterror();
+      	    $this->error = "Error ".$this->db->lasterror();
             return -1;
         }
     }
@@ -212,15 +212,15 @@ 
      *  @param      int		$notrigger	 0=launch triggers after, 1=disable triggers
      *  @return     int     		   	 <0 if KO, >0 if OK
      */
-    function update($user=null, $notrigger=0)
+    function update($user = null, $notrigger = 0)
     {
     	global $conf, $langs;
-		$error=0;
+		$error = 0;
 
 		// Clean parameters
-		if (isset($this->code_departement)) $this->code_departement=trim($this->code_departement);
-		if (isset($this->nom)) $this->nom=trim($this->nom);
-		if (isset($this->active)) $this->active=trim($this->active);
+		if (isset($this->code_departement)) $this->code_departement = trim($this->code_departement);
+		if (isset($this->nom)) $this->nom = trim($this->nom);
+		if (isset($this->active)) $this->active = trim($this->active);
 
 
 		// Check parameters
@@ -228,20 +228,20 @@ 
 
         // Update request
         $sql = "UPDATE ".MAIN_DB_PREFIX."c_departements SET";
-		$sql.= " code_departement=".(isset($this->code_departement)?"'".$this->db->escape($this->code_departement)."'":"null").",";
-		$sql.= " nom=".(isset($this->nom)?"'".$this->db->escape($this->nom)."'":"null").",";
-		$sql.= " active=".(isset($this->active)?$this->active:"null")."";
-        $sql.= " WHERE rowid=".$this->id;
+		$sql .= " code_departement=".(isset($this->code_departement) ? "'".$this->db->escape($this->code_departement)."'" : "null").",";
+		$sql .= " nom=".(isset($this->nom) ? "'".$this->db->escape($this->nom)."'" : "null").",";
+		$sql .= " active=".(isset($this->active) ? $this->active : "null")."";
+        $sql .= " WHERE rowid=".$this->id;
 
 		$this->db->begin();
 
 		dol_syslog(get_class($this)."::update", LOG_DEBUG);
         $resql = $this->db->query($sql);
-    	if (! $resql) { $error++; $this->errors[]="Error ".$this->db->lasterror(); }
+    	if (!$resql) { $error++; $this->errors[] = "Error ".$this->db->lasterror(); }
 
-		if (! $error)
+		if (!$error)
 		{
-			if (! $notrigger)
+			if (!$notrigger)
 			{
 	            // Uncomment this and change MYOBJECT to your own tag if you
 	            // want this action call a trigger.
@@ -258,13 +258,13 @@ 
         // Commit or rollback
 		if ($error)
 		{
-			foreach($this->errors as $errmsg)
+			foreach ($this->errors as $errmsg)
 			{
 	            dol_syslog(get_class($this)."::update ".$errmsg, LOG_ERR);
-	            $this->error.=($this->error?', '.$errmsg:$errmsg);
+	            $this->error .= ($this->error ? ', '.$errmsg : $errmsg);
 			}
 			$this->db->rollback();
-			return -1*$error;
+			return -1 * $error;
 		}
 		else
 		{
@@ -281,23 +281,23 @@ 
      *  @param	int		$notrigger	 0=launch triggers after, 1=disable triggers
 	 *  @return	int					 <0 if KO, >0 if OK
 	 */
-	function delete($user, $notrigger=0)
+	function delete($user, $notrigger = 0)
 	{
 		global $conf, $langs;
-		$error=0;
+		$error = 0;
 
 		$sql = "DELETE FROM ".MAIN_DB_PREFIX."c_departements";
-		$sql.= " WHERE rowid=".$this->id;
+		$sql .= " WHERE rowid=".$this->id;
 
 		$this->db->begin();
 
 		dol_syslog(get_class($this)."::delete", LOG_DEBUG);
 		$resql = $this->db->query($sql);
-    	if (! $resql) { $error++; $this->errors[]="Error ".$this->db->lasterror(); }
+    	if (!$resql) { $error++; $this->errors[] = "Error ".$this->db->lasterror(); }
 
-		if (! $error)
+		if (!$error)
 		{
-			if (! $notrigger)
+			if (!$notrigger)
 			{
 				// Uncomment this and change MYOBJECT to your own tag if you
 		        // want this action call a trigger.
@@ -314,13 +314,13 @@ 
         // Commit or rollback
 		if ($error)
 		{
-			foreach($this->errors as $errmsg)
+			foreach ($this->errors as $errmsg)
 			{
 	            dol_syslog(get_class($this)."::delete ".$errmsg, LOG_ERR);
-	            $this->error.=($this->error?', '.$errmsg:$errmsg);
+	            $this->error .= ($this->error ? ', '.$errmsg : $errmsg);
 			}
 			$this->db->rollback();
-			return -1*$error;
+			return -1 * $error;
 		}
 		else
 		{

Braces +27 added lines, -16 removed lines

@@ -98,9 +98,15 @@ 
 		$error=0;
 
 		// Clean parameters
-		if (isset($this->code_departement)) $this->code_departement=trim($this->code_departement);
-		if (isset($this->nom)) $this->nom=trim($this->nom);
-		if (isset($this->active)) $this->active=trim($this->active);
+		if (isset($this->code_departement)) {
+		    $this->code_departement=trim($this->code_departement);
+		}
+		if (isset($this->nom)) {
+		    $this->nom=trim($this->nom);
+		}
+		if (isset($this->active)) {
+		    $this->active=trim($this->active);
+		}
 
 		// Check parameters
 		// Put here code to add control on parameters values
@@ -152,8 +158,7 @@ 
 			}
 			$this->db->rollback();
 			return -1*$error;
-		}
-		else
+		} else
 		{
 			$this->db->commit();
             return $this->id;
@@ -177,8 +182,11 @@ 
 		$sql.= " t.nom,";
 		$sql.= " t.active";
         $sql.= " FROM ".MAIN_DB_PREFIX."c_departements as t";
-        if ($id)   $sql.= " WHERE t.rowid = ".$id;
-        elseif ($code) $sql.= " WHERE t.code_departement = '".$this->db->escape($code)."'";
+        if ($id) {
+            $sql.= " WHERE t.rowid = ".$id;
+        } elseif ($code) {
+            $sql.= " WHERE t.code_departement = '".$this->db->escape($code)."'";
+        }
 
     	dol_syslog(get_class($this)."::fetch", LOG_DEBUG);
         $resql=$this->db->query($sql);
@@ -196,8 +204,7 @@ 
             $this->db->free($resql);
 
             return 1;
-        }
-        else
+        } else
         {
       	    $this->error="Error ".$this->db->lasterror();
             return -1;
@@ -218,9 +225,15 @@ 
 		$error=0;
 
 		// Clean parameters
-		if (isset($this->code_departement)) $this->code_departement=trim($this->code_departement);
-		if (isset($this->nom)) $this->nom=trim($this->nom);
-		if (isset($this->active)) $this->active=trim($this->active);
+		if (isset($this->code_departement)) {
+		    $this->code_departement=trim($this->code_departement);
+		}
+		if (isset($this->nom)) {
+		    $this->nom=trim($this->nom);
+		}
+		if (isset($this->active)) {
+		    $this->active=trim($this->active);
+		}
 
 
 		// Check parameters
@@ -265,8 +278,7 @@ 
 			}
 			$this->db->rollback();
 			return -1*$error;
-		}
-		else
+		} else
 		{
 			$this->db->commit();
 			return 1;
@@ -321,8 +333,7 @@ 
 			}
 			$this->db->rollback();
 			return -1*$error;
-		}
-		else
+		} else
 		{
 			$this->db->commit();
 			return 1;

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

Indentation +7 added lines, -8 removed lines

@@ -32,7 +32,6 @@ 
  * Classe permettant la generation du formulaire d'un nouveau ticket.
  *
  * @package Ticket
-
  * \remarks Utilisation: $formticket = new FormTicket($db)
  * \remarks $formticket->proprietes=1 ou chaine ou tableau de valeurs
  * \remarks $formticket->show_form() affiche le formulaire
@@ -88,9 +87,9 @@ 
     public $param = array();
 
     /**
-	 * @var string Error code (or message)
-	 */
-	public $error;
+     * @var string Error code (or message)
+     */
+    public $error;
 
 
     /**
@@ -153,7 +152,7 @@ 
         print '<input type="hidden" name="token" value="' . $_SESSION['newtoken'] . '">';
         print '<input type="hidden" name="action" value="' . $this->action . '">';
         foreach ($this->param as $key => $value) {
-        	print '<input type="hidden" name="' . $key . '" value="' . $value . '">';
+            print '<input type="hidden" name="' . $key . '" value="' . $value . '">';
         }
         print '<input type="hidden" name="fk_user_create" value="' . $this->fk_user_create . '">';
 
@@ -306,9 +305,9 @@ 
         // Notify thirdparty at creation
         if (empty($this->ispublic))
         {
-	        print '<tr><td><label for="notify_tiers_at_create">' . $langs->trans("TicketNotifyTiersAtCreation") . '</label></td><td>';
-        	print '<input type="checkbox" id="notify_tiers_at_create" name="notify_tiers_at_create"'.($this->withnotifytiersatcreate?' checked="checked"':'').'>';
-        	print '</td></tr>';
+            print '<tr><td><label for="notify_tiers_at_create">' . $langs->trans("TicketNotifyTiersAtCreation") . '</label></td><td>';
+            print '<input type="checkbox" id="notify_tiers_at_create" name="notify_tiers_at_create"'.($this->withnotifytiersatcreate?' checked="checked"':'').'>';
+            print '</td></tr>';
         }
 
         // TITLE

Spacing +120 added lines, -120 removed lines

@@ -21,11 +21,11 @@ 
  *       \ingroup    ticket
  *       \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.formmail.class.php";
+require_once DOL_DOCUMENT_ROOT."/core/class/html.form.class.php";
+require_once DOL_DOCUMENT_ROOT."/core/class/html.formmail.class.php";
 
 if (!class_exists('FormCompany')) {
-    include DOL_DOCUMENT_ROOT . '/core/class/html.formcompany.class.php';
+    include DOL_DOCUMENT_ROOT.'/core/class/html.formcompany.class.php';
 }
 
 /**
@@ -114,7 +114,7 @@ 
         $this->withcreatereadonly = 1;
         $this->withemail = 0;
         $this->withref = 0;
-        $this->withextrafields = 0;         // Show extrafields or not
+        $this->withextrafields = 0; // Show extrafields or not
         //$this->withtopicreadonly=0;
     }
 
@@ -124,7 +124,7 @@ 
      * @param  int	 $withdolfichehead			With dol_fiche_head
      * @return void
      */
-    public function showForm($withdolfichehead=0)
+    public function showForm($withdolfichehead = 0)
     {
         global $conf, $langs, $user, $hookmanager;
 
@@ -149,25 +149,25 @@ 
 
         if ($withdolfichehead) dol_fiche_head(null, 'card', '', 0, '');
 
-        print '<form method="POST" '.($withdolfichehead?'':'style="margin-bottom: 30px;" ').'name="ticket" id="form_create_ticket" enctype="multipart/form-data" action="' . $this->param["returnurl"] . '">';
-        print '<input type="hidden" name="token" value="' . $_SESSION['newtoken'] . '">';
-        print '<input type="hidden" name="action" value="' . $this->action . '">';
+        print '<form method="POST" '.($withdolfichehead ? '' : 'style="margin-bottom: 30px;" ').'name="ticket" id="form_create_ticket" enctype="multipart/form-data" action="'.$this->param["returnurl"].'">';
+        print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
+        print '<input type="hidden" name="action" value="'.$this->action.'">';
         foreach ($this->param as $key => $value) {
-        	print '<input type="hidden" name="' . $key . '" value="' . $value . '">';
+        	print '<input type="hidden" name="'.$key.'" value="'.$value.'">';
         }
-        print '<input type="hidden" name="fk_user_create" value="' . $this->fk_user_create . '">';
+        print '<input type="hidden" name="fk_user_create" value="'.$this->fk_user_create.'">';
 
         print '<table class="border">';
 
         if ($this->withref) {
             // Ref
             $defaultref = $ticketstat->getDefaultRef();
-            print '<tr><td class="titlefield"><span class="fieldrequired">' . $langs->trans("Ref") . '</span></td><td><input size="18" type="text" name="ref" value="' . (GETPOST("ref", 'alpha') ? GETPOST("ref", 'alpha') : $defaultref) . '"></td></tr>';
+            print '<tr><td class="titlefield"><span class="fieldrequired">'.$langs->trans("Ref").'</span></td><td><input size="18" type="text" name="ref" value="'.(GETPOST("ref", 'alpha') ? GETPOST("ref", 'alpha') : $defaultref).'"></td></tr>';
         }
 
         // FK_USER_CREATE
         if ($this->withusercreate > 0 && $this->fk_user_create) {
-            print '<tr><td class="titlefield">' . $langs->trans("CreatedBy") . '</td><td>';
+            print '<tr><td class="titlefield">'.$langs->trans("CreatedBy").'</td><td>';
             $langs->load("users");
             $fuser = new User($this->db);
 
@@ -185,12 +185,12 @@ 
             // altairis: force company and contact id for external user
             if (empty($user->socid)) {
                 // Company
-                print '<tr><td class="titlefield">' . $langs->trans("ThirdParty") . '</td><td>';
+                print '<tr><td class="titlefield">'.$langs->trans("ThirdParty").'</td><td>';
                 $events = array();
                 $events[] = array('method' => 'getContacts', 'url' => dol_buildpath('/core/ajax/contacts.php', 1), 'htmlname' => 'contactid', 'params' => array('add-customer-contact' => 'disabled'));
                 print $form->select_company($this->withfromsocid, 'socid', '', 1, 1, '', $events, 0, 'minwidth200');
                 print '</td></tr>';
-                if (! empty($conf->use_javascript_ajax) && ! empty($conf->global->COMPANY_USE_SEARCH_TO_SELECT)) {
+                if (!empty($conf->use_javascript_ajax) && !empty($conf->global->COMPANY_USE_SEARCH_TO_SELECT)) {
                     $htmlname = 'socid';
                     print '<script type="text/javascript">
                     $(document).ready(function () {
@@ -245,23 +245,23 @@ 
                 }
 
                 // Contact and type
-                print '<tr><td>' . $langs->trans("Contact") . '</td><td>';
+                print '<tr><td>'.$langs->trans("Contact").'</td><td>';
                 // If no socid, set to -1 to avoid full contacts list
                 $selectedCompany = ($this->withfromsocid > 0) ? $this->withfromsocid : -1;
                 $nbofcontacts = $form->select_contacts($selectedCompany, $this->withfromcontactid, 'contactid', 3, '', '', 0, 'minwidth200');
                 $formcompany->selectTypeContact($ticketstatic, '', 'type', 'external', '', 0, 'maginleftonly');
                 print '</td></tr>';
             } else {
-                print '<tr><td class="titlefield"><input type="hidden" name="socid" value="' . $user->socid . '"/></td>';
-                print '<td><input type="hidden" name="contactid" value="' . $user->contactid . '"/></td>';
+                print '<tr><td class="titlefield"><input type="hidden" name="socid" value="'.$user->socid.'"/></td>';
+                print '<td><input type="hidden" name="contactid" value="'.$user->contactid.'"/></td>';
                 print '<td><input type="hidden" name="type" value="Z"/></td></tr>';
             }
         }
 
         // TITLE
         if ($this->withemail) {
-            print '<tr><td class="titlefield"><label for="email"><span class="fieldrequired">' . $langs->trans("Email") . '</span></label></td><td>';
-            print '<input  class="text minwidth200" id="email" name="email" value="' . (GETPOST('email', 'alpha') ? GETPOST('email', 'alpha') : $subject) . '" />';
+            print '<tr><td class="titlefield"><label for="email"><span class="fieldrequired">'.$langs->trans("Email").'</span></label></td><td>';
+            print '<input  class="text minwidth200" id="email" name="email" value="'.(GETPOST('email', 'alpha') ? GETPOST('email', 'alpha') : $subject).'" />';
             print '</td></tr>';
         }
 
@@ -274,10 +274,10 @@ 
                 $subelement = $regs[2];
             }
 
-            dol_include_once('/' . $element . '/class/' . $subelement . '.class.php');
+            dol_include_once('/'.$element.'/class/'.$subelement.'.class.php');
             $classname = ucfirst($subelement);
             $objectsrc = new $classname($this->db);
-            $objectsrc->fetch(GETPOST('originid','int'));
+            $objectsrc->fetch(GETPOST('originid', 'int'));
 
             if (empty($objectsrc->lines) && method_exists($objectsrc, 'fetch_lines')) {
                 $objectsrc->fetch_lines();
@@ -285,58 +285,58 @@ 
 
             $objectsrc->fetch_thirdparty();
             $newclassname = $classname;
-            print '<tr><td>' . $langs->trans($newclassname) . '</td><td colspan="2"><input name="' . $subelement . 'id" value="' . GETPOST('originid') . '" type="hidden" />' . $objectsrc->getNomUrl(1) . '</td></tr>';
+            print '<tr><td>'.$langs->trans($newclassname).'</td><td colspan="2"><input name="'.$subelement.'id" value="'.GETPOST('originid').'" type="hidden" />'.$objectsrc->getNomUrl(1).'</td></tr>';
         }
 
         // Type
-        print '<tr><td class="titlefield"><span class="fieldrequired"><label for="selecttype_code">' . $langs->trans("TicketTypeRequest") . '</span></label></td><td>';
+        print '<tr><td class="titlefield"><span class="fieldrequired"><label for="selecttype_code">'.$langs->trans("TicketTypeRequest").'</span></label></td><td>';
         print $this->selectTypesTickets((GETPOST('type_code') ? GETPOST('type_code') : $this->type_code), 'type_code', '', '2');
         print '</td></tr>';
 
         // Category
-        print '<tr><td><span class="fieldrequired"><label for="selectcategory_code">' . $langs->trans("TicketCategory") . '</span></label></td><td>';
+        print '<tr><td><span class="fieldrequired"><label for="selectcategory_code">'.$langs->trans("TicketCategory").'</span></label></td><td>';
         print $this->selectCategoriesTickets((GETPOST('category_code') ? GETPOST('category_code') : $this->category_code), 'category_code', '', '2');
         print '</td></tr>';
 
         // Severity
-        print '<tr><td><span class="fieldrequired"><label for="selectseverity_code">' . $langs->trans("TicketSeverity") . '</span></label></td><td>';
+        print '<tr><td><span class="fieldrequired"><label for="selectseverity_code">'.$langs->trans("TicketSeverity").'</span></label></td><td>';
         print $this->selectSeveritiesTickets((GETPOST('severity_code') ? GETPOST('severity_code') : $this->severity_code), 'severity_code', '', '2');
         print '</td></tr>';
 
         // Notify thirdparty at creation
         if (empty($this->ispublic))
         {
-	        print '<tr><td><label for="notify_tiers_at_create">' . $langs->trans("TicketNotifyTiersAtCreation") . '</label></td><td>';
-        	print '<input type="checkbox" id="notify_tiers_at_create" name="notify_tiers_at_create"'.($this->withnotifytiersatcreate?' checked="checked"':'').'>';
+	        print '<tr><td><label for="notify_tiers_at_create">'.$langs->trans("TicketNotifyTiersAtCreation").'</label></td><td>';
+        	print '<input type="checkbox" id="notify_tiers_at_create" name="notify_tiers_at_create"'.($this->withnotifytiersatcreate ? ' checked="checked"' : '').'>';
         	print '</td></tr>';
         }
 
         // TITLE
         if ($this->withtitletopic) {
-            print '<tr><td><label for="subject"><span class="fieldrequired">' . $langs->trans("Subject") . '</span></label></td><td>';
+            print '<tr><td><label for="subject"><span class="fieldrequired">'.$langs->trans("Subject").'</span></label></td><td>';
 
             // Réponse à un ticket : affichage du titre du thread en readonly
             if ($this->withtopicreadonly) {
-                print $langs->trans('SubjectAnswerToTicket') . ' ' . $this->topic_title;
+                print $langs->trans('SubjectAnswerToTicket').' '.$this->topic_title;
                 print '</td></tr>';
             } else {
                 if ($this->withthreadid > 0) {
-                    $subject = $langs->trans('SubjectAnswerToTicket') . ' ' . $this->withthreadid . ' : ' . $this->topic_title . '';
+                    $subject = $langs->trans('SubjectAnswerToTicket').' '.$this->withthreadid.' : '.$this->topic_title.'';
                 }
-                print '<input class="text" size="50" id="subject" name="subject" value="' . (GETPOST('subject', 'alpha') ? GETPOST('subject', 'alpha') : $subject) . '" />';
+                print '<input class="text" size="50" id="subject" name="subject" value="'.(GETPOST('subject', 'alpha') ? GETPOST('subject', 'alpha') : $subject).'" />';
                 print '</td></tr>';
             }
         }
 
         // MESSAGE
         $msg = GETPOST('message', 'alpha') ? GETPOST('message', 'alpha') : '';
-        print '<tr><td><label for="message"><span class="fieldrequired">' . $langs->trans("Message") . '</span></label></td><td>';
+        print '<tr><td><label for="message"><span class="fieldrequired">'.$langs->trans("Message").'</span></label></td><td>';
 
         // If public form, display more information
         if ($this->ispublic) {
-            print '<div class="warning">' . ($conf->global->TICKET_PUBLIC_TEXT_HELP_MESSAGE ? $conf->global->TICKET_PUBLIC_TEXT_HELP_MESSAGE : $langs->trans('TicketPublicPleaseBeAccuratelyDescribe')) . '</div>';
+            print '<div class="warning">'.($conf->global->TICKET_PUBLIC_TEXT_HELP_MESSAGE ? $conf->global->TICKET_PUBLIC_TEXT_HELP_MESSAGE : $langs->trans('TicketPublicPleaseBeAccuratelyDescribe')).'</div>';
         }
-        include_once DOL_DOCUMENT_ROOT . '/core/class/doleditor.class.php';
+        include_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
         $uselocalbrowser = true;
         $doleditor = new DolEditor('message', GETPOST('message', 'alpha'), '100%', 250, 'dolibarr_details', 'In', true, $uselocalbrowser);
         $doleditor->Create();
@@ -361,33 +361,33 @@ 
             }
 
             $out .= '<tr>';
-            $out .= '<td width="180">' . $langs->trans("MailFile") . '</td>';
+            $out .= '<td width="180">'.$langs->trans("MailFile").'</td>';
             $out .= '<td colspan="2">';
             // TODO Trick to have param removedfile containing nb of image to delete. But this does not works without javascript
-            $out .= '<input type="hidden" class="removedfilehidden" name="removedfile" value="">' . "\n";
+            $out .= '<input type="hidden" class="removedfilehidden" name="removedfile" value="">'."\n";
             $out .= '<script type="text/javascript" language="javascript">';
             $out .= 'jQuery(document).ready(function () {';
             $out .= '    jQuery(".removedfile").click(function() {';
             $out .= '        jQuery(".removedfilehidden").val(jQuery(this).val());';
             $out .= '    });';
             $out .= '})';
-            $out .= '</script>' . "\n";
+            $out .= '</script>'."\n";
             if (count($listofpaths)) {
                 foreach ($listofpaths as $key => $val) {
-                    $out .= '<div id="attachfile_' . $key . '">';
-                    $out .= img_mime($listofnames[$key]) . ' ' . $listofnames[$key];
+                    $out .= '<div id="attachfile_'.$key.'">';
+                    $out .= img_mime($listofnames[$key]).' '.$listofnames[$key];
                     if (!$this->withfilereadonly) {
-                        $out .= ' <input type="image" style="border: 0px;" src="' . DOL_URL_ROOT . '/theme/' . $conf->theme . '/img/delete.png" value="' . ($key + 1) . '" class="removedfile" id="removedfile_' . $key . '" name="removedfile_' . $key . '" />';
+                        $out .= ' <input type="image" style="border: 0px;" src="'.DOL_URL_ROOT.'/theme/'.$conf->theme.'/img/delete.png" value="'.($key + 1).'" class="removedfile" id="removedfile_'.$key.'" name="removedfile_'.$key.'" />';
                     }
                     $out .= '<br></div>';
                 }
             } else {
-                $out .= $langs->trans("NoAttachedFiles") . '<br>';
+                $out .= $langs->trans("NoAttachedFiles").'<br>';
             }
             if ($this->withfile == 2) { // Can add other files
-                $out .= '<input type="file" class="flat" id="addedfile" name="addedfile" value="' . $langs->trans("Upload") . '" />';
+                $out .= '<input type="file" class="flat" id="addedfile" name="addedfile" value="'.$langs->trans("Upload").'" />';
                 $out .= ' ';
-                $out .= '<input type="submit" class="button" id="addfile" name="addfile" value="' . $langs->trans("MailingAddFile") . '" />';
+                $out .= '<input type="submit" class="button" id="addfile" name="addfile" value="'.$langs->trans("MailingAddFile").'" />';
             }
             $out .= "</td></tr>\n";
 
@@ -406,11 +406,11 @@ 
         if ($withdolfichehead) dol_fiche_end();
 
         print '<center>';
-        print '<input class="button" type="submit" name="add_ticket" value="' . $langs->trans(($this->withthreadid > 0 ? "SendResponse" : "NewTicket")) . '" />';
+        print '<input class="button" type="submit" name="add_ticket" value="'.$langs->trans(($this->withthreadid > 0 ? "SendResponse" : "NewTicket")).'" />';
 
         if ($this->withcancel) {
             print " &nbsp; &nbsp; ";
-            print "<input class=\"button\" type=\"submit\" name=\"cancel\" value=\"" . $langs->trans("Cancel") . "\">";
+            print "<input class=\"button\" type=\"submit\" name=\"cancel\" value=\"".$langs->trans("Cancel")."\">";
         }
         print "</center>\n";
 
@@ -431,13 +431,13 @@ 
      *      @param	string	$morecss	More CSS
      *      @return void
      */
-    public function selectTypesTickets($selected = '', $htmlname = 'tickettype', $filtertype = '', $format = 0, $empty = 0, $noadmininfo = 0, $maxlength = 0, $morecss='')
+    public function selectTypesTickets($selected = '', $htmlname = 'tickettype', $filtertype = '', $format = 0, $empty = 0, $noadmininfo = 0, $maxlength = 0, $morecss = '')
     {
         global $langs, $user;
 
         $ticketstat = new Ticket($this->db);
 
-        dol_syslog(get_class($this) . "::select_types_tickets " . $selected . ", " . $htmlname . ", " . $filtertype . ", " . $format, LOG_DEBUG);
+        dol_syslog(get_class($this)."::select_types_tickets ".$selected.", ".$htmlname.", ".$filtertype.", ".$format, LOG_DEBUG);
 
         $filterarray = array();
 
@@ -447,7 +447,7 @@ 
 
         $ticketstat->loadCacheTypesTickets();
 
-        print '<select id="select' . $htmlname . '" class="flat minwidth100'.($morecss?' '.$morecss:'').'" name="' . $htmlname . '">';
+        print '<select id="select'.$htmlname.'" class="flat minwidth100'.($morecss ? ' '.$morecss : '').'" name="'.$htmlname.'">';
         if ($empty) {
             print '<option value="">&nbsp;</option>';
         }
@@ -465,19 +465,19 @@ 
                 }
 
                 if ($format == 0) {
-                    print '<option value="' . $id . '"';
+                    print '<option value="'.$id.'"';
                 }
 
                 if ($format == 1) {
-                    print '<option value="' . $arraytypes['code'] . '"';
+                    print '<option value="'.$arraytypes['code'].'"';
                 }
 
                 if ($format == 2) {
-                    print '<option value="' . $arraytypes['code'] . '"';
+                    print '<option value="'.$arraytypes['code'].'"';
                 }
 
                 if ($format == 3) {
-                    print '<option value="' . $id . '"';
+                    print '<option value="'.$id.'"';
                 }
 
                 // Si selected est text, on compare avec code, sinon avec id
@@ -531,13 +531,13 @@ 
      *      @param	string	$morecss	More CSS
      *      @return void
      */
-    public function selectCategoriesTickets($selected = '', $htmlname = 'ticketcategory', $filtertype = '', $format = 0, $empty = 0, $noadmininfo = 0, $maxlength = 0, $morecss='')
+    public function selectCategoriesTickets($selected = '', $htmlname = 'ticketcategory', $filtertype = '', $format = 0, $empty = 0, $noadmininfo = 0, $maxlength = 0, $morecss = '')
     {
         global $langs, $user;
 
         $ticketstat = new Ticket($this->db);
 
-        dol_syslog(get_class($this) . "::selectCategoryTickets " . $selected . ", " . $htmlname . ", " . $filtertype . ", " . $format, LOG_DEBUG);
+        dol_syslog(get_class($this)."::selectCategoryTickets ".$selected.", ".$htmlname.", ".$filtertype.", ".$format, LOG_DEBUG);
 
         $filterarray = array();
 
@@ -547,7 +547,7 @@ 
 
         $ticketstat->loadCacheCategoriesTickets();
 
-        print '<select id="select' . $htmlname . '" class="flat minwidth100'.($morecss?' '.$morecss:'').'" name="' . $htmlname . '">';
+        print '<select id="select'.$htmlname.'" class="flat minwidth100'.($morecss ? ' '.$morecss : '').'" name="'.$htmlname.'">';
         if ($empty) {
             print '<option value="">&nbsp;</option>';
         }
@@ -565,19 +565,19 @@ 
                 }
 
                 if ($format == 0) {
-                    print '<option value="' . $id . '"';
+                    print '<option value="'.$id.'"';
                 }
 
                 if ($format == 1) {
-                    print '<option value="' . $arraycategories['code'] . '"';
+                    print '<option value="'.$arraycategories['code'].'"';
                 }
 
                 if ($format == 2) {
-                    print '<option value="' . $arraycategories['code'] . '"';
+                    print '<option value="'.$arraycategories['code'].'"';
                 }
 
                 if ($format == 3) {
-                    print '<option value="' . $id . '"';
+                    print '<option value="'.$id.'"';
                 }
 
                 // Si selected est text, on compare avec code, sinon avec id
@@ -632,13 +632,13 @@ 
      *      @param	string	$morecss	More CSS
      *      @return void
      */
-    public function selectSeveritiesTickets($selected = '', $htmlname = 'ticketseverity', $filtertype = '', $format = 0, $empty = 0, $noadmininfo = 0, $maxlength = 0, $morecss='')
+    public function selectSeveritiesTickets($selected = '', $htmlname = 'ticketseverity', $filtertype = '', $format = 0, $empty = 0, $noadmininfo = 0, $maxlength = 0, $morecss = '')
     {
         global $langs, $user;
 
         $ticketstat = new Ticket($this->db);
 
-        dol_syslog(get_class($this) . "::selectSeveritiesTickets " . $selected . ", " . $htmlname . ", " . $filtertype . ", " . $format, LOG_DEBUG);
+        dol_syslog(get_class($this)."::selectSeveritiesTickets ".$selected.", ".$htmlname.", ".$filtertype.", ".$format, LOG_DEBUG);
 
         $filterarray = array();
 
@@ -648,7 +648,7 @@ 
 
         $ticketstat->loadCacheSeveritiesTickets();
 
-        print '<select id="select' . $htmlname . '" class="flat minwidth150'.($morecss?' '.$morecss:'').'" name="' . $htmlname . '">';
+        print '<select id="select'.$htmlname.'" class="flat minwidth150'.($morecss ? ' '.$morecss : '').'" name="'.$htmlname.'">';
         if ($empty) {
             print '<option value="">&nbsp;</option>';
         }
@@ -666,19 +666,19 @@ 
                 }
 
                 if ($format == 0) {
-                    print '<option value="' . $id . '"';
+                    print '<option value="'.$id.'"';
                 }
 
                 if ($format == 1) {
-                    print '<option value="' . $arrayseverities['code'] . '"';
+                    print '<option value="'.$arrayseverities['code'].'"';
                 }
 
                 if ($format == 2) {
-                    print '<option value="' . $arrayseverities['code'] . '"';
+                    print '<option value="'.$arrayseverities['code'].'"';
                 }
 
                 if ($format == 3) {
-                    print '<option value="' . $id . '"';
+                    print '<option value="'.$id.'"';
                 }
 
                 // Si selected est text, on compare avec code, sinon avec id
@@ -760,7 +760,7 @@ 
         if ($conf->global->MAIN_MULTILANGS && empty($newlang)) {
             $newlang = $this->param['langsmodels'];
         }
-        if (! empty($newlang)) {
+        if (!empty($newlang)) {
             $outputlangs = new Translate("", $conf);
             $outputlangs->setDefaultLang($newlang);
             $outputlangs->load('other');
@@ -773,7 +773,7 @@ 
         // Example 1 : Adding jquery code
         print '<script type="text/javascript" language="javascript">
 		jQuery(document).ready(function() {
-			send_email=' . $send_email . ';
+			send_email=' . $send_email.';
 			if (send_email) {
 				jQuery(".email_line").show();
 			} else {
@@ -791,42 +791,42 @@ 
         print '});
 		</script>';
 
-        print '<form method="post" name="ticket" enctype="multipart/form-data" action="' . $this->param["returnurl"] . '">';
-        print '<input type="hidden" name="token" value="' . $_SESSION['newtoken'] . '">';
-        print '<input type="hidden" name="action" value="' . $this->action . '">';
+        print '<form method="post" name="ticket" enctype="multipart/form-data" action="'.$this->param["returnurl"].'">';
+        print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
+        print '<input type="hidden" name="action" value="'.$this->action.'">';
         foreach ($this->param as $key => $value) {
-            print '<input type="hidden" name="' . $key . '" value="' . $value . '">';
+            print '<input type="hidden" name="'.$key.'" value="'.$value.'">';
         }
 
         // Get message template
-        $model_id=0;
+        $model_id = 0;
         if (array_key_exists('models_id', $this->param)) {
-            $model_id=$this->param["models_id"];
-            $arraydefaultmessage=$formmail->getEMailTemplate($this->db, $this->param["models"], $user, $outputlangs, $model_id);
+            $model_id = $this->param["models_id"];
+            $arraydefaultmessage = $formmail->getEMailTemplate($this->db, $this->param["models"], $user, $outputlangs, $model_id);
         }
 
         $result = $formmail->fetchAllEMailTemplate($this->param["models"], $user, $outputlangs);
-        if ($result<0) {
+        if ($result < 0) {
             setEventMessages($this->error, $this->errors, 'errors');
         }
-        $modelmail_array=array();
+        $modelmail_array = array();
         foreach ($formmail->lines_model as $line) {
-            $modelmail_array[$line->id]=$line->label;
+            $modelmail_array[$line->id] = $line->label;
         }
 
-        print '<table class="border"  width="' . $width . '">';
+        print '<table class="border"  width="'.$width.'">';
 
 
         // External users can't send message email
         if ($user->rights->ticket->write && !$user->socid) {
             print '<tr><td width="30%"></td><td colspan="2">';
-            $checkbox_selected = ( GETPOST('send_email') == "1" ? ' checked' : '');
+            $checkbox_selected = (GETPOST('send_email') == "1" ? ' checked' : '');
             print '<input type="checkbox" name="send_email" value="1" id="send_msg_email" '.$checkbox_selected.'/> ';
-            print '<label for="send_msg_email">' . $langs->trans('SendMessageByEmail') . '</label>';
+            print '<label for="send_msg_email">'.$langs->trans('SendMessageByEmail').'</label>';
             print '</td></tr>';
 
             // Zone to select its email template
-            if (count($modelmail_array)>0) {
+            if (count($modelmail_array) > 0) {
                 print '<tr class="email_line"><td></td><td colspan="2"><div style="padding: 3px 0 3px 0">'."\n";
                 print $langs->trans('SelectMailModel').': '.$formmail->selectarray('modelmailselected', $modelmail_array, $this->param['models_id'], 1);
                 if ($user->admin) {
@@ -841,32 +841,32 @@ 
             // Substitution array
             if ($this->withsubstit) {
                 print '<tr class="email_line"><td></td><td colspan="2">';
-                $help="";
+                $help = "";
                 foreach ($this->substit as $key => $val) {
-                    $help.=$key.' -> '.$langs->trans($val).'<br>';
+                    $help .= $key.' -> '.$langs->trans($val).'<br>';
                 }
                 print $form->textwithpicto($langs->trans("TicketMessageSubstitutionReplacedByGenericValues"), $help);
                 print "</td></tr>";
             }
 
-            if (! $user->socid) {
+            if (!$user->socid) {
                 print '<tr><td width="30%"></td><td>';
-                $checkbox_selected = ( GETPOST('private_message') == "1" ? ' checked' : '');
+                $checkbox_selected = (GETPOST('private_message') == "1" ? ' checked' : '');
                 print '<input type="checkbox" name="private_message" value="1" id="private_message" '.$checkbox_selected.'/> ';
-                print '<label for="private_message">' . $langs->trans('MarkMessageAsPrivate') . '</label>';
+                print '<label for="private_message">'.$langs->trans('MarkMessageAsPrivate').'</label>';
                 print '</td><td align="center">';
                 print $form->textwithpicto('', $langs->trans("TicketMessagePrivateHelp"), 1, 'help');
                 print '</td></tr>';
             }
 
 
-            print '<tr class="email_line"><td width=20%">' . $langs->trans('Subject') . '</td>';
+            print '<tr class="email_line"><td width=20%">'.$langs->trans('Subject').'</td>';
             $label_title = empty($conf->global->MAIN_APPLICATION_TITLE) ? $mysoc->name : $conf->global->MAIN_APPLICATION_TITLE;
-            print '<td colspan="2"><input type="text" class="text" size="80" name="subject" value="[' . $label_title . ' - ticket #' . $this->track_id . '] ' . $langs->trans('TicketNewMessage') . '" />';
+            print '<td colspan="2"><input type="text" class="text" size="80" name="subject" value="['.$label_title.' - ticket #'.$this->track_id.'] '.$langs->trans('TicketNewMessage').'" />';
             print '</td></tr>';
 
             // Destinataires
-            print '<tr class="email_line"><td>' . $langs->trans('MailRecipients') . '</td><td colspan="2">';
+            print '<tr class="email_line"><td>'.$langs->trans('MailRecipients').'</td><td colspan="2">';
             $ticketstat = new Ticket($this->db);
             $res = $ticketstat->fetch('', '', $this->track_id);
             if ($res) {
@@ -878,13 +878,13 @@ 
                 if (is_array($contacts) && count($contacts) > 0) {
                     foreach ($contacts as $key => $info_sendto) {
                         if ($info_sendto['email'] != '') {
-                            $sendto[] = dol_escape_htmltag(trim($info_sendto['firstname'] . " " . $info_sendto['lastname']) . " <" . $info_sendto['email'] . "> (" . $info_sendto['libelle'] . ")");
+                            $sendto[] = dol_escape_htmltag(trim($info_sendto['firstname']." ".$info_sendto['lastname'])." <".$info_sendto['email']."> (".$info_sendto['libelle'].")");
                         }
                     }
                 }
 
                 if ($ticketstat->origin_email && !in_array($this->dao->origin_email, $sendto)) {
-                    $sendto[] = $ticketstat->origin_email . "(origin)";
+                    $sendto[] = $ticketstat->origin_email."(origin)";
                 }
 
                 if ($ticketstat->fk_soc > 0) {
@@ -892,19 +892,19 @@ 
                     $ticketstat->fetch_thirdparty();
 
                     if (is_array($ticketstat->thirdparty->email) && !in_array($ticketstat->thirdparty->email, $sendto)) {
-                        $sendto[] = $ticketstat->thirdparty->email . '(' . $langs->trans('Customer') . ')';
+                        $sendto[] = $ticketstat->thirdparty->email.'('.$langs->trans('Customer').')';
                     }
                 }
 
                 if ($conf->global->TICKET_NOTIFICATION_ALSO_MAIN_ADDRESS) {
-                    $sendto[] = $conf->global->TICKET_NOTIFICATION_EMAIL_TO . '(generic email)';
+                    $sendto[] = $conf->global->TICKET_NOTIFICATION_EMAIL_TO.'(generic email)';
                 }
 
                 // Print recipient list
                 if (is_array($sendto) && count($sendto) > 0) {
                     print implode(', ', $sendto);
                 } else {
-                    print '<div class="warning">' . $langs->trans('WarningNoEMailsAdded') . ' ' . $langs->trans('TicketGoIntoContactTab') . '</div>';
+                    print '<div class="warning">'.$langs->trans('WarningNoEMailsAdded').' '.$langs->trans('TicketGoIntoContactTab').'</div>';
                 }
             }
             print '</td></tr>';
@@ -914,10 +914,10 @@ 
         // External users can't send message email
         if ($user->rights->ticket->write && !$user->socid) {
             $mail_intro = GETPOST('mail_intro') ? GETPOST('mail_intro') : $conf->global->TICKET_MESSAGE_MAIL_INTRO;
-            print '<tr class="email_line"><td><label for="mail_intro">' . $langs->trans("TicketMessageMailIntro") . '</label>';
+            print '<tr class="email_line"><td><label for="mail_intro">'.$langs->trans("TicketMessageMailIntro").'</label>';
 
             print '</td><td>';
-            include_once DOL_DOCUMENT_ROOT . '/core/class/doleditor.class.php';
+            include_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
             $uselocalbrowser = true;
 
             $doleditor = new DolEditor('mail_intro', $mail_intro, '100%', 140, 'dolibarr_details', '', false, true, $conf->global->FCKEDITOR_ENABLE_SOCIETE, ROWS_2, 70);
@@ -929,11 +929,11 @@ 
         }
 
         // MESSAGE
-        $defaultmessage="";
+        $defaultmessage = "";
         if (is_array($arraydefaultmessage) && count($arraydefaultmessage) > 0 && $arraydefaultmessage->content) {
-            $defaultmessage=$arraydefaultmessage->content;
+            $defaultmessage = $arraydefaultmessage->content;
         }
-        $defaultmessage=str_replace('\n', "\n", $defaultmessage);
+        $defaultmessage = str_replace('\n', "\n", $defaultmessage);
 
         // Deal with format differences between message and signature (text / HTML)
         if (dol_textishtml($defaultmessage) && !dol_textishtml($this->substit['__SIGNATURE__'])) {
@@ -941,17 +941,17 @@ 
         } elseif (!dol_textishtml($defaultmessage) && dol_textishtml($this->substit['__SIGNATURE__'])) {
             $defaultmessage = dol_nl2br($defaultmessage);
         }
-        if (isset($_POST["message"]) &&  ! $_POST['modelselected']) {
-            $defaultmessage=GETPOST('message');
+        if (isset($_POST["message"]) && !$_POST['modelselected']) {
+            $defaultmessage = GETPOST('message');
         } else {
-            $defaultmessage=make_substitutions($defaultmessage, $this->substit);
+            $defaultmessage = make_substitutions($defaultmessage, $this->substit);
             // Clean first \n and br (to avoid empty line when CONTACTCIVNAME is empty)
-            $defaultmessage=preg_replace("/^(<br>)+/", "", $defaultmessage);
-            $defaultmessage=preg_replace("/^\n+/", "", $defaultmessage);
+            $defaultmessage = preg_replace("/^(<br>)+/", "", $defaultmessage);
+            $defaultmessage = preg_replace("/^\n+/", "", $defaultmessage);
         }
 
-        print '<tr><td><label for="message"><span class="fieldrequired">' . $langs->trans("Message") . '</span></label></td><td>';
-        include_once DOL_DOCUMENT_ROOT . '/core/class/doleditor.class.php';
+        print '<tr><td><label for="message"><span class="fieldrequired">'.$langs->trans("Message").'</span></label></td><td>';
+        include_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
         $doleditor = new DolEditor('message', $defaultmessage, '100%', 350, 'dolibarr_details', '', false, true, $conf->global->FCKEDITOR_ENABLE_SOCIETE, ROWS_2, 70);
         $doleditor->Create();
         print '</td><td align="center">';
@@ -965,10 +965,10 @@ 
         // External users can't send message email
         if ($user->rights->ticket->write && !$user->socid) {
             $mail_signature = GETPOST('mail_signature') ? GETPOST('mail_signature') : $conf->global->TICKET_MESSAGE_MAIL_SIGNATURE;
-            print '<tr class="email_line"><td><label for="mail_intro">' . $langs->trans("TicketMessageMailSignature") . '</label>';
+            print '<tr class="email_line"><td><label for="mail_intro">'.$langs->trans("TicketMessageMailSignature").'</label>';
 
             print '</td><td>';
-            include_once DOL_DOCUMENT_ROOT . '/core/class/doleditor.class.php';
+            include_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
             $doleditor = new DolEditor('mail_signature', $mail_signature, '100%', 150, 'dolibarr_details', '', false, true, $conf->global->FCKEDITOR_ENABLE_SOCIETE, ROWS_2, 70);
             $doleditor->Create();
             print '</td><td align="center">';
@@ -979,33 +979,33 @@ 
         // Attached files
         if (!empty($this->withfile)) {
             $out .= '<tr>';
-            $out .= '<td width="180">' . $langs->trans("MailFile") . '</td>';
+            $out .= '<td width="180">'.$langs->trans("MailFile").'</td>';
             $out .= '<td colspan="2">';
             // TODO Trick to have param removedfile containing nb of image to delete. But this does not works without javascript
-            $out .= '<input type="hidden" class="removedfilehidden" name="removedfile" value="">' . "\n";
+            $out .= '<input type="hidden" class="removedfilehidden" name="removedfile" value="">'."\n";
             $out .= '<script type="text/javascript" language="javascript">';
             $out .= 'jQuery(document).ready(function () {';
             $out .= '    jQuery(".removedfile").click(function() {';
             $out .= '        jQuery(".removedfilehidden").val(jQuery(this).val());';
             $out .= '    });';
             $out .= '})';
-            $out .= '</script>' . "\n";
+            $out .= '</script>'."\n";
             if (count($listofpaths)) {
                 foreach ($listofpaths as $key => $val) {
-                    $out .= '<div id="attachfile_' . $key . '">';
-                    $out .= img_mime($listofnames[$key]) . ' ' . $listofnames[$key];
+                    $out .= '<div id="attachfile_'.$key.'">';
+                    $out .= img_mime($listofnames[$key]).' '.$listofnames[$key];
                     if (!$this->withfilereadonly) {
-                        $out .= ' <input type="image" style="border: 0px;" src="' . DOL_URL_ROOT . '/theme/' . $conf->theme . '/img/delete.png" value="' . ($key + 1) . '" class="removedfile" id="removedfile_' . $key . '" name="removedfile_' . $key . '" />';
+                        $out .= ' <input type="image" style="border: 0px;" src="'.DOL_URL_ROOT.'/theme/'.$conf->theme.'/img/delete.png" value="'.($key + 1).'" class="removedfile" id="removedfile_'.$key.'" name="removedfile_'.$key.'" />';
                     }
                     $out .= '<br></div>';
                 }
             } else {
-                $out .= $langs->trans("NoAttachedFiles") . '<br>';
+                $out .= $langs->trans("NoAttachedFiles").'<br>';
             }
             if ($this->withfile == 2) { // Can add other files
-                $out .= '<input type="file" class="flat" id="addedfile" name="addedfile" value="' . $langs->trans("Upload") . '" />';
+                $out .= '<input type="file" class="flat" id="addedfile" name="addedfile" value="'.$langs->trans("Upload").'" />';
                 $out .= ' ';
-                $out .= '<input type="submit" class="button" id="' . $addfileaction . '" name="' . $addfileaction . '" value="' . $langs->trans("MailingAddFile") . '" />';
+                $out .= '<input type="submit" class="button" id="'.$addfileaction.'" name="'.$addfileaction.'" value="'.$langs->trans("MailingAddFile").'" />';
             }
             $out .= "</td></tr>\n";
 
@@ -1014,11 +1014,11 @@ 
 
         print '<tr><td colspan="3">';
         print '<center>';
-        print '<input class="button" type="submit" name="btn_add_message" value="' . $langs->trans("AddMessage") . '" />';
+        print '<input class="button" type="submit" name="btn_add_message" value="'.$langs->trans("AddMessage").'" />';
 
         if ($this->withcancel) {
             print " &nbsp; &nbsp; ";
-            print "<input class=\"button\" type=\"submit\" name=\"cancel\" value=\"" . $langs->trans("Cancel") . "\">";
+            print "<input class=\"button\" type=\"submit\" name=\"cancel\" value=\"".$langs->trans("Cancel")."\">";
         }
         print "</center>\n";
         print '</td></tr>';

Braces +6 added lines, -2 removed lines

@@ -147,7 +147,9 @@ 
 
         print "\n<!-- Begin form TICKETSUP -->\n";
 
-        if ($withdolfichehead) dol_fiche_head(null, 'card', '', 0, '');
+        if ($withdolfichehead) {
+            dol_fiche_head(null, 'card', '', 0, '');
+        }
 
         print '<form method="POST" '.($withdolfichehead?'':'style="margin-bottom: 30px;" ').'name="ticket" id="form_create_ticket" enctype="multipart/form-data" action="' . $this->param["returnurl"] . '">';
         print '<input type="hidden" name="token" value="' . $_SESSION['newtoken'] . '">';
@@ -403,7 +405,9 @@ 
 
         print '</table>';
 
-        if ($withdolfichehead) dol_fiche_end();
+        if ($withdolfichehead) {
+            dol_fiche_end();
+        }
 
         print '<center>';
         print '<input class="button" type="submit" name="add_ticket" value="' . $langs->trans(($this->withthreadid > 0 ? "SendResponse" : "NewTicket")) . '" />';