Dolibarr / dolibarr

htdocs/core/modules/supplier_order/mod_commande_fournisseur_orchidee.php

Doc Comments +2 added lines, -2 removed lines

@@ -102,7 +102,7 @@ 
 	/**
 	 *  Return next value
 	 *
-	 *  @param	Societe		$objsoc     Object third party
+	 *  @param	integer		$objsoc     Object third party
 	 *  @param  Object	    $object		Object
      *  @return string      			Value if OK, 0 if KO
 	*/
@@ -130,7 +130,7 @@ 
     /**
      *  Renvoie la reference de commande suivante non utilisee
      *
-	 *  @param	Societe		$objsoc     Object third party
+	 *  @param	integer		$objsoc     Object third party
 	 *  @param  Object	    $object		Object
      *  @return string      			Texte descripif
      */

Indentation +35 added lines, -35 removed lines

@@ -37,14 +37,14 @@ 
 	var $nom = 'Orchidee';
 
 
-    /**
-     *  Renvoi la description du modele de numerotation
-     *
-     * 	@return     string      Texte descripif
-     */
+	/**
+	 *  Renvoi la description du modele de numerotation
+	 *
+	 * 	@return     string      Texte descripif
+	 */
 	function info()
-    {
-    	global $conf,$langs;
+	{
+		global $conf,$langs;
 
 		$langs->load("bills");
 		$langs->load("admin");
@@ -76,20 +76,20 @@ 
 		$texte.= '</form>';
 
 		return $texte;
-    }
-
-    /**
-     *  Renvoi un exemple de numerotation
-     *
-     *  @return     string      Example
-     */
-    function getExample()
-    {
-    	global $conf,$langs,$mysoc;
-
-    	$old_code_client=$mysoc->code_client;
-    	$mysoc->code_client='CCCCCCCCCC';
-    	$numExample = $this->getNextValue($mysoc,'');
+	}
+
+	/**
+	 *  Renvoi un exemple de numerotation
+	 *
+	 *  @return     string      Example
+	 */
+	function getExample()
+	{
+		global $conf,$langs,$mysoc;
+
+		$old_code_client=$mysoc->code_client;
+		$mysoc->code_client='CCCCCCCCCC';
+		$numExample = $this->getNextValue($mysoc,'');
 		$mysoc->code_client=$old_code_client;
 
 		if (! $numExample)
@@ -97,17 +97,17 @@ 
 			$numExample = $langs->trans('NotConfigured');
 		}
 		return $numExample;
-    }
+	}
 
 	/**
 	 *  Return next value
 	 *
 	 *  @param	Societe		$objsoc     Object third party
 	 *  @param  Object	    $object		Object
-     *  @return string      			Value if OK, 0 if KO
-	*/
-    function getNextValue($objsoc=0,$object='')
-    {
+	 *  @return string      			Value if OK, 0 if KO
+	 */
+	function getNextValue($objsoc=0,$object='')
+	{
 		global $db,$conf;
 
 		require_once DOL_DOCUMENT_ROOT .'/core/lib/functions2.lib.php';
@@ -127,16 +127,16 @@ 
 	}
 
 
-    /**
-     *  Renvoie la reference de commande suivante non utilisee
-     *
+	/**
+	 *  Renvoie la reference de commande suivante non utilisee
+	 *
 	 *  @param	Societe		$objsoc     Object third party
 	 *  @param  Object	    $object		Object
-     *  @return string      			Texte descripif
-     */
-    function commande_get_num($objsoc=0,$object='')
-    {
-        return $this->getNextValue($objsoc,$object);
-    }
+	 *  @return string      			Texte descripif
+	 */
+	function commande_get_num($objsoc=0,$object='')
+	{
+		return $this->getNextValue($objsoc,$object);
+	}
 }
 

Spacing +35 added lines, -35 removed lines

@@ -24,7 +24,7 @@ 
  *	\brief      Fichier contenant la classe du modele de numerotation de reference de commande fournisseur Orchidee
  */
 
-require_once DOL_DOCUMENT_ROOT .'/core/modules/supplier_order/modules_commandefournisseur.php';
+require_once DOL_DOCUMENT_ROOT.'/core/modules/supplier_order/modules_commandefournisseur.php';
 
 
 /**
@@ -32,7 +32,7 @@ 
  */
 class mod_commande_fournisseur_orchidee extends ModeleNumRefSuppliersOrders
 {
-	var $version='dolibarr';		// 'development', 'experimental', 'dolibarr'
+	var $version = 'dolibarr'; // 'development', 'experimental', 'dolibarr'
 	var $error = '';
 	var $nom = 'Orchidee';
 
@@ -44,7 +44,7 @@ 
      */
 	function info()
     {
-    	global $conf,$langs;
+    	global $conf, $langs;
 
 		$langs->load("bills");
 		$langs->load("admin");
@@ -52,28 +52,28 @@ 
 		$form = new Form($this->db);
 
 		$texte = $langs->trans('GenericNumRefModelDesc')."<br>\n";
-		$texte.= '<form action="'.$_SERVER["PHP_SELF"].'" method="POST">';
-		$texte.= '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
-		$texte.= '<input type="hidden" name="action" value="updateMask">';
-		$texte.= '<input type="hidden" name="maskconstorder" value="COMMANDE_FOURNISSEUR_ORCHIDEE_MASK">';
-		$texte.= '<table class="nobordernopadding" width="100%">';
-
-		$tooltip=$langs->trans("GenericMaskCodes",$langs->transnoentities("Order"),$langs->transnoentities("Order"));
-		$tooltip.=$langs->trans("GenericMaskCodes2");
-		$tooltip.=$langs->trans("GenericMaskCodes3");
-		$tooltip.=$langs->trans("GenericMaskCodes4a",$langs->transnoentities("Order"),$langs->transnoentities("Order"));
-		$tooltip.=$langs->trans("GenericMaskCodes5");
+		$texte .= '<form action="'.$_SERVER["PHP_SELF"].'" method="POST">';
+		$texte .= '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
+		$texte .= '<input type="hidden" name="action" value="updateMask">';
+		$texte .= '<input type="hidden" name="maskconstorder" value="COMMANDE_FOURNISSEUR_ORCHIDEE_MASK">';
+		$texte .= '<table class="nobordernopadding" width="100%">';
+
+		$tooltip = $langs->trans("GenericMaskCodes", $langs->transnoentities("Order"), $langs->transnoentities("Order"));
+		$tooltip .= $langs->trans("GenericMaskCodes2");
+		$tooltip .= $langs->trans("GenericMaskCodes3");
+		$tooltip .= $langs->trans("GenericMaskCodes4a", $langs->transnoentities("Order"), $langs->transnoentities("Order"));
+		$tooltip .= $langs->trans("GenericMaskCodes5");
 
 		// Parametrage du prefix
-		$texte.= '<tr><td>'.$langs->trans("Mask").':</td>';
-		$texte.= '<td align="right">'.$form->textwithpicto('<input type="text" class="flat" size="24" name="maskorder" value="'.$conf->global->COMMANDE_FOURNISSEUR_ORCHIDEE_MASK.'">',$tooltip,1,1).'</td>';
+		$texte .= '<tr><td>'.$langs->trans("Mask").':</td>';
+		$texte .= '<td align="right">'.$form->textwithpicto('<input type="text" class="flat" size="24" name="maskorder" value="'.$conf->global->COMMANDE_FOURNISSEUR_ORCHIDEE_MASK.'">', $tooltip, 1, 1).'</td>';
 
-		$texte.= '<td align="left" rowspan="2">&nbsp; <input type="submit" class="button" value="'.$langs->trans("Modify").'" name="Button"></td>';
+		$texte .= '<td align="left" rowspan="2">&nbsp; <input type="submit" class="button" value="'.$langs->trans("Modify").'" name="Button"></td>';
 
-		$texte.= '</tr>';
+		$texte .= '</tr>';
 
-		$texte.= '</table>';
-		$texte.= '</form>';
+		$texte .= '</table>';
+		$texte .= '</form>';
 
 		return $texte;
     }
@@ -85,14 +85,14 @@ 
      */
     function getExample()
     {
-    	global $conf,$langs,$mysoc;
+    	global $conf, $langs, $mysoc;
 
-    	$old_code_client=$mysoc->code_client;
-    	$mysoc->code_client='CCCCCCCCCC';
-    	$numExample = $this->getNextValue($mysoc,'');
-		$mysoc->code_client=$old_code_client;
+    	$old_code_client = $mysoc->code_client;
+    	$mysoc->code_client = 'CCCCCCCCCC';
+    	$numExample = $this->getNextValue($mysoc, '');
+		$mysoc->code_client = $old_code_client;
 
-		if (! $numExample)
+		if (!$numExample)
 		{
 			$numExample = $langs->trans('NotConfigured');
 		}
@@ -106,22 +106,22 @@ 
 	 *  @param  Object	    $object		Object
      *  @return string      			Value if OK, 0 if KO
 	*/
-    function getNextValue($objsoc=0,$object='')
+    function getNextValue($objsoc = 0, $object = '')
     {
-		global $db,$conf;
+		global $db, $conf;
 
-		require_once DOL_DOCUMENT_ROOT .'/core/lib/functions2.lib.php';
+		require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
 
 		// On defini critere recherche compteur
-		$mask=$conf->global->COMMANDE_FOURNISSEUR_ORCHIDEE_MASK;
+		$mask = $conf->global->COMMANDE_FOURNISSEUR_ORCHIDEE_MASK;
 
-		if (! $mask)
+		if (!$mask)
 		{
-			$this->error='NotConfigured';
+			$this->error = 'NotConfigured';
 			return 0;
 		}
 
-		$numFinal=get_next_value($db,$mask,'commande_fournisseur','ref','',$objsoc,$object->date_commande);
+		$numFinal = get_next_value($db, $mask, 'commande_fournisseur', 'ref', '', $objsoc, $object->date_commande);
 
 		return  $numFinal;
 	}
@@ -134,9 +134,9 @@ 
 	 *  @param  Object	    $object		Object
      *  @return string      			Texte descripif
      */
-    function commande_get_num($objsoc=0,$object='')
+    function commande_get_num($objsoc = 0, $object = '')
     {
-        return $this->getNextValue($objsoc,$object);
+        return $this->getNextValue($objsoc, $object);
     }
 }
 

htdocs/loan/class/paymentloan.class.php

Doc Comments +1 added lines, -1 removed lines

@@ -226,7 +226,7 @@
 	/**
 	 *  Update database
 	 *
-	 *  @param	User	$user        	User that modify
+	 *  @param	integer	$user        	User that modify
 	 *  @param  int		$notrigger	    0=launch triggers after, 1=disable triggers
 	 *  @return int         			<0 if KO, >0 if OK
 	 */

Indentation +113 added lines, -113 removed lines

@@ -37,8 +37,8 @@ 
 	var $datec='';
 	var $tms='';
 	var $datep='';
-    var $amounts=array();   // Array of amounts
-    var $amount_capital;    // Total amount of payment
+	var $amounts=array();   // Array of amounts
+	var $amount_capital;    // Total amount of payment
 	var $amount_insurance;
 	var $amount_interest;
 	var $fk_typepayment;
@@ -65,8 +65,8 @@ 
 
 	/**
 	 *  Create payment of loan into database.
-     *  Use this->amounts to have list of lines for the payment
-     *
+	 *  Use this->amounts to have list of lines for the payment
+	 *
 	 *  @param      User		$user   User making payment
 	 *  @return     int     			<0 if KO, id of payment if OK
 	 */
@@ -76,9 +76,9 @@ 
 
 		$error=0;
 
-        $now=dol_now();
+		$now=dol_now();
 
-        // Validate parameters
+		// Validate parameters
 		if (! $this->datepaid)
 		{
 			$this->error='ErrorBadValueForParameter';
@@ -98,11 +98,11 @@ 
 		if (isset($this->fk_user_creat))	$this->fk_user_creat = trim($this->fk_user_creat);
 		if (isset($this->fk_user_modif))	$this->fk_user_modif = trim($this->fk_user_modif);
 
-        $totalamount = $this->amount_capital + $this->amount_insurance + $this->amount_interest;
-        $totalamount = price2num($totalamount);
+		$totalamount = $this->amount_capital + $this->amount_insurance + $this->amount_interest;
+		$totalamount = price2num($totalamount);
 
-        // Check parameters
-        if ($totalamount == 0) return -1; // Negative amounts are accepted for reject prelevement but not null
+		// Check parameters
+		if ($totalamount == 0) return -1; // Negative amounts are accepted for reject prelevement but not null
 
 
 		$this->db->begin();
@@ -127,7 +127,7 @@ 
 			}
 			else
 			{
-                $this->error=$this->db->lasterror();
+				$this->error=$this->db->lasterror();
 				$error++;
 			}
 
@@ -135,9 +135,9 @@ 
 
 		if ($totalamount != 0 && ! $error)
 		{
-		    $this->amount_capital=$totalamount;
-            $this->total=$totalamount;    // deprecated
-		    $this->db->commit();
+			$this->amount_capital=$totalamount;
+			$this->total=$totalamount;    // deprecated
+			$this->db->commit();
 			return $this->id;
 		}
 		else
@@ -168,8 +168,8 @@ 
 		$sql.= " t.amount_interest,";
 		$sql.= " t.fk_typepayment,";
 		$sql.= " t.num_payment,";
-        $sql.= " t.note_private,";
-        $sql.= " t.note_public,";
+		$sql.= " t.note_private,";
+		$sql.= " t.note_public,";
 		$sql.= " t.fk_bank,";
 		$sql.= " t.fk_user_creat,";
 		$sql.= " t.fk_user_modif,";
@@ -326,15 +326,15 @@ 
 
 		$this->db->begin();
 
-	    if (! $error)
-        {
-            $sql = "DELETE FROM ".MAIN_DB_PREFIX."bank_url";
-            $sql.= " WHERE type='payment_loan' AND url_id=".$this->id;
+		if (! $error)
+		{
+			$sql = "DELETE FROM ".MAIN_DB_PREFIX."bank_url";
+			$sql.= " WHERE type='payment_loan' AND url_id=".$this->id;
 
-            dol_syslog(get_class($this)."::delete", LOG_DEBUG);
-            $resql = $this->db->query($sql);
-            if (! $resql) { $error++; $this->errors[]="Error ".$this->db->lasterror(); }
-        }
+			dol_syslog(get_class($this)."::delete", LOG_DEBUG);
+			$resql = $this->db->query($sql);
+			if (! $resql) { $error++; $this->errors[]="Error ".$this->db->lasterror(); }
+		}
 
 		if (! $error)
 		{
@@ -380,95 +380,95 @@ 
 		}
 	}
 
-    /**
-     *      Add record into bank for payment with links between this bank record and invoices of payment.
-     *      All payment properties must have been set first like after a call to create().
-     *
-     *      @param	User	$user               Object of user making payment
-     *      @param  int		$fk_loan            Id of fk_loan to do link with this payment
-     *      @param  string	$mode               'payment_loan'
-     *      @param  string	$label              Label to use in bank record
-     *      @param  int		$accountid          Id of bank account to do link with
-     *      @param  string	$emetteur_nom       Name of transmitter
-     *      @param  string	$emetteur_banque    Name of bank
-     *      @return int                 		<0 if KO, >0 if OK
-     */
-    function addPaymentToBank($user, $fk_loan, $mode, $label, $accountid, $emetteur_nom, $emetteur_banque)
-    {
-        global $conf;
-
-        $error=0;
-
-        if (! empty($conf->banque->enabled))
-        {
-            require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php';
-
-            $acc = new Account($this->db);
-            $acc->fetch($accountid);
-
-            $total=$this->total;
-            if ($mode == 'payment_loan') $total=-$total;
-
-            // Insert payment into llx_bank
-            $bank_line_id = $acc->addline(
-                $this->datepaid,
-                $this->paymenttype,  // Payment mode id or code ("CHQ or VIR for example")
-                $label,
-                $total,
-                $this->num_payment,
-                '',
-                $user,
-                $emetteur_nom,
-                $emetteur_banque
-            );
-
-            // Update fk_bank into llx_paiement.
-            // We know the payment who generated the account write
-            if ($bank_line_id > 0)
-            {
-                $result=$this->update_fk_bank($bank_line_id);
-                if ($result <= 0)
-                {
-                    $error++;
-                    dol_print_error($this->db);
-                }
-
-                // Add link 'payment_loan' in bank_url between payment and bank transaction
-                $url='';
-                if ($mode == 'payment_loan') $url=DOL_URL_ROOT.'/loan/payment/card.php?id=';
-                if ($url)
-                {
-                    $result=$acc->add_url_line($bank_line_id, $this->id, $url, '(payment)', $mode);
-                    if ($result <= 0)
-                    {
-                        $error++;
-                        dol_print_error($this->db);
-                    }
-                }
-
-                // Add link 'loan' in bank_url between invoice and bank transaction (for each invoice concerned by payment)
-                if ($mode == 'payment_loan')
-                {
-                    $result=$acc->add_url_line($bank_line_id, $fk_loan, DOL_URL_ROOT.'/loan/card.php?id=', ($this->label?$this->label:''),'loan');
-                    if ($result <= 0) dol_print_error($this->db);
-                }
-            }
-            else
-            {
-                $this->error=$acc->error;
-                $error++;
-            }
-        }
-
-        if (! $error)
-        {
-            return 1;
-        }
-        else
-        {
-            return -1;
-        }
-    }
+	/**
+	 *      Add record into bank for payment with links between this bank record and invoices of payment.
+	 *      All payment properties must have been set first like after a call to create().
+	 *
+	 *      @param	User	$user               Object of user making payment
+	 *      @param  int		$fk_loan            Id of fk_loan to do link with this payment
+	 *      @param  string	$mode               'payment_loan'
+	 *      @param  string	$label              Label to use in bank record
+	 *      @param  int		$accountid          Id of bank account to do link with
+	 *      @param  string	$emetteur_nom       Name of transmitter
+	 *      @param  string	$emetteur_banque    Name of bank
+	 *      @return int                 		<0 if KO, >0 if OK
+	 */
+	function addPaymentToBank($user, $fk_loan, $mode, $label, $accountid, $emetteur_nom, $emetteur_banque)
+	{
+		global $conf;
+
+		$error=0;
+
+		if (! empty($conf->banque->enabled))
+		{
+			require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php';
+
+			$acc = new Account($this->db);
+			$acc->fetch($accountid);
+
+			$total=$this->total;
+			if ($mode == 'payment_loan') $total=-$total;
+
+			// Insert payment into llx_bank
+			$bank_line_id = $acc->addline(
+				$this->datepaid,
+				$this->paymenttype,  // Payment mode id or code ("CHQ or VIR for example")
+				$label,
+				$total,
+				$this->num_payment,
+				'',
+				$user,
+				$emetteur_nom,
+				$emetteur_banque
+			);
+
+			// Update fk_bank into llx_paiement.
+			// We know the payment who generated the account write
+			if ($bank_line_id > 0)
+			{
+				$result=$this->update_fk_bank($bank_line_id);
+				if ($result <= 0)
+				{
+					$error++;
+					dol_print_error($this->db);
+				}
+
+				// Add link 'payment_loan' in bank_url between payment and bank transaction
+				$url='';
+				if ($mode == 'payment_loan') $url=DOL_URL_ROOT.'/loan/payment/card.php?id=';
+				if ($url)
+				{
+					$result=$acc->add_url_line($bank_line_id, $this->id, $url, '(payment)', $mode);
+					if ($result <= 0)
+					{
+						$error++;
+						dol_print_error($this->db);
+					}
+				}
+
+				// Add link 'loan' in bank_url between invoice and bank transaction (for each invoice concerned by payment)
+				if ($mode == 'payment_loan')
+				{
+					$result=$acc->add_url_line($bank_line_id, $fk_loan, DOL_URL_ROOT.'/loan/card.php?id=', ($this->label?$this->label:''),'loan');
+					if ($result <= 0) dol_print_error($this->db);
+				}
+			}
+			else
+			{
+				$this->error=$acc->error;
+				$error++;
+			}
+		}
+
+		if (! $error)
+		{
+			return 1;
+		}
+		else
+		{
+			return -1;
+		}
+	}
 
 
 	/**

Braces +99 added lines, -46 removed lines

@@ -86,23 +86,48 @@ 
 		}
 
 		// Clean parameters
-		if (isset($this->fk_loan)) 			$this->fk_loan = trim($this->fk_loan);
-		if (isset($this->amount_capital))	$this->amount_capital = price2num($this->amount_capital?$this->amount_capital:0);
-		if (isset($this->amount_insurance))	$this->amount_insurance = price2num($this->amount_insurance?$this->amount_insurance:0);
-		if (isset($this->amount_interest))	$this->amount_interest = price2num($this->amount_interest?$this->amount_interest:0);
-		if (isset($this->fk_typepayment))	$this->fk_typepayment = trim($this->fk_typepayment);
-		if (isset($this->num_payment))		$this->num_payment = trim($this->num_payment);
-		if (isset($this->note_private))     $this->note_private = trim($this->note_private);
-		if (isset($this->note_public))      $this->note_public = trim($this->note_public);
-		if (isset($this->fk_bank))			$this->fk_bank = trim($this->fk_bank);
-		if (isset($this->fk_user_creat))	$this->fk_user_creat = trim($this->fk_user_creat);
-		if (isset($this->fk_user_modif))	$this->fk_user_modif = trim($this->fk_user_modif);
+		if (isset($this->fk_loan)) {
+			$this->fk_loan = trim($this->fk_loan);
+		}
+		if (isset($this->amount_capital)) {
+			$this->amount_capital = price2num($this->amount_capital?$this->amount_capital:0);
+		}
+		if (isset($this->amount_insurance)) {
+			$this->amount_insurance = price2num($this->amount_insurance?$this->amount_insurance:0);
+		}
+		if (isset($this->amount_interest)) {
+			$this->amount_interest = price2num($this->amount_interest?$this->amount_interest:0);
+		}
+		if (isset($this->fk_typepayment)) {
+			$this->fk_typepayment = trim($this->fk_typepayment);
+		}
+		if (isset($this->num_payment)) {
+			$this->num_payment = trim($this->num_payment);
+		}
+		if (isset($this->note_private)) {
+			$this->note_private = trim($this->note_private);
+		}
+		if (isset($this->note_public)) {
+			$this->note_public = trim($this->note_public);
+		}
+		if (isset($this->fk_bank)) {
+			$this->fk_bank = trim($this->fk_bank);
+		}
+		if (isset($this->fk_user_creat)) {
+			$this->fk_user_creat = trim($this->fk_user_creat);
+		}
+		if (isset($this->fk_user_modif)) {
+			$this->fk_user_modif = trim($this->fk_user_modif);
+		}
 
         $totalamount = $this->amount_capital + $this->amount_insurance + $this->amount_interest;
         $totalamount = price2num($totalamount);
 
         // Check parameters
-        if ($totalamount == 0) return -1; // Negative amounts are accepted for reject prelevement but not null
+        if ($totalamount == 0) {
+        	return -1;
+        }
+        // Negative amounts are accepted for reject prelevement but not null
 
 
 		$this->db->begin();
@@ -124,8 +149,7 @@ 
 			if ($resql)
 			{
 				$this->id = $this->db->last_insert_id(MAIN_DB_PREFIX."payment_loan");
-			}
-			else
+			} else
 			{
                 $this->error=$this->db->lasterror();
 				$error++;
@@ -139,8 +163,7 @@ 
             $this->total=$totalamount;    // deprecated
 		    $this->db->commit();
 			return $this->id;
-		}
-		else
+		} else
 		{
 			$this->error=$this->db->lasterror();
 			$this->db->rollback();
@@ -214,8 +237,7 @@ 
 			$this->db->free($resql);
 
 			return 1;
-		}
-		else
+		} else
 		{
 			$this->error="Error ".$this->db->lasterror();
 			return -1;
@@ -236,17 +258,39 @@ 
 		$error=0;
 
 		// Clean parameters
-		if (isset($this->fk_loan)) $this->fk_loan=trim($this->fk_loan);
-		if (isset($this->amount_capital)) $this->amount_capital=trim($this->amount_capital);
-		if (isset($this->amount_insurance)) $this->amount_insurance=trim($this->amount_insurance);
-		if (isset($this->amount_interest)) $this->amount_interest=trim($this->amount_interest);
-		if (isset($this->fk_typepayment)) $this->fk_typepayment=trim($this->fk_typepayment);
-		if (isset($this->num_payment)) $this->num_payment=trim($this->num_payment);
-		if (isset($this->note_private)) $this->note=trim($this->note_private);
-		if (isset($this->note_public)) $this->note=trim($this->note_public);
-		if (isset($this->fk_bank)) $this->fk_bank=trim($this->fk_bank);
-		if (isset($this->fk_user_creat)) $this->fk_user_creat=trim($this->fk_user_creat);
-		if (isset($this->fk_user_modif)) $this->fk_user_modif=trim($this->fk_user_modif);
+		if (isset($this->fk_loan)) {
+			$this->fk_loan=trim($this->fk_loan);
+		}
+		if (isset($this->amount_capital)) {
+			$this->amount_capital=trim($this->amount_capital);
+		}
+		if (isset($this->amount_insurance)) {
+			$this->amount_insurance=trim($this->amount_insurance);
+		}
+		if (isset($this->amount_interest)) {
+			$this->amount_interest=trim($this->amount_interest);
+		}
+		if (isset($this->fk_typepayment)) {
+			$this->fk_typepayment=trim($this->fk_typepayment);
+		}
+		if (isset($this->num_payment)) {
+			$this->num_payment=trim($this->num_payment);
+		}
+		if (isset($this->note_private)) {
+			$this->note=trim($this->note_private);
+		}
+		if (isset($this->note_public)) {
+			$this->note=trim($this->note_public);
+		}
+		if (isset($this->fk_bank)) {
+			$this->fk_bank=trim($this->fk_bank);
+		}
+		if (isset($this->fk_user_creat)) {
+			$this->fk_user_creat=trim($this->fk_user_creat);
+		}
+		if (isset($this->fk_user_modif)) {
+			$this->fk_user_modif=trim($this->fk_user_modif);
+		}
 
 		// Check parameters
 		// Put here code to add control on parameters values
@@ -303,8 +347,7 @@ 
 			}
 			$this->db->rollback();
 			return -1*$error;
-		}
-		else
+		} else
 		{
 			$this->db->commit();
 			return 1;
@@ -372,8 +415,7 @@ 
 			}
 			$this->db->rollback();
 			return -1*$error;
-		}
-		else
+		} else
 		{
 			$this->db->commit();
 			return 1;
@@ -407,7 +449,9 @@ 
             $acc->fetch($accountid);
 
             $total=$this->total;
-            if ($mode == 'payment_loan') $total=-$total;
+            if ($mode == 'payment_loan') {
+            	$total=-$total;
+            }
 
             // Insert payment into llx_bank
             $bank_line_id = $acc->addline(
@@ -435,7 +479,9 @@ 
 
                 // Add link 'payment_loan' in bank_url between payment and bank transaction
                 $url='';
-                if ($mode == 'payment_loan') $url=DOL_URL_ROOT.'/loan/payment/card.php?id=';
+                if ($mode == 'payment_loan') {
+                	$url=DOL_URL_ROOT.'/loan/payment/card.php?id=';
+                }
                 if ($url)
                 {
                     $result=$acc->add_url_line($bank_line_id, $this->id, $url, '(payment)', $mode);
@@ -450,10 +496,11 @@ 
                 if ($mode == 'payment_loan')
                 {
                     $result=$acc->add_url_line($bank_line_id, $fk_loan, DOL_URL_ROOT.'/loan/card.php?id=', ($this->label?$this->label:''),'loan');
-                    if ($result <= 0) dol_print_error($this->db);
+                    if ($result <= 0) {
+                    	dol_print_error($this->db);
+                    }
                 }
-            }
-            else
+            } else
             {
                 $this->error=$acc->error;
                 $error++;
@@ -463,8 +510,7 @@ 
         if (! $error)
         {
             return 1;
-        }
-        else
+        } else
         {
             return -1;
         }
@@ -486,8 +532,7 @@ 
 		if ($result)
 		{
 			return 1;
-		}
-		else
+		} else
 		{
 			$this->error=$this->db->error();
 			return 0;
@@ -507,16 +552,24 @@ 
 
 		$result='';
 
-		if (empty($this->ref)) $this->ref=$this->lib;
+		if (empty($this->ref)) {
+			$this->ref=$this->lib;
+		}
 
 		if (!empty($this->id))
 		{
 			$link = '<a href="'.DOL_URL_ROOT.'/compta/payment/card.php?id='.$this->id.'">';
 			$linkend='</a>';
 
-			if ($withpicto) $result.=($link.img_object($langs->trans("ShowPayment").': '.$this->ref,'payment').$linkend.' ');
-			if ($withpicto && $withpicto != 2) $result.=' ';
-			if ($withpicto != 2) $result.=$link.($maxlen?dol_trunc($this->ref,$maxlen):$this->ref).$linkend;
+			if ($withpicto) {
+				$result.=($link.img_object($langs->trans("ShowPayment").': '.$this->ref,'payment').$linkend.' ');
+			}
+			if ($withpicto && $withpicto != 2) {
+				$result.=' ';
+			}
+			if ($withpicto != 2) {
+				$result.=$link.($maxlen?dol_trunc($this->ref,$maxlen):$this->ref).$linkend;
+			}
 		}
 
 		return $result;

Spacing +119 added lines, -119 removed lines

@@ -30,15 +30,15 @@ 
  */
 class PaymentLoan extends CommonObject
 {
-	public $element='payment_loan';			//!< Id that identify managed objects
-	public $table_element='payment_loan';	//!< Name of table without prefix where object is stored
+	public $element = 'payment_loan'; //!< Id that identify managed objects
+	public $table_element = 'payment_loan'; //!< Name of table without prefix where object is stored
 
 	var $fk_loan;
-	var $datec='';
-	var $tms='';
-	var $datep='';
-    var $amounts=array();   // Array of amounts
-    var $amount_capital;    // Total amount of payment
+	var $datec = '';
+	var $tms = '';
+	var $datep = '';
+    var $amounts = array(); // Array of amounts
+    var $amount_capital; // Total amount of payment
 	var $amount_insurance;
 	var $amount_interest;
 	var $fk_typepayment;
@@ -74,22 +74,22 @@ 
 	{
 		global $conf, $langs;
 
-		$error=0;
+		$error = 0;
 
-        $now=dol_now();
+        $now = dol_now();
 
         // Validate parameters
-		if (! $this->datepaid)
+		if (!$this->datepaid)
 		{
-			$this->error='ErrorBadValueForParameter';
+			$this->error = 'ErrorBadValueForParameter';
 			return -1;
 		}
 
 		// Clean parameters
 		if (isset($this->fk_loan)) 			$this->fk_loan = trim($this->fk_loan);
-		if (isset($this->amount_capital))	$this->amount_capital = price2num($this->amount_capital?$this->amount_capital:0);
-		if (isset($this->amount_insurance))	$this->amount_insurance = price2num($this->amount_insurance?$this->amount_insurance:0);
-		if (isset($this->amount_interest))	$this->amount_interest = price2num($this->amount_interest?$this->amount_interest:0);
+		if (isset($this->amount_capital))	$this->amount_capital = price2num($this->amount_capital ? $this->amount_capital : 0);
+		if (isset($this->amount_insurance))	$this->amount_insurance = price2num($this->amount_insurance ? $this->amount_insurance : 0);
+		if (isset($this->amount_interest))	$this->amount_interest = price2num($this->amount_interest ? $this->amount_interest : 0);
 		if (isset($this->fk_typepayment))	$this->fk_typepayment = trim($this->fk_typepayment);
 		if (isset($this->num_payment))		$this->num_payment = trim($this->num_payment);
 		if (isset($this->note_private))     $this->note_private = trim($this->note_private);
@@ -110,39 +110,39 @@ 
 		if ($totalamount != 0)
 		{
 			$sql = "INSERT INTO ".MAIN_DB_PREFIX."payment_loan (fk_loan, datec, datep, amount_capital, amount_insurance, amount_interest,";
-			$sql.= " fk_typepayment, num_payment, note_private, note_public, fk_user_creat, fk_bank)";
-			$sql.= " VALUES (".$this->chid.", '".$this->db->idate($now)."',";
-			$sql.= " '".$this->db->idate($this->datepaid)."',";
-			$sql.= " ".$this->amount_capital.",";
-			$sql.= " ".$this->amount_insurance.",";
-			$sql.= " ".$this->amount_interest.",";
-			$sql.= " ".$this->paymenttype.", '".$this->db->escape($this->num_payment)."', '".$this->db->escape($this->note_private)."', '".$this->db->escape($this->note_public)."', ".$user->id.",";
-			$sql.= " 0)";
+			$sql .= " fk_typepayment, num_payment, note_private, note_public, fk_user_creat, fk_bank)";
+			$sql .= " VALUES (".$this->chid.", '".$this->db->idate($now)."',";
+			$sql .= " '".$this->db->idate($this->datepaid)."',";
+			$sql .= " ".$this->amount_capital.",";
+			$sql .= " ".$this->amount_insurance.",";
+			$sql .= " ".$this->amount_interest.",";
+			$sql .= " ".$this->paymenttype.", '".$this->db->escape($this->num_payment)."', '".$this->db->escape($this->note_private)."', '".$this->db->escape($this->note_public)."', ".$user->id.",";
+			$sql .= " 0)";
 
 			dol_syslog(get_class($this)."::create", LOG_DEBUG);
-			$resql=$this->db->query($sql);
+			$resql = $this->db->query($sql);
 			if ($resql)
 			{
 				$this->id = $this->db->last_insert_id(MAIN_DB_PREFIX."payment_loan");
 			}
 			else
 			{
-                $this->error=$this->db->lasterror();
+                $this->error = $this->db->lasterror();
 				$error++;
 			}
 
 		}
 
-		if ($totalamount != 0 && ! $error)
+		if ($totalamount != 0 && !$error)
 		{
-		    $this->amount_capital=$totalamount;
-            $this->total=$totalamount;    // deprecated
+		    $this->amount_capital = $totalamount;
+            $this->total = $totalamount; // deprecated
 		    $this->db->commit();
 			return $this->id;
 		}
 		else
 		{
-			$this->error=$this->db->lasterror();
+			$this->error = $this->db->lasterror();
 			$this->db->rollback();
 			return -1;
 		}
@@ -158,30 +158,30 @@ 
 	{
 		global $langs;
 		$sql = "SELECT";
-		$sql.= " t.rowid,";
-		$sql.= " t.fk_loan,";
-		$sql.= " t.datec,";
-		$sql.= " t.tms,";
-		$sql.= " t.datep,";
-		$sql.= " t.amount_capital,";
-		$sql.= " t.amount_insurance,";
-		$sql.= " t.amount_interest,";
-		$sql.= " t.fk_typepayment,";
-		$sql.= " t.num_payment,";
-        $sql.= " t.note_private,";
-        $sql.= " t.note_public,";
-		$sql.= " t.fk_bank,";
-		$sql.= " t.fk_user_creat,";
-		$sql.= " t.fk_user_modif,";
-		$sql.= " pt.code as type_code, pt.libelle as type_libelle,";
-		$sql.= ' b.fk_account';
-		$sql.= " FROM (".MAIN_DB_PREFIX."c_paiement as pt, ".MAIN_DB_PREFIX."payment_loan as t)";
-		$sql.= ' LEFT JOIN '.MAIN_DB_PREFIX.'bank as b ON t.fk_bank = b.rowid';
-		$sql.= " WHERE t.rowid = ".$id." AND t.fk_typepayment = pt.id";
-		$sql.= " AND pt.entity = " . getEntity('c_paiement');
+		$sql .= " t.rowid,";
+		$sql .= " t.fk_loan,";
+		$sql .= " t.datec,";
+		$sql .= " t.tms,";
+		$sql .= " t.datep,";
+		$sql .= " t.amount_capital,";
+		$sql .= " t.amount_insurance,";
+		$sql .= " t.amount_interest,";
+		$sql .= " t.fk_typepayment,";
+		$sql .= " t.num_payment,";
+        $sql .= " t.note_private,";
+        $sql .= " t.note_public,";
+		$sql .= " t.fk_bank,";
+		$sql .= " t.fk_user_creat,";
+		$sql .= " t.fk_user_modif,";
+		$sql .= " pt.code as type_code, pt.libelle as type_libelle,";
+		$sql .= ' b.fk_account';
+		$sql .= " FROM (".MAIN_DB_PREFIX."c_paiement as pt, ".MAIN_DB_PREFIX."payment_loan as t)";
+		$sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'bank as b ON t.fk_bank = b.rowid';
+		$sql .= " WHERE t.rowid = ".$id." AND t.fk_typepayment = pt.id";
+		$sql .= " AND pt.entity = ".getEntity('c_paiement');
 
 		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))
@@ -218,7 +218,7 @@ 
 		}
 		else
 		{
-			$this->error="Error ".$this->db->lasterror();
+			$this->error = "Error ".$this->db->lasterror();
 			return -1;
 		}
 	}
@@ -231,23 +231,23 @@ 
 	 *  @param  int		$notrigger	    0=launch triggers after, 1=disable triggers
 	 *  @return int         			<0 if KO, >0 if OK
 	 */
-	function update($user=0, $notrigger=0)
+	function update($user = 0, $notrigger = 0)
 	{
 		global $conf, $langs;
-		$error=0;
+		$error = 0;
 
 		// Clean parameters
-		if (isset($this->fk_loan)) $this->fk_loan=trim($this->fk_loan);
-		if (isset($this->amount_capital)) $this->amount_capital=trim($this->amount_capital);
-		if (isset($this->amount_insurance)) $this->amount_insurance=trim($this->amount_insurance);
-		if (isset($this->amount_interest)) $this->amount_interest=trim($this->amount_interest);
-		if (isset($this->fk_typepayment)) $this->fk_typepayment=trim($this->fk_typepayment);
-		if (isset($this->num_payment)) $this->num_payment=trim($this->num_payment);
-		if (isset($this->note_private)) $this->note=trim($this->note_private);
-		if (isset($this->note_public)) $this->note=trim($this->note_public);
-		if (isset($this->fk_bank)) $this->fk_bank=trim($this->fk_bank);
-		if (isset($this->fk_user_creat)) $this->fk_user_creat=trim($this->fk_user_creat);
-		if (isset($this->fk_user_modif)) $this->fk_user_modif=trim($this->fk_user_modif);
+		if (isset($this->fk_loan)) $this->fk_loan = trim($this->fk_loan);
+		if (isset($this->amount_capital)) $this->amount_capital = trim($this->amount_capital);
+		if (isset($this->amount_insurance)) $this->amount_insurance = trim($this->amount_insurance);
+		if (isset($this->amount_interest)) $this->amount_interest = trim($this->amount_interest);
+		if (isset($this->fk_typepayment)) $this->fk_typepayment = trim($this->fk_typepayment);
+		if (isset($this->num_payment)) $this->num_payment = trim($this->num_payment);
+		if (isset($this->note_private)) $this->note = trim($this->note_private);
+		if (isset($this->note_public)) $this->note = trim($this->note_public);
+		if (isset($this->fk_bank)) $this->fk_bank = trim($this->fk_bank);
+		if (isset($this->fk_user_creat)) $this->fk_user_creat = trim($this->fk_user_creat);
+		if (isset($this->fk_user_modif)) $this->fk_user_modif = trim($this->fk_user_modif);
 
 		// Check parameters
 		// Put here code to add control on parameters values
@@ -255,32 +255,32 @@ 
 		// Update request
 		$sql = "UPDATE ".MAIN_DB_PREFIX."payment_loan SET";
 
-		$sql.= " fk_loan=".(isset($this->fk_loan)?$this->fk_loan:"null").",";
-		$sql.= " datec=".(dol_strlen($this->datec)!=0 ? "'".$this->db->idate($this->datec)."'" : 'null').",";
-		$sql.= " tms=".(dol_strlen($this->tms)!=0 ? "'".$this->db->idate($this->tms)."'" : 'null').",";
-		$sql.= " datep=".(dol_strlen($this->datep)!=0 ? "'".$this->db->idate($this->datep)."'" : 'null').",";
-		$sql.= " amount_capital=".(isset($this->amount_capital)?$this->amount_capital:"null").",";
-		$sql.= " amount_insurance=".(isset($this->amount_insurance)?$this->amount_insurance:"null").",";
-		$sql.= " amount_interest=".(isset($this->amount_interest)?$this->amount_interest:"null").",";
-		$sql.= " fk_typepayment=".(isset($this->fk_typepayment)?$this->fk_typepayment:"null").",";
-		$sql.= " num_payment=".(isset($this->num_payment)?"'".$this->db->escape($this->num_payment)."'":"null").",";
-		$sql.= " note_private=".(isset($this->note_private)?"'".$this->db->escape($this->note_private)."'":"null").",";
-		$sql.= " note_public=".(isset($this->note_public)?"'".$this->db->escape($this->note_public)."'":"null").",";
-		$sql.= " fk_bank=".(isset($this->fk_bank)?$this->fk_bank:"null").",";
-		$sql.= " fk_user_creat=".(isset($this->fk_user_creat)?$this->fk_user_creat:"null").",";
-		$sql.= " fk_user_modif=".(isset($this->fk_user_modif)?$this->fk_user_modif:"null")."";
-
-		$sql.= " WHERE rowid=".$this->id;
+		$sql .= " fk_loan=".(isset($this->fk_loan) ? $this->fk_loan : "null").",";
+		$sql .= " datec=".(dol_strlen($this->datec) != 0 ? "'".$this->db->idate($this->datec)."'" : 'null').",";
+		$sql .= " tms=".(dol_strlen($this->tms) != 0 ? "'".$this->db->idate($this->tms)."'" : 'null').",";
+		$sql .= " datep=".(dol_strlen($this->datep) != 0 ? "'".$this->db->idate($this->datep)."'" : 'null').",";
+		$sql .= " amount_capital=".(isset($this->amount_capital) ? $this->amount_capital : "null").",";
+		$sql .= " amount_insurance=".(isset($this->amount_insurance) ? $this->amount_insurance : "null").",";
+		$sql .= " amount_interest=".(isset($this->amount_interest) ? $this->amount_interest : "null").",";
+		$sql .= " fk_typepayment=".(isset($this->fk_typepayment) ? $this->fk_typepayment : "null").",";
+		$sql .= " num_payment=".(isset($this->num_payment) ? "'".$this->db->escape($this->num_payment)."'" : "null").",";
+		$sql .= " note_private=".(isset($this->note_private) ? "'".$this->db->escape($this->note_private)."'" : "null").",";
+		$sql .= " note_public=".(isset($this->note_public) ? "'".$this->db->escape($this->note_public)."'" : "null").",";
+		$sql .= " fk_bank=".(isset($this->fk_bank) ? $this->fk_bank : "null").",";
+		$sql .= " fk_user_creat=".(isset($this->fk_user_creat) ? $this->fk_user_creat : "null").",";
+		$sql .= " fk_user_modif=".(isset($this->fk_user_modif) ? $this->fk_user_modif : "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.
@@ -297,13 +297,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
 		{
@@ -320,36 +320,36 @@ 
 	 *  @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;
 
 		$this->db->begin();
 
-	    if (! $error)
+	    if (!$error)
         {
             $sql = "DELETE FROM ".MAIN_DB_PREFIX."bank_url";
-            $sql.= " WHERE type='payment_loan' AND url_id=".$this->id;
+            $sql .= " WHERE type='payment_loan' AND url_id=".$this->id;
 
             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)
 		{
 			$sql = "DELETE FROM ".MAIN_DB_PREFIX."payment_loan";
-			$sql.= " WHERE rowid=".$this->id;
+			$sql .= " WHERE rowid=".$this->id;
 
 			dol_syslog(get_class($this)."::delete", LOG_DEBUG);
 			$resql = $this->db->query($sql);
-			if (! $resql) { $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.
@@ -366,13 +366,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
 		{
@@ -398,22 +398,22 @@ 
     {
         global $conf;
 
-        $error=0;
+        $error = 0;
 
-        if (! empty($conf->banque->enabled))
+        if (!empty($conf->banque->enabled))
         {
             require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php';
 
             $acc = new Account($this->db);
             $acc->fetch($accountid);
 
-            $total=$this->total;
-            if ($mode == 'payment_loan') $total=-$total;
+            $total = $this->total;
+            if ($mode == 'payment_loan') $total = -$total;
 
             // Insert payment into llx_bank
             $bank_line_id = $acc->addline(
                 $this->datepaid,
-                $this->paymenttype,  // Payment mode id or code ("CHQ or VIR for example")
+                $this->paymenttype, // Payment mode id or code ("CHQ or VIR for example")
                 $label,
                 $total,
                 $this->num_payment,
@@ -427,7 +427,7 @@ 
             // We know the payment who generated the account write
             if ($bank_line_id > 0)
             {
-                $result=$this->update_fk_bank($bank_line_id);
+                $result = $this->update_fk_bank($bank_line_id);
                 if ($result <= 0)
                 {
                     $error++;
@@ -435,11 +435,11 @@ 
                 }
 
                 // Add link 'payment_loan' in bank_url between payment and bank transaction
-                $url='';
-                if ($mode == 'payment_loan') $url=DOL_URL_ROOT.'/loan/payment/card.php?id=';
+                $url = '';
+                if ($mode == 'payment_loan') $url = DOL_URL_ROOT.'/loan/payment/card.php?id=';
                 if ($url)
                 {
-                    $result=$acc->add_url_line($bank_line_id, $this->id, $url, '(payment)', $mode);
+                    $result = $acc->add_url_line($bank_line_id, $this->id, $url, '(payment)', $mode);
                     if ($result <= 0)
                     {
                         $error++;
@@ -450,18 +450,18 @@ 
                 // Add link 'loan' in bank_url between invoice and bank transaction (for each invoice concerned by payment)
                 if ($mode == 'payment_loan')
                 {
-                    $result=$acc->add_url_line($bank_line_id, $fk_loan, DOL_URL_ROOT.'/loan/card.php?id=', ($this->label?$this->label:''),'loan');
+                    $result = $acc->add_url_line($bank_line_id, $fk_loan, DOL_URL_ROOT.'/loan/card.php?id=', ($this->label ? $this->label : ''), 'loan');
                     if ($result <= 0) dol_print_error($this->db);
                 }
             }
             else
             {
-                $this->error=$acc->error;
+                $this->error = $acc->error;
                 $error++;
             }
         }
 
-        if (! $error)
+        if (!$error)
         {
             return 1;
         }
@@ -490,7 +490,7 @@ 
 		}
 		else
 		{
-			$this->error=$this->db->error();
+			$this->error = $this->db->error();
 			return 0;
 		}
 	}
@@ -502,22 +502,22 @@ 
 	 * 	@param	int		$maxlen			Max length label
 	 *	@return	string					Chaine with URL
 	 */
-	function getNomUrl($withpicto=0,$maxlen=0)
+	function getNomUrl($withpicto = 0, $maxlen = 0)
 	{
 		global $langs;
 
-		$result='';
+		$result = '';
 
-		if (empty($this->ref)) $this->ref=$this->lib;
+		if (empty($this->ref)) $this->ref = $this->lib;
 
 		if (!empty($this->id))
 		{
 			$link = '<a href="'.DOL_URL_ROOT.'/compta/payment/card.php?id='.$this->id.'">';
-			$linkend='</a>';
+			$linkend = '</a>';
 
-			if ($withpicto) $result.=($link.img_object($langs->trans("ShowPayment").': '.$this->ref,'payment').$linkend.' ');
-			if ($withpicto && $withpicto != 2) $result.=' ';
-			if ($withpicto != 2) $result.=$link.($maxlen?dol_trunc($this->ref,$maxlen):$this->ref).$linkend;
+			if ($withpicto) $result .= ($link.img_object($langs->trans("ShowPayment").': '.$this->ref, 'payment').$linkend.' ');
+			if ($withpicto && $withpicto != 2) $result .= ' ';
+			if ($withpicto != 2) $result .= $link.($maxlen ?dol_trunc($this->ref, $maxlen) : $this->ref).$linkend;
 		}
 
 		return $result;

htdocs/main.inc.php

Doc Comments +2 added lines, -2 removed lines

@@ -1590,7 +1590,7 @@ 
 /**
  *  Show left menu bar
  *
- *  @param  array	$menu_array_before 	       	Table of menu entries to show before entries of menu handler. This param is deprectaed and must be provided to ''.
+ *  @param  string	$menu_array_before 	       	Table of menu entries to show before entries of menu handler. This param is deprectaed and must be provided to ''.
  *  @param  string	$helppagename    	       	Name of wiki page for help ('' by default).
  * 				     		                   	Syntax is: For a wiki page: EN:EnglishPage|FR:FrenchPage|ES:SpanishPage
  * 									         		       For other external page: http://server/url
@@ -1598,7 +1598,7 @@ 
  *  @param  array	$menu_array_after           Table of menu entries to show after entries of menu handler
  *  @param  int		$leftmenuwithoutmainarea    Must be set to 1. 0 by default for backward compatibility with old modules.
  *  @param  string	$title                      Title of web page
- *  @param  string  $acceptdelayedhtml          1 if caller request to have html delayed content not returned but saved into global $delayedhtmlcontent (so caller can show it at end of page to avoid flash FOUC effect)
+ *  @param  integer  $acceptdelayedhtml          1 if caller request to have html delayed content not returned but saved into global $delayedhtmlcontent (so caller can show it at end of page to avoid flash FOUC effect)
  *  @return	void
  */
 function left_menu($menu_array_before, $helppagename='', $notused='', $menu_array_after='', $leftmenuwithoutmainarea=0, $title='', $acceptdelayedhtml=0)

Indentation +91 added lines, -91 removed lines

@@ -1279,97 +1279,97 @@
                 print '<script type="text/javascript" src="'.DOL_URL_ROOT.'/includes/jquery/plugins/datatables/extensions/ColReorder/js/dataTables.colReorder.min.js'.($ext?'?'.$ext:'').'"></script>'."\n";
                 print '<script type="text/javascript" src="'.DOL_URL_ROOT.'/includes/jszip/jszip.min.js"></script>'."\n";
             }*/
-            // jQuery Timepicker
-            if (! empty($conf->global->MAIN_USE_JQUERY_TIMEPICKER) || defined('REQUIRE_JQUERY_TIMEPICKER'))
-            {
-            	print '<script type="text/javascript" src="'.DOL_URL_ROOT.'/includes/jquery/plugins/timepicker/jquery-ui-timepicker-addon.js'.($ext?'?'.$ext:'').'"></script>'."\n";
-            	print '<script type="text/javascript" src="'.DOL_URL_ROOT.'/core/js/timepicker.js.php?lang='.$langs->defaultlang.($ext?'&amp;'.$ext:'').'"></script>'."\n";
-            }
-            if (! defined('DISABLE_SELECT2') && (! empty($conf->global->MAIN_USE_JQUERY_MULTISELECT) || defined('REQUIRE_JQUERY_MULTISELECT')))     // jQuery plugin "mutiselect", "multiple-select", "select2", ...
-            {
-            	$tmpplugin=empty($conf->global->MAIN_USE_JQUERY_MULTISELECT)?constant('REQUIRE_JQUERY_MULTISELECT'):$conf->global->MAIN_USE_JQUERY_MULTISELECT;
-            	print '<script type="text/javascript" src="'.DOL_URL_ROOT.'/includes/jquery/plugins/'.$tmpplugin.'/dist/js/'.$tmpplugin.'.full.min.js'.($ext?'?'.$ext:'').'"></script>'."\n";	// We include full because we need the support of containerCssClass
-            }
-        }
-
-        if (! $disablejs && ! empty($conf->use_javascript_ajax))
-        {
-            // CKEditor
-            if (! empty($conf->fckeditor->enabled) && (empty($conf->global->FCKEDITOR_EDITORNAME) || $conf->global->FCKEDITOR_EDITORNAME == 'ckeditor') && ! defined('DISABLE_CKEDITOR'))
-            {
-                print '<!-- Includes JS for CKEditor -->'."\n";
-                $pathckeditor = DOL_URL_ROOT . '/includes/ckeditor/ckeditor/';
-                $jsckeditor='ckeditor.js';
-                if (constant('JS_CKEDITOR'))	// To use external ckeditor 4 js lib
-                {
-                	$pathckeditor=constant('JS_CKEDITOR');
-                }
-                print '<script type="text/javascript">';
-                print 'var CKEDITOR_BASEPATH = \''.$pathckeditor.'\';'."\n";
-                print 'var ckeditorConfig = \''.dol_buildpath($themesubdir.'/theme/'.$conf->theme.'/ckeditor/config.js'.($ext?'?'.$ext:''),1).'\';'."\n";		// $themesubdir='' in standard usage
-                print 'var ckeditorFilebrowserBrowseUrl = \''.DOL_URL_ROOT.'/core/filemanagerdol/browser/default/browser.php?Connector='.DOL_URL_ROOT.'/core/filemanagerdol/connectors/php/connector.php\';'."\n";
-                print 'var ckeditorFilebrowserImageBrowseUrl = \''.DOL_URL_ROOT.'/core/filemanagerdol/browser/default/browser.php?Type=Image&Connector='.DOL_URL_ROOT.'/core/filemanagerdol/connectors/php/connector.php\';'."\n";
-                print '</script>'."\n";
-                print '<script type="text/javascript" src="'.$pathckeditor.$jsckeditor.($ext?'?'.$ext:'').'"></script>'."\n";
-            }
-
-            // Browser notifications
-            if (! defined('DISABLE_BROWSER_NOTIF'))
-            {
-                $enablebrowsernotif=false;
-                if (! empty($conf->agenda->enabled) && ! empty($conf->global->AGENDA_REMINDER_BROWSER)) $enablebrowsernotif=true;
-                if ($conf->browser->layout == 'phone') $enablebrowsernotif=false;
-                if ($enablebrowsernotif)
-                {
-                    print '<!-- Includes JS of Dolibarr (brwoser layout = '.$conf->browser->layout.')-->'."\n";
-                    print '<script type="text/javascript" src="'.DOL_URL_ROOT.'/core/js/lib_notification.js.php'.($ext?'?'.$ext:'').'"></script>'."\n";
-                }
-            }
-
-            // Global js function
-            print '<!-- Includes JS of Dolibarr -->'."\n";
-            print '<script type="text/javascript" src="'.DOL_URL_ROOT.'/core/js/lib_head.js.php?lang='.$langs->defaultlang.($ext?'&amp;'.$ext:'').'"></script>'."\n";
-
-            // JS forced by modules (relative url starting with /)
-            if (! empty($conf->modules_parts['js']))		// $conf->modules_parts['js'] is array('module'=>array('file1','file2'))
-        	{
-        		$arrayjs=(array) $conf->modules_parts['js'];
-	            foreach($arrayjs as $modjs => $filesjs)
-	            {
-        			$filesjs=(array) $filesjs;	// To be sure filejs is an array
-		            foreach($filesjs as $jsfile)
-		            {
-	    	    		// jsfile is a relative path
-	        	    	print '<!-- Include JS added by module '.$modjs. '-->'."\n".'<script type="text/javascript" src="'.dol_buildpath($jsfile,1).'"></script>'."\n";
-		            }
-	            }
-        	}
-            // JS forced by page in top_htmlhead (relative url starting with /)
-            if (is_array($arrayofjs))
-            {
-                print '<!-- Includes JS added by page -->'."\n";
-                foreach($arrayofjs as $jsfile)
-                {
-                    if (preg_match('/^http/i',$jsfile))
-                    {
-                        print '<script type="text/javascript" src="'.$jsfile.'"></script>'."\n";
-                    }
-                    else
-                    {
-                        if (! preg_match('/^\//',$jsfile)) $jsfile='/'.$jsfile;	// For backward compatibility
-                        print '<script type="text/javascript" src="'.dol_buildpath($jsfile,1).'"></script>'."\n";
-                    }
-                }
-            }
-        }
-
-        if (! empty($head)) print $head."\n";
-        if (! empty($conf->global->MAIN_HTML_HEADER)) print $conf->global->MAIN_HTML_HEADER."\n";
-
-        print "</head>\n\n";
-    }
-
-    $conf->headerdone=1;	// To tell header was output
+			// jQuery Timepicker
+			if (! empty($conf->global->MAIN_USE_JQUERY_TIMEPICKER) || defined('REQUIRE_JQUERY_TIMEPICKER'))
+			{
+				print '<script type="text/javascript" src="'.DOL_URL_ROOT.'/includes/jquery/plugins/timepicker/jquery-ui-timepicker-addon.js'.($ext?'?'.$ext:'').'"></script>'."\n";
+				print '<script type="text/javascript" src="'.DOL_URL_ROOT.'/core/js/timepicker.js.php?lang='.$langs->defaultlang.($ext?'&amp;'.$ext:'').'"></script>'."\n";
+			}
+			if (! defined('DISABLE_SELECT2') && (! empty($conf->global->MAIN_USE_JQUERY_MULTISELECT) || defined('REQUIRE_JQUERY_MULTISELECT')))     // jQuery plugin "mutiselect", "multiple-select", "select2", ...
+			{
+				$tmpplugin=empty($conf->global->MAIN_USE_JQUERY_MULTISELECT)?constant('REQUIRE_JQUERY_MULTISELECT'):$conf->global->MAIN_USE_JQUERY_MULTISELECT;
+				print '<script type="text/javascript" src="'.DOL_URL_ROOT.'/includes/jquery/plugins/'.$tmpplugin.'/dist/js/'.$tmpplugin.'.full.min.js'.($ext?'?'.$ext:'').'"></script>'."\n";	// We include full because we need the support of containerCssClass
+			}
+		}
+
+		if (! $disablejs && ! empty($conf->use_javascript_ajax))
+		{
+			// CKEditor
+			if (! empty($conf->fckeditor->enabled) && (empty($conf->global->FCKEDITOR_EDITORNAME) || $conf->global->FCKEDITOR_EDITORNAME == 'ckeditor') && ! defined('DISABLE_CKEDITOR'))
+			{
+				print '<!-- Includes JS for CKEditor -->'."\n";
+				$pathckeditor = DOL_URL_ROOT . '/includes/ckeditor/ckeditor/';
+				$jsckeditor='ckeditor.js';
+				if (constant('JS_CKEDITOR'))	// To use external ckeditor 4 js lib
+				{
+					$pathckeditor=constant('JS_CKEDITOR');
+				}
+				print '<script type="text/javascript">';
+				print 'var CKEDITOR_BASEPATH = \''.$pathckeditor.'\';'."\n";
+				print 'var ckeditorConfig = \''.dol_buildpath($themesubdir.'/theme/'.$conf->theme.'/ckeditor/config.js'.($ext?'?'.$ext:''),1).'\';'."\n";		// $themesubdir='' in standard usage
+				print 'var ckeditorFilebrowserBrowseUrl = \''.DOL_URL_ROOT.'/core/filemanagerdol/browser/default/browser.php?Connector='.DOL_URL_ROOT.'/core/filemanagerdol/connectors/php/connector.php\';'."\n";
+				print 'var ckeditorFilebrowserImageBrowseUrl = \''.DOL_URL_ROOT.'/core/filemanagerdol/browser/default/browser.php?Type=Image&Connector='.DOL_URL_ROOT.'/core/filemanagerdol/connectors/php/connector.php\';'."\n";
+				print '</script>'."\n";
+				print '<script type="text/javascript" src="'.$pathckeditor.$jsckeditor.($ext?'?'.$ext:'').'"></script>'."\n";
+			}
+
+			// Browser notifications
+			if (! defined('DISABLE_BROWSER_NOTIF'))
+			{
+				$enablebrowsernotif=false;
+				if (! empty($conf->agenda->enabled) && ! empty($conf->global->AGENDA_REMINDER_BROWSER)) $enablebrowsernotif=true;
+				if ($conf->browser->layout == 'phone') $enablebrowsernotif=false;
+				if ($enablebrowsernotif)
+				{
+					print '<!-- Includes JS of Dolibarr (brwoser layout = '.$conf->browser->layout.')-->'."\n";
+					print '<script type="text/javascript" src="'.DOL_URL_ROOT.'/core/js/lib_notification.js.php'.($ext?'?'.$ext:'').'"></script>'."\n";
+				}
+			}
+
+			// Global js function
+			print '<!-- Includes JS of Dolibarr -->'."\n";
+			print '<script type="text/javascript" src="'.DOL_URL_ROOT.'/core/js/lib_head.js.php?lang='.$langs->defaultlang.($ext?'&amp;'.$ext:'').'"></script>'."\n";
+
+			// JS forced by modules (relative url starting with /)
+			if (! empty($conf->modules_parts['js']))		// $conf->modules_parts['js'] is array('module'=>array('file1','file2'))
+			{
+				$arrayjs=(array) $conf->modules_parts['js'];
+				foreach($arrayjs as $modjs => $filesjs)
+				{
+					$filesjs=(array) $filesjs;	// To be sure filejs is an array
+					foreach($filesjs as $jsfile)
+					{
+						// jsfile is a relative path
+						print '<!-- Include JS added by module '.$modjs. '-->'."\n".'<script type="text/javascript" src="'.dol_buildpath($jsfile,1).'"></script>'."\n";
+					}
+				}
+			}
+			// JS forced by page in top_htmlhead (relative url starting with /)
+			if (is_array($arrayofjs))
+			{
+				print '<!-- Includes JS added by page -->'."\n";
+				foreach($arrayofjs as $jsfile)
+				{
+					if (preg_match('/^http/i',$jsfile))
+					{
+						print '<script type="text/javascript" src="'.$jsfile.'"></script>'."\n";
+					}
+					else
+					{
+						if (! preg_match('/^\//',$jsfile)) $jsfile='/'.$jsfile;	// For backward compatibility
+						print '<script type="text/javascript" src="'.dol_buildpath($jsfile,1).'"></script>'."\n";
+					}
+				}
+			}
+		}
+
+		if (! empty($head)) print $head."\n";
+		if (! empty($conf->global->MAIN_HTML_HEADER)) print $conf->global->MAIN_HTML_HEADER."\n";
+
+		print "</head>\n\n";
+	}
+
+	$conf->headerdone=1;	// To tell header was output
 }
 
 

Spacing +605 added lines, -605 removed lines

@@ -35,11 +35,11 @@ 
 //@ini_set('memory_limit', '128M');	// This may be useless if memory is hard limited by your PHP
 
 // For optional tuning. Enabled if environment variable MAIN_SHOW_TUNING_INFO is defined.
-$micro_start_time=0;
-if (! empty($_SERVER['MAIN_SHOW_TUNING_INFO']))
+$micro_start_time = 0;
+if (!empty($_SERVER['MAIN_SHOW_TUNING_INFO']))
 {
 	list($usec, $sec) = explode(" ", microtime());
-	$micro_start_time=((float) $usec + (float) $sec);
+	$micro_start_time = ((float) $usec + (float) $sec);
 	// Add Xdebug code coverage
 	//define('XDEBUGCOVERAGE',1);
 	if (defined('XDEBUGCOVERAGE')) {
@@ -81,14 +81,14 @@ 
 	// For SQL Injection (only GET and POST are used to be included into bad escaped SQL requests)
 	if ($type != 2)
 	{
-		$inj += preg_match('/delete\s+from/i',	 $val);
-		$inj += preg_match('/create\s+table/i',	 $val);
-		$inj += preg_match('/update.+set.+=/i',  $val);
-		$inj += preg_match('/insert\s+into/i', 	 $val);
-		$inj += preg_match('/select.+from/i', 	 $val);
-		$inj += preg_match('/union.+select/i', 	 $val);
-		$inj += preg_match('/into\s+(outfile|dumpfile)/i',  $val);
-		$inj += preg_match('/(\.\.%2f)+/i',		 $val);
+		$inj += preg_match('/delete\s+from/i', $val);
+		$inj += preg_match('/create\s+table/i', $val);
+		$inj += preg_match('/update.+set.+=/i', $val);
+		$inj += preg_match('/insert\s+into/i', $val);
+		$inj += preg_match('/select.+from/i', $val);
+		$inj += preg_match('/union.+select/i', $val);
+		$inj += preg_match('/into\s+(outfile|dumpfile)/i', $val);
+		$inj += preg_match('/(\.\.%2f)+/i', $val);
 	}
 	// For XSS Injection done by adding javascript with script
 	// This is all cases a browser consider text is javascript:
@@ -97,23 +97,23 @@ 
 	// More on https://www.owasp.org/index.php/XSS_Filter_Evasion_Cheat_Sheet
 	$inj += preg_match('/<script/i', $val);
 	$inj += preg_match('/<iframe/i', $val);
-	$inj += preg_match('/Set\.constructor/i', $val);	// ECMA script 6
-	if (! defined('NOSTYLECHECK')) $inj += preg_match('/<style/i', $val);
+	$inj += preg_match('/Set\.constructor/i', $val); // ECMA script 6
+	if (!defined('NOSTYLECHECK')) $inj += preg_match('/<style/i', $val);
 	$inj += preg_match('/base[\s]+href/si', $val);
-	$inj += preg_match('/<.*onmouse/si', $val);       // onmousexxx can be set on img or any html tag like <img title='...' onmouseover=alert(1)>
-	$inj += preg_match('/onerror\s*=/i', $val);       // onerror can be set on img or any html tag like <img title='...' onerror = alert(1)>
-	$inj += preg_match('/onfocus\s*=/i', $val);       // onfocus can be set on input text html tag like <input type='text' value='...' onfocus = alert(1)>
-	$inj += preg_match('/onload\s*=/i', $val);        // onload can be set on svg tag <svg/onload=alert(1)> or other tag like body <body onload=alert(1)>
+	$inj += preg_match('/<.*onmouse/si', $val); // onmousexxx can be set on img or any html tag like <img title='...' onmouseover=alert(1)>
+	$inj += preg_match('/onerror\s*=/i', $val); // onerror can be set on img or any html tag like <img title='...' onerror = alert(1)>
+	$inj += preg_match('/onfocus\s*=/i', $val); // onfocus can be set on input text html tag like <input type='text' value='...' onfocus = alert(1)>
+	$inj += preg_match('/onload\s*=/i', $val); // onload can be set on svg tag <svg/onload=alert(1)> or other tag like body <body onload=alert(1)>
 	//$inj += preg_match('/on[A-Z][a-z]+\*=/', $val);   // To lock event handlers onAbort(), ...
-	$inj += preg_match('/&#58;|&#0000058|&#x3A/i', $val);		// refused string ':' encoded (no reason to have it encoded) to lock 'javascript:...'
+	$inj += preg_match('/&#58;|&#0000058|&#x3A/i', $val); // refused string ':' encoded (no reason to have it encoded) to lock 'javascript:...'
 	//if ($type == 1)
 	//{
 		$inj += preg_match('/javascript:/i', $val);
 		$inj += preg_match('/vbscript:/i', $val);
 	//}
 	// For XSS Injection done by adding javascript closing html tags like with onmousemove, etc... (closing a src or href tag with not cleaned param)
-	if ($type == 1) $inj += preg_match('/"/i', $val);		// We refused " in GET parameters value
-	if ($type == 2) $inj += preg_match('/[;"]/', $val);		// PHP_SELF is a file system path. It can contains spaces.
+	if ($type == 1) $inj += preg_match('/"/i', $val); // We refused " in GET parameters value
+	if ($type == 2) $inj += preg_match('/[;"]/', $val); // PHP_SELF is a file system path. It can contains spaces.
 	return $inj;
 }
 
@@ -130,7 +130,7 @@ 
 	{
 		foreach ($var as $key => $value)
 		{
-			if (analyseVarsForSqlAndScriptsInjection($value,$type))
+			if (analyseVarsForSqlAndScriptsInjection($value, $type))
 			{
 				$var[$key] = $value;
 			}
@@ -144,36 +144,36 @@ 
 	}
 	else
 	{
-		return (test_sql_and_script_inject($var,$type) <= 0);
+		return (test_sql_and_script_inject($var, $type) <= 0);
 	}
 }
 
 
 // Check consistency of NOREQUIREXXX DEFINES
-if ((defined('NOREQUIREDB') || defined('NOREQUIRETRAN')) && ! defined('NOREQUIREMENU')) dol_print_error('','If define NOREQUIREDB or NOREQUIRETRAN are set, you must also set NOREQUIREMENU or not use them');
+if ((defined('NOREQUIREDB') || defined('NOREQUIRETRAN')) && !defined('NOREQUIREMENU')) dol_print_error('', 'If define NOREQUIREDB or NOREQUIRETRAN are set, you must also set NOREQUIREMENU or not use them');
 
 // Sanity check on URL
-if (! empty($_SERVER["PHP_SELF"]))
+if (!empty($_SERVER["PHP_SELF"]))
 {
-	$morevaltochecklikepost=array($_SERVER["PHP_SELF"]);
-	analyseVarsForSqlAndScriptsInjection($morevaltochecklikepost,2);
+	$morevaltochecklikepost = array($_SERVER["PHP_SELF"]);
+	analyseVarsForSqlAndScriptsInjection($morevaltochecklikepost, 2);
 }
 // Sanity check on GET parameters
-if (! defined('NOSCANGETFORINJECTION') && ! empty($_SERVER["QUERY_STRING"]))
+if (!defined('NOSCANGETFORINJECTION') && !empty($_SERVER["QUERY_STRING"]))
 {
-	$morevaltochecklikeget=array($_SERVER["QUERY_STRING"]);
-	analyseVarsForSqlAndScriptsInjection($morevaltochecklikeget,1);
+	$morevaltochecklikeget = array($_SERVER["QUERY_STRING"]);
+	analyseVarsForSqlAndScriptsInjection($morevaltochecklikeget, 1);
 }
 // Sanity check on POST
-if (! defined('NOSCANPOSTFORINJECTION'))
+if (!defined('NOSCANPOSTFORINJECTION'))
 {
-	analyseVarsForSqlAndScriptsInjection($_POST,0);
+	analyseVarsForSqlAndScriptsInjection($_POST, 0);
 }
 
 // This is to make Dolibarr working with Plesk
-if (! empty($_SERVER['DOCUMENT_ROOT']) && substr($_SERVER['DOCUMENT_ROOT'], -6) !== 'htdocs')
+if (!empty($_SERVER['DOCUMENT_ROOT']) && substr($_SERVER['DOCUMENT_ROOT'], -6) !== 'htdocs')
 {
-	set_include_path($_SERVER['DOCUMENT_ROOT'] . '/htdocs');
+	set_include_path($_SERVER['DOCUMENT_ROOT'].'/htdocs');
 }
 
 // Include the conf.php and functions.lib.php
@@ -182,34 +182,34 @@ 
 // If there is a POST parameter to tell to save automatically some POST parameters into cookies, we do it.
 // This is used for example by form of boxes to save personalization of some options.
 // DOL_AUTOSET_COOKIE=cookiename:val1,val2 and  cookiename_val1=aaa cookiename_val2=bbb will set cookie_name with value json_encode(array('val1'=> , ))
-if (! empty($_POST["DOL_AUTOSET_COOKIE"]))
+if (!empty($_POST["DOL_AUTOSET_COOKIE"]))
 {
-	$tmpautoset=explode(':',$_POST["DOL_AUTOSET_COOKIE"],2);
-	$tmplist=explode(',',$tmpautoset[1]);
-	$cookiearrayvalue='';
+	$tmpautoset = explode(':', $_POST["DOL_AUTOSET_COOKIE"], 2);
+	$tmplist = explode(',', $tmpautoset[1]);
+	$cookiearrayvalue = '';
 	foreach ($tmplist as $tmpkey)
 	{
-		$postkey=$tmpautoset[0].'_'.$tmpkey;
+		$postkey = $tmpautoset[0].'_'.$tmpkey;
 		//var_dump('tmpkey='.$tmpkey.' postkey='.$postkey.' value='.$_POST[$postkey]);
-		if (! empty($_POST[$postkey])) $cookiearrayvalue[$tmpkey]=$_POST[$postkey];
+		if (!empty($_POST[$postkey])) $cookiearrayvalue[$tmpkey] = $_POST[$postkey];
 	}
-	$cookiename=$tmpautoset[0];
-	$cookievalue=json_encode($cookiearrayvalue);
+	$cookiename = $tmpautoset[0];
+	$cookievalue = json_encode($cookiearrayvalue);
 	//var_dump('setcookie cookiename='.$cookiename.' cookievalue='.$cookievalue);
-	setcookie($cookiename, empty($cookievalue)?'':$cookievalue, empty($cookievalue)?0:(time()+(86400*354)), '/', null, false, true);	// keep cookie 1 year and add tag httponly
+	setcookie($cookiename, empty($cookievalue) ? '' : $cookievalue, empty($cookievalue) ? 0 : (time() + (86400 * 354)), '/', null, false, true); // keep cookie 1 year and add tag httponly
 	if (empty($cookievalue)) unset($_COOKIE[$cookiename]);
 }
 
 // Init session. Name of session is specific to Dolibarr instance.
-$prefix=dol_getprefix();
-$sessionname='DOLSESSID_'.$prefix;
-$sessiontimeout='DOLSESSTIMEOUT_'.$prefix;
-if (! empty($_COOKIE[$sessiontimeout])) ini_set('session.gc_maxlifetime',$_COOKIE[$sessiontimeout]);
+$prefix = dol_getprefix();
+$sessionname = 'DOLSESSID_'.$prefix;
+$sessiontimeout = 'DOLSESSTIMEOUT_'.$prefix;
+if (!empty($_COOKIE[$sessiontimeout])) ini_set('session.gc_maxlifetime', $_COOKIE[$sessiontimeout]);
 session_name($sessionname);
-session_set_cookie_params(0, '/', null, false, true);   // Add tag httponly on session cookie (same as setting session.cookie_httponly into php.ini). Must be called before the session_start.
+session_set_cookie_params(0, '/', null, false, true); // Add tag httponly on session cookie (same as setting session.cookie_httponly into php.ini). Must be called before the session_start.
 // This create lock released until session_write_close() or end of page.
 // We need this lock as long as we read/write $_SESSION ['vars']. We can close released when finished.
-if (! defined('NOSESSION'))
+if (!defined('NOSESSION'))
 {
 	session_start();
 	if (ini_get('register_globals'))    // Deprecated in 5.3 and removed in 5.4. To solve bug in using $_SESSION
@@ -230,42 +230,42 @@ 
 // Detection browser
 if (isset($_SERVER["HTTP_USER_AGENT"]))
 {
-	$tmp=getBrowserInfo($_SERVER["HTTP_USER_AGENT"]);
-	$conf->browser->name=$tmp['browsername'];
-	$conf->browser->os=$tmp['browseros'];
-	$conf->browser->version=$tmp['browserversion'];
-	$conf->browser->layout=$tmp['layout'];     // 'classic', 'phone', 'tablet'
-	$conf->browser->phone=$tmp['phone'];	   // TODO deprecated, use ->layout
-	$conf->browser->tablet=$tmp['tablet'];	   // TODO deprecated, use ->layout
+	$tmp = getBrowserInfo($_SERVER["HTTP_USER_AGENT"]);
+	$conf->browser->name = $tmp['browsername'];
+	$conf->browser->os = $tmp['browseros'];
+	$conf->browser->version = $tmp['browserversion'];
+	$conf->browser->layout = $tmp['layout']; // 'classic', 'phone', 'tablet'
+	$conf->browser->phone = $tmp['phone']; // TODO deprecated, use ->layout
+	$conf->browser->tablet = $tmp['tablet']; // TODO deprecated, use ->layout
 	//var_dump($conf->browser);
 
-	if ($conf->browser->layout == 'phone') $conf->dol_no_mouse_hover=1;
-	if ($conf->browser->layout == 'phone') $conf->global->MAIN_TESTMENUHIDER=1;
+	if ($conf->browser->layout == 'phone') $conf->dol_no_mouse_hover = 1;
+	if ($conf->browser->layout == 'phone') $conf->global->MAIN_TESTMENUHIDER = 1;
 }
 
 // Force HTTPS if required ($conf->file->main_force_https is 0/1 or https dolibarr root url)
 // $_SERVER["HTTPS"] is 'on' when link is https, otherwise $_SERVER["HTTPS"] is empty or 'off'
-if (! empty($conf->file->main_force_https) && (empty($_SERVER["HTTPS"]) || $_SERVER["HTTPS"] != 'on'))
+if (!empty($conf->file->main_force_https) && (empty($_SERVER["HTTPS"]) || $_SERVER["HTTPS"] != 'on'))
 {
-	$newurl='';
+	$newurl = '';
 	if (is_numeric($conf->file->main_force_https))
 	{
-		if ($conf->file->main_force_https == '1' && ! empty($_SERVER["SCRIPT_URI"]))	// If SCRIPT_URI supported by server
+		if ($conf->file->main_force_https == '1' && !empty($_SERVER["SCRIPT_URI"]))	// If SCRIPT_URI supported by server
 		{
-			if (preg_match('/^http:/i',$_SERVER["SCRIPT_URI"]) && ! preg_match('/^https:/i',$_SERVER["SCRIPT_URI"]))	// If link is http
+			if (preg_match('/^http:/i', $_SERVER["SCRIPT_URI"]) && !preg_match('/^https:/i', $_SERVER["SCRIPT_URI"]))	// If link is http
 			{
-				$newurl=preg_replace('/^http:/i','https:',$_SERVER["SCRIPT_URI"]);
+				$newurl = preg_replace('/^http:/i', 'https:', $_SERVER["SCRIPT_URI"]);
 			}
 		}
 		else	// Check HTTPS environment variable (Apache/mod_ssl only)
 		{
-			$newurl=preg_replace('/^http:/i','https:',DOL_MAIN_URL_ROOT).$_SERVER["REQUEST_URI"];
+			$newurl = preg_replace('/^http:/i', 'https:', DOL_MAIN_URL_ROOT).$_SERVER["REQUEST_URI"];
 		}
 	}
 	else
 	{
 		// Check HTTPS environment variable (Apache/mod_ssl only)
-		$newurl=$conf->file->main_force_https.$_SERVER["REQUEST_URI"];
+		$newurl = $conf->file->main_force_https.$_SERVER["REQUEST_URI"];
 	}
 	// Start redirect
 	if ($newurl)
@@ -282,25 +282,25 @@ 
 
 
 // Loading of additional presentation includes
-if (! defined('NOREQUIREHTML')) require_once DOL_DOCUMENT_ROOT .'/core/class/html.form.class.php';	    // Need 660ko memory (800ko in 2.2)
-if (! defined('NOREQUIREAJAX') && $conf->use_javascript_ajax) require_once DOL_DOCUMENT_ROOT.'/core/lib/ajax.lib.php';	// Need 22ko memory
+if (!defined('NOREQUIREHTML')) require_once DOL_DOCUMENT_ROOT.'/core/class/html.form.class.php'; // Need 660ko memory (800ko in 2.2)
+if (!defined('NOREQUIREAJAX') && $conf->use_javascript_ajax) require_once DOL_DOCUMENT_ROOT.'/core/lib/ajax.lib.php'; // Need 22ko memory
 
 // If install or upgrade process not done or not completely finished, we call the install page.
-if (! empty($conf->global->MAIN_NOT_INSTALLED) || ! empty($conf->global->MAIN_NOT_UPGRADED))
+if (!empty($conf->global->MAIN_NOT_INSTALLED) || !empty($conf->global->MAIN_NOT_UPGRADED))
 {
 	dol_syslog("main.inc: A previous install or upgrade was not complete. Redirect to install page.", LOG_WARNING);
 	header("Location: ".DOL_URL_ROOT."/install/index.php");
 	exit;
 }
 // If an upgrade process is required, we call the install page.
-if ((! empty($conf->global->MAIN_VERSION_LAST_UPGRADE) && ($conf->global->MAIN_VERSION_LAST_UPGRADE != DOL_VERSION))
-|| (empty($conf->global->MAIN_VERSION_LAST_UPGRADE) && ! empty($conf->global->MAIN_VERSION_LAST_INSTALL) && ($conf->global->MAIN_VERSION_LAST_INSTALL != DOL_VERSION)))
+if ((!empty($conf->global->MAIN_VERSION_LAST_UPGRADE) && ($conf->global->MAIN_VERSION_LAST_UPGRADE != DOL_VERSION))
+|| (empty($conf->global->MAIN_VERSION_LAST_UPGRADE) && !empty($conf->global->MAIN_VERSION_LAST_INSTALL) && ($conf->global->MAIN_VERSION_LAST_INSTALL != DOL_VERSION)))
 {
-	$versiontocompare=empty($conf->global->MAIN_VERSION_LAST_UPGRADE)?$conf->global->MAIN_VERSION_LAST_INSTALL:$conf->global->MAIN_VERSION_LAST_UPGRADE;
-	require_once DOL_DOCUMENT_ROOT .'/core/lib/admin.lib.php';
-	$dolibarrversionlastupgrade=preg_split('/[.-]/',$versiontocompare);
-	$dolibarrversionprogram=preg_split('/[.-]/',DOL_VERSION);
-	$rescomp=versioncompare($dolibarrversionprogram,$dolibarrversionlastupgrade);
+	$versiontocompare = empty($conf->global->MAIN_VERSION_LAST_UPGRADE) ? $conf->global->MAIN_VERSION_LAST_INSTALL : $conf->global->MAIN_VERSION_LAST_UPGRADE;
+	require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php';
+	$dolibarrversionlastupgrade = preg_split('/[.-]/', $versiontocompare);
+	$dolibarrversionprogram = preg_split('/[.-]/', DOL_VERSION);
+	$rescomp = versioncompare($dolibarrversionprogram, $dolibarrversionlastupgrade);
 	if ($rescomp > 0)   // Programs have a version higher than database. We did not add "&& $rescomp < 3" because we want upgrade process for build upgrades
 	{
 		dol_syslog("main.inc: database version ".$versiontocompare." is lower than programs version ".DOL_VERSION.". Redirect to install page.", LOG_WARNING);
@@ -310,18 +310,18 @@ 
 }
 
 // Creation of a token against CSRF vulnerabilities
-if (! defined('NOTOKENRENEWAL'))
+if (!defined('NOTOKENRENEWAL'))
 {
 	// roulement des jetons car cree a chaque appel
 	if (isset($_SESSION['newtoken'])) $_SESSION['token'] = $_SESSION['newtoken'];
 
 	// Save in $_SESSION['newtoken'] what will be next token. Into forms, we will add param token = $_SESSION['newtoken']
-	$token = dol_hash(uniqid(mt_rand(),TRUE)); // Generates a hash of a random number
+	$token = dol_hash(uniqid(mt_rand(), TRUE)); // Generates a hash of a random number
 	$_SESSION['newtoken'] = $token;
 }
-if (! defined('NOCSRFCHECK') && empty($dolibarr_nocsrfcheck) && ! empty($conf->global->MAIN_SECURITY_CSRF_WITH_TOKEN))	// Check validity of token, only if option enabled (this option breaks some features sometimes)
+if (!defined('NOCSRFCHECK') && empty($dolibarr_nocsrfcheck) && !empty($conf->global->MAIN_SECURITY_CSRF_WITH_TOKEN))	// Check validity of token, only if option enabled (this option breaks some features sometimes)
 {
-	if ($_SERVER['REQUEST_METHOD'] == 'POST' && ! GETPOST('token','alpha')) // Note, offender can still send request by GET
+	if ($_SERVER['REQUEST_METHOD'] == 'POST' && !GETPOST('token', 'alpha')) // Note, offender can still send request by GET
 	{
 		print "Access refused by CSRF protection in main.inc.php. Token not provided.\n";
 		print "If you access your server behind a proxy using url rewriting, you might check that all HTTP header is propagated (or add the line \$dolibarr_nocsrfcheck=1 into your conf.php file).\n";
@@ -331,7 +331,7 @@ 
 	{
 		if (GETPOST('token', 'alpha') != $_SESSION['token'])
 		{
-			dol_syslog("Invalid token in ".$_SERVER['HTTP_REFERER'].", action=".GETPOST('action','aZ09').", _POST['token']=".GETPOST('token','alpha').", _SESSION['token']=".$_SESSION['token'], LOG_WARNING);
+			dol_syslog("Invalid token in ".$_SERVER['HTTP_REFERER'].", action=".GETPOST('action', 'aZ09').", _POST['token']=".GETPOST('token', 'alpha').", _SESSION['token']=".$_SESSION['token'], LOG_WARNING);
 			//print 'Unset POST by CSRF protection in main.inc.php.';	// Do not output anything because this create problems when using the BACK button on browsers.
 			unset($_POST);
 		}
@@ -339,20 +339,20 @@ 
 }
 
 // Disable modules (this must be after session_start and after conf has been loaded)
-if (GETPOST('disablemodules','alpha'))  $_SESSION["disablemodules"]=GETPOST('disablemodules','alpha');
-if (! empty($_SESSION["disablemodules"]))
+if (GETPOST('disablemodules', 'alpha'))  $_SESSION["disablemodules"] = GETPOST('disablemodules', 'alpha');
+if (!empty($_SESSION["disablemodules"]))
 {
-	$disabled_modules=explode(',',$_SESSION["disablemodules"]);
-	foreach($disabled_modules as $module)
+	$disabled_modules = explode(',', $_SESSION["disablemodules"]);
+	foreach ($disabled_modules as $module)
 	{
 		if ($module)
 		{
-			if (empty($conf->$module)) $conf->$module=new stdClass();
-			$conf->$module->enabled=false;
+			if (empty($conf->$module)) $conf->$module = new stdClass();
+			$conf->$module->enabled = false;
 			if ($module == 'fournisseur')		// Special case
 			{
-				$conf->supplier_order->enabled=0;
-				$conf->supplier_invoice->enabled=0;
+				$conf->supplier_order->enabled = 0;
+				$conf->supplier_invoice->enabled = 0;
 			}
 		}
 	}
@@ -362,120 +362,120 @@ 
 /*
  * Phase authentication / login
  */
-$login='';
-if (! defined('NOLOGIN'))
+$login = '';
+if (!defined('NOLOGIN'))
 {
 	// $authmode lists the different means of identification to be tested in order of preference.
 	// Example: 'http', 'dolibarr', 'ldap', 'http,forceuser'
 
 	// Authentication mode
-	if (empty($dolibarr_main_authentication)) $dolibarr_main_authentication='http,dolibarr';
+	if (empty($dolibarr_main_authentication)) $dolibarr_main_authentication = 'http,dolibarr';
 	// Authentication mode: forceuser
-	if ($dolibarr_main_authentication == 'forceuser' && empty($dolibarr_auto_user)) $dolibarr_auto_user='auto';
+	if ($dolibarr_main_authentication == 'forceuser' && empty($dolibarr_auto_user)) $dolibarr_auto_user = 'auto';
 	// Set authmode
-	$authmode=explode(',',$dolibarr_main_authentication);
+	$authmode = explode(',', $dolibarr_main_authentication);
 
 	// No authentication mode
-	if (! count($authmode))
+	if (!count($authmode))
 	{
 		$langs->load('main');
-		dol_print_error('',$langs->trans("ErrorConfigParameterNotDefined",'dolibarr_main_authentication'));
+		dol_print_error('', $langs->trans("ErrorConfigParameterNotDefined", 'dolibarr_main_authentication'));
 		exit;
 	}
 
 	// If login request was already post, we retrieve login from the session
 	// Call module if not realized that his request.
 	// At the end of this phase, the variable $login is defined.
-	$resultFetchUser='';
-	$test=true;
-	if (! isset($_SESSION["dol_login"]))
+	$resultFetchUser = '';
+	$test = true;
+	if (!isset($_SESSION["dol_login"]))
 	{
 		// It is not already authenticated and it requests the login / password
 		include_once DOL_DOCUMENT_ROOT.'/core/lib/security2.lib.php';
 
-		$dol_dst_observed=GETPOST("dst_observed",'int',3);
-		$dol_dst_first=GETPOST("dst_first",'int',3);
-		$dol_dst_second=GETPOST("dst_second",'int',3);
-		$dol_screenwidth=GETPOST("screenwidth",'int',3);
-		$dol_screenheight=GETPOST("screenheight",'int',3);
-		$dol_hide_topmenu=GETPOST('dol_hide_topmenu','int',3);
-		$dol_hide_leftmenu=GETPOST('dol_hide_leftmenu','int',3);
-		$dol_optimize_smallscreen=GETPOST('dol_optimize_smallscreen','int',3);
-		$dol_no_mouse_hover=GETPOST('dol_no_mouse_hover','int',3);
-		$dol_use_jmobile=GETPOST('dol_use_jmobile','int',3);
+		$dol_dst_observed = GETPOST("dst_observed", 'int', 3);
+		$dol_dst_first = GETPOST("dst_first", 'int', 3);
+		$dol_dst_second = GETPOST("dst_second", 'int', 3);
+		$dol_screenwidth = GETPOST("screenwidth", 'int', 3);
+		$dol_screenheight = GETPOST("screenheight", 'int', 3);
+		$dol_hide_topmenu = GETPOST('dol_hide_topmenu', 'int', 3);
+		$dol_hide_leftmenu = GETPOST('dol_hide_leftmenu', 'int', 3);
+		$dol_optimize_smallscreen = GETPOST('dol_optimize_smallscreen', 'int', 3);
+		$dol_no_mouse_hover = GETPOST('dol_no_mouse_hover', 'int', 3);
+		$dol_use_jmobile = GETPOST('dol_use_jmobile', 'int', 3);
 		//dol_syslog("POST key=".join(array_keys($_POST),',').' value='.join($_POST,','));
 
 		// If in demo mode, we check we go to home page through the public/demo/index.php page
-		if (! empty($dolibarr_main_demo) && $_SERVER['PHP_SELF'] == DOL_URL_ROOT.'/index.php')  // We ask index page
+		if (!empty($dolibarr_main_demo) && $_SERVER['PHP_SELF'] == DOL_URL_ROOT.'/index.php')  // We ask index page
 		{
-			if (empty($_SERVER['HTTP_REFERER']) || ! preg_match('/public/',$_SERVER['HTTP_REFERER']))
+			if (empty($_SERVER['HTTP_REFERER']) || !preg_match('/public/', $_SERVER['HTTP_REFERER']))
 			{
 				dol_syslog("Call index page from another url than demo page (call is done from page ".$_SERVER['HTTP_REFERER'].")");
-				$url='';
-				$url.=($url?'&':'').($dol_hide_topmenu?'dol_hide_topmenu='.$dol_hide_topmenu:'');
-				$url.=($url?'&':'').($dol_hide_leftmenu?'dol_hide_leftmenu='.$dol_hide_leftmenu:'');
-				$url.=($url?'&':'').($dol_optimize_smallscreen?'dol_optimize_smallscreen='.$dol_optimize_smallscreen:'');
-				$url.=($url?'&':'').($dol_no_mouse_hover?'dol_no_mouse_hover='.$dol_no_mouse_hover:'');
-				$url.=($url?'&':'').($dol_use_jmobile?'dol_use_jmobile='.$dol_use_jmobile:'');
-				$url=DOL_URL_ROOT.'/public/demo/index.php'.($url?'?'.$url:'');
+				$url = '';
+				$url .= ($url ? '&' : '').($dol_hide_topmenu ? 'dol_hide_topmenu='.$dol_hide_topmenu : '');
+				$url .= ($url ? '&' : '').($dol_hide_leftmenu ? 'dol_hide_leftmenu='.$dol_hide_leftmenu : '');
+				$url .= ($url ? '&' : '').($dol_optimize_smallscreen ? 'dol_optimize_smallscreen='.$dol_optimize_smallscreen : '');
+				$url .= ($url ? '&' : '').($dol_no_mouse_hover ? 'dol_no_mouse_hover='.$dol_no_mouse_hover : '');
+				$url .= ($url ? '&' : '').($dol_use_jmobile ? 'dol_use_jmobile='.$dol_use_jmobile : '');
+				$url = DOL_URL_ROOT.'/public/demo/index.php'.($url ? '?'.$url : '');
 				header("Location: ".$url);
 				exit;
 			}
 		}
 
 		// Verification security graphic code
-		if (GETPOST("username","alpha",2) && ! empty($conf->global->MAIN_SECURITY_ENABLECAPTCHA))
+		if (GETPOST("username", "alpha", 2) && !empty($conf->global->MAIN_SECURITY_ENABLECAPTCHA))
 		{
 			$sessionkey = 'dol_antispam_value';
-			$ok=(array_key_exists($sessionkey, $_SESSION) === TRUE && (strtolower($_SESSION[$sessionkey]) == strtolower($_POST['code'])));
+			$ok = (array_key_exists($sessionkey, $_SESSION) === TRUE && (strtolower($_SESSION[$sessionkey]) == strtolower($_POST['code'])));
 
 			// Check code
-			if (! $ok)
+			if (!$ok)
 			{
 				dol_syslog('Bad value for code, connexion refused');
 				$langs->load('main');
 				$langs->load('errors');
 
-				$_SESSION["dol_loginmesg"]=$langs->trans("ErrorBadValueForCode");
-				$test=false;
+				$_SESSION["dol_loginmesg"] = $langs->trans("ErrorBadValueForCode");
+				$test = false;
 
 				// TODO @deprecated Remove this. Hook must be used, not this trigger.
-				$user->trigger_mesg='ErrorBadValueForCode - login='.GETPOST("username","alpha",2);
+				$user->trigger_mesg = 'ErrorBadValueForCode - login='.GETPOST("username", "alpha", 2);
 				// Call of triggers
-				include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php';
-				$interface=new Interfaces($db);
-				$result=$interface->run_triggers('USER_LOGIN_FAILED',$user,$user,$langs,$conf);
+				include_once DOL_DOCUMENT_ROOT.'/core/class/interfaces.class.php';
+				$interface = new Interfaces($db);
+				$result = $interface->run_triggers('USER_LOGIN_FAILED', $user, $user, $langs, $conf);
 				if ($result < 0) {
 					$error++;
 				}
 				// End Call of triggers
 
 				// Hooks on failed login
-				$action='';
+				$action = '';
 				$hookmanager->initHooks(array('login'));
-				$parameters=array('dol_authmode'=>$dol_authmode, 'dol_loginmesg'=>$_SESSION["dol_loginmesg"]);
-				$reshook=$hookmanager->executeHooks('afterLoginFailed',$parameters,$user,$action);    // Note that $action and $object may have been modified by some hooks
+				$parameters = array('dol_authmode'=>$dol_authmode, 'dol_loginmesg'=>$_SESSION["dol_loginmesg"]);
+				$reshook = $hookmanager->executeHooks('afterLoginFailed', $parameters, $user, $action); // Note that $action and $object may have been modified by some hooks
 				if ($reshook < 0) $error++;
 
 				// Note: exit is done later
 			}
 		}
 
-		$usertotest		= (! empty($_COOKIE['login_dolibarr']) ? $_COOKIE['login_dolibarr'] : GETPOST("username","alpha",2));
-		$passwordtotest	= GETPOST('password','none',2);
-		$entitytotest	= (GETPOST('entity','int') ? GETPOST('entity','int') : (!empty($conf->entity) ? $conf->entity : 1));
+		$usertotest = (!empty($_COOKIE['login_dolibarr']) ? $_COOKIE['login_dolibarr'] : GETPOST("username", "alpha", 2));
+		$passwordtotest = GETPOST('password', 'none', 2);
+		$entitytotest = (GETPOST('entity', 'int') ? GETPOST('entity', 'int') : (!empty($conf->entity) ? $conf->entity : 1));
 
 		// Define if we received data to test the login.
-		$goontestloop=false;
-		if (isset($_SERVER["REMOTE_USER"]) && in_array('http',$authmode)) $goontestloop=true;
-		if ($dolibarr_main_authentication == 'forceuser' && ! empty($dolibarr_auto_user)) $goontestloop=true;
-		if (GETPOST("username","alpha",2) || ! empty($_COOKIE['login_dolibarr']) || GETPOST('openid_mode','alpha',1)) $goontestloop=true;
+		$goontestloop = false;
+		if (isset($_SERVER["REMOTE_USER"]) && in_array('http', $authmode)) $goontestloop = true;
+		if ($dolibarr_main_authentication == 'forceuser' && !empty($dolibarr_auto_user)) $goontestloop = true;
+		if (GETPOST("username", "alpha", 2) || !empty($_COOKIE['login_dolibarr']) || GETPOST('openid_mode', 'alpha', 1)) $goontestloop = true;
 
-		if (! is_object($langs)) // This can occurs when calling page with NOREQUIRETRAN defined, however we need langs for error messages.
+		if (!is_object($langs)) // This can occurs when calling page with NOREQUIRETRAN defined, however we need langs for error messages.
 		{
 			include_once DOL_DOCUMENT_ROOT.'/core/class/translate.class.php';
-			$langs=new Translate("",$conf);
-			$langcode=(GETPOST('lang','aZ09',1)?GETPOST('lang','aZ09',1):(empty($conf->global->MAIN_LANG_DEFAULT)?'auto':$conf->global->MAIN_LANG_DEFAULT));
+			$langs = new Translate("", $conf);
+			$langcode = (GETPOST('lang', 'aZ09', 1) ?GETPOST('lang', 'aZ09', 1) : (empty($conf->global->MAIN_LANG_DEFAULT) ? 'auto' : $conf->global->MAIN_LANG_DEFAULT));
 			$langs->setDefaultLang($langcode);
 		}
 
@@ -484,53 +484,53 @@ 
 		// If error, we will put error message in session under the name dol_loginmesg
 		if ($test && $goontestloop)
 		{
-			$login = checkLoginPassEntity($usertotest,$passwordtotest,$entitytotest,$authmode);
+			$login = checkLoginPassEntity($usertotest, $passwordtotest, $entitytotest, $authmode);
 			if ($login)
 			{
-				$dol_authmode=$conf->authmode;	// This properties is defined only when logged, to say what mode was successfully used
-				$dol_tz=$_POST["tz"];
-				$dol_tz_string=$_POST["tz_string"];
-				$dol_tz_string=preg_replace('/\s*\(.+\)$/','',$dol_tz_string);
-				$dol_tz_string=preg_replace('/,/','/',$dol_tz_string);
-				$dol_tz_string=preg_replace('/\s/','_',$dol_tz_string);
-				$dol_dst=0;
+				$dol_authmode = $conf->authmode; // This properties is defined only when logged, to say what mode was successfully used
+				$dol_tz = $_POST["tz"];
+				$dol_tz_string = $_POST["tz_string"];
+				$dol_tz_string = preg_replace('/\s*\(.+\)$/', '', $dol_tz_string);
+				$dol_tz_string = preg_replace('/,/', '/', $dol_tz_string);
+				$dol_tz_string = preg_replace('/\s/', '_', $dol_tz_string);
+				$dol_dst = 0;
 				if (isset($_POST["dst_first"]) && isset($_POST["dst_second"]))
 				{
 					include_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
-					$datenow=dol_now();
-					$datefirst=dol_stringtotime($_POST["dst_first"]);
-					$datesecond=dol_stringtotime($_POST["dst_second"]);
-					if ($datenow >= $datefirst && $datenow < $datesecond) $dol_dst=1;
+					$datenow = dol_now();
+					$datefirst = dol_stringtotime($_POST["dst_first"]);
+					$datesecond = dol_stringtotime($_POST["dst_second"]);
+					if ($datenow >= $datefirst && $datenow < $datesecond) $dol_dst = 1;
 				}
 				//print $datefirst.'-'.$datesecond.'-'.$datenow.'-'.$dol_tz.'-'.$dol_tzstring.'-'.$dol_dst; exit;
 			}
 
-			if (! $login)
+			if (!$login)
 			{
-				dol_syslog('Bad password, connexion refused',LOG_DEBUG);
+				dol_syslog('Bad password, connexion refused', LOG_DEBUG);
 				$langs->load('main');
 				$langs->load('errors');
 
 				// Bad password. No authmode has found a good password.
 				// We set a generic message if not defined inside function checkLoginPassEntity or subfunctions
-				if (empty($_SESSION["dol_loginmesg"])) $_SESSION["dol_loginmesg"]=$langs->trans("ErrorBadLoginPassword");
+				if (empty($_SESSION["dol_loginmesg"])) $_SESSION["dol_loginmesg"] = $langs->trans("ErrorBadLoginPassword");
 
 				// TODO @deprecated Remove this. Hook must be used, not this trigger.
-				$user->trigger_mesg=$langs->trans("ErrorBadLoginPassword").' - login='.GETPOST("username","alpha",2);
+				$user->trigger_mesg = $langs->trans("ErrorBadLoginPassword").' - login='.GETPOST("username", "alpha", 2);
 				// Call of triggers
 				include_once DOL_DOCUMENT_ROOT.'/core/class/interfaces.class.php';
-				$interface=new Interfaces($db);
-				$result=$interface->run_triggers('USER_LOGIN_FAILED',$user,$user,$langs,$conf,GETPOST("username","alpha",2));
+				$interface = new Interfaces($db);
+				$result = $interface->run_triggers('USER_LOGIN_FAILED', $user, $user, $langs, $conf, GETPOST("username", "alpha", 2));
 				if ($result < 0) {
 					$error++;
 				}
 				// End Call of triggers
 
 				// Hooks on failed login
-				$action='';
+				$action = '';
 				$hookmanager->initHooks(array('login'));
-				$parameters=array('dol_authmode'=>$dol_authmode, 'dol_loginmesg'=>$_SESSION["dol_loginmesg"]);
-				$reshook=$hookmanager->executeHooks('afterLoginFailed',$parameters,$user,$action);    // Note that $action and $object may have been modified by some hooks
+				$parameters = array('dol_authmode'=>$dol_authmode, 'dol_loginmesg'=>$_SESSION["dol_loginmesg"]);
+				$reshook = $hookmanager->executeHooks('afterLoginFailed', $parameters, $user, $action); // Note that $action and $object may have been modified by some hooks
 				if ($reshook < 0) $error++;
 
 				// Note: exit is done in next chapter
@@ -538,123 +538,123 @@ 
 		}
 
 		// End test login / passwords
-		if (! $login || (in_array('ldap',$authmode) && empty($passwordtotest)))	// With LDAP we refused empty password because some LDAP are "opened" for anonymous access so connexion is a success.
+		if (!$login || (in_array('ldap', $authmode) && empty($passwordtotest)))	// With LDAP we refused empty password because some LDAP are "opened" for anonymous access so connexion is a success.
 		{
 			// No data to test login, so we show the login page
 			dol_syslog("--- Access to ".$_SERVER["PHP_SELF"]." showing the login form and exit");
 			if (defined('NOREDIRECTBYMAINTOLOGIN')) return 'ERROR_NOT_LOGGED';
-			else dol_loginfunction($langs,$conf,(! empty($mysoc)?$mysoc:''));
+			else dol_loginfunction($langs, $conf, (!empty($mysoc) ? $mysoc : ''));
 			exit;
 		}
 
-		$resultFetchUser=$user->fetch('', $login, '', 1, ($entitytotest > 0 ? $entitytotest : -1));
+		$resultFetchUser = $user->fetch('', $login, '', 1, ($entitytotest > 0 ? $entitytotest : -1));
 		if ($resultFetchUser <= 0)
 		{
 			dol_syslog('User not found, connexion refused');
 			session_destroy();
 			session_name($sessionname);
-			session_set_cookie_params(0, '/', null, false, true);   // Add tag httponly on session cookie
-			session_start();    // Fixing the bug of register_globals here is useless since session is empty
+			session_set_cookie_params(0, '/', null, false, true); // Add tag httponly on session cookie
+			session_start(); // Fixing the bug of register_globals here is useless since session is empty
 
 			if ($resultFetchUser == 0)
 			{
 				$langs->load('main');
 				$langs->load('errors');
 
-				$_SESSION["dol_loginmesg"]=$langs->trans("ErrorCantLoadUserFromDolibarrDatabase",$login);
+				$_SESSION["dol_loginmesg"] = $langs->trans("ErrorCantLoadUserFromDolibarrDatabase", $login);
 
 				// TODO @deprecated Remove this. Hook must be used, not this trigger.
-				$user->trigger_mesg='ErrorCantLoadUserFromDolibarrDatabase - login='.$login;
+				$user->trigger_mesg = 'ErrorCantLoadUserFromDolibarrDatabase - login='.$login;
 			}
 			if ($resultFetchUser < 0)
 			{
-				$_SESSION["dol_loginmesg"]=$user->error;
+				$_SESSION["dol_loginmesg"] = $user->error;
 
 				// TODO @deprecated Remove this. Hook must be used, not this trigger.
-				$user->trigger_mesg=$user->error;
+				$user->trigger_mesg = $user->error;
 			}
 
 			// Call triggers
-			include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php';
-			$interface=new Interfaces($db);
-			$result=$interface->run_triggers('USER_LOGIN_FAILED',$user,$user,$langs,$conf);
+			include_once DOL_DOCUMENT_ROOT.'/core/class/interfaces.class.php';
+			$interface = new Interfaces($db);
+			$result = $interface->run_triggers('USER_LOGIN_FAILED', $user, $user, $langs, $conf);
 			if ($result < 0) {
 				$error++;
 			}
 			// End call triggers
 
 			// Hooks on failed login
-			$action='';
+			$action = '';
 			$hookmanager->initHooks(array('login'));
-			$parameters=array('dol_authmode'=>$dol_authmode, 'dol_loginmesg'=>$_SESSION["dol_loginmesg"]);
-			$reshook=$hookmanager->executeHooks('afterLoginFailed',$parameters,$user,$action);    // Note that $action and $object may have been modified by some hooks
+			$parameters = array('dol_authmode'=>$dol_authmode, 'dol_loginmesg'=>$_SESSION["dol_loginmesg"]);
+			$reshook = $hookmanager->executeHooks('afterLoginFailed', $parameters, $user, $action); // Note that $action and $object may have been modified by some hooks
 			if ($reshook < 0) $error++;
 
-			$paramsurl=array();
-			if (GETPOST('textbrowser','int')) $paramsurl[]='textbrowser='.GETPOST('textbrowser','int');
-			if (GETPOST('nojs','int'))        $paramsurl[]='nojs='.GETPOST('nojs','int');
-			if (GETPOST('lang','aZ09'))       $paramsurl[]='lang='.GETPOST('lang','aZ09');
-			header('Location: '.DOL_URL_ROOT.'/index.php'.(count($paramsurl)?'?'.implode('&',$paramsurl):''));
+			$paramsurl = array();
+			if (GETPOST('textbrowser', 'int')) $paramsurl[] = 'textbrowser='.GETPOST('textbrowser', 'int');
+			if (GETPOST('nojs', 'int'))        $paramsurl[] = 'nojs='.GETPOST('nojs', 'int');
+			if (GETPOST('lang', 'aZ09'))       $paramsurl[] = 'lang='.GETPOST('lang', 'aZ09');
+			header('Location: '.DOL_URL_ROOT.'/index.php'.(count($paramsurl) ? '?'.implode('&', $paramsurl) : ''));
 			exit;
 		}
 	}
 	else
 	{
 		// We are already into an authenticated session
-		$login=$_SESSION["dol_login"];
-		$entity=$_SESSION["dol_entity"];
+		$login = $_SESSION["dol_login"];
+		$entity = $_SESSION["dol_entity"];
 		dol_syslog("- This is an already logged session. _SESSION['dol_login']=".$login." _SESSION['dol_entity']=".$entity, LOG_DEBUG);
 
-		$resultFetchUser=$user->fetch('', $login, '', 1, ($entity > 0 ? $entity : -1));
+		$resultFetchUser = $user->fetch('', $login, '', 1, ($entity > 0 ? $entity : -1));
 		if ($resultFetchUser <= 0)
 		{
 			// Account has been removed after login
 			dol_syslog("Can't load user even if session logged. _SESSION['dol_login']=".$login, LOG_WARNING);
 			session_destroy();
 			session_name($sessionname);
-			session_set_cookie_params(0, '/', null, false, true);   // Add tag httponly on session cookie
-			session_start();    // Fixing the bug of register_globals here is useless since session is empty
+			session_set_cookie_params(0, '/', null, false, true); // Add tag httponly on session cookie
+			session_start(); // Fixing the bug of register_globals here is useless since session is empty
 
 			if ($resultFetchUser == 0)
 			{
 				$langs->load('main');
 				$langs->load('errors');
 
-				$_SESSION["dol_loginmesg"]=$langs->trans("ErrorCantLoadUserFromDolibarrDatabase",$login);
+				$_SESSION["dol_loginmesg"] = $langs->trans("ErrorCantLoadUserFromDolibarrDatabase", $login);
 
 				// TODO @deprecated Remove this. Hook must be used, not this trigger.
-				$user->trigger_mesg='ErrorCantLoadUserFromDolibarrDatabase - login='.$login;
+				$user->trigger_mesg = 'ErrorCantLoadUserFromDolibarrDatabase - login='.$login;
 			}
 			if ($resultFetchUser < 0)
 			{
-				$_SESSION["dol_loginmesg"]=$user->error;
+				$_SESSION["dol_loginmesg"] = $user->error;
 
 				// TODO @deprecated Remove this. Hook must be used, not this trigger.
-				$user->trigger_mesg=$user->error;
+				$user->trigger_mesg = $user->error;
 			}
 
 			// TODO @deprecated Remove this. Hook must be used, not this trigger.
 			// Call triggers
-			include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php';
-			$interface=new Interfaces($db);
-			$result=$interface->run_triggers('USER_LOGIN_FAILED',$user,$user,$langs,$conf);
+			include_once DOL_DOCUMENT_ROOT.'/core/class/interfaces.class.php';
+			$interface = new Interfaces($db);
+			$result = $interface->run_triggers('USER_LOGIN_FAILED', $user, $user, $langs, $conf);
 			if ($result < 0) {
 				$error++;
 			}
 			// End call triggers
 
 			// Hooks on failed login
-			$action='';
+			$action = '';
 			$hookmanager->initHooks(array('login'));
-			$parameters=array('dol_authmode'=>$dol_authmode, 'dol_loginmesg'=>$_SESSION["dol_loginmesg"]);
-			$reshook=$hookmanager->executeHooks('afterLoginFailed',$parameters,$user,$action);    // Note that $action and $object may have been modified by some hooks
+			$parameters = array('dol_authmode'=>$dol_authmode, 'dol_loginmesg'=>$_SESSION["dol_loginmesg"]);
+			$reshook = $hookmanager->executeHooks('afterLoginFailed', $parameters, $user, $action); // Note that $action and $object may have been modified by some hooks
 			if ($reshook < 0) $error++;
 
-			$paramsurl=array();
-			if (GETPOST('textbrowser','int')) $paramsurl[]='textbrowser='.GETPOST('textbrowser','int');
-			if (GETPOST('nojs','int'))        $paramsurl[]='nojs='.GETPOST('nojs','int');
-			if (GETPOST('lang','aZ09'))       $paramsurl[]='lang='.GETPOST('lang','aZ09');
-			header('Location: '.DOL_URL_ROOT.'/index.php'.(count($paramsurl)?'?'.implode('&',$paramsurl):''));
+			$paramsurl = array();
+			if (GETPOST('textbrowser', 'int')) $paramsurl[] = 'textbrowser='.GETPOST('textbrowser', 'int');
+			if (GETPOST('nojs', 'int'))        $paramsurl[] = 'nojs='.GETPOST('nojs', 'int');
+			if (GETPOST('lang', 'aZ09'))       $paramsurl[] = 'lang='.GETPOST('lang', 'aZ09');
+			header('Location: '.DOL_URL_ROOT.'/index.php'.(count($paramsurl) ? '?'.implode('&', $paramsurl) : ''));
 			exit;
 		}
 		else
@@ -663,19 +663,19 @@ 
 		   $hookmanager->initHooks(array('main'));
 
 		   // Code for search criteria persistence.
-		   if (! empty($_GET['save_lastsearch_values']))    // Keep $_GET here
+		   if (!empty($_GET['save_lastsearch_values']))    // Keep $_GET here
 		   {
-			   $relativepathstring = preg_replace('/\?.*$/','',$_SERVER["HTTP_REFERER"]);
-			   $relativepathstring = preg_replace('/^https?:\/\/[^\/]*/','',$relativepathstring);     // Get full path except host server
+			   $relativepathstring = preg_replace('/\?.*$/', '', $_SERVER["HTTP_REFERER"]);
+			   $relativepathstring = preg_replace('/^https?:\/\/[^\/]*/', '', $relativepathstring); // Get full path except host server
 			   // Clean $relativepathstring
-   			   if (constant('DOL_URL_ROOT')) $relativepathstring = preg_replace('/^'.preg_quote(constant('DOL_URL_ROOT'),'/').'/', '', $relativepathstring);
+   			   if (constant('DOL_URL_ROOT')) $relativepathstring = preg_replace('/^'.preg_quote(constant('DOL_URL_ROOT'), '/').'/', '', $relativepathstring);
 			   $relativepathstring = preg_replace('/^\//', '', $relativepathstring);
 			   $relativepathstring = preg_replace('/^custom\//', '', $relativepathstring);
 			   //var_dump($relativepathstring);
 
-			   if (! empty($_SESSION['lastsearch_values_tmp_'.$relativepathstring]))
+			   if (!empty($_SESSION['lastsearch_values_tmp_'.$relativepathstring]))
 			   {
-				   $_SESSION['lastsearch_values_'.$relativepathstring]=$_SESSION['lastsearch_values_tmp_'.$relativepathstring];
+				   $_SESSION['lastsearch_values_'.$relativepathstring] = $_SESSION['lastsearch_values_tmp_'.$relativepathstring];
 				   unset($_SESSION['lastsearch_values_tmp_'.$relativepathstring]);
 			   }
 		   }
@@ -690,30 +690,30 @@ 
 
 	// Is it a new session that has started ?
 	// If we are here, this means authentication was successfull.
-	if (! isset($_SESSION["dol_login"]))
+	if (!isset($_SESSION["dol_login"]))
 	{
 		// New session for this login has started.
-		$error=0;
+		$error = 0;
 
 		// Store value into session (values always stored)
-		$_SESSION["dol_login"]=$user->login;
-		$_SESSION["dol_authmode"]=isset($dol_authmode)?$dol_authmode:'';
-		$_SESSION["dol_tz"]=isset($dol_tz)?$dol_tz:'';
-		$_SESSION["dol_tz_string"]=isset($dol_tz_string)?$dol_tz_string:'';
-		$_SESSION["dol_dst"]=isset($dol_dst)?$dol_dst:'';
-		$_SESSION["dol_dst_observed"]=isset($dol_dst_observed)?$dol_dst_observed:'';
-		$_SESSION["dol_dst_first"]=isset($dol_dst_first)?$dol_dst_first:'';
-		$_SESSION["dol_dst_second"]=isset($dol_dst_second)?$dol_dst_second:'';
-		$_SESSION["dol_screenwidth"]=isset($dol_screenwidth)?$dol_screenwidth:'';
-		$_SESSION["dol_screenheight"]=isset($dol_screenheight)?$dol_screenheight:'';
-		$_SESSION["dol_company"]=$conf->global->MAIN_INFO_SOCIETE_NOM;
-		$_SESSION["dol_entity"]=$conf->entity;
+		$_SESSION["dol_login"] = $user->login;
+		$_SESSION["dol_authmode"] = isset($dol_authmode) ? $dol_authmode : '';
+		$_SESSION["dol_tz"] = isset($dol_tz) ? $dol_tz : '';
+		$_SESSION["dol_tz_string"] = isset($dol_tz_string) ? $dol_tz_string : '';
+		$_SESSION["dol_dst"] = isset($dol_dst) ? $dol_dst : '';
+		$_SESSION["dol_dst_observed"] = isset($dol_dst_observed) ? $dol_dst_observed : '';
+		$_SESSION["dol_dst_first"] = isset($dol_dst_first) ? $dol_dst_first : '';
+		$_SESSION["dol_dst_second"] = isset($dol_dst_second) ? $dol_dst_second : '';
+		$_SESSION["dol_screenwidth"] = isset($dol_screenwidth) ? $dol_screenwidth : '';
+		$_SESSION["dol_screenheight"] = isset($dol_screenheight) ? $dol_screenheight : '';
+		$_SESSION["dol_company"] = $conf->global->MAIN_INFO_SOCIETE_NOM;
+		$_SESSION["dol_entity"] = $conf->entity;
 		// Store value into session (values stored only if defined)
-		if (! empty($dol_hide_topmenu))         $_SESSION['dol_hide_topmenu']=$dol_hide_topmenu;
-		if (! empty($dol_hide_leftmenu))        $_SESSION['dol_hide_leftmenu']=$dol_hide_leftmenu;
-		if (! empty($dol_optimize_smallscreen)) $_SESSION['dol_optimize_smallscreen']=$dol_optimize_smallscreen;
-		if (! empty($dol_no_mouse_hover))       $_SESSION['dol_no_mouse_hover']=$dol_no_mouse_hover;
-		if (! empty($dol_use_jmobile))          $_SESSION['dol_use_jmobile']=$dol_use_jmobile;
+		if (!empty($dol_hide_topmenu))         $_SESSION['dol_hide_topmenu'] = $dol_hide_topmenu;
+		if (!empty($dol_hide_leftmenu))        $_SESSION['dol_hide_leftmenu'] = $dol_hide_leftmenu;
+		if (!empty($dol_optimize_smallscreen)) $_SESSION['dol_optimize_smallscreen'] = $dol_optimize_smallscreen;
+		if (!empty($dol_no_mouse_hover))       $_SESSION['dol_no_mouse_hover'] = $dol_no_mouse_hover;
+		if (!empty($dol_use_jmobile))          $_SESSION['dol_use_jmobile'] = $dol_use_jmobile;
 
 		dol_syslog("This is a new started user session. _SESSION['dol_login']=".$_SESSION["dol_login"]." Session id=".session_id());
 
@@ -726,26 +726,26 @@ 
 		// TODO @deprecated Remove this. Hook must be used, not this trigger.
 		$user->trigger_mesg = $loginfo;
 		// Call triggers
-		include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php';
-		$interface=new Interfaces($db);
-		$result=$interface->run_triggers('USER_LOGIN',$user,$user,$langs,$conf);
+		include_once DOL_DOCUMENT_ROOT.'/core/class/interfaces.class.php';
+		$interface = new Interfaces($db);
+		$result = $interface->run_triggers('USER_LOGIN', $user, $user, $langs, $conf);
 		if ($result < 0) {
 			$error++;
 		}
 		// End call triggers
 
 		// Hooks on successfull login
-		$action='';
+		$action = '';
 		$hookmanager->initHooks(array('login'));
-		$parameters=array('dol_authmode'=>$dol_authmode, 'dol_loginfo'=>$loginfo);
-		$reshook=$hookmanager->executeHooks('afterLogin',$parameters,$user,$action);    // Note that $action and $object may have been modified by some hooks
+		$parameters = array('dol_authmode'=>$dol_authmode, 'dol_loginfo'=>$loginfo);
+		$reshook = $hookmanager->executeHooks('afterLogin', $parameters, $user, $action); // Note that $action and $object may have been modified by some hooks
 		if ($reshook < 0) $error++;
 
 		if ($error)
 		{
 			$db->rollback();
 			session_destroy();
-			dol_print_error($db,'Error in some hooks afterLogin (or old trigger USER_LOGIN)');
+			dol_print_error($db, 'Error in some hooks afterLogin (or old trigger USER_LOGIN)');
 			exit;
 		}
 		else
@@ -754,10 +754,10 @@ 
 		}
 
 		// Change landing page if defined.
-		$landingpage=(empty($user->conf->MAIN_LANDING_PAGE)?(empty($conf->global->MAIN_LANDING_PAGE)?'':$conf->global->MAIN_LANDING_PAGE):$user->conf->MAIN_LANDING_PAGE);
-		if (! empty($landingpage))    // Example: /index.php
+		$landingpage = (empty($user->conf->MAIN_LANDING_PAGE) ? (empty($conf->global->MAIN_LANDING_PAGE) ? '' : $conf->global->MAIN_LANDING_PAGE) : $user->conf->MAIN_LANDING_PAGE);
+		if (!empty($landingpage))    // Example: /index.php
 		{
-			$newpath=dol_buildpath($landingpage, 1);
+			$newpath = dol_buildpath($landingpage, 1);
 			if ($_SERVER["PHP_SELF"] != $newpath)   // not already on landing page (avoid infinite loop)
 			{
 				header('Location: '.$newpath);
@@ -770,12 +770,12 @@ 
 	// If user admin, we force the rights-based modules
 	if ($user->admin)
 	{
-		$user->rights->user->user->lire=1;
-		$user->rights->user->user->creer=1;
-		$user->rights->user->user->password=1;
-		$user->rights->user->user->supprimer=1;
-		$user->rights->user->self->creer=1;
-		$user->rights->user->self->password=1;
+		$user->rights->user->user->lire = 1;
+		$user->rights->user->user->creer = 1;
+		$user->rights->user->user->password = 1;
+		$user->rights->user->user->supprimer = 1;
+		$user->rights->user->self->creer = 1;
+		$user->rights->user->self->password = 1;
 	}
 
 	/*
@@ -783,74 +783,74 @@ 
      */
 
 	// Set liste_limit
-	if (isset($user->conf->MAIN_SIZE_LISTE_LIMIT))	$conf->liste_limit = $user->conf->MAIN_SIZE_LISTE_LIMIT;	// Can be 0
-	if (isset($user->conf->PRODUIT_LIMIT_SIZE))	$conf->product->limit_size = $user->conf->PRODUIT_LIMIT_SIZE;	// Can be 0
+	if (isset($user->conf->MAIN_SIZE_LISTE_LIMIT))	$conf->liste_limit = $user->conf->MAIN_SIZE_LISTE_LIMIT; // Can be 0
+	if (isset($user->conf->PRODUIT_LIMIT_SIZE))	$conf->product->limit_size = $user->conf->PRODUIT_LIMIT_SIZE; // Can be 0
 
 	// Replace conf->css by personalized value if theme not forced
-	if (empty($conf->global->MAIN_FORCETHEME) && ! empty($user->conf->MAIN_THEME))
+	if (empty($conf->global->MAIN_FORCETHEME) && !empty($user->conf->MAIN_THEME))
 	{
-		$conf->theme=$user->conf->MAIN_THEME;
+		$conf->theme = $user->conf->MAIN_THEME;
 		$conf->css  = "/theme/".$conf->theme."/style.css.php";
 	}
 }
 
 // Case forcing style from url
-if (GETPOST('theme','alpha'))
+if (GETPOST('theme', 'alpha'))
 {
-	$conf->theme=GETPOST('theme','alpha',1);
+	$conf->theme = GETPOST('theme', 'alpha', 1);
 	$conf->css  = "/theme/".$conf->theme."/style.css.php";
 }
 
 
 // Set javascript option
-if (! GETPOST('nojs','int'))   // If javascript was not disabled on URL
+if (!GETPOST('nojs', 'int'))   // If javascript was not disabled on URL
 {
-	if (! empty($user->conf->MAIN_DISABLE_JAVASCRIPT))
+	if (!empty($user->conf->MAIN_DISABLE_JAVASCRIPT))
 	{
-		$conf->use_javascript_ajax=! $user->conf->MAIN_DISABLE_JAVASCRIPT;
+		$conf->use_javascript_ajax = !$user->conf->MAIN_DISABLE_JAVASCRIPT;
 	}
 }
-else $conf->use_javascript_ajax=0;
+else $conf->use_javascript_ajax = 0;
 // Set MAIN_OPTIMIZEFORTEXTBROWSER
-if (GETPOST('textbrowser','int') || (! empty($conf->browser->name) && $conf->browser->name == 'lynxlinks') || ! empty($user->conf->MAIN_OPTIMIZEFORTEXTBROWSER))   // If we must enable text browser
+if (GETPOST('textbrowser', 'int') || (!empty($conf->browser->name) && $conf->browser->name == 'lynxlinks') || !empty($user->conf->MAIN_OPTIMIZEFORTEXTBROWSER))   // If we must enable text browser
 {
-	$conf->global->MAIN_OPTIMIZEFORTEXTBROWSER=1;
+	$conf->global->MAIN_OPTIMIZEFORTEXTBROWSER = 1;
 }
-elseif (! empty($user->conf->MAIN_OPTIMIZEFORTEXTBROWSER))
+elseif (!empty($user->conf->MAIN_OPTIMIZEFORTEXTBROWSER))
 {
-	$conf->global->MAIN_OPTIMIZEFORTEXTBROWSER=$user->conf->MAIN_OPTIMIZEFORTEXTBROWSER;
+	$conf->global->MAIN_OPTIMIZEFORTEXTBROWSER = $user->conf->MAIN_OPTIMIZEFORTEXTBROWSER;
 }
 
 // Set terminal output option according to conf->browser.
-if (GETPOST('dol_hide_leftmenu','int') || ! empty($_SESSION['dol_hide_leftmenu']))               $conf->dol_hide_leftmenu=1;
-if (GETPOST('dol_hide_topmenu','int') || ! empty($_SESSION['dol_hide_topmenu']))                 $conf->dol_hide_topmenu=1;
-if (GETPOST('dol_optimize_smallscreen','int') || ! empty($_SESSION['dol_optimize_smallscreen'])) $conf->dol_optimize_smallscreen=1;
-if (GETPOST('dol_no_mouse_hover','int') || ! empty($_SESSION['dol_no_mouse_hover']))             $conf->dol_no_mouse_hover=1;
-if (GETPOST('dol_use_jmobile','int') || ! empty($_SESSION['dol_use_jmobile']))                   $conf->dol_use_jmobile=1;
-if (! empty($conf->browser->layout) && $conf->browser->layout != 'classic') $conf->dol_no_mouse_hover=1;
-if ((! empty($conf->browser->layout) && $conf->browser->layout == 'phone')
-	|| (! empty($_SESSION['dol_screenwidth']) && $_SESSION['dol_screenwidth'] < 400)
-	|| (! empty($_SESSION['dol_screenheight']) && $_SESSION['dol_screenheight'] < 400)
+if (GETPOST('dol_hide_leftmenu', 'int') || !empty($_SESSION['dol_hide_leftmenu']))               $conf->dol_hide_leftmenu = 1;
+if (GETPOST('dol_hide_topmenu', 'int') || !empty($_SESSION['dol_hide_topmenu']))                 $conf->dol_hide_topmenu = 1;
+if (GETPOST('dol_optimize_smallscreen', 'int') || !empty($_SESSION['dol_optimize_smallscreen'])) $conf->dol_optimize_smallscreen = 1;
+if (GETPOST('dol_no_mouse_hover', 'int') || !empty($_SESSION['dol_no_mouse_hover']))             $conf->dol_no_mouse_hover = 1;
+if (GETPOST('dol_use_jmobile', 'int') || !empty($_SESSION['dol_use_jmobile']))                   $conf->dol_use_jmobile = 1;
+if (!empty($conf->browser->layout) && $conf->browser->layout != 'classic') $conf->dol_no_mouse_hover = 1;
+if ((!empty($conf->browser->layout) && $conf->browser->layout == 'phone')
+	|| (!empty($_SESSION['dol_screenwidth']) && $_SESSION['dol_screenwidth'] < 400)
+	|| (!empty($_SESSION['dol_screenheight']) && $_SESSION['dol_screenheight'] < 400)
 )
 {
-	$conf->dol_optimize_smallscreen=1;
+	$conf->dol_optimize_smallscreen = 1;
 }
 // If we force to use jmobile, then we reenable javascript
-if (! empty($conf->dol_use_jmobile)) $conf->use_javascript_ajax=1;
+if (!empty($conf->dol_use_jmobile)) $conf->use_javascript_ajax = 1;
 // Replace themes bugged with jmobile with eldy
-if (! empty($conf->dol_use_jmobile) && in_array($conf->theme,array('bureau2crea','cameleo','amarok')))
+if (!empty($conf->dol_use_jmobile) && in_array($conf->theme, array('bureau2crea', 'cameleo', 'amarok')))
 {
-	$conf->theme='eldy';
-	$conf->css  =  "/theme/".$conf->theme."/style.css.php";
+	$conf->theme = 'eldy';
+	$conf->css  = "/theme/".$conf->theme."/style.css.php";
 }
 //var_dump($conf->browser->phone);
 
-if (! defined('NOREQUIRETRAN'))
+if (!defined('NOREQUIRETRAN'))
 {
-	if (! GETPOST('lang','aZ09'))	// If language was not forced on URL
+	if (!GETPOST('lang', 'aZ09'))	// If language was not forced on URL
 	{
 		// If user has chosen its own language
-		if (! empty($user->conf->MAIN_LANG_DEFAULT))
+		if (!empty($user->conf->MAIN_LANG_DEFAULT))
 		{
 			// If different than current language
 			//print ">>>".$langs->getDefaultLang()."-".$user->conf->MAIN_LANG_DEFAULT;
@@ -862,11 +862,11 @@ 
 	}
 }
 
-if (! defined('NOLOGIN'))
+if (!defined('NOLOGIN'))
 {
 	// If the login is not recovered, it is identified with an account that does not exist.
 	// Hacking attempt?
-	if (! $user->login) accessforbidden();
+	if (!$user->login) accessforbidden();
 
 	// Check if user is active
 	if ($user->statut < 1)
@@ -883,88 +883,88 @@ 
 }
 
 
-dol_syslog("--- Access to ".$_SERVER["PHP_SELF"].' - action='.GETPOST('action','az09').', massaction='.GETPOST('massaction','az09'));
+dol_syslog("--- Access to ".$_SERVER["PHP_SELF"].' - action='.GETPOST('action', 'az09').', massaction='.GETPOST('massaction', 'az09'));
 //Another call for easy debugg
 //dol_syslog("Access to ".$_SERVER["PHP_SELF"].' GET='.join(',',array_keys($_GET)).'->'.join(',',$_GET).' POST:'.join(',',array_keys($_POST)).'->'.join(',',$_POST));
 
 // Load main languages files
-if (! defined('NOREQUIRETRAN'))
+if (!defined('NOREQUIRETRAN'))
 {
 	$langs->load("main");
 	$langs->load("dict");
 }
 
 // Define some constants used for style of arrays
-$bc=array(0=>'class="impair"',1=>'class="pair"');
-$bcdd=array(0=>'class="drag drop oddeven"',1=>'class="drag drop oddeven"');
-$bcnd=array(0=>'class="nodrag nodrop nohover"',1=>'class="nodrag nodrop nohoverpair"');		// Used for tr to add new lines
-$bctag=array(0=>'class="impair tagtr"',1=>'class="pair tagtr"');
+$bc = array(0=>'class="impair"', 1=>'class="pair"');
+$bcdd = array(0=>'class="drag drop oddeven"', 1=>'class="drag drop oddeven"');
+$bcnd = array(0=>'class="nodrag nodrop nohover"', 1=>'class="nodrag nodrop nohoverpair"'); // Used for tr to add new lines
+$bctag = array(0=>'class="impair tagtr"', 1=>'class="pair tagtr"');
 
 // Define messages variables
-$mesg=''; $warning=''; $error=0;
+$mesg = ''; $warning = ''; $error = 0;
 // deprecated, see setEventMessages() and dol_htmloutput_events()
-$mesgs=array(); $warnings=array(); $errors=array();
+$mesgs = array(); $warnings = array(); $errors = array();
 
 // Constants used to defined number of lines in textarea
 if (empty($conf->browser->firefox))
 {
-	define('ROWS_1',1);
-	define('ROWS_2',2);
-	define('ROWS_3',3);
-	define('ROWS_4',4);
-	define('ROWS_5',5);
-	define('ROWS_6',6);
-	define('ROWS_7',7);
-	define('ROWS_8',8);
-	define('ROWS_9',9);
+	define('ROWS_1', 1);
+	define('ROWS_2', 2);
+	define('ROWS_3', 3);
+	define('ROWS_4', 4);
+	define('ROWS_5', 5);
+	define('ROWS_6', 6);
+	define('ROWS_7', 7);
+	define('ROWS_8', 8);
+	define('ROWS_9', 9);
 }
 else
 {
-	define('ROWS_1',0);
-	define('ROWS_2',1);
-	define('ROWS_3',2);
-	define('ROWS_4',3);
-	define('ROWS_5',4);
-	define('ROWS_6',5);
-	define('ROWS_7',6);
-	define('ROWS_8',7);
-	define('ROWS_9',8);
+	define('ROWS_1', 0);
+	define('ROWS_2', 1);
+	define('ROWS_3', 2);
+	define('ROWS_4', 3);
+	define('ROWS_5', 4);
+	define('ROWS_6', 5);
+	define('ROWS_7', 6);
+	define('ROWS_8', 7);
+	define('ROWS_9', 8);
 }
 
-$heightforframes=48;
+$heightforframes = 48;
 
 // Init menu manager
-if (! defined('NOREQUIREMENU'))
+if (!defined('NOREQUIREMENU'))
 {
 	if (empty($user->societe_id))    // If internal user or not defined
 	{
-		$conf->standard_menu=(empty($conf->global->MAIN_MENU_STANDARD_FORCED)?(empty($conf->global->MAIN_MENU_STANDARD)?'eldy_menu.php':$conf->global->MAIN_MENU_STANDARD):$conf->global->MAIN_MENU_STANDARD_FORCED);
+		$conf->standard_menu = (empty($conf->global->MAIN_MENU_STANDARD_FORCED) ? (empty($conf->global->MAIN_MENU_STANDARD) ? 'eldy_menu.php' : $conf->global->MAIN_MENU_STANDARD) : $conf->global->MAIN_MENU_STANDARD_FORCED);
 	}
 	else                        // If external user
 	{
-		$conf->standard_menu=(empty($conf->global->MAIN_MENUFRONT_STANDARD_FORCED)?(empty($conf->global->MAIN_MENUFRONT_STANDARD)?'eldy_menu.php':$conf->global->MAIN_MENUFRONT_STANDARD):$conf->global->MAIN_MENUFRONT_STANDARD_FORCED);
+		$conf->standard_menu = (empty($conf->global->MAIN_MENUFRONT_STANDARD_FORCED) ? (empty($conf->global->MAIN_MENUFRONT_STANDARD) ? 'eldy_menu.php' : $conf->global->MAIN_MENUFRONT_STANDARD) : $conf->global->MAIN_MENUFRONT_STANDARD_FORCED);
 	}
 
 	// Load the menu manager (only if not already done)
-	$file_menu=$conf->standard_menu;
-	if (GETPOST('menu','alpha')) $file_menu=GETPOST('menu','alpha');     // example: menu=eldy_menu.php
-	if (! class_exists('MenuManager'))
+	$file_menu = $conf->standard_menu;
+	if (GETPOST('menu', 'alpha')) $file_menu = GETPOST('menu', 'alpha'); // example: menu=eldy_menu.php
+	if (!class_exists('MenuManager'))
 	{
-		$menufound=0;
-		$dirmenus=array_merge(array("/core/menus/"),(array) $conf->modules_parts['menus']);
-		foreach($dirmenus as $dirmenu)
+		$menufound = 0;
+		$dirmenus = array_merge(array("/core/menus/"), (array) $conf->modules_parts['menus']);
+		foreach ($dirmenus as $dirmenu)
 		{
-			$menufound=dol_include_once($dirmenu."standard/".$file_menu);
+			$menufound = dol_include_once($dirmenu."standard/".$file_menu);
 			if (class_exists('MenuManager')) break;
 		}
-		if (! class_exists('MenuManager'))	// If failed to include, we try with standard eldy_menu.php
+		if (!class_exists('MenuManager'))	// If failed to include, we try with standard eldy_menu.php
 		{
 			dol_syslog("You define a menu manager '".$file_menu."' that can not be loaded.", LOG_WARNING);
-			$file_menu='eldy_menu.php';
+			$file_menu = 'eldy_menu.php';
 			include_once DOL_DOCUMENT_ROOT."/core/menus/standard/".$file_menu;
 		}
 	}
-	$menumanager = new MenuManager($db, empty($user->societe_id)?0:1);
+	$menumanager = new MenuManager($db, empty($user->societe_id) ? 0 : 1);
 	$menumanager->loadMenu();
 }
 
@@ -972,7 +972,7 @@ 
 
 // Functions
 
-if (! function_exists("llxHeader"))
+if (!function_exists("llxHeader"))
 {
 	/**
 	 *	Show HTML header HTML + BODY + Top menu + left menu + DIV
@@ -992,14 +992,14 @@ 
 	 * @param	string	$replacemainareaby	Replace call to main_area() by a print of this string
 	 * @return	void
 	 */
-	function llxHeader($head='', $title='', $help_url='', $target='', $disablejs=0, $disablehead=0, $arrayofjs='', $arrayofcss='', $morequerystring='', $morecssonbody='', $replacemainareaby='')
+	function llxHeader($head = '', $title = '', $help_url = '', $target = '', $disablejs = 0, $disablehead = 0, $arrayofjs = '', $arrayofcss = '', $morequerystring = '', $morecssonbody = '', $replacemainareaby = '')
 	{
 		global $conf;
 
 		// html header
 		top_htmlhead($head, $title, $disablejs, $disablehead, $arrayofjs, $arrayofcss);
 
-		print '<body id="mainbody"'.($morecssonbody?' class="'.$morecssonbody.'"':'').'>' . "\n";
+		print '<body id="mainbody"'.($morecssonbody ? ' class="'.$morecssonbody.'"' : '').'>'."\n";
 
 		// top menu and left menu area
 		if (empty($conf->dol_hide_topmenu))
@@ -1029,16 +1029,16 @@ 
  *  @param  string  $contenttype    Content type. For example, 'text/html'
  *  @return	void
  */
-function top_httphead($contenttype='text/html')
+function top_httphead($contenttype = 'text/html')
 {
 	global $conf;
 
-	if ($contenttype == 'text/html' ) header("Content-Type: text/html; charset=".$conf->file->character_set_client);
+	if ($contenttype == 'text/html') header("Content-Type: text/html; charset=".$conf->file->character_set_client);
 	else header("Content-Type: ".$contenttype);
 	// Security options
-	header("X-Content-Type-Options: nosniff");  // With the nosniff option, if the server says the content is text/html, the browser will render it as text/html (note that most browsers now force this option to on)
-	header("X-Frame-Options: SAMEORIGIN");      // Frames allowed only if on same domain (stop some XSS attacks)
-	if (! empty($conf->global->MAIN_HTTP_CONTENT_SECURITY_POLICY))
+	header("X-Content-Type-Options: nosniff"); // With the nosniff option, if the server says the content is text/html, the browser will render it as text/html (note that most browsers now force this option to on)
+	header("X-Frame-Options: SAMEORIGIN"); // Frames allowed only if on same domain (stop some XSS attacks)
+	if (!empty($conf->global->MAIN_HTTP_CONTENT_SECURITY_POLICY))
 	{
 		// For example, to restrict script, object, frames or img to some domains
 		// script-src https://api.google.com https://anotherhost.com; object-src https://youtube.com; child-src https://youtube.com; img-src: https://static.example.com
@@ -1068,72 +1068,72 @@ 
  * @param   int     $disablenofollow Disable no follow tag
  * @return	void
  */
-function top_htmlhead($head, $title='', $disablejs=0, $disablehead=0, $arrayofjs='', $arrayofcss='', $disablejmobile=0, $disablenofollow=0)
+function top_htmlhead($head, $title = '', $disablejs = 0, $disablehead = 0, $arrayofjs = '', $arrayofcss = '', $disablejmobile = 0, $disablenofollow = 0)
 {
 	global $user, $conf, $langs, $db;
 
 	top_httphead();
 
-	if (empty($conf->css)) $conf->css = '/theme/eldy/style.css.php';	// If not defined, eldy by default
+	if (empty($conf->css)) $conf->css = '/theme/eldy/style.css.php'; // If not defined, eldy by default
 
-	if (! empty($conf->global->MAIN_ACTIVATE_HTML4)) {
+	if (!empty($conf->global->MAIN_ACTIVATE_HTML4)) {
 		$doctype = '<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">';
-	}else {
+	} else {
 		$doctype = '<!doctype html>';
 	}
 	print $doctype."\n";
-	if (! empty($conf->global->MAIN_USE_CACHE_MANIFEST)) print '<html lang="'.substr($langs->defaultlang,0,2).'" manifest="'.DOL_URL_ROOT.'/cache.manifest">'."\n";
-	else print '<html lang="'.substr($langs->defaultlang,0,2).'">'."\n";
+	if (!empty($conf->global->MAIN_USE_CACHE_MANIFEST)) print '<html lang="'.substr($langs->defaultlang, 0, 2).'" manifest="'.DOL_URL_ROOT.'/cache.manifest">'."\n";
+	else print '<html lang="'.substr($langs->defaultlang, 0, 2).'">'."\n";
 	//print '<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="fr">'."\n";
 	if (empty($disablehead))
 	{
 		print "<head>\n";
-		if (GETPOST('dol_basehref','alpha')) print '<base href="'.dol_escape_htmltag(GETPOST('dol_basehref','alpha')).'">'."\n";
+		if (GETPOST('dol_basehref', 'alpha')) print '<base href="'.dol_escape_htmltag(GETPOST('dol_basehref', 'alpha')).'">'."\n";
 		// Displays meta
-		print '<meta name="robots" content="noindex'.($disablenofollow?'':',nofollow').'">'."\n";	// Do not index
-		print '<meta name="viewport" content="width=device-width, initial-scale=1.0">'."\n";		// Scale for mobile device
+		print '<meta name="robots" content="noindex'.($disablenofollow ? '' : ',nofollow').'">'."\n"; // Do not index
+		print '<meta name="viewport" content="width=device-width, initial-scale=1.0">'."\n"; // Scale for mobile device
 		print '<meta name="author" content="Dolibarr Development Team">'."\n";
 		// Favicon
-		$favicon=dol_buildpath('/theme/'.$conf->theme.'/img/favicon.ico',1);
-		if (! empty($conf->global->MAIN_FAVICON_URL)) $favicon=$conf->global->MAIN_FAVICON_URL;
-		if (empty($conf->dol_use_jmobile)) print '<link rel="shortcut icon" type="image/x-icon" href="'.$favicon.'"/>'."\n";	// Not required into an Android webview
+		$favicon = dol_buildpath('/theme/'.$conf->theme.'/img/favicon.ico', 1);
+		if (!empty($conf->global->MAIN_FAVICON_URL)) $favicon = $conf->global->MAIN_FAVICON_URL;
+		if (empty($conf->dol_use_jmobile)) print '<link rel="shortcut icon" type="image/x-icon" href="'.$favicon.'"/>'."\n"; // Not required into an Android webview
 		//if (empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER)) print '<link rel="top" title="'.$langs->trans("Home").'" href="'.(DOL_URL_ROOT?DOL_URL_ROOT:'/').'">'."\n";
 		//if (empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER)) print '<link rel="copyright" title="GNU General Public License" href="http://www.gnu.org/copyleft/gpl.html#SEC1">'."\n";
 		//if (empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER)) print '<link rel="author" title="Dolibarr Development Team" href="https://www.dolibarr.org">'."\n";
 
 		// Displays title
-		$appli=constant('DOL_APPLICATION_TITLE');
-		if (!empty($conf->global->MAIN_APPLICATION_TITLE)) $appli=$conf->global->MAIN_APPLICATION_TITLE;
+		$appli = constant('DOL_APPLICATION_TITLE');
+		if (!empty($conf->global->MAIN_APPLICATION_TITLE)) $appli = $conf->global->MAIN_APPLICATION_TITLE;
 
-		if ($title && ! empty($conf->global->MAIN_HTML_TITLE) && preg_match('/noapp/',$conf->global->MAIN_HTML_TITLE)) print '<title>'.dol_htmlentities($title).'</title>';
+		if ($title && !empty($conf->global->MAIN_HTML_TITLE) && preg_match('/noapp/', $conf->global->MAIN_HTML_TITLE)) print '<title>'.dol_htmlentities($title).'</title>';
 		else if ($title) print '<title>'.dol_htmlentities($appli.' - '.$title).'</title>';
 		else print "<title>".dol_htmlentities($appli)."</title>";
 		print "\n";
 
 		//$ext='';
 		//if (! empty($conf->dol_use_jmobile)) $ext='version='.urlencode(DOL_VERSION);
-		$ext='version='.urlencode(DOL_VERSION);
+		$ext = 'version='.urlencode(DOL_VERSION);
 
-		if (GETPOST('version','int')) $ext='version='.GETPOST('version','int');	// usefull to force no cache on css/js
-		if (GETPOST('testmenuhider','int') || ! empty($conf->global->MAIN_TESTMENUHIDER)) $ext.='&testmenuhider='.(GETPOST('testmenuhider','int')?GETPOST('testmenuhider','int'):$conf->global->MAIN_TESTMENUHIDER);
+		if (GETPOST('version', 'int')) $ext = 'version='.GETPOST('version', 'int'); // usefull to force no cache on css/js
+		if (GETPOST('testmenuhider', 'int') || !empty($conf->global->MAIN_TESTMENUHIDER)) $ext .= '&testmenuhider='.(GETPOST('testmenuhider', 'int') ?GETPOST('testmenuhider', 'int') : $conf->global->MAIN_TESTMENUHIDER);
 
-		$themeparam='?lang='.$langs->defaultlang.'&amp;theme='.$conf->theme.(GETPOST('optioncss','aZ09')?'&amp;optioncss='.GETPOST('optioncss','aZ09',1):'').'&amp;userid='.$user->id.'&amp;entity='.$conf->entity;
-		$themeparam.=($ext?'&amp;'.$ext:'');
-		if (! empty($_SESSION['dol_resetcache'])) $themeparam.='&amp;dol_resetcache='.$_SESSION['dol_resetcache'];
-		if (GETPOST('dol_hide_topmenu','int'))           { $themeparam.='&amp;dol_hide_topmenu='.GETPOST('dol_hide_topmenu','int'); }
-		if (GETPOST('dol_hide_leftmenu','int'))          { $themeparam.='&amp;dol_hide_leftmenu='.GETPOST('dol_hide_leftmenu','int'); }
-		if (GETPOST('dol_optimize_smallscreen','int'))   { $themeparam.='&amp;dol_optimize_smallscreen='.GETPOST('dol_optimize_smallscreen','int'); }
-		if (GETPOST('dol_no_mouse_hover','int'))         { $themeparam.='&amp;dol_no_mouse_hover='.GETPOST('dol_no_mouse_hover','int'); }
-		if (GETPOST('dol_use_jmobile','int'))            { $themeparam.='&amp;dol_use_jmobile='.GETPOST('dol_use_jmobile','int'); $conf->dol_use_jmobile=GETPOST('dol_use_jmobile','int'); }
+		$themeparam = '?lang='.$langs->defaultlang.'&amp;theme='.$conf->theme.(GETPOST('optioncss', 'aZ09') ? '&amp;optioncss='.GETPOST('optioncss', 'aZ09', 1) : '').'&amp;userid='.$user->id.'&amp;entity='.$conf->entity;
+		$themeparam .= ($ext ? '&amp;'.$ext : '');
+		if (!empty($_SESSION['dol_resetcache'])) $themeparam .= '&amp;dol_resetcache='.$_SESSION['dol_resetcache'];
+		if (GETPOST('dol_hide_topmenu', 'int')) { $themeparam .= '&amp;dol_hide_topmenu='.GETPOST('dol_hide_topmenu', 'int'); }
+		if (GETPOST('dol_hide_leftmenu', 'int')) { $themeparam .= '&amp;dol_hide_leftmenu='.GETPOST('dol_hide_leftmenu', 'int'); }
+		if (GETPOST('dol_optimize_smallscreen', 'int')) { $themeparam .= '&amp;dol_optimize_smallscreen='.GETPOST('dol_optimize_smallscreen', 'int'); }
+		if (GETPOST('dol_no_mouse_hover', 'int')) { $themeparam .= '&amp;dol_no_mouse_hover='.GETPOST('dol_no_mouse_hover', 'int'); }
+		if (GETPOST('dol_use_jmobile', 'int')) { $themeparam .= '&amp;dol_use_jmobile='.GETPOST('dol_use_jmobile', 'int'); $conf->dol_use_jmobile = GETPOST('dol_use_jmobile', 'int'); }
 
-		if (! defined('DISABLE_JQUERY') && ! $disablejs && $conf->use_javascript_ajax)
+		if (!defined('DISABLE_JQUERY') && !$disablejs && $conf->use_javascript_ajax)
 		{
 			print '<!-- Includes CSS for JQuery (Ajax library) -->'."\n";
 			$jquerytheme = 'smoothness';
 			if (!empty($conf->global->MAIN_USE_JQUERY_THEME)) $jquerytheme = $conf->global->MAIN_USE_JQUERY_THEME;
-			if (constant('JS_JQUERY_UI')) print '<link rel="stylesheet" type="text/css" href="'.JS_JQUERY_UI.'css/'.$jquerytheme.'/jquery-ui.min.css'.($ext?'?'.$ext:'').'">'."\n";  // JQuery
-			else print '<link rel="stylesheet" type="text/css" href="'.DOL_URL_ROOT.'/includes/jquery/css/'.$jquerytheme.'/jquery-ui.css'.($ext?'?'.$ext:'').'">'."\n";    // JQuery
-			if (! defined('DISABLE_JQUERY_JNOTIFY')) print '<link rel="stylesheet" type="text/css" href="'.DOL_URL_ROOT.'/includes/jquery/plugins/jnotify/jquery.jnotify-alt.min.css'.($ext?'?'.$ext:'').'">'."\n";          // JNotify
+			if (constant('JS_JQUERY_UI')) print '<link rel="stylesheet" type="text/css" href="'.JS_JQUERY_UI.'css/'.$jquerytheme.'/jquery-ui.min.css'.($ext ? '?'.$ext : '').'">'."\n"; // JQuery
+			else print '<link rel="stylesheet" type="text/css" href="'.DOL_URL_ROOT.'/includes/jquery/css/'.$jquerytheme.'/jquery-ui.css'.($ext ? '?'.$ext : '').'">'."\n"; // JQuery
+			if (!defined('DISABLE_JQUERY_JNOTIFY')) print '<link rel="stylesheet" type="text/css" href="'.DOL_URL_ROOT.'/includes/jquery/plugins/jnotify/jquery.jnotify-alt.min.css'.($ext ? '?'.$ext : '').'">'."\n"; // JNotify
 			/* Removed a old hidden problematic feature never used in Dolibarr. If an external module need datatable, the module must provide all lib it needs and manage version problems with other dolibarr components
             if (! empty($conf->global->MAIN_USE_JQUERY_DATATABLES) || (defined('REQUIRE_JQUERY_DATATABLES') && constant('REQUIRE_JQUERY_DATATABLES')))     // jQuery datatables
             {
@@ -1141,58 +1141,58 @@ 
                 print '<link rel="stylesheet" type="text/css" href="'.DOL_URL_ROOT.'/includes/jquery/plugins/datatables/extensions/Buttons/css/buttons.dataTables.min.css'.($ext?'?'.$ext:'').'">'."\n";
                 print '<link rel="stylesheet" type="text/css" href="'.DOL_URL_ROOT.'/includes/jquery/plugins/datatables/extensions/ColReorder/css/colReorder.dataTables.min.css'.($ext?'?'.$ext:'').'"></script>'."\n";
             }*/
-			if (! defined('DISABLE_SELECT2') && (! empty($conf->global->MAIN_USE_JQUERY_MULTISELECT) || defined('REQUIRE_JQUERY_MULTISELECT')))     // jQuery plugin "mutiselect", "multiple-select", "select2"...
+			if (!defined('DISABLE_SELECT2') && (!empty($conf->global->MAIN_USE_JQUERY_MULTISELECT) || defined('REQUIRE_JQUERY_MULTISELECT')))     // jQuery plugin "mutiselect", "multiple-select", "select2"...
 			{
-				$tmpplugin=empty($conf->global->MAIN_USE_JQUERY_MULTISELECT)?constant('REQUIRE_JQUERY_MULTISELECT'):$conf->global->MAIN_USE_JQUERY_MULTISELECT;
-				print '<link rel="stylesheet" type="text/css" href="'.DOL_URL_ROOT.'/includes/jquery/plugins/'.$tmpplugin.'/dist/css/'.$tmpplugin.'.css'.($ext?'?'.$ext:'').'">'."\n";
+				$tmpplugin = empty($conf->global->MAIN_USE_JQUERY_MULTISELECT) ?constant('REQUIRE_JQUERY_MULTISELECT') : $conf->global->MAIN_USE_JQUERY_MULTISELECT;
+				print '<link rel="stylesheet" type="text/css" href="'.DOL_URL_ROOT.'/includes/jquery/plugins/'.$tmpplugin.'/dist/css/'.$tmpplugin.'.css'.($ext ? '?'.$ext : '').'">'."\n";
 			}
 			// jQuery Timepicker
-			if (! empty($conf->global->MAIN_USE_JQUERY_TIMEPICKER) || defined('REQUIRE_JQUERY_TIMEPICKER'))
+			if (!empty($conf->global->MAIN_USE_JQUERY_TIMEPICKER) || defined('REQUIRE_JQUERY_TIMEPICKER'))
 			{
-				print '<link rel="stylesheet" type="text/css" href="'.DOL_URL_ROOT.'/includes/jquery/plugins/timepicker/jquery-ui-timepicker-addon.css'.($ext?'?'.$ext:'').'">'."\n";
+				print '<link rel="stylesheet" type="text/css" href="'.DOL_URL_ROOT.'/includes/jquery/plugins/timepicker/jquery-ui-timepicker-addon.css'.($ext ? '?'.$ext : '').'">'."\n";
 			}
 		}
 
-		if (! defined('DISABLE_FONT_AWSOME'))
+		if (!defined('DISABLE_FONT_AWSOME'))
 		{
 			print '<!-- Includes CSS for font awesome -->'."\n";
-			print '<link rel="stylesheet" type="text/css" href="'.DOL_URL_ROOT.'/theme/common/fontawesome/css/font-awesome.min.css'.($ext?'?'.$ext:'').'">'."\n";
+			print '<link rel="stylesheet" type="text/css" href="'.DOL_URL_ROOT.'/theme/common/fontawesome/css/font-awesome.min.css'.($ext ? '?'.$ext : '').'">'."\n";
 		}
 
 		print '<!-- Includes CSS for Dolibarr theme -->'."\n";
 		// Output style sheets (optioncss='print' or ''). Note: $conf->css looks like '/theme/eldy/style.css.php'
-		$themepath=dol_buildpath($conf->css,1);
-		$themesubdir='';
-		if (! empty($conf->modules_parts['theme']))	// This slow down
+		$themepath = dol_buildpath($conf->css, 1);
+		$themesubdir = '';
+		if (!empty($conf->modules_parts['theme']))	// This slow down
 		{
-			foreach($conf->modules_parts['theme'] as $reldir)
+			foreach ($conf->modules_parts['theme'] as $reldir)
 			{
 				if (file_exists(dol_buildpath($reldir.$conf->css, 0)))
 				{
-					$themepath=dol_buildpath($reldir.$conf->css, 1);
-					$themesubdir=$reldir;
+					$themepath = dol_buildpath($reldir.$conf->css, 1);
+					$themesubdir = $reldir;
 					break;
 				}
 			}
 		}
 		//print 'themepath='.$themepath.' themeparam='.$themeparam;exit;
 		print '<link rel="stylesheet" type="text/css" href="'.$themepath.$themeparam.'">'."\n";
-		if (! empty($conf->global->MAIN_FIX_FLASH_ON_CHROME)) print '<!-- Includes CSS that does not exists as a workaround of flash bug of chrome -->'."\n".'<link rel="stylesheet" type="text/css" href="filethatdoesnotexiststosolvechromeflashbug">'."\n";
+		if (!empty($conf->global->MAIN_FIX_FLASH_ON_CHROME)) print '<!-- Includes CSS that does not exists as a workaround of flash bug of chrome -->'."\n".'<link rel="stylesheet" type="text/css" href="filethatdoesnotexiststosolvechromeflashbug">'."\n";
 
 		// CSS forced by modules (relative url starting with /)
-		if (! empty($conf->modules_parts['css']))
+		if (!empty($conf->modules_parts['css']))
 		{
-			$arraycss=(array) $conf->modules_parts['css'];
-			foreach($arraycss as $modcss => $filescss)
+			$arraycss = (array) $conf->modules_parts['css'];
+			foreach ($arraycss as $modcss => $filescss)
 			{
-				$filescss=(array) $filescss;	// To be sure filecss is an array
-				foreach($filescss as $cssfile)
+				$filescss = (array) $filescss; // To be sure filecss is an array
+				foreach ($filescss as $cssfile)
 				{
 					if (empty($cssfile)) dol_syslog("Warning: module ".$modcss." declared a css path file into its descriptor that is empty.", LOG_WARNING);
 					// cssfile is a relative path
-					print '<!-- Includes CSS added by module '.$modcss. ' -->'."\n".'<link rel="stylesheet" type="text/css" href="'.dol_buildpath($cssfile,1);
+					print '<!-- Includes CSS added by module '.$modcss.' -->'."\n".'<link rel="stylesheet" type="text/css" href="'.dol_buildpath($cssfile, 1);
 					// We add params only if page is not static, because some web server setup does not return content type text/css if url has parameters, so browser cache is not used.
-					if (!preg_match('/\.css$/i',$cssfile)) print $themeparam;
+					if (!preg_match('/\.css$/i', $cssfile)) print $themeparam;
 					print '">'."\n";
 				}
 			}
@@ -1200,71 +1200,71 @@ 
 		// CSS forced by page in top_htmlhead call (relative url starting with /)
 		if (is_array($arrayofcss))
 		{
-			foreach($arrayofcss as $cssfile)
+			foreach ($arrayofcss as $cssfile)
 			{
-				print '<!-- Includes CSS added by page -->'."\n".'<link rel="stylesheet" type="text/css" title="default" href="'.dol_buildpath($cssfile,1);
+				print '<!-- Includes CSS added by page -->'."\n".'<link rel="stylesheet" type="text/css" title="default" href="'.dol_buildpath($cssfile, 1);
 				// We add params only if page is not static, because some web server setup does not return content type text/css if url has parameters and browser cache is not used.
-				if (!preg_match('/\.css$/i',$cssfile)) print $themeparam;
+				if (!preg_match('/\.css$/i', $cssfile)) print $themeparam;
 				print '">'."\n";
 			}
 		}
 
 		// Output standard javascript links
-		if (! defined('DISABLE_JQUERY') && ! $disablejs && ! empty($conf->use_javascript_ajax))
+		if (!defined('DISABLE_JQUERY') && !$disablejs && !empty($conf->use_javascript_ajax))
 		{
 			// JQuery. Must be before other includes
 			print '<!-- Includes JS for JQuery -->'."\n";
-			if (defined('JS_JQUERY') && constant('JS_JQUERY')) print '<script type="text/javascript" src="'.JS_JQUERY.'jquery.min.js'.($ext?'?'.$ext:'').'"></script>'."\n";
-			else print '<script type="text/javascript" src="'.DOL_URL_ROOT.'/includes/jquery/js/jquery.min.js'.($ext?'?'.$ext:'').'"></script>'."\n";
-			if (! empty($conf->global->MAIN_FEATURES_LEVEL) && ! defined('JS_JQUERY_MIGRATE_DISABLED'))
+			if (defined('JS_JQUERY') && constant('JS_JQUERY')) print '<script type="text/javascript" src="'.JS_JQUERY.'jquery.min.js'.($ext ? '?'.$ext : '').'"></script>'."\n";
+			else print '<script type="text/javascript" src="'.DOL_URL_ROOT.'/includes/jquery/js/jquery.min.js'.($ext ? '?'.$ext : '').'"></script>'."\n";
+			if (!empty($conf->global->MAIN_FEATURES_LEVEL) && !defined('JS_JQUERY_MIGRATE_DISABLED'))
 			{
-				if (defined('JS_JQUERY_MIGRATE') && constant('JS_JQUERY_MIGRATE')) print '<script type="text/javascript" src="'.JS_JQUERY_MIGRATE.'jquery-migrate.min.js'.($ext?'?'.$ext:'').'"></script>'."\n";
-				else print '<script type="text/javascript" src="'.DOL_URL_ROOT.'/includes/jquery/js/jquery-migrate.min.js'.($ext?'?'.$ext:'').'"></script>'."\n";
+				if (defined('JS_JQUERY_MIGRATE') && constant('JS_JQUERY_MIGRATE')) print '<script type="text/javascript" src="'.JS_JQUERY_MIGRATE.'jquery-migrate.min.js'.($ext ? '?'.$ext : '').'"></script>'."\n";
+				else print '<script type="text/javascript" src="'.DOL_URL_ROOT.'/includes/jquery/js/jquery-migrate.min.js'.($ext ? '?'.$ext : '').'"></script>'."\n";
 			}
-			if (defined('JS_JQUERY_UI') && constant('JS_JQUERY_UI')) print '<script type="text/javascript" src="'.JS_JQUERY_UI.'jquery-ui.min.js'.($ext?'?'.$ext:'').'"></script>'."\n";
-			else print '<script type="text/javascript" src="'.DOL_URL_ROOT.'/includes/jquery/js/jquery-ui.min.js'.($ext?'?'.$ext:'').'"></script>'."\n";
-			if (! defined('DISABLE_JQUERY_TABLEDND')) print '<script type="text/javascript" src="'.DOL_URL_ROOT.'/includes/jquery/plugins/tablednd/jquery.tablednd.0.6.min.js'.($ext?'?'.$ext:'').'"></script>'."\n";
+			if (defined('JS_JQUERY_UI') && constant('JS_JQUERY_UI')) print '<script type="text/javascript" src="'.JS_JQUERY_UI.'jquery-ui.min.js'.($ext ? '?'.$ext : '').'"></script>'."\n";
+			else print '<script type="text/javascript" src="'.DOL_URL_ROOT.'/includes/jquery/js/jquery-ui.min.js'.($ext ? '?'.$ext : '').'"></script>'."\n";
+			if (!defined('DISABLE_JQUERY_TABLEDND')) print '<script type="text/javascript" src="'.DOL_URL_ROOT.'/includes/jquery/plugins/tablednd/jquery.tablednd.0.6.min.js'.($ext ? '?'.$ext : '').'"></script>'."\n";
 			// jQuery jnotify
-			if (empty($conf->global->MAIN_DISABLE_JQUERY_JNOTIFY) && ! defined('DISABLE_JQUERY_JNOTIFY'))
+			if (empty($conf->global->MAIN_DISABLE_JQUERY_JNOTIFY) && !defined('DISABLE_JQUERY_JNOTIFY'))
 			{
-				print '<script type="text/javascript" src="'.DOL_URL_ROOT.'/includes/jquery/plugins/jnotify/jquery.jnotify.min.js'.($ext?'?'.$ext:'').'"></script>'."\n";
-				print '<script type="text/javascript" src="'.DOL_URL_ROOT.'/core/js/jnotify.js'.($ext?'?'.$ext:'').'"></script>'."\n";
+				print '<script type="text/javascript" src="'.DOL_URL_ROOT.'/includes/jquery/plugins/jnotify/jquery.jnotify.min.js'.($ext ? '?'.$ext : '').'"></script>'."\n";
+				print '<script type="text/javascript" src="'.DOL_URL_ROOT.'/core/js/jnotify.js'.($ext ? '?'.$ext : '').'"></script>'."\n";
 			}
 			// Flot
-			if (empty($conf->global->MAIN_DISABLE_JQUERY_FLOT) && ! defined('DISABLE_JQUERY_FLOT'))
+			if (empty($conf->global->MAIN_DISABLE_JQUERY_FLOT) && !defined('DISABLE_JQUERY_FLOT'))
 			{
 				if (constant('JS_JQUERY_FLOT'))
 				{
-					print '<script type="text/javascript" src="'.JS_JQUERY_FLOT.'jquery.flot.js'.($ext?'?'.$ext:'').'"></script>'."\n";
-					print '<script type="text/javascript" src="'.JS_JQUERY_FLOT.'jquery.flot.pie.js'.($ext?'?'.$ext:'').'"></script>'."\n";
-					print '<script type="text/javascript" src="'.JS_JQUERY_FLOT.'jquery.flot.stack.js'.($ext?'?'.$ext:'').'"></script>'."\n";
+					print '<script type="text/javascript" src="'.JS_JQUERY_FLOT.'jquery.flot.js'.($ext ? '?'.$ext : '').'"></script>'."\n";
+					print '<script type="text/javascript" src="'.JS_JQUERY_FLOT.'jquery.flot.pie.js'.($ext ? '?'.$ext : '').'"></script>'."\n";
+					print '<script type="text/javascript" src="'.JS_JQUERY_FLOT.'jquery.flot.stack.js'.($ext ? '?'.$ext : '').'"></script>'."\n";
 				}
 				else
 				{
-					print '<script type="text/javascript" src="'.DOL_URL_ROOT.'/includes/jquery/plugins/flot/jquery.flot.min.js'.($ext?'?'.$ext:'').'"></script>'."\n";
-					print '<script type="text/javascript" src="'.DOL_URL_ROOT.'/includes/jquery/plugins/flot/jquery.flot.pie.min.js'.($ext?'?'.$ext:'').'"></script>'."\n";
-					print '<script type="text/javascript" src="'.DOL_URL_ROOT.'/includes/jquery/plugins/flot/jquery.flot.stack.min.js'.($ext?'?'.$ext:'').'"></script>'."\n";
+					print '<script type="text/javascript" src="'.DOL_URL_ROOT.'/includes/jquery/plugins/flot/jquery.flot.min.js'.($ext ? '?'.$ext : '').'"></script>'."\n";
+					print '<script type="text/javascript" src="'.DOL_URL_ROOT.'/includes/jquery/plugins/flot/jquery.flot.pie.min.js'.($ext ? '?'.$ext : '').'"></script>'."\n";
+					print '<script type="text/javascript" src="'.DOL_URL_ROOT.'/includes/jquery/plugins/flot/jquery.flot.stack.min.js'.($ext ? '?'.$ext : '').'"></script>'."\n";
 				}
 			}
 			// jQuery jeditable
-			if (! empty($conf->global->MAIN_USE_JQUERY_JEDITABLE) && ! defined('DISABLE_JQUERY_JEDITABLE'))
+			if (!empty($conf->global->MAIN_USE_JQUERY_JEDITABLE) && !defined('DISABLE_JQUERY_JEDITABLE'))
 			{
 				print '<!-- JS to manage editInPlace feature -->'."\n";
-				print '<script type="text/javascript" src="'.DOL_URL_ROOT.'/includes/jquery/plugins/jeditable/jquery.jeditable.min.js'.($ext?'?'.$ext:'').'"></script>'."\n";
-				print '<script type="text/javascript" src="'.DOL_URL_ROOT.'/includes/jquery/plugins/jeditable/jquery.jeditable.ui-datepicker.js'.($ext?'?'.$ext:'').'"></script>'."\n";
-				print '<script type="text/javascript" src="'.DOL_URL_ROOT.'/includes/jquery/plugins/jeditable/jquery.jeditable.ui-autocomplete.js'.($ext?'?'.$ext:'').'"></script>'."\n";
+				print '<script type="text/javascript" src="'.DOL_URL_ROOT.'/includes/jquery/plugins/jeditable/jquery.jeditable.min.js'.($ext ? '?'.$ext : '').'"></script>'."\n";
+				print '<script type="text/javascript" src="'.DOL_URL_ROOT.'/includes/jquery/plugins/jeditable/jquery.jeditable.ui-datepicker.js'.($ext ? '?'.$ext : '').'"></script>'."\n";
+				print '<script type="text/javascript" src="'.DOL_URL_ROOT.'/includes/jquery/plugins/jeditable/jquery.jeditable.ui-autocomplete.js'.($ext ? '?'.$ext : '').'"></script>'."\n";
 				print '<script type="text/javascript">'."\n";
 				print 'var urlSaveInPlace = \''.DOL_URL_ROOT.'/core/ajax/saveinplace.php\';'."\n";
 				print 'var urlLoadInPlace = \''.DOL_URL_ROOT.'/core/ajax/loadinplace.php\';'."\n";
-				print 'var tooltipInPlace = \''.$langs->transnoentities('ClickToEdit').'\';'."\n";	// Added in title attribute of span
-				print 'var placeholderInPlace = \'&nbsp;\';'."\n";	// If we put another string than $langs->trans("ClickToEdit") here, nothing is shown. If we put empty string, there is error, Why ?
+				print 'var tooltipInPlace = \''.$langs->transnoentities('ClickToEdit').'\';'."\n"; // Added in title attribute of span
+				print 'var placeholderInPlace = \'&nbsp;\';'."\n"; // If we put another string than $langs->trans("ClickToEdit") here, nothing is shown. If we put empty string, there is error, Why ?
 				print 'var cancelInPlace = \''.$langs->trans('Cancel').'\';'."\n";
 				print 'var submitInPlace = \''.$langs->trans('Ok').'\';'."\n";
 				print 'var indicatorInPlace = \'<img src="'.DOL_URL_ROOT."/theme/".$conf->theme."/img/working.gif".'">\';'."\n";
-				print 'var withInPlace = 300;';		// width in pixel for default string edit
+				print 'var withInPlace = 300;'; // width in pixel for default string edit
 				print '</script>'."\n";
-				print '<script type="text/javascript" src="'.DOL_URL_ROOT.'/core/js/editinplace.js'.($ext?'?'.$ext:'').'"></script>'."\n";
-				print '<script type="text/javascript" src="'.DOL_URL_ROOT.'/includes/jquery/plugins/jeditable/jquery.jeditable.ckeditor.js'.($ext?'?'.$ext:'').'"></script>'."\n";
+				print '<script type="text/javascript" src="'.DOL_URL_ROOT.'/core/js/editinplace.js'.($ext ? '?'.$ext : '').'"></script>'."\n";
+				print '<script type="text/javascript" src="'.DOL_URL_ROOT.'/includes/jquery/plugins/jeditable/jquery.jeditable.ckeditor.js'.($ext ? '?'.$ext : '').'"></script>'."\n";
 			}
 			// jQuery DataTables
 			/* Removed a old hidden problematic feature never used in Dolibarr. If an external module need datatable, the module must provide all lib it needs and manage version problems with other dolibarr components
@@ -1280,67 +1280,67 @@ 
                 print '<script type="text/javascript" src="'.DOL_URL_ROOT.'/includes/jszip/jszip.min.js"></script>'."\n";
             }*/
             // jQuery Timepicker
-            if (! empty($conf->global->MAIN_USE_JQUERY_TIMEPICKER) || defined('REQUIRE_JQUERY_TIMEPICKER'))
+            if (!empty($conf->global->MAIN_USE_JQUERY_TIMEPICKER) || defined('REQUIRE_JQUERY_TIMEPICKER'))
             {
-            	print '<script type="text/javascript" src="'.DOL_URL_ROOT.'/includes/jquery/plugins/timepicker/jquery-ui-timepicker-addon.js'.($ext?'?'.$ext:'').'"></script>'."\n";
-            	print '<script type="text/javascript" src="'.DOL_URL_ROOT.'/core/js/timepicker.js.php?lang='.$langs->defaultlang.($ext?'&amp;'.$ext:'').'"></script>'."\n";
+            	print '<script type="text/javascript" src="'.DOL_URL_ROOT.'/includes/jquery/plugins/timepicker/jquery-ui-timepicker-addon.js'.($ext ? '?'.$ext : '').'"></script>'."\n";
+            	print '<script type="text/javascript" src="'.DOL_URL_ROOT.'/core/js/timepicker.js.php?lang='.$langs->defaultlang.($ext ? '&amp;'.$ext : '').'"></script>'."\n";
             }
-            if (! defined('DISABLE_SELECT2') && (! empty($conf->global->MAIN_USE_JQUERY_MULTISELECT) || defined('REQUIRE_JQUERY_MULTISELECT')))     // jQuery plugin "mutiselect", "multiple-select", "select2", ...
+            if (!defined('DISABLE_SELECT2') && (!empty($conf->global->MAIN_USE_JQUERY_MULTISELECT) || defined('REQUIRE_JQUERY_MULTISELECT')))     // jQuery plugin "mutiselect", "multiple-select", "select2", ...
             {
-            	$tmpplugin=empty($conf->global->MAIN_USE_JQUERY_MULTISELECT)?constant('REQUIRE_JQUERY_MULTISELECT'):$conf->global->MAIN_USE_JQUERY_MULTISELECT;
-            	print '<script type="text/javascript" src="'.DOL_URL_ROOT.'/includes/jquery/plugins/'.$tmpplugin.'/dist/js/'.$tmpplugin.'.full.min.js'.($ext?'?'.$ext:'').'"></script>'."\n";	// We include full because we need the support of containerCssClass
+            	$tmpplugin = empty($conf->global->MAIN_USE_JQUERY_MULTISELECT) ?constant('REQUIRE_JQUERY_MULTISELECT') : $conf->global->MAIN_USE_JQUERY_MULTISELECT;
+            	print '<script type="text/javascript" src="'.DOL_URL_ROOT.'/includes/jquery/plugins/'.$tmpplugin.'/dist/js/'.$tmpplugin.'.full.min.js'.($ext ? '?'.$ext : '').'"></script>'."\n"; // We include full because we need the support of containerCssClass
             }
         }
 
-        if (! $disablejs && ! empty($conf->use_javascript_ajax))
+        if (!$disablejs && !empty($conf->use_javascript_ajax))
         {
             // CKEditor
-            if (! empty($conf->fckeditor->enabled) && (empty($conf->global->FCKEDITOR_EDITORNAME) || $conf->global->FCKEDITOR_EDITORNAME == 'ckeditor') && ! defined('DISABLE_CKEDITOR'))
+            if (!empty($conf->fckeditor->enabled) && (empty($conf->global->FCKEDITOR_EDITORNAME) || $conf->global->FCKEDITOR_EDITORNAME == 'ckeditor') && !defined('DISABLE_CKEDITOR'))
             {
                 print '<!-- Includes JS for CKEditor -->'."\n";
-                $pathckeditor = DOL_URL_ROOT . '/includes/ckeditor/ckeditor/';
-                $jsckeditor='ckeditor.js';
+                $pathckeditor = DOL_URL_ROOT.'/includes/ckeditor/ckeditor/';
+                $jsckeditor = 'ckeditor.js';
                 if (constant('JS_CKEDITOR'))	// To use external ckeditor 4 js lib
                 {
-                	$pathckeditor=constant('JS_CKEDITOR');
+                	$pathckeditor = constant('JS_CKEDITOR');
                 }
                 print '<script type="text/javascript">';
                 print 'var CKEDITOR_BASEPATH = \''.$pathckeditor.'\';'."\n";
-                print 'var ckeditorConfig = \''.dol_buildpath($themesubdir.'/theme/'.$conf->theme.'/ckeditor/config.js'.($ext?'?'.$ext:''),1).'\';'."\n";		// $themesubdir='' in standard usage
+                print 'var ckeditorConfig = \''.dol_buildpath($themesubdir.'/theme/'.$conf->theme.'/ckeditor/config.js'.($ext ? '?'.$ext : ''), 1).'\';'."\n"; // $themesubdir='' in standard usage
                 print 'var ckeditorFilebrowserBrowseUrl = \''.DOL_URL_ROOT.'/core/filemanagerdol/browser/default/browser.php?Connector='.DOL_URL_ROOT.'/core/filemanagerdol/connectors/php/connector.php\';'."\n";
                 print 'var ckeditorFilebrowserImageBrowseUrl = \''.DOL_URL_ROOT.'/core/filemanagerdol/browser/default/browser.php?Type=Image&Connector='.DOL_URL_ROOT.'/core/filemanagerdol/connectors/php/connector.php\';'."\n";
                 print '</script>'."\n";
-                print '<script type="text/javascript" src="'.$pathckeditor.$jsckeditor.($ext?'?'.$ext:'').'"></script>'."\n";
+                print '<script type="text/javascript" src="'.$pathckeditor.$jsckeditor.($ext ? '?'.$ext : '').'"></script>'."\n";
             }
 
             // Browser notifications
-            if (! defined('DISABLE_BROWSER_NOTIF'))
+            if (!defined('DISABLE_BROWSER_NOTIF'))
             {
-                $enablebrowsernotif=false;
-                if (! empty($conf->agenda->enabled) && ! empty($conf->global->AGENDA_REMINDER_BROWSER)) $enablebrowsernotif=true;
-                if ($conf->browser->layout == 'phone') $enablebrowsernotif=false;
+                $enablebrowsernotif = false;
+                if (!empty($conf->agenda->enabled) && !empty($conf->global->AGENDA_REMINDER_BROWSER)) $enablebrowsernotif = true;
+                if ($conf->browser->layout == 'phone') $enablebrowsernotif = false;
                 if ($enablebrowsernotif)
                 {
                     print '<!-- Includes JS of Dolibarr (brwoser layout = '.$conf->browser->layout.')-->'."\n";
-                    print '<script type="text/javascript" src="'.DOL_URL_ROOT.'/core/js/lib_notification.js.php'.($ext?'?'.$ext:'').'"></script>'."\n";
+                    print '<script type="text/javascript" src="'.DOL_URL_ROOT.'/core/js/lib_notification.js.php'.($ext ? '?'.$ext : '').'"></script>'."\n";
                 }
             }
 
             // Global js function
             print '<!-- Includes JS of Dolibarr -->'."\n";
-            print '<script type="text/javascript" src="'.DOL_URL_ROOT.'/core/js/lib_head.js.php?lang='.$langs->defaultlang.($ext?'&amp;'.$ext:'').'"></script>'."\n";
+            print '<script type="text/javascript" src="'.DOL_URL_ROOT.'/core/js/lib_head.js.php?lang='.$langs->defaultlang.($ext ? '&amp;'.$ext : '').'"></script>'."\n";
 
             // JS forced by modules (relative url starting with /)
-            if (! empty($conf->modules_parts['js']))		// $conf->modules_parts['js'] is array('module'=>array('file1','file2'))
+            if (!empty($conf->modules_parts['js']))		// $conf->modules_parts['js'] is array('module'=>array('file1','file2'))
         	{
-        		$arrayjs=(array) $conf->modules_parts['js'];
-	            foreach($arrayjs as $modjs => $filesjs)
+        		$arrayjs = (array) $conf->modules_parts['js'];
+	            foreach ($arrayjs as $modjs => $filesjs)
 	            {
-        			$filesjs=(array) $filesjs;	// To be sure filejs is an array
-		            foreach($filesjs as $jsfile)
+        			$filesjs = (array) $filesjs; // To be sure filejs is an array
+		            foreach ($filesjs as $jsfile)
 		            {
 	    	    		// jsfile is a relative path
-	        	    	print '<!-- Include JS added by module '.$modjs. '-->'."\n".'<script type="text/javascript" src="'.dol_buildpath($jsfile,1).'"></script>'."\n";
+	        	    	print '<!-- Include JS added by module '.$modjs.'-->'."\n".'<script type="text/javascript" src="'.dol_buildpath($jsfile, 1).'"></script>'."\n";
 		            }
 	            }
         	}
@@ -1348,28 +1348,28 @@ 
             if (is_array($arrayofjs))
             {
                 print '<!-- Includes JS added by page -->'."\n";
-                foreach($arrayofjs as $jsfile)
+                foreach ($arrayofjs as $jsfile)
                 {
-                    if (preg_match('/^http/i',$jsfile))
+                    if (preg_match('/^http/i', $jsfile))
                     {
                         print '<script type="text/javascript" src="'.$jsfile.'"></script>'."\n";
                     }
                     else
                     {
-                        if (! preg_match('/^\//',$jsfile)) $jsfile='/'.$jsfile;	// For backward compatibility
-                        print '<script type="text/javascript" src="'.dol_buildpath($jsfile,1).'"></script>'."\n";
+                        if (!preg_match('/^\//', $jsfile)) $jsfile = '/'.$jsfile; // For backward compatibility
+                        print '<script type="text/javascript" src="'.dol_buildpath($jsfile, 1).'"></script>'."\n";
                     }
                 }
             }
         }
 
-        if (! empty($head)) print $head."\n";
-        if (! empty($conf->global->MAIN_HTML_HEADER)) print $conf->global->MAIN_HTML_HEADER."\n";
+        if (!empty($head)) print $head."\n";
+        if (!empty($conf->global->MAIN_HTML_HEADER)) print $conf->global->MAIN_HTML_HEADER."\n";
 
         print "</head>\n\n";
     }
 
-    $conf->headerdone=1;	// To tell header was output
+    $conf->headerdone = 1; // To tell header was output
 }
 
 
@@ -1389,19 +1389,19 @@ 
  * 									                   For other external page: http://server/url
  *  @return		void
  */
-function top_menu($head, $title='', $target='', $disablejs=0, $disablehead=0, $arrayofjs='', $arrayofcss='', $morequerystring='', $helppagename='')
+function top_menu($head, $title = '', $target = '', $disablejs = 0, $disablehead = 0, $arrayofjs = '', $arrayofcss = '', $morequerystring = '', $helppagename = '')
 {
 	global $user, $conf, $langs, $db;
 	global $dolibarr_main_authentication, $dolibarr_main_demo;
-	global $hookmanager,$menumanager;
+	global $hookmanager, $menumanager;
 
-	$searchform='';
-	$bookmarks='';
+	$searchform = '';
+	$bookmarks = '';
 
 	// Instantiate hooks of thirdparty module
 	$hookmanager->initHooks(array('toprightmenu'));
 
-	$toprightmenu='';
+	$toprightmenu = '';
 
 	// For backward compatibility with old modules
 	if (empty($conf->headerdone))
@@ -1413,49 +1413,49 @@ 
 	/*
      * Top menu
      */
-	if (empty($conf->dol_hide_topmenu) && (! defined('NOREQUIREMENU') || ! constant('NOREQUIREMENU')))
+	if (empty($conf->dol_hide_topmenu) && (!defined('NOREQUIREMENU') || !constant('NOREQUIREMENU')))
 	{
 		print "\n".'<!-- Start top horizontal -->'."\n";
 
 		print '<div class="side-nav-vert"><div id="id-top">';
 
 		// Show menu entries
-		print '<div id="tmenu_tooltip'.(empty($conf->global->MAIN_MENU_INVERT)?'':'invert').'" class="tmenu">'."\n";
-		$menumanager->atarget=$target;
-		$menumanager->showmenu('top', array('searchform'=>$searchform, 'bookmarks'=>$bookmarks));      // This contains a \n
+		print '<div id="tmenu_tooltip'.(empty($conf->global->MAIN_MENU_INVERT) ? '' : 'invert').'" class="tmenu">'."\n";
+		$menumanager->atarget = $target;
+		$menumanager->showmenu('top', array('searchform'=>$searchform, 'bookmarks'=>$bookmarks)); // This contains a \n
 		print "</div>\n";
 
 		// Define link to login card
-		$appli=constant('DOL_APPLICATION_TITLE');
-		if (! empty($conf->global->MAIN_APPLICATION_TITLE))
+		$appli = constant('DOL_APPLICATION_TITLE');
+		if (!empty($conf->global->MAIN_APPLICATION_TITLE))
 		{
-			$appli=$conf->global->MAIN_APPLICATION_TITLE;
+			$appli = $conf->global->MAIN_APPLICATION_TITLE;
 			if (preg_match('/\d\.\d/', $appli))
 			{
-				if (! preg_match('/'.preg_quote(DOL_VERSION).'/', $appli)) $appli.=" (".DOL_VERSION.")";	// If new title contains a version that is different than core
+				if (!preg_match('/'.preg_quote(DOL_VERSION).'/', $appli)) $appli .= " (".DOL_VERSION.")"; // If new title contains a version that is different than core
 			}
-			else $appli.=" ".DOL_VERSION;
+			else $appli .= " ".DOL_VERSION;
 		}
-		else $appli.=" ".DOL_VERSION;
+		else $appli .= " ".DOL_VERSION;
 
-		if (! empty($conf->global->MAIN_FEATURES_LEVEL)) $appli.="<br>".$langs->trans("LevelOfFeature").': '.$conf->global->MAIN_FEATURES_LEVEL;
+		if (!empty($conf->global->MAIN_FEATURES_LEVEL)) $appli .= "<br>".$langs->trans("LevelOfFeature").': '.$conf->global->MAIN_FEATURES_LEVEL;
 
-		$logouttext='';
+		$logouttext = '';
 		if (empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER))
 		{
 			//$logouthtmltext=$appli.'<br>';
 			if ($_SESSION["dol_authmode"] != 'forceuser' && $_SESSION["dol_authmode"] != 'http')
 			{
-				$logouthtmltext.=$langs->trans("Logout").'<br>';
+				$logouthtmltext .= $langs->trans("Logout").'<br>';
 
-				$logouttext .='<a href="'.DOL_URL_ROOT.'/user/logout.php">';
+				$logouttext .= '<a href="'.DOL_URL_ROOT.'/user/logout.php">';
 				//$logouttext .= img_picto($langs->trans('Logout').":".$langs->trans('Logout'), 'logout_top.png', 'class="login"', 0, 0, 1);
-				$logouttext .='<span class="fa fa-sign-out atoplogin"></span>';
-				$logouttext .='</a>';
+				$logouttext .= '<span class="fa fa-sign-out atoplogin"></span>';
+				$logouttext .= '</a>';
 			}
 			else
 			{
-				$logouthtmltext.=$langs->trans("NoLogoutProcessWithAuthMode",$_SESSION["dol_authmode"]);
+				$logouthtmltext .= $langs->trans("NoLogoutProcessWithAuthMode", $_SESSION["dol_authmode"]);
 				$logouttext .= img_picto($langs->trans('Logout').":".$langs->trans('Logout'), 'logout_top.png', 'class="login"', 0, 0, 1);
 			}
 		}
@@ -1463,55 +1463,55 @@ 
 		print '<div class="login_block">'."\n";
 
 		// Add login user link
-		$toprightmenu.='<div class="login_block_user">';
+		$toprightmenu .= '<div class="login_block_user">';
 
 		// Login name with photo and tooltip
-		$mode=-1;
-		$toprightmenu.='<div class="inline-block nowrap"><div class="inline-block login_block_elem login_block_elem_name" style="padding: 0px;">';
-		$toprightmenu.=$user->getNomUrl($mode, '', 1, 0, 11, 0, ($user->firstname ? 'firstname' : -1),'atoplogin');
-		$toprightmenu.='</div></div>';
+		$mode = -1;
+		$toprightmenu .= '<div class="inline-block nowrap"><div class="inline-block login_block_elem login_block_elem_name" style="padding: 0px;">';
+		$toprightmenu .= $user->getNomUrl($mode, '', 1, 0, 11, 0, ($user->firstname ? 'firstname' : -1), 'atoplogin');
+		$toprightmenu .= '</div></div>';
 
-		$toprightmenu.='</div>'."\n";
+		$toprightmenu .= '</div>'."\n";
 
-		$toprightmenu.='<div class="login_block_other">';
+		$toprightmenu .= '<div class="login_block_other">';
 
 		// Execute hook printTopRightMenu (hooks should output string like '<div class="login"><a href="">mylink</a></div>')
-		$parameters=array();
-		$result=$hookmanager->executeHooks('printTopRightMenu',$parameters);    // Note that $action and $object may have been modified by some hooks
+		$parameters = array();
+		$result = $hookmanager->executeHooks('printTopRightMenu', $parameters); // Note that $action and $object may have been modified by some hooks
 		if (is_numeric($result))
 		{
-			if (empty($result)) $toprightmenu.=$hookmanager->resPrint;		// add
-			else  $toprightmenu=$hookmanager->resPrint;						// replace
+			if (empty($result)) $toprightmenu .= $hookmanager->resPrint; // add
+			else  $toprightmenu = $hookmanager->resPrint; // replace
 		}
-		else $toprightmenu.=$result;	// For backward compatibility
+		else $toprightmenu .= $result; // For backward compatibility
 
 		// Link to module builder
-		if (! empty($conf->modulebuilder->enabled))
+		if (!empty($conf->modulebuilder->enabled))
 		{
-			$text ='<a href="'.DOL_URL_ROOT.'/modulebuilder/index.php?mainmenu=home&leftmenu=admintools" target="_modulebuilder">';
+			$text = '<a href="'.DOL_URL_ROOT.'/modulebuilder/index.php?mainmenu=home&leftmenu=admintools" target="_modulebuilder">';
 			//$text.= img_picto(":".$langs->trans("ModuleBuilder"), 'printer_top.png', 'class="printer"');
-			$text.='<span class="fa fa-bug atoplogin"></span>';
-			$text.='</a>';
-			$toprightmenu.=@Form::textwithtooltip('',$langs->trans("ModuleBuilder"),2,1,$text,'login_block_elem',2);
+			$text .= '<span class="fa fa-bug atoplogin"></span>';
+			$text .= '</a>';
+			$toprightmenu .= @Form::textwithtooltip('', $langs->trans("ModuleBuilder"), 2, 1, $text, 'login_block_elem', 2);
 		}
 
 		// Link to print main content area
 		if (empty($conf->global->MAIN_PRINT_DISABLELINK) && empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER) && empty($conf->browser->phone))
 		{
-			$qs=dol_escape_htmltag($_SERVER["QUERY_STRING"]);
+			$qs = dol_escape_htmltag($_SERVER["QUERY_STRING"]);
 
 			if (is_array($_POST))
 			{
-				foreach($_POST as $key=>$value) {
-					if ($key!=='action' && !is_array($value)) $qs.='&'.$key.'='.urlencode($value);
+				foreach ($_POST as $key=>$value) {
+					if ($key !== 'action' && !is_array($value)) $qs .= '&'.$key.'='.urlencode($value);
 				}
 			}
-			$qs.=(($qs && $morequerystring)?'&':'').$morequerystring;
-			$text ='<a href="'.dol_escape_htmltag($_SERVER["PHP_SELF"]).'?'.$qs.($qs?'&':'').'optioncss=print" target="_blank">';
+			$qs .= (($qs && $morequerystring) ? '&' : '').$morequerystring;
+			$text = '<a href="'.dol_escape_htmltag($_SERVER["PHP_SELF"]).'?'.$qs.($qs ? '&' : '').'optioncss=print" target="_blank">';
 			//$text.= img_picto(":".$langs->trans("PrintContentArea"), 'printer_top.png', 'class="printer"');
-			$text.='<span class="fa fa-print atoplogin"></span>';
-			$text.='</a>';
-			$toprightmenu.=@Form::textwithtooltip('',$langs->trans("PrintContentArea"),2,1,$text,'login_block_elem',2);
+			$text .= '<span class="fa fa-print atoplogin"></span>';
+			$text .= '</a>';
+			$toprightmenu .= @Form::textwithtooltip('', $langs->trans("PrintContentArea"), 2, 1, $text, 'login_block_elem', 2);
 		}
 
 		// Link to Dolibarr wiki pages
@@ -1519,43 +1519,43 @@ 
 		{
 			$langs->load("help");
 
-			$helpbaseurl='';
-			$helppage='';
-			$mode='';
+			$helpbaseurl = '';
+			$helppage = '';
+			$mode = '';
 
-			if (empty($helppagename)) $helppagename='EN:User_documentation|FR:Documentation_utilisateur|ES:Documentación_usuarios';
+			if (empty($helppagename)) $helppagename = 'EN:User_documentation|FR:Documentation_utilisateur|ES:Documentación_usuarios';
 
 			// Get helpbaseurl, helppage and mode from helppagename and langs
-			$arrayres=getHelpParamFor($helppagename,$langs);
-			$helpbaseurl=$arrayres['helpbaseurl'];
-			$helppage=$arrayres['helppage'];
-			$mode=$arrayres['mode'];
+			$arrayres = getHelpParamFor($helppagename, $langs);
+			$helpbaseurl = $arrayres['helpbaseurl'];
+			$helppage = $arrayres['helppage'];
+			$mode = $arrayres['mode'];
 
 			// Link to help pages
 			if ($helpbaseurl && $helppage)
 			{
-				$text='';
-				$title=$appli.'<br>';
-				$title.=$langs->trans($mode == 'wiki' ? 'GoToWikiHelpPage': 'GoToHelpPage');
-				if ($mode == 'wiki') $title.=' - '.$langs->trans("PageWiki").' &quot;'.dol_escape_htmltag(strtr($helppage,'_',' ')).'&quot;';
-				$text.='<a class="help" target="_blank" href="';
-				if ($mode == 'wiki') $text.=sprintf($helpbaseurl,urlencode(html_entity_decode($helppage)));
-				else $text.=sprintf($helpbaseurl,$helppage);
-				$text.='">';
+				$text = '';
+				$title = $appli.'<br>';
+				$title .= $langs->trans($mode == 'wiki' ? 'GoToWikiHelpPage' : 'GoToHelpPage');
+				if ($mode == 'wiki') $title .= ' - '.$langs->trans("PageWiki").' &quot;'.dol_escape_htmltag(strtr($helppage, '_', ' ')).'&quot;';
+				$text .= '<a class="help" target="_blank" href="';
+				if ($mode == 'wiki') $text .= sprintf($helpbaseurl, urlencode(html_entity_decode($helppage)));
+				else $text .= sprintf($helpbaseurl, $helppage);
+				$text .= '">';
 				//$text.=img_picto('', 'helpdoc_top').' ';
-				$text.='<span class="fa fa-question-circle atoplogin"></span>';
+				$text .= '<span class="fa fa-question-circle atoplogin"></span>';
 				//$toprightmenu.=$langs->trans($mode == 'wiki' ? 'OnlineHelp': 'Help');
 				//if ($mode == 'wiki') $text.=' ('.dol_trunc(strtr($helppage,'_',' '),8).')';
-				$text.='</a>';
+				$text .= '</a>';
 				//$toprightmenu.='</div>'."\n";
-				$toprightmenu.=@Form::textwithtooltip('',$title,2,1,$text,'login_block_elem',2);
+				$toprightmenu .= @Form::textwithtooltip('', $title, 2, 1, $text, 'login_block_elem', 2);
 			}
 		}
 
 		// Logout link
-		$toprightmenu.=@Form::textwithtooltip('',$logouthtmltext,2,1,$logouttext,'login_block_elem',2);
+		$toprightmenu .= @Form::textwithtooltip('', $logouthtmltext, 2, 1, $logouttext, 'login_block_elem', 2);
 
-		$toprightmenu.='</div>';
+		$toprightmenu .= '</div>';
 
 		print $toprightmenu;
 
@@ -1568,7 +1568,7 @@ 
 		print "<!-- End top horizontal menu -->\n\n";
 	}
 
-	if (empty($conf->dol_hide_leftmenu) && empty($conf->dol_use_jmobile)) print '<!-- Begin div id-container --><div id="id-container" class="id-container'.($morecss?' '.$morecss:'').'">';
+	if (empty($conf->dol_hide_leftmenu) && empty($conf->dol_use_jmobile)) print '<!-- Begin div id-container --><div id="id-container" class="id-container'.($morecss ? ' '.$morecss : '').'">';
 }
 
 
@@ -1586,81 +1586,81 @@ 
  *  @param  string  $acceptdelayedhtml          1 if caller request to have html delayed content not returned but saved into global $delayedhtmlcontent (so caller can show it at end of page to avoid flash FOUC effect)
  *  @return	void
  */
-function left_menu($menu_array_before, $helppagename='', $notused='', $menu_array_after='', $leftmenuwithoutmainarea=0, $title='', $acceptdelayedhtml=0)
+function left_menu($menu_array_before, $helppagename = '', $notused = '', $menu_array_after = '', $leftmenuwithoutmainarea = 0, $title = '', $acceptdelayedhtml = 0)
 {
 	global $user, $conf, $langs, $db, $form;
 	global $hookmanager, $menumanager;
 
-	$searchform='';
-	$bookmarks='';
+	$searchform = '';
+	$bookmarks = '';
 
-	if (! empty($menu_array_before)) dol_syslog("Deprecated parameter menu_array_before was used when calling main::left_menu function. Menu entries of module should now be defined into module descriptor and not provided when calling left_menu.", LOG_WARNING);
+	if (!empty($menu_array_before)) dol_syslog("Deprecated parameter menu_array_before was used when calling main::left_menu function. Menu entries of module should now be defined into module descriptor and not provided when calling left_menu.", LOG_WARNING);
 
-	if (empty($conf->dol_hide_leftmenu) && (! defined('NOREQUIREMENU') || ! constant('NOREQUIREMENU')))
+	if (empty($conf->dol_hide_leftmenu) && (!defined('NOREQUIREMENU') || !constant('NOREQUIREMENU')))
 	{
 		// Instantiate hooks of thirdparty module
-		$hookmanager->initHooks(array('searchform','leftblock'));
+		$hookmanager->initHooks(array('searchform', 'leftblock'));
 
 		print "\n".'<!-- Begin side-nav id-left -->'."\n".'<div class="side-nav"><div id="id-left">'."\n";
 
 		print "\n";
 
-		if ($conf->browser->layout == 'phone') $conf->global->MAIN_USE_OLD_SEARCH_FORM=1;	// Select into select2 is awfull on smartphone
+		if ($conf->browser->layout == 'phone') $conf->global->MAIN_USE_OLD_SEARCH_FORM = 1; // Select into select2 is awfull on smartphone
 		if ($conf->use_javascript_ajax && empty($conf->global->MAIN_USE_OLD_SEARCH_FORM))
 		{
-			if (! is_object($form)) $form=new Form($db);
-			$selected=-1;
-			$searchform.=$form->selectArrayAjax('searchselectcombo', DOL_URL_ROOT.'/core/ajax/selectsearchbox.php', $selected, '', '', 0, 1, 'vmenusearchselectcombo', 1, $langs->trans("Search"), 1);
+			if (!is_object($form)) $form = new Form($db);
+			$selected = -1;
+			$searchform .= $form->selectArrayAjax('searchselectcombo', DOL_URL_ROOT.'/core/ajax/selectsearchbox.php', $selected, '', '', 0, 1, 'vmenusearchselectcombo', 1, $langs->trans("Search"), 1);
 		}
 		else
 		{
-			if (! is_object($form)) $form=new Form($db);
-			$selected=-1;
-			$usedbyinclude=1;
+			if (!is_object($form)) $form = new Form($db);
+			$selected = -1;
+			$usedbyinclude = 1;
 			include_once DOL_DOCUMENT_ROOT.'/core/ajax/selectsearchbox.php';
 
-			foreach($arrayresult as $key => $val)
+			foreach ($arrayresult as $key => $val)
 			{
 				//$searchform.=printSearchForm($val['url'], $val['url'], $val['label'], 'maxwidth100', 'sall', $val['shortcut'], 'searchleftt', img_picto('',$val['img']));
-				$searchform.=printSearchForm($val['url'], $val['url'], $val['label'], 'maxwidth125', 'sall', $val['shortcut'], 'searchleftt', img_picto('', $val['img'], '', false, 1, 1));
+				$searchform .= printSearchForm($val['url'], $val['url'], $val['label'], 'maxwidth125', 'sall', $val['shortcut'], 'searchleftt', img_picto('', $val['img'], '', false, 1, 1));
 			}
 		}
 
 		// Execute hook printSearchForm
-		$parameters=array('searchform'=>$searchform);
-		$reshook=$hookmanager->executeHooks('printSearchForm',$parameters);    // Note that $action and $object may have been modified by some hooks
+		$parameters = array('searchform'=>$searchform);
+		$reshook = $hookmanager->executeHooks('printSearchForm', $parameters); // Note that $action and $object may have been modified by some hooks
 		if (empty($reshook))
 		{
-			$searchform.=$hookmanager->resPrint;
+			$searchform .= $hookmanager->resPrint;
 		}
-		else $searchform=$hookmanager->resPrint;
+		else $searchform = $hookmanager->resPrint;
 
-		if ($conf->use_javascript_ajax && ! empty($conf->global->MAIN_USE_OLD_SEARCH_FORM))
+		if ($conf->use_javascript_ajax && !empty($conf->global->MAIN_USE_OLD_SEARCH_FORM))
 		{
-			$searchform='<div class="blockvmenuimpair blockvmenusearchphone"><div id="divsearchforms1"><a href="#" alt="'.dol_escape_htmltag($langs->trans("ShowSearchFields")).'">'.$langs->trans("Search").'...</a></div><div id="divsearchforms2" style="display: none">'.$searchform.'</div>';
-			$searchform.='<script type="text/javascript">
+			$searchform = '<div class="blockvmenuimpair blockvmenusearchphone"><div id="divsearchforms1"><a href="#" alt="'.dol_escape_htmltag($langs->trans("ShowSearchFields")).'">'.$langs->trans("Search").'...</a></div><div id="divsearchforms2" style="display: none">'.$searchform.'</div>';
+			$searchform .= '<script type="text/javascript">
             	jQuery(document).ready(function () {
             		jQuery("#divsearchforms1").click(function(){
 	                   jQuery("#divsearchforms2").toggle();
 	               });
             	});
                 </script>' . "\n";
-			$searchform.='</div>';
+			$searchform .= '</div>';
 		}
 
 		// Define $bookmarks
-		if (! empty($conf->bookmark->enabled) && $user->rights->bookmark->lire)
+		if (!empty($conf->bookmark->enabled) && $user->rights->bookmark->lire)
 		{
 			include_once (DOL_DOCUMENT_ROOT.'/bookmarks/bookmarks.lib.php');
 			$langs->load("bookmarks");
 
-			$bookmarks=printBookmarksList($db, $langs);
+			$bookmarks = printBookmarksList($db, $langs);
 		}
 
 		// Left column
 		print '<!-- Begin left menu -->'."\n";
 
-		print '<div class="vmenu"'.(empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER)?'':' title="Left menu"').'>'."\n\n";
+		print '<div class="vmenu"'.(empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER) ? '' : ' title="Left menu"').'>'."\n\n";
 
 		// Show left menu with other forms
 		$menumanager->menu_array = $menu_array_before;
@@ -1675,25 +1675,25 @@ 
 		// Version
 		if (empty($conf->global->MAIN_HIDE_VERSION))    // Version is already on help picto and on login page.
 		{
-			$doliurl='https://www.dolibarr.org';
+			$doliurl = 'https://www.dolibarr.org';
 			//local communities
-			if (preg_match('/fr/i',$langs->defaultlang)) $doliurl='https://www.dolibarr.fr';
-			if (preg_match('/es/i',$langs->defaultlang)) $doliurl='https://www.dolibarr.es';
-			if (preg_match('/de/i',$langs->defaultlang)) $doliurl='https://www.dolibarr.de';
-			if (preg_match('/it/i',$langs->defaultlang)) $doliurl='https://www.dolibarr.it';
-			if (preg_match('/gr/i',$langs->defaultlang)) $doliurl='https://www.dolibarr.gr';
-
-			$appli=constant('DOL_APPLICATION_TITLE');
-			if (! empty($conf->global->MAIN_APPLICATION_TITLE))
+			if (preg_match('/fr/i', $langs->defaultlang)) $doliurl = 'https://www.dolibarr.fr';
+			if (preg_match('/es/i', $langs->defaultlang)) $doliurl = 'https://www.dolibarr.es';
+			if (preg_match('/de/i', $langs->defaultlang)) $doliurl = 'https://www.dolibarr.de';
+			if (preg_match('/it/i', $langs->defaultlang)) $doliurl = 'https://www.dolibarr.it';
+			if (preg_match('/gr/i', $langs->defaultlang)) $doliurl = 'https://www.dolibarr.gr';
+
+			$appli = constant('DOL_APPLICATION_TITLE');
+			if (!empty($conf->global->MAIN_APPLICATION_TITLE))
 			{
-				$appli=$conf->global->MAIN_APPLICATION_TITLE; $doliurl='';
+				$appli = $conf->global->MAIN_APPLICATION_TITLE; $doliurl = '';
 				if (preg_match('/\d\.\d/', $appli))
 				{
-					if (! preg_match('/'.preg_quote(DOL_VERSION).'/', $appli)) $appli.=" (".DOL_VERSION.")";	// If new title contains a version that is different than core
+					if (!preg_match('/'.preg_quote(DOL_VERSION).'/', $appli)) $appli .= " (".DOL_VERSION.")"; // If new title contains a version that is different than core
 				}
-				else $appli.=" ".DOL_VERSION;
+				else $appli .= " ".DOL_VERSION;
 			}
-			else $appli.=" ".DOL_VERSION;
+			else $appli .= " ".DOL_VERSION;
 			print '<div id="blockvmenuhelpapp" class="blockvmenuhelp">';
 			if ($doliurl) print '<a class="help" target="_blank" href="'.$doliurl.'">';
 			else print '<span class="help">';
@@ -1704,26 +1704,26 @@ 
 		}
 
 		// Link to bugtrack
-		if (! empty($conf->global->MAIN_BUGTRACK_ENABLELINK))
+		if (!empty($conf->global->MAIN_BUGTRACK_ENABLELINK))
 		{
 			require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
 
 			$bugbaseurl = 'https://github.com/Dolibarr/dolibarr/issues/new';
-			$bugbaseurl.= '?title=';
-			$bugbaseurl.= urlencode("Bug: ");
-			$bugbaseurl.= '&body=';
+			$bugbaseurl .= '?title=';
+			$bugbaseurl .= urlencode("Bug: ");
+			$bugbaseurl .= '&body=';
 			// TODO use .github/ISSUE_TEMPLATE.md to generate?
 			$bugbaseurl .= urlencode("# Bug\n");
 			$bugbaseurl .= urlencode("\n");
-			$bugbaseurl.= urlencode("## Environment\n");
-			$bugbaseurl.= urlencode("- **Version**: " . DOL_VERSION . "\n");
-			$bugbaseurl.= urlencode("- **OS**: " . php_uname('s') . "\n");
-			$bugbaseurl.= urlencode("- **Web server**: " . $_SERVER["SERVER_SOFTWARE"] . "\n");
-			$bugbaseurl.= urlencode("- **PHP**: " . php_sapi_name() . ' ' . phpversion() . "\n");
-			$bugbaseurl.= urlencode("- **Database**: " . $db::LABEL . ' ' . $db->getVersion() . "\n");
-			$bugbaseurl.= urlencode("- **URL**: " . $_SERVER["REQUEST_URI"] . "\n");
-			$bugbaseurl.= urlencode("\n");
-			$bugbaseurl.= urlencode("## Report\n");
+			$bugbaseurl .= urlencode("## Environment\n");
+			$bugbaseurl .= urlencode("- **Version**: ".DOL_VERSION."\n");
+			$bugbaseurl .= urlencode("- **OS**: ".php_uname('s')."\n");
+			$bugbaseurl .= urlencode("- **Web server**: ".$_SERVER["SERVER_SOFTWARE"]."\n");
+			$bugbaseurl .= urlencode("- **PHP**: ".php_sapi_name().' '.phpversion()."\n");
+			$bugbaseurl .= urlencode("- **Database**: ".$db::LABEL.' '.$db->getVersion()."\n");
+			$bugbaseurl .= urlencode("- **URL**: ".$_SERVER["REQUEST_URI"]."\n");
+			$bugbaseurl .= urlencode("\n");
+			$bugbaseurl .= urlencode("## Report\n");
 			print '<div id="blockvmenuhelpbugreport" class="blockvmenuhelp">';
 			print '<a class="help" target="_blank" href="'.$bugbaseurl.'">'.$langs->trans("FindBug").'</a>';
 			print '</div>';
@@ -1738,11 +1738,11 @@ 
 		print "\n";
 
 		// Execute hook printLeftBlock
-		$parameters=array();
-		$reshook=$hookmanager->executeHooks('printLeftBlock',$parameters);    // Note that $action and $object may have been modified by some hooks
+		$parameters = array();
+		$reshook = $hookmanager->executeHooks('printLeftBlock', $parameters); // Note that $action and $object may have been modified by some hooks
 		print $hookmanager->resPrint;
 
-		print '</div></div> <!-- End side-nav id-left -->';	// End div id="side-nav" div id="id-left"
+		print '</div></div> <!-- End side-nav id-left -->'; // End div id="side-nav" div id="id-left"
 	}
 
 	print "\n";
@@ -1758,7 +1758,7 @@ 
  *  @param	string	$title		Title
  *  @return	void
  */
-function main_area($title='')
+function main_area($title = '')
 {
 	global $conf, $langs;
 
@@ -1768,7 +1768,7 @@ 
 
 	print '<!-- Begin div class="fiche" -->'."\n".'<div class="fiche">'."\n";
 
-	if (! empty($conf->global->MAIN_ONLY_LOGIN_ALLOWED)) print info_admin($langs->trans("WarningYouAreInMaintenanceMode",$conf->global->MAIN_ONLY_LOGIN_ALLOWED));
+	if (!empty($conf->global->MAIN_ONLY_LOGIN_ALLOWED)) print info_admin($langs->trans("WarningYouAreInMaintenanceMode", $conf->global->MAIN_ONLY_LOGIN_ALLOWED));
 }
 
 
@@ -1779,40 +1779,40 @@ 
  *  @param  Translate	$langs				Language
  *  @return	array		Array of help urls
  */
-function getHelpParamFor($helppagename,$langs)
+function getHelpParamFor($helppagename, $langs)
 {
-	$helpbaseurl='';
-	$helppage='';
-	$mode='';
+	$helpbaseurl = '';
+	$helppage = '';
+	$mode = '';
 
-	if (preg_match('/^http/i',$helppagename))
+	if (preg_match('/^http/i', $helppagename))
 	{
 		// If complete URL
-		$helpbaseurl='%s';
-		$helppage=$helppagename;
-		$mode='local';
+		$helpbaseurl = '%s';
+		$helppage = $helppagename;
+		$mode = 'local';
 	}
 	else
 	{
 		// If WIKI URL
-		if (preg_match('/^es/i',$langs->defaultlang))
+		if (preg_match('/^es/i', $langs->defaultlang))
 		{
-			$helpbaseurl='http://wiki.dolibarr.org/index.php/%s';
-			if (preg_match('/ES:([^|]+)/i',$helppagename,$reg)) $helppage=$reg[1];
+			$helpbaseurl = 'http://wiki.dolibarr.org/index.php/%s';
+			if (preg_match('/ES:([^|]+)/i', $helppagename, $reg)) $helppage = $reg[1];
 		}
-		if (preg_match('/^fr/i',$langs->defaultlang))
+		if (preg_match('/^fr/i', $langs->defaultlang))
 		{
-			$helpbaseurl='http://wiki.dolibarr.org/index.php/%s';
-			if (preg_match('/FR:([^|]+)/i',$helppagename,$reg)) $helppage=$reg[1];
+			$helpbaseurl = 'http://wiki.dolibarr.org/index.php/%s';
+			if (preg_match('/FR:([^|]+)/i', $helppagename, $reg)) $helppage = $reg[1];
 		}
 		if (empty($helppage))	// If help page not already found
 		{
-			$helpbaseurl='http://wiki.dolibarr.org/index.php/%s';
-			if (preg_match('/EN:([^|]+)/i',$helppagename,$reg)) $helppage=$reg[1];
+			$helpbaseurl = 'http://wiki.dolibarr.org/index.php/%s';
+			if (preg_match('/EN:([^|]+)/i', $helppagename, $reg)) $helppage = $reg[1];
 		}
-		$mode='wiki';
+		$mode = 'wiki';
 	}
-	return array('helpbaseurl'=>$helpbaseurl,'helppage'=>$helppage,'mode'=>$mode);
+	return array('helpbaseurl'=>$helpbaseurl, 'helppage'=>$helppage, 'mode'=>$mode);
 }
 
 
@@ -1830,31 +1830,31 @@ 
  *  @param	string	$img				Image to use
  *  @return	string
  */
-function printSearchForm($urlaction, $urlobject, $title, $htmlmorecss, $htmlinputname, $accesskey='', $prefhtmlinputname='',$img='')
+function printSearchForm($urlaction, $urlobject, $title, $htmlmorecss, $htmlinputname, $accesskey = '', $prefhtmlinputname = '', $img = '')
 {
-	global $conf,$langs,$user;
+	global $conf, $langs, $user;
 
 	if (empty($htmlinputid)) {
 		$htmlinputid = $htmlinputname;
 	}
 
-	$ret='';
-	$ret.='<form action="'.$urlaction.'" method="post" class="searchform">';
-	$ret.='<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
-	$ret.='<input type="hidden" name="mode" value="search">';
-	$ret.='<input type="hidden" name="savelogin" value="'.dol_escape_htmltag($user->login).'">';
-	$ret.='<input type="text" class="flat '.$htmlmorecss.'"';
-	$ret.=' style="text-indent: 22px; background-image: url(\''.$img.'\'); background-repeat: no-repeat; background-position: 3px;"';
-	$ret.=($accesskey?' accesskey="'.$accesskey.'"':'');
-	$ret.=' placeholder="'.strip_tags($title).'"';
-	$ret.=' name="'.$htmlinputname.'" id="'.$prefhtmlinputname.$htmlinputname.'" />';
-	$ret.='<input type="submit" class="button" style="padding-top: 4px; padding-bottom: 4px; padding-left: 6px; padding-right: 6px" value="'.$langs->trans("Go").'">';
-	$ret.="</form>\n";
+	$ret = '';
+	$ret .= '<form action="'.$urlaction.'" method="post" class="searchform">';
+	$ret .= '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
+	$ret .= '<input type="hidden" name="mode" value="search">';
+	$ret .= '<input type="hidden" name="savelogin" value="'.dol_escape_htmltag($user->login).'">';
+	$ret .= '<input type="text" class="flat '.$htmlmorecss.'"';
+	$ret .= ' style="text-indent: 22px; background-image: url(\''.$img.'\'); background-repeat: no-repeat; background-position: 3px;"';
+	$ret .= ($accesskey ? ' accesskey="'.$accesskey.'"' : '');
+	$ret .= ' placeholder="'.strip_tags($title).'"';
+	$ret .= ' name="'.$htmlinputname.'" id="'.$prefhtmlinputname.$htmlinputname.'" />';
+	$ret .= '<input type="submit" class="button" style="padding-top: 4px; padding-bottom: 4px; padding-left: 6px; padding-right: 6px" value="'.$langs->trans("Go").'">';
+	$ret .= "</form>\n";
 	return $ret;
 }
 
 
-if (! function_exists("llxFooter"))
+if (!function_exists("llxFooter"))
 {
 	/**
 	 * Show HTML footer
@@ -1866,7 +1866,7 @@ 
 	 * @param	int		$disabledoutputofmessages	Clear all messages stored into session without diplaying them
 	 * @return	void
 	 */
-	function llxFooter($comment='',$zone='private', $disabledoutputofmessages=0)
+	function llxFooter($comment = '', $zone = 'private', $disabledoutputofmessages = 0)
 	{
 		global $conf, $langs, $user, $object;
 		global $delayedhtmlcontent;
@@ -1876,10 +1876,10 @@ 
 
 		// Code for search criteria persistence.
 		// Save $user->lastsearch_values if defined (define on list pages when a form field search_xxx exists)
-		if (is_object($user) && ! empty($user->lastsearch_values_tmp) && is_array($user->lastsearch_values_tmp))
+		if (is_object($user) && !empty($user->lastsearch_values_tmp) && is_array($user->lastsearch_values_tmp))
 		{
 			// Clean data
-			foreach($user->lastsearch_values_tmp as $key => $val)
+			foreach ($user->lastsearch_values_tmp as $key => $val)
 			{
 				unset($_SESSION['lastsearch_values_tmp_'.$key]);
 				if (count($val))
@@ -1887,14 +1887,14 @@ 
 					if (empty($val['sortfield'])) unset($val['sortfield']);
 					if (empty($val['sortorder'])) unset($val['sortorder']);
 					dol_syslog('Save lastsearch_values_tmp_'.$key.'='.json_encode($val, 0)." (systematic recording of last search criteria)");
-					$_SESSION['lastsearch_values_tmp_'.$key]=json_encode($val);
+					$_SESSION['lastsearch_values_tmp_'.$key] = json_encode($val);
 					unset($_SESSION['lastsearch_values_'.$key]);
 				}
 			}
 		}
 
 		// Core error message
-		if (! empty($conf->global->MAIN_CORE_ERROR))
+		if (!empty($conf->global->MAIN_CORE_ERROR))
 		{
 			// Ajax version
 			if ($conf->use_javascript_ajax)
@@ -1923,14 +1923,14 @@ 
 
 		printCommonFooter($zone);
 
-		if (empty($conf->dol_hide_leftmenu) && empty($conf->dol_use_jmobile)) print '</div> <!-- End div id-container -->'."\n";	// End div container
+		if (empty($conf->dol_hide_leftmenu) && empty($conf->dol_use_jmobile)) print '</div> <!-- End div id-container -->'."\n"; // End div container
 
-		if (! empty($delayedhtmlcontent)) print $delayedhtmlcontent;
+		if (!empty($delayedhtmlcontent)) print $delayedhtmlcontent;
 
 		// TODO Move this in lib_head.js.php
 
 		// Wrapper to show tooltips (html or onclick popup)
-		if (! empty($conf->use_javascript_ajax) && empty($conf->dol_no_mouse_hover))
+		if (!empty($conf->use_javascript_ajax) && empty($conf->dol_no_mouse_hover))
 		{
 			print "\n<!-- JS CODE TO ENABLE Tooltips on all object with class classfortooltip -->\n";
 			print '<script type="text/javascript">
@@ -1958,7 +1958,7 @@ 
 		}
 
 		// Wrapper to manage document_preview
-		if (! empty($conf->use_javascript_ajax) && ($conf->browser->layout != 'phone'))
+		if (!empty($conf->use_javascript_ajax) && ($conf->browser->layout != 'phone'))
 		{
 			print "\n<!-- JS CODE TO ENABLE document_preview -->\n";
 			print '<script type="text/javascript">
@@ -1973,7 +1973,7 @@ 
 		}
 
 		// Wrapper to manage dropdown
-		if (! empty($conf->use_javascript_ajax) && ! defined('JS_JQUERY_DISABLE_DROPDOWN'))
+		if (!empty($conf->use_javascript_ajax) && !defined('JS_JQUERY_DISABLE_DROPDOWN'))
 		{
 			print "\n<!-- JS CODE TO ENABLE dropdown -->\n";
 			print '<script type="text/javascript">
@@ -2012,7 +2012,7 @@ 
 		}
 
 		// Wrapper to add log when clicking on download or preview
-		if (! empty($conf->blockedlog->enabled) && is_object($object) && $object->id > 0 && $object->statut > 0)
+		if (!empty($conf->blockedlog->enabled) && is_object($object) && $object->id > 0 && $object->statut > 0)
 		{
 			if (in_array($object->element, array('facture')))       // Restrict for the moment to element 'facture'
 			{

Braces +492 added lines, -192 removed lines

@@ -48,7 +48,8 @@ 
 }
 
 // Removed magic_quotes
-if (function_exists('get_magic_quotes_gpc'))	// magic_quotes_* deprecated in PHP 5.0 and removed in PHP 5.5
+if (function_exists('get_magic_quotes_gpc')) {
+	// magic_quotes_* deprecated in PHP 5.0 and removed in PHP 5.5
 {
 	if (get_magic_quotes_gpc())
 	{
@@ -59,6 +60,7 @@ 
 		function stripslashes_deep($value)
 		{
 			return (is_array($value) ? array_map('stripslashes_deep', $value) : stripslashes($value));
+}
 		}
 		$_GET     = array_map('stripslashes_deep', $_GET);
 		$_POST    = array_map('stripslashes_deep', $_POST);
@@ -98,7 +100,9 @@ 
 	$inj += preg_match('/<script/i', $val);
 	$inj += preg_match('/<iframe/i', $val);
 	$inj += preg_match('/Set\.constructor/i', $val);	// ECMA script 6
-	if (! defined('NOSTYLECHECK')) $inj += preg_match('/<style/i', $val);
+	if (! defined('NOSTYLECHECK')) {
+		$inj += preg_match('/<style/i', $val);
+	}
 	$inj += preg_match('/base[\s]+href/si', $val);
 	$inj += preg_match('/<.*onmouse/si', $val);       // onmousexxx can be set on img or any html tag like <img title='...' onmouseover=alert(1)>
 	$inj += preg_match('/onerror\s*=/i', $val);       // onerror can be set on img or any html tag like <img title='...' onerror = alert(1)>
@@ -112,8 +116,14 @@ 
 		$inj += preg_match('/vbscript:/i', $val);
 	//}
 	// For XSS Injection done by adding javascript closing html tags like with onmousemove, etc... (closing a src or href tag with not cleaned param)
-	if ($type == 1) $inj += preg_match('/"/i', $val);		// We refused " in GET parameters value
-	if ($type == 2) $inj += preg_match('/[;"]/', $val);		// PHP_SELF is a file system path. It can contains spaces.
+	if ($type == 1) {
+		$inj += preg_match('/"/i', $val);
+	}
+	// We refused " in GET parameters value
+	if ($type == 2) {
+		$inj += preg_match('/[;"]/', $val);
+	}
+	// PHP_SELF is a file system path. It can contains spaces.
 	return $inj;
 }
 
@@ -133,16 +143,14 @@ 
 			if (analyseVarsForSqlAndScriptsInjection($value,$type))
 			{
 				$var[$key] = $value;
-			}
-			else
+			} else
 			{
 				print 'Access refused by SQL/Script injection protection in main.inc.php (type='.htmlentities($type).' key='.htmlentities($key).' value='.htmlentities($value).' page='.htmlentities($_SERVER["REQUEST_URI"]).')';
 				exit;
 			}
 		}
 		return true;
-	}
-	else
+	} else
 	{
 		return (test_sql_and_script_inject($var,$type) <= 0);
 	}
@@ -150,7 +158,9 @@ 
 
 
 // Check consistency of NOREQUIREXXX DEFINES
-if ((defined('NOREQUIREDB') || defined('NOREQUIRETRAN')) && ! defined('NOREQUIREMENU')) dol_print_error('','If define NOREQUIREDB or NOREQUIRETRAN are set, you must also set NOREQUIREMENU or not use them');
+if ((defined('NOREQUIREDB') || defined('NOREQUIRETRAN')) && ! defined('NOREQUIREMENU')) {
+	dol_print_error('','If define NOREQUIREDB or NOREQUIRETRAN are set, you must also set NOREQUIREMENU or not use them');
+}
 
 // Sanity check on URL
 if (! empty($_SERVER["PHP_SELF"]))
@@ -191,20 +201,26 @@ 
 	{
 		$postkey=$tmpautoset[0].'_'.$tmpkey;
 		//var_dump('tmpkey='.$tmpkey.' postkey='.$postkey.' value='.$_POST[$postkey]);
-		if (! empty($_POST[$postkey])) $cookiearrayvalue[$tmpkey]=$_POST[$postkey];
+		if (! empty($_POST[$postkey])) {
+			$cookiearrayvalue[$tmpkey]=$_POST[$postkey];
+		}
 	}
 	$cookiename=$tmpautoset[0];
 	$cookievalue=json_encode($cookiearrayvalue);
 	//var_dump('setcookie cookiename='.$cookiename.' cookievalue='.$cookievalue);
 	setcookie($cookiename, empty($cookievalue)?'':$cookievalue, empty($cookievalue)?0:(time()+(86400*354)), '/', null, false, true);	// keep cookie 1 year and add tag httponly
-	if (empty($cookievalue)) unset($_COOKIE[$cookiename]);
-}
+	if (empty($cookievalue)) {
+		unset($_COOKIE[$cookiename]);
+	}
+	}
 
 // Init session. Name of session is specific to Dolibarr instance.
 $prefix=dol_getprefix();
 $sessionname='DOLSESSID_'.$prefix;
 $sessiontimeout='DOLSESSTIMEOUT_'.$prefix;
-if (! empty($_COOKIE[$sessiontimeout])) ini_set('session.gc_maxlifetime',$_COOKIE[$sessiontimeout]);
+if (! empty($_COOKIE[$sessiontimeout])) {
+	ini_set('session.gc_maxlifetime',$_COOKIE[$sessiontimeout]);
+}
 session_name($sessionname);
 session_set_cookie_params(0, '/', null, false, true);   // Add tag httponly on session cookie (same as setting session.cookie_httponly into php.ini). Must be called before the session_start.
 // This create lock released until session_write_close() or end of page.
@@ -212,11 +228,13 @@ 
 if (! defined('NOSESSION'))
 {
 	session_start();
-	if (ini_get('register_globals'))    // Deprecated in 5.3 and removed in 5.4. To solve bug in using $_SESSION
+	if (ini_get('register_globals')) {
+		// Deprecated in 5.3 and removed in 5.4. To solve bug in using $_SESSION
 	{
 		foreach ($_SESSION as $key=>$value)
 		{
 			if (isset($GLOBALS[$key])) unset($GLOBALS[$key]);
+	}
 		}
 	}
 }
@@ -239,9 +257,13 @@ 
 	$conf->browser->tablet=$tmp['tablet'];	   // TODO deprecated, use ->layout
 	//var_dump($conf->browser);
 
-	if ($conf->browser->layout == 'phone') $conf->dol_no_mouse_hover=1;
-	if ($conf->browser->layout == 'phone') $conf->global->MAIN_TESTMENUHIDER=1;
-}
+	if ($conf->browser->layout == 'phone') {
+		$conf->dol_no_mouse_hover=1;
+	}
+	if ($conf->browser->layout == 'phone') {
+		$conf->global->MAIN_TESTMENUHIDER=1;
+	}
+	}
 
 // Force HTTPS if required ($conf->file->main_force_https is 0/1 or https dolibarr root url)
 // $_SERVER["HTTPS"] is 'on' when link is https, otherwise $_SERVER["HTTPS"] is empty or 'off'
@@ -250,19 +272,19 @@ 
 	$newurl='';
 	if (is_numeric($conf->file->main_force_https))
 	{
-		if ($conf->file->main_force_https == '1' && ! empty($_SERVER["SCRIPT_URI"]))	// If SCRIPT_URI supported by server
+		if ($conf->file->main_force_https == '1' && ! empty($_SERVER["SCRIPT_URI"])) {
+			// If SCRIPT_URI supported by server
 		{
 			if (preg_match('/^http:/i',$_SERVER["SCRIPT_URI"]) && ! preg_match('/^https:/i',$_SERVER["SCRIPT_URI"]))	// If link is http
 			{
 				$newurl=preg_replace('/^http:/i','https:',$_SERVER["SCRIPT_URI"]);
-			}
 		}
-		else	// Check HTTPS environment variable (Apache/mod_ssl only)
+			}
+		} else	// Check HTTPS environment variable (Apache/mod_ssl only)
 		{
 			$newurl=preg_replace('/^http:/i','https:',DOL_MAIN_URL_ROOT).$_SERVER["REQUEST_URI"];
 		}
-	}
-	else
+	} else
 	{
 		// Check HTTPS environment variable (Apache/mod_ssl only)
 		$newurl=$conf->file->main_force_https.$_SERVER["REQUEST_URI"];
@@ -273,8 +295,7 @@ 
 		dol_syslog("main.inc: dolibarr_main_force_https is on, we make a redirect to ".$newurl);
 		header("Location: ".$newurl);
 		exit;
-	}
-	else
+	} else
 	{
 		dol_syslog("main.inc: dolibarr_main_force_https is on but we failed to forge new https url so no redirect is done", LOG_WARNING);
 	}
@@ -282,8 +303,14 @@ 
 
 
 // Loading of additional presentation includes
-if (! defined('NOREQUIREHTML')) require_once DOL_DOCUMENT_ROOT .'/core/class/html.form.class.php';	    // Need 660ko memory (800ko in 2.2)
-if (! defined('NOREQUIREAJAX') && $conf->use_javascript_ajax) require_once DOL_DOCUMENT_ROOT.'/core/lib/ajax.lib.php';	// Need 22ko memory
+if (! defined('NOREQUIREHTML')) {
+	require_once DOL_DOCUMENT_ROOT .'/core/class/html.form.class.php';
+}
+// Need 660ko memory (800ko in 2.2)
+if (! defined('NOREQUIREAJAX') && $conf->use_javascript_ajax) {
+	require_once DOL_DOCUMENT_ROOT.'/core/lib/ajax.lib.php';
+}
+// Need 22ko memory
 
 // If install or upgrade process not done or not completely finished, we call the install page.
 if (! empty($conf->global->MAIN_NOT_INSTALLED) || ! empty($conf->global->MAIN_NOT_UPGRADED))
@@ -301,9 +328,11 @@ 
 	$dolibarrversionlastupgrade=preg_split('/[.-]/',$versiontocompare);
 	$dolibarrversionprogram=preg_split('/[.-]/',DOL_VERSION);
 	$rescomp=versioncompare($dolibarrversionprogram,$dolibarrversionlastupgrade);
-	if ($rescomp > 0)   // Programs have a version higher than database. We did not add "&& $rescomp < 3" because we want upgrade process for build upgrades
+	if ($rescomp > 0) {
+		// Programs have a version higher than database. We did not add "&& $rescomp < 3" because we want upgrade process for build upgrades
 	{
 		dol_syslog("main.inc: database version ".$versiontocompare." is lower than programs version ".DOL_VERSION.". Redirect to install page.", LOG_WARNING);
+	}
 		header("Location: ".DOL_URL_ROOT."/install/index.php");
 		exit;
 	}
@@ -313,25 +342,31 @@ 
 if (! defined('NOTOKENRENEWAL'))
 {
 	// roulement des jetons car cree a chaque appel
-	if (isset($_SESSION['newtoken'])) $_SESSION['token'] = $_SESSION['newtoken'];
+	if (isset($_SESSION['newtoken'])) {
+		$_SESSION['token'] = $_SESSION['newtoken'];
+	}
 
 	// Save in $_SESSION['newtoken'] what will be next token. Into forms, we will add param token = $_SESSION['newtoken']
 	$token = dol_hash(uniqid(mt_rand(),TRUE)); // Generates a hash of a random number
 	$_SESSION['newtoken'] = $token;
 }
-if (! defined('NOCSRFCHECK') && empty($dolibarr_nocsrfcheck) && ! empty($conf->global->MAIN_SECURITY_CSRF_WITH_TOKEN))	// Check validity of token, only if option enabled (this option breaks some features sometimes)
+if (! defined('NOCSRFCHECK') && empty($dolibarr_nocsrfcheck) && ! empty($conf->global->MAIN_SECURITY_CSRF_WITH_TOKEN)) {
+	// Check validity of token, only if option enabled (this option breaks some features sometimes)
 {
 	if ($_SERVER['REQUEST_METHOD'] == 'POST' && ! GETPOST('token','alpha')) // Note, offender can still send request by GET
 	{
 		print "Access refused by CSRF protection in main.inc.php. Token not provided.\n";
+}
 		print "If you access your server behind a proxy using url rewriting, you might check that all HTTP header is propagated (or add the line \$dolibarr_nocsrfcheck=1 into your conf.php file).\n";
 		die;
 	}
-	if ($_SERVER['REQUEST_METHOD'] === 'POST')  // This test must be after loading $_SESSION['token'].
+	if ($_SERVER['REQUEST_METHOD'] === 'POST') {
+		// This test must be after loading $_SESSION['token'].
 	{
 		if (GETPOST('token', 'alpha') != $_SESSION['token'])
 		{
 			dol_syslog("Invalid token in ".$_SERVER['HTTP_REFERER'].", action=".GETPOST('action','aZ09').", _POST['token']=".GETPOST('token','alpha').", _SESSION['token']=".$_SESSION['token'], LOG_WARNING);
+	}
 			//print 'Unset POST by CSRF protection in main.inc.php.';	// Do not output anything because this create problems when using the BACK button on browsers.
 			unset($_POST);
 		}
@@ -339,7 +374,9 @@ 
 }
 
 // Disable modules (this must be after session_start and after conf has been loaded)
-if (GETPOST('disablemodules','alpha'))  $_SESSION["disablemodules"]=GETPOST('disablemodules','alpha');
+if (GETPOST('disablemodules','alpha')) {
+	$_SESSION["disablemodules"]=GETPOST('disablemodules','alpha');
+}
 if (! empty($_SESSION["disablemodules"]))
 {
 	$disabled_modules=explode(',',$_SESSION["disablemodules"]);
@@ -347,11 +384,15 @@ 
 	{
 		if ($module)
 		{
-			if (empty($conf->$module)) $conf->$module=new stdClass();
+			if (empty($conf->$module)) {
+				$conf->$module=new stdClass();
+			}
 			$conf->$module->enabled=false;
-			if ($module == 'fournisseur')		// Special case
+			if ($module == 'fournisseur') {
+				// Special case
 			{
 				$conf->supplier_order->enabled=0;
+			}
 				$conf->supplier_invoice->enabled=0;
 			}
 		}
@@ -369,9 +410,13 @@ 
 	// Example: 'http', 'dolibarr', 'ldap', 'http,forceuser'
 
 	// Authentication mode
-	if (empty($dolibarr_main_authentication)) $dolibarr_main_authentication='http,dolibarr';
+	if (empty($dolibarr_main_authentication)) {
+		$dolibarr_main_authentication='http,dolibarr';
+	}
 	// Authentication mode: forceuser
-	if ($dolibarr_main_authentication == 'forceuser' && empty($dolibarr_auto_user)) $dolibarr_auto_user='auto';
+	if ($dolibarr_main_authentication == 'forceuser' && empty($dolibarr_auto_user)) {
+		$dolibarr_auto_user='auto';
+	}
 	// Set authmode
 	$authmode=explode(',',$dolibarr_main_authentication);
 
@@ -406,11 +451,13 @@ 
 		//dol_syslog("POST key=".join(array_keys($_POST),',').' value='.join($_POST,','));
 
 		// If in demo mode, we check we go to home page through the public/demo/index.php page
-		if (! empty($dolibarr_main_demo) && $_SERVER['PHP_SELF'] == DOL_URL_ROOT.'/index.php')  // We ask index page
+		if (! empty($dolibarr_main_demo) && $_SERVER['PHP_SELF'] == DOL_URL_ROOT.'/index.php') {
+			// We ask index page
 		{
 			if (empty($_SERVER['HTTP_REFERER']) || ! preg_match('/public/',$_SERVER['HTTP_REFERER']))
 			{
 				dol_syslog("Call index page from another url than demo page (call is done from page ".$_SERVER['HTTP_REFERER'].")");
+		}
 				$url='';
 				$url.=($url?'&':'').($dol_hide_topmenu?'dol_hide_topmenu='.$dol_hide_topmenu:'');
 				$url.=($url?'&':'').($dol_hide_leftmenu?'dol_hide_leftmenu='.$dol_hide_leftmenu:'');
@@ -455,7 +502,9 @@ 
 				$hookmanager->initHooks(array('login'));
 				$parameters=array('dol_authmode'=>$dol_authmode, 'dol_loginmesg'=>$_SESSION["dol_loginmesg"]);
 				$reshook=$hookmanager->executeHooks('afterLoginFailed',$parameters,$user,$action);    // Note that $action and $object may have been modified by some hooks
-				if ($reshook < 0) $error++;
+				if ($reshook < 0) {
+					$error++;
+				}
 
 				// Note: exit is done later
 			}
@@ -467,13 +516,21 @@ 
 
 		// Define if we received data to test the login.
 		$goontestloop=false;
-		if (isset($_SERVER["REMOTE_USER"]) && in_array('http',$authmode)) $goontestloop=true;
-		if ($dolibarr_main_authentication == 'forceuser' && ! empty($dolibarr_auto_user)) $goontestloop=true;
-		if (GETPOST("username","alpha",2) || ! empty($_COOKIE['login_dolibarr']) || GETPOST('openid_mode','alpha',1)) $goontestloop=true;
+		if (isset($_SERVER["REMOTE_USER"]) && in_array('http',$authmode)) {
+			$goontestloop=true;
+		}
+		if ($dolibarr_main_authentication == 'forceuser' && ! empty($dolibarr_auto_user)) {
+			$goontestloop=true;
+		}
+		if (GETPOST("username","alpha",2) || ! empty($_COOKIE['login_dolibarr']) || GETPOST('openid_mode','alpha',1)) {
+			$goontestloop=true;
+		}
 
-		if (! is_object($langs)) // This can occurs when calling page with NOREQUIRETRAN defined, however we need langs for error messages.
+		if (! is_object($langs)) {
+			// This can occurs when calling page with NOREQUIRETRAN defined, however we need langs for error messages.
 		{
 			include_once DOL_DOCUMENT_ROOT.'/core/class/translate.class.php';
+		}
 			$langs=new Translate("",$conf);
 			$langcode=(GETPOST('lang','aZ09',1)?GETPOST('lang','aZ09',1):(empty($conf->global->MAIN_LANG_DEFAULT)?'auto':$conf->global->MAIN_LANG_DEFAULT));
 			$langs->setDefaultLang($langcode);
@@ -500,7 +557,9 @@ 
 					$datenow=dol_now();
 					$datefirst=dol_stringtotime($_POST["dst_first"]);
 					$datesecond=dol_stringtotime($_POST["dst_second"]);
-					if ($datenow >= $datefirst && $datenow < $datesecond) $dol_dst=1;
+					if ($datenow >= $datefirst && $datenow < $datesecond) {
+						$dol_dst=1;
+					}
 				}
 				//print $datefirst.'-'.$datesecond.'-'.$datenow.'-'.$dol_tz.'-'.$dol_tzstring.'-'.$dol_dst; exit;
 			}
@@ -513,7 +572,9 @@ 
 
 				// Bad password. No authmode has found a good password.
 				// We set a generic message if not defined inside function checkLoginPassEntity or subfunctions
-				if (empty($_SESSION["dol_loginmesg"])) $_SESSION["dol_loginmesg"]=$langs->trans("ErrorBadLoginPassword");
+				if (empty($_SESSION["dol_loginmesg"])) {
+					$_SESSION["dol_loginmesg"]=$langs->trans("ErrorBadLoginPassword");
+				}
 
 				// TODO @deprecated Remove this. Hook must be used, not this trigger.
 				$user->trigger_mesg=$langs->trans("ErrorBadLoginPassword").' - login='.GETPOST("username","alpha",2);
@@ -531,19 +592,26 @@ 
 				$hookmanager->initHooks(array('login'));
 				$parameters=array('dol_authmode'=>$dol_authmode, 'dol_loginmesg'=>$_SESSION["dol_loginmesg"]);
 				$reshook=$hookmanager->executeHooks('afterLoginFailed',$parameters,$user,$action);    // Note that $action and $object may have been modified by some hooks
-				if ($reshook < 0) $error++;
+				if ($reshook < 0) {
+					$error++;
+				}
 
 				// Note: exit is done in next chapter
 			}
 		}
 
 		// End test login / passwords
-		if (! $login || (in_array('ldap',$authmode) && empty($passwordtotest)))	// With LDAP we refused empty password because some LDAP are "opened" for anonymous access so connexion is a success.
+		if (! $login || (in_array('ldap',$authmode) && empty($passwordtotest))) {
+			// With LDAP we refused empty password because some LDAP are "opened" for anonymous access so connexion is a success.
 		{
 			// No data to test login, so we show the login page
 			dol_syslog("--- Access to ".$_SERVER["PHP_SELF"]." showing the login form and exit");
-			if (defined('NOREDIRECTBYMAINTOLOGIN')) return 'ERROR_NOT_LOGGED';
-			else dol_loginfunction($langs,$conf,(! empty($mysoc)?$mysoc:''));
+		}
+			if (defined('NOREDIRECTBYMAINTOLOGIN')) {
+				return 'ERROR_NOT_LOGGED';
+			} else {
+				dol_loginfunction($langs,$conf,(! empty($mysoc)?$mysoc:''));
+			}
 			exit;
 		}
 
@@ -588,17 +656,24 @@ 
 			$hookmanager->initHooks(array('login'));
 			$parameters=array('dol_authmode'=>$dol_authmode, 'dol_loginmesg'=>$_SESSION["dol_loginmesg"]);
 			$reshook=$hookmanager->executeHooks('afterLoginFailed',$parameters,$user,$action);    // Note that $action and $object may have been modified by some hooks
-			if ($reshook < 0) $error++;
+			if ($reshook < 0) {
+				$error++;
+			}
 
 			$paramsurl=array();
-			if (GETPOST('textbrowser','int')) $paramsurl[]='textbrowser='.GETPOST('textbrowser','int');
-			if (GETPOST('nojs','int'))        $paramsurl[]='nojs='.GETPOST('nojs','int');
-			if (GETPOST('lang','aZ09'))       $paramsurl[]='lang='.GETPOST('lang','aZ09');
+			if (GETPOST('textbrowser','int')) {
+				$paramsurl[]='textbrowser='.GETPOST('textbrowser','int');
+			}
+			if (GETPOST('nojs','int')) {
+				$paramsurl[]='nojs='.GETPOST('nojs','int');
+			}
+			if (GETPOST('lang','aZ09')) {
+				$paramsurl[]='lang='.GETPOST('lang','aZ09');
+			}
 			header('Location: '.DOL_URL_ROOT.'/index.php'.(count($paramsurl)?'?'.implode('&',$paramsurl):''));
 			exit;
 		}
-	}
-	else
+	} else
 	{
 		// We are already into an authenticated session
 		$login=$_SESSION["dol_login"];
@@ -648,27 +723,38 @@ 
 			$hookmanager->initHooks(array('login'));
 			$parameters=array('dol_authmode'=>$dol_authmode, 'dol_loginmesg'=>$_SESSION["dol_loginmesg"]);
 			$reshook=$hookmanager->executeHooks('afterLoginFailed',$parameters,$user,$action);    // Note that $action and $object may have been modified by some hooks
-			if ($reshook < 0) $error++;
+			if ($reshook < 0) {
+				$error++;
+			}
 
 			$paramsurl=array();
-			if (GETPOST('textbrowser','int')) $paramsurl[]='textbrowser='.GETPOST('textbrowser','int');
-			if (GETPOST('nojs','int'))        $paramsurl[]='nojs='.GETPOST('nojs','int');
-			if (GETPOST('lang','aZ09'))       $paramsurl[]='lang='.GETPOST('lang','aZ09');
+			if (GETPOST('textbrowser','int')) {
+				$paramsurl[]='textbrowser='.GETPOST('textbrowser','int');
+			}
+			if (GETPOST('nojs','int')) {
+				$paramsurl[]='nojs='.GETPOST('nojs','int');
+			}
+			if (GETPOST('lang','aZ09')) {
+				$paramsurl[]='lang='.GETPOST('lang','aZ09');
+			}
 			header('Location: '.DOL_URL_ROOT.'/index.php'.(count($paramsurl)?'?'.implode('&',$paramsurl):''));
 			exit;
-		}
-		else
+		} else
 		{
 		   // Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
 		   $hookmanager->initHooks(array('main'));
 
 		   // Code for search criteria persistence.
-		   if (! empty($_GET['save_lastsearch_values']))    // Keep $_GET here
+		   if (! empty($_GET['save_lastsearch_values'])) {
+		   	// Keep $_GET here
 		   {
 			   $relativepathstring = preg_replace('/\?.*$/','',$_SERVER["HTTP_REFERER"]);
+		   }
 			   $relativepathstring = preg_replace('/^https?:\/\/[^\/]*/','',$relativepathstring);     // Get full path except host server
 			   // Clean $relativepathstring
-   			   if (constant('DOL_URL_ROOT')) $relativepathstring = preg_replace('/^'.preg_quote(constant('DOL_URL_ROOT'),'/').'/', '', $relativepathstring);
+   			   if (constant('DOL_URL_ROOT')) {
+   			   	$relativepathstring = preg_replace('/^'.preg_quote(constant('DOL_URL_ROOT'),'/').'/', '', $relativepathstring);
+   			   }
 			   $relativepathstring = preg_replace('/^\//', '', $relativepathstring);
 			   $relativepathstring = preg_replace('/^custom\//', '', $relativepathstring);
 			   //var_dump($relativepathstring);
@@ -709,11 +795,21 @@ 
 		$_SESSION["dol_company"]=$conf->global->MAIN_INFO_SOCIETE_NOM;
 		$_SESSION["dol_entity"]=$conf->entity;
 		// Store value into session (values stored only if defined)
-		if (! empty($dol_hide_topmenu))         $_SESSION['dol_hide_topmenu']=$dol_hide_topmenu;
-		if (! empty($dol_hide_leftmenu))        $_SESSION['dol_hide_leftmenu']=$dol_hide_leftmenu;
-		if (! empty($dol_optimize_smallscreen)) $_SESSION['dol_optimize_smallscreen']=$dol_optimize_smallscreen;
-		if (! empty($dol_no_mouse_hover))       $_SESSION['dol_no_mouse_hover']=$dol_no_mouse_hover;
-		if (! empty($dol_use_jmobile))          $_SESSION['dol_use_jmobile']=$dol_use_jmobile;
+		if (! empty($dol_hide_topmenu)) {
+			$_SESSION['dol_hide_topmenu']=$dol_hide_topmenu;
+		}
+		if (! empty($dol_hide_leftmenu)) {
+			$_SESSION['dol_hide_leftmenu']=$dol_hide_leftmenu;
+		}
+		if (! empty($dol_optimize_smallscreen)) {
+			$_SESSION['dol_optimize_smallscreen']=$dol_optimize_smallscreen;
+		}
+		if (! empty($dol_no_mouse_hover)) {
+			$_SESSION['dol_no_mouse_hover']=$dol_no_mouse_hover;
+		}
+		if (! empty($dol_use_jmobile)) {
+			$_SESSION['dol_use_jmobile']=$dol_use_jmobile;
+		}
 
 		dol_syslog("This is a new started user session. _SESSION['dol_login']=".$_SESSION["dol_login"]." Session id=".session_id());
 
@@ -739,7 +835,9 @@ 
 		$hookmanager->initHooks(array('login'));
 		$parameters=array('dol_authmode'=>$dol_authmode, 'dol_loginfo'=>$loginfo);
 		$reshook=$hookmanager->executeHooks('afterLogin',$parameters,$user,$action);    // Note that $action and $object may have been modified by some hooks
-		if ($reshook < 0) $error++;
+		if ($reshook < 0) {
+			$error++;
+		}
 
 		if ($error)
 		{
@@ -747,20 +845,23 @@ 
 			session_destroy();
 			dol_print_error($db,'Error in some hooks afterLogin (or old trigger USER_LOGIN)');
 			exit;
-		}
-		else
+		} else
 		{
 			$db->commit();
 		}
 
 		// Change landing page if defined.
 		$landingpage=(empty($user->conf->MAIN_LANDING_PAGE)?(empty($conf->global->MAIN_LANDING_PAGE)?'':$conf->global->MAIN_LANDING_PAGE):$user->conf->MAIN_LANDING_PAGE);
-		if (! empty($landingpage))    // Example: /index.php
+		if (! empty($landingpage)) {
+			// Example: /index.php
 		{
 			$newpath=dol_buildpath($landingpage, 1);
-			if ($_SERVER["PHP_SELF"] != $newpath)   // not already on landing page (avoid infinite loop)
+		}
+			if ($_SERVER["PHP_SELF"] != $newpath) {
+				// not already on landing page (avoid infinite loop)
 			{
 				header('Location: '.$newpath);
+			}
 				exit;
 			}
 		}
@@ -783,8 +884,14 @@ 
      */
 
 	// Set liste_limit
-	if (isset($user->conf->MAIN_SIZE_LISTE_LIMIT))	$conf->liste_limit = $user->conf->MAIN_SIZE_LISTE_LIMIT;	// Can be 0
-	if (isset($user->conf->PRODUIT_LIMIT_SIZE))	$conf->product->limit_size = $user->conf->PRODUIT_LIMIT_SIZE;	// Can be 0
+	if (isset($user->conf->MAIN_SIZE_LISTE_LIMIT)) {
+		$conf->liste_limit = $user->conf->MAIN_SIZE_LISTE_LIMIT;
+	}
+	// Can be 0
+	if (isset($user->conf->PRODUIT_LIMIT_SIZE)) {
+		$conf->product->limit_size = $user->conf->PRODUIT_LIMIT_SIZE;
+	}
+	// Can be 0
 
 	// Replace conf->css by personalized value if theme not forced
 	if (empty($conf->global->MAIN_FORCETHEME) && ! empty($user->conf->MAIN_THEME))
@@ -803,31 +910,47 @@ 
 
 
 // Set javascript option
-if (! GETPOST('nojs','int'))   // If javascript was not disabled on URL
+if (! GETPOST('nojs','int')) {
+	// If javascript was not disabled on URL
 {
 	if (! empty($user->conf->MAIN_DISABLE_JAVASCRIPT))
 	{
 		$conf->use_javascript_ajax=! $user->conf->MAIN_DISABLE_JAVASCRIPT;
+}
 	}
+} else {
+	$conf->use_javascript_ajax=0;
 }
-else $conf->use_javascript_ajax=0;
 // Set MAIN_OPTIMIZEFORTEXTBROWSER
-if (GETPOST('textbrowser','int') || (! empty($conf->browser->name) && $conf->browser->name == 'lynxlinks') || ! empty($user->conf->MAIN_OPTIMIZEFORTEXTBROWSER))   // If we must enable text browser
+if (GETPOST('textbrowser','int') || (! empty($conf->browser->name) && $conf->browser->name == 'lynxlinks') || ! empty($user->conf->MAIN_OPTIMIZEFORTEXTBROWSER)) {
+	// If we must enable text browser
 {
 	$conf->global->MAIN_OPTIMIZEFORTEXTBROWSER=1;
 }
-elseif (! empty($user->conf->MAIN_OPTIMIZEFORTEXTBROWSER))
+} elseif (! empty($user->conf->MAIN_OPTIMIZEFORTEXTBROWSER))
 {
 	$conf->global->MAIN_OPTIMIZEFORTEXTBROWSER=$user->conf->MAIN_OPTIMIZEFORTEXTBROWSER;
 }
 
 // Set terminal output option according to conf->browser.
-if (GETPOST('dol_hide_leftmenu','int') || ! empty($_SESSION['dol_hide_leftmenu']))               $conf->dol_hide_leftmenu=1;
-if (GETPOST('dol_hide_topmenu','int') || ! empty($_SESSION['dol_hide_topmenu']))                 $conf->dol_hide_topmenu=1;
-if (GETPOST('dol_optimize_smallscreen','int') || ! empty($_SESSION['dol_optimize_smallscreen'])) $conf->dol_optimize_smallscreen=1;
-if (GETPOST('dol_no_mouse_hover','int') || ! empty($_SESSION['dol_no_mouse_hover']))             $conf->dol_no_mouse_hover=1;
-if (GETPOST('dol_use_jmobile','int') || ! empty($_SESSION['dol_use_jmobile']))                   $conf->dol_use_jmobile=1;
-if (! empty($conf->browser->layout) && $conf->browser->layout != 'classic') $conf->dol_no_mouse_hover=1;
+if (GETPOST('dol_hide_leftmenu','int') || ! empty($_SESSION['dol_hide_leftmenu'])) {
+	$conf->dol_hide_leftmenu=1;
+}
+if (GETPOST('dol_hide_topmenu','int') || ! empty($_SESSION['dol_hide_topmenu'])) {
+	$conf->dol_hide_topmenu=1;
+}
+if (GETPOST('dol_optimize_smallscreen','int') || ! empty($_SESSION['dol_optimize_smallscreen'])) {
+	$conf->dol_optimize_smallscreen=1;
+}
+if (GETPOST('dol_no_mouse_hover','int') || ! empty($_SESSION['dol_no_mouse_hover'])) {
+	$conf->dol_no_mouse_hover=1;
+}
+if (GETPOST('dol_use_jmobile','int') || ! empty($_SESSION['dol_use_jmobile'])) {
+	$conf->dol_use_jmobile=1;
+}
+if (! empty($conf->browser->layout) && $conf->browser->layout != 'classic') {
+	$conf->dol_no_mouse_hover=1;
+}
 if ((! empty($conf->browser->layout) && $conf->browser->layout == 'phone')
 	|| (! empty($_SESSION['dol_screenwidth']) && $_SESSION['dol_screenwidth'] < 400)
 	|| (! empty($_SESSION['dol_screenheight']) && $_SESSION['dol_screenheight'] < 400)
@@ -836,7 +959,9 @@ 
 	$conf->dol_optimize_smallscreen=1;
 }
 // If we force to use jmobile, then we reenable javascript
-if (! empty($conf->dol_use_jmobile)) $conf->use_javascript_ajax=1;
+if (! empty($conf->dol_use_jmobile)) {
+	$conf->use_javascript_ajax=1;
+}
 // Replace themes bugged with jmobile with eldy
 if (! empty($conf->dol_use_jmobile) && in_array($conf->theme,array('bureau2crea','cameleo','amarok')))
 {
@@ -847,7 +972,8 @@ 
 
 if (! defined('NOREQUIRETRAN'))
 {
-	if (! GETPOST('lang','aZ09'))	// If language was not forced on URL
+	if (! GETPOST('lang','aZ09')) {
+		// If language was not forced on URL
 	{
 		// If user has chosen its own language
 		if (! empty($user->conf->MAIN_LANG_DEFAULT))
@@ -857,6 +983,7 @@ 
 			if ($langs->getDefaultLang() != $user->conf->MAIN_LANG_DEFAULT)
 			{
 				$langs->setDefaultLang($user->conf->MAIN_LANG_DEFAULT);
+	}
 			}
 		}
 	}
@@ -866,7 +993,9 @@ 
 {
 	// If the login is not recovered, it is identified with an account that does not exist.
 	// Hacking attempt?
-	if (! $user->login) accessforbidden();
+	if (! $user->login) {
+		accessforbidden();
+	}
 
 	// Check if user is active
 	if ($user->statut < 1)
@@ -917,8 +1046,7 @@ 
 	define('ROWS_7',7);
 	define('ROWS_8',8);
 	define('ROWS_9',9);
-}
-else
+} else
 {
 	define('ROWS_1',0);
 	define('ROWS_2',1);
@@ -936,18 +1064,22 @@ 
 // Init menu manager
 if (! defined('NOREQUIREMENU'))
 {
-	if (empty($user->societe_id))    // If internal user or not defined
+	if (empty($user->societe_id)) {
+		// If internal user or not defined
 	{
 		$conf->standard_menu=(empty($conf->global->MAIN_MENU_STANDARD_FORCED)?(empty($conf->global->MAIN_MENU_STANDARD)?'eldy_menu.php':$conf->global->MAIN_MENU_STANDARD):$conf->global->MAIN_MENU_STANDARD_FORCED);
 	}
-	else                        // If external user
+	} else                        // If external user
 	{
 		$conf->standard_menu=(empty($conf->global->MAIN_MENUFRONT_STANDARD_FORCED)?(empty($conf->global->MAIN_MENUFRONT_STANDARD)?'eldy_menu.php':$conf->global->MAIN_MENUFRONT_STANDARD):$conf->global->MAIN_MENUFRONT_STANDARD_FORCED);
 	}
 
 	// Load the menu manager (only if not already done)
 	$file_menu=$conf->standard_menu;
-	if (GETPOST('menu','alpha')) $file_menu=GETPOST('menu','alpha');     // example: menu=eldy_menu.php
+	if (GETPOST('menu','alpha')) {
+		$file_menu=GETPOST('menu','alpha');
+	}
+	// example: menu=eldy_menu.php
 	if (! class_exists('MenuManager'))
 	{
 		$menufound=0;
@@ -955,11 +1087,15 @@ 
 		foreach($dirmenus as $dirmenu)
 		{
 			$menufound=dol_include_once($dirmenu."standard/".$file_menu);
-			if (class_exists('MenuManager')) break;
+			if (class_exists('MenuManager')) {
+				break;
+			}
 		}
-		if (! class_exists('MenuManager'))	// If failed to include, we try with standard eldy_menu.php
+		if (! class_exists('MenuManager')) {
+			// If failed to include, we try with standard eldy_menu.php
 		{
 			dol_syslog("You define a menu manager '".$file_menu."' that can not be loaded.", LOG_WARNING);
+		}
 			$file_menu='eldy_menu.php';
 			include_once DOL_DOCUMENT_ROOT."/core/menus/standard/".$file_menu;
 		}
@@ -1033,8 +1169,11 @@ 
 {
 	global $conf;
 
-	if ($contenttype == 'text/html' ) header("Content-Type: text/html; charset=".$conf->file->character_set_client);
-	else header("Content-Type: ".$contenttype);
+	if ($contenttype == 'text/html' ) {
+		header("Content-Type: text/html; charset=".$conf->file->character_set_client);
+	} else {
+		header("Content-Type: ".$contenttype);
+	}
 	// Security options
 	header("X-Content-Type-Options: nosniff");  // With the nosniff option, if the server says the content is text/html, the browser will render it as text/html (note that most browsers now force this option to on)
 	header("X-Frame-Options: SAMEORIGIN");      // Frames allowed only if on same domain (stop some XSS attacks)
@@ -1074,52 +1213,78 @@ 
 
 	top_httphead();
 
-	if (empty($conf->css)) $conf->css = '/theme/eldy/style.css.php';	// If not defined, eldy by default
+	if (empty($conf->css)) {
+		$conf->css = '/theme/eldy/style.css.php';
+	}
+	// If not defined, eldy by default
 
 	if (! empty($conf->global->MAIN_ACTIVATE_HTML4)) {
 		$doctype = '<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">';
-	}else {
+	} else {
 		$doctype = '<!doctype html>';
 	}
 	print $doctype."\n";
-	if (! empty($conf->global->MAIN_USE_CACHE_MANIFEST)) print '<html lang="'.substr($langs->defaultlang,0,2).'" manifest="'.DOL_URL_ROOT.'/cache.manifest">'."\n";
-	else print '<html lang="'.substr($langs->defaultlang,0,2).'">'."\n";
+	if (! empty($conf->global->MAIN_USE_CACHE_MANIFEST)) {
+		print '<html lang="'.substr($langs->defaultlang,0,2).'" manifest="'.DOL_URL_ROOT.'/cache.manifest">'."\n";
+	} else {
+		print '<html lang="'.substr($langs->defaultlang,0,2).'">'."\n";
+	}
 	//print '<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="fr">'."\n";
 	if (empty($disablehead))
 	{
 		print "<head>\n";
-		if (GETPOST('dol_basehref','alpha')) print '<base href="'.dol_escape_htmltag(GETPOST('dol_basehref','alpha')).'">'."\n";
+		if (GETPOST('dol_basehref','alpha')) {
+			print '<base href="'.dol_escape_htmltag(GETPOST('dol_basehref','alpha')).'">'."\n";
+		}
 		// Displays meta
 		print '<meta name="robots" content="noindex'.($disablenofollow?'':',nofollow').'">'."\n";	// Do not index
 		print '<meta name="viewport" content="width=device-width, initial-scale=1.0">'."\n";		// Scale for mobile device
 		print '<meta name="author" content="Dolibarr Development Team">'."\n";
 		// Favicon
 		$favicon=dol_buildpath('/theme/'.$conf->theme.'/img/favicon.ico',1);
-		if (! empty($conf->global->MAIN_FAVICON_URL)) $favicon=$conf->global->MAIN_FAVICON_URL;
-		if (empty($conf->dol_use_jmobile)) print '<link rel="shortcut icon" type="image/x-icon" href="'.$favicon.'"/>'."\n";	// Not required into an Android webview
+		if (! empty($conf->global->MAIN_FAVICON_URL)) {
+			$favicon=$conf->global->MAIN_FAVICON_URL;
+		}
+		if (empty($conf->dol_use_jmobile)) {
+			print '<link rel="shortcut icon" type="image/x-icon" href="'.$favicon.'"/>'."\n";
+		}
+		// Not required into an Android webview
 		//if (empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER)) print '<link rel="top" title="'.$langs->trans("Home").'" href="'.(DOL_URL_ROOT?DOL_URL_ROOT:'/').'">'."\n";
 		//if (empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER)) print '<link rel="copyright" title="GNU General Public License" href="http://www.gnu.org/copyleft/gpl.html#SEC1">'."\n";
 		//if (empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER)) print '<link rel="author" title="Dolibarr Development Team" href="https://www.dolibarr.org">'."\n";
 
 		// Displays title
 		$appli=constant('DOL_APPLICATION_TITLE');
-		if (!empty($conf->global->MAIN_APPLICATION_TITLE)) $appli=$conf->global->MAIN_APPLICATION_TITLE;
+		if (!empty($conf->global->MAIN_APPLICATION_TITLE)) {
+			$appli=$conf->global->MAIN_APPLICATION_TITLE;
+		}
 
-		if ($title && ! empty($conf->global->MAIN_HTML_TITLE) && preg_match('/noapp/',$conf->global->MAIN_HTML_TITLE)) print '<title>'.dol_htmlentities($title).'</title>';
-		else if ($title) print '<title>'.dol_htmlentities($appli.' - '.$title).'</title>';
-		else print "<title>".dol_htmlentities($appli)."</title>";
+		if ($title && ! empty($conf->global->MAIN_HTML_TITLE) && preg_match('/noapp/',$conf->global->MAIN_HTML_TITLE)) {
+			print '<title>'.dol_htmlentities($title).'</title>';
+		} else if ($title) {
+			print '<title>'.dol_htmlentities($appli.' - '.$title).'</title>';
+		} else {
+			print "<title>".dol_htmlentities($appli)."</title>";
+		}
 		print "\n";
 
 		//$ext='';
 		//if (! empty($conf->dol_use_jmobile)) $ext='version='.urlencode(DOL_VERSION);
 		$ext='version='.urlencode(DOL_VERSION);
 
-		if (GETPOST('version','int')) $ext='version='.GETPOST('version','int');	// usefull to force no cache on css/js
-		if (GETPOST('testmenuhider','int') || ! empty($conf->global->MAIN_TESTMENUHIDER)) $ext.='&testmenuhider='.(GETPOST('testmenuhider','int')?GETPOST('testmenuhider','int'):$conf->global->MAIN_TESTMENUHIDER);
+		if (GETPOST('version','int')) {
+			$ext='version='.GETPOST('version','int');
+		}
+		// usefull to force no cache on css/js
+		if (GETPOST('testmenuhider','int') || ! empty($conf->global->MAIN_TESTMENUHIDER)) {
+			$ext.='&testmenuhider='.(GETPOST('testmenuhider','int')?GETPOST('testmenuhider','int'):$conf->global->MAIN_TESTMENUHIDER);
+		}
 
 		$themeparam='?lang='.$langs->defaultlang.'&amp;theme='.$conf->theme.(GETPOST('optioncss','aZ09')?'&amp;optioncss='.GETPOST('optioncss','aZ09',1):'').'&amp;userid='.$user->id.'&amp;entity='.$conf->entity;
 		$themeparam.=($ext?'&amp;'.$ext:'');
-		if (! empty($_SESSION['dol_resetcache'])) $themeparam.='&amp;dol_resetcache='.$_SESSION['dol_resetcache'];
+		if (! empty($_SESSION['dol_resetcache'])) {
+			$themeparam.='&amp;dol_resetcache='.$_SESSION['dol_resetcache'];
+		}
 		if (GETPOST('dol_hide_topmenu','int'))           { $themeparam.='&amp;dol_hide_topmenu='.GETPOST('dol_hide_topmenu','int'); }
 		if (GETPOST('dol_hide_leftmenu','int'))          { $themeparam.='&amp;dol_hide_leftmenu='.GETPOST('dol_hide_leftmenu','int'); }
 		if (GETPOST('dol_optimize_smallscreen','int'))   { $themeparam.='&amp;dol_optimize_smallscreen='.GETPOST('dol_optimize_smallscreen','int'); }
@@ -1130,10 +1295,21 @@ 
 		{
 			print '<!-- Includes CSS for JQuery (Ajax library) -->'."\n";
 			$jquerytheme = 'smoothness';
-			if (!empty($conf->global->MAIN_USE_JQUERY_THEME)) $jquerytheme = $conf->global->MAIN_USE_JQUERY_THEME;
-			if (constant('JS_JQUERY_UI')) print '<link rel="stylesheet" type="text/css" href="'.JS_JQUERY_UI.'css/'.$jquerytheme.'/jquery-ui.min.css'.($ext?'?'.$ext:'').'">'."\n";  // JQuery
-			else print '<link rel="stylesheet" type="text/css" href="'.DOL_URL_ROOT.'/includes/jquery/css/'.$jquerytheme.'/jquery-ui.css'.($ext?'?'.$ext:'').'">'."\n";    // JQuery
-			if (! defined('DISABLE_JQUERY_JNOTIFY')) print '<link rel="stylesheet" type="text/css" href="'.DOL_URL_ROOT.'/includes/jquery/plugins/jnotify/jquery.jnotify-alt.min.css'.($ext?'?'.$ext:'').'">'."\n";          // JNotify
+			if (!empty($conf->global->MAIN_USE_JQUERY_THEME)) {
+				$jquerytheme = $conf->global->MAIN_USE_JQUERY_THEME;
+			}
+			if (constant('JS_JQUERY_UI')) {
+				print '<link rel="stylesheet" type="text/css" href="'.JS_JQUERY_UI.'css/'.$jquerytheme.'/jquery-ui.min.css'.($ext?'?'.$ext:'').'">'."\n";
+			}
+			// JQuery
+			else {
+				print '<link rel="stylesheet" type="text/css" href="'.DOL_URL_ROOT.'/includes/jquery/css/'.$jquerytheme.'/jquery-ui.css'.($ext?'?'.$ext:'').'">'."\n";
+			}
+			// JQuery
+			if (! defined('DISABLE_JQUERY_JNOTIFY')) {
+				print '<link rel="stylesheet" type="text/css" href="'.DOL_URL_ROOT.'/includes/jquery/plugins/jnotify/jquery.jnotify-alt.min.css'.($ext?'?'.$ext:'').'">'."\n";
+			}
+			// JNotify
 			/* Removed a old hidden problematic feature never used in Dolibarr. If an external module need datatable, the module must provide all lib it needs and manage version problems with other dolibarr components
             if (! empty($conf->global->MAIN_USE_JQUERY_DATATABLES) || (defined('REQUIRE_JQUERY_DATATABLES') && constant('REQUIRE_JQUERY_DATATABLES')))     // jQuery datatables
             {
@@ -1141,9 +1317,11 @@ 
                 print '<link rel="stylesheet" type="text/css" href="'.DOL_URL_ROOT.'/includes/jquery/plugins/datatables/extensions/Buttons/css/buttons.dataTables.min.css'.($ext?'?'.$ext:'').'">'."\n";
                 print '<link rel="stylesheet" type="text/css" href="'.DOL_URL_ROOT.'/includes/jquery/plugins/datatables/extensions/ColReorder/css/colReorder.dataTables.min.css'.($ext?'?'.$ext:'').'"></script>'."\n";
             }*/
-			if (! defined('DISABLE_SELECT2') && (! empty($conf->global->MAIN_USE_JQUERY_MULTISELECT) || defined('REQUIRE_JQUERY_MULTISELECT')))     // jQuery plugin "mutiselect", "multiple-select", "select2"...
+			if (! defined('DISABLE_SELECT2') && (! empty($conf->global->MAIN_USE_JQUERY_MULTISELECT) || defined('REQUIRE_JQUERY_MULTISELECT'))) {
+				// jQuery plugin "mutiselect", "multiple-select", "select2"...
 			{
 				$tmpplugin=empty($conf->global->MAIN_USE_JQUERY_MULTISELECT)?constant('REQUIRE_JQUERY_MULTISELECT'):$conf->global->MAIN_USE_JQUERY_MULTISELECT;
+			}
 				print '<link rel="stylesheet" type="text/css" href="'.DOL_URL_ROOT.'/includes/jquery/plugins/'.$tmpplugin.'/dist/css/'.$tmpplugin.'.css'.($ext?'?'.$ext:'').'">'."\n";
 			}
 			// jQuery Timepicker
@@ -1163,13 +1341,15 @@ 
 		// Output style sheets (optioncss='print' or ''). Note: $conf->css looks like '/theme/eldy/style.css.php'
 		$themepath=dol_buildpath($conf->css,1);
 		$themesubdir='';
-		if (! empty($conf->modules_parts['theme']))	// This slow down
+		if (! empty($conf->modules_parts['theme'])) {
+			// This slow down
 		{
 			foreach($conf->modules_parts['theme'] as $reldir)
 			{
 				if (file_exists(dol_buildpath($reldir.$conf->css, 0)))
 				{
 					$themepath=dol_buildpath($reldir.$conf->css, 1);
+		}
 					$themesubdir=$reldir;
 					break;
 				}
@@ -1177,7 +1357,9 @@ 
 		}
 		//print 'themepath='.$themepath.' themeparam='.$themeparam;exit;
 		print '<link rel="stylesheet" type="text/css" href="'.$themepath.$themeparam.'">'."\n";
-		if (! empty($conf->global->MAIN_FIX_FLASH_ON_CHROME)) print '<!-- Includes CSS that does not exists as a workaround of flash bug of chrome -->'."\n".'<link rel="stylesheet" type="text/css" href="filethatdoesnotexiststosolvechromeflashbug">'."\n";
+		if (! empty($conf->global->MAIN_FIX_FLASH_ON_CHROME)) {
+			print '<!-- Includes CSS that does not exists as a workaround of flash bug of chrome -->'."\n".'<link rel="stylesheet" type="text/css" href="filethatdoesnotexiststosolvechromeflashbug">'."\n";
+		}
 
 		// CSS forced by modules (relative url starting with /)
 		if (! empty($conf->modules_parts['css']))
@@ -1188,11 +1370,15 @@ 
 				$filescss=(array) $filescss;	// To be sure filecss is an array
 				foreach($filescss as $cssfile)
 				{
-					if (empty($cssfile)) dol_syslog("Warning: module ".$modcss." declared a css path file into its descriptor that is empty.", LOG_WARNING);
+					if (empty($cssfile)) {
+						dol_syslog("Warning: module ".$modcss." declared a css path file into its descriptor that is empty.", LOG_WARNING);
+					}
 					// cssfile is a relative path
 					print '<!-- Includes CSS added by module '.$modcss. ' -->'."\n".'<link rel="stylesheet" type="text/css" href="'.dol_buildpath($cssfile,1);
 					// We add params only if page is not static, because some web server setup does not return content type text/css if url has parameters, so browser cache is not used.
-					if (!preg_match('/\.css$/i',$cssfile)) print $themeparam;
+					if (!preg_match('/\.css$/i',$cssfile)) {
+						print $themeparam;
+					}
 					print '">'."\n";
 				}
 			}
@@ -1204,7 +1390,9 @@ 
 			{
 				print '<!-- Includes CSS added by page -->'."\n".'<link rel="stylesheet" type="text/css" title="default" href="'.dol_buildpath($cssfile,1);
 				// We add params only if page is not static, because some web server setup does not return content type text/css if url has parameters and browser cache is not used.
-				if (!preg_match('/\.css$/i',$cssfile)) print $themeparam;
+				if (!preg_match('/\.css$/i',$cssfile)) {
+					print $themeparam;
+				}
 				print '">'."\n";
 			}
 		}
@@ -1214,16 +1402,27 @@ 
 		{
 			// JQuery. Must be before other includes
 			print '<!-- Includes JS for JQuery -->'."\n";
-			if (defined('JS_JQUERY') && constant('JS_JQUERY')) print '<script type="text/javascript" src="'.JS_JQUERY.'jquery.min.js'.($ext?'?'.$ext:'').'"></script>'."\n";
-			else print '<script type="text/javascript" src="'.DOL_URL_ROOT.'/includes/jquery/js/jquery.min.js'.($ext?'?'.$ext:'').'"></script>'."\n";
+			if (defined('JS_JQUERY') && constant('JS_JQUERY')) {
+				print '<script type="text/javascript" src="'.JS_JQUERY.'jquery.min.js'.($ext?'?'.$ext:'').'"></script>'."\n";
+			} else {
+				print '<script type="text/javascript" src="'.DOL_URL_ROOT.'/includes/jquery/js/jquery.min.js'.($ext?'?'.$ext:'').'"></script>'."\n";
+			}
 			if (! empty($conf->global->MAIN_FEATURES_LEVEL) && ! defined('JS_JQUERY_MIGRATE_DISABLED'))
 			{
-				if (defined('JS_JQUERY_MIGRATE') && constant('JS_JQUERY_MIGRATE')) print '<script type="text/javascript" src="'.JS_JQUERY_MIGRATE.'jquery-migrate.min.js'.($ext?'?'.$ext:'').'"></script>'."\n";
-				else print '<script type="text/javascript" src="'.DOL_URL_ROOT.'/includes/jquery/js/jquery-migrate.min.js'.($ext?'?'.$ext:'').'"></script>'."\n";
+				if (defined('JS_JQUERY_MIGRATE') && constant('JS_JQUERY_MIGRATE')) {
+					print '<script type="text/javascript" src="'.JS_JQUERY_MIGRATE.'jquery-migrate.min.js'.($ext?'?'.$ext:'').'"></script>'."\n";
+				} else {
+					print '<script type="text/javascript" src="'.DOL_URL_ROOT.'/includes/jquery/js/jquery-migrate.min.js'.($ext?'?'.$ext:'').'"></script>'."\n";
+				}
+			}
+			if (defined('JS_JQUERY_UI') && constant('JS_JQUERY_UI')) {
+				print '<script type="text/javascript" src="'.JS_JQUERY_UI.'jquery-ui.min.js'.($ext?'?'.$ext:'').'"></script>'."\n";
+			} else {
+				print '<script type="text/javascript" src="'.DOL_URL_ROOT.'/includes/jquery/js/jquery-ui.min.js'.($ext?'?'.$ext:'').'"></script>'."\n";
+			}
+			if (! defined('DISABLE_JQUERY_TABLEDND')) {
+				print '<script type="text/javascript" src="'.DOL_URL_ROOT.'/includes/jquery/plugins/tablednd/jquery.tablednd.0.6.min.js'.($ext?'?'.$ext:'').'"></script>'."\n";
 			}
-			if (defined('JS_JQUERY_UI') && constant('JS_JQUERY_UI')) print '<script type="text/javascript" src="'.JS_JQUERY_UI.'jquery-ui.min.js'.($ext?'?'.$ext:'').'"></script>'."\n";
-			else print '<script type="text/javascript" src="'.DOL_URL_ROOT.'/includes/jquery/js/jquery-ui.min.js'.($ext?'?'.$ext:'').'"></script>'."\n";
-			if (! defined('DISABLE_JQUERY_TABLEDND')) print '<script type="text/javascript" src="'.DOL_URL_ROOT.'/includes/jquery/plugins/tablednd/jquery.tablednd.0.6.min.js'.($ext?'?'.$ext:'').'"></script>'."\n";
 			// jQuery jnotify
 			if (empty($conf->global->MAIN_DISABLE_JQUERY_JNOTIFY) && ! defined('DISABLE_JQUERY_JNOTIFY'))
 			{
@@ -1238,8 +1437,7 @@ 
 					print '<script type="text/javascript" src="'.JS_JQUERY_FLOT.'jquery.flot.js'.($ext?'?'.$ext:'').'"></script>'."\n";
 					print '<script type="text/javascript" src="'.JS_JQUERY_FLOT.'jquery.flot.pie.js'.($ext?'?'.$ext:'').'"></script>'."\n";
 					print '<script type="text/javascript" src="'.JS_JQUERY_FLOT.'jquery.flot.stack.js'.($ext?'?'.$ext:'').'"></script>'."\n";
-				}
-				else
+				} else
 				{
 					print '<script type="text/javascript" src="'.DOL_URL_ROOT.'/includes/jquery/plugins/flot/jquery.flot.min.js'.($ext?'?'.$ext:'').'"></script>'."\n";
 					print '<script type="text/javascript" src="'.DOL_URL_ROOT.'/includes/jquery/plugins/flot/jquery.flot.pie.min.js'.($ext?'?'.$ext:'').'"></script>'."\n";
@@ -1285,9 +1483,11 @@ 
             	print '<script type="text/javascript" src="'.DOL_URL_ROOT.'/includes/jquery/plugins/timepicker/jquery-ui-timepicker-addon.js'.($ext?'?'.$ext:'').'"></script>'."\n";
             	print '<script type="text/javascript" src="'.DOL_URL_ROOT.'/core/js/timepicker.js.php?lang='.$langs->defaultlang.($ext?'&amp;'.$ext:'').'"></script>'."\n";
             }
-            if (! defined('DISABLE_SELECT2') && (! empty($conf->global->MAIN_USE_JQUERY_MULTISELECT) || defined('REQUIRE_JQUERY_MULTISELECT')))     // jQuery plugin "mutiselect", "multiple-select", "select2", ...
+            if (! defined('DISABLE_SELECT2') && (! empty($conf->global->MAIN_USE_JQUERY_MULTISELECT) || defined('REQUIRE_JQUERY_MULTISELECT'))) {
+            	// jQuery plugin "mutiselect", "multiple-select", "select2", ...
             {
             	$tmpplugin=empty($conf->global->MAIN_USE_JQUERY_MULTISELECT)?constant('REQUIRE_JQUERY_MULTISELECT'):$conf->global->MAIN_USE_JQUERY_MULTISELECT;
+            }
             	print '<script type="text/javascript" src="'.DOL_URL_ROOT.'/includes/jquery/plugins/'.$tmpplugin.'/dist/js/'.$tmpplugin.'.full.min.js'.($ext?'?'.$ext:'').'"></script>'."\n";	// We include full because we need the support of containerCssClass
             }
         }
@@ -1300,10 +1500,12 @@ 
                 print '<!-- Includes JS for CKEditor -->'."\n";
                 $pathckeditor = DOL_URL_ROOT . '/includes/ckeditor/ckeditor/';
                 $jsckeditor='ckeditor.js';
-                if (constant('JS_CKEDITOR'))	// To use external ckeditor 4 js lib
+                if (constant('JS_CKEDITOR')) {
+                	// To use external ckeditor 4 js lib
                 {
                 	$pathckeditor=constant('JS_CKEDITOR');
                 }
+                }
                 print '<script type="text/javascript">';
                 print 'var CKEDITOR_BASEPATH = \''.$pathckeditor.'\';'."\n";
                 print 'var ckeditorConfig = \''.dol_buildpath($themesubdir.'/theme/'.$conf->theme.'/ckeditor/config.js'.($ext?'?'.$ext:''),1).'\';'."\n";		// $themesubdir='' in standard usage
@@ -1317,8 +1519,12 @@ 
             if (! defined('DISABLE_BROWSER_NOTIF'))
             {
                 $enablebrowsernotif=false;
-                if (! empty($conf->agenda->enabled) && ! empty($conf->global->AGENDA_REMINDER_BROWSER)) $enablebrowsernotif=true;
-                if ($conf->browser->layout == 'phone') $enablebrowsernotif=false;
+                if (! empty($conf->agenda->enabled) && ! empty($conf->global->AGENDA_REMINDER_BROWSER)) {
+                	$enablebrowsernotif=true;
+                }
+                if ($conf->browser->layout == 'phone') {
+                	$enablebrowsernotif=false;
+                }
                 if ($enablebrowsernotif)
                 {
                     print '<!-- Includes JS of Dolibarr (brwoser layout = '.$conf->browser->layout.')-->'."\n";
@@ -1331,9 +1537,11 @@ 
             print '<script type="text/javascript" src="'.DOL_URL_ROOT.'/core/js/lib_head.js.php?lang='.$langs->defaultlang.($ext?'&amp;'.$ext:'').'"></script>'."\n";
 
             // JS forced by modules (relative url starting with /)
-            if (! empty($conf->modules_parts['js']))		// $conf->modules_parts['js'] is array('module'=>array('file1','file2'))
+            if (! empty($conf->modules_parts['js'])) {
+            	// $conf->modules_parts['js'] is array('module'=>array('file1','file2'))
         	{
         		$arrayjs=(array) $conf->modules_parts['js'];
+            }
 	            foreach($arrayjs as $modjs => $filesjs)
 	            {
         			$filesjs=(array) $filesjs;	// To be sure filejs is an array
@@ -1353,18 +1561,24 @@ 
                     if (preg_match('/^http/i',$jsfile))
                     {
                         print '<script type="text/javascript" src="'.$jsfile.'"></script>'."\n";
-                    }
-                    else
+                    } else
                     {
-                        if (! preg_match('/^\//',$jsfile)) $jsfile='/'.$jsfile;	// For backward compatibility
+                        if (! preg_match('/^\//',$jsfile)) {
+                        	$jsfile='/'.$jsfile;
+                        }
+                        // For backward compatibility
                         print '<script type="text/javascript" src="'.dol_buildpath($jsfile,1).'"></script>'."\n";
                     }
                 }
             }
         }
 
-        if (! empty($head)) print $head."\n";
-        if (! empty($conf->global->MAIN_HTML_HEADER)) print $conf->global->MAIN_HTML_HEADER."\n";
+        if (! empty($head)) {
+        	print $head."\n";
+        }
+        if (! empty($conf->global->MAIN_HTML_HEADER)) {
+        	print $conf->global->MAIN_HTML_HEADER."\n";
+        }
 
         print "</head>\n\n";
     }
@@ -1432,13 +1646,20 @@ 
 			$appli=$conf->global->MAIN_APPLICATION_TITLE;
 			if (preg_match('/\d\.\d/', $appli))
 			{
-				if (! preg_match('/'.preg_quote(DOL_VERSION).'/', $appli)) $appli.=" (".DOL_VERSION.")";	// If new title contains a version that is different than core
+				if (! preg_match('/'.preg_quote(DOL_VERSION).'/', $appli)) {
+					$appli.=" (".DOL_VERSION.")";
+				}
+				// If new title contains a version that is different than core
+			} else {
+				$appli.=" ".DOL_VERSION;
 			}
-			else $appli.=" ".DOL_VERSION;
+		} else {
+			$appli.=" ".DOL_VERSION;
 		}
-		else $appli.=" ".DOL_VERSION;
 
-		if (! empty($conf->global->MAIN_FEATURES_LEVEL)) $appli.="<br>".$langs->trans("LevelOfFeature").': '.$conf->global->MAIN_FEATURES_LEVEL;
+		if (! empty($conf->global->MAIN_FEATURES_LEVEL)) {
+			$appli.="<br>".$langs->trans("LevelOfFeature").': '.$conf->global->MAIN_FEATURES_LEVEL;
+		}
 
 		$logouttext='';
 		if (empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER))
@@ -1452,8 +1673,7 @@ 
 				//$logouttext .= img_picto($langs->trans('Logout').":".$langs->trans('Logout'), 'logout_top.png', 'class="login"', 0, 0, 1);
 				$logouttext .='<span class="fa fa-sign-out atoplogin"></span>';
 				$logouttext .='</a>';
-			}
-			else
+			} else
 			{
 				$logouthtmltext.=$langs->trans("NoLogoutProcessWithAuthMode",$_SESSION["dol_authmode"]);
 				$logouttext .= img_picto($langs->trans('Logout').":".$langs->trans('Logout'), 'logout_top.png', 'class="login"', 0, 0, 1);
@@ -1480,10 +1700,18 @@ 
 		$result=$hookmanager->executeHooks('printTopRightMenu',$parameters);    // Note that $action and $object may have been modified by some hooks
 		if (is_numeric($result))
 		{
-			if (empty($result)) $toprightmenu.=$hookmanager->resPrint;		// add
-			else  $toprightmenu=$hookmanager->resPrint;						// replace
+			if (empty($result)) {
+				$toprightmenu.=$hookmanager->resPrint;
+			}
+			// add
+			else {
+				$toprightmenu=$hookmanager->resPrint;
+			}
+			// replace
+		} else {
+			$toprightmenu.=$result;
 		}
-		else $toprightmenu.=$result;	// For backward compatibility
+		// For backward compatibility
 
 		// Link to module builder
 		if (! empty($conf->modulebuilder->enabled))
@@ -1503,7 +1731,9 @@ 
 			if (is_array($_POST))
 			{
 				foreach($_POST as $key=>$value) {
-					if ($key!=='action' && !is_array($value)) $qs.='&'.$key.'='.urlencode($value);
+					if ($key!=='action' && !is_array($value)) {
+						$qs.='&'.$key.'='.urlencode($value);
+					}
 				}
 			}
 			$qs.=(($qs && $morequerystring)?'&':'').$morequerystring;
@@ -1523,7 +1753,9 @@ 
 			$helppage='';
 			$mode='';
 
-			if (empty($helppagename)) $helppagename='EN:User_documentation|FR:Documentation_utilisateur|ES:Documentación_usuarios';
+			if (empty($helppagename)) {
+				$helppagename='EN:User_documentation|FR:Documentation_utilisateur|ES:Documentación_usuarios';
+			}
 
 			// Get helpbaseurl, helppage and mode from helppagename and langs
 			$arrayres=getHelpParamFor($helppagename,$langs);
@@ -1537,10 +1769,15 @@ 
 				$text='';
 				$title=$appli.'<br>';
 				$title.=$langs->trans($mode == 'wiki' ? 'GoToWikiHelpPage': 'GoToHelpPage');
-				if ($mode == 'wiki') $title.=' - '.$langs->trans("PageWiki").' &quot;'.dol_escape_htmltag(strtr($helppage,'_',' ')).'&quot;';
+				if ($mode == 'wiki') {
+					$title.=' - '.$langs->trans("PageWiki").' &quot;'.dol_escape_htmltag(strtr($helppage,'_',' ')).'&quot;';
+				}
 				$text.='<a class="help" target="_blank" href="';
-				if ($mode == 'wiki') $text.=sprintf($helpbaseurl,urlencode(html_entity_decode($helppage)));
-				else $text.=sprintf($helpbaseurl,$helppage);
+				if ($mode == 'wiki') {
+					$text.=sprintf($helpbaseurl,urlencode(html_entity_decode($helppage)));
+				} else {
+					$text.=sprintf($helpbaseurl,$helppage);
+				}
 				$text.='">';
 				//$text.=img_picto('', 'helpdoc_top').' ';
 				$text.='<span class="fa fa-question-circle atoplogin"></span>';
@@ -1568,8 +1805,10 @@ 
 		print "<!-- End top horizontal menu -->\n\n";
 	}
 
-	if (empty($conf->dol_hide_leftmenu) && empty($conf->dol_use_jmobile)) print '<!-- Begin div id-container --><div id="id-container" class="id-container'.($morecss?' '.$morecss:'').'">';
-}
+	if (empty($conf->dol_hide_leftmenu) && empty($conf->dol_use_jmobile)) {
+		print '<!-- Begin div id-container --><div id="id-container" class="id-container'.($morecss?' '.$morecss:'').'">';
+	}
+	}
 
 
 /**
@@ -1594,7 +1833,9 @@ 
 	$searchform='';
 	$bookmarks='';
 
-	if (! empty($menu_array_before)) dol_syslog("Deprecated parameter menu_array_before was used when calling main::left_menu function. Menu entries of module should now be defined into module descriptor and not provided when calling left_menu.", LOG_WARNING);
+	if (! empty($menu_array_before)) {
+		dol_syslog("Deprecated parameter menu_array_before was used when calling main::left_menu function. Menu entries of module should now be defined into module descriptor and not provided when calling left_menu.", LOG_WARNING);
+	}
 
 	if (empty($conf->dol_hide_leftmenu) && (! defined('NOREQUIREMENU') || ! constant('NOREQUIREMENU')))
 	{
@@ -1605,16 +1846,22 @@ 
 
 		print "\n";
 
-		if ($conf->browser->layout == 'phone') $conf->global->MAIN_USE_OLD_SEARCH_FORM=1;	// Select into select2 is awfull on smartphone
+		if ($conf->browser->layout == 'phone') {
+			$conf->global->MAIN_USE_OLD_SEARCH_FORM=1;
+		}
+		// Select into select2 is awfull on smartphone
 		if ($conf->use_javascript_ajax && empty($conf->global->MAIN_USE_OLD_SEARCH_FORM))
 		{
-			if (! is_object($form)) $form=new Form($db);
+			if (! is_object($form)) {
+				$form=new Form($db);
+			}
 			$selected=-1;
 			$searchform.=$form->selectArrayAjax('searchselectcombo', DOL_URL_ROOT.'/core/ajax/selectsearchbox.php', $selected, '', '', 0, 1, 'vmenusearchselectcombo', 1, $langs->trans("Search"), 1);
-		}
-		else
+		} else
 		{
-			if (! is_object($form)) $form=new Form($db);
+			if (! is_object($form)) {
+				$form=new Form($db);
+			}
 			$selected=-1;
 			$usedbyinclude=1;
 			include_once DOL_DOCUMENT_ROOT.'/core/ajax/selectsearchbox.php';
@@ -1632,8 +1879,9 @@ 
 		if (empty($reshook))
 		{
 			$searchform.=$hookmanager->resPrint;
+		} else {
+			$searchform=$hookmanager->resPrint;
 		}
-		else $searchform=$hookmanager->resPrint;
 
 		if ($conf->use_javascript_ajax && ! empty($conf->global->MAIN_USE_OLD_SEARCH_FORM))
 		{
@@ -1673,15 +1921,27 @@ 
 		print '<div id="blockvmenuhelp" class="blockvmenuhelp">'."\n";
 
 		// Version
-		if (empty($conf->global->MAIN_HIDE_VERSION))    // Version is already on help picto and on login page.
+		if (empty($conf->global->MAIN_HIDE_VERSION)) {
+			// Version is already on help picto and on login page.
 		{
 			$doliurl='https://www.dolibarr.org';
+		}
 			//local communities
-			if (preg_match('/fr/i',$langs->defaultlang)) $doliurl='https://www.dolibarr.fr';
-			if (preg_match('/es/i',$langs->defaultlang)) $doliurl='https://www.dolibarr.es';
-			if (preg_match('/de/i',$langs->defaultlang)) $doliurl='https://www.dolibarr.de';
-			if (preg_match('/it/i',$langs->defaultlang)) $doliurl='https://www.dolibarr.it';
-			if (preg_match('/gr/i',$langs->defaultlang)) $doliurl='https://www.dolibarr.gr';
+			if (preg_match('/fr/i',$langs->defaultlang)) {
+				$doliurl='https://www.dolibarr.fr';
+			}
+			if (preg_match('/es/i',$langs->defaultlang)) {
+				$doliurl='https://www.dolibarr.es';
+			}
+			if (preg_match('/de/i',$langs->defaultlang)) {
+				$doliurl='https://www.dolibarr.de';
+			}
+			if (preg_match('/it/i',$langs->defaultlang)) {
+				$doliurl='https://www.dolibarr.it';
+			}
+			if (preg_match('/gr/i',$langs->defaultlang)) {
+				$doliurl='https://www.dolibarr.gr';
+			}
 
 			$appli=constant('DOL_APPLICATION_TITLE');
 			if (! empty($conf->global->MAIN_APPLICATION_TITLE))
@@ -1689,17 +1949,28 @@ 
 				$appli=$conf->global->MAIN_APPLICATION_TITLE; $doliurl='';
 				if (preg_match('/\d\.\d/', $appli))
 				{
-					if (! preg_match('/'.preg_quote(DOL_VERSION).'/', $appli)) $appli.=" (".DOL_VERSION.")";	// If new title contains a version that is different than core
+					if (! preg_match('/'.preg_quote(DOL_VERSION).'/', $appli)) {
+						$appli.=" (".DOL_VERSION.")";
+					}
+					// If new title contains a version that is different than core
+				} else {
+					$appli.=" ".DOL_VERSION;
 				}
-				else $appli.=" ".DOL_VERSION;
+			} else {
+				$appli.=" ".DOL_VERSION;
 			}
-			else $appli.=" ".DOL_VERSION;
 			print '<div id="blockvmenuhelpapp" class="blockvmenuhelp">';
-			if ($doliurl) print '<a class="help" target="_blank" href="'.$doliurl.'">';
-			else print '<span class="help">';
+			if ($doliurl) {
+				print '<a class="help" target="_blank" href="'.$doliurl.'">';
+			} else {
+				print '<span class="help">';
+			}
 			print $appli;
-			if ($doliurl) print '</a>';
-			else print '</span>';
+			if ($doliurl) {
+				print '</a>';
+			} else {
+				print '</span>';
+			}
 			print '</div>'."\n";
 		}
 
@@ -1748,8 +2019,10 @@ 
 	print "\n";
 	print '<!-- Begin right area -->'."\n";
 
-	if (empty($leftmenuwithoutmainarea)) main_area($title);
-}
+	if (empty($leftmenuwithoutmainarea)) {
+		main_area($title);
+	}
+	}
 
 
 /**
@@ -1762,14 +2035,18 @@ 
 {
 	global $conf, $langs;
 
-	if (empty($conf->dol_hide_leftmenu)) print '<div id="id-right">';
+	if (empty($conf->dol_hide_leftmenu)) {
+		print '<div id="id-right">';
+	}
 
 	print "\n";
 
 	print '<!-- Begin div class="fiche" -->'."\n".'<div class="fiche">'."\n";
 
-	if (! empty($conf->global->MAIN_ONLY_LOGIN_ALLOWED)) print info_admin($langs->trans("WarningYouAreInMaintenanceMode",$conf->global->MAIN_ONLY_LOGIN_ALLOWED));
-}
+	if (! empty($conf->global->MAIN_ONLY_LOGIN_ALLOWED)) {
+		print info_admin($langs->trans("WarningYouAreInMaintenanceMode",$conf->global->MAIN_ONLY_LOGIN_ALLOWED));
+	}
+	}
 
 
 /**
@@ -1791,24 +2068,31 @@ 
 		$helpbaseurl='%s';
 		$helppage=$helppagename;
 		$mode='local';
-	}
-	else
+	} else
 	{
 		// If WIKI URL
 		if (preg_match('/^es/i',$langs->defaultlang))
 		{
 			$helpbaseurl='http://wiki.dolibarr.org/index.php/%s';
-			if (preg_match('/ES:([^|]+)/i',$helppagename,$reg)) $helppage=$reg[1];
+			if (preg_match('/ES:([^|]+)/i',$helppagename,$reg)) {
+				$helppage=$reg[1];
+			}
 		}
 		if (preg_match('/^fr/i',$langs->defaultlang))
 		{
 			$helpbaseurl='http://wiki.dolibarr.org/index.php/%s';
-			if (preg_match('/FR:([^|]+)/i',$helppagename,$reg)) $helppage=$reg[1];
+			if (preg_match('/FR:([^|]+)/i',$helppagename,$reg)) {
+				$helppage=$reg[1];
+			}
 		}
-		if (empty($helppage))	// If help page not already found
+		if (empty($helppage)) {
+			// If help page not already found
 		{
 			$helpbaseurl='http://wiki.dolibarr.org/index.php/%s';
-			if (preg_match('/EN:([^|]+)/i',$helppagename,$reg)) $helppage=$reg[1];
+		}
+			if (preg_match('/EN:([^|]+)/i',$helppagename,$reg)) {
+				$helppage=$reg[1];
+			}
 		}
 		$mode='wiki';
 	}
@@ -1884,8 +2168,12 @@ 
 				unset($_SESSION['lastsearch_values_tmp_'.$key]);
 				if (count($val))
 				{
-					if (empty($val['sortfield'])) unset($val['sortfield']);
-					if (empty($val['sortorder'])) unset($val['sortorder']);
+					if (empty($val['sortfield'])) {
+						unset($val['sortfield']);
+					}
+					if (empty($val['sortorder'])) {
+						unset($val['sortorder']);
+					}
 					dol_syslog('Save lastsearch_values_tmp_'.$key.'='.json_encode($val, 0)." (systematic recording of last search criteria)");
 					$_SESSION['lastsearch_values_tmp_'.$key]=json_encode($val);
 					unset($_SESSION['lastsearch_values_'.$key]);
@@ -1916,16 +2204,26 @@ 
 
 		print '</div> <!-- End div class="fiche" -->'."\n"; // End div fiche
 
-		if (empty($conf->dol_hide_leftmenu)) print '</div> <!-- End div id-right -->'; // End div id-right
+		if (empty($conf->dol_hide_leftmenu)) {
+			print '</div> <!-- End div id-right -->';
+		}
+		// End div id-right
 
 		print "\n";
-		if ($comment) print '<!-- '.$comment.' -->'."\n";
+		if ($comment) {
+			print '<!-- '.$comment.' -->'."\n";
+		}
 
 		printCommonFooter($zone);
 
-		if (empty($conf->dol_hide_leftmenu) && empty($conf->dol_use_jmobile)) print '</div> <!-- End div id-container -->'."\n";	// End div container
+		if (empty($conf->dol_hide_leftmenu) && empty($conf->dol_use_jmobile)) {
+			print '</div> <!-- End div id-container -->'."\n";
+		}
+		// End div container
 
-		if (! empty($delayedhtmlcontent)) print $delayedhtmlcontent;
+		if (! empty($delayedhtmlcontent)) {
+			print $delayedhtmlcontent;
+		}
 
 		// TODO Move this in lib_head.js.php
 
@@ -2014,9 +2312,11 @@ 
 		// Wrapper to add log when clicking on download or preview
 		if (! empty($conf->blockedlog->enabled) && is_object($object) && $object->id > 0 && $object->statut > 0)
 		{
-			if (in_array($object->element, array('facture')))       // Restrict for the moment to element 'facture'
+			if (in_array($object->element, array('facture'))) {
+				// Restrict for the moment to element 'facture'
 			{
 				print "\n<!-- JS CODE TO ENABLE log when making a download or a preview of a document -->\n";
+			}
 				?>
     			<script type="text/javascript">
     			jQuery(document).ready(function () {

htdocs/product/class/productcustomerprice.class.php

Doc Comments +1 added lines, -1 removed lines

@@ -507,7 +507,7 @@
 	/**
 	 * Update object into database
 	 *
-	 * @param User $user that modifies
+	 * @param integer $user that modifies
 	 * @param int $notrigger triggers after, 1=disable triggers
 	 * @param int $forceupdateaffiliate update price on each soc child
 	 * @return int <0 if KO, >0 if OK

Braces +108 added lines, -64 removed lines

@@ -75,34 +75,48 @@ 
 
 		// Clean parameters
 
-		if (isset($this->entity))
-			$this->entity = trim($this->entity);
-		if (isset($this->fk_product))
-			$this->fk_product = trim($this->fk_product);
-		if (isset($this->fk_soc))
-			$this->fk_soc = trim($this->fk_soc);
-		if (isset($this->price))
-			$this->price = trim($this->price);
-		if (isset($this->price_ttc))
-			$this->price_ttc = trim($this->price_ttc);
-		if (isset($this->price_min))
-			$this->price_min = trim($this->price_min);
-		if (isset($this->price_min_ttc))
-			$this->price_min_ttc = trim($this->price_min_ttc);
-		if (isset($this->price_base_type))
-			$this->price_base_type = trim($this->price_base_type);
-		if (isset($this->tva_tx))
-			$this->tva_tx = trim($this->tva_tx);
-		if (isset($this->recuperableonly))
-			$this->recuperableonly = trim($this->recuperableonly);
-		if (isset($this->localtax1_tx))
-			$this->localtax1_tx = trim($this->localtax1_tx);
-		if (isset($this->localtax2_tx))
-			$this->localtax2_tx = trim($this->localtax2_tx);
-		if (isset($this->fk_user))
-			$this->fk_user = trim($this->fk_user);
-		if (isset($this->import_key))
-			$this->import_key = trim($this->import_key);
+		if (isset($this->entity)) {
+					$this->entity = trim($this->entity);
+		}
+		if (isset($this->fk_product)) {
+					$this->fk_product = trim($this->fk_product);
+		}
+		if (isset($this->fk_soc)) {
+					$this->fk_soc = trim($this->fk_soc);
+		}
+		if (isset($this->price)) {
+					$this->price = trim($this->price);
+		}
+		if (isset($this->price_ttc)) {
+					$this->price_ttc = trim($this->price_ttc);
+		}
+		if (isset($this->price_min)) {
+					$this->price_min = trim($this->price_min);
+		}
+		if (isset($this->price_min_ttc)) {
+					$this->price_min_ttc = trim($this->price_min_ttc);
+		}
+		if (isset($this->price_base_type)) {
+					$this->price_base_type = trim($this->price_base_type);
+		}
+		if (isset($this->tva_tx)) {
+					$this->tva_tx = trim($this->tva_tx);
+		}
+		if (isset($this->recuperableonly)) {
+					$this->recuperableonly = trim($this->recuperableonly);
+		}
+		if (isset($this->localtax1_tx)) {
+					$this->localtax1_tx = trim($this->localtax1_tx);
+		}
+		if (isset($this->localtax2_tx)) {
+					$this->localtax2_tx = trim($this->localtax2_tx);
+		}
+		if (isset($this->fk_user)) {
+					$this->fk_user = trim($this->fk_user);
+		}
+		if (isset($this->import_key)) {
+					$this->import_key = trim($this->import_key);
+		}
 
 			// Check parameters
 			// Put here code to add control on parameters values
@@ -308,8 +322,12 @@ 
 	{
 		global $langs;
 
-		if ( empty($sortfield)) $sortfield = "t.rowid";
-		if ( empty($sortorder)) $sortorder = "DESC";
+		if ( empty($sortfield)) {
+			$sortfield = "t.rowid";
+		}
+		if ( empty($sortorder)) {
+			$sortorder = "DESC";
+		}
 
 		$sql = "SELECT";
 		$sql .= " t.rowid,";
@@ -343,9 +361,11 @@ 
 		// Manage filter
 		if (count($filter) > 0) {
 			foreach ( $filter as $key => $value ) {
-				if (strpos($key, 'date')) 				// To allow $filter['YEAR(s.dated)']=>$year
+				if (strpos($key, 'date')) {
+					// To allow $filter['YEAR(s.dated)']=>$year
 				{
 					$sql .= ' AND ' . $key . ' = \'' . $value . '\'';
+				}
 				} elseif ($key == 'soc.nom') {
 					$sql .= ' AND ' . $key . ' LIKE \'%' . $value . '%\'';
 				} elseif ($key == 'prod.ref') {
@@ -356,7 +376,9 @@ 
 			}
 		}
 		$sql.= $this->db->order($sortfield, $sortorder);
-		if (! empty($limit)) $sql .= ' ' . $this->db->plimit($limit + 1, $offset);
+		if (! empty($limit)) {
+			$sql .= ' ' . $this->db->plimit($limit + 1, $offset);
+		}
 
 		dol_syslog(get_class($this) . "::fetch_all", LOG_DEBUG);
 		$resql = $this->db->query($sql);
@@ -416,8 +438,12 @@ 
 	{
 		global $langs;
 
-		if (! empty($sortfield)) $sortfield = "t.rowid";
-		if (! empty($sortorder)) $sortorder = "DESC";
+		if (! empty($sortfield)) {
+			$sortfield = "t.rowid";
+		}
+		if (! empty($sortorder)) {
+			$sortorder = "DESC";
+		}
 
 		$sql = "SELECT";
 		$sql .= " t.rowid,";
@@ -450,9 +476,11 @@ 
 		// Manage filter
 		if (count($filter) > 0) {
 			foreach ( $filter as $key => $value ) {
-				if (strpos($key, 'date')) 				// To allow $filter['YEAR(s.dated)']=>$year
+				if (strpos($key, 'date')) {
+					// To allow $filter['YEAR(s.dated)']=>$year
 				{
 					$sql .= ' AND ' . $key . ' = \'' . $value . '\'';
+				}
 				} elseif ($key == 'soc.nom') {
 					$sql .= ' AND ' . $key . ' LIKE \'%' . $value . '%\'';
 				} else {
@@ -462,7 +490,9 @@ 
 		}
 
 		$sql.= $this->db->order($sortfield, $sortorder);
-		if (! empty($limit)) $sql .= ' ' . $this->db->plimit($limit + 1, $offset);
+		if (! empty($limit)) {
+			$sql .= ' ' . $this->db->plimit($limit + 1, $offset);
+		}
 
 		dol_syslog(get_class($this) . "::fetch_all_log", LOG_DEBUG);
 		$resql = $this->db->query($sql);
@@ -523,34 +553,48 @@ 
 
 		// Clean parameters
 
-		if (isset($this->entity))
-			$this->entity = trim($this->entity);
-		if (isset($this->fk_product))
-			$this->fk_product = trim($this->fk_product);
-		if (isset($this->fk_soc))
-			$this->fk_soc = trim($this->fk_soc);
-		if (isset($this->price))
-			$this->price = trim($this->price);
-		if (isset($this->price_ttc))
-			$this->price_ttc = trim($this->price_ttc);
-		if (isset($this->price_min))
-			$this->price_min = trim($this->price_min);
-		if (isset($this->price_min_ttc))
-			$this->price_min_ttc = trim($this->price_min_ttc);
-		if (isset($this->price_base_type))
-			$this->price_base_type = trim($this->price_base_type);
-		if (isset($this->tva_tx))
-			$this->tva_tx = trim($this->tva_tx);
-		if (isset($this->recuperableonly))
-			$this->recuperableonly = trim($this->recuperableonly);
-		if (isset($this->localtax1_tx))
-			$this->localtax1_tx = trim($this->localtax1_tx);
-		if (isset($this->localtax2_tx))
-			$this->localtax2_tx = trim($this->localtax2_tx);
-		if (isset($this->fk_user))
-			$this->fk_user = trim($this->fk_user);
-		if (isset($this->import_key))
-			$this->import_key = trim($this->import_key);
+		if (isset($this->entity)) {
+					$this->entity = trim($this->entity);
+		}
+		if (isset($this->fk_product)) {
+					$this->fk_product = trim($this->fk_product);
+		}
+		if (isset($this->fk_soc)) {
+					$this->fk_soc = trim($this->fk_soc);
+		}
+		if (isset($this->price)) {
+					$this->price = trim($this->price);
+		}
+		if (isset($this->price_ttc)) {
+					$this->price_ttc = trim($this->price_ttc);
+		}
+		if (isset($this->price_min)) {
+					$this->price_min = trim($this->price_min);
+		}
+		if (isset($this->price_min_ttc)) {
+					$this->price_min_ttc = trim($this->price_min_ttc);
+		}
+		if (isset($this->price_base_type)) {
+					$this->price_base_type = trim($this->price_base_type);
+		}
+		if (isset($this->tva_tx)) {
+					$this->tva_tx = trim($this->tva_tx);
+		}
+		if (isset($this->recuperableonly)) {
+					$this->recuperableonly = trim($this->recuperableonly);
+		}
+		if (isset($this->localtax1_tx)) {
+					$this->localtax1_tx = trim($this->localtax1_tx);
+		}
+		if (isset($this->localtax2_tx)) {
+					$this->localtax2_tx = trim($this->localtax2_tx);
+		}
+		if (isset($this->fk_user)) {
+					$this->fk_user = trim($this->fk_user);
+		}
+		if (isset($this->import_key)) {
+					$this->import_key = trim($this->import_key);
+		}
 
 			// Check parameters
 			// Put here code to add a control on parameters values

Spacing +152 added lines, -152 removed lines

@@ -21,7 +21,7 @@ 
  * \ingroup produit
  * \brief File of class to manage predefined price products or services by customer
  */
-require_once DOL_DOCUMENT_ROOT . '/core/class/commonobject.class.php';
+require_once DOL_DOCUMENT_ROOT.'/core/class/commonobject.class.php';
 
 /**
  * File of class to manage predefined price products or services by customer
@@ -47,7 +47,7 @@ 
 	var $localtax2_type;
 	var $localtax2_tx;
 	var $fk_user;
-	var $lines = array ();
+	var $lines = array();
 
 	/**
 	 * Constructor
@@ -139,7 +139,7 @@ 
 		}
 
 		// Insert request
-		$sql = "INSERT INTO " . MAIN_DB_PREFIX . "product_customer_price(";
+		$sql = "INSERT INTO ".MAIN_DB_PREFIX."product_customer_price(";
 		$sql .= "entity,";
 		$sql .= "datec,";
 		$sql .= "fk_product,";
@@ -159,39 +159,39 @@ 
 		$sql .= "fk_user,";
 		$sql .= "import_key";
 		$sql .= ") VALUES (";
-		$sql .= " " . $conf->entity . ",";
-		$sql .= " '" . $this->db->idate(dol_now()) . "',";
-		$sql .= " " . (! isset($this->fk_product) ? 'NULL' : "'" . $this->db->escape($this->fk_product) . "'") . ",";
-		$sql .= " " . (! isset($this->fk_soc) ? 'NULL' : "'" . $this->db->escape($this->fk_soc) . "'") . ",";
-		$sql .= " " . (empty($this->price) ? '0' : "'" . $this->db->escape($this->price) . "'") . ",";
-		$sql .= " " . (empty($this->price_ttc) ? '0' : "'" . $this->db->escape($this->price_ttc) . "'") . ",";
-		$sql .= " " . (empty($this->price_min) ? '0' : "'" . $this->db->escape($this->price_min) . "'") . ",";
-		$sql .= " " . (empty($this->price_min_ttc) ? '0' : "'" . $this->db->escape($this->price_min_ttc) . "'") . ",";
-		$sql .= " " . (! isset($this->price_base_type) ? 'NULL' : "'" . $this->db->escape($this->price_base_type) . "'") . ",";
+		$sql .= " ".$conf->entity.",";
+		$sql .= " '".$this->db->idate(dol_now())."',";
+		$sql .= " ".(!isset($this->fk_product) ? 'NULL' : "'".$this->db->escape($this->fk_product)."'").",";
+		$sql .= " ".(!isset($this->fk_soc) ? 'NULL' : "'".$this->db->escape($this->fk_soc)."'").",";
+		$sql .= " ".(empty($this->price) ? '0' : "'".$this->db->escape($this->price)."'").",";
+		$sql .= " ".(empty($this->price_ttc) ? '0' : "'".$this->db->escape($this->price_ttc)."'").",";
+		$sql .= " ".(empty($this->price_min) ? '0' : "'".$this->db->escape($this->price_min)."'").",";
+		$sql .= " ".(empty($this->price_min_ttc) ? '0' : "'".$this->db->escape($this->price_min_ttc)."'").",";
+		$sql .= " ".(!isset($this->price_base_type) ? 'NULL' : "'".$this->db->escape($this->price_base_type)."'").",";
 		$sql .= " ".($this->default_vat_code ? "'".$this->db->escape($this->default_vat_code)."'" : "null").",";
-		$sql .= " " . (! isset($this->tva_tx) ? 'NULL' : (empty($this->tva_tx)?0:$this->tva_tx)) . ",";
-		$sql .= " " . (! isset($this->recuperableonly) ? 'NULL' : "'" . $this->db->escape($this->recuperableonly) . "'") . ",";
-		$sql .= " " . (empty($this->localtax1_type) ? "'0'" : "'" . $this->db->escape($this->localtax1_type) . "'") . ",";
-		$sql .= " " . (! isset($this->localtax1_tx) ? 'NULL' : (empty($this->localtax1_tx)?0:$this->localtax1_tx)) . ",";
-		$sql .= " " . (empty($this->localtax2_type) ? "'0'" : "'" . $this->db->escape($this->localtax2_type) . "'") . ",";
-		$sql .= " " . (! isset($this->localtax2_tx) ? 'NULL' : (empty($this->localtax2_tx)?0:$this->localtax2_tx)) . ",";
-		$sql .= " " . $user->id . ",";
-		$sql .= " " . (! isset($this->import_key) ? 'NULL' : "'" . $this->db->escape($this->import_key) . "'") . "";
+		$sql .= " ".(!isset($this->tva_tx) ? 'NULL' : (empty($this->tva_tx) ? 0 : $this->tva_tx)).",";
+		$sql .= " ".(!isset($this->recuperableonly) ? 'NULL' : "'".$this->db->escape($this->recuperableonly)."'").",";
+		$sql .= " ".(empty($this->localtax1_type) ? "'0'" : "'".$this->db->escape($this->localtax1_type)."'").",";
+		$sql .= " ".(!isset($this->localtax1_tx) ? 'NULL' : (empty($this->localtax1_tx) ? 0 : $this->localtax1_tx)).",";
+		$sql .= " ".(empty($this->localtax2_type) ? "'0'" : "'".$this->db->escape($this->localtax2_type)."'").",";
+		$sql .= " ".(!isset($this->localtax2_tx) ? 'NULL' : (empty($this->localtax2_tx) ? 0 : $this->localtax2_tx)).",";
+		$sql .= " ".$user->id.",";
+		$sql .= " ".(!isset($this->import_key) ? 'NULL' : "'".$this->db->escape($this->import_key)."'")."";
 		$sql .= ")";
 
 		$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) {
-			$this->id = $this->db->last_insert_id(MAIN_DB_PREFIX . "product_customer_price");
+		if (!$error) {
+			$this->id = $this->db->last_insert_id(MAIN_DB_PREFIX."product_customer_price");
 
-			if (! $notrigger) {
+			if (!$notrigger) {
 				// Uncomment this and change MYOBJECT to your own tag if you
 				// want this action calls a trigger.
 
@@ -204,21 +204,21 @@ 
 			}
 		}
 
-		if (! $error) {
+		if (!$error) {
 			$result = $this->setPriceOnAffiliateThirdparty($user, $forceupdateaffiliate);
 			if ($result < 0) {
-				$error ++;
+				$error++;
 			}
 		}
 
 		// 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);
+			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;
+			return -1 * $error;
 		} else {
 			$this->db->commit();
 			return $this->id;
@@ -256,10 +256,10 @@ 
 		$sql .= " t.fk_user,";
 		$sql .= " t.import_key";
 
-		$sql .= " FROM " . MAIN_DB_PREFIX . "product_customer_price as t";
-		$sql .= " WHERE t.rowid = " . $id;
+		$sql .= " FROM ".MAIN_DB_PREFIX."product_customer_price as t";
+		$sql .= " WHERE t.rowid = ".$id;
 
-		dol_syslog(get_class($this) . "::fetch", LOG_DEBUG);
+		dol_syslog(get_class($this)."::fetch", LOG_DEBUG);
 		$resql = $this->db->query($sql);
 		if ($resql) {
 			if ($this->db->num_rows($resql)) {
@@ -289,8 +289,8 @@ 
 
 			return 1;
 		} else {
-			$this->error = "Error " . $this->db->lasterror();
-			return - 1;
+			$this->error = "Error ".$this->db->lasterror();
+			return -1;
 		}
 	}
 
@@ -308,8 +308,8 @@ 
 	{
 		global $langs;
 
-		if ( empty($sortfield)) $sortfield = "t.rowid";
-		if ( empty($sortorder)) $sortorder = "DESC";
+		if (empty($sortfield)) $sortfield = "t.rowid";
+		if (empty($sortorder)) $sortorder = "DESC";
 
 		$sql = "SELECT";
 		$sql .= " t.rowid,";
@@ -333,39 +333,39 @@ 
 		$sql .= " t.import_key,";
 		$sql .= " soc.nom as socname,";
 		$sql .= " prod.ref as prodref";
-		$sql .= " FROM " . MAIN_DB_PREFIX . "product_customer_price as t ";
-		$sql .= " ," . MAIN_DB_PREFIX . "product as prod ";
-		$sql .= " ," . MAIN_DB_PREFIX . "societe as soc ";
+		$sql .= " FROM ".MAIN_DB_PREFIX."product_customer_price as t ";
+		$sql .= " ,".MAIN_DB_PREFIX."product as prod ";
+		$sql .= " ,".MAIN_DB_PREFIX."societe as soc ";
 		$sql .= " WHERE soc.rowid=t.fk_soc ";
 		$sql .= " AND prod.rowid=t.fk_product ";
-		$sql .= " AND prod.entity IN (" . getEntity('product') . ")";
+		$sql .= " AND prod.entity IN (".getEntity('product').")";
 
 		// Manage filter
 		if (count($filter) > 0) {
-			foreach ( $filter as $key => $value ) {
+			foreach ($filter as $key => $value) {
 				if (strpos($key, 'date')) 				// To allow $filter['YEAR(s.dated)']=>$year
 				{
-					$sql .= ' AND ' . $key . ' = \'' . $value . '\'';
+					$sql .= ' AND '.$key.' = \''.$value.'\'';
 				} elseif ($key == 'soc.nom') {
-					$sql .= ' AND ' . $key . ' LIKE \'%' . $value . '%\'';
+					$sql .= ' AND '.$key.' LIKE \'%'.$value.'%\'';
 				} elseif ($key == 'prod.ref') {
-					$sql .= ' AND ' . $key . ' LIKE \'%' . $value . '%\'';
+					$sql .= ' AND '.$key.' LIKE \'%'.$value.'%\'';
 				} else {
-					$sql .= ' AND ' . $key . ' = ' . $value;
+					$sql .= ' AND '.$key.' = '.$value;
 				}
 			}
 		}
-		$sql.= $this->db->order($sortfield, $sortorder);
-		if (! empty($limit)) $sql .= ' ' . $this->db->plimit($limit + 1, $offset);
+		$sql .= $this->db->order($sortfield, $sortorder);
+		if (!empty($limit)) $sql .= ' '.$this->db->plimit($limit + 1, $offset);
 
-		dol_syslog(get_class($this) . "::fetch_all", LOG_DEBUG);
+		dol_syslog(get_class($this)."::fetch_all", LOG_DEBUG);
 		$resql = $this->db->query($sql);
 		if ($resql) {
 
-			$this->lines = array ();
+			$this->lines = array();
 			$num = $this->db->num_rows($resql);
 
-			while ( $obj = $this->db->fetch_object($resql) ) {
+			while ($obj = $this->db->fetch_object($resql)) {
 
 				$line = new PriceByCustomerLine();
 
@@ -397,8 +397,8 @@ 
 
 			return $num;
 		} else {
-			$this->error = "Error " . $this->db->lasterror();
-			return - 1;
+			$this->error = "Error ".$this->db->lasterror();
+			return -1;
 		}
 	}
 
@@ -416,8 +416,8 @@ 
 	{
 		global $langs;
 
-		if (! empty($sortfield)) $sortfield = "t.rowid";
-		if (! empty($sortorder)) $sortorder = "DESC";
+		if (!empty($sortfield)) $sortfield = "t.rowid";
+		if (!empty($sortorder)) $sortorder = "DESC";
 
 		$sql = "SELECT";
 		$sql .= " t.rowid,";
@@ -440,38 +440,38 @@ 
 		$sql .= " t.import_key,";
 		$sql .= " soc.nom as socname,";
 		$sql .= " prod.ref as prodref";
-		$sql .= " FROM " . MAIN_DB_PREFIX . "product_customer_price_log as t ";
-		$sql .= " ," . MAIN_DB_PREFIX . "product as prod ";
-		$sql .= " ," . MAIN_DB_PREFIX . "societe as soc ";
+		$sql .= " FROM ".MAIN_DB_PREFIX."product_customer_price_log as t ";
+		$sql .= " ,".MAIN_DB_PREFIX."product as prod ";
+		$sql .= " ,".MAIN_DB_PREFIX."societe as soc ";
 		$sql .= " WHERE soc.rowid=t.fk_soc ";
 		$sql .= " AND prod.rowid=t.fk_product ";
-		$sql .= " AND prod.entity IN (" . getEntity('product') . ")";
+		$sql .= " AND prod.entity IN (".getEntity('product').")";
 
 		// Manage filter
 		if (count($filter) > 0) {
-			foreach ( $filter as $key => $value ) {
+			foreach ($filter as $key => $value) {
 				if (strpos($key, 'date')) 				// To allow $filter['YEAR(s.dated)']=>$year
 				{
-					$sql .= ' AND ' . $key . ' = \'' . $value . '\'';
+					$sql .= ' AND '.$key.' = \''.$value.'\'';
 				} elseif ($key == 'soc.nom') {
-					$sql .= ' AND ' . $key . ' LIKE \'%' . $value . '%\'';
+					$sql .= ' AND '.$key.' LIKE \'%'.$value.'%\'';
 				} else {
-					$sql .= ' AND ' . $key . ' = ' . $value;
+					$sql .= ' AND '.$key.' = '.$value;
 				}
 			}
 		}
 
-		$sql.= $this->db->order($sortfield, $sortorder);
-		if (! empty($limit)) $sql .= ' ' . $this->db->plimit($limit + 1, $offset);
+		$sql .= $this->db->order($sortfield, $sortorder);
+		if (!empty($limit)) $sql .= ' '.$this->db->plimit($limit + 1, $offset);
 
-		dol_syslog(get_class($this) . "::fetch_all_log", LOG_DEBUG);
+		dol_syslog(get_class($this)."::fetch_all_log", LOG_DEBUG);
 		$resql = $this->db->query($sql);
 		if ($resql) {
 
-			$this->lines = array ();
+			$this->lines = array();
 			$num = $this->db->num_rows($resql);
 
-			while ( $obj = $this->db->fetch_object($resql) ) {
+			while ($obj = $this->db->fetch_object($resql)) {
 
 				$line = new PriceByCustomerLine();
 
@@ -503,8 +503,8 @@ 
 
 			return $num;
 		} else {
-			$this->error = "Error " . $this->db->lasterror();
-			return - 1;
+			$this->error = "Error ".$this->db->lasterror();
+			return -1;
 		}
 	}
 
@@ -588,7 +588,7 @@ 
 
 		// Do a copy of current record into log table
 		// Insert request
-		$sql = "INSERT INTO " . MAIN_DB_PREFIX . "product_customer_price_log(";
+		$sql = "INSERT INTO ".MAIN_DB_PREFIX."product_customer_price_log(";
 
 		$sql .= "entity,";
 		$sql .= "datec,";
@@ -631,75 +631,75 @@ 
 		$sql .= " t.fk_user,";
 		$sql .= " t.import_key";
 
-		$sql .= " FROM " . MAIN_DB_PREFIX . "product_customer_price as t";
-		$sql .= " WHERE t.rowid = " . $this->id;
+		$sql .= " FROM ".MAIN_DB_PREFIX."product_customer_price as t";
+		$sql .= " WHERE t.rowid = ".$this->id;
 
 		$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 (!$resql) {
+			$error++;
+			$this->errors [] = "Error ".$this->db->lasterror();
 		}
 
 		// Update request
-		$sql = "UPDATE " . MAIN_DB_PREFIX . "product_customer_price SET";
-
-		$sql .= " entity=" . $conf->entity . ",";
-		$sql .= " datec='" . $this->db->idate(dol_now()) . "',";
-		$sql .= " tms=" . (dol_strlen($this->tms) != 0 ? "'" . $this->db->idate($this->tms) . "'" : 'null') . ",";
-		$sql .= " fk_product=" . (isset($this->fk_product) ? $this->fk_product : "null") . ",";
-		$sql .= " fk_soc=" . (isset($this->fk_soc) ? $this->fk_soc : "null") . ",";
-		$sql .= " price=" . (isset($this->price) ? $this->price : "null") . ",";
-		$sql .= " price_ttc=" . (isset($this->price_ttc) ? $this->price_ttc : "null") . ",";
-		$sql .= " price_min=" . (isset($this->price_min) ? $this->price_min : "null") . ",";
-		$sql .= " price_min_ttc=" . (isset($this->price_min_ttc) ? $this->price_min_ttc : "null") . ",";
-		$sql .= " price_base_type=" . (isset($this->price_base_type) ? "'" . $this->db->escape($this->price_base_type) . "'" : "null") . ",";
+		$sql = "UPDATE ".MAIN_DB_PREFIX."product_customer_price SET";
+
+		$sql .= " entity=".$conf->entity.",";
+		$sql .= " datec='".$this->db->idate(dol_now())."',";
+		$sql .= " tms=".(dol_strlen($this->tms) != 0 ? "'".$this->db->idate($this->tms)."'" : 'null').",";
+		$sql .= " fk_product=".(isset($this->fk_product) ? $this->fk_product : "null").",";
+		$sql .= " fk_soc=".(isset($this->fk_soc) ? $this->fk_soc : "null").",";
+		$sql .= " price=".(isset($this->price) ? $this->price : "null").",";
+		$sql .= " price_ttc=".(isset($this->price_ttc) ? $this->price_ttc : "null").",";
+		$sql .= " price_min=".(isset($this->price_min) ? $this->price_min : "null").",";
+		$sql .= " price_min_ttc=".(isset($this->price_min_ttc) ? $this->price_min_ttc : "null").",";
+		$sql .= " price_base_type=".(isset($this->price_base_type) ? "'".$this->db->escape($this->price_base_type)."'" : "null").",";
 		$sql .= " default_vat_code = ".($this->default_vat_code ? "'".$this->db->escape($this->default_vat_code)."'" : "null").",";
-		$sql .= " tva_tx=" . (isset($this->tva_tx) ? (empty($this->tva_tx)?0:$this->tva_tx) : "null") . ",";
-		$sql .= " recuperableonly=" . (isset($this->recuperableonly) ? $this->recuperableonly : "null") . ",";
-		$sql .= " localtax1_tx=" . (isset($this->localtax1_tx) ? (empty($this->localtax1_tx)?0:$this->localtax1_tx) : "null") . ",";
-		$sql .= " localtax2_tx=" . (isset($this->localtax2_tx) ? (empty($this->localtax2_tx)?0:$this->localtax2_tx) : "null") . ",";
-		$sql .= " localtax1_type=" . (! empty($this->localtax1_type) ? "'".$this->db->escape($this->localtax1_type)."'": "'0'") . ",";
-		$sql .= " localtax2_type=" . (! empty($this->localtax2_type) ? "'".$this->db->escape($this->localtax2_type)."'": "'0'") . ",";
-		$sql .= " fk_user=" . $user->id . ",";
-		$sql .= " import_key=" . (isset($this->import_key) ? "'" . $this->db->escape($this->import_key) . "'" : "null") . "";
-
-		$sql .= " WHERE rowid=" . $this->id;
-
-		dol_syslog(get_class($this) . "::update", LOG_DEBUG);
+		$sql .= " tva_tx=".(isset($this->tva_tx) ? (empty($this->tva_tx) ? 0 : $this->tva_tx) : "null").",";
+		$sql .= " recuperableonly=".(isset($this->recuperableonly) ? $this->recuperableonly : "null").",";
+		$sql .= " localtax1_tx=".(isset($this->localtax1_tx) ? (empty($this->localtax1_tx) ? 0 : $this->localtax1_tx) : "null").",";
+		$sql .= " localtax2_tx=".(isset($this->localtax2_tx) ? (empty($this->localtax2_tx) ? 0 : $this->localtax2_tx) : "null").",";
+		$sql .= " localtax1_type=".(!empty($this->localtax1_type) ? "'".$this->db->escape($this->localtax1_type)."'" : "'0'").",";
+		$sql .= " localtax2_type=".(!empty($this->localtax2_type) ? "'".$this->db->escape($this->localtax2_type)."'" : "'0'").",";
+		$sql .= " fk_user=".$user->id.",";
+		$sql .= " import_key=".(isset($this->import_key) ? "'".$this->db->escape($this->import_key)."'" : "null")."";
+
+		$sql .= " WHERE rowid=".$this->id;
+
+		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 (! $notrigger) {
+		if (!$error) {
+			if (!$notrigger) {
 				// Call triggers
-				include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php';
-				$interface=new Interfaces($this->db);
-				$result=$interface->run_triggers('PRODUCT_CUSTOMER_PRICE_UPDATE',$this,$user,$langs,$conf);
-				if ($result < 0) { $error++; $this->errors=$interface->errors; }
+				include_once DOL_DOCUMENT_ROOT.'/core/class/interfaces.class.php';
+				$interface = new Interfaces($this->db);
+				$result = $interface->run_triggers('PRODUCT_CUSTOMER_PRICE_UPDATE', $this, $user, $langs, $conf);
+				if ($result < 0) { $error++; $this->errors = $interface->errors; }
 				// End call triggers
 			}
 		}
 
-		if (! $error) {
+		if (!$error) {
 			$result = $this->setPriceOnAffiliateThirdparty($user, $forceupdateaffiliate);
 			if ($result < 0) {
-				$error ++;
+				$error++;
 			}
 		}
 
 		// 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);
+			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;
+			return -1 * $error;
 		} else {
 			$this->db->commit();
 			return 1;
@@ -719,37 +719,37 @@ 
 
 		// Find all susidiaries
 		$sql = "SELECT s.rowid";
-		$sql .= " FROM " . MAIN_DB_PREFIX . "societe as s";
-		$sql .= " WHERE s.parent = " . $this->fk_soc;
-		$sql .= " AND s.entity IN (" . getEntity('societe') . ")";
+		$sql .= " FROM ".MAIN_DB_PREFIX."societe as s";
+		$sql .= " WHERE s.parent = ".$this->fk_soc;
+		$sql .= " AND s.entity IN (".getEntity('societe').")";
 
-		dol_syslog(get_class($this) . "::setPriceOnAffiliateThirdparty", LOG_DEBUG);
+		dol_syslog(get_class($this)."::setPriceOnAffiliateThirdparty", LOG_DEBUG);
 		$resql = $this->db->query($sql);
 
 		if ($resql) {
 
-			$this->lines = array ();
+			$this->lines = array();
 			$num = $this->db->num_rows($resql);
 
-			while ( ($obj = $this->db->fetch_object($resql)) && (empty($error)) ) {
+			while (($obj = $this->db->fetch_object($resql)) && (empty($error))) {
 
 				// find if there is an existing line for the product and the subsidiaries
 				$prodsocprice = new Productcustomerprice($this->db);
 
-				$filter = array (
-					't.fk_product' => $this->fk_product,'t.fk_soc' => $obj->rowid
+				$filter = array(
+					't.fk_product' => $this->fk_product, 't.fk_soc' => $obj->rowid
 				);
 
 				$result = $prodsocprice->fetch_all('', '', 0, 0, $filter);
 				if ($result < 0) {
-					$error ++;
+					$error++;
 					$this->error = $prodsocprice->error;
 				} else {
 
 					// There is one line
 					if (count($prodsocprice->lines) > 0) {
 						// If force update => Update
-						if (! empty($forceupdateaffiliate)) {
+						if (!empty($forceupdateaffiliate)) {
 
 							$prodsocpriceupd = new Productcustomerprice($this->db);
 							$prodsocpriceupd->fetch($prodsocprice->lines [0]->id);
@@ -762,7 +762,7 @@ 
 
 							$resultupd = $prodsocpriceupd->update($user, 0, $forceupdateaffiliate);
 							if ($result < 0) {
-								$error ++;
+								$error++;
 								$this->error = $prodsocpriceupd->error;
 							}
 						}
@@ -779,7 +779,7 @@ 
 
 						$resultupd = $prodsocpricenew->create($user, 0, $forceupdateaffiliate);
 						if ($result < 0) {
-							$error ++;
+							$error++;
 							$this->error = $prodsocpriceupd->error;
 						}
 					}
@@ -790,11 +790,11 @@ 
 			if (empty($error)) {
 				return 1;
 			} else {
-				return - 1;
+				return -1;
 			}
 		} else {
-			$this->error = "Error " . $this->db->lasterror();
-			return - 1;
+			$this->error = "Error ".$this->db->lasterror();
+			return -1;
 		}
 	}
 
@@ -812,8 +812,8 @@ 
 
 		$this->db->begin();
 
-		if (! $error) {
-			if (! $notrigger) {
+		if (!$error) {
+			if (!$notrigger) {
 				// Uncomment this and change MYOBJECT to your own tag if you
 				// want this action calls a trigger.
 
@@ -826,26 +826,26 @@ 
 			}
 		}
 
-		if (! $error) {
-			$sql = "DELETE FROM " . MAIN_DB_PREFIX . "product_customer_price";
-			$sql .= " WHERE rowid=" . $this->id;
+		if (!$error) {
+			$sql = "DELETE FROM ".MAIN_DB_PREFIX."product_customer_price";
+			$sql .= " WHERE rowid=".$this->id;
 
-			dol_syslog(get_class($this) . "::delete", LOG_DEBUG);
+			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();
 			}
 		}
 
 		// 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);
+			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;
+			return -1 * $error;
 		} else {
 			$this->db->commit();
 			return 1;
@@ -866,7 +866,7 @@ 
 
 		$object = new Productcustomerprice($this->db);
 
-		$object->context['createfromclone']='createfromclone';
+		$object->context['createfromclone'] = 'createfromclone';
 
 		$this->db->begin();
 
@@ -884,21 +884,21 @@ 
 		// Other options
 		if ($result < 0) {
 			$this->error = $object->error;
-			$error ++;
+			$error++;
 		}
 
-		if (! $error) {
+		if (!$error) {
 		}
 
 		unset($object->context['createfromclone']);
 
 		// End
-		if (! $error) {
+		if (!$error) {
 			$this->db->commit();
 			return $object->id;
 		} else {
 			$this->db->rollback();
-			return - 1;
+			return -1;
 		}
 	}
 

htdocs/product/class/propalmergepdfproduct.class.php

Doc Comments +1 added lines, -1 removed lines

@@ -297,7 +297,7 @@
     /**
      *  Update object into database
      *
-     *  @param	User	$user        User that modifies
+     *  @param	integer	$user        User that modifies
      *  @param  int		$notrigger	 0=launch triggers after, 1=disable triggers
      *  @return int     		   	 <0 if KO, >0 if OK
      */

Braces +39 added lines, -27 removed lines

@@ -73,12 +73,24 @@ 
 
 		// Clean parameters
         
-		if (isset($this->fk_product)) $this->fk_product=trim($this->fk_product);
-		if (isset($this->file_name)) $this->file_name=trim($this->file_name);
-		if (isset($this->fk_user_author)) $this->fk_user_author=trim($this->fk_user_author);
-		if (isset($this->fk_user_mod)) $this->fk_user_mod=trim($this->fk_user_mod);
-		if (isset($this->lang)) $this->lang=trim($this->lang);
-		if (isset($this->import_key)) $this->import_key=trim($this->import_key);
+		if (isset($this->fk_product)) {
+			$this->fk_product=trim($this->fk_product);
+		}
+		if (isset($this->file_name)) {
+			$this->file_name=trim($this->file_name);
+		}
+		if (isset($this->fk_user_author)) {
+			$this->fk_user_author=trim($this->fk_user_author);
+		}
+		if (isset($this->fk_user_mod)) {
+			$this->fk_user_mod=trim($this->fk_user_mod);
+		}
+		if (isset($this->lang)) {
+			$this->lang=trim($this->lang);
+		}
+		if (isset($this->import_key)) {
+			$this->import_key=trim($this->import_key);
+		}
 
         
 
@@ -146,8 +158,7 @@ 
 			}
 			$this->db->rollback();
 			return -1*$error;
-		}
-		else
+		} else
 		{
 			$this->db->commit();
             return $this->id;
@@ -207,8 +218,7 @@ 
             $this->db->free($resql);
 
             return 1;
-        }
-        else
+        } else
         {
       	    $this->error="Error ".$this->db->lasterror();
             dol_syslog(get_class($this)."::fetch ".$this->error, LOG_ERR);
@@ -272,7 +282,7 @@ 
 	    			
 	    			if ($conf->global->MAIN_MULTILANGS) {
 	    				$this->lines[$obj->file_name.'_'.$obj->lang]=$line;
-	    			}else {
+	    			} else {
 	    				$this->lines[$obj->file_name]=$line;
 	    			}
 	    			
@@ -284,8 +294,7 @@ 
     		$this->db->free($resql);
     
     		return 1;
-    	}
-    	else
+    	} else
     	{
     		$this->error="Error ".$this->db->lasterror();
     		dol_syslog(get_class($this)."::fetch_by_product ".$this->error, LOG_ERR);
@@ -308,10 +317,18 @@ 
 
 		// Clean parameters
         
-		if (isset($this->fk_product)) $this->fk_product=trim($this->fk_product);
-		if (isset($this->file_name)) $this->file_name=trim($this->file_name);
-		if (isset($this->fk_user_mod)) $this->fk_user_mod=trim($this->fk_user_mod);
-		if (isset($this->lang)) $this->lang=trim($this->lang);
+		if (isset($this->fk_product)) {
+			$this->fk_product=trim($this->fk_product);
+		}
+		if (isset($this->file_name)) {
+			$this->file_name=trim($this->file_name);
+		}
+		if (isset($this->fk_user_mod)) {
+			$this->fk_user_mod=trim($this->fk_user_mod);
+		}
+		if (isset($this->lang)) {
+			$this->lang=trim($this->lang);
+		}
 		
 
         
@@ -364,8 +381,7 @@ 
 			}
 			$this->db->rollback();
 			return -1*$error;
-		}
-		else
+		} else
 		{
 			$this->db->commit();
 			return 1;
@@ -423,8 +439,7 @@ 
 			}
 			$this->db->rollback();
 			return -1*$error;
-		}
-		else
+		} else
 		{
 			$this->db->commit();
 			return 1;
@@ -487,8 +502,7 @@ 
 			}
 			$this->db->rollback();
 			return -1*$error;
-		}
-		else
+		} else
 		{
 			$this->db->commit();
 			return 1;
@@ -544,8 +558,7 @@ 
 			}
 			$this->db->rollback();
 			return -1*$error;
-		}
-		else
+		} else
 		{
 			$this->db->commit();
 			return 1;
@@ -599,8 +612,7 @@ 
 		{
 			$this->db->commit();
 			return $object->id;
-		}
-		else
+		} else
 		{
 			$this->db->rollback();
 			return -1;

Indentation +206 added lines, -206 removed lines

@@ -47,28 +47,28 @@ 
 
 
 
-    /**
-     *  Constructor
-     *
-     *  @param	DoliDb		$db      Database handler
-     */
-    function __construct($db)
-    {
-        $this->db = $db;
-        return 1;
-    }
-
-
-    /**
-     *  Create object into database
-     *
-     *  @param	User	$user        User that creates
-     *  @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)
-    {
-    	global $conf, $langs;
+	/**
+	 *  Constructor
+	 *
+	 *  @param	DoliDb		$db      Database handler
+	 */
+	function __construct($db)
+	{
+		$this->db = $db;
+		return 1;
+	}
+
+
+	/**
+	 *  Create object into database
+	 *
+	 *  @param	User	$user        User that creates
+	 *  @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)
+	{
+		global $conf, $langs;
 		$error=0;
 
 		// Clean parameters
@@ -85,7 +85,7 @@ 
 		// Check parameters
 		// Put here code to add control on parameters values
 
-        // Insert request
+		// Insert request
 		$sql = "INSERT INTO ".MAIN_DB_PREFIX."propal_merge_pdf_product(";
 
 		$sql.= "fk_product,";
@@ -98,7 +98,7 @@ 
 		$sql.= "datec";
 
 
-        $sql.= ") VALUES (";
+		$sql.= ") VALUES (";
 
 		$sql.= " ".(! isset($this->fk_product)?'NULL':"'".$this->db->escape($this->fk_product)."'").",";
 		$sql.= " ".(! isset($this->file_name)?'NULL':"'".$this->db->escape($this->file_name)."'").",";
@@ -115,34 +115,34 @@ 
 		$this->db->begin();
 
 	   	dol_syslog(get_class($this)."::".__METHOD__, 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)
-        {
-            $this->id = $this->db->last_insert_id(MAIN_DB_PREFIX."propal_merge_pdf_product");
+		{
+			$this->id = $this->db->last_insert_id(MAIN_DB_PREFIX."propal_merge_pdf_product");
 
 			if (! $notrigger)
 			{
-	            // Uncomment this and change MYOBJECT to your own tag if you
-	            // want this action calls 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
+				// Uncomment this and change MYOBJECT to your own tag if you
+				// want this action calls 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)
+		// 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);
+				dol_syslog(get_class($this)."::create ".$errmsg, LOG_ERR);
+				$this->error.=($this->error?', '.$errmsg:$errmsg);
 			}
 			$this->db->rollback();
 			return -1*$error;
@@ -150,22 +150,22 @@ 
 		else
 		{
 			$this->db->commit();
-            return $this->id;
+			return $this->id;
 		}
-    }
+	}
 
 
-    /**
-     *  Load object in memory from the database
-     *
-     *  @param	int		$id    Id object
-     *  @return int          	<0 if KO, >0 if OK
-     */
-    function fetch($id)
-    {
-    	global $langs,$conf;
+	/**
+	 *  Load object in memory from the database
+	 *
+	 *  @param	int		$id    Id object
+	 *  @return int          	<0 if KO, >0 if OK
+	 */
+	function fetch($id)
+	{
+		global $langs,$conf;
 
-        $sql = "SELECT";
+		$sql = "SELECT";
 		$sql.= " t.rowid,";
 
 		$sql.= " t.fk_product,";
@@ -178,18 +178,18 @@ 
 		$sql.= " t.import_key";
 
 
-        $sql.= " FROM ".MAIN_DB_PREFIX."propal_merge_pdf_product as t";
-        $sql.= " WHERE t.rowid = ".$id;
+		$sql.= " FROM ".MAIN_DB_PREFIX."propal_merge_pdf_product as t";
+		$sql.= " WHERE t.rowid = ".$id;
 
-    	dol_syslog(get_class($this)."::".__METHOD__, LOG_DEBUG);
-        $resql=$this->db->query($sql);
-        if ($resql)
-        {
-            if ($this->db->num_rows($resql))
-            {
-                $obj = $this->db->fetch_object($resql);
+		dol_syslog(get_class($this)."::".__METHOD__, LOG_DEBUG);
+		$resql=$this->db->query($sql);
+		if ($resql)
+		{
+			if ($this->db->num_rows($resql))
+			{
+				$obj = $this->db->fetch_object($resql);
 
-                $this->id    = $obj->rowid;
+				$this->id    = $obj->rowid;
 
 				$this->fk_product = $obj->fk_product;
 				$this->file_name = $obj->file_name;
@@ -203,107 +203,107 @@ 
 				$this->import_key = $obj->import_key;
 
 
-            }
-            $this->db->free($resql);
-
-            return 1;
-        }
-        else
-        {
-      	    $this->error="Error ".$this->db->lasterror();
-            dol_syslog(get_class($this)."::fetch ".$this->error, LOG_ERR);
-            return -1;
-        }
-    }
-
-    /**
-     *  Load object in memory from the database
-     *
-     *  @param	int		$product_id    	Id object
-     *  @param	string	$lang  			Lang string code
-     *  @return int          	<0 if KO, >0 if OK
-     */
-    function fetch_by_product($product_id, $lang='')
-    {
-    	global $langs,$conf;
-
-    	$sql = "SELECT";
-    	$sql.= " t.rowid,";
-
-    	$sql.= " t.fk_product,";
-    	$sql.= " t.file_name,";
-    	$sql.= " t.lang,";
-    	$sql.= " t.fk_user_author,";
-    	$sql.= " t.fk_user_mod,";
-    	$sql.= " t.datec,";
-    	$sql.= " t.tms,";
-    	$sql.= " t.import_key";
-
-
-    	$sql.= " FROM ".MAIN_DB_PREFIX."propal_merge_pdf_product as t";
-    	$sql.= " WHERE t.fk_product = ".$product_id;
-    	if ($conf->global->MAIN_MULTILANGS && !empty($lang)) {
-    		$sql.= " AND t.lang = '".$lang."'";
-    	}
-
-    	dol_syslog(get_class($this)."::".__METHOD__, LOG_DEBUG);
-    	$resql=$this->db->query($sql);
-    	if ($resql)
-    	{
-    		if ($this->db->num_rows($resql))
-    		{
-    			while($obj = $this->db->fetch_object($resql)) {
-
-    				$line = new PropalmergepdfproductLine();
-
-	    			$line->id    = $obj->rowid;
-
-	    			$line->fk_product = $obj->fk_product;
-	    			$line->file_name = $obj->file_name;
-	    			if ($conf->global->MAIN_MULTILANGS) {
-	    				$line->lang = $obj->lang;
-	    			}
-	    			$line->fk_user_author = $obj->fk_user_author;
-	    			$line->fk_user_mod = $obj->fk_user_mod;
-	    			$line->datec = $this->db->jdate($obj->datec);
-	    			$line->tms = $this->db->jdate($obj->tms);
-	    			$line->import_key = $obj->import_key;
-
-
-	    			if ($conf->global->MAIN_MULTILANGS) {
-	    				$this->lines[$obj->file_name.'_'.$obj->lang]=$line;
-	    			}else {
-	    				$this->lines[$obj->file_name]=$line;
-	    			}
-
-
-    			}
-
-
-    		}
-    		$this->db->free($resql);
-
-    		return 1;
-    	}
-    	else
-    	{
-    		$this->error="Error ".$this->db->lasterror();
-    		dol_syslog(get_class($this)."::fetch_by_product ".$this->error, LOG_ERR);
-    		return -1;
-    	}
-    }
-
-
-    /**
-     *  Update object into database
-     *
-     *  @param	User	$user        User that modifies
-     *  @param  int		$notrigger	 0=launch triggers after, 1=disable triggers
-     *  @return int     		   	 <0 if KO, >0 if OK
-     */
-    function update($user=0, $notrigger=0)
-    {
-    	global $conf, $langs;
+			}
+			$this->db->free($resql);
+
+			return 1;
+		}
+		else
+		{
+	  		$this->error="Error ".$this->db->lasterror();
+			dol_syslog(get_class($this)."::fetch ".$this->error, LOG_ERR);
+			return -1;
+		}
+	}
+
+	/**
+	 *  Load object in memory from the database
+	 *
+	 *  @param	int		$product_id    	Id object
+	 *  @param	string	$lang  			Lang string code
+	 *  @return int          	<0 if KO, >0 if OK
+	 */
+	function fetch_by_product($product_id, $lang='')
+	{
+		global $langs,$conf;
+
+		$sql = "SELECT";
+		$sql.= " t.rowid,";
+
+		$sql.= " t.fk_product,";
+		$sql.= " t.file_name,";
+		$sql.= " t.lang,";
+		$sql.= " t.fk_user_author,";
+		$sql.= " t.fk_user_mod,";
+		$sql.= " t.datec,";
+		$sql.= " t.tms,";
+		$sql.= " t.import_key";
+
+
+		$sql.= " FROM ".MAIN_DB_PREFIX."propal_merge_pdf_product as t";
+		$sql.= " WHERE t.fk_product = ".$product_id;
+		if ($conf->global->MAIN_MULTILANGS && !empty($lang)) {
+			$sql.= " AND t.lang = '".$lang."'";
+		}
+
+		dol_syslog(get_class($this)."::".__METHOD__, LOG_DEBUG);
+		$resql=$this->db->query($sql);
+		if ($resql)
+		{
+			if ($this->db->num_rows($resql))
+			{
+				while($obj = $this->db->fetch_object($resql)) {
+
+					$line = new PropalmergepdfproductLine();
+
+					$line->id    = $obj->rowid;
+
+					$line->fk_product = $obj->fk_product;
+					$line->file_name = $obj->file_name;
+					if ($conf->global->MAIN_MULTILANGS) {
+						$line->lang = $obj->lang;
+					}
+					$line->fk_user_author = $obj->fk_user_author;
+					$line->fk_user_mod = $obj->fk_user_mod;
+					$line->datec = $this->db->jdate($obj->datec);
+					$line->tms = $this->db->jdate($obj->tms);
+					$line->import_key = $obj->import_key;
+
+
+					if ($conf->global->MAIN_MULTILANGS) {
+						$this->lines[$obj->file_name.'_'.$obj->lang]=$line;
+					}else {
+						$this->lines[$obj->file_name]=$line;
+					}
+
+
+				}
+
+
+			}
+			$this->db->free($resql);
+
+			return 1;
+		}
+		else
+		{
+			$this->error="Error ".$this->db->lasterror();
+			dol_syslog(get_class($this)."::fetch_by_product ".$this->error, LOG_ERR);
+			return -1;
+		}
+	}
+
+
+	/**
+	 *  Update object into database
+	 *
+	 *  @param	User	$user        User that modifies
+	 *  @param  int		$notrigger	 0=launch triggers after, 1=disable triggers
+	 *  @return int     		   	 <0 if KO, >0 if OK
+	 */
+	function update($user=0, $notrigger=0)
+	{
+		global $conf, $langs;
 		$error=0;
 
 		// Clean parameters
@@ -319,8 +319,8 @@ 
 		// Check parameters
 		// Put here code to add a control on parameters values
 
-        // Update request
-        $sql = "UPDATE ".MAIN_DB_PREFIX."propal_merge_pdf_product SET";
+		// Update request
+		$sql = "UPDATE ".MAIN_DB_PREFIX."propal_merge_pdf_product SET";
 
 		$sql.= " fk_product=".(isset($this->fk_product)?$this->fk_product:"null").",";
 		$sql.= " file_name=".(isset($this->file_name)?"'".$this->db->escape($this->file_name)."'":"null").",";
@@ -330,37 +330,37 @@ 
 		$sql.= " fk_user_mod=".$user->id;
 
 
-        $sql.= " WHERE rowid=".$this->id;
+		$sql.= " WHERE rowid=".$this->id;
 
 		$this->db->begin();
 
 		dol_syslog(get_class($this)."::".__METHOD__, 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 (! $notrigger)
 			{
-	            // Uncomment this and change MYOBJECT to your own tag if you
-	            // want this action calls 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
-	    	}
+				// Uncomment this and change MYOBJECT to your own tag if you
+				// want this action calls 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
+		// 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);
+				dol_syslog(get_class($this)."::update ".$errmsg, LOG_ERR);
+				$this->error.=($this->error?', '.$errmsg:$errmsg);
 			}
 			$this->db->rollback();
 			return -1*$error;
@@ -370,16 +370,16 @@ 
 			$this->db->commit();
 			return 1;
 		}
-    }
+	}
 
 
  	/**
-	 *  Delete object in database
-	 *
-     *	@param  User	$user        User that deletes
-     *  @param  int		$notrigger	 0=launch triggers after, 1=disable triggers
-	 *  @return	int					 <0 if KO, >0 if OK
-	 */
+ 	 *  Delete object in database
+ 	 *
+ 	 *	@param  User	$user        User that deletes
+ 	 *  @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;
@@ -392,34 +392,34 @@ 
 			if (! $notrigger)
 			{
 				// Uncomment this and change MYOBJECT to your own tag if you
-		        // want this action calls 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
+				// want this action calls 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
 			}
 		}
 
 		if (! $error)
 		{
-    		$sql = "DELETE FROM ".MAIN_DB_PREFIX."propal_merge_pdf_product";
-    		$sql.= " WHERE rowid=".$this->id;
+			$sql = "DELETE FROM ".MAIN_DB_PREFIX."propal_merge_pdf_product";
+			$sql.= " WHERE rowid=".$this->id;
 
-    		dol_syslog(get_class($this)."::".__METHOD__, LOG_DEBUG);
-    		$resql = $this->db->query($sql);
-        	if (! $resql) { $error++; $this->errors[]="Error ".$this->db->lasterror(); }
+			dol_syslog(get_class($this)."::".__METHOD__, LOG_DEBUG);
+			$resql = $this->db->query($sql);
+			if (! $resql) { $error++; $this->errors[]="Error ".$this->db->lasterror(); }
 		}
 
-        // Commit or rollback
+		// 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);
+				dol_syslog(get_class($this)."::delete ".$errmsg, LOG_ERR);
+				$this->error.=($this->error?', '.$errmsg:$errmsg);
 			}
 			$this->db->rollback();
 			return -1*$error;

Spacing +136 added lines, -136 removed lines

@@ -31,18 +31,18 @@ 
  */
 class Propalmergepdfproduct extends CommonObject
 {
-	var $element='propal_merge_pdf_product';			//!< Id that identify managed objects
-	var $table_element='propal_merge_pdf_product';		//!< Name of table without prefix where object is stored
+	var $element = 'propal_merge_pdf_product'; //!< Id that identify managed objects
+	var $table_element = 'propal_merge_pdf_product'; //!< Name of table without prefix where object is stored
 
 	var $fk_product;
 	var $file_name;
 	var $fk_user_author;
 	var $fk_user_mod;
-	var $datec='';
-	var $tms='';
+	var $datec = '';
+	var $tms = '';
 	var $lang;
 
-	var $lines=array();
+	var $lines = array();
 
 
 
@@ -66,19 +66,19 @@ 
      *  @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->fk_product)) $this->fk_product=trim($this->fk_product);
-		if (isset($this->file_name)) $this->file_name=trim($this->file_name);
-		if (isset($this->fk_user_author)) $this->fk_user_author=trim($this->fk_user_author);
-		if (isset($this->fk_user_mod)) $this->fk_user_mod=trim($this->fk_user_mod);
-		if (isset($this->lang)) $this->lang=trim($this->lang);
-		if (isset($this->import_key)) $this->import_key=trim($this->import_key);
+		if (isset($this->fk_product)) $this->fk_product = trim($this->fk_product);
+		if (isset($this->file_name)) $this->file_name = trim($this->file_name);
+		if (isset($this->fk_user_author)) $this->fk_user_author = trim($this->fk_user_author);
+		if (isset($this->fk_user_mod)) $this->fk_user_mod = trim($this->fk_user_mod);
+		if (isset($this->lang)) $this->lang = trim($this->lang);
+		if (isset($this->import_key)) $this->import_key = trim($this->import_key);
 
 
 
@@ -88,41 +88,41 @@ 
         // Insert request
 		$sql = "INSERT INTO ".MAIN_DB_PREFIX."propal_merge_pdf_product(";
 
-		$sql.= "fk_product,";
-		$sql.= "file_name,";
+		$sql .= "fk_product,";
+		$sql .= "file_name,";
 		if ($conf->global->MAIN_MULTILANGS) {
-			$sql.= "lang,";
+			$sql .= "lang,";
 		}
-		$sql.= "fk_user_author,";
-		$sql.= "fk_user_mod,";
-		$sql.= "datec";
+		$sql .= "fk_user_author,";
+		$sql .= "fk_user_mod,";
+		$sql .= "datec";
 
 
-        $sql.= ") VALUES (";
+        $sql .= ") VALUES (";
 
-		$sql.= " ".(! isset($this->fk_product)?'NULL':"'".$this->db->escape($this->fk_product)."'").",";
-		$sql.= " ".(! isset($this->file_name)?'NULL':"'".$this->db->escape($this->file_name)."'").",";
+		$sql .= " ".(!isset($this->fk_product) ? 'NULL' : "'".$this->db->escape($this->fk_product)."'").",";
+		$sql .= " ".(!isset($this->file_name) ? 'NULL' : "'".$this->db->escape($this->file_name)."'").",";
 		if ($conf->global->MAIN_MULTILANGS) {
-			$sql.= " ".(! isset($this->lang)?'NULL':"'".$this->db->escape($this->lang)."'").",";
+			$sql .= " ".(!isset($this->lang) ? 'NULL' : "'".$this->db->escape($this->lang)."'").",";
 		}
-		$sql.= " ".$user->id.",";
-		$sql.= " ".$user->id.",";
-		$sql.= " '".$this->db->idate(dol_now())."'";
+		$sql .= " ".$user->id.",";
+		$sql .= " ".$user->id.",";
+		$sql .= " '".$this->db->idate(dol_now())."'";
 
 
-		$sql.= ")";
+		$sql .= ")";
 
 		$this->db->begin();
 
 	   	dol_syslog(get_class($this)."::".__METHOD__, 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."propal_merge_pdf_product");
 
-			if (! $notrigger)
+			if (!$notrigger)
 			{
 	            // Uncomment this and change MYOBJECT to your own tag if you
 	            // want this action calls a trigger.
@@ -139,13 +139,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
 		{
@@ -163,33 +163,33 @@ 
      */
     function fetch($id)
     {
-    	global $langs,$conf;
+    	global $langs, $conf;
 
         $sql = "SELECT";
-		$sql.= " t.rowid,";
+		$sql .= " t.rowid,";
 
-		$sql.= " t.fk_product,";
-		$sql.= " t.file_name,";
-		$sql.= " t.lang,";
-		$sql.= " t.fk_user_author,";
-		$sql.= " t.fk_user_mod,";
-		$sql.= " t.datec,";
-		$sql.= " t.tms,";
-		$sql.= " t.import_key";
+		$sql .= " t.fk_product,";
+		$sql .= " t.file_name,";
+		$sql .= " t.lang,";
+		$sql .= " t.fk_user_author,";
+		$sql .= " t.fk_user_mod,";
+		$sql .= " t.datec,";
+		$sql .= " t.tms,";
+		$sql .= " t.import_key";
 
 
-        $sql.= " FROM ".MAIN_DB_PREFIX."propal_merge_pdf_product as t";
-        $sql.= " WHERE t.rowid = ".$id;
+        $sql .= " FROM ".MAIN_DB_PREFIX."propal_merge_pdf_product as t";
+        $sql .= " WHERE t.rowid = ".$id;
 
     	dol_syslog(get_class($this)."::".__METHOD__, 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->fk_product = $obj->fk_product;
 				$this->file_name = $obj->file_name;
@@ -210,7 +210,7 @@ 
         }
         else
         {
-      	    $this->error="Error ".$this->db->lasterror();
+      	    $this->error = "Error ".$this->db->lasterror();
             dol_syslog(get_class($this)."::fetch ".$this->error, LOG_ERR);
             return -1;
         }
@@ -223,40 +223,40 @@ 
      *  @param	string	$lang  			Lang string code
      *  @return int          	<0 if KO, >0 if OK
      */
-    function fetch_by_product($product_id, $lang='')
+    function fetch_by_product($product_id, $lang = '')
     {
-    	global $langs,$conf;
+    	global $langs, $conf;
 
     	$sql = "SELECT";
-    	$sql.= " t.rowid,";
+    	$sql .= " t.rowid,";
 
-    	$sql.= " t.fk_product,";
-    	$sql.= " t.file_name,";
-    	$sql.= " t.lang,";
-    	$sql.= " t.fk_user_author,";
-    	$sql.= " t.fk_user_mod,";
-    	$sql.= " t.datec,";
-    	$sql.= " t.tms,";
-    	$sql.= " t.import_key";
+    	$sql .= " t.fk_product,";
+    	$sql .= " t.file_name,";
+    	$sql .= " t.lang,";
+    	$sql .= " t.fk_user_author,";
+    	$sql .= " t.fk_user_mod,";
+    	$sql .= " t.datec,";
+    	$sql .= " t.tms,";
+    	$sql .= " t.import_key";
 
 
-    	$sql.= " FROM ".MAIN_DB_PREFIX."propal_merge_pdf_product as t";
-    	$sql.= " WHERE t.fk_product = ".$product_id;
+    	$sql .= " FROM ".MAIN_DB_PREFIX."propal_merge_pdf_product as t";
+    	$sql .= " WHERE t.fk_product = ".$product_id;
     	if ($conf->global->MAIN_MULTILANGS && !empty($lang)) {
-    		$sql.= " AND t.lang = '".$lang."'";
+    		$sql .= " AND t.lang = '".$lang."'";
     	}
 
     	dol_syslog(get_class($this)."::".__METHOD__, LOG_DEBUG);
-    	$resql=$this->db->query($sql);
+    	$resql = $this->db->query($sql);
     	if ($resql)
     	{
     		if ($this->db->num_rows($resql))
     		{
-    			while($obj = $this->db->fetch_object($resql)) {
+    			while ($obj = $this->db->fetch_object($resql)) {
 
     				$line = new PropalmergepdfproductLine();
 
-	    			$line->id    = $obj->rowid;
+	    			$line->id = $obj->rowid;
 
 	    			$line->fk_product = $obj->fk_product;
 	    			$line->file_name = $obj->file_name;
@@ -271,9 +271,9 @@ 
 
 
 	    			if ($conf->global->MAIN_MULTILANGS) {
-	    				$this->lines[$obj->file_name.'_'.$obj->lang]=$line;
-	    			}else {
-	    				$this->lines[$obj->file_name]=$line;
+	    				$this->lines[$obj->file_name.'_'.$obj->lang] = $line;
+	    			} else {
+	    				$this->lines[$obj->file_name] = $line;
 	    			}
 
 
@@ -287,7 +287,7 @@ 
     	}
     	else
     	{
-    		$this->error="Error ".$this->db->lasterror();
+    		$this->error = "Error ".$this->db->lasterror();
     		dol_syslog(get_class($this)."::fetch_by_product ".$this->error, LOG_ERR);
     		return -1;
     	}
@@ -301,17 +301,17 @@ 
      *  @param  int		$notrigger	 0=launch triggers after, 1=disable triggers
      *  @return int     		   	 <0 if KO, >0 if OK
      */
-    function update($user=0, $notrigger=0)
+    function update($user = 0, $notrigger = 0)
     {
     	global $conf, $langs;
-		$error=0;
+		$error = 0;
 
 		// Clean parameters
 
-		if (isset($this->fk_product)) $this->fk_product=trim($this->fk_product);
-		if (isset($this->file_name)) $this->file_name=trim($this->file_name);
-		if (isset($this->fk_user_mod)) $this->fk_user_mod=trim($this->fk_user_mod);
-		if (isset($this->lang)) $this->lang=trim($this->lang);
+		if (isset($this->fk_product)) $this->fk_product = trim($this->fk_product);
+		if (isset($this->file_name)) $this->file_name = trim($this->file_name);
+		if (isset($this->fk_user_mod)) $this->fk_user_mod = trim($this->fk_user_mod);
+		if (isset($this->lang)) $this->lang = trim($this->lang);
 
 
 
@@ -322,25 +322,25 @@ 
         // Update request
         $sql = "UPDATE ".MAIN_DB_PREFIX."propal_merge_pdf_product SET";
 
-		$sql.= " fk_product=".(isset($this->fk_product)?$this->fk_product:"null").",";
-		$sql.= " file_name=".(isset($this->file_name)?"'".$this->db->escape($this->file_name)."'":"null").",";
+		$sql .= " fk_product=".(isset($this->fk_product) ? $this->fk_product : "null").",";
+		$sql .= " file_name=".(isset($this->file_name) ? "'".$this->db->escape($this->file_name)."'" : "null").",";
 		if ($conf->global->MAIN_MULTILANGS) {
-			$sql.= " lang=".(isset($this->lang)?"'".$this->db->escape($this->lang)."'":"null").",";
+			$sql .= " lang=".(isset($this->lang) ? "'".$this->db->escape($this->lang)."'" : "null").",";
 		}
-		$sql.= " fk_user_mod=".$user->id;
+		$sql .= " fk_user_mod=".$user->id;
 
 
-        $sql.= " WHERE rowid=".$this->id;
+        $sql .= " WHERE rowid=".$this->id;
 
 		$this->db->begin();
 
 		dol_syslog(get_class($this)."::".__METHOD__, 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 calls a trigger.
@@ -357,13 +357,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
 		{
@@ -380,16 +380,16 @@ 
      *  @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;
 
 		$this->db->begin();
 
-		if (! $error)
+		if (!$error)
 		{
-			if (! $notrigger)
+			if (!$notrigger)
 			{
 				// Uncomment this and change MYOBJECT to your own tag if you
 		        // want this action calls a trigger.
@@ -403,26 +403,26 @@ 
 			}
 		}
 
-		if (! $error)
+		if (!$error)
 		{
     		$sql = "DELETE FROM ".MAIN_DB_PREFIX."propal_merge_pdf_product";
-    		$sql.= " WHERE rowid=".$this->id;
+    		$sql .= " WHERE rowid=".$this->id;
 
     		dol_syslog(get_class($this)."::".__METHOD__, 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(); }
 		}
 
         // 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
 		{
@@ -440,16 +440,16 @@ 
 	 *  @param  int		$notrigger	 0=launch triggers after, 1=disable triggers
 	 *  @return	int					 <0 if KO, >0 if OK
 	 */
-	function delete_by_product($user, $product_id, $lang_id='',  $notrigger=0)
+	function delete_by_product($user, $product_id, $lang_id = '', $notrigger = 0)
 	{
 		global $conf, $langs;
-		$error=0;
+		$error = 0;
 
 		$this->db->begin();
 
-		if (! $error)
+		if (!$error)
 		{
-			if (! $notrigger)
+			if (!$notrigger)
 			{
 				// Uncomment this and change MYOBJECT to your own tag if you
 				// want this action calls a trigger.
@@ -463,30 +463,30 @@ 
 			}
 		}
 
-		if (! $error)
+		if (!$error)
 		{
 			$sql = "DELETE FROM ".MAIN_DB_PREFIX."propal_merge_pdf_product";
-			$sql.= " WHERE fk_product=".$product_id;
+			$sql .= " WHERE fk_product=".$product_id;
 
 			if ($conf->global->MAIN_MULTILANGS && !empty($lang_id)) {
-				$sql.= " AND lang='".$lang_id."'";
+				$sql .= " AND lang='".$lang_id."'";
 			}
 
 			dol_syslog(get_class($this)."::".__METHOD__, 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(); }
 		}
 
 		// 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
 		{
@@ -504,13 +504,13 @@ 
 	function delete_by_file($user)
 	{
 		global $conf, $langs;
-		$error=0;
+		$error = 0;
 
 		$this->db->begin();
 
-		if (! $error)
+		if (!$error)
 		{
-			if (! $notrigger)
+			if (!$notrigger)
 			{
 				// Uncomment this and change MYOBJECT to your own tag if you
 				// want this action calls a trigger.
@@ -524,26 +524,26 @@ 
 			}
 		}
 
-		if (! $error)
+		if (!$error)
 		{
 			$sql = "DELETE FROM ".MAIN_DB_PREFIX."propal_merge_pdf_product";
-			$sql.= " WHERE fk_product=".$this->fk_product." AND file_name='".$this->db->escape($this->file_name)."'";
+			$sql .= " WHERE fk_product=".$this->fk_product." AND file_name='".$this->db->escape($this->file_name)."'";
 
 			dol_syslog(get_class($this)."::".__METHOD__, 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(); }
 		}
 
 		// 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
 		{
@@ -562,40 +562,40 @@ 
 	 */
 	function createFromClone($fromid)
 	{
-		global $user,$langs;
+		global $user, $langs;
 
-		$error=0;
+		$error = 0;
 
-		$object=new Propalmergepdfproduct($this->db);
+		$object = new Propalmergepdfproduct($this->db);
 
 		$this->db->begin();
 
 		// Load source object
 		$object->fetch($fromid);
-		$object->id=0;
-		$object->statut=0;
+		$object->id = 0;
+		$object->statut = 0;
 
 		// Clear fields
 		// ...
 
 		// Create clone
-		$result=$object->create($user);
+		$result = $object->create($user);
 
 		// Other options
 		if ($result < 0)
 		{
-			$this->error=$object->error;
+			$this->error = $object->error;
 			$error++;
 		}
 
-		if (! $error)
+		if (!$error)
 		{
 
 
 		}
 
 		// End
-		if (! $error)
+		if (!$error)
 		{
 			$this->db->commit();
 			return $object->id;
@@ -616,15 +616,15 @@ 
 	 */
 	function initAsSpecimen()
 	{
-		$this->id=0;
+		$this->id = 0;
 
-		$this->fk_product='';
-		$this->file_name='';
-		$this->fk_user_author='';
-		$this->fk_user_mod='';
-		$this->datec='';
-		$this->tms='';
-		$this->import_key='';
+		$this->fk_product = '';
+		$this->file_name = '';
+		$this->fk_user_author = '';
+		$this->fk_user_mod = '';
+		$this->datec = '';
+		$this->tms = '';
+		$this->import_key = '';
 
 
 	}
@@ -643,8 +643,8 @@ 
 	var $lang;
 	var $fk_user_author;
 	var $fk_user_mod;
-	var $datec='';
-	var $tms='';
+	var $datec = '';
+	var $tms = '';
 	var $import_key;
 
 	function __construct() {

htdocs/product/dynamic_price/class/price_global_variable_updater.class.php

Doc Comments +3 added lines, -3 removed lines

@@ -168,7 +168,7 @@ 
     /**
      *  Update object into database
      *
-     *  @param	User	$user        User that modifies
+     *  @param	integer	$user        User that modifies
      *  @param  int		$notrigger	 0=launch triggers after, 1=disable triggers
      *  @return int     		   	 <0 if KO, >0 if OK
      */
@@ -539,7 +539,7 @@ 
      *  Update next_update into database
      *
      *  @param	string	$next_update Next update to write
-     *  @param	User	$user        User that modifies
+     *  @param	integer	$user        User that modifies
      *  @param  int		$notrigger	 0=launch triggers after, 1=disable triggers
      *  @return int     		   	 <0 if KO, >0 if OK
      */
@@ -583,7 +583,7 @@ 
      *  Update last_status into database
      *
      *  @param	string	$last_status Status to write
-     *  @param	User	$user        User that modifies
+     *  @param	integer	$user        User that modifies
      *  @param  int		$notrigger	 0=launch triggers after, 1=disable triggers
      *  @return int     		   	 <0 if KO, >0 if OK
      */

Indentation +587 added lines, -587 removed lines

@@ -29,591 +29,591 @@
  */
 class PriceGlobalVariableUpdater
 {
-    var $db;							//!< To store db handler
-    var $error;							//!< To return error code (or message)
-    var $errors=array();				//!< To return several error codes (or messages)
-    var $types=array(0, 1);				//!< Updater types
-    var $update_min = 5;				//!< Minimal update rate
-    var $id;
-    var $type;
-    var $description;
-    var $parameters;
-    var $fk_variable;
-    var $update_interval;				//!< Interval in mins
-    var $next_update;					//!< Next update timestamp
-    var $last_status;
-    public $table_element = "c_price_global_variable_updater";
-
-    /**
-     *  Constructor
-     *
-     *  @param	DoliDb		$db      Database handler
-     */
-    function __construct($db)
-    {
-        $this->db = $db;
-        return 1;
-    }
-
-
-    /**
-     *  Create object into database
-     *
-     *  @param	User	$user        User that creates
-     *  @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)
-    {
-        $error=0;
-
-        $this->checkParameters();
-
-        // Insert request
-        $sql = "INSERT INTO ".MAIN_DB_PREFIX.$this->table_element." (";
-        $sql.= "type, description, parameters, fk_variable, update_interval, next_update, last_status";
-        $sql.= ") VALUES (";
-        $sql.= " ".$this->type.",";
-        $sql.= " ".(isset($this->description)?"'".$this->db->escape($this->description)."'":"''").",";
-        $sql.= " ".(isset($this->parameters)?"'".$this->db->escape($this->parameters)."'":"''").",";
-        $sql.= " ".$this->fk_variable.",";
-        $sql.= " ".$this->update_interval.",";
-        $sql.= " ".$this->next_update.",";
-        $sql.= " ".(isset($this->last_status)?"'".$this->db->escape($this->last_status)."'":"''");
-        $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(); }
-
-        if (! $error)
-        {
-            $this->id = $this->db->last_insert_id(MAIN_DB_PREFIX.$this->table_element);
-
-            if (! $notrigger)
-            {
-                // Uncomment this and change MYOBJECT to your own tag if you
-                // want this action calls a trigger.
-
-                //// Call triggers
-                //$result=$this->call_trigger('MYOBJECT_CREATE',$user);
-                //if ($result < 0) { $error++; //Do also what you must do to rollback action if trigger fail}
-                //// End call triggers
-            }
-        }
-
-        // Commit or rollback
-        if ($error)
-        {
-            foreach($this->errors as $errmsg)
-            {
-                dol_syslog(__METHOD__." ".$errmsg, LOG_ERR);
-                $this->error.=($this->error?', '.$errmsg:$errmsg);
-            }
-            $this->db->rollback();
-            return -1*$error;
-        }
-        else
-        {
-            $this->db->commit();
-            return $this->id;
-        }
-    }
-
-
-    /**
-     *  Load object in memory from the database
-     *
-     *  @param		int		$id    	Id object
-     *  @return		int			    < 0 if KO, 0 if OK but not found, > 0 if OK
-     */
-    function fetch($id)
-    {
-        $sql = "SELECT type, description, parameters, fk_variable, update_interval, next_update, last_status";
-        $sql.= " FROM ".MAIN_DB_PREFIX.$this->table_element;
-        $sql.= " WHERE rowid = ".$id;
-
-        dol_syslog(get_class($this)."::fetch");
-        $resql=$this->db->query($sql);
-        if ($resql)
-        {
-            $obj = $this->db->fetch_object($resql);
-            if ($obj)
-            {
-                $this->id				= $id;
-                $this->type				= $obj->type;
-                $this->description		= $obj->description;
-                $this->parameters		= $obj->parameters;
-                $this->fk_variable		= $obj->fk_variable;
-                $this->update_interval	= $obj->update_interval;
-                $this->next_update		= $obj->next_update;
-                $this->last_status		= $obj->last_status;
-                $this->checkParameters();
-                return 1;
-            }
-            else
-            {
-                return 0;
-            }
-        }
-        else
-        {
-            $this->error="Error ".$this->db->lasterror();
-            return -1;
-        }
-    }
-
-    /**
-     *  Update object into database
-     *
-     *  @param	User	$user        User that modifies
-     *  @param  int		$notrigger	 0=launch triggers after, 1=disable triggers
-     *  @return int     		   	 <0 if KO, >0 if OK
-     */
-    function update($user=0, $notrigger=0)
-    {
-        $error=0;
-
-        $this->checkParameters();
-
-        // Update request
-        $sql = "UPDATE ".MAIN_DB_PREFIX.$this->table_element." SET";
-        $sql.= " type = ".$this->type.",";
-        $sql.= " description = ".(isset($this->description)?"'".$this->db->escape($this->description)."'":"''").",";
-        $sql.= " parameters = ".(isset($this->parameters)?"'".$this->db->escape($this->parameters)."'":"''").",";
-        $sql.= " fk_variable = ".$this->fk_variable.",";
-        $sql.= " update_interval = ".$this->update_interval.",";
-        $sql.= " next_update = ".$this->next_update.",";
-        $sql.= " last_status = ".(isset($this->last_status)?"'".$this->db->escape($this->last_status)."'":"''");
-        $sql.= " WHERE rowid = ".$this->id;
-
-        $this->db->begin();
-
-        dol_syslog(get_class($this)."::update");
-        $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 calls a trigger.
-
-                //// Call triggers
-                //$result=$this->call_trigger('MYOBJECT_MODIFY',$user);
-                //if ($result < 0) { $error++; //Do also what you must do to rollback action if trigger fail}
-                //// End call triggers
-             }
-        }
-
-        // Commit or rollback
-        if ($error)
-        {
-            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	int		$rowid		 Row id of global variable
-     *	@param  User	$user        User that deletes
-     *  @param  int		$notrigger	 0=launch triggers after, 1=disable triggers
-     *  @return	int					 <0 if KO, >0 if OK
-     */
-    function delete($rowid, $user, $notrigger=0)
-    {
-        $error=0;
-
-        $this->db->begin();
-
-        if (! $error)
-        {
-            if (! $notrigger)
-            {
-                // Uncomment this and change MYOBJECT to your own tag if you
-                // want this action calls a trigger.
-
-                //// Call triggers
-                //$result=$this->call_trigger('MYOBJECT_DELETE',$user);
-                //if ($result < 0) { $error++; //Do also what you must do to rollback action if trigger fail}
-                //// End call triggers
-            }
-        }
-
-        if (! $error)
-        {
-            $sql = "DELETE FROM ".MAIN_DB_PREFIX.$this->table_element;
-            $sql.= " WHERE rowid = ".$rowid;
-
-            dol_syslog(get_class($this)."::delete");
-            $resql = $this->db->query($sql);
-            if (! $resql) { $error++; $this->errors[]="Error ".$this->db->lasterror(); }
-        }
-
-        // 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;
-        }
-    }
-
-    /**
-     *	Initialise object with example values
-     *	Id must be 0 if object instance is a specimen
-     *
-     *	@return	void
-     */
-    function initAsSpecimen()
-    {
-        $this->id=0;
-        $this->type=0;
-        $this->description='';
-        $this->parameters='';
-        $this->fk_variable=0;
-        $this->update_interval=0;
-        $this->next_update=0;
-        $this->last_status='';
-    }
-
-    /**
-     *	Returns the last updated time in string html format, returns "never" if its less than 1
-     *
-     *	@return	string
-     */
-    function getLastUpdated()
-    {
-        global $langs;
-        $last = $this->next_update - ($this->update_interval * 60);
-        if ($last < 1) {
-            return $langs->trans("Never");
-        }
-        $status = empty($this->last_status) ? $langs->trans("CorrectlyUpdated") : $this->last_status;
-        return $status.'<br>'.dol_print_date($last, '%d/%m/%Y %H:%M:%S');
-    }
-
-    /**
-     *	Checks if all parameters are in order
-     *
-     *	@return	void
-     */
-    function checkParameters()
-    {
-        // Clean parameters
-        if (isset($this->description)) $this->description=trim($this->description);
-        if (isset($this->parameters)) $this->parameters=trim($this->parameters);
-        else $this->parameters="";
-        if (isset($this->last_status)) $this->last_status=trim($this->last_status);
-
-        // Check parameters
-        if (empty($this->type) || !is_numeric($this->type) || !in_array($this->type, $this->types)) $this->type=0;
-        if (empty($this->update_interval) || !is_numeric($this->update_interval) || $this->update_interval < 1) $this->update_interval=$this->update_min;
-        if (empty($this->next_update) || !is_numeric($this->next_update) || $this->next_update < 0) $this->next_update=0;
-    }
-
-    /**
-     *  List all price global variables
-     *
-     *  @return	array				Array of price global variable updaters
-     */
-    function listUpdaters()
-    {
-        $sql = "SELECT rowid, type, description, parameters, fk_variable, update_interval, next_update, last_status";
-        $sql.= " FROM ".MAIN_DB_PREFIX.$this->table_element;
-
-        dol_syslog(get_class($this)."::listUpdaters");
-        $resql=$this->db->query($sql);
-        if ($resql)
-        {
-            $retarray = array();
-
-            while ($record = $this->db->fetch_array($resql))
-            {
-                $updater_obj = new PriceGlobalVariableUpdater($this->db);
-                $updater_obj->id				= $record["rowid"];
-                $updater_obj->type				= $record["type"];
-                $updater_obj->description		= $record["description"];
-                $updater_obj->parameters		= $record["parameters"];
-                $updater_obj->fk_variable		= $record["fk_variable"];
-                $updater_obj->update_interval	= $record["update_interval"];
-                $updater_obj->next_update		= $record["next_update"];
-                $updater_obj->last_status		= $record["last_status"];
-                $updater_obj->checkParameters();
-                $retarray[]=$updater_obj;
-            }
-
-            $this->db->free($resql);
-            return $retarray;
-        }
-        else
-        {
-            $this->error=$this->db->error();
-            return -1;
-        }
-    }
-
-    /**
-     *  List all updaters which need to be processed
-     *
-     *  @return	array				Array of price global variable updaters
-     */
-    function listPendingUpdaters()
-    {
-        $sql = "SELECT rowid, type, description, parameters, fk_variable, update_interval, next_update, last_status";
-        $sql.= " FROM ".MAIN_DB_PREFIX.$this->table_element;
-        $sql.= " WHERE next_update < ".dol_now();
-
-        dol_syslog(get_class($this)."::processUpdaters");
-        $resql=$this->db->query($sql);
-        if ($resql)
-        {
-            $retarray = array();
-
-            while ($record = $this->db->fetch_array($resql))
-            {
-                $updater_obj = new PriceGlobalVariableUpdater($this->db);
-                $updater_obj->id				= $record["rowid"];
-                $updater_obj->type				= $record["type"];
-                $updater_obj->description		= $record["description"];
-                $updater_obj->parameters		= $record["parameters"];
-                $updater_obj->fk_variable		= $record["fk_variable"];
-                $updater_obj->update_interval	= $record["update_interval"];
-                $updater_obj->next_update		= $record["next_update"];
-                $updater_obj->last_status		= $record["last_status"];
-                $updater_obj->checkParameters();
-                $retarray[]=$updater_obj;
-            }
-
-            $this->db->free($resql);
-            return $retarray;
-        }
-        else
-        {
-            $this->error=$this->db->error();
-            return -1;
-        }
-    }
-
-    /**
-     *	Handles the processing of this updater
-     *
-     *  @return	int					 <0 if KO, 0 if OK but no global variable found, >0 if OK
-     */
-    function process()
-    {
-        global $langs, $user;
-        $langs->load("errors");
-
-        $this->error = null;
-        $this->checkParameters();
-
-        //Try to load the target global variable and abort if fails
-        if ($this->fk_variable < 1) {
-            $this->error = $langs->trans("ErrorGlobalVariableUpdater5");
-            return 0;
-        }
-        $price_globals = new PriceGlobalVariable($this->db);
-        $res = $price_globals->fetch($this->fk_variable);
-        if ($res < 1) {
-            $this->error = $langs->trans("ErrorGlobalVariableUpdater5");
-            return 0;
-        }
-
-        //Process depending of type
-        if ($this->type == 0 || $this->type == 1) {
-            //Get and check if required parameters are present
-            $parameters = json_decode($this->parameters, true);
-            if (!isset($parameters)) {
-                $this->error = $langs->trans("ErrorGlobalVariableUpdater1", $this->parameters);
-                return -1;
-            }
-            $url = $parameters['URL'];
-            if (!isset($url)) {
-                $this->error = $langs->trans("ErrorGlobalVariableUpdater2", 'URL');
-                return -1;
-            }
-            $value = $parameters['VALUE'];
-            if (!isset($value)) {
-                $this->error = $langs->trans("ErrorGlobalVariableUpdater2", 'VALUE');
-                return -1;
-            }
-            $result = "";
-            if ($this->type == 0) {
-                // Call JSON request
-                include_once DOL_DOCUMENT_ROOT.'/core/lib/geturl.lib.php';
-                $tmpresult=getURLContent($url);
-                $code=$tmpresult['http_code'];
-                $result=$tmpresult['content'];
-
-                if (!isset($result)) {
-                    $this->error = $langs->trans("ErrorGlobalVariableUpdater0", "empty response");
-                    return -1;
-                }
-                if ($code !== 200) {
-                    $this->error = $langs->trans("ErrorGlobalVariableUpdater0", $code.' '.$tmpresult['curl_error_msg']);
-                    return -1;
-                }
-
-                //Decode returned response
-                $result = json_decode($result, true);
-            } elseif ($this->type == 1) {
-                $ns = $parameters['NS'];
-                if (!isset($ns)) {
-                    $this->error = $langs->trans("ErrorGlobalVariableUpdater2", 'NS');
-                    return -1;
-                }
-                $method = $parameters['METHOD'];
-                if (!isset($method)) {
-                    $this->error = $langs->trans("ErrorGlobalVariableUpdater2", 'METHOD');
-                    return -1;
-                }
-                $data = $parameters['DATA'];
-                if (!isset($data)) {
-                    $this->error = $langs->trans("ErrorGlobalVariableUpdater2", 'DATA');
-                    return -1;
-                }
-
-                //SOAP client
-                require_once NUSOAP_PATH.'/nusoap.php';
-                $soap_client = new nusoap_client($url);
-                $soap_client->soap_defencoding='UTF-8';
-                $soap_client->decodeUTF8(false);
-                $result = $soap_client->call($method, $data, $ns,'');
-
-                //Check if result is a error
-                if ($result === false) {
-                    $this->error = $langs->trans("ErrorGlobalVariableUpdater4", $soap_client->error_str);
-                    return -1;
-                }
-            }
-
-            //Explode value and walk for each key in value array to get the relevant key
-            $value = explode(',', $value);
-            foreach ($value as $key) {
-                $result = $result[$key];
-            }
-            if (!isset($result)) {
-                $this->error = $langs->trans("ErrorGlobalVariableUpdater3");
-                return -1;
-            }
-
-            //Save data to global and update it
-            $price_globals->value = $result;
-            $price_globals->update($user);
-        }
-        return 1;
-    }
-
-    /**
-     *  Update next_update into database
-     *
-     *  @param	string	$next_update Next update to write
-     *  @param	User	$user        User that modifies
-     *  @param  int		$notrigger	 0=launch triggers after, 1=disable triggers
-     *  @return int     		   	 <0 if KO, >0 if OK
-     */
-    function update_next_update($next_update, $user=0, $notrigger=0)
-    {
-        $error=0;
-
-        $this->next_update = $next_update;
-        $this->checkParameters();
-
-        // Update request
-        $sql = "UPDATE ".MAIN_DB_PREFIX.$this->table_element." SET";
-        $sql.= " next_update = ".$this->next_update;
-        $sql.= " WHERE rowid = ".$this->id;
-
-        $this->db->begin();
-
-        dol_syslog(get_class($this)."::update_next_update");
-        $resql = $this->db->query($sql);
-        if (! $resql) { $error++; $this->errors[]="Error ".$this->db->lasterror(); }
-
-        // Commit or rollback
-        if ($error)
-        {
-            foreach($this->errors as $errmsg)
-            {
-                dol_syslog(get_class($this)."::update_next_update ".$errmsg, LOG_ERR);
-                $this->error.=($this->error?', '.$errmsg:$errmsg);
-            }
-            $this->db->rollback();
-            return -1*$error;
-        }
-        else
-        {
-            $this->db->commit();
-            return 1;
-        }
-    }
-
-    /**
-     *  Update last_status into database
-     *
-     *  @param	string	$last_status Status to write
-     *  @param	User	$user        User that modifies
-     *  @param  int		$notrigger	 0=launch triggers after, 1=disable triggers
-     *  @return int     		   	 <0 if KO, >0 if OK
-     */
-    function update_status($last_status, $user=0, $notrigger=0)
-    {
-        $error=0;
-
-        $this->last_status = $last_status;
-        $this->checkParameters();
-
-        // Update request
-        $sql = "UPDATE ".MAIN_DB_PREFIX.$this->table_element." SET";
-        $sql.= " last_status = ".(isset($this->last_status)?"'".$this->db->escape($this->last_status)."'":"''");
-        $sql.= " WHERE rowid = ".$this->id;
-
-        $this->db->begin();
-
-        dol_syslog(get_class($this)."::update_status");
-        $resql = $this->db->query($sql);
-        if (! $resql) { $error++; $this->errors[]="Error ".$this->db->lasterror(); }
-
-        // Commit or rollback
-        if ($error)
-        {
-            foreach($this->errors as $errmsg)
-            {
-                dol_syslog(get_class($this)."::update_status ".$errmsg, LOG_ERR);
-                $this->error.=($this->error?', '.$errmsg:$errmsg);
-            }
-            $this->db->rollback();
-            return -1*$error;
-        }
-        else
-        {
-            $this->db->commit();
-            return 1;
-        }
-    }
+	var $db;							//!< To store db handler
+	var $error;							//!< To return error code (or message)
+	var $errors=array();				//!< To return several error codes (or messages)
+	var $types=array(0, 1);				//!< Updater types
+	var $update_min = 5;				//!< Minimal update rate
+	var $id;
+	var $type;
+	var $description;
+	var $parameters;
+	var $fk_variable;
+	var $update_interval;				//!< Interval in mins
+	var $next_update;					//!< Next update timestamp
+	var $last_status;
+	public $table_element = "c_price_global_variable_updater";
+
+	/**
+	 *  Constructor
+	 *
+	 *  @param	DoliDb		$db      Database handler
+	 */
+	function __construct($db)
+	{
+		$this->db = $db;
+		return 1;
+	}
+
+
+	/**
+	 *  Create object into database
+	 *
+	 *  @param	User	$user        User that creates
+	 *  @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)
+	{
+		$error=0;
+
+		$this->checkParameters();
+
+		// Insert request
+		$sql = "INSERT INTO ".MAIN_DB_PREFIX.$this->table_element." (";
+		$sql.= "type, description, parameters, fk_variable, update_interval, next_update, last_status";
+		$sql.= ") VALUES (";
+		$sql.= " ".$this->type.",";
+		$sql.= " ".(isset($this->description)?"'".$this->db->escape($this->description)."'":"''").",";
+		$sql.= " ".(isset($this->parameters)?"'".$this->db->escape($this->parameters)."'":"''").",";
+		$sql.= " ".$this->fk_variable.",";
+		$sql.= " ".$this->update_interval.",";
+		$sql.= " ".$this->next_update.",";
+		$sql.= " ".(isset($this->last_status)?"'".$this->db->escape($this->last_status)."'":"''");
+		$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(); }
+
+		if (! $error)
+		{
+			$this->id = $this->db->last_insert_id(MAIN_DB_PREFIX.$this->table_element);
+
+			if (! $notrigger)
+			{
+				// Uncomment this and change MYOBJECT to your own tag if you
+				// want this action calls a trigger.
+
+				//// Call triggers
+				//$result=$this->call_trigger('MYOBJECT_CREATE',$user);
+				//if ($result < 0) { $error++; //Do also what you must do to rollback action if trigger fail}
+				//// End call triggers
+			}
+		}
+
+		// Commit or rollback
+		if ($error)
+		{
+			foreach($this->errors as $errmsg)
+			{
+				dol_syslog(__METHOD__." ".$errmsg, LOG_ERR);
+				$this->error.=($this->error?', '.$errmsg:$errmsg);
+			}
+			$this->db->rollback();
+			return -1*$error;
+		}
+		else
+		{
+			$this->db->commit();
+			return $this->id;
+		}
+	}
+
+
+	/**
+	 *  Load object in memory from the database
+	 *
+	 *  @param		int		$id    	Id object
+	 *  @return		int			    < 0 if KO, 0 if OK but not found, > 0 if OK
+	 */
+	function fetch($id)
+	{
+		$sql = "SELECT type, description, parameters, fk_variable, update_interval, next_update, last_status";
+		$sql.= " FROM ".MAIN_DB_PREFIX.$this->table_element;
+		$sql.= " WHERE rowid = ".$id;
+
+		dol_syslog(get_class($this)."::fetch");
+		$resql=$this->db->query($sql);
+		if ($resql)
+		{
+			$obj = $this->db->fetch_object($resql);
+			if ($obj)
+			{
+				$this->id				= $id;
+				$this->type				= $obj->type;
+				$this->description		= $obj->description;
+				$this->parameters		= $obj->parameters;
+				$this->fk_variable		= $obj->fk_variable;
+				$this->update_interval	= $obj->update_interval;
+				$this->next_update		= $obj->next_update;
+				$this->last_status		= $obj->last_status;
+				$this->checkParameters();
+				return 1;
+			}
+			else
+			{
+				return 0;
+			}
+		}
+		else
+		{
+			$this->error="Error ".$this->db->lasterror();
+			return -1;
+		}
+	}
+
+	/**
+	 *  Update object into database
+	 *
+	 *  @param	User	$user        User that modifies
+	 *  @param  int		$notrigger	 0=launch triggers after, 1=disable triggers
+	 *  @return int     		   	 <0 if KO, >0 if OK
+	 */
+	function update($user=0, $notrigger=0)
+	{
+		$error=0;
+
+		$this->checkParameters();
+
+		// Update request
+		$sql = "UPDATE ".MAIN_DB_PREFIX.$this->table_element." SET";
+		$sql.= " type = ".$this->type.",";
+		$sql.= " description = ".(isset($this->description)?"'".$this->db->escape($this->description)."'":"''").",";
+		$sql.= " parameters = ".(isset($this->parameters)?"'".$this->db->escape($this->parameters)."'":"''").",";
+		$sql.= " fk_variable = ".$this->fk_variable.",";
+		$sql.= " update_interval = ".$this->update_interval.",";
+		$sql.= " next_update = ".$this->next_update.",";
+		$sql.= " last_status = ".(isset($this->last_status)?"'".$this->db->escape($this->last_status)."'":"''");
+		$sql.= " WHERE rowid = ".$this->id;
+
+		$this->db->begin();
+
+		dol_syslog(get_class($this)."::update");
+		$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 calls a trigger.
+
+				//// Call triggers
+				//$result=$this->call_trigger('MYOBJECT_MODIFY',$user);
+				//if ($result < 0) { $error++; //Do also what you must do to rollback action if trigger fail}
+				//// End call triggers
+			 }
+		}
+
+		// Commit or rollback
+		if ($error)
+		{
+			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	int		$rowid		 Row id of global variable
+	 *	@param  User	$user        User that deletes
+	 *  @param  int		$notrigger	 0=launch triggers after, 1=disable triggers
+	 *  @return	int					 <0 if KO, >0 if OK
+	 */
+	function delete($rowid, $user, $notrigger=0)
+	{
+		$error=0;
+
+		$this->db->begin();
+
+		if (! $error)
+		{
+			if (! $notrigger)
+			{
+				// Uncomment this and change MYOBJECT to your own tag if you
+				// want this action calls a trigger.
+
+				//// Call triggers
+				//$result=$this->call_trigger('MYOBJECT_DELETE',$user);
+				//if ($result < 0) { $error++; //Do also what you must do to rollback action if trigger fail}
+				//// End call triggers
+			}
+		}
+
+		if (! $error)
+		{
+			$sql = "DELETE FROM ".MAIN_DB_PREFIX.$this->table_element;
+			$sql.= " WHERE rowid = ".$rowid;
+
+			dol_syslog(get_class($this)."::delete");
+			$resql = $this->db->query($sql);
+			if (! $resql) { $error++; $this->errors[]="Error ".$this->db->lasterror(); }
+		}
+
+		// 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;
+		}
+	}
+
+	/**
+	 *	Initialise object with example values
+	 *	Id must be 0 if object instance is a specimen
+	 *
+	 *	@return	void
+	 */
+	function initAsSpecimen()
+	{
+		$this->id=0;
+		$this->type=0;
+		$this->description='';
+		$this->parameters='';
+		$this->fk_variable=0;
+		$this->update_interval=0;
+		$this->next_update=0;
+		$this->last_status='';
+	}
+
+	/**
+	 *	Returns the last updated time in string html format, returns "never" if its less than 1
+	 *
+	 *	@return	string
+	 */
+	function getLastUpdated()
+	{
+		global $langs;
+		$last = $this->next_update - ($this->update_interval * 60);
+		if ($last < 1) {
+			return $langs->trans("Never");
+		}
+		$status = empty($this->last_status) ? $langs->trans("CorrectlyUpdated") : $this->last_status;
+		return $status.'<br>'.dol_print_date($last, '%d/%m/%Y %H:%M:%S');
+	}
+
+	/**
+	 *	Checks if all parameters are in order
+	 *
+	 *	@return	void
+	 */
+	function checkParameters()
+	{
+		// Clean parameters
+		if (isset($this->description)) $this->description=trim($this->description);
+		if (isset($this->parameters)) $this->parameters=trim($this->parameters);
+		else $this->parameters="";
+		if (isset($this->last_status)) $this->last_status=trim($this->last_status);
+
+		// Check parameters
+		if (empty($this->type) || !is_numeric($this->type) || !in_array($this->type, $this->types)) $this->type=0;
+		if (empty($this->update_interval) || !is_numeric($this->update_interval) || $this->update_interval < 1) $this->update_interval=$this->update_min;
+		if (empty($this->next_update) || !is_numeric($this->next_update) || $this->next_update < 0) $this->next_update=0;
+	}
+
+	/**
+	 *  List all price global variables
+	 *
+	 *  @return	array				Array of price global variable updaters
+	 */
+	function listUpdaters()
+	{
+		$sql = "SELECT rowid, type, description, parameters, fk_variable, update_interval, next_update, last_status";
+		$sql.= " FROM ".MAIN_DB_PREFIX.$this->table_element;
+
+		dol_syslog(get_class($this)."::listUpdaters");
+		$resql=$this->db->query($sql);
+		if ($resql)
+		{
+			$retarray = array();
+
+			while ($record = $this->db->fetch_array($resql))
+			{
+				$updater_obj = new PriceGlobalVariableUpdater($this->db);
+				$updater_obj->id				= $record["rowid"];
+				$updater_obj->type				= $record["type"];
+				$updater_obj->description		= $record["description"];
+				$updater_obj->parameters		= $record["parameters"];
+				$updater_obj->fk_variable		= $record["fk_variable"];
+				$updater_obj->update_interval	= $record["update_interval"];
+				$updater_obj->next_update		= $record["next_update"];
+				$updater_obj->last_status		= $record["last_status"];
+				$updater_obj->checkParameters();
+				$retarray[]=$updater_obj;
+			}
+
+			$this->db->free($resql);
+			return $retarray;
+		}
+		else
+		{
+			$this->error=$this->db->error();
+			return -1;
+		}
+	}
+
+	/**
+	 *  List all updaters which need to be processed
+	 *
+	 *  @return	array				Array of price global variable updaters
+	 */
+	function listPendingUpdaters()
+	{
+		$sql = "SELECT rowid, type, description, parameters, fk_variable, update_interval, next_update, last_status";
+		$sql.= " FROM ".MAIN_DB_PREFIX.$this->table_element;
+		$sql.= " WHERE next_update < ".dol_now();
+
+		dol_syslog(get_class($this)."::processUpdaters");
+		$resql=$this->db->query($sql);
+		if ($resql)
+		{
+			$retarray = array();
+
+			while ($record = $this->db->fetch_array($resql))
+			{
+				$updater_obj = new PriceGlobalVariableUpdater($this->db);
+				$updater_obj->id				= $record["rowid"];
+				$updater_obj->type				= $record["type"];
+				$updater_obj->description		= $record["description"];
+				$updater_obj->parameters		= $record["parameters"];
+				$updater_obj->fk_variable		= $record["fk_variable"];
+				$updater_obj->update_interval	= $record["update_interval"];
+				$updater_obj->next_update		= $record["next_update"];
+				$updater_obj->last_status		= $record["last_status"];
+				$updater_obj->checkParameters();
+				$retarray[]=$updater_obj;
+			}
+
+			$this->db->free($resql);
+			return $retarray;
+		}
+		else
+		{
+			$this->error=$this->db->error();
+			return -1;
+		}
+	}
+
+	/**
+	 *	Handles the processing of this updater
+	 *
+	 *  @return	int					 <0 if KO, 0 if OK but no global variable found, >0 if OK
+	 */
+	function process()
+	{
+		global $langs, $user;
+		$langs->load("errors");
+
+		$this->error = null;
+		$this->checkParameters();
+
+		//Try to load the target global variable and abort if fails
+		if ($this->fk_variable < 1) {
+			$this->error = $langs->trans("ErrorGlobalVariableUpdater5");
+			return 0;
+		}
+		$price_globals = new PriceGlobalVariable($this->db);
+		$res = $price_globals->fetch($this->fk_variable);
+		if ($res < 1) {
+			$this->error = $langs->trans("ErrorGlobalVariableUpdater5");
+			return 0;
+		}
+
+		//Process depending of type
+		if ($this->type == 0 || $this->type == 1) {
+			//Get and check if required parameters are present
+			$parameters = json_decode($this->parameters, true);
+			if (!isset($parameters)) {
+				$this->error = $langs->trans("ErrorGlobalVariableUpdater1", $this->parameters);
+				return -1;
+			}
+			$url = $parameters['URL'];
+			if (!isset($url)) {
+				$this->error = $langs->trans("ErrorGlobalVariableUpdater2", 'URL');
+				return -1;
+			}
+			$value = $parameters['VALUE'];
+			if (!isset($value)) {
+				$this->error = $langs->trans("ErrorGlobalVariableUpdater2", 'VALUE');
+				return -1;
+			}
+			$result = "";
+			if ($this->type == 0) {
+				// Call JSON request
+				include_once DOL_DOCUMENT_ROOT.'/core/lib/geturl.lib.php';
+				$tmpresult=getURLContent($url);
+				$code=$tmpresult['http_code'];
+				$result=$tmpresult['content'];
+
+				if (!isset($result)) {
+					$this->error = $langs->trans("ErrorGlobalVariableUpdater0", "empty response");
+					return -1;
+				}
+				if ($code !== 200) {
+					$this->error = $langs->trans("ErrorGlobalVariableUpdater0", $code.' '.$tmpresult['curl_error_msg']);
+					return -1;
+				}
+
+				//Decode returned response
+				$result = json_decode($result, true);
+			} elseif ($this->type == 1) {
+				$ns = $parameters['NS'];
+				if (!isset($ns)) {
+					$this->error = $langs->trans("ErrorGlobalVariableUpdater2", 'NS');
+					return -1;
+				}
+				$method = $parameters['METHOD'];
+				if (!isset($method)) {
+					$this->error = $langs->trans("ErrorGlobalVariableUpdater2", 'METHOD');
+					return -1;
+				}
+				$data = $parameters['DATA'];
+				if (!isset($data)) {
+					$this->error = $langs->trans("ErrorGlobalVariableUpdater2", 'DATA');
+					return -1;
+				}
+
+				//SOAP client
+				require_once NUSOAP_PATH.'/nusoap.php';
+				$soap_client = new nusoap_client($url);
+				$soap_client->soap_defencoding='UTF-8';
+				$soap_client->decodeUTF8(false);
+				$result = $soap_client->call($method, $data, $ns,'');
+
+				//Check if result is a error
+				if ($result === false) {
+					$this->error = $langs->trans("ErrorGlobalVariableUpdater4", $soap_client->error_str);
+					return -1;
+				}
+			}
+
+			//Explode value and walk for each key in value array to get the relevant key
+			$value = explode(',', $value);
+			foreach ($value as $key) {
+				$result = $result[$key];
+			}
+			if (!isset($result)) {
+				$this->error = $langs->trans("ErrorGlobalVariableUpdater3");
+				return -1;
+			}
+
+			//Save data to global and update it
+			$price_globals->value = $result;
+			$price_globals->update($user);
+		}
+		return 1;
+	}
+
+	/**
+	 *  Update next_update into database
+	 *
+	 *  @param	string	$next_update Next update to write
+	 *  @param	User	$user        User that modifies
+	 *  @param  int		$notrigger	 0=launch triggers after, 1=disable triggers
+	 *  @return int     		   	 <0 if KO, >0 if OK
+	 */
+	function update_next_update($next_update, $user=0, $notrigger=0)
+	{
+		$error=0;
+
+		$this->next_update = $next_update;
+		$this->checkParameters();
+
+		// Update request
+		$sql = "UPDATE ".MAIN_DB_PREFIX.$this->table_element." SET";
+		$sql.= " next_update = ".$this->next_update;
+		$sql.= " WHERE rowid = ".$this->id;
+
+		$this->db->begin();
+
+		dol_syslog(get_class($this)."::update_next_update");
+		$resql = $this->db->query($sql);
+		if (! $resql) { $error++; $this->errors[]="Error ".$this->db->lasterror(); }
+
+		// Commit or rollback
+		if ($error)
+		{
+			foreach($this->errors as $errmsg)
+			{
+				dol_syslog(get_class($this)."::update_next_update ".$errmsg, LOG_ERR);
+				$this->error.=($this->error?', '.$errmsg:$errmsg);
+			}
+			$this->db->rollback();
+			return -1*$error;
+		}
+		else
+		{
+			$this->db->commit();
+			return 1;
+		}
+	}
+
+	/**
+	 *  Update last_status into database
+	 *
+	 *  @param	string	$last_status Status to write
+	 *  @param	User	$user        User that modifies
+	 *  @param  int		$notrigger	 0=launch triggers after, 1=disable triggers
+	 *  @return int     		   	 <0 if KO, >0 if OK
+	 */
+	function update_status($last_status, $user=0, $notrigger=0)
+	{
+		$error=0;
+
+		$this->last_status = $last_status;
+		$this->checkParameters();
+
+		// Update request
+		$sql = "UPDATE ".MAIN_DB_PREFIX.$this->table_element." SET";
+		$sql.= " last_status = ".(isset($this->last_status)?"'".$this->db->escape($this->last_status)."'":"''");
+		$sql.= " WHERE rowid = ".$this->id;
+
+		$this->db->begin();
+
+		dol_syslog(get_class($this)."::update_status");
+		$resql = $this->db->query($sql);
+		if (! $resql) { $error++; $this->errors[]="Error ".$this->db->lasterror(); }
+
+		// Commit or rollback
+		if ($error)
+		{
+			foreach($this->errors as $errmsg)
+			{
+				dol_syslog(get_class($this)."::update_status ".$errmsg, LOG_ERR);
+				$this->error.=($this->error?', '.$errmsg:$errmsg);
+			}
+			$this->db->rollback();
+			return -1*$error;
+		}
+		else
+		{
+			$this->db->commit();
+			return 1;
+		}
+	}
 }

Spacing +113 added lines, -113 removed lines

@@ -29,18 +29,18 @@ 
  */
 class PriceGlobalVariableUpdater
 {
-    var $db;							//!< To store db handler
-    var $error;							//!< To return error code (or message)
-    var $errors=array();				//!< To return several error codes (or messages)
-    var $types=array(0, 1);				//!< Updater types
-    var $update_min = 5;				//!< Minimal update rate
+    var $db; //!< To store db handler
+    var $error; //!< To return error code (or message)
+    var $errors = array(); //!< To return several error codes (or messages)
+    var $types = array(0, 1); //!< Updater types
+    var $update_min = 5; //!< Minimal update rate
     var $id;
     var $type;
     var $description;
     var $parameters;
     var $fk_variable;
-    var $update_interval;				//!< Interval in mins
-    var $next_update;					//!< Next update timestamp
+    var $update_interval; //!< Interval in mins
+    var $next_update; //!< Next update timestamp
     var $last_status;
     public $table_element = "c_price_global_variable_updater";
 
@@ -63,36 +63,36 @@ 
      *  @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)
     {
-        $error=0;
+        $error = 0;
 
         $this->checkParameters();
 
         // Insert request
         $sql = "INSERT INTO ".MAIN_DB_PREFIX.$this->table_element." (";
-        $sql.= "type, description, parameters, fk_variable, update_interval, next_update, last_status";
-        $sql.= ") VALUES (";
-        $sql.= " ".$this->type.",";
-        $sql.= " ".(isset($this->description)?"'".$this->db->escape($this->description)."'":"''").",";
-        $sql.= " ".(isset($this->parameters)?"'".$this->db->escape($this->parameters)."'":"''").",";
-        $sql.= " ".$this->fk_variable.",";
-        $sql.= " ".$this->update_interval.",";
-        $sql.= " ".$this->next_update.",";
-        $sql.= " ".(isset($this->last_status)?"'".$this->db->escape($this->last_status)."'":"''");
-        $sql.= ")";
+        $sql .= "type, description, parameters, fk_variable, update_interval, next_update, last_status";
+        $sql .= ") VALUES (";
+        $sql .= " ".$this->type.",";
+        $sql .= " ".(isset($this->description) ? "'".$this->db->escape($this->description)."'" : "''").",";
+        $sql .= " ".(isset($this->parameters) ? "'".$this->db->escape($this->parameters)."'" : "''").",";
+        $sql .= " ".$this->fk_variable.",";
+        $sql .= " ".$this->update_interval.",";
+        $sql .= " ".$this->next_update.",";
+        $sql .= " ".(isset($this->last_status) ? "'".$this->db->escape($this->last_status)."'" : "''");
+        $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.$this->table_element);
 
-            if (! $notrigger)
+            if (!$notrigger)
             {
                 // Uncomment this and change MYOBJECT to your own tag if you
                 // want this action calls a trigger.
@@ -107,13 +107,13 @@ 
         // Commit or rollback
         if ($error)
         {
-            foreach($this->errors as $errmsg)
+            foreach ($this->errors as $errmsg)
             {
                 dol_syslog(__METHOD__." ".$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
         {
@@ -132,22 +132,22 @@ 
     function fetch($id)
     {
         $sql = "SELECT type, description, parameters, fk_variable, update_interval, next_update, last_status";
-        $sql.= " FROM ".MAIN_DB_PREFIX.$this->table_element;
-        $sql.= " WHERE rowid = ".$id;
+        $sql .= " FROM ".MAIN_DB_PREFIX.$this->table_element;
+        $sql .= " WHERE rowid = ".$id;
 
         dol_syslog(get_class($this)."::fetch");
-        $resql=$this->db->query($sql);
+        $resql = $this->db->query($sql);
         if ($resql)
         {
             $obj = $this->db->fetch_object($resql);
             if ($obj)
             {
-                $this->id				= $id;
-                $this->type				= $obj->type;
+                $this->id = $id;
+                $this->type = $obj->type;
                 $this->description		= $obj->description;
-                $this->parameters		= $obj->parameters;
+                $this->parameters = $obj->parameters;
                 $this->fk_variable		= $obj->fk_variable;
-                $this->update_interval	= $obj->update_interval;
+                $this->update_interval = $obj->update_interval;
                 $this->next_update		= $obj->next_update;
                 $this->last_status		= $obj->last_status;
                 $this->checkParameters();
@@ -160,7 +160,7 @@ 
         }
         else
         {
-            $this->error="Error ".$this->db->lasterror();
+            $this->error = "Error ".$this->db->lasterror();
             return -1;
         }
     }
@@ -172,32 +172,32 @@ 
      *  @param  int		$notrigger	 0=launch triggers after, 1=disable triggers
      *  @return int     		   	 <0 if KO, >0 if OK
      */
-    function update($user=0, $notrigger=0)
+    function update($user = 0, $notrigger = 0)
     {
-        $error=0;
+        $error = 0;
 
         $this->checkParameters();
 
         // Update request
         $sql = "UPDATE ".MAIN_DB_PREFIX.$this->table_element." SET";
-        $sql.= " type = ".$this->type.",";
-        $sql.= " description = ".(isset($this->description)?"'".$this->db->escape($this->description)."'":"''").",";
-        $sql.= " parameters = ".(isset($this->parameters)?"'".$this->db->escape($this->parameters)."'":"''").",";
-        $sql.= " fk_variable = ".$this->fk_variable.",";
-        $sql.= " update_interval = ".$this->update_interval.",";
-        $sql.= " next_update = ".$this->next_update.",";
-        $sql.= " last_status = ".(isset($this->last_status)?"'".$this->db->escape($this->last_status)."'":"''");
-        $sql.= " WHERE rowid = ".$this->id;
+        $sql .= " type = ".$this->type.",";
+        $sql .= " description = ".(isset($this->description) ? "'".$this->db->escape($this->description)."'" : "''").",";
+        $sql .= " parameters = ".(isset($this->parameters) ? "'".$this->db->escape($this->parameters)."'" : "''").",";
+        $sql .= " fk_variable = ".$this->fk_variable.",";
+        $sql .= " update_interval = ".$this->update_interval.",";
+        $sql .= " next_update = ".$this->next_update.",";
+        $sql .= " last_status = ".(isset($this->last_status) ? "'".$this->db->escape($this->last_status)."'" : "''");
+        $sql .= " WHERE rowid = ".$this->id;
 
         $this->db->begin();
 
         dol_syslog(get_class($this)."::update");
         $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 calls a trigger.
@@ -212,13 +212,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
         {
@@ -235,15 +235,15 @@ 
      *  @param  int		$notrigger	 0=launch triggers after, 1=disable triggers
      *  @return	int					 <0 if KO, >0 if OK
      */
-    function delete($rowid, $user, $notrigger=0)
+    function delete($rowid, $user, $notrigger = 0)
     {
-        $error=0;
+        $error = 0;
 
         $this->db->begin();
 
-        if (! $error)
+        if (!$error)
         {
-            if (! $notrigger)
+            if (!$notrigger)
             {
                 // Uncomment this and change MYOBJECT to your own tag if you
                 // want this action calls a trigger.
@@ -255,26 +255,26 @@ 
             }
         }
 
-        if (! $error)
+        if (!$error)
         {
             $sql = "DELETE FROM ".MAIN_DB_PREFIX.$this->table_element;
-            $sql.= " WHERE rowid = ".$rowid;
+            $sql .= " WHERE rowid = ".$rowid;
 
             dol_syslog(get_class($this)."::delete");
             $resql = $this->db->query($sql);
-            if (! $resql) { $error++; $this->errors[]="Error ".$this->db->lasterror(); }
+            if (!$resql) { $error++; $this->errors[] = "Error ".$this->db->lasterror(); }
         }
 
         // 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
         {
@@ -291,14 +291,14 @@ 
      */
     function initAsSpecimen()
     {
-        $this->id=0;
-        $this->type=0;
-        $this->description='';
-        $this->parameters='';
-        $this->fk_variable=0;
-        $this->update_interval=0;
-        $this->next_update=0;
-        $this->last_status='';
+        $this->id = 0;
+        $this->type = 0;
+        $this->description = '';
+        $this->parameters = '';
+        $this->fk_variable = 0;
+        $this->update_interval = 0;
+        $this->next_update = 0;
+        $this->last_status = '';
     }
 
     /**
@@ -325,15 +325,15 @@ 
     function checkParameters()
     {
         // Clean parameters
-        if (isset($this->description)) $this->description=trim($this->description);
-        if (isset($this->parameters)) $this->parameters=trim($this->parameters);
-        else $this->parameters="";
-        if (isset($this->last_status)) $this->last_status=trim($this->last_status);
+        if (isset($this->description)) $this->description = trim($this->description);
+        if (isset($this->parameters)) $this->parameters = trim($this->parameters);
+        else $this->parameters = "";
+        if (isset($this->last_status)) $this->last_status = trim($this->last_status);
 
         // Check parameters
-        if (empty($this->type) || !is_numeric($this->type) || !in_array($this->type, $this->types)) $this->type=0;
-        if (empty($this->update_interval) || !is_numeric($this->update_interval) || $this->update_interval < 1) $this->update_interval=$this->update_min;
-        if (empty($this->next_update) || !is_numeric($this->next_update) || $this->next_update < 0) $this->next_update=0;
+        if (empty($this->type) || !is_numeric($this->type) || !in_array($this->type, $this->types)) $this->type = 0;
+        if (empty($this->update_interval) || !is_numeric($this->update_interval) || $this->update_interval < 1) $this->update_interval = $this->update_min;
+        if (empty($this->next_update) || !is_numeric($this->next_update) || $this->next_update < 0) $this->next_update = 0;
     }
 
     /**
@@ -344,10 +344,10 @@ 
     function listUpdaters()
     {
         $sql = "SELECT rowid, type, description, parameters, fk_variable, update_interval, next_update, last_status";
-        $sql.= " FROM ".MAIN_DB_PREFIX.$this->table_element;
+        $sql .= " FROM ".MAIN_DB_PREFIX.$this->table_element;
 
         dol_syslog(get_class($this)."::listUpdaters");
-        $resql=$this->db->query($sql);
+        $resql = $this->db->query($sql);
         if ($resql)
         {
             $retarray = array();
@@ -355,16 +355,16 @@ 
             while ($record = $this->db->fetch_array($resql))
             {
                 $updater_obj = new PriceGlobalVariableUpdater($this->db);
-                $updater_obj->id				= $record["rowid"];
-                $updater_obj->type				= $record["type"];
+                $updater_obj->id = $record["rowid"];
+                $updater_obj->type = $record["type"];
                 $updater_obj->description		= $record["description"];
-                $updater_obj->parameters		= $record["parameters"];
+                $updater_obj->parameters = $record["parameters"];
                 $updater_obj->fk_variable		= $record["fk_variable"];
-                $updater_obj->update_interval	= $record["update_interval"];
+                $updater_obj->update_interval = $record["update_interval"];
                 $updater_obj->next_update		= $record["next_update"];
                 $updater_obj->last_status		= $record["last_status"];
                 $updater_obj->checkParameters();
-                $retarray[]=$updater_obj;
+                $retarray[] = $updater_obj;
             }
 
             $this->db->free($resql);
@@ -372,7 +372,7 @@ 
         }
         else
         {
-            $this->error=$this->db->error();
+            $this->error = $this->db->error();
             return -1;
         }
     }
@@ -385,11 +385,11 @@ 
     function listPendingUpdaters()
     {
         $sql = "SELECT rowid, type, description, parameters, fk_variable, update_interval, next_update, last_status";
-        $sql.= " FROM ".MAIN_DB_PREFIX.$this->table_element;
-        $sql.= " WHERE next_update < ".dol_now();
+        $sql .= " FROM ".MAIN_DB_PREFIX.$this->table_element;
+        $sql .= " WHERE next_update < ".dol_now();
 
         dol_syslog(get_class($this)."::processUpdaters");
-        $resql=$this->db->query($sql);
+        $resql = $this->db->query($sql);
         if ($resql)
         {
             $retarray = array();
@@ -397,16 +397,16 @@ 
             while ($record = $this->db->fetch_array($resql))
             {
                 $updater_obj = new PriceGlobalVariableUpdater($this->db);
-                $updater_obj->id				= $record["rowid"];
-                $updater_obj->type				= $record["type"];
+                $updater_obj->id = $record["rowid"];
+                $updater_obj->type = $record["type"];
                 $updater_obj->description		= $record["description"];
-                $updater_obj->parameters		= $record["parameters"];
+                $updater_obj->parameters = $record["parameters"];
                 $updater_obj->fk_variable		= $record["fk_variable"];
-                $updater_obj->update_interval	= $record["update_interval"];
+                $updater_obj->update_interval = $record["update_interval"];
                 $updater_obj->next_update		= $record["next_update"];
                 $updater_obj->last_status		= $record["last_status"];
                 $updater_obj->checkParameters();
-                $retarray[]=$updater_obj;
+                $retarray[] = $updater_obj;
             }
 
             $this->db->free($resql);
@@ -414,7 +414,7 @@ 
         }
         else
         {
-            $this->error=$this->db->error();
+            $this->error = $this->db->error();
             return -1;
         }
     }
@@ -466,9 +466,9 @@ 
             if ($this->type == 0) {
                 // Call JSON request
                 include_once DOL_DOCUMENT_ROOT.'/core/lib/geturl.lib.php';
-                $tmpresult=getURLContent($url);
-                $code=$tmpresult['http_code'];
-                $result=$tmpresult['content'];
+                $tmpresult = getURLContent($url);
+                $code = $tmpresult['http_code'];
+                $result = $tmpresult['content'];
 
                 if (!isset($result)) {
                     $this->error = $langs->trans("ErrorGlobalVariableUpdater0", "empty response");
@@ -501,9 +501,9 @@ 
                 //SOAP client
                 require_once NUSOAP_PATH.'/nusoap.php';
                 $soap_client = new nusoap_client($url);
-                $soap_client->soap_defencoding='UTF-8';
+                $soap_client->soap_defencoding = 'UTF-8';
                 $soap_client->decodeUTF8(false);
-                $result = $soap_client->call($method, $data, $ns,'');
+                $result = $soap_client->call($method, $data, $ns, '');
 
                 //Check if result is a error
                 if ($result === false) {
@@ -537,34 +537,34 @@ 
      *  @param  int		$notrigger	 0=launch triggers after, 1=disable triggers
      *  @return int     		   	 <0 if KO, >0 if OK
      */
-    function update_next_update($next_update, $user=0, $notrigger=0)
+    function update_next_update($next_update, $user = 0, $notrigger = 0)
     {
-        $error=0;
+        $error = 0;
 
         $this->next_update = $next_update;
         $this->checkParameters();
 
         // Update request
         $sql = "UPDATE ".MAIN_DB_PREFIX.$this->table_element." SET";
-        $sql.= " next_update = ".$this->next_update;
-        $sql.= " WHERE rowid = ".$this->id;
+        $sql .= " next_update = ".$this->next_update;
+        $sql .= " WHERE rowid = ".$this->id;
 
         $this->db->begin();
 
         dol_syslog(get_class($this)."::update_next_update");
         $resql = $this->db->query($sql);
-        if (! $resql) { $error++; $this->errors[]="Error ".$this->db->lasterror(); }
+        if (!$resql) { $error++; $this->errors[] = "Error ".$this->db->lasterror(); }
 
         // Commit or rollback
         if ($error)
         {
-            foreach($this->errors as $errmsg)
+            foreach ($this->errors as $errmsg)
             {
                 dol_syslog(get_class($this)."::update_next_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
         {
@@ -581,34 +581,34 @@ 
      *  @param  int		$notrigger	 0=launch triggers after, 1=disable triggers
      *  @return int     		   	 <0 if KO, >0 if OK
      */
-    function update_status($last_status, $user=0, $notrigger=0)
+    function update_status($last_status, $user = 0, $notrigger = 0)
     {
-        $error=0;
+        $error = 0;
 
         $this->last_status = $last_status;
         $this->checkParameters();
 
         // Update request
         $sql = "UPDATE ".MAIN_DB_PREFIX.$this->table_element." SET";
-        $sql.= " last_status = ".(isset($this->last_status)?"'".$this->db->escape($this->last_status)."'":"''");
-        $sql.= " WHERE rowid = ".$this->id;
+        $sql .= " last_status = ".(isset($this->last_status) ? "'".$this->db->escape($this->last_status)."'" : "''");
+        $sql .= " WHERE rowid = ".$this->id;
 
         $this->db->begin();
 
         dol_syslog(get_class($this)."::update_status");
         $resql = $this->db->query($sql);
-        if (! $resql) { $error++; $this->errors[]="Error ".$this->db->lasterror(); }
+        if (!$resql) { $error++; $this->errors[] = "Error ".$this->db->lasterror(); }
 
         // Commit or rollback
         if ($error)
         {
-            foreach($this->errors as $errmsg)
+            foreach ($this->errors as $errmsg)
             {
                 dol_syslog(get_class($this)."::update_status ".$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 +29 added lines, -25 removed lines

@@ -114,8 +114,7 @@ 
             }
             $this->db->rollback();
             return -1*$error;
-        }
-        else
+        } else
         {
             $this->db->commit();
             return $this->id;
@@ -152,13 +151,11 @@ 
                 $this->last_status		= $obj->last_status;
                 $this->checkParameters();
                 return 1;
-            }
-            else
+            } else
             {
                 return 0;
             }
-        }
-        else
+        } else
         {
             $this->error="Error ".$this->db->lasterror();
             return -1;
@@ -219,8 +216,7 @@ 
             }
             $this->db->rollback();
             return -1*$error;
-        }
-        else
+        } else
         {
             $this->db->commit();
             return 1;
@@ -275,8 +271,7 @@ 
             }
             $this->db->rollback();
             return -1*$error;
-        }
-        else
+        } else
         {
             $this->db->commit();
             return 1;
@@ -325,15 +320,28 @@ 
     function checkParameters()
     {
         // Clean parameters
-        if (isset($this->description)) $this->description=trim($this->description);
-        if (isset($this->parameters)) $this->parameters=trim($this->parameters);
-        else $this->parameters="";
-        if (isset($this->last_status)) $this->last_status=trim($this->last_status);
+        if (isset($this->description)) {
+        	$this->description=trim($this->description);
+        }
+        if (isset($this->parameters)) {
+        	$this->parameters=trim($this->parameters);
+        } else {
+        	$this->parameters="";
+        }
+        if (isset($this->last_status)) {
+        	$this->last_status=trim($this->last_status);
+        }
 
         // Check parameters
-        if (empty($this->type) || !is_numeric($this->type) || !in_array($this->type, $this->types)) $this->type=0;
-        if (empty($this->update_interval) || !is_numeric($this->update_interval) || $this->update_interval < 1) $this->update_interval=$this->update_min;
-        if (empty($this->next_update) || !is_numeric($this->next_update) || $this->next_update < 0) $this->next_update=0;
+        if (empty($this->type) || !is_numeric($this->type) || !in_array($this->type, $this->types)) {
+        	$this->type=0;
+        }
+        if (empty($this->update_interval) || !is_numeric($this->update_interval) || $this->update_interval < 1) {
+        	$this->update_interval=$this->update_min;
+        }
+        if (empty($this->next_update) || !is_numeric($this->next_update) || $this->next_update < 0) {
+        	$this->next_update=0;
+        }
     }
 
     /**
@@ -369,8 +377,7 @@ 
 
             $this->db->free($resql);
             return $retarray;
-        }
-        else
+        } else
         {
             $this->error=$this->db->error();
             return -1;
@@ -411,8 +418,7 @@ 
 
             $this->db->free($resql);
             return $retarray;
-        }
-        else
+        } else
         {
             $this->error=$this->db->error();
             return -1;
@@ -565,8 +571,7 @@ 
             }
             $this->db->rollback();
             return -1*$error;
-        }
-        else
+        } else
         {
             $this->db->commit();
             return 1;
@@ -609,8 +614,7 @@ 
             }
             $this->db->rollback();
             return -1*$error;
-        }
-        else
+        } else
         {
             $this->db->commit();
             return 1;

htdocs/core/class/smtps.class.php

Doc Comments +1 added lines, -1 removed lines

@@ -876,7 +876,7 @@
 	 * addresses and to sort them by Domain.
 	 *
 	 * @param 	string 	$_type 			TO, CC, or BCC lists to add addrresses into
-	 * @param 	mixed 	$_addrList 		Array or COMMA delimited string of addresses
+	 * @param 	string 	$_addrList 		Array or COMMA delimited string of addresses
 	 * @return void
 	 *
 	 */

Indentation +86 added lines, -86 removed lines

@@ -118,9 +118,9 @@ 
 	 * Message Sensitivity
 	 */
 	var $_arySensitivity = array ( false,
-                                  'Personal',
-                                  'Private',
-                                  'Company Confidential' );
+								  'Personal',
+								  'Private',
+								  'Company Confidential' );
 
 	/**
 	 * Message Sensitivity
@@ -132,11 +132,11 @@ 
 	 * Message Priority
 	 */
 	var $_aryPriority = array ( 'Bulk',
-                                'Highest',
-                                'High',
-                                'Normal',
-                                'Low',
-                                'Lowest' );
+								'Highest',
+								'High',
+								'Normal',
+								'Low',
+								'Lowest' );
 
 	/**
 	 * Content-Transfer-Encoding
@@ -148,12 +148,12 @@ 
 	 * Content-Transfer-Encoding
 	 */
 	var $_smtpsTransEncodeTypes = array( '7bit',               // Simple 7-bit ASCII
-                                         '8bit',               // 8-bit coding with line termination characters
-                                         'base64',             // 3 octets encoded into 4 sextets with offset
-                                         'binary',             // Arbitrary binary stream
-                                         'mac-binhex40',       // Macintosh binary to hex encoding
-                                         'quoted-printable',   // Mostly 7-bit, with 8-bit characters encoded as "=HH"
-                                         'uuencode' );         // UUENCODE encoding
+										 '8bit',               // 8-bit coding with line termination characters
+										 'base64',             // 3 octets encoded into 4 sextets with offset
+										 'binary',             // Arbitrary binary stream
+										 'mac-binhex40',       // Macintosh binary to hex encoding
+										 'quoted-printable',   // Mostly 7-bit, with 8-bit characters encoded as "=HH"
+										 'uuencode' );         // UUENCODE encoding
 
 	/**
 	 * Content-Transfer-Encoding
@@ -229,54 +229,54 @@ 
 	var $_moreInHeader = '';
 
 
-    /**
-     * Set delivery receipt
-     *
-     * @param	int		$_val		Value
-     * @return	void
-     */
+	/**
+	 * Set delivery receipt
+	 *
+	 * @param	int		$_val		Value
+	 * @return	void
+	 */
 	function setDeliveryReceipt($_val = 0)
 	{
 		$this->_deliveryReceipt = $_val;
 	}
 
-    /**
-     * get delivery receipt
-     *
-     * @return	int		Delivery receipt
-     */
+	/**
+	 * get delivery receipt
+	 *
+	 * @return	int		Delivery receipt
+	 */
 	function getDeliveryReceipt()
 	{
 		return $this->_deliveryReceipt;
 	}
 
-    /**
-     * Set trackid
-     *
-     * @param	string		$_val		Value
-     * @return	void
-     */
+	/**
+	 * Set trackid
+	 *
+	 * @param	string		$_val		Value
+	 * @return	void
+	 */
 	function setTrackId($_val = '')
 	{
 		$this->_trackId = $_val;
 	}
 
-    /**
-     * Set moreInHeader
-     *
-     * @param	string		$_val		Value
-     * @return	void
-     */
+	/**
+	 * Set moreInHeader
+	 *
+	 * @param	string		$_val		Value
+	 * @return	void
+	 */
 	function setMoreInHeader($_val = '')
 	{
 		$this->_moreinheader = $_val;
 	}
 
 	/**
-     * get trackid
-     *
-     * @return	string		Track id
-     */
+	 * get trackid
+	 *
+	 * @return	string		Track id
+	 */
 	function getTrackId()
 	{
 		return $this->_trackId;
@@ -289,27 +289,27 @@ 
 	 */
 	function getMoreInHeader()
 	{
-	    return $this->_moreinheader;
+		return $this->_moreinheader;
 	}
 
-    /**
-     * Set errors to
-     *
-     * @param	string		$_strErrorsTo		Errors to
-     * @return	void
-     */
+	/**
+	 * Set errors to
+	 *
+	 * @param	string		$_strErrorsTo		Errors to
+	 * @return	void
+	 */
 	function setErrorsTo($_strErrorsTo)
 	{
 		if ( $_strErrorsTo )
 		$this->_errorsTo = $this->_strip_email($_strErrorsTo);
 	}
 
-    /**
-     * Get errors to
-     *
-     * @param	boolean		$_part		Variant
-     * @return	string					Errors to
-     */
+	/**
+	 * Get errors to
+	 *
+	 * @param	boolean		$_part		Variant
+	 * @return	string					Errors to
+	 */
 	function getErrorsTo($_part = true )
 	{
 		$_retValue = '';
@@ -376,11 +376,11 @@ 
 		{
 			//See if we can connect to the SMTP server
 			if ($this->socket = @fsockopen(
-    			preg_replace('@tls://@i','',$this->getHost()),       // Host to 'hit', IP or domain
-    			$this->getPort(),       // which Port number to use
-    			$this->errno,           // actual system level error
-    			$this->errstr,          // and any text that goes with the error
-    			$this->_smtpTimeout
+				preg_replace('@tls://@i','',$this->getHost()),       // Host to 'hit', IP or domain
+				$this->getPort(),       // which Port number to use
+				$this->errno,           // actual system level error
+				$this->errstr,          // and any text that goes with the error
+				$this->_smtpTimeout
 			))  // timeout for reading/writing data over the socket
 			{
 				// Fix from PHP SMTP class by 'Chris Ryan'
@@ -431,7 +431,7 @@ 
 		{
 			if ($usetls)
 			{
-			    /*
+				/*
 			    The following dialog illustrates how a client and server can start a TLS STARTTLS session
 			    S: <waits for connection on TCP port 25>
 			    C: <opens connection>
@@ -540,13 +540,13 @@ 
 				// and send it out "single file"
 				foreach ( $this->get_RCPT_list() as $_address )
 				{
-				    /* Note:
+					/* Note:
 				     * BCC email addresses must be listed in the RCPT TO command list,
                      * but the BCC header should not be printed under the DATA command.
 				     * http://stackoverflow.com/questions/2750211/sending-bcc-emails-using-a-smtp-server
 				     */
 
-    				/*
+					/*
 					 * TODO
 					 * After each 'RCPT TO:' is sent, we need to make sure it was kosher,
 					 * if not, the whole message will fail
@@ -908,8 +908,8 @@ 
 	 */
 	function setReplyTo($_strReplyTo)
 	{
-	    if ( $_strReplyTo )
-	        $this->_msgReplyTo = $this->_strip_email($_strReplyTo);
+		if ( $_strReplyTo )
+			$this->_msgReplyTo = $this->_strip_email($_strReplyTo);
 	}
 
 	/**
@@ -920,14 +920,14 @@ 
 	 */
 	function getReplyTo($_part = true)
 	{
-	    $_retValue = '';
+		$_retValue = '';
 
-	    if ( $_part === true )
-	        $_retValue = $this->_msgReplyTo;
-	    else
-	        $_retValue = $this->_msgReplyTo[$_part];
+		if ( $_part === true )
+			$_retValue = $this->_msgReplyTo;
+		else
+			$_retValue = $this->_msgReplyTo[$_part];
 
-	    return $_retValue;
+		return $_retValue;
 	}
 
 	/**
@@ -1270,7 +1270,7 @@ 
 			$_header .= 'Message-ID: <' . time() . '.SMTPs@' . $host . ">\r\n";
 		}
 		if ( $this->getMoreInHeader() )
-		    $_header .= $this->getMoreInHeader();     // Value must include the "\r\n";
+			$_header .= $this->getMoreInHeader();     // Value must include the "\r\n";
 
 		//$_header .=
 		//                 'Read-Receipt-To: '   . $this->getFrom( 'org' ) . "\r\n"
@@ -1285,11 +1285,11 @@ 
 
 		// @CHANGE LDR
 		if ( $this->getDeliveryReceipt() )
-		    $_header .= 'Disposition-Notification-To: '.$this->getFrom('addr') . "\r\n";
+			$_header .= 'Disposition-Notification-To: '.$this->getFrom('addr') . "\r\n";
 		if ( $this->getErrorsTo() )
-		    $_header .= 'Errors-To: '.$this->getErrorsTo('addr') . "\r\n";
+			$_header .= 'Errors-To: '.$this->getErrorsTo('addr') . "\r\n";
 		if ( $this->getReplyTo() )
-		    $_header .= "Reply-To: ".$this->getReplyTo('addr') ."\r\n";
+			$_header .= "Reply-To: ".$this->getReplyTo('addr') ."\r\n";
 
 		$_header .= 'X-Mailer: Dolibarr version ' . DOL_VERSION .' (using SMTPs Mailer)' . "\r\n";
 		$_header .= 'X-Dolibarr-Option: '.($conf->global->MAIN_MAIL_USE_MULTI_PART?'MAIN_MAIL_USE_MULTI_PART':'No MAIN_MAIL_USE_MULTI_PART') . "\r\n";
@@ -1347,7 +1347,7 @@ 
 	 */
 	function getBodyContent()
 	{
-	    global $conf;
+		global $conf;
 
 		// Generate a new Boundary string
 		$this->_setBoundary();
@@ -1467,13 +1467,13 @@ 
 
 					if (! key_exists('image', $this->_msgContent) && $_content['dataText'] && ! empty($conf->global->MAIN_MAIL_USE_MULTI_PART))  // Add plain text message part before html part
 					{
-					    $content.= 'Content-Type: multipart/alternative; boundary="'.$this->_getBoundary('alternative').'"' . "\r\n";
-    					$content .= "\r\n";
-	       				$content .= "--" . $this->_getBoundary('alternative') . "\r\n";
+						$content.= 'Content-Type: multipart/alternative; boundary="'.$this->_getBoundary('alternative').'"' . "\r\n";
+						$content .= "\r\n";
+		   				$content .= "--" . $this->_getBoundary('alternative') . "\r\n";
 
-	       				$content.= "Content-Type: text/plain; charset=" . $this->getCharSet() . "\r\n";
-	       				$content.= "\r\n". $_content['dataText'] . "\r\n";
-	       				$content.= "--" . $this->_getBoundary('alternative') . "\r\n";
+		   				$content.= "Content-Type: text/plain; charset=" . $this->getCharSet() . "\r\n";
+		   				$content.= "\r\n". $_content['dataText'] . "\r\n";
+		   				$content.= "--" . $this->_getBoundary('alternative') . "\r\n";
 					}
 
 					$content .= 'Content-Type: ' . $_content['mimeType'] . '; '
@@ -1495,7 +1495,7 @@ 
 
 					if (! key_exists('image', $this->_msgContent) && $_content['dataText'] && ! empty($conf->global->MAIN_MAIL_USE_MULTI_PART))  // Add plain text message part after html part
 					{
-					    $content.= "--" . $this->_getBoundary('alternative') . "--". "\r\n";
+						$content.= "--" . $this->_getBoundary('alternative') . "--". "\r\n";
 					}
 
 					$content .= "\r\n";
@@ -1722,8 +1722,8 @@ 
 		$_retVal = true;
 
 		$server_response = '';
-        // avoid infinite loop
-        $limit=0;
+		// avoid infinite loop
+		$limit=0;
 
 		while ( substr($server_response,3,1) != ' ' && $limit<100)
 		{
@@ -1732,7 +1732,7 @@ 
 				$this->_setErr(121, "Couldn't get mail server response codes");
 				$_retVal = false;
 			}
-            $limit++;
+			$limit++;
 		}
 
 		if( !( substr($server_response, 0, 3) == $response ) )
@@ -1775,7 +1775,7 @@ 
 	function _setErr ( $_errNum, $_errMsg )
 	{
 		$this->_smtpsErrors[] = array( 'num' => $_errNum,
-                                       'msg' => $_errMsg );
+									   'msg' => $_errMsg );
 	}
 
 	/**

Spacing +216 added lines, -216 removed lines

@@ -117,10 +117,10 @@ 
 	/**
 	 * Message Sensitivity
 	 */
-	var $_arySensitivity = array ( false,
+	var $_arySensitivity = array(false,
                                   'Personal',
                                   'Private',
-                                  'Company Confidential' );
+                                  'Company Confidential');
 
 	/**
 	 * Message Sensitivity
@@ -131,12 +131,12 @@ 
 	/**
 	 * Message Priority
 	 */
-	var $_aryPriority = array ( 'Bulk',
+	var $_aryPriority = array('Bulk',
                                 'Highest',
                                 'High',
                                 'Normal',
                                 'Low',
-                                'Lowest' );
+                                'Lowest');
 
 	/**
 	 * Content-Transfer-Encoding
@@ -147,13 +147,13 @@ 
 	/**
 	 * Content-Transfer-Encoding
 	 */
-	var $_smtpsTransEncodeTypes = array( '7bit',               // Simple 7-bit ASCII
-                                         '8bit',               // 8-bit coding with line termination characters
-                                         'base64',             // 3 octets encoded into 4 sextets with offset
-                                         'binary',             // Arbitrary binary stream
-                                         'mac-binhex40',       // Macintosh binary to hex encoding
-                                         'quoted-printable',   // Mostly 7-bit, with 8-bit characters encoded as "=HH"
-                                         'uuencode' );         // UUENCODE encoding
+	var $_smtpsTransEncodeTypes = array('7bit', // Simple 7-bit ASCII
+                                         '8bit', // 8-bit coding with line termination characters
+                                         'base64', // 3 octets encoded into 4 sextets with offset
+                                         'binary', // Arbitrary binary stream
+                                         'mac-binhex40', // Macintosh binary to hex encoding
+                                         'quoted-printable', // Mostly 7-bit, with 8-bit characters encoded as "=HH"
+                                         'uuencode'); // UUENCODE encoding
 
 	/**
 	 * Content-Transfer-Encoding
@@ -300,7 +300,7 @@ 
      */
 	function setErrorsTo($_strErrorsTo)
 	{
-		if ( $_strErrorsTo )
+		if ($_strErrorsTo)
 		$this->_errorsTo = $this->_strip_email($_strErrorsTo);
 	}
 
@@ -310,11 +310,11 @@ 
      * @param	boolean		$_part		Variant
      * @return	string					Errors to
      */
-	function getErrorsTo($_part = true )
+	function getErrorsTo($_part = true)
 	{
 		$_retValue = '';
 
-		if ( $_part === true )
+		if ($_part === true)
 		$_retValue = $this->_errorsTo;
 		else
 		$_retValue = $this->_errorsTo[$_part];
@@ -328,7 +328,7 @@ 
 	 * @param	boolean		$_vDebug		Value for debug
 	 * @return 	void
 	 */
-	function setDebug($_vDebug = false )
+	function setDebug($_vDebug = false)
 	{
 		$this->_debug = $_vDebug;
 	}
@@ -357,29 +357,29 @@ 
 		// We have to make sure the HOST given is valid
 		// This is done here because '@fsockopen' will not give me this
 		// information if it failes to connect because it can't find the HOST
-		$host=$this->getHost();
-		$usetls = preg_match('@tls://@i',$host);
+		$host = $this->getHost();
+		$usetls = preg_match('@tls://@i', $host);
 
-		$host=preg_replace('@tcp://@i','',$host);	// Remove prefix
-		$host=preg_replace('@ssl://@i','',$host);	// Remove prefix
-		$host=preg_replace('@tls://@i','',$host);	// Remove prefix
+		$host = preg_replace('@tcp://@i', '', $host); // Remove prefix
+		$host = preg_replace('@ssl://@i', '', $host); // Remove prefix
+		$host = preg_replace('@tls://@i', '', $host); // Remove prefix
 
 		// @CHANGE LDR
 		include_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
 
-		if ( (! is_ip($host)) && ((gethostbyname($host)) == $host))
+		if ((!is_ip($host)) && ((gethostbyname($host)) == $host))
 		{
-			$this->_setErr(99, $host . ' is either offline or is an invalid host name.');
+			$this->_setErr(99, $host.' is either offline or is an invalid host name.');
 			$_retVal = false;
 		}
 		else
 		{
 			//See if we can connect to the SMTP server
 			if ($this->socket = @fsockopen(
-    			preg_replace('@tls://@i','',$this->getHost()),       // Host to 'hit', IP or domain
-    			$this->getPort(),       // which Port number to use
-    			$this->errno,           // actual system level error
-    			$this->errstr,          // and any text that goes with the error
+    			preg_replace('@tls://@i', '', $this->getHost()), // Host to 'hit', IP or domain
+    			$this->getPort(), // which Port number to use
+    			$this->errno, // actual system level error
+    			$this->errstr, // and any text that goes with the error
     			$this->_smtpTimeout
 			))  // timeout for reading/writing data over the socket
 			{
@@ -390,14 +390,14 @@ 
 				if (function_exists('stream_set_timeout')) stream_set_timeout($this->socket, $this->_smtpTimeout, 0);
 
 				// Check response from Server
-				if ( $_retVal = $this->server_parse($this->socket, "220") )
+				if ($_retVal = $this->server_parse($this->socket, "220"))
 				$_retVal = $this->socket;
 			}
 			// This connection attempt failed.
 			else
 			{
 				// @CHANGE LDR
-				if (empty($this->errstr)) $this->errstr='Failed to connect with fsockopen host='.$this->getHost().' port='.$this->getPort();
+				if (empty($this->errstr)) $this->errstr = 'Failed to connect with fsockopen host='.$this->getHost().' port='.$this->getPort();
 				$this->_setErr($this->errno, $this->errstr);
 				$_retVal = false;
 			}
@@ -418,16 +418,16 @@ 
 		// Send the RFC2554 specified EHLO.
 		// This improvment as provided by 'SirSir' to
 		// accomodate both SMTP AND ESMTP capable servers
-		$host=$this->getHost();
-		$usetls = preg_match('@tls://@i',$host);
+		$host = $this->getHost();
+		$usetls = preg_match('@tls://@i', $host);
 
-		$host=preg_replace('@tcp://@i','',$host);	// Remove prefix
-		$host=preg_replace('@ssl://@i','',$host);	// Remove prefix
-		$host=preg_replace('@tls://@i','',$host);	// Remove prefix
+		$host = preg_replace('@tcp://@i', '', $host); // Remove prefix
+		$host = preg_replace('@ssl://@i', '', $host); // Remove prefix
+		$host = preg_replace('@tls://@i', '', $host); // Remove prefix
 
-		if ($usetls) $host='tls://'.$host;
+		if ($usetls) $host = 'tls://'.$host;
 
-		if ( $_retVal = $this->socket_send_str('EHLO ' . $host, '250') )
+		if ($_retVal = $this->socket_send_str('EHLO '.$host, '250'))
 		{
 			if ($usetls)
 			{
@@ -464,7 +464,7 @@ 
 				// the answer with list of supported AUTH methods. They may differs between non STARTTLS and with STARTTLS.
 				if (!$_retVal = $this->socket_send_str('EHLO '.$host, '250'))
 				{
-					$this->_setErr(126, '"' . $host . '" does not support authenticated connections.');
+					$this->_setErr(126, '"'.$host.'" does not support authenticated connections.');
 					return $_retVal;
 				}
 			}
@@ -477,12 +477,12 @@ 
 
 			// The error here just means the ID/password combo doesn't work.
 			// There is not a method to determine which is the problem, ID or password
-			if ( ! $_retVal = $this->socket_send_str(base64_encode($this->_smtpsPW), '235') )
+			if (!$_retVal = $this->socket_send_str(base64_encode($this->_smtpsPW), '235'))
 			$this->_setErr(130, 'Invalid Authentication Credentials.');
 		}
 		else
 		{
-			$this->_setErr(126, '"' . $host . '" does not support authenticated connections.');
+			$this->_setErr(126, '"'.$host.'" does not support authenticated connections.');
 		}
 
 		return $_retVal;
@@ -504,10 +504,10 @@ 
 		$_retVal = false;
 
 		// Connect to Server
-		if ( $this->socket = $this->_server_connect() )
+		if ($this->socket = $this->_server_connect())
 		{
 			// If a User ID *and* a password is given, assume Authentication is desired
-			if( !empty($this->_smtpsID) && !empty($this->_smtpsPW) )
+			if (!empty($this->_smtpsID) && !empty($this->_smtpsPW))
 			{
 				// Send the RFC2554 specified EHLO.
 				$_retVal = $this->_server_authenticate();
@@ -517,28 +517,28 @@ 
 			else
 			{
 				// Send the RFC821 specified HELO.
-				$host=$this->getHost();
-				$usetls = preg_match('@tls://@i',$host);
+				$host = $this->getHost();
+				$usetls = preg_match('@tls://@i', $host);
 
-				$host=preg_replace('@tcp://@i','',$host);	// Remove prefix
-				$host=preg_replace('@ssl://@i','',$host);	// Remove prefix
-				$host=preg_replace('@tls://@i','',$host);	// Remove prefix
+				$host = preg_replace('@tcp://@i', '', $host); // Remove prefix
+				$host = preg_replace('@ssl://@i', '', $host); // Remove prefix
+				$host = preg_replace('@tls://@i', '', $host); // Remove prefix
 
-				$_retVal = $this->socket_send_str('HELO ' . $host, '250');
+				$_retVal = $this->socket_send_str('HELO '.$host, '250');
 			}
 
 			// Well, did we get to the server?
-			if ( $_retVal )
+			if ($_retVal)
 			{
 				// From this point onward most server response codes should be 250
 				// Specify who the mail is from....
 				// This has to be the raw email address, strip the "name" off
-				$this->socket_send_str('MAIL FROM: ' . $this->getFrom('addr'), '250');
+				$this->socket_send_str('MAIL FROM: '.$this->getFrom('addr'), '250');
 
 				// 'RCPT TO:' must be given a single address, so this has to loop
 				// through the list of addresses, regardless of TO, CC or BCC
 				// and send it out "single file"
-				foreach ( $this->get_RCPT_list() as $_address )
+				foreach ($this->get_RCPT_list() as $_address)
 				{
 				    /* Note:
 				     * BCC email addresses must be listed in the RCPT TO command list,
@@ -554,7 +554,7 @@ 
 					 * mark the last address as "bad" and start the address loop over again.
 					 * If any address fails, the entire message fails.
 					 */
-					$this->socket_send_str('RCPT TO: <' . $_address . '>', '250');
+					$this->socket_send_str('RCPT TO: <'.$_address.'>', '250');
 				}
 
 				// Tell the server we are ready to start sending data
@@ -564,7 +564,7 @@ 
 
 				// Now we are ready for the message...
 				// Ok, all the ingredients are mixed in let's cook this puppy...
-				$this->socket_send_str($this->getHeader().$this->getBodyContent() . "\r\n" . '.', '250');
+				$this->socket_send_str($this->getHeader().$this->getBodyContent()."\r\n".'.', '250');
 
 				// Now tell the server we are done and close the socket...
 				fputs($this->socket, 'QUIT');
@@ -614,13 +614,13 @@ 
 		$_retVal = true;
 
 		// if we have a path...
-		if ( ! empty ($_strConfigPath) )
+		if (!empty ($_strConfigPath))
 		{
 			// If the path is not valid, this will NOT generate an error,
 			// it will simply return FALSE.
-			if ( ! @include ( $_strConfigPath ) )
+			if (!@include ($_strConfigPath))
 			{
-				$this->_setErr(110, '"' . $_strConfigPath . '" is not a valid path.');
+				$this->_setErr(110, '"'.$_strConfigPath.'" is not a valid path.');
 				$_retVal = false;
 			}
 		}
@@ -630,13 +630,13 @@ 
 		{
 			// Set these properties ONLY if they are set in the php.ini file.
 			// Otherwise the default values will be used.
-			if ( $_host = ini_get('SMTPs') )
+			if ($_host = ini_get('SMTPs'))
 			$this->setHost($_host);
 
-			if ( $_port = ini_get('smtp_port') )
+			if ($_port = ini_get('smtp_port'))
 			$this->setPort($_port);
 
-			if ( $_from = ini_get('sendmail_from') )
+			if ($_from = ini_get('sendmail_from'))
 			$this->setFrom($_from);
 		}
 
@@ -655,8 +655,8 @@ 
 	 */
 	function setTransportType($_type = 0)
 	{
-		if ( ( is_numeric($_type) ) &&
-		( ( $_type >= 0 ) && ( $_type <= 3 ) ) )
+		if ((is_numeric($_type)) &&
+		(($_type >= 0) && ($_type <= 3)))
 		$this->_transportType = $_type;
 	}
 
@@ -698,7 +698,7 @@ 
 	 */
 	function setHost($_strHost)
 	{
-		if ( $_strHost )
+		if ($_strHost)
 		$this->_smtpsHost = $_strHost;
 	}
 
@@ -723,8 +723,8 @@ 
 	 */
 	function setPort($_intPort)
 	{
-		if ( ( is_numeric($_intPort) ) &&
-		( ( $_intPort >= 1 ) && ( $_intPort <= 65536 ) ) )
+		if ((is_numeric($_intPort)) &&
+		(($_intPort >= 1) && ($_intPort <= 65536)))
 		$this->_smtpsPort = $_intPort;
 	}
 
@@ -790,7 +790,7 @@ 
 	 */
 	function setCharSet($_strCharSet)
 	{
-		if ( $_strCharSet )
+		if ($_strCharSet)
 		$this->_smtpsCharSet = $_strCharSet;
 	}
 
@@ -878,7 +878,7 @@ 
 	 */
 	function setFrom($_strFrom)
 	{
-		if ( $_strFrom )
+		if ($_strFrom)
 		$this->_msgFrom = $this->_strip_email($_strFrom);
 	}
 
@@ -892,7 +892,7 @@ 
 	{
 		$_retValue = '';
 
-		if ( $_part === true )
+		if ($_part === true)
 		$_retValue = $this->_msgFrom;
 		else
 		$_retValue = $this->_msgFrom[$_part];
@@ -908,7 +908,7 @@ 
 	 */
 	function setReplyTo($_strReplyTo)
 	{
-	    if ( $_strReplyTo )
+	    if ($_strReplyTo)
 	        $this->_msgReplyTo = $this->_strip_email($_strReplyTo);
 	}
 
@@ -922,7 +922,7 @@ 
 	{
 	    $_retValue = '';
 
-	    if ( $_part === true )
+	    if ($_part === true)
 	        $_retValue = $this->_msgReplyTo;
 	    else
 	        $_retValue = $this->_msgReplyTo[$_part];
@@ -948,13 +948,13 @@ 
 		$aryHost = $this->_msgRecipients;
 
 		// Only run this if we have something
-		if ( !empty ($_addrList ))
+		if (!empty ($_addrList))
 		{
 			// $_addrList can be a STRING or an array
-			if ( is_string($_addrList) )
+			if (is_string($_addrList))
 			{
 				// This could be a COMMA delimited string
-				if ( strstr($_addrList, ',') )
+				if (strstr($_addrList, ','))
 				// "explode "list" into an array
 				$_addrList = explode(',', $_addrList);
 
@@ -964,7 +964,7 @@ 
 			}
 
 			// take the array of addresses and split them further
-			foreach ( $_addrList as $_strAddr )
+			foreach ($_addrList as $_strAddr)
 			{
 				// Strip off the end '>'
 				$_strAddr = str_replace('>', '', $_strAddr);
@@ -974,7 +974,7 @@ 
 				$_tmpaddr = explode('<', $_strAddr);
 
 				// We have a "Real Name" and eMail address
-				if ( count($_tmpaddr) == 2 )
+				if (count($_tmpaddr) == 2)
 				{
 					$_tmpHost = explode('@', $_tmpaddr[1]);
 					$_tmpaddr[0] = trim($_tmpaddr[0], ' ">');
@@ -1029,10 +1029,10 @@ 
 		$_tmpAry = explode('<', $_strAddr);
 
 		// Do we have a "Real name"
-		if ( count($_tmpAry) == 2 )
+		if (count($_tmpAry) == 2)
 		{
 			// We may not really have a "Real Name"
-			if ( $_tmpAry[0])
+			if ($_tmpAry[0])
 			$_aryEmail['real'] = trim($_tmpAry[0], ' ">');
 
 			$_aryEmail['addr'] = $_tmpAry[1];
@@ -1041,10 +1041,10 @@ 
 		$_aryEmail['addr'] = $_tmpAry[0];
 
 		// Pull User Name and Host.tld apart
-		list($_aryEmail['user'], $_aryEmail['host'] ) = explode('@', $_aryEmail['addr']);
+		list($_aryEmail['user'], $_aryEmail['host']) = explode('@', $_aryEmail['addr']);
 
 		// Put the brackets back around the address
-		$_aryEmail['addr'] = '<' . $_aryEmail['addr'] . '>';
+		$_aryEmail['addr'] = '<'.$_aryEmail['addr'].'>';
 
 		return $_aryEmail;
 	}
@@ -1061,17 +1061,17 @@ 
 		/**
 		 * An array of bares addresses for use with 'RCPT TO:'
 		 */
-		$_RCPT_list=array();
+		$_RCPT_list = array();
 
 		// walk down Recipients array and pull just email addresses
-		foreach ( $this->_msgRecipients as $_host => $_list )
+		foreach ($this->_msgRecipients as $_host => $_list)
 		{
-			foreach ( $_list as $_subList )
+			foreach ($_list as $_subList)
 			{
-				foreach ( $_subList as $_name => $_addr )
+				foreach ($_subList as $_name => $_addr)
 				{
 					// build RCPT list
-					$_RCPT_list[] = $_name . '@' . $_host;
+					$_RCPT_list[] = $_name.'@'.$_host;
 				}
 			}
 		}
@@ -1088,27 +1088,27 @@ 
 	function get_email_list($_which = null)
 	{
 		// We need to know which address segment to pull
-		if ( $_which )
+		if ($_which)
 		{
 			// Make sure we have addresses to process
-			if ( $this->_msgRecipients )
+			if ($this->_msgRecipients)
 			{
-				$_RCPT_list=array();
+				$_RCPT_list = array();
 				// walk down Recipients array and pull just email addresses
-				foreach ( $this->_msgRecipients as $_host => $_list )
+				foreach ($this->_msgRecipients as $_host => $_list)
 				{
-					if ( $this->_msgRecipients[$_host][$_which] )
+					if ($this->_msgRecipients[$_host][$_which])
 					{
-						foreach ( $this->_msgRecipients[$_host][$_which] as $_addr => $_realName )
+						foreach ($this->_msgRecipients[$_host][$_which] as $_addr => $_realName)
 						{
-							if ( $_realName )	// @CHANGE LDR
+							if ($_realName)	// @CHANGE LDR
 							{
-								$_realName = '"' . $_realName . '"';
-								$_RCPT_list[] = $_realName . ' <' . $_addr . '@' . $_host . '>';
+								$_realName = '"'.$_realName.'"';
+								$_RCPT_list[] = $_realName.' <'.$_addr.'@'.$_host.'>';
 							}
 							else
 							{
-								$_RCPT_list[] = $_addr . '@' . $_host;
+								$_RCPT_list[] = $_addr.'@'.$_host;
 							}
 						}
 					}
@@ -1138,7 +1138,7 @@ 
 	 */
 	function setTO($_addrTo)
 	{
-		if ( $_addrTo )
+		if ($_addrTo)
 		$this->_buildAddrList('to', $_addrTo);
 	}
 
@@ -1160,7 +1160,7 @@ 
 	 */
 	function setCC($_strCC)
 	{
-		if ( $_strCC )
+		if ($_strCC)
 		$this->_buildAddrList('cc', $_strCC);
 	}
 
@@ -1182,7 +1182,7 @@ 
 	 */
 	function setBCC($_strBCC)
 	{
-		if ( $_strBCC )
+		if ($_strBCC)
 		$this->_buildAddrList('bcc', $_strBCC);
 	}
 
@@ -1204,7 +1204,7 @@ 
 	 */
 	function setSubject($_strSubject = '')
 	{
-		if ( $_strSubject )
+		if ($_strSubject)
 		$this->_msgSubject = $_strSubject;
 	}
 
@@ -1227,11 +1227,11 @@ 
 	{
 		global $conf;
 
-		$_header = 'From: '       . $this->getFrom('org') . "\r\n"
-		. 'To: '         . $this->getTO()          . "\r\n";
+		$_header = 'From: '.$this->getFrom('org')."\r\n"
+		. 'To: '.$this->getTO()."\r\n";
 
-		if ( $this->getCC() )
-		$_header .= 'Cc: ' . $this->getCC()  . "\r\n";
+		if ($this->getCC())
+		$_header .= 'Cc: '.$this->getCC()."\r\n";
 
 		/* Note:
 		 * BCC email addresses must be listed in the RCPT TO command list,
@@ -1244,56 +1244,56 @@ 
 		$_header .= 'Bcc: ' . $this->getBCC()  . "\r\n";
         */
 
-		$host=$this->getHost();
-		$usetls = preg_match('@tls://@i',$host);
+		$host = $this->getHost();
+		$usetls = preg_match('@tls://@i', $host);
 
-		$host=preg_replace('@tcp://@i','',$host);	// Remove prefix
-		$host=preg_replace('@ssl://@i','',$host);	// Remove prefix
-		$host=preg_replace('@tls://@i','',$host);	// Remove prefix
+		$host = preg_replace('@tcp://@i', '', $host); // Remove prefix
+		$host = preg_replace('@ssl://@i', '', $host); // Remove prefix
+		$host = preg_replace('@tls://@i', '', $host); // Remove prefix
 
-		$host=dol_getprefix('email');
+		$host = dol_getprefix('email');
 
 		//NOTE: Message-ID should probably contain the username of the user who sent the msg
-		$_header .= 'Subject: '    . $this->getSubject()     . "\r\n";
-		$_header .= 'Date: '       . date("r")               . "\r\n";
+		$_header .= 'Subject: '.$this->getSubject()."\r\n";
+		$_header .= 'Date: '.date("r")."\r\n";
 
 		$trackid = $this->getTrackId();
 		if ($trackid)
 		{
 			// References is kept in response and Message-ID is returned into In-Reply-To:
-			$_header .= 'Message-ID: <' . time() . '.SMTPs-dolibarr-'.$trackid.'@' . $host . ">\r\n";
-			$_header .= 'References: <' . time() . '.SMTPs-dolibarr-'.$trackid.'@' . $host . ">\r\n";
-			$_header .= 'X-Dolibarr-TRACKID: ' . $trackid . "\r\n";
+			$_header .= 'Message-ID: <'.time().'.SMTPs-dolibarr-'.$trackid.'@'.$host.">\r\n";
+			$_header .= 'References: <'.time().'.SMTPs-dolibarr-'.$trackid.'@'.$host.">\r\n";
+			$_header .= 'X-Dolibarr-TRACKID: '.$trackid."\r\n";
 		}
 		else
 		{
-			$_header .= 'Message-ID: <' . time() . '.SMTPs@' . $host . ">\r\n";
+			$_header .= 'Message-ID: <'.time().'.SMTPs@'.$host.">\r\n";
 		}
-		if ( $this->getMoreInHeader() )
-		    $_header .= $this->getMoreInHeader();     // Value must include the "\r\n";
+		if ($this->getMoreInHeader())
+		    $_header .= $this->getMoreInHeader(); // Value must include the "\r\n";
 
 		//$_header .=
 		//                 'Read-Receipt-To: '   . $this->getFrom( 'org' ) . "\r\n"
 		//                 'Return-Receipt-To: ' . $this->getFrom( 'org' ) . "\r\n";
 
-		if ( $this->getSensitivity() )
-		$_header .= 'Sensitivity: ' . $this->getSensitivity()  . "\r\n";
+		if ($this->getSensitivity())
+		$_header .= 'Sensitivity: '.$this->getSensitivity()."\r\n";
 
-		if ( $this->_msgPriority != 3 )
+		if ($this->_msgPriority != 3)
 		$_header .= $this->getPriority();
 
 
 		// @CHANGE LDR
-		if ( $this->getDeliveryReceipt() )
-		    $_header .= 'Disposition-Notification-To: '.$this->getFrom('addr') . "\r\n";
-		if ( $this->getErrorsTo() )
-		    $_header .= 'Errors-To: '.$this->getErrorsTo('addr') . "\r\n";
-		if ( $this->getReplyTo() )
-		    $_header .= "Reply-To: ".$this->getReplyTo('addr') ."\r\n";
+		if ($this->getDeliveryReceipt())
+		    $_header .= 'Disposition-Notification-To: '.$this->getFrom('addr')."\r\n";
+		if ($this->getErrorsTo())
+		    $_header .= 'Errors-To: '.$this->getErrorsTo('addr')."\r\n";
+		if ($this->getReplyTo())
+		    $_header .= "Reply-To: ".$this->getReplyTo('addr')."\r\n";
 
-		$_header .= 'X-Mailer: Dolibarr version ' . DOL_VERSION .' (using SMTPs Mailer)' . "\r\n";
-		$_header .= 'X-Dolibarr-Option: '.($conf->global->MAIN_MAIL_USE_MULTI_PART?'MAIN_MAIL_USE_MULTI_PART':'No MAIN_MAIL_USE_MULTI_PART') . "\r\n";
-		$_header .= 'Mime-Version: 1.0' . "\r\n";
+		$_header .= 'X-Mailer: Dolibarr version '.DOL_VERSION.' (using SMTPs Mailer)'."\r\n";
+		$_header .= 'X-Dolibarr-Option: '.($conf->global->MAIN_MAIL_USE_MULTI_PART ? 'MAIN_MAIL_USE_MULTI_PART' : 'No MAIN_MAIL_USE_MULTI_PART')."\r\n";
+		$_header .= 'Mime-Version: 1.0'."\r\n";
 
 
 		return $_header;
@@ -1310,7 +1310,7 @@ 
 	{
 		//if ( $strContent )
 		//{
-		if ( $strType == 'html' )
+		if ($strType == 'html')
 		$strMimeType = 'text/html';
 		else
 		$strMimeType = 'text/plain';
@@ -1327,7 +1327,7 @@ 
 
 		// Make RFC2045 Compliant
 		//$strContent = rtrim(chunk_split($strContent));    // Function chunck_split seems ko if not used on a base64 content
-		$strContent = rtrim(wordwrap($strContent, 75, "\r\n"));   // TODO Using this method creates unexpected line break on text/plain content.
+		$strContent = rtrim(wordwrap($strContent, 75, "\r\n")); // TODO Using this method creates unexpected line break on text/plain content.
 
 		$this->_msgContent[$strType] = array();
 
@@ -1335,7 +1335,7 @@ 
 		$this->_msgContent[$strType]['data']     = $strContent;
 		$this->_msgContent[$strType]['dataText'] = $strContentAltText;
 
-		if ( $this->getMD5flag() )
+		if ($this->getMD5flag())
 		$this->_msgContent[$strType]['md5']      = dol_hash($strContent, 3);
 		//}
 	}
@@ -1359,49 +1359,49 @@ 
 		$keyCount = count($_types);
 
 		// If we have ZERO, we have a problem
-		if( $keyCount === 0 )
+		if ($keyCount === 0)
 		die ("Sorry, no content");
 
 		// If we have ONE, we can use the simple format
-		else if( $keyCount === 1 && empty($conf->global->MAIN_MAIL_USE_MULTI_PART))
+		else if ($keyCount === 1 && empty($conf->global->MAIN_MAIL_USE_MULTI_PART))
 		{
 			$_msgData = $this->_msgContent;
 			$_msgData = $_msgData[$_types[0]];
 
-			$content = 'Content-Type: ' . $_msgData['mimeType'] . '; charset="' . $this->getCharSet() . '"' . "\r\n"
-			. 'Content-Transfer-Encoding: ' . $this->getTransEncodeType() . "\r\n"
-			. 'Content-Disposition: inline'  . "\r\n"
-			. 'Content-Description: message' . "\r\n";
+			$content = 'Content-Type: '.$_msgData['mimeType'].'; charset="'.$this->getCharSet().'"'."\r\n"
+			. 'Content-Transfer-Encoding: '.$this->getTransEncodeType()."\r\n"
+			. 'Content-Disposition: inline'."\r\n"
+			. 'Content-Description: message'."\r\n";
 
-			if ( $this->getMD5flag() )
-			$content .= 'Content-MD5: ' . $_msgData['md5'] . "\r\n";
+			if ($this->getMD5flag())
+			$content .= 'Content-MD5: '.$_msgData['md5']."\r\n";
 
 			$content .= "\r\n"
-			.  $_msgData['data'] . "\r\n";
+			.  $_msgData['data']."\r\n";
 		}
 
 		// If we have more than ONE, we use the multi-part format
-		else if( $keyCount >= 1 || ! empty($conf->global->MAIN_MAIL_USE_MULTI_PART))
+		else if ($keyCount >= 1 || !empty($conf->global->MAIN_MAIL_USE_MULTI_PART))
 		{
 			// Since this is an actual multi-part message
 			// We need to define a content message Boundary
 			// NOTE: This was 'multipart/alternative', but Windows based mail servers have issues with this.
 
 			//$content = 'Content-Type: multipart/related; boundary="' . $this->_getBoundary() . '"'   . "\r\n";
-			$content = 'Content-Type: multipart/mixed; boundary="' . $this->_getBoundary('mixed') . '"'   . "\r\n";
+			$content = 'Content-Type: multipart/mixed; boundary="'.$this->_getBoundary('mixed').'"'."\r\n";
 
 			//                     . "\r\n"
 			//                     . 'This is a multi-part message in MIME format.' . "\r\n";
 			$content .= "Content-Transfer-Encoding: 8bit\r\n";
 			$content .= "\r\n";
 
-			$content .= "--" . $this->_getBoundary('mixed') . "\r\n";
+			$content .= "--".$this->_getBoundary('mixed')."\r\n";
 
 			if (key_exists('image', $this->_msgContent))     // If inline image found
 			{
-				$content.= 'Content-Type: multipart/alternative; boundary="'.$this->_getBoundary('alternative').'"' . "\r\n";
+				$content .= 'Content-Type: multipart/alternative; boundary="'.$this->_getBoundary('alternative').'"'."\r\n";
 				$content .= "\r\n";
-				$content .= "--" . $this->_getBoundary('alternative') . "\r\n";
+				$content .= "--".$this->_getBoundary('alternative')."\r\n";
 			}
 
 
@@ -1409,93 +1409,93 @@ 
 
 
 			// Loop through message content array
-			foreach ($this->_msgContent as $type => $_content )
+			foreach ($this->_msgContent as $type => $_content)
 			{
-				if ( $type == 'attachment' )
+				if ($type == 'attachment')
 				{
 					// loop through all attachments
-					foreach ( $_content as $_file => $_data )
+					foreach ($_content as $_file => $_data)
 					{
-						$content .= "--" . $this->_getBoundary('mixed') . "\r\n"
-						.  'Content-Disposition: attachment; filename="' . $_data['fileName'] . '"' . "\r\n"
-						.  'Content-Type: ' . $_data['mimeType'] . '; name="' . $_data['fileName'] . '"' . "\r\n"
-						.  'Content-Transfer-Encoding: base64' . "\r\n"
-						.  'Content-Description: File Attachment' . "\r\n";
+						$content .= "--".$this->_getBoundary('mixed')."\r\n"
+						.  'Content-Disposition: attachment; filename="'.$_data['fileName'].'"'."\r\n"
+						.  'Content-Type: '.$_data['mimeType'].'; name="'.$_data['fileName'].'"'."\r\n"
+						.  'Content-Transfer-Encoding: base64'."\r\n"
+						.  'Content-Description: File Attachment'."\r\n";
 
-						if ( $this->getMD5flag() )
-						$content .= 'Content-MD5: ' . $_data['md5'] . "\r\n";
+						if ($this->getMD5flag())
+						$content .= 'Content-MD5: '.$_data['md5']."\r\n";
 
-						$content .= "\r\n" .  $_data['data'] . "\r\n\r\n";
+						$content .= "\r\n".$_data['data']."\r\n\r\n";
 					}
 				}
 				// @CHANGE LDR
-				else if ( $type == 'image' )
+				else if ($type == 'image')
 				{
 					// loop through all images
-					foreach ( $_content as $_image => $_data )
+					foreach ($_content as $_image => $_data)
 					{
-						$content .= "--" . $this->_getBoundary('related') . "\r\n";  // always related for an inline image
+						$content .= "--".$this->_getBoundary('related')."\r\n"; // always related for an inline image
 
-						$content .= 'Content-Type: ' . $_data['mimeType'] . '; name="' . $_data['imageName'] . '"' . "\r\n"
-						.  'Content-Transfer-Encoding: base64' . "\r\n"
-						.  'Content-Disposition: inline; filename="' . $_data['imageName'] . '"' . "\r\n"
-						.  'Content-ID: <' . $_data['cid'] . '> ' . "\r\n";
+						$content .= 'Content-Type: '.$_data['mimeType'].'; name="'.$_data['imageName'].'"'."\r\n"
+						.  'Content-Transfer-Encoding: base64'."\r\n"
+						.  'Content-Disposition: inline; filename="'.$_data['imageName'].'"'."\r\n"
+						.  'Content-ID: <'.$_data['cid'].'> '."\r\n";
 
-						if ( $this->getMD5flag() )
-						$content .= 'Content-MD5: ' . $_data['md5'] . "\r\n";
+						if ($this->getMD5flag())
+						$content .= 'Content-MD5: '.$_data['md5']."\r\n";
 
 						$content .= "\r\n"
-						. $_data['data'] . "\r\n";
+						. $_data['data']."\r\n";
 					}
 
 					// always end related and end alternative after inline images
-					$content.= "--" . $this->_getBoundary('related') . "--" . "\r\n";
-					$content.= "\r\n" . "--" . $this->_getBoundary('alternative') . "--" . "\r\n";
-					$content.= "\r\n";
+					$content .= "--".$this->_getBoundary('related')."--"."\r\n";
+					$content .= "\r\n"."--".$this->_getBoundary('alternative')."--"."\r\n";
+					$content .= "\r\n";
 				}
 				else
 				{
 					if (key_exists('image', $this->_msgContent))
 					{
-						$content.= "Content-Type: text/plain; charset=" . $this->getCharSet() . "\r\n";
-						$content.= "\r\n" . ($_content['dataText']?$_content['dataText']:strip_tags($_content['data'])) . "\r\n"; // Add plain text message
-						$content.= "--" . $this->_getBoundary('alternative') . "\r\n";
-						$content.= 'Content-Type: multipart/related; boundary="' . $this->_getBoundary('related') . '"' . "\r\n";
-						$content.= "\r\n";
-						$content.= "--" . $this->_getBoundary('related') . "\r\n";
+						$content .= "Content-Type: text/plain; charset=".$this->getCharSet()."\r\n";
+						$content .= "\r\n".($_content['dataText'] ? $_content['dataText'] : strip_tags($_content['data']))."\r\n"; // Add plain text message
+						$content .= "--".$this->_getBoundary('alternative')."\r\n";
+						$content .= 'Content-Type: multipart/related; boundary="'.$this->_getBoundary('related').'"'."\r\n";
+						$content .= "\r\n";
+						$content .= "--".$this->_getBoundary('related')."\r\n";
 					}
 
-					if (! key_exists('image', $this->_msgContent) && $_content['dataText'] && ! empty($conf->global->MAIN_MAIL_USE_MULTI_PART))  // Add plain text message part before html part
+					if (!key_exists('image', $this->_msgContent) && $_content['dataText'] && !empty($conf->global->MAIN_MAIL_USE_MULTI_PART))  // Add plain text message part before html part
 					{
-					    $content.= 'Content-Type: multipart/alternative; boundary="'.$this->_getBoundary('alternative').'"' . "\r\n";
+					    $content .= 'Content-Type: multipart/alternative; boundary="'.$this->_getBoundary('alternative').'"'."\r\n";
     					$content .= "\r\n";
-	       				$content .= "--" . $this->_getBoundary('alternative') . "\r\n";
+	       				$content .= "--".$this->_getBoundary('alternative')."\r\n";
 
-	       				$content.= "Content-Type: text/plain; charset=" . $this->getCharSet() . "\r\n";
-	       				$content.= "\r\n". $_content['dataText'] . "\r\n";
-	       				$content.= "--" . $this->_getBoundary('alternative') . "\r\n";
+	       				$content .= "Content-Type: text/plain; charset=".$this->getCharSet()."\r\n";
+	       				$content .= "\r\n".$_content['dataText']."\r\n";
+	       				$content .= "--".$this->_getBoundary('alternative')."\r\n";
 					}
 
-					$content .= 'Content-Type: ' . $_content['mimeType'] . '; '
+					$content .= 'Content-Type: '.$_content['mimeType'].'; '
 					//                             . 'charset="' . $this->getCharSet() . '"';
-					. 'charset=' . $this->getCharSet() . '';
+					. 'charset='.$this->getCharSet().'';
 
 					//                    $content .= ( $type == 'html') ? '; name="HTML Part"' : '';
-					$content .=  "\r\n";
+					$content .= "\r\n";
 					//                    $content .= 'Content-Transfer-Encoding: ';
 					//                    $content .= ($type == 'html') ? 'quoted-printable' : $this->getTransEncodeType();
 					//                    $content .=  "\r\n"
 					//                             . 'Content-Disposition: inline'  . "\r\n"
 					//                             . 'Content-Description: ' . $type . ' message' . "\r\n";
 
-					if ( $this->getMD5flag() )
-					$content .= 'Content-MD5: ' . $_content['md5'] . "\r\n";
+					if ($this->getMD5flag())
+					$content .= 'Content-MD5: '.$_content['md5']."\r\n";
 
-					$content .= "\r\n"	. $_content['data'] . "\r\n";
+					$content .= "\r\n".$_content['data']."\r\n";
 
-					if (! key_exists('image', $this->_msgContent) && $_content['dataText'] && ! empty($conf->global->MAIN_MAIL_USE_MULTI_PART))  // Add plain text message part after html part
+					if (!key_exists('image', $this->_msgContent) && $_content['dataText'] && !empty($conf->global->MAIN_MAIL_USE_MULTI_PART))  // Add plain text message part after html part
 					{
-					    $content.= "--" . $this->_getBoundary('alternative') . "--". "\r\n";
+					    $content .= "--".$this->_getBoundary('alternative')."--"."\r\n";
 					}
 
 					$content .= "\r\n";
@@ -1504,7 +1504,7 @@ 
 
 			// Close message boundries
 			//            $content .= "\r\n--" . $this->_getBoundary() . '--' . "\r\n" ;
-			$content .= "--" . $this->_getBoundary('mixed') . '--' . "\r\n" ;
+			$content .= "--".$this->_getBoundary('mixed').'--'."\r\n";
 		}
 
 		return $content;
@@ -1521,15 +1521,15 @@ 
 	 */
 	function setAttachment($strContent, $strFileName = 'unknown', $strMimeType = 'unknown')
 	{
-		if ( $strContent )
+		if ($strContent)
 		{
-			$strContent = rtrim(chunk_split(base64_encode($strContent), 76, "\r\n"));    // 76 max is defined into http://tools.ietf.org/html/rfc2047
+			$strContent = rtrim(chunk_split(base64_encode($strContent), 76, "\r\n")); // 76 max is defined into http://tools.ietf.org/html/rfc2047
 
 			$this->_msgContent['attachment'][$strFileName]['mimeType'] = $strMimeType;
 			$this->_msgContent['attachment'][$strFileName]['fileName'] = $strFileName;
 			$this->_msgContent['attachment'][$strFileName]['data']     = $strContent;
 
-			if ( $this->getMD5flag() )
+			if ($this->getMD5flag())
 			$this->_msgContent['attachment'][$strFileName]['md5']      = dol_hash($strContent, 3);
 		}
 	}
@@ -1556,7 +1556,7 @@ 
 			$this->_msgContent['image'][$strImageName]['cid']      = $strImageCid;
 			$this->_msgContent['image'][$strImageName]['data']     = $strContent;
 
-			if ( $this->getMD5flag() )
+			if ($this->getMD5flag())
 			$this->_msgContent['image'][$strImageName]['md5']      = dol_hash($strContent, 3);
 		}
 	}
@@ -1576,8 +1576,8 @@ 
 	 */
 	function setSensitivity($_value = 0)
 	{
-		if ( ( is_numeric($_value) ) &&
-		( ( $_value >= 0 ) && ( $_value <= 3 ) ) )
+		if ((is_numeric($_value)) &&
+		(($_value >= 0) && ($_value <= 3)))
 		$this->_msgSensitivity = $_value;
 	}
 
@@ -1609,10 +1609,10 @@ 
 	 * @param 	integer 	$_value 	Message Priority
 	 * @return 	void
 	 */
-	function setPriority ( $_value = 3 )
+	function setPriority($_value = 3)
 	{
-		if ( ( is_numeric($_value) ) &&
-		( ( $_value >= 0 ) && ( $_value <= 5 ) ) )
+		if ((is_numeric($_value)) &&
+		(($_value >= 0) && ($_value <= 5)))
 		$this->_msgPriority = $_value;
 	}
 
@@ -1630,9 +1630,9 @@ 
 	 */
 	function getPriority()
 	{
-		return 'Importance: ' . $this->_aryPriority[$this->_msgPriority] . "\r\n"
-		. 'Priority: '   . $this->_aryPriority[$this->_msgPriority] . "\r\n"
-		. 'X-Priority: ' . $this->_msgPriority . ' (' . $this->_aryPriority[$this->_msgPriority] . ')' . "\r\n";
+		return 'Importance: '.$this->_aryPriority[$this->_msgPriority]."\r\n"
+		. 'Priority: '.$this->_aryPriority[$this->_msgPriority]."\r\n"
+		. 'X-Priority: '.$this->_msgPriority.' ('.$this->_aryPriority[$this->_msgPriority].')'."\r\n";
 	}
 
 	/**
@@ -1666,7 +1666,7 @@ 
 	 */
 	function setXheader($strXdata)
 	{
-		if ( $strXdata )
+		if ($strXdata)
 		$this->_msgXheader[] = $strXdata;
 	}
 
@@ -1687,7 +1687,7 @@ 
 	 */
 	function _setBoundary()
 	{
-		$this->_smtpsBoundary = "multipart_x." . time() . ".x_boundary";
+		$this->_smtpsBoundary = "multipart_x.".time().".x_boundary";
 		$this->_smtpsRelatedBoundary = 'mul_'.dol_hash(uniqid("dolibarr2"), 3);
 		$this->_smtpsAlternativeBoundary = 'mul_'.dol_hash(uniqid("dolibarr3"), 3);
 	}
@@ -1698,7 +1698,7 @@ 
 	 * @param  string $type				Type of boundary
 	 * @return string $_smtpsBoundary 	MIME message Boundary
 	 */
-	function _getBoundary($type='mixed')
+	function _getBoundary($type = 'mixed')
 	{
 		if ($type == 'mixed') return $this->_smtpsBoundary;
 		else if ($type == 'related') return $this->_smtpsRelatedBoundary;
@@ -1723,11 +1723,11 @@ 
 
 		$server_response = '';
         // avoid infinite loop
-        $limit=0;
+        $limit = 0;
 
-		while ( substr($server_response,3,1) != ' ' && $limit<100)
+		while (substr($server_response, 3, 1) != ' ' && $limit < 100)
 		{
-			if( !( $server_response = fgets($socket, 256) ) )
+			if (!($server_response = fgets($socket, 256)))
 			{
 				$this->_setErr(121, "Couldn't get mail server response codes");
 				$_retVal = false;
@@ -1735,7 +1735,7 @@ 
             $limit++;
 		}
 
-		if( !( substr($server_response, 0, 3) == $response ) )
+		if (!(substr($server_response, 0, 3) == $response))
 		{
 			$this->_setErr(120, "Ran into problems sending Mail.\r\nResponse: $server_response");
 			$_retVal = false;
@@ -1752,13 +1752,13 @@ 
 	 * @param 	string		$CRLF			CRLF
 	 * @return 	boolean|null						True or false
 	 */
-	function socket_send_str( $_strSend, $_returnCode = null, $CRLF = "\r\n" )
+	function socket_send_str($_strSend, $_returnCode = null, $CRLF = "\r\n")
 	{
-		if ($this->_debug) $this->log.=$_strSend;	// @CHANGE LDR for log
-		fputs($this->socket, $_strSend . $CRLF);
-		if ($this->_debug) $this->log.=' ('.$_returnCode.')' . $CRLF;
+		if ($this->_debug) $this->log .= $_strSend; // @CHANGE LDR for log
+		fputs($this->socket, $_strSend.$CRLF);
+		if ($this->_debug) $this->log .= ' ('.$_returnCode.')'.$CRLF;
 
-		if ( $_returnCode )
+		if ($_returnCode)
 		return $this->server_parse($this->socket, $_returnCode);
 	}
 
@@ -1772,10 +1772,10 @@ 
 	 * @param  string $_errMsg  Error Message
 	 * @return void
 	 */
-	function _setErr ( $_errNum, $_errMsg )
+	function _setErr($_errNum, $_errMsg)
 	{
-		$this->_smtpsErrors[] = array( 'num' => $_errNum,
-                                       'msg' => $_errMsg );
+		$this->_smtpsErrors[] = array('num' => $_errNum,
+                                       'msg' => $_errMsg);
 	}
 
 	/**
@@ -1787,9 +1787,9 @@ 
 	{
 		$_errMsg = array();
 
-		foreach ( $this->_smtpsErrors as $_err => $_info )
+		foreach ($this->_smtpsErrors as $_err => $_info)
 		{
-			$_errMsg[] = 'Error [' . $_info['num'] .']: '. $_info['msg'];
+			$_errMsg[] = 'Error ['.$_info['num'].']: '.$_info['msg'];
 		}
 
 		return implode("\n", $_errMsg);

Braces +185 added lines, -124 removed lines

@@ -300,8 +300,9 @@ 
      */
 	function setErrorsTo($_strErrorsTo)
 	{
-		if ( $_strErrorsTo )
-		$this->_errorsTo = $this->_strip_email($_strErrorsTo);
+		if ( $_strErrorsTo ) {
+				$this->_errorsTo = $this->_strip_email($_strErrorsTo);
+		}
 	}
 
     /**
@@ -314,10 +315,11 @@ 
 	{
 		$_retValue = '';
 
-		if ( $_part === true )
-		$_retValue = $this->_errorsTo;
-		else
-		$_retValue = $this->_errorsTo[$_part];
+		if ( $_part === true ) {
+				$_retValue = $this->_errorsTo;
+		} else {
+				$_retValue = $this->_errorsTo[$_part];
+		}
 
 		return $_retValue;
 	}
@@ -371,8 +373,7 @@ 
 		{
 			$this->_setErr(99, $host . ' is either offline or is an invalid host name.');
 			$_retVal = false;
-		}
-		else
+		} else
 		{
 			//See if we can connect to the SMTP server
 			if ($this->socket = @fsockopen(
@@ -381,23 +382,28 @@ 
     			$this->errno,           // actual system level error
     			$this->errstr,          // and any text that goes with the error
     			$this->_smtpTimeout
-			))  // timeout for reading/writing data over the socket
+			)) {
+				// timeout for reading/writing data over the socket
 			{
 				// Fix from PHP SMTP class by 'Chris Ryan'
 				// Sometimes the SMTP server takes a little longer to respond
 				// so we will give it a longer timeout for the first read
 				// Windows still does not have support for this timeout function
 				if (function_exists('stream_set_timeout')) stream_set_timeout($this->socket, $this->_smtpTimeout, 0);
+			}
 
 				// Check response from Server
-				if ( $_retVal = $this->server_parse($this->socket, "220") )
-				$_retVal = $this->socket;
+				if ( $_retVal = $this->server_parse($this->socket, "220") ) {
+								$_retVal = $this->socket;
+				}
 			}
 			// This connection attempt failed.
 			else
 			{
 				// @CHANGE LDR
-				if (empty($this->errstr)) $this->errstr='Failed to connect with fsockopen host='.$this->getHost().' port='.$this->getPort();
+				if (empty($this->errstr)) {
+					$this->errstr='Failed to connect with fsockopen host='.$this->getHost().' port='.$this->getPort();
+				}
 				$this->_setErr($this->errno, $this->errstr);
 				$_retVal = false;
 			}
@@ -425,7 +431,9 @@ 
 		$host=preg_replace('@ssl://@i','',$host);	// Remove prefix
 		$host=preg_replace('@tls://@i','',$host);	// Remove prefix
 
-		if ($usetls) $host='tls://'.$host;
+		if ($usetls) {
+			$host='tls://'.$host;
+		}
 
 		if ( $_retVal = $this->socket_send_str('EHLO ' . $host, '250') )
 		{
@@ -477,10 +485,10 @@ 
 
 			// The error here just means the ID/password combo doesn't work.
 			// There is not a method to determine which is the problem, ID or password
-			if ( ! $_retVal = $this->socket_send_str(base64_encode($this->_smtpsPW), '235') )
-			$this->_setErr(130, 'Invalid Authentication Credentials.');
-		}
-		else
+			if ( ! $_retVal = $this->socket_send_str(base64_encode($this->_smtpsPW), '235') ) {
+						$this->_setErr(130, 'Invalid Authentication Credentials.');
+			}
+		} else
 		{
 			$this->_setErr(126, '"' . $host . '" does not support authenticated connections.');
 		}
@@ -630,14 +638,17 @@ 
 		{
 			// Set these properties ONLY if they are set in the php.ini file.
 			// Otherwise the default values will be used.
-			if ( $_host = ini_get('SMTPs') )
-			$this->setHost($_host);
+			if ( $_host = ini_get('SMTPs') ) {
+						$this->setHost($_host);
+			}
 
-			if ( $_port = ini_get('smtp_port') )
-			$this->setPort($_port);
+			if ( $_port = ini_get('smtp_port') ) {
+						$this->setPort($_port);
+			}
 
-			if ( $_from = ini_get('sendmail_from') )
-			$this->setFrom($_from);
+			if ( $_from = ini_get('sendmail_from') ) {
+						$this->setFrom($_from);
+			}
 		}
 
 		// Send back what we have
@@ -656,8 +667,9 @@ 
 	function setTransportType($_type = 0)
 	{
 		if ( ( is_numeric($_type) ) &&
-		( ( $_type >= 0 ) && ( $_type <= 3 ) ) )
-		$this->_transportType = $_type;
+		( ( $_type >= 0 ) && ( $_type <= 3 ) ) ) {
+				$this->_transportType = $_type;
+		}
 	}
 
 	/**
@@ -698,8 +710,9 @@ 
 	 */
 	function setHost($_strHost)
 	{
-		if ( $_strHost )
-		$this->_smtpsHost = $_strHost;
+		if ( $_strHost ) {
+				$this->_smtpsHost = $_strHost;
+		}
 	}
 
 	/**
@@ -724,8 +737,9 @@ 
 	function setPort($_intPort)
 	{
 		if ( ( is_numeric($_intPort) ) &&
-		( ( $_intPort >= 1 ) && ( $_intPort <= 65536 ) ) )
-		$this->_smtpsPort = $_intPort;
+		( ( $_intPort >= 1 ) && ( $_intPort <= 65536 ) ) ) {
+				$this->_smtpsPort = $_intPort;
+		}
 	}
 
 	/**
@@ -790,8 +804,9 @@ 
 	 */
 	function setCharSet($_strCharSet)
 	{
-		if ( $_strCharSet )
-		$this->_smtpsCharSet = $_strCharSet;
+		if ( $_strCharSet ) {
+				$this->_smtpsCharSet = $_strCharSet;
+		}
 	}
 
 	/**
@@ -821,8 +836,9 @@ 
 	 */
 	function setTransEncode($_strTransEncode)
 	{
-		if (array_search($_strTransEncode, $this->_smtpsTransEncodeTypes))
-		$this->_smtpsTransEncode = $_strTransEncode;
+		if (array_search($_strTransEncode, $this->_smtpsTransEncodeTypes)) {
+				$this->_smtpsTransEncode = $_strTransEncode;
+		}
 	}
 
 	/**
@@ -853,8 +869,9 @@ 
 	 */
 	function setTransEncodeType($_strTransEncodeType)
 	{
-		if (array_search($_strTransEncodeType, $this->_smtpsTransEncodeTypes))
-		$this->_smtpsTransEncodeType = $_strTransEncodeType;
+		if (array_search($_strTransEncodeType, $this->_smtpsTransEncodeTypes)) {
+				$this->_smtpsTransEncodeType = $_strTransEncodeType;
+		}
 	}
 
 	/**
@@ -878,8 +895,9 @@ 
 	 */
 	function setFrom($_strFrom)
 	{
-		if ( $_strFrom )
-		$this->_msgFrom = $this->_strip_email($_strFrom);
+		if ( $_strFrom ) {
+				$this->_msgFrom = $this->_strip_email($_strFrom);
+		}
 	}
 
 	/**
@@ -892,10 +910,11 @@ 
 	{
 		$_retValue = '';
 
-		if ( $_part === true )
-		$_retValue = $this->_msgFrom;
-		else
-		$_retValue = $this->_msgFrom[$_part];
+		if ( $_part === true ) {
+				$_retValue = $this->_msgFrom;
+		} else {
+				$_retValue = $this->_msgFrom[$_part];
+		}
 
 		return $_retValue;
 	}
@@ -908,8 +927,9 @@ 
 	 */
 	function setReplyTo($_strReplyTo)
 	{
-	    if ( $_strReplyTo )
-	        $this->_msgReplyTo = $this->_strip_email($_strReplyTo);
+	    if ( $_strReplyTo ) {
+	    	        $this->_msgReplyTo = $this->_strip_email($_strReplyTo);
+	    }
 	}
 
 	/**
@@ -922,10 +942,11 @@ 
 	{
 	    $_retValue = '';
 
-	    if ( $_part === true )
-	        $_retValue = $this->_msgReplyTo;
-	    else
-	        $_retValue = $this->_msgReplyTo[$_part];
+	    if ( $_part === true ) {
+	    	        $_retValue = $this->_msgReplyTo;
+	    } else {
+	    	        $_retValue = $this->_msgReplyTo[$_part];
+	    }
 
 	    return $_retValue;
 	}
@@ -954,13 +975,15 @@ 
 			if ( is_string($_addrList) )
 			{
 				// This could be a COMMA delimited string
-				if ( strstr($_addrList, ',') )
-				// "explode "list" into an array
+				if ( strstr($_addrList, ',') ) {
+								// "explode "list" into an array
 				$_addrList = explode(',', $_addrList);
+				}
 
 				// Stick it in an array
-				else
-				$_addrList = array($_addrList);
+				else {
+								$_addrList = array($_addrList);
+				}
 			}
 
 			// take the array of addresses and split them further
@@ -1032,13 +1055,14 @@ 
 		if ( count($_tmpAry) == 2 )
 		{
 			// We may not really have a "Real Name"
-			if ( $_tmpAry[0])
-			$_aryEmail['real'] = trim($_tmpAry[0], ' ">');
+			if ( $_tmpAry[0]) {
+						$_aryEmail['real'] = trim($_tmpAry[0], ' ">');
+			}
 
 			$_aryEmail['addr'] = $_tmpAry[1];
+		} else {
+				$_aryEmail['addr'] = $_tmpAry[0];
 		}
-		else
-		$_aryEmail['addr'] = $_tmpAry[0];
 
 		// Pull User Name and Host.tld apart
 		list($_aryEmail['user'], $_aryEmail['host'] ) = explode('@', $_aryEmail['addr']);
@@ -1101,12 +1125,13 @@ 
 					{
 						foreach ( $this->_msgRecipients[$_host][$_which] as $_addr => $_realName )
 						{
-							if ( $_realName )	// @CHANGE LDR
+							if ( $_realName ) {
+								// @CHANGE LDR
 							{
 								$_realName = '"' . $_realName . '"';
-								$_RCPT_list[] = $_realName . ' <' . $_addr . '@' . $_host . '>';
 							}
-							else
+								$_RCPT_list[] = $_realName . ' <' . $_addr . '@' . $_host . '>';
+							} else
 							{
 								$_RCPT_list[] = $_addr . '@' . $_host;
 							}
@@ -1115,14 +1140,12 @@ 
 				}
 
 				return implode(', ', $_RCPT_list);
-			}
-			else
+			} else
 			{
 				$this->_setErr(101, 'No eMail Address for message to be sent to.');
 				return false;
 			}
-		}
-		else
+		} else
 		{
 			$this->_setErr(102, 'eMail type not defined.');
 			return false;
@@ -1138,8 +1161,9 @@ 
 	 */
 	function setTO($_addrTo)
 	{
-		if ( $_addrTo )
-		$this->_buildAddrList('to', $_addrTo);
+		if ( $_addrTo ) {
+				$this->_buildAddrList('to', $_addrTo);
+		}
 	}
 
 	/**
@@ -1160,8 +1184,9 @@ 
 	 */
 	function setCC($_strCC)
 	{
-		if ( $_strCC )
-		$this->_buildAddrList('cc', $_strCC);
+		if ( $_strCC ) {
+				$this->_buildAddrList('cc', $_strCC);
+		}
 	}
 
 	/**
@@ -1182,8 +1207,9 @@ 
 	 */
 	function setBCC($_strBCC)
 	{
-		if ( $_strBCC )
-		$this->_buildAddrList('bcc', $_strBCC);
+		if ( $_strBCC ) {
+				$this->_buildAddrList('bcc', $_strBCC);
+		}
 	}
 
 	/**
@@ -1204,8 +1230,9 @@ 
 	 */
 	function setSubject($_strSubject = '')
 	{
-		if ( $_strSubject )
-		$this->_msgSubject = $_strSubject;
+		if ( $_strSubject ) {
+				$this->_msgSubject = $_strSubject;
+		}
 	}
 
 	/**
@@ -1230,8 +1257,9 @@ 
 		$_header = 'From: '       . $this->getFrom('org') . "\r\n"
 		. 'To: '         . $this->getTO()          . "\r\n";
 
-		if ( $this->getCC() )
-		$_header .= 'Cc: ' . $this->getCC()  . "\r\n";
+		if ( $this->getCC() ) {
+				$_header .= 'Cc: ' . $this->getCC()  . "\r\n";
+		}
 
 		/* Note:
 		 * BCC email addresses must be listed in the RCPT TO command list,
@@ -1264,32 +1292,38 @@ 
 			$_header .= 'Message-ID: <' . time() . '.SMTPs-dolibarr-'.$trackid.'@' . $host . ">\r\n";
 			$_header .= 'References: <' . time() . '.SMTPs-dolibarr-'.$trackid.'@' . $host . ">\r\n";
 			$_header .= 'X-Dolibarr-TRACKID: ' . $trackid . "\r\n";
-		}
-		else
+		} else
 		{
 			$_header .= 'Message-ID: <' . time() . '.SMTPs@' . $host . ">\r\n";
 		}
-		if ( $this->getMoreInHeader() )
-		    $_header .= $this->getMoreInHeader();     // Value must include the "\r\n";
+		if ( $this->getMoreInHeader() ) {
+				    $_header .= $this->getMoreInHeader();
+		}
+		// Value must include the "\r\n";
 
 		//$_header .=
 		//                 'Read-Receipt-To: '   . $this->getFrom( 'org' ) . "\r\n"
 		//                 'Return-Receipt-To: ' . $this->getFrom( 'org' ) . "\r\n";
 
-		if ( $this->getSensitivity() )
-		$_header .= 'Sensitivity: ' . $this->getSensitivity()  . "\r\n";
+		if ( $this->getSensitivity() ) {
+				$_header .= 'Sensitivity: ' . $this->getSensitivity()  . "\r\n";
+		}
 
-		if ( $this->_msgPriority != 3 )
-		$_header .= $this->getPriority();
+		if ( $this->_msgPriority != 3 ) {
+				$_header .= $this->getPriority();
+		}
 
 
 		// @CHANGE LDR
-		if ( $this->getDeliveryReceipt() )
-		    $_header .= 'Disposition-Notification-To: '.$this->getFrom('addr') . "\r\n";
-		if ( $this->getErrorsTo() )
-		    $_header .= 'Errors-To: '.$this->getErrorsTo('addr') . "\r\n";
-		if ( $this->getReplyTo() )
-		    $_header .= "Reply-To: ".$this->getReplyTo('addr') ."\r\n";
+		if ( $this->getDeliveryReceipt() ) {
+				    $_header .= 'Disposition-Notification-To: '.$this->getFrom('addr') . "\r\n";
+		}
+		if ( $this->getErrorsTo() ) {
+				    $_header .= 'Errors-To: '.$this->getErrorsTo('addr') . "\r\n";
+		}
+		if ( $this->getReplyTo() ) {
+				    $_header .= "Reply-To: ".$this->getReplyTo('addr') ."\r\n";
+		}
 
 		$_header .= 'X-Mailer: Dolibarr version ' . DOL_VERSION .' (using SMTPs Mailer)' . "\r\n";
 		$_header .= 'X-Dolibarr-Option: '.($conf->global->MAIN_MAIL_USE_MULTI_PART?'MAIN_MAIL_USE_MULTI_PART':'No MAIN_MAIL_USE_MULTI_PART') . "\r\n";
@@ -1310,10 +1344,11 @@ 
 	{
 		//if ( $strContent )
 		//{
-		if ( $strType == 'html' )
-		$strMimeType = 'text/html';
-		else
-		$strMimeType = 'text/plain';
+		if ( $strType == 'html' ) {
+				$strMimeType = 'text/html';
+		} else {
+				$strMimeType = 'text/plain';
+		}
 
 		// Make RFC821 Compliant, replace bare linefeeds
 		$strContent = preg_replace("/(?<!\r)\n/si", "\r\n", $strContent);
@@ -1335,8 +1370,9 @@ 
 		$this->_msgContent[$strType]['data']     = $strContent;
 		$this->_msgContent[$strType]['dataText'] = $strContentAltText;
 
-		if ( $this->getMD5flag() )
-		$this->_msgContent[$strType]['md5']      = dol_hash($strContent, 3);
+		if ( $this->getMD5flag() ) {
+				$this->_msgContent[$strType]['md5']      = dol_hash($strContent, 3);
+		}
 		//}
 	}
 
@@ -1359,8 +1395,9 @@ 
 		$keyCount = count($_types);
 
 		// If we have ZERO, we have a problem
-		if( $keyCount === 0 )
-		die ("Sorry, no content");
+		if( $keyCount === 0 ) {
+				die ("Sorry, no content");
+		}
 
 		// If we have ONE, we can use the simple format
 		else if( $keyCount === 1 && empty($conf->global->MAIN_MAIL_USE_MULTI_PART))
@@ -1373,8 +1410,9 @@ 
 			. 'Content-Disposition: inline'  . "\r\n"
 			. 'Content-Description: message' . "\r\n";
 
-			if ( $this->getMD5flag() )
-			$content .= 'Content-MD5: ' . $_msgData['md5'] . "\r\n";
+			if ( $this->getMD5flag() ) {
+						$content .= 'Content-MD5: ' . $_msgData['md5'] . "\r\n";
+			}
 
 			$content .= "\r\n"
 			.  $_msgData['data'] . "\r\n";
@@ -1397,9 +1435,11 @@ 
 
 			$content .= "--" . $this->_getBoundary('mixed') . "\r\n";
 
-			if (key_exists('image', $this->_msgContent))     // If inline image found
+			if (key_exists('image', $this->_msgContent)) {
+				// If inline image found
 			{
 				$content.= 'Content-Type: multipart/alternative; boundary="'.$this->_getBoundary('alternative').'"' . "\r\n";
+			}
 				$content .= "\r\n";
 				$content .= "--" . $this->_getBoundary('alternative') . "\r\n";
 			}
@@ -1422,8 +1462,9 @@ 
 						.  'Content-Transfer-Encoding: base64' . "\r\n"
 						.  'Content-Description: File Attachment' . "\r\n";
 
-						if ( $this->getMD5flag() )
-						$content .= 'Content-MD5: ' . $_data['md5'] . "\r\n";
+						if ( $this->getMD5flag() ) {
+												$content .= 'Content-MD5: ' . $_data['md5'] . "\r\n";
+						}
 
 						$content .= "\r\n" .  $_data['data'] . "\r\n\r\n";
 					}
@@ -1441,8 +1482,9 @@ 
 						.  'Content-Disposition: inline; filename="' . $_data['imageName'] . '"' . "\r\n"
 						.  'Content-ID: <' . $_data['cid'] . '> ' . "\r\n";
 
-						if ( $this->getMD5flag() )
-						$content .= 'Content-MD5: ' . $_data['md5'] . "\r\n";
+						if ( $this->getMD5flag() ) {
+												$content .= 'Content-MD5: ' . $_data['md5'] . "\r\n";
+						}
 
 						$content .= "\r\n"
 						. $_data['data'] . "\r\n";
@@ -1452,8 +1494,7 @@ 
 					$content.= "--" . $this->_getBoundary('related') . "--" . "\r\n";
 					$content.= "\r\n" . "--" . $this->_getBoundary('alternative') . "--" . "\r\n";
 					$content.= "\r\n";
-				}
-				else
+				} else
 				{
 					if (key_exists('image', $this->_msgContent))
 					{
@@ -1465,9 +1506,11 @@ 
 						$content.= "--" . $this->_getBoundary('related') . "\r\n";
 					}
 
-					if (! key_exists('image', $this->_msgContent) && $_content['dataText'] && ! empty($conf->global->MAIN_MAIL_USE_MULTI_PART))  // Add plain text message part before html part
+					if (! key_exists('image', $this->_msgContent) && $_content['dataText'] && ! empty($conf->global->MAIN_MAIL_USE_MULTI_PART)) {
+						// Add plain text message part before html part
 					{
 					    $content.= 'Content-Type: multipart/alternative; boundary="'.$this->_getBoundary('alternative').'"' . "\r\n";
+					}
     					$content .= "\r\n";
 	       				$content .= "--" . $this->_getBoundary('alternative') . "\r\n";
 
@@ -1488,15 +1531,18 @@ 
 					//                             . 'Content-Disposition: inline'  . "\r\n"
 					//                             . 'Content-Description: ' . $type . ' message' . "\r\n";
 
-					if ( $this->getMD5flag() )
-					$content .= 'Content-MD5: ' . $_content['md5'] . "\r\n";
+					if ( $this->getMD5flag() ) {
+										$content .= 'Content-MD5: ' . $_content['md5'] . "\r\n";
+					}
 
 					$content .= "\r\n"	. $_content['data'] . "\r\n";
 
-					if (! key_exists('image', $this->_msgContent) && $_content['dataText'] && ! empty($conf->global->MAIN_MAIL_USE_MULTI_PART))  // Add plain text message part after html part
+					if (! key_exists('image', $this->_msgContent) && $_content['dataText'] && ! empty($conf->global->MAIN_MAIL_USE_MULTI_PART)) {
+						// Add plain text message part after html part
 					{
 					    $content.= "--" . $this->_getBoundary('alternative') . "--". "\r\n";
 					}
+					}
 
 					$content .= "\r\n";
 				}
@@ -1529,8 +1575,9 @@ 
 			$this->_msgContent['attachment'][$strFileName]['fileName'] = $strFileName;
 			$this->_msgContent['attachment'][$strFileName]['data']     = $strContent;
 
-			if ( $this->getMD5flag() )
-			$this->_msgContent['attachment'][$strFileName]['md5']      = dol_hash($strContent, 3);
+			if ( $this->getMD5flag() ) {
+						$this->_msgContent['attachment'][$strFileName]['md5']      = dol_hash($strContent, 3);
+			}
 		}
 	}
 
@@ -1556,8 +1603,9 @@ 
 			$this->_msgContent['image'][$strImageName]['cid']      = $strImageCid;
 			$this->_msgContent['image'][$strImageName]['data']     = $strContent;
 
-			if ( $this->getMD5flag() )
-			$this->_msgContent['image'][$strImageName]['md5']      = dol_hash($strContent, 3);
+			if ( $this->getMD5flag() ) {
+						$this->_msgContent['image'][$strImageName]['md5']      = dol_hash($strContent, 3);
+			}
 		}
 	}
 	// END @CHANGE LDR
@@ -1577,8 +1625,9 @@ 
 	function setSensitivity($_value = 0)
 	{
 		if ( ( is_numeric($_value) ) &&
-		( ( $_value >= 0 ) && ( $_value <= 3 ) ) )
-		$this->_msgSensitivity = $_value;
+		( ( $_value >= 0 ) && ( $_value <= 3 ) ) ) {
+				$this->_msgSensitivity = $_value;
+		}
 	}
 
 	/**
@@ -1612,8 +1661,9 @@ 
 	function setPriority ( $_value = 3 )
 	{
 		if ( ( is_numeric($_value) ) &&
-		( ( $_value >= 0 ) && ( $_value <= 5 ) ) )
-		$this->_msgPriority = $_value;
+		( ( $_value >= 0 ) && ( $_value <= 5 ) ) ) {
+				$this->_msgPriority = $_value;
+		}
 	}
 
 	/**
@@ -1666,8 +1716,9 @@ 
 	 */
 	function setXheader($strXdata)
 	{
-		if ( $strXdata )
-		$this->_msgXheader[] = $strXdata;
+		if ( $strXdata ) {
+				$this->_msgXheader[] = $strXdata;
+		}
 	}
 
 	/**
@@ -1700,9 +1751,13 @@ 
 	 */
 	function _getBoundary($type='mixed')
 	{
-		if ($type == 'mixed') return $this->_smtpsBoundary;
-		else if ($type == 'related') return $this->_smtpsRelatedBoundary;
-		else if ($type == 'alternative') return $this->_smtpsAlternativeBoundary;
+		if ($type == 'mixed') {
+			return $this->_smtpsBoundary;
+		} else if ($type == 'related') {
+			return $this->_smtpsRelatedBoundary;
+		} else if ($type == 'alternative') {
+			return $this->_smtpsAlternativeBoundary;
+		}
 	}
 
 	/**
@@ -1754,12 +1809,18 @@ 
 	 */
 	function socket_send_str( $_strSend, $_returnCode = null, $CRLF = "\r\n" )
 	{
-		if ($this->_debug) $this->log.=$_strSend;	// @CHANGE LDR for log
+		if ($this->_debug) {
+			$this->log.=$_strSend;
+		}
+		// @CHANGE LDR for log
 		fputs($this->socket, $_strSend . $CRLF);
-		if ($this->_debug) $this->log.=' ('.$_returnCode.')' . $CRLF;
+		if ($this->_debug) {
+			$this->log.=' ('.$_returnCode.')' . $CRLF;
+		}
 
-		if ( $_returnCode )
-		return $this->server_parse($this->socket, $_returnCode);
+		if ( $_returnCode ) {
+				return $this->server_parse($this->socket, $_returnCode);
+		}
 	}
 
 	// =============================================================

htdocs/livraison/class/livraison.class.php

Doc Comments +1 added lines, -1 removed lines

@@ -536,7 +536,7 @@
 	 * Update a livraison line (only extrafields)
 	 *
 	 * @param 	int		$id					Id of line (livraison line)
-	 * @param	array		$array_options		extrafields array
+	 * @param	integer		$array_options		extrafields array
 	 * @return	int							<0 if KO, >0 if OK
 	 */
 	function update_line($id, $array_options=0)

Indentation +76 added lines, -76 removed lines

@@ -86,7 +86,7 @@ 
 
 		$error = 0;
 
-        $now=dol_now();
+		$now=dol_now();
 
 		/* On positionne en mode brouillon le bon de livraison */
 		$this->brouillon = 1;
@@ -120,8 +120,8 @@ 
 		$sql.= ", ".(!empty($this->note_private)?"'".$this->db->escape($this->note_private)."'":"null");
 		$sql.= ", ".(!empty($this->note_public)?"'".$this->db->escape($this->note_public)."'":"null");
 		$sql.= ", ".(!empty($this->model_pdf)?"'".$this->db->escape($this->model_pdf)."'":"null");
-        $sql.= ", ".(int) $this->fk_incoterms;
-        $sql.= ", '".$this->db->escape($this->location_incoterms)."'";
+		$sql.= ", ".(int) $this->fk_incoterms;
+		$sql.= ", '".$this->db->escape($this->location_incoterms)."'";
 		$sql.= ")";
 
 		dol_syslog("Livraison::create", LOG_DEBUG);
@@ -260,8 +260,8 @@ 
 		$sql.=" l.total_ht, l.fk_statut, l.fk_user_valid, l.note_private, l.note_public";
 		$sql.= ", l.date_delivery, l.fk_address, l.model_pdf";
 		$sql.= ", el.fk_source as origin_id, el.sourcetype as origin";
-        $sql.= ', l.fk_incoterms, l.location_incoterms';
-        $sql.= ", i.libelle as libelle_incoterms";
+		$sql.= ', l.fk_incoterms, l.location_incoterms';
+		$sql.= ", i.libelle as libelle_incoterms";
 		$sql.= " FROM ".MAIN_DB_PREFIX."livraison as l";
 		$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."element_element as el ON el.fk_target = l.rowid AND el.targettype = '".$this->db->escape($this->element)."'";
 		$sql.= ' LEFT JOIN '.MAIN_DB_PREFIX.'c_incoterms as i ON l.fk_incoterms = i.rowid';
@@ -337,13 +337,13 @@ 
 	/**
 	 *        Validate object and update stock if option enabled
 	 *
-     *        @param 	User	$user        Object user that validate
-     *        @return   int
+	 *        @param 	User	$user        Object user that validate
+	 *        @return   int
 	 */
 	function valid($user)
 	{
 		global $conf, $langs;
-        require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
+		require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
 
 		dol_syslog(get_class($this)."::valid begin");
 
@@ -351,8 +351,8 @@ 
 
 		$error = 0;
 
-        if ((empty($conf->global->MAIN_USE_ADVANCED_PERMS) && ! empty($user->rights->expedition->livraison->creer))
-       	|| (! empty($conf->global->MAIN_USE_ADVANCED_PERMS) && ! empty($user->rights->expedition->livraison_advance->validate)))
+		if ((empty($conf->global->MAIN_USE_ADVANCED_PERMS) && ! empty($user->rights->expedition->livraison->creer))
+	   	|| (! empty($conf->global->MAIN_USE_ADVANCED_PERMS) && ! empty($user->rights->expedition->livraison_advance->validate)))
 		{
 			if (! empty($conf->global->LIVRAISON_ADDON_NUMBER))
 			{
@@ -371,14 +371,14 @@ 
 					$soc->fetch($this->socid);
 
 					if (preg_match('/^[\(]?PROV/i', $this->ref) || empty($this->ref)) // empty should not happened, but when it occurs, the test save life
-		            {
-		                $numref = $objMod->livraison_get_num($soc,$this);
-		            }
-		            else
 					{
-		                $numref = $this->ref;
-		            }
-            		$this->newref = $numref;
+						$numref = $objMod->livraison_get_num($soc,$this);
+					}
+					else
+					{
+						$numref = $this->ref;
+					}
+					$this->newref = $numref;
 
 					// Tester si non deja au statut valide. Si oui, on arrete afin d'eviter
 					// de decrementer 2 fois le stock.
@@ -407,24 +407,24 @@ 
 					$sql.= " AND fk_statut = 0";
 
 					$resql=$this->db->query($sql);
-			        if (! $resql)
-			        {
-			            dol_print_error($this->db);
-			            $this->error=$this->db->lasterror();
-			            $error++;
-			        }
-
-			        if (! $error && ! $notrigger)
-			        {
-			            // Call trigger
-			            $result=$this->call_trigger('DELIVERY_VALIDATE',$user);
-			            if ($result < 0) $error++;
-			            // End call triggers
-			        }
+					if (! $resql)
+					{
+						dol_print_error($this->db);
+						$this->error=$this->db->lasterror();
+						$error++;
+					}
+
+					if (! $error && ! $notrigger)
+					{
+						// Call trigger
+						$result=$this->call_trigger('DELIVERY_VALIDATE',$user);
+						if ($result < 0) $error++;
+						// End call triggers
+					}
 
 					if (! $error)
 					{
-			            $this->oldref = $this->ref;
+						$this->oldref = $this->ref;
 
 						// Rename directory if dir was a temporary ref
 						if (preg_match('/^[\(]?PROV/i', $this->ref))
@@ -441,17 +441,17 @@ 
 
 								if (@rename($dirsource, $dirdest))
 								{
-			                        dol_syslog("Rename ok");
-			                        // Rename docs starting with $oldref with $newref
-			                        $listoffiles=dol_dir_list($conf->expedition->dir_output.'/receipt/'.$newref, 'files', 1, '^'.preg_quote($oldref,'/'));
-			                        foreach($listoffiles as $fileentry)
-			                        {
-			                        	$dirsource=$fileentry['name'];
-			                        	$dirdest=preg_replace('/^'.preg_quote($oldref,'/').'/',$newref, $dirsource);
-			                        	$dirsource=$fileentry['path'].'/'.$dirsource;
-			                        	$dirdest=$fileentry['path'].'/'.$dirdest;
-			                        	@rename($dirsource, $dirdest);
-			                        }
+									dol_syslog("Rename ok");
+									// Rename docs starting with $oldref with $newref
+									$listoffiles=dol_dir_list($conf->expedition->dir_output.'/receipt/'.$newref, 'files', 1, '^'.preg_quote($oldref,'/'));
+									foreach($listoffiles as $fileentry)
+									{
+										$dirsource=$fileentry['name'];
+										$dirdest=preg_replace('/^'.preg_quote($oldref,'/').'/',$newref, $dirsource);
+										$dirsource=$fileentry['path'].'/'.$dirsource;
+										$dirdest=$fileentry['path'].'/'.$dirdest;
+										@rename($dirsource, $dirdest);
+									}
 								}
 							}
 						}
@@ -466,16 +466,16 @@ 
 						dol_syslog(get_class($this)."::valid ok");
 					}
 
-			        if (! $error)
-			        {
-			            $this->db->commit();
-			            return 1;
-			        }
-			        else
+					if (! $error)
+					{
+						$this->db->commit();
+						return 1;
+					}
+					else
 					{
-			            $this->db->rollback();
-			            return -1;
-			        }
+						$this->db->rollback();
+						return -1;
+					}
 				}
 			}
 		}
@@ -616,7 +616,7 @@ 
 	{
 		global $conf, $langs, $user;
 
-        require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
+		require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
 		$this->db->begin();
 
 		$error=0;
@@ -660,14 +660,14 @@ 
 						}
 					}
 
-                    // Call trigger
-                    $result=$this->call_trigger('DELIVERY_DELETE',$user);
-                    if ($result < 0)
-                    {
-                        $this->db->rollback();
-                        return -4;
-                    }
-                    // End call triggers
+					// Call trigger
+					$result=$this->call_trigger('DELIVERY_DELETE',$user);
+					if ($result < 0)
+					{
+						$this->db->rollback();
+						return -4;
+					}
+					// End call triggers
 
 					return 1;
 				}
@@ -697,7 +697,7 @@ 
 	 *	Return clicable name (with picto eventually)
 	 *
 	 *	@param	int		$withpicto					0=No picto, 1=Include picto into link, 2=Only picto
-     *  @param  int     $save_lastsearch_value		-1=Auto, 0=No save of lastsearch_values when clicking, 1=Save lastsearch_values whenclicking
+	 *  @param  int     $save_lastsearch_value		-1=Auto, 0=No save of lastsearch_values when clicking, 1=Save lastsearch_values whenclicking
 	 *	@return	string								Chaine avec URL
 	 */
 	function getNomUrl($withpicto=0, $save_lastsearch_value=-1)
@@ -711,16 +711,16 @@ 
 
 		$url=DOL_URL_ROOT.'/livraison/card.php?id='.$this->id;
 
-        //if ($option !== 'nolink')
-        //{
-        	// Add param to save lastsearch_values or not
-        	$add_save_lastsearch_values=($save_lastsearch_value == 1 ? 1 : 0);
-        	if ($save_lastsearch_value == -1 && preg_match('/list\.php/',$_SERVER["PHP_SELF"])) $add_save_lastsearch_values=1;
-        	if ($add_save_lastsearch_values) $url.='&save_lastsearch_values=1';
-        //}
+		//if ($option !== 'nolink')
+		//{
+			// Add param to save lastsearch_values or not
+			$add_save_lastsearch_values=($save_lastsearch_value == 1 ? 1 : 0);
+			if ($save_lastsearch_value == -1 && preg_match('/list\.php/',$_SERVER["PHP_SELF"])) $add_save_lastsearch_values=1;
+			if ($add_save_lastsearch_values) $url.='&save_lastsearch_values=1';
+		//}
 
 
-        $linkstart = '<a href="'.$url.'" title="'.dol_escape_htmltag($label, 1).'" class="classfortooltip">';
+		$linkstart = '<a href="'.$url.'" title="'.dol_escape_htmltag($label, 1).'" class="classfortooltip">';
 		$linkend='</a>';
 
 		if ($withpicto) $result.=($linkstart.img_object($label, $picto, 'class="classfortooltip"').$linkend);
@@ -837,11 +837,11 @@ 
 
 
 	/**
-     *  Initialise an instance with random values.
-     *  Used to build previews or test instances.
-     *	id must be 0 if object instance is a specimen.
-     *
-     *  @return	void
+	 *  Initialise an instance with random values.
+	 *  Used to build previews or test instances.
+	 *	id must be 0 if object instance is a specimen.
+	 *
+	 *  @return	void
 	 */
 	function initAsSpecimen()
 	{
@@ -849,7 +849,7 @@ 
 
 		$now=dol_now();
 
-        // Load array of products prodids
+		// Load array of products prodids
 		$num_prods = 0;
 		$prodids = array();
 		$sql = "SELECT rowid";

Spacing +226 added lines, -226 removed lines

@@ -30,8 +30,8 @@ 
 require_once DOL_DOCUMENT_ROOT.'/core/class/commonobject.class.php';
 require_once DOL_DOCUMENT_ROOT.'/expedition/class/expedition.class.php';
 require_once DOL_DOCUMENT_ROOT.'/product/stock/class/mouvementstock.class.php';
-if (! empty($conf->propal->enabled))   require_once DOL_DOCUMENT_ROOT.'/comm/propal/class/propal.class.php';
-if (! empty($conf->commande->enabled)) require_once DOL_DOCUMENT_ROOT.'/commande/class/commande.class.php';
+if (!empty($conf->propal->enabled))   require_once DOL_DOCUMENT_ROOT.'/comm/propal/class/propal.class.php';
+if (!empty($conf->commande->enabled)) require_once DOL_DOCUMENT_ROOT.'/commande/class/commande.class.php';
 
 
 /**
@@ -39,16 +39,16 @@ 
  */
 class Livraison extends CommonObject
 {
-	public $element="delivery";
-	public $fk_element="fk_livraison";
-	public $table_element="livraison";
-	public $table_element_line="livraisondet";
+	public $element = "delivery";
+	public $fk_element = "fk_livraison";
+	public $table_element = "livraison";
+	public $table_element_line = "livraisondet";
 
 	var $brouillon;
 	var $socid;
 	var $ref_customer;
 
-	var $date_delivery;    // Date really received
+	var $date_delivery; // Date really received
 	var $date_creation;
 	var $date_valid;
 	var $model_pdf;
@@ -82,11 +82,11 @@ 
 
 		dol_syslog("Livraison::create");
 
-		if (empty($this->model_pdf)) $this->model_pdf=$conf->global->LIVRAISON_ADDON_PDF;
+		if (empty($this->model_pdf)) $this->model_pdf = $conf->global->LIVRAISON_ADDON_PDF;
 
 		$error = 0;
 
-        $now=dol_now();
+        $now = dol_now();
 
 		/* On positionne en mode brouillon le bon de livraison */
 		$this->brouillon = 1;
@@ -96,36 +96,36 @@ 
 		$this->db->begin();
 
 		$sql = "INSERT INTO ".MAIN_DB_PREFIX."livraison (";
-		$sql.= "ref";
-		$sql.= ", entity";
-		$sql.= ", fk_soc";
-		$sql.= ", ref_customer";
-		$sql.= ", date_creation";
-		$sql.= ", fk_user_author";
-		$sql.= ", date_delivery";
-		$sql.= ", fk_address";
-		$sql.= ", note_private";
-		$sql.= ", note_public";
-		$sql.= ", model_pdf";
-		$sql.= ", fk_incoterms, location_incoterms";
-		$sql.= ") VALUES (";
-		$sql.= "'(PROV)'";
-		$sql.= ", ".$conf->entity;
-		$sql.= ", ".$this->socid;
-		$sql.= ", '".$this->db->escape($this->ref_customer)."'";
-		$sql.= ", '".$this->db->idate($now)."'";
-		$sql.= ", ".$user->id;
-		$sql.= ", ".($this->date_delivery?"'".$this->db->idate($this->date_delivery)."'":"null");
-		$sql.= ", ".($this->fk_delivery_address > 0 ? $this->fk_delivery_address : "null");
-		$sql.= ", ".(!empty($this->note_private)?"'".$this->db->escape($this->note_private)."'":"null");
-		$sql.= ", ".(!empty($this->note_public)?"'".$this->db->escape($this->note_public)."'":"null");
-		$sql.= ", ".(!empty($this->model_pdf)?"'".$this->db->escape($this->model_pdf)."'":"null");
-        $sql.= ", ".(int) $this->fk_incoterms;
-        $sql.= ", '".$this->db->escape($this->location_incoterms)."'";
-		$sql.= ")";
+		$sql .= "ref";
+		$sql .= ", entity";
+		$sql .= ", fk_soc";
+		$sql .= ", ref_customer";
+		$sql .= ", date_creation";
+		$sql .= ", fk_user_author";
+		$sql .= ", date_delivery";
+		$sql .= ", fk_address";
+		$sql .= ", note_private";
+		$sql .= ", note_public";
+		$sql .= ", model_pdf";
+		$sql .= ", fk_incoterms, location_incoterms";
+		$sql .= ") VALUES (";
+		$sql .= "'(PROV)'";
+		$sql .= ", ".$conf->entity;
+		$sql .= ", ".$this->socid;
+		$sql .= ", '".$this->db->escape($this->ref_customer)."'";
+		$sql .= ", '".$this->db->idate($now)."'";
+		$sql .= ", ".$user->id;
+		$sql .= ", ".($this->date_delivery ? "'".$this->db->idate($this->date_delivery)."'" : "null");
+		$sql .= ", ".($this->fk_delivery_address > 0 ? $this->fk_delivery_address : "null");
+		$sql .= ", ".(!empty($this->note_private) ? "'".$this->db->escape($this->note_private)."'" : "null");
+		$sql .= ", ".(!empty($this->note_public) ? "'".$this->db->escape($this->note_public)."'" : "null");
+		$sql .= ", ".(!empty($this->model_pdf) ? "'".$this->db->escape($this->model_pdf)."'" : "null");
+        $sql .= ", ".(int) $this->fk_incoterms;
+        $sql .= ", '".$this->db->escape($this->location_incoterms)."'";
+		$sql .= ")";
 
 		dol_syslog("Livraison::create", LOG_DEBUG);
-		$resql=$this->db->query($sql);
+		$resql = $this->db->query($sql);
 		if ($resql)
 		{
 			$this->id = $this->db->last_insert_id(MAIN_DB_PREFIX."livraison");
@@ -133,14 +133,14 @@ 
 			$numref = "(PROV".$this->id.")";
 
 			$sql = "UPDATE ".MAIN_DB_PREFIX."livraison ";
-			$sql.= "SET ref = '".$this->db->escape($numref)."'";
-			$sql.= " WHERE rowid = ".$this->id;
+			$sql .= "SET ref = '".$this->db->escape($numref)."'";
+			$sql .= " WHERE rowid = ".$this->id;
 
 			dol_syslog("Livraison::create", LOG_DEBUG);
-			$resql=$this->db->query($sql);
+			$resql = $this->db->query($sql);
 			if ($resql)
 			{
-				if (! $conf->expedition_bon->enabled)
+				if (!$conf->expedition_bon->enabled)
 				{
 					$commande = new Commande($this->db);
 					$commande->id = $this->commande_id;
@@ -151,19 +151,19 @@ 
 				/*
 				 *  Insertion des produits dans la base
 				 */
-				$num=count($this->lines);
+				$num = count($this->lines);
 				for ($i = 0; $i < $num; $i++)
 				{
-					$origin_id=$this->lines[$i]->origin_line_id;
-					if (! $origin_id) $origin_id=$this->lines[$i]->commande_ligne_id;	// For backward compatibility
+					$origin_id = $this->lines[$i]->origin_line_id;
+					if (!$origin_id) $origin_id = $this->lines[$i]->commande_ligne_id; // For backward compatibility
 
-					if (! $this->create_line($origin_id, $this->lines[$i]->qty, $this->lines[$i]->fk_product, $this->lines[$i]->description))
+					if (!$this->create_line($origin_id, $this->lines[$i]->qty, $this->lines[$i]->fk_product, $this->lines[$i]->description))
 					{
 						$error++;
 					}
 				}
 
-				if (! $error && $this->id && $this->origin_id)
+				if (!$error && $this->id && $this->origin_id)
 				{
 					$ret = $this->add_object_linked();
 					if (!$ret)
@@ -171,18 +171,18 @@ 
 						$error++;
 					}
 
-					if (! $conf->expedition_bon->enabled)
+					if (!$conf->expedition_bon->enabled)
 					{
 						// TODO uniformiser les statuts
-						$ret = $this->setStatut(2,$this->origin_id,$this->origin);
-						if (! $ret)
+						$ret = $this->setStatut(2, $this->origin_id, $this->origin);
+						if (!$ret)
 						{
 							$error++;
 						}
 					}
 				}
 
-				if (! $error)
+				if (!$error)
 				{
 					$this->db->commit();
 					return $this->id;
@@ -190,7 +190,7 @@ 
 				else
 				{
 					$error++;
-					$this->error=$this->db->lasterror()." - sql=".$this->db->lastqueryerror;
+					$this->error = $this->db->lasterror()." - sql=".$this->db->lastqueryerror;
 					$this->db->rollback();
 					return -3;
 				}
@@ -198,7 +198,7 @@ 
 			else
 			{
 				$error++;
-				$this->error=$this->db->lasterror()." - sql=".$this->db->lastqueryerror;
+				$this->error = $this->db->lasterror()." - sql=".$this->db->lastqueryerror;
 				$this->db->rollback();
 				return -2;
 			}
@@ -206,7 +206,7 @@ 
 		else
 		{
 			$error++;
-			$this->error=$this->db->lasterror()." - sql=".$this->db->lastqueryerror;
+			$this->error = $this->db->lasterror()." - sql=".$this->db->lastqueryerror;
 			$this->db->rollback();
 			return -1;
 		}
@@ -228,19 +228,19 @@ 
 		$j = 0;
 
 		$sql = "INSERT INTO ".MAIN_DB_PREFIX."livraisondet (fk_livraison, fk_origin_line,";
-		$sql.= " fk_product, description, qty)";
-		$sql.= " VALUES (".$this->id.",".$origin_id.",";
-		$sql.= " ".($idprod>0?$idprod:"null").",";
-		$sql.= " ".($description?"'".$this->db->escape($description)."'":"null").",";
-		$sql.= $qty.")";
+		$sql .= " fk_product, description, qty)";
+		$sql .= " VALUES (".$this->id.",".$origin_id.",";
+		$sql .= " ".($idprod > 0 ? $idprod : "null").",";
+		$sql .= " ".($description ? "'".$this->db->escape($description)."'" : "null").",";
+		$sql .= $qty.")";
 
 		dol_syslog(get_class($this)."::create_line", LOG_DEBUG);
-		if (! $this->db->query($sql) )
+		if (!$this->db->query($sql))
 		{
 			$error++;
 		}
 
-		if ($error == 0 )
+		if ($error == 0)
 		{
 			return 1;
 		}
@@ -257,15 +257,15 @@ 
 		global $conf;
 
 		$sql = "SELECT l.rowid, l.fk_soc, l.date_creation, l.date_valid, l.ref, l.ref_customer, l.fk_user_author,";
-		$sql.=" l.total_ht, l.fk_statut, l.fk_user_valid, l.note_private, l.note_public";
-		$sql.= ", l.date_delivery, l.fk_address, l.model_pdf";
-		$sql.= ", el.fk_source as origin_id, el.sourcetype as origin";
-        $sql.= ', l.fk_incoterms, l.location_incoterms';
-        $sql.= ", i.libelle as libelle_incoterms";
-		$sql.= " FROM ".MAIN_DB_PREFIX."livraison as l";
-		$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."element_element as el ON el.fk_target = l.rowid AND el.targettype = '".$this->db->escape($this->element)."'";
-		$sql.= ' LEFT JOIN '.MAIN_DB_PREFIX.'c_incoterms as i ON l.fk_incoterms = i.rowid';
-		$sql.= " WHERE l.rowid = ".$id;
+		$sql .= " l.total_ht, l.fk_statut, l.fk_user_valid, l.note_private, l.note_public";
+		$sql .= ", l.date_delivery, l.fk_address, l.model_pdf";
+		$sql .= ", el.fk_source as origin_id, el.sourcetype as origin";
+        $sql .= ', l.fk_incoterms, l.location_incoterms';
+        $sql .= ", i.libelle as libelle_incoterms";
+		$sql .= " FROM ".MAIN_DB_PREFIX."livraison as l";
+		$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."element_element as el ON el.fk_target = l.rowid AND el.targettype = '".$this->db->escape($this->element)."'";
+		$sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'c_incoterms as i ON l.fk_incoterms = i.rowid';
+		$sql .= " WHERE l.rowid = ".$id;
 
 		dol_syslog(get_class($this)."::fetch", LOG_DEBUG);
 		$result = $this->db->query($sql);
@@ -290,8 +290,8 @@ 
 				$this->note_private         = $obj->note_private;
 				$this->note_public          = $obj->note_public;
 				$this->modelpdf             = $obj->model_pdf;
-				$this->origin               = $obj->origin;		// May be 'shipping'
-				$this->origin_id            = $obj->origin_id;	// May be id of shipping
+				$this->origin               = $obj->origin; // May be 'shipping'
+				$this->origin_id            = $obj->origin_id; // May be id of shipping
 
 				//Incoterms
 				$this->fk_incoterms = $obj->fk_incoterms;
@@ -305,14 +305,14 @@ 
 				// Retrieve all extrafields for delivery
 				// fetch optionals attributes and labels
 				require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php';
-				$extrafields=new ExtraFields($this->db);
-				$extralabels=$extrafields->fetch_name_optionals_label($this->table_element,true);
-				$this->fetch_optionals($this->id,$extralabels);
+				$extrafields = new ExtraFields($this->db);
+				$extralabels = $extrafields->fetch_name_optionals_label($this->table_element, true);
+				$this->fetch_optionals($this->id, $extralabels);
 
 				/*
 				 * Lignes
 				 */
-				$result=$this->fetch_lines();
+				$result = $this->fetch_lines();
 				if ($result < 0)
 				{
 					return -3;
@@ -322,14 +322,14 @@ 
 			}
 			else
 			{
-				$this->error='Delivery with id '.$id.' not found sql='.$sql;
+				$this->error = 'Delivery with id '.$id.' not found sql='.$sql;
 				dol_syslog(get_class($this).'::fetch Error '.$this->error, LOG_ERR);
 				return -2;
 			}
 		}
 		else
 		{
-			$this->error=$this->db->error();
+			$this->error = $this->db->error();
 			return -1;
 		}
 	}
@@ -351,19 +351,19 @@ 
 
 		$error = 0;
 
-        if ((empty($conf->global->MAIN_USE_ADVANCED_PERMS) && ! empty($user->rights->expedition->livraison->creer))
-       	|| (! empty($conf->global->MAIN_USE_ADVANCED_PERMS) && ! empty($user->rights->expedition->livraison_advance->validate)))
+        if ((empty($conf->global->MAIN_USE_ADVANCED_PERMS) && !empty($user->rights->expedition->livraison->creer))
+       	|| (!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && !empty($user->rights->expedition->livraison_advance->validate)))
 		{
-			if (! empty($conf->global->LIVRAISON_ADDON_NUMBER))
+			if (!empty($conf->global->LIVRAISON_ADDON_NUMBER))
 			{
 				// Definition du nom de module de numerotation de commande
 				$modName = $conf->global->LIVRAISON_ADDON_NUMBER;
 
-				if (is_readable(DOL_DOCUMENT_ROOT .'/core/modules/livraison/'.$modName.'.php'))
+				if (is_readable(DOL_DOCUMENT_ROOT.'/core/modules/livraison/'.$modName.'.php'))
 				{
-					require_once DOL_DOCUMENT_ROOT .'/core/modules/livraison/'.$modName.'.php';
+					require_once DOL_DOCUMENT_ROOT.'/core/modules/livraison/'.$modName.'.php';
 
-					$now=dol_now();
+					$now = dol_now();
 
 					// Recuperation de la nouvelle reference
 					$objMod = new $modName($this->db);
@@ -372,7 +372,7 @@ 
 
 					if (preg_match('/^[\(]?PROV/i', $this->ref) || empty($this->ref)) // empty should not happened, but when it occurs, the test save life
 		            {
-		                $numref = $objMod->livraison_get_num($soc,$this);
+		                $numref = $objMod->livraison_get_num($soc, $this);
 		            }
 		            else
 					{
@@ -383,12 +383,12 @@ 
 					// Tester si non deja au statut valide. Si oui, on arrete afin d'eviter
 					// de decrementer 2 fois le stock.
 					$sql = "SELECT ref";
-					$sql.= " FROM ".MAIN_DB_PREFIX."livraison";
-					$sql.= " WHERE ref = '".$this->db->escape($numref)."'";
-					$sql.= " AND fk_statut <> 0";
-					$sql.= " AND entity = ".$conf->entity;
+					$sql .= " FROM ".MAIN_DB_PREFIX."livraison";
+					$sql .= " WHERE ref = '".$this->db->escape($numref)."'";
+					$sql .= " AND fk_statut <> 0";
+					$sql .= " AND entity = ".$conf->entity;
 
-					$resql=$this->db->query($sql);
+					$resql = $this->db->query($sql);
 					if ($resql)
 					{
 						$num = $this->db->num_rows($resql);
@@ -399,30 +399,30 @@ 
 					}
 
 					$sql = "UPDATE ".MAIN_DB_PREFIX."livraison SET";
-					$sql.= " ref='".$this->db->escape($numref)."'";
-					$sql.= ", fk_statut = 1";
-					$sql.= ", date_valid = '".$this->db->idate($now)."'";
-					$sql.= ", fk_user_valid = ".$user->id;
-					$sql.= " WHERE rowid = ".$this->id;
-					$sql.= " AND fk_statut = 0";
-
-					$resql=$this->db->query($sql);
-			        if (! $resql)
+					$sql .= " ref='".$this->db->escape($numref)."'";
+					$sql .= ", fk_statut = 1";
+					$sql .= ", date_valid = '".$this->db->idate($now)."'";
+					$sql .= ", fk_user_valid = ".$user->id;
+					$sql .= " WHERE rowid = ".$this->id;
+					$sql .= " AND fk_statut = 0";
+
+					$resql = $this->db->query($sql);
+			        if (!$resql)
 			        {
 			            dol_print_error($this->db);
-			            $this->error=$this->db->lasterror();
+			            $this->error = $this->db->lasterror();
 			            $error++;
 			        }
 
-			        if (! $error && ! $notrigger)
+			        if (!$error && !$notrigger)
 			        {
 			            // Call trigger
-			            $result=$this->call_trigger('DELIVERY_VALIDATE',$user);
+			            $result = $this->call_trigger('DELIVERY_VALIDATE', $user);
 			            if ($result < 0) $error++;
 			            // End call triggers
 			        }
 
-					if (! $error)
+					if (!$error)
 					{
 			            $this->oldref = $this->ref;
 
@@ -443,13 +443,13 @@ 
 								{
 			                        dol_syslog("Rename ok");
 			                        // Rename docs starting with $oldref with $newref
-			                        $listoffiles=dol_dir_list($conf->expedition->dir_output.'/receipt/'.$newref, 'files', 1, '^'.preg_quote($oldref,'/'));
-			                        foreach($listoffiles as $fileentry)
+			                        $listoffiles = dol_dir_list($conf->expedition->dir_output.'/receipt/'.$newref, 'files', 1, '^'.preg_quote($oldref, '/'));
+			                        foreach ($listoffiles as $fileentry)
 			                        {
-			                        	$dirsource=$fileentry['name'];
-			                        	$dirdest=preg_replace('/^'.preg_quote($oldref,'/').'/',$newref, $dirsource);
-			                        	$dirsource=$fileentry['path'].'/'.$dirsource;
-			                        	$dirdest=$fileentry['path'].'/'.$dirdest;
+			                        	$dirsource = $fileentry['name'];
+			                        	$dirdest = preg_replace('/^'.preg_quote($oldref, '/').'/', $newref, $dirsource);
+			                        	$dirsource = $fileentry['path'].'/'.$dirsource;
+			                        	$dirdest = $fileentry['path'].'/'.$dirdest;
 			                        	@rename($dirsource, $dirdest);
 			                        }
 								}
@@ -457,7 +457,7 @@ 
 						}
 
 						// Set new ref and current status
-						if (! $error)
+						if (!$error)
 						{
 							$this->ref = $numref;
 							$this->statut = 1;
@@ -466,7 +466,7 @@ 
 						dol_syslog(get_class($this)."::valid ok");
 					}
 
-			        if (! $error)
+			        if (!$error)
 			        {
 			            $this->db->commit();
 			            return 1;
@@ -481,7 +481,7 @@ 
 		}
 		else
 		{
-			$this->error="Non autorise";
+			$this->error = "Non autorise";
 			dol_syslog(get_class($this)."::valid ".$this->error, LOG_ERR);
 			return -1;
 		}
@@ -497,11 +497,11 @@ 
 	function create_from_sending($user, $sending_id)
 	{
 		$expedition = new Expedition($this->db);
-		$result=$expedition->fetch($sending_id);
+		$result = $expedition->fetch($sending_id);
 
 		$this->lines = array();
 
-		$num=count($expedition->lines);
+		$num = count($expedition->lines);
 		for ($i = 0; $i < $num; $i++)
 		{
 			$line = new LivraisonLigne($this->db);
@@ -523,10 +523,10 @@ 
 		$this->date_delivery        = $expedition->date_delivery;
 		$this->fk_delivery_address  = $expedition->fk_delivery_address;
 		$this->socid                = $expedition->socid;
-		$this->ref_customer			= $expedition->ref_customer;
+		$this->ref_customer = $expedition->ref_customer;
 
 		//Incoterms
-		$this->fk_incoterms		= $expedition->fk_incoterms;
+		$this->fk_incoterms = $expedition->fk_incoterms;
 		$this->location_incoterms = $expedition->location_incoterms;
 
 		return $this->create($user);
@@ -539,26 +539,26 @@ 
 	 * @param	array		$array_options		extrafields array
 	 * @return	int							<0 if KO, >0 if OK
 	 */
-	function update_line($id, $array_options=0)
+	function update_line($id, $array_options = 0)
 	{
 		global $conf;
 		$error = 0;
 
-		if ($id > 0 && !$error && empty($conf->global->MAIN_EXTRAFIELDS_DISABLED) && is_array($array_options) && count($array_options)>0) // For avoid conflicts if trigger used
+		if ($id > 0 && !$error && empty($conf->global->MAIN_EXTRAFIELDS_DISABLED) && is_array($array_options) && count($array_options) > 0) // For avoid conflicts if trigger used
 		{
 			$livraisonline = new LivraisonLigne($this->db);
-			$livraisonline->array_options=$array_options;
-			$livraisonline->id=$id;
-			$result=$livraisonline->insertExtraFields();
+			$livraisonline->array_options = $array_options;
+			$livraisonline->id = $id;
+			$result = $livraisonline->insertExtraFields();
 
 			if ($result < 0)
 			{
-				$this->error[]=$livraisonline->error;
+				$this->error[] = $livraisonline->error;
 				$error++;
 			}
 		}
 
-		if (! $error) return 1;
+		if (!$error) return 1;
 		else return -1;
 	}
 
@@ -592,9 +592,9 @@ 
 		if ($this->statut == 0)
 		{
 			$sql = "DELETE FROM ".MAIN_DB_PREFIX."commandedet";
-			$sql.= " WHERE rowid = ".$lineid;
+			$sql .= " WHERE rowid = ".$lineid;
 
-			if ($this->db->query($sql) )
+			if ($this->db->query($sql))
 			{
 				$this->update_price();
 
@@ -619,30 +619,30 @@ 
         require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
 		$this->db->begin();
 
-		$error=0;
+		$error = 0;
 
 		$sql = "DELETE FROM ".MAIN_DB_PREFIX."livraisondet";
-		$sql.= " WHERE fk_livraison = ".$this->id;
+		$sql .= " WHERE fk_livraison = ".$this->id;
 		if ($this->db->query($sql))
 		{
 			// Delete linked object
 			$res = $this->deleteObjectLinked();
 			if ($res < 0) $error++;
 
-			if (! $error)
+			if (!$error)
 			{
 				$sql = "DELETE FROM ".MAIN_DB_PREFIX."livraison";
-				$sql.= " WHERE rowid = ".$this->id;
+				$sql .= " WHERE rowid = ".$this->id;
 				if ($this->db->query($sql))
 				{
 					$this->db->commit();
 
 					// On efface le repertoire de pdf provisoire
 					$ref = dol_sanitizeFileName($this->ref);
-					if (! empty($conf->expedition->dir_output))
+					if (!empty($conf->expedition->dir_output))
 					{
-						$dir = $conf->expedition->dir_output . '/receipt/' . $ref ;
-						$file = $dir . '/' . $ref . '.pdf';
+						$dir = $conf->expedition->dir_output.'/receipt/'.$ref;
+						$file = $dir.'/'.$ref.'.pdf';
 						if (file_exists($file))
 						{
 							if (!dol_delete_file($file))
@@ -654,14 +654,14 @@ 
 						{
 							if (!dol_delete_dir($dir))
 							{
-								$this->error=$langs->trans("ErrorCanNotDeleteDir",$dir);
+								$this->error = $langs->trans("ErrorCanNotDeleteDir", $dir);
 								return 0;
 							}
 						}
 					}
 
                     // Call trigger
-                    $result=$this->call_trigger('DELIVERY_DELETE',$user);
+                    $result = $this->call_trigger('DELIVERY_DELETE', $user);
                     if ($result < 0)
                     {
                         $this->db->rollback();
@@ -673,21 +673,21 @@ 
 				}
 				else
 				{
-					$this->error=$this->db->lasterror()." - sql=$sql";
+					$this->error = $this->db->lasterror()." - sql=$sql";
 					$this->db->rollback();
 					return -3;
 				}
 			}
 			else
 			{
-				$this->error=$this->db->lasterror()." - sql=$sql";
+				$this->error = $this->db->lasterror()." - sql=$sql";
 				$this->db->rollback();
 				return -2;
 			}
 		}
 		else
 		{
-			$this->error=$this->db->lasterror()." - sql=$sql";
+			$this->error = $this->db->lasterror()." - sql=$sql";
 			$this->db->rollback();
 			return -1;
 		}
@@ -700,32 +700,32 @@ 
      *  @param  int     $save_lastsearch_value		-1=Auto, 0=No save of lastsearch_values when clicking, 1=Save lastsearch_values whenclicking
 	 *	@return	string								Chaine avec URL
 	 */
-	function getNomUrl($withpicto=0, $save_lastsearch_value=-1)
+	function getNomUrl($withpicto = 0, $save_lastsearch_value = -1)
 	{
 		global $langs;
 
-		$result='';
-		$picto='sending';
+		$result = '';
+		$picto = 'sending';
 
-		$label=$langs->trans("ShowReceiving").': '.$this->ref;
+		$label = $langs->trans("ShowReceiving").': '.$this->ref;
 
-		$url=DOL_URL_ROOT.'/livraison/card.php?id='.$this->id;
+		$url = DOL_URL_ROOT.'/livraison/card.php?id='.$this->id;
 
         //if ($option !== 'nolink')
         //{
         	// Add param to save lastsearch_values or not
-        	$add_save_lastsearch_values=($save_lastsearch_value == 1 ? 1 : 0);
-        	if ($save_lastsearch_value == -1 && preg_match('/list\.php/',$_SERVER["PHP_SELF"])) $add_save_lastsearch_values=1;
-        	if ($add_save_lastsearch_values) $url.='&save_lastsearch_values=1';
+        	$add_save_lastsearch_values = ($save_lastsearch_value == 1 ? 1 : 0);
+        	if ($save_lastsearch_value == -1 && preg_match('/list\.php/', $_SERVER["PHP_SELF"])) $add_save_lastsearch_values = 1;
+        	if ($add_save_lastsearch_values) $url .= '&save_lastsearch_values=1';
         //}
 
 
         $linkstart = '<a href="'.$url.'" title="'.dol_escape_htmltag($label, 1).'" class="classfortooltip">';
-		$linkend='</a>';
+		$linkend = '</a>';
 
-		if ($withpicto) $result.=($linkstart.img_object($label, $picto, 'class="classfortooltip"').$linkend);
-		if ($withpicto && $withpicto != 2) $result.=' ';
-		$result.=$linkstart.$this->ref.$linkend;
+		if ($withpicto) $result .= ($linkstart.img_object($label, $picto, 'class="classfortooltip"').$linkend);
+		if ($withpicto && $withpicto != 2) $result .= ' ';
+		$result .= $linkstart.$this->ref.$linkend;
 		return $result;
 	}
 
@@ -739,12 +739,12 @@ 
 		$this->lines = array();
 
 		$sql = "SELECT ld.rowid, ld.fk_product, ld.description, ld.subprice, ld.total_ht, ld.qty as qty_shipped, ld.fk_origin_line, ";
-		$sql.= " cd.qty as qty_asked, cd.label as custom_label,";
-		$sql.= " p.ref as product_ref, p.fk_product_type as fk_product_type, p.label as product_label, p.description as product_desc";
-		$sql.= " FROM ".MAIN_DB_PREFIX."commandedet as cd, ".MAIN_DB_PREFIX."livraisondet as ld";
-		$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."product as p on p.rowid = ld.fk_product";
-		$sql.= " WHERE ld.fk_origin_line = cd.rowid";
-		$sql.= " AND ld.fk_livraison = ".$this->id;
+		$sql .= " cd.qty as qty_asked, cd.label as custom_label,";
+		$sql .= " p.ref as product_ref, p.fk_product_type as fk_product_type, p.label as product_label, p.description as product_desc";
+		$sql .= " FROM ".MAIN_DB_PREFIX."commandedet as cd, ".MAIN_DB_PREFIX."livraisondet as ld";
+		$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."product as p on p.rowid = ld.fk_product";
+		$sql .= " WHERE ld.fk_origin_line = cd.rowid";
+		$sql .= " AND ld.fk_livraison = ".$this->id;
 
 		dol_syslog(get_class($this)."::fetch_lines", LOG_DEBUG);
 		$resql = $this->db->query($sql);
@@ -758,23 +758,23 @@ 
 
 				$obj = $this->db->fetch_object($resql);
 
-				$line->id					= $obj->rowid;
-				$line->label			= $obj->custom_label;
+				$line->id = $obj->rowid;
+				$line->label = $obj->custom_label;
 				$line->description		= $obj->description;
-				$line->fk_product		= $obj->fk_product;
-				$line->qty_asked		= $obj->qty_asked;
+				$line->fk_product = $obj->fk_product;
+				$line->qty_asked = $obj->qty_asked;
 				$line->qty_shipped		= $obj->qty_shipped;
 
-				$line->ref				= $obj->product_ref;		// deprecated
-				$line->libelle			= $obj->product_label;		// deprecated
-				$line->product_label	= $obj->product_label;		// Product label
-				$line->product_ref		= $obj->product_ref;		// Product ref
-				$line->product_desc		= $obj->product_desc;		// Product description
+				$line->ref = $obj->product_ref; // deprecated
+				$line->libelle = $obj->product_label; // deprecated
+				$line->product_label	= $obj->product_label; // Product label
+				$line->product_ref = $obj->product_ref; // Product ref
+				$line->product_desc		= $obj->product_desc; // Product description
 				$line->product_type		= $obj->fk_product_type;
-				$line->fk_origin_line 	= $obj->fk_origin_line;
+				$line->fk_origin_line = $obj->fk_origin_line;
 
-				$line->price			= $obj->price;
-				$line->total_ht			= $obj->total_ht;
+				$line->price = $obj->price;
+				$line->total_ht = $obj->total_ht;
 
 				$this->lines[$i] = $line;
 
@@ -793,9 +793,9 @@ 
 	 *  @param	int			$mode		Mode
 	 *  @return string      			Label
 	 */
-	function getLibStatut($mode=0)
+	function getLibStatut($mode = 0)
 	{
-		return $this->LibStatut($this->statut,$mode);
+		return $this->LibStatut($this->statut, $mode);
 	}
 
 	/**
@@ -805,33 +805,33 @@ 
 	 *  @param  int			$mode       0=libelle long, 1=libelle court, 2=Picto + Libelle court, 3=Picto, 4=Picto + Libelle long, 5=Libelle court + Picto
 	 *  @return string					Label
 	 */
-	function LibStatut($statut,$mode)
+	function LibStatut($statut, $mode)
 	{
 		global $langs;
 
-		if ($mode==0)
+		if ($mode == 0)
 		{
-			if ($statut==-1) return $langs->trans('StatusDeliveryCanceled');
-			if ($statut==0)  return $langs->trans('StatusDeliveryDraft');
-			if ($statut==1)  return $langs->trans('StatusDeliveryValidated');
+			if ($statut == -1) return $langs->trans('StatusDeliveryCanceled');
+			if ($statut == 0)  return $langs->trans('StatusDeliveryDraft');
+			if ($statut == 1)  return $langs->trans('StatusDeliveryValidated');
 		}
-		if ($mode==1)
+		if ($mode == 1)
 		{
-			if ($statut==-1) return $langs->trans($this->statuts[$statut]);
-			if ($statut==0)  return $langs->trans($this->statuts[$statut]);
-			if ($statut==1)  return $langs->trans($this->statuts[$statut]);
+			if ($statut == -1) return $langs->trans($this->statuts[$statut]);
+			if ($statut == 0)  return $langs->trans($this->statuts[$statut]);
+			if ($statut == 1)  return $langs->trans($this->statuts[$statut]);
 		}
 		if ($mode == 4)
 		{
-			if ($statut==-1) return img_picto($langs->trans('StatusDeliveryCanceled'),'statut5').' '.$langs->trans('StatusDeliveryCanceled');
-			if ($statut==0)  return img_picto($langs->trans('StatusDeliveryDraft'),'statut0').' '.$langs->trans('StatusDeliveryDraft');
-			if ($statut==1)  return img_picto($langs->trans('StatusDeliveryValidated'),'statut4').' '.$langs->trans('StatusDeliveryValidated');
+			if ($statut == -1) return img_picto($langs->trans('StatusDeliveryCanceled'), 'statut5').' '.$langs->trans('StatusDeliveryCanceled');
+			if ($statut == 0)  return img_picto($langs->trans('StatusDeliveryDraft'), 'statut0').' '.$langs->trans('StatusDeliveryDraft');
+			if ($statut == 1)  return img_picto($langs->trans('StatusDeliveryValidated'), 'statut4').' '.$langs->trans('StatusDeliveryValidated');
 		}
 		if ($mode == 6)
 		{
-			if ($statut==-1) return $langs->trans('StatusDeliveryCanceled').' '.img_picto($langs->trans('StatusDeliveryCanceled'),'statut5');
-			if ($statut==0)  return $langs->trans('StatusDeliveryDraft').' '.img_picto($langs->trans('StatusDeliveryDraft'),'statut0');
-			if ($statut==1)  return $langs->trans('StatusDeliveryValidated').' '.img_picto($langs->trans('StatusDeliveryValidated'),'statut4');
+			if ($statut == -1) return $langs->trans('StatusDeliveryCanceled').' '.img_picto($langs->trans('StatusDeliveryCanceled'), 'statut5');
+			if ($statut == 0)  return $langs->trans('StatusDeliveryDraft').' '.img_picto($langs->trans('StatusDeliveryDraft'), 'statut0');
+			if ($statut == 1)  return $langs->trans('StatusDeliveryValidated').' '.img_picto($langs->trans('StatusDeliveryValidated'), 'statut4');
 		}
 	}
 
@@ -845,17 +845,17 @@ 
 	 */
 	function initAsSpecimen()
 	{
-		global $user,$langs,$conf;
+		global $user, $langs, $conf;
 
-		$now=dol_now();
+		$now = dol_now();
 
         // Load array of products prodids
 		$num_prods = 0;
 		$prodids = array();
 		$sql = "SELECT rowid";
-		$sql.= " FROM ".MAIN_DB_PREFIX."product";
-		$sql.= " WHERE entity IN (".getEntity('product').")";
-		$sql.= " AND tosell = 1";
+		$sql .= " FROM ".MAIN_DB_PREFIX."product";
+		$sql .= " WHERE entity IN (".getEntity('product').")";
+		$sql .= " AND tosell = 1";
 		$resql = $this->db->query($sql);
 		if ($resql)
 		{
@@ -870,16 +870,16 @@ 
 		}
 
 		// Initialise parametres
-		$this->id=0;
+		$this->id = 0;
 		$this->ref = 'SPECIMEN';
-		$this->specimen=1;
+		$this->specimen = 1;
 		$this->socid = 1;
 		$this->date_delivery = $now;
-		$this->note_public='Public note';
-		$this->note_private='Private note';
+		$this->note_public = 'Public note';
+		$this->note_private = 'Private note';
 
-		$i=0;
-		$line=new LivraisonLigne($this->db);
+		$i = 0;
+		$line = new LivraisonLigne($this->db);
 		$line->fk_product     = $prodids[0];
 		$line->qty_asked      = 10;
 		$line->qty_shipped    = 9;
@@ -903,14 +903,14 @@ 
 		global $langs;
 
 		// Get the linked object
-		$this->fetchObjectLinked('','',$this->id,$this->element);
+		$this->fetchObjectLinked('', '', $this->id, $this->element);
 		//var_dump($this->linkedObjectIds);
 		// Get the product ref and qty in source
 		$sqlSourceLine = "SELECT st.rowid, st.description, st.qty";
-		$sqlSourceLine.= ", p.ref, p.label";
-		$sqlSourceLine.= " FROM ".MAIN_DB_PREFIX.$this->linkedObjectIds[0]['type']."det as st";
-		$sqlSourceLine.= " LEFT JOIN ".MAIN_DB_PREFIX."product as p ON st.fk_product = p.rowid";
-		$sqlSourceLine.= " WHERE fk_".$this->linked_object[0]['type']." = ".$this->linked_object[0]['linkid'];
+		$sqlSourceLine .= ", p.ref, p.label";
+		$sqlSourceLine .= " FROM ".MAIN_DB_PREFIX.$this->linkedObjectIds[0]['type']."det as st";
+		$sqlSourceLine .= " LEFT JOIN ".MAIN_DB_PREFIX."product as p ON st.fk_product = p.rowid";
+		$sqlSourceLine .= " WHERE fk_".$this->linked_object[0]['type']." = ".$this->linked_object[0]['linkid'];
 
 		$resultSourceLine = $this->db->query($sqlSourceLine);
 		if ($resultSourceLine)
@@ -924,15 +924,15 @@ 
 
 				// Recupere les lignes de la source deja livrees
 				$sql = "SELECT ld.fk_origin_line, sum(ld.qty) as qty";
-				$sql.= " FROM ".MAIN_DB_PREFIX."livraisondet as ld, ".MAIN_DB_PREFIX."livraison as l,";
-				$sql.= " ".MAIN_DB_PREFIX.$this->linked_object[0]['type']." as c";
-				$sql.= ", ".MAIN_DB_PREFIX.$this->linked_object[0]['type']."det as cd";
-				$sql.= " WHERE ld.fk_livraison = l.rowid";
-				$sql.= " AND ld.fk_origin_line = cd.rowid";
-				$sql.= " AND cd.fk_".$this->linked_object[0]['type']." = c.rowid";
-				$sql.= " AND cd.fk_".$this->linked_object[0]['type']." = ".$this->linked_object[0]['linkid'];
-				$sql.= " AND ld.fk_origin_line = ".$objSourceLine->rowid;
-				$sql.= " GROUP BY ld.fk_origin_line";
+				$sql .= " FROM ".MAIN_DB_PREFIX."livraisondet as ld, ".MAIN_DB_PREFIX."livraison as l,";
+				$sql .= " ".MAIN_DB_PREFIX.$this->linked_object[0]['type']." as c";
+				$sql .= ", ".MAIN_DB_PREFIX.$this->linked_object[0]['type']."det as cd";
+				$sql .= " WHERE ld.fk_livraison = l.rowid";
+				$sql .= " AND ld.fk_origin_line = cd.rowid";
+				$sql .= " AND cd.fk_".$this->linked_object[0]['type']." = c.rowid";
+				$sql .= " AND cd.fk_".$this->linked_object[0]['type']." = ".$this->linked_object[0]['linkid'];
+				$sql .= " AND ld.fk_origin_line = ".$objSourceLine->rowid;
+				$sql .= " GROUP BY ld.fk_origin_line";
 
 				$result = $this->db->query($sql);
 				$row = $this->db->fetch_row($result);
@@ -949,13 +949,13 @@ 
 					}
 
 					$array[$i]['ref'] = $objSourceLine->ref;
-					$array[$i]['label'] = $objSourceLine->label?$objSourceLine->label:$objSourceLine->description;
+					$array[$i]['label'] = $objSourceLine->label ? $objSourceLine->label : $objSourceLine->description;
 				}
-				elseif($objSourceLine->qty - $row[1] < 0)
+				elseif ($objSourceLine->qty - $row[1] < 0)
 				{
-					$array[$i]['qty'] = $objSourceLine->qty - $row[1]. " Erreur livraison !";
+					$array[$i]['qty'] = $objSourceLine->qty - $row[1]." Erreur livraison !";
 					$array[$i]['ref'] = $objSourceLine->ref;
-					$array[$i]['label'] = $objSourceLine->label?$objSourceLine->label:$objSourceLine->description;
+					$array[$i]['label'] = $objSourceLine->label ? $objSourceLine->label : $objSourceLine->description;
 				}
 
 					$i++;
@@ -964,7 +964,7 @@ 
 		}
 		else
 		{
-			$this->error=$this->db->error()." - sql=$sqlSourceLine";
+			$this->error = $this->db->error()." - sql=$sqlSourceLine";
 			return -1;
 		}
 	}
@@ -981,11 +981,11 @@ 
 		if ($user->rights->expedition->creer)
 		{
 			$sql = "UPDATE ".MAIN_DB_PREFIX."livraison";
-			$sql.= " SET date_delivery = ".($date_livraison ? "'".$this->db->idate($date_livraison)."'" : 'null');
-			$sql.= " WHERE rowid = ".$this->id;
+			$sql .= " SET date_delivery = ".($date_livraison ? "'".$this->db->idate($date_livraison)."'" : 'null');
+			$sql .= " WHERE rowid = ".$this->id;
 
 			dol_syslog(get_class($this)."::set_date_livraison", LOG_DEBUG);
-			$resql=$this->db->query($sql);
+			$resql = $this->db->query($sql);
 			if ($resql)
 			{
 				$this->date_delivery = $date_livraison;
@@ -993,7 +993,7 @@ 
 			}
 			else
 			{
-				$this->error=$this->db->error();
+				$this->error = $this->db->error();
 				return -1;
 			}
 		}
@@ -1013,19 +1013,19 @@ 
 	 *  @param     int			$hideref        Hide ref
 	 *  @return    int             				0 if KO, 1 if OK
 	 */
-	public function generateDocument($modele, $outputlangs='',$hidedetails=0,$hidedesc=0,$hideref=0)
+	public function generateDocument($modele, $outputlangs = '', $hidedetails = 0, $hidedesc = 0, $hideref = 0)
 	{
-		global $conf,$user,$langs;
+		global $conf, $user, $langs;
 
 		$langs->load("deliveries");
 
-		if (! dol_strlen($modele)) {
+		if (!dol_strlen($modele)) {
 
 			$modele = 'typhon';
 
 			if ($this->modelpdf) {
 				$modele = $this->modelpdf;
-			} elseif (! empty($conf->global->LIVRAISON_ADDON_PDF)) {
+			} elseif (!empty($conf->global->LIVRAISON_ADDON_PDF)) {
 				$modele = $conf->global->LIVRAISON_ADDON_PDF;
 			}
 		}
@@ -1070,8 +1070,8 @@ 
 	var $price;
 	var $fk_product;
 	var $origin_id;
-	var $label;       // Label produit
-	var $description;  // Description produit
+	var $label; // Label produit
+	var $description; // Description produit
 	/**
 	 * @deprecated
 	 * @see product_ref
@@ -1086,8 +1086,8 @@ 
 	public $product_ref;
 	public $product_label;
 
-	public $element='livraisondet';
-	public $table_element='livraisondet';
+	public $element = 'livraisondet';
+	public $table_element = 'livraisondet';
 
 	/**
 	 *	Constructor
@@ -1096,7 +1096,7 @@ 
 	 */
 	function __construct($db)
 	{
-		$this->db=$db;
+		$this->db = $db;
 	}
 
 }

Braces +98 added lines, -61 removed lines

@@ -30,8 +30,12 @@ 
 require_once DOL_DOCUMENT_ROOT.'/core/class/commonobject.class.php';
 require_once DOL_DOCUMENT_ROOT.'/expedition/class/expedition.class.php';
 require_once DOL_DOCUMENT_ROOT.'/product/stock/class/mouvementstock.class.php';
-if (! empty($conf->propal->enabled))   require_once DOL_DOCUMENT_ROOT.'/comm/propal/class/propal.class.php';
-if (! empty($conf->commande->enabled)) require_once DOL_DOCUMENT_ROOT.'/commande/class/commande.class.php';
+if (! empty($conf->propal->enabled)) {
+	require_once DOL_DOCUMENT_ROOT.'/comm/propal/class/propal.class.php';
+}
+if (! empty($conf->commande->enabled)) {
+	require_once DOL_DOCUMENT_ROOT.'/commande/class/commande.class.php';
+}
 
 
 /**
@@ -82,7 +86,9 @@ 
 
 		dol_syslog("Livraison::create");
 
-		if (empty($this->model_pdf)) $this->model_pdf=$conf->global->LIVRAISON_ADDON_PDF;
+		if (empty($this->model_pdf)) {
+			$this->model_pdf=$conf->global->LIVRAISON_ADDON_PDF;
+		}
 
 		$error = 0;
 
@@ -155,7 +161,10 @@ 
 				for ($i = 0; $i < $num; $i++)
 				{
 					$origin_id=$this->lines[$i]->origin_line_id;
-					if (! $origin_id) $origin_id=$this->lines[$i]->commande_ligne_id;	// For backward compatibility
+					if (! $origin_id) {
+						$origin_id=$this->lines[$i]->commande_ligne_id;
+					}
+					// For backward compatibility
 
 					if (! $this->create_line($origin_id, $this->lines[$i]->qty, $this->lines[$i]->fk_product, $this->lines[$i]->description))
 					{
@@ -186,24 +195,21 @@ 
 				{
 					$this->db->commit();
 					return $this->id;
-				}
-				else
+				} else
 				{
 					$error++;
 					$this->error=$this->db->lasterror()." - sql=".$this->db->lastqueryerror;
 					$this->db->rollback();
 					return -3;
 				}
-			}
-			else
+			} else
 			{
 				$error++;
 				$this->error=$this->db->lasterror()." - sql=".$this->db->lastqueryerror;
 				$this->db->rollback();
 				return -2;
 			}
-		}
-		else
+		} else
 		{
 			$error++;
 			$this->error=$this->db->lasterror()." - sql=".$this->db->lastqueryerror;
@@ -299,7 +305,9 @@ 
 				$this->libelle_incoterms = $obj->libelle_incoterms;
 				$this->db->free($result);
 
-				if ($this->statut == 0) $this->brouillon = 1;
+				if ($this->statut == 0) {
+					$this->brouillon = 1;
+				}
 
 
 				// Retrieve all extrafields for delivery
@@ -319,15 +327,13 @@ 
 				}
 
 				return 1;
-			}
-			else
+			} else
 			{
 				$this->error='Delivery with id '.$id.' not found sql='.$sql;
 				dol_syslog(get_class($this).'::fetch Error '.$this->error, LOG_ERR);
 				return -2;
 			}
-		}
-		else
+		} else
 		{
 			$this->error=$this->db->error();
 			return -1;
@@ -370,11 +376,12 @@ 
 					$soc = new Societe($this->db);
 					$soc->fetch($this->socid);
 
-					if (preg_match('/^[\(]?PROV/i', $this->ref) || empty($this->ref)) // empty should not happened, but when it occurs, the test save life
+					if (preg_match('/^[\(]?PROV/i', $this->ref) || empty($this->ref)) {
+						// empty should not happened, but when it occurs, the test save life
 		            {
 		                $numref = $objMod->livraison_get_num($soc,$this);
-		            }
-		            else
+					}
+		            } else
 					{
 		                $numref = $this->ref;
 		            }
@@ -418,7 +425,9 @@ 
 			        {
 			            // Call trigger
 			            $result=$this->call_trigger('DELIVERY_VALIDATE',$user);
-			            if ($result < 0) $error++;
+			            if ($result < 0) {
+			            	$error++;
+			            }
 			            // End call triggers
 			        }
 
@@ -470,16 +479,14 @@ 
 			        {
 			            $this->db->commit();
 			            return 1;
-			        }
-			        else
+			        } else
 					{
 			            $this->db->rollback();
 			            return -1;
 			        }
 				}
 			}
-		}
-		else
+		} else
 		{
 			$this->error="Non autorise";
 			dol_syslog(get_class($this)."::valid ".$this->error, LOG_ERR);
@@ -544,9 +551,11 @@ 
 		global $conf;
 		$error = 0;
 
-		if ($id > 0 && !$error && empty($conf->global->MAIN_EXTRAFIELDS_DISABLED) && is_array($array_options) && count($array_options)>0) // For avoid conflicts if trigger used
+		if ($id > 0 && !$error && empty($conf->global->MAIN_EXTRAFIELDS_DISABLED) && is_array($array_options) && count($array_options)>0) {
+			// For avoid conflicts if trigger used
 		{
 			$livraisonline = new LivraisonLigne($this->db);
+		}
 			$livraisonline->array_options=$array_options;
 			$livraisonline->id=$id;
 			$result=$livraisonline->insertExtraFields();
@@ -558,8 +567,11 @@ 
 			}
 		}
 
-		if (! $error) return 1;
-		else return -1;
+		if (! $error) {
+			return 1;
+		} else {
+			return -1;
+		}
 	}
 
 
@@ -599,8 +611,7 @@ 
 				$this->update_price();
 
 				return 1;
-			}
-			else
+			} else
 			{
 				return 0;
 			}
@@ -627,7 +638,9 @@ 
 		{
 			// Delete linked object
 			$res = $this->deleteObjectLinked();
-			if ($res < 0) $error++;
+			if ($res < 0) {
+				$error++;
+			}
 
 			if (! $error)
 			{
@@ -670,22 +683,19 @@ 
                     // End call triggers
 
 					return 1;
-				}
-				else
+				} else
 				{
 					$this->error=$this->db->lasterror()." - sql=$sql";
 					$this->db->rollback();
 					return -3;
 				}
-			}
-			else
+			} else
 			{
 				$this->error=$this->db->lasterror()." - sql=$sql";
 				$this->db->rollback();
 				return -2;
 			}
-		}
-		else
+		} else
 		{
 			$this->error=$this->db->lasterror()." - sql=$sql";
 			$this->db->rollback();
@@ -715,16 +725,24 @@ 
         //{
         	// Add param to save lastsearch_values or not
         	$add_save_lastsearch_values=($save_lastsearch_value == 1 ? 1 : 0);
-        	if ($save_lastsearch_value == -1 && preg_match('/list\.php/',$_SERVER["PHP_SELF"])) $add_save_lastsearch_values=1;
-        	if ($add_save_lastsearch_values) $url.='&save_lastsearch_values=1';
+        	if ($save_lastsearch_value == -1 && preg_match('/list\.php/',$_SERVER["PHP_SELF"])) {
+        		$add_save_lastsearch_values=1;
+        	}
+        	if ($add_save_lastsearch_values) {
+        		$url.='&save_lastsearch_values=1';
+        	}
         //}
 
 
         $linkstart = '<a href="'.$url.'" title="'.dol_escape_htmltag($label, 1).'" class="classfortooltip">';
 		$linkend='</a>';
 
-		if ($withpicto) $result.=($linkstart.img_object($label, $picto, 'class="classfortooltip"').$linkend);
-		if ($withpicto && $withpicto != 2) $result.=' ';
+		if ($withpicto) {
+			$result.=($linkstart.img_object($label, $picto, 'class="classfortooltip"').$linkend);
+		}
+		if ($withpicto && $withpicto != 2) {
+			$result.=' ';
+		}
 		$result.=$linkstart.$this->ref.$linkend;
 		return $result;
 	}
@@ -811,27 +829,51 @@ 
 
 		if ($mode==0)
 		{
-			if ($statut==-1) return $langs->trans('StatusDeliveryCanceled');
-			if ($statut==0)  return $langs->trans('StatusDeliveryDraft');
-			if ($statut==1)  return $langs->trans('StatusDeliveryValidated');
+			if ($statut==-1) {
+				return $langs->trans('StatusDeliveryCanceled');
+			}
+			if ($statut==0) {
+				return $langs->trans('StatusDeliveryDraft');
+			}
+			if ($statut==1) {
+				return $langs->trans('StatusDeliveryValidated');
+			}
 		}
 		if ($mode==1)
 		{
-			if ($statut==-1) return $langs->trans($this->statuts[$statut]);
-			if ($statut==0)  return $langs->trans($this->statuts[$statut]);
-			if ($statut==1)  return $langs->trans($this->statuts[$statut]);
+			if ($statut==-1) {
+				return $langs->trans($this->statuts[$statut]);
+			}
+			if ($statut==0) {
+				return $langs->trans($this->statuts[$statut]);
+			}
+			if ($statut==1) {
+				return $langs->trans($this->statuts[$statut]);
+			}
 		}
 		if ($mode == 4)
 		{
-			if ($statut==-1) return img_picto($langs->trans('StatusDeliveryCanceled'),'statut5').' '.$langs->trans('StatusDeliveryCanceled');
-			if ($statut==0)  return img_picto($langs->trans('StatusDeliveryDraft'),'statut0').' '.$langs->trans('StatusDeliveryDraft');
-			if ($statut==1)  return img_picto($langs->trans('StatusDeliveryValidated'),'statut4').' '.$langs->trans('StatusDeliveryValidated');
+			if ($statut==-1) {
+				return img_picto($langs->trans('StatusDeliveryCanceled'),'statut5').' '.$langs->trans('StatusDeliveryCanceled');
+			}
+			if ($statut==0) {
+				return img_picto($langs->trans('StatusDeliveryDraft'),'statut0').' '.$langs->trans('StatusDeliveryDraft');
+			}
+			if ($statut==1) {
+				return img_picto($langs->trans('StatusDeliveryValidated'),'statut4').' '.$langs->trans('StatusDeliveryValidated');
+			}
 		}
 		if ($mode == 6)
 		{
-			if ($statut==-1) return $langs->trans('StatusDeliveryCanceled').' '.img_picto($langs->trans('StatusDeliveryCanceled'),'statut5');
-			if ($statut==0)  return $langs->trans('StatusDeliveryDraft').' '.img_picto($langs->trans('StatusDeliveryDraft'),'statut0');
-			if ($statut==1)  return $langs->trans('StatusDeliveryValidated').' '.img_picto($langs->trans('StatusDeliveryValidated'),'statut4');
+			if ($statut==-1) {
+				return $langs->trans('StatusDeliveryCanceled').' '.img_picto($langs->trans('StatusDeliveryCanceled'),'statut5');
+			}
+			if ($statut==0) {
+				return $langs->trans('StatusDeliveryDraft').' '.img_picto($langs->trans('StatusDeliveryDraft'),'statut0');
+			}
+			if ($statut==1) {
+				return $langs->trans('StatusDeliveryValidated').' '.img_picto($langs->trans('StatusDeliveryValidated'),'statut4');
+			}
 		}
 	}
 
@@ -942,16 +984,14 @@ 
 					if ($row[0] == $objSourceLine->rowid)
 					{
 						$array[$i]['qty'] = $objSourceLine->qty - $row[1];
-					}
-					else
+					} else
 					{
 						$array[$i]['qty'] = $objSourceLine->qty;
 					}
 
 					$array[$i]['ref'] = $objSourceLine->ref;
 					$array[$i]['label'] = $objSourceLine->label?$objSourceLine->label:$objSourceLine->description;
-				}
-				elseif($objSourceLine->qty - $row[1] < 0)
+				} elseif($objSourceLine->qty - $row[1] < 0)
 				{
 					$array[$i]['qty'] = $objSourceLine->qty - $row[1]. " Erreur livraison !";
 					$array[$i]['ref'] = $objSourceLine->ref;
@@ -961,8 +1001,7 @@ 
 					$i++;
 			}
 			return $array;
-		}
-		else
+		} else
 		{
 			$this->error=$this->db->error()." - sql=$sqlSourceLine";
 			return -1;
@@ -990,14 +1029,12 @@ 
 			{
 				$this->date_delivery = $date_livraison;
 				return 1;
-			}
-			else
+			} else
 			{
 				$this->error=$this->db->error();
 				return -1;
 			}
-		}
-		else
+		} else
 		{
 			return -2;
 		}

htdocs/core/class/html.formadmin.class.php

Doc Comments +1 added lines, -1 removed lines

@@ -334,7 +334,7 @@
 	 *
 	 *    	@param      string	$selected       Paper format pre-selected
 	 *    	@param      string	$htmlname       Name of HTML select field
-	 * 		@param		string	$filter			Value to filter on code
+	 * 		@param		integer	$filter			Value to filter on code
 	 * 		@param		int		$showempty		Add empty value
 	 * 		@return		string					Return HTML output
 	 */

Indentation +138 added lines, -138 removed lines

@@ -87,8 +87,8 @@ 
 
 		foreach ($langs_available as $key => $value)
 		{
-		    $valuetoshow=$value;
-		    if ($showcode) $valuetoshow=$key.' - '.$value;
+			$valuetoshow=$value;
+			if ($showcode) $valuetoshow=$key.' - '.$value;
 
 			if ($filter && is_array($filter))
 			{
@@ -109,79 +109,79 @@ 
 		$out.= '</select>';
 
 		// Make select dynamic
-        include_once DOL_DOCUMENT_ROOT . '/core/lib/ajax.lib.php';
-        $out.= ajax_combobox($htmlname);
+		include_once DOL_DOCUMENT_ROOT . '/core/lib/ajax.lib.php';
+		$out.= ajax_combobox($htmlname);
 
 		return $out;
 	}
 
 	/**
-     *    Return list of available menus (eldy_backoffice, ...)
-     *
-     *    @param	string		$selected        Preselected menu value
-     *    @param    string		$htmlname        Name of html select
-     *    @param    array		$dirmenuarray    Array of directories to scan
-     *    @param    string		$moreattrib      More attributes on html select tag
-     *    @return	integer|null
-     */
-    function select_menu($selected, $htmlname, $dirmenuarray, $moreattrib='')
-    {
-        global $langs,$conf;
+	 *    Return list of available menus (eldy_backoffice, ...)
+	 *
+	 *    @param	string		$selected        Preselected menu value
+	 *    @param    string		$htmlname        Name of html select
+	 *    @param    array		$dirmenuarray    Array of directories to scan
+	 *    @param    string		$moreattrib      More attributes on html select tag
+	 *    @return	integer|null
+	 */
+	function select_menu($selected, $htmlname, $dirmenuarray, $moreattrib='')
+	{
+		global $langs,$conf;
 
-        // Clean parameters
+		// Clean parameters
 
 
-        // Check parameters
-        if (! is_array($dirmenuarray)) return -1;
+		// Check parameters
+		if (! is_array($dirmenuarray)) return -1;
 
 		$menuarray=array();
-        foreach ($conf->file->dol_document_root as $dirroot)
-        {
-            foreach($dirmenuarray as $dirtoscan)
-            {
-                $dir=$dirroot.$dirtoscan;
-                //print $dir.'<br>';
-                if (is_dir($dir))
-                {
-    	            $handle=opendir($dir);
-    	            if (is_resource($handle))
-    	            {
-    	                while (($file = readdir($handle))!==false)
-    	                {
-    	                    if (is_file($dir."/".$file) && substr($file, 0, 1) <> '.' && substr($file, 0, 3) <> 'CVS' && substr($file, 0, 5) != 'index')
-    	                    {
-    	                        if (preg_match('/lib\.php$/i',$file)) continue;	// We exclude library files
-    	                        if (preg_match('/eldy_(backoffice|frontoffice)\.php$/i',$file)) continue;		// We exclude all menu manager files
-    	                        if (preg_match('/auguria_(backoffice|frontoffice)\.php$/i',$file)) continue;	// We exclude all menu manager files
-    	                        if (preg_match('/smartphone_(backoffice|frontoffice)\.php$/i',$file)) continue;	// We exclude all menu manager files
-
-    	                        $filelib=preg_replace('/\.php$/i','',$file);
-    	        				$prefix='';
-    	        				// 0=Recommanded, 1=Experimental, 2=Developpement, 3=Other
-    	        				if (preg_match('/^eldy/i',$file)) $prefix='0';
-                                else if (preg_match('/^smartphone/i',$file)) $prefix='2';
-    	        				else $prefix='3';
-
-    	                        if ($file == $selected)
-    	                        {
-    	        					$menuarray[$prefix.'_'.$file]='<option value="'.$file.'" selected>'.$filelib.'</option>';
-    	                        }
-    	                        else
-    	                        {
-    	                            $menuarray[$prefix.'_'.$file]='<option value="'.$file.'">'.$filelib.'</option>';
-    	                        }
-    	                    }
-    	                }
-    	                closedir($handle);
-    	            }
-                }
-            }
-        }
+		foreach ($conf->file->dol_document_root as $dirroot)
+		{
+			foreach($dirmenuarray as $dirtoscan)
+			{
+				$dir=$dirroot.$dirtoscan;
+				//print $dir.'<br>';
+				if (is_dir($dir))
+				{
+					$handle=opendir($dir);
+					if (is_resource($handle))
+					{
+						while (($file = readdir($handle))!==false)
+						{
+							if (is_file($dir."/".$file) && substr($file, 0, 1) <> '.' && substr($file, 0, 3) <> 'CVS' && substr($file, 0, 5) != 'index')
+							{
+								if (preg_match('/lib\.php$/i',$file)) continue;	// We exclude library files
+								if (preg_match('/eldy_(backoffice|frontoffice)\.php$/i',$file)) continue;		// We exclude all menu manager files
+								if (preg_match('/auguria_(backoffice|frontoffice)\.php$/i',$file)) continue;	// We exclude all menu manager files
+								if (preg_match('/smartphone_(backoffice|frontoffice)\.php$/i',$file)) continue;	// We exclude all menu manager files
+
+								$filelib=preg_replace('/\.php$/i','',$file);
+								$prefix='';
+								// 0=Recommanded, 1=Experimental, 2=Developpement, 3=Other
+								if (preg_match('/^eldy/i',$file)) $prefix='0';
+								else if (preg_match('/^smartphone/i',$file)) $prefix='2';
+								else $prefix='3';
+
+								if ($file == $selected)
+								{
+									$menuarray[$prefix.'_'.$file]='<option value="'.$file.'" selected>'.$filelib.'</option>';
+								}
+								else
+								{
+									$menuarray[$prefix.'_'.$file]='<option value="'.$file.'">'.$filelib.'</option>';
+								}
+							}
+						}
+						closedir($handle);
+					}
+				}
+			}
+		}
 		ksort($menuarray);
 
 		// Output combo list of menus
-        print '<select class="flat" id="'.$htmlname.'" name="'.$htmlname.'"'.($moreattrib?' '.$moreattrib:'').'>';
-        $oldprefix='';
+		print '<select class="flat" id="'.$htmlname.'" name="'.$htmlname.'"'.($moreattrib?' '.$moreattrib:'').'>';
+		$oldprefix='';
 		foreach ($menuarray as $key => $val)
 		{
 			$tab=explode('_',$key);
@@ -193,7 +193,7 @@ 
 				// Affiche titre
 				print '<option value="-1" disabled>';
 				if ($newprefix=='0') print '-- '.$langs->trans("VersionRecommanded").' --';
-                if ($newprefix=='1') print '-- '.$langs->trans("VersionExperimental").' --';
+				if ($newprefix=='1') print '-- '.$langs->trans("VersionExperimental").' --';
 				if ($newprefix=='2') print '-- '.$langs->trans("VersionDevelopment").' --';
 				if ($newprefix=='3') print '-- '.$langs->trans("Other").' --';
 				print '</option>';
@@ -202,67 +202,67 @@ 
 			print $val."\n";	// Show menu entry
 		}
 		print '</select>';
-    }
-
-    /**
-     *  Return combo list of available menu families
-     *
-     *  @param	string		$selected        Menu pre-selected
-     *  @param	string		$htmlname        Name of html select
-     *  @param	string[]	$dirmenuarray    Directories to scan
-     *  @return	void
-     */
-    function select_menu_families($selected, $htmlname, $dirmenuarray)
-    {
+	}
+
+	/**
+	 *  Return combo list of available menu families
+	 *
+	 *  @param	string		$selected        Menu pre-selected
+	 *  @param	string		$htmlname        Name of html select
+	 *  @param	string[]	$dirmenuarray    Directories to scan
+	 *  @return	void
+	 */
+	function select_menu_families($selected, $htmlname, $dirmenuarray)
+	{
 		global $langs,$conf;
 
-        //$expdevmenu=array('smartphone_backoffice.php','smartphone_frontoffice.php');  // Menu to disable if $conf->global->MAIN_FEATURES_LEVEL is not set
+		//$expdevmenu=array('smartphone_backoffice.php','smartphone_frontoffice.php');  // Menu to disable if $conf->global->MAIN_FEATURES_LEVEL is not set
 		$expdevmenu=array();
 
 		$menuarray=array();
 
 		foreach($dirmenuarray as $dirmenu)
 		{
-            foreach ($conf->file->dol_document_root as $dirroot)
-            {
-                $dir=$dirroot.$dirmenu;
-                if (is_dir($dir))
-                {
-	                $handle=opendir($dir);
-	                if (is_resource($handle))
-	                {
-	        			while (($file = readdir($handle))!==false)
-	        			{
-	        				if (is_file($dir."/".$file) && substr($file, 0, 1) <> '.' && substr($file, 0, 3) <> 'CVS')
-	        				{
-	        					$filelib=preg_replace('/(_backoffice|_frontoffice)?\.php$/i','',$file);
-	        					if (preg_match('/^index/i',$filelib)) continue;
-	        					if (preg_match('/^default/i',$filelib)) continue;
-	        					if (preg_match('/^empty/i',$filelib)) continue;
-	        					if (preg_match('/\.lib/i',$filelib)) continue;
-	        					if (empty($conf->global->MAIN_FEATURES_LEVEL) && in_array($file,$expdevmenu)) continue;
-
-	        					$menuarray[$filelib]=1;
-	        				}
-	        				$menuarray['all']=1;
-	        			}
-	        			closedir($handle);
-	                }
-                }
-            }
+			foreach ($conf->file->dol_document_root as $dirroot)
+			{
+				$dir=$dirroot.$dirmenu;
+				if (is_dir($dir))
+				{
+					$handle=opendir($dir);
+					if (is_resource($handle))
+					{
+						while (($file = readdir($handle))!==false)
+						{
+							if (is_file($dir."/".$file) && substr($file, 0, 1) <> '.' && substr($file, 0, 3) <> 'CVS')
+							{
+								$filelib=preg_replace('/(_backoffice|_frontoffice)?\.php$/i','',$file);
+								if (preg_match('/^index/i',$filelib)) continue;
+								if (preg_match('/^default/i',$filelib)) continue;
+								if (preg_match('/^empty/i',$filelib)) continue;
+								if (preg_match('/\.lib/i',$filelib)) continue;
+								if (empty($conf->global->MAIN_FEATURES_LEVEL) && in_array($file,$expdevmenu)) continue;
+
+								$menuarray[$filelib]=1;
+							}
+							$menuarray['all']=1;
+						}
+						closedir($handle);
+					}
+				}
+			}
 		}
 
 		ksort($menuarray);
 
 		// Affichage liste deroulante des menus
-        print '<select class="flat" id="'.$htmlname.'" name="'.$htmlname.'">';
-        $oldprefix='';
+		print '<select class="flat" id="'.$htmlname.'" name="'.$htmlname.'">';
+		$oldprefix='';
 		foreach ($menuarray as $key => $val)
 		{
 			$tab=explode('_',$key);
 			$newprefix=$tab[0];
 			print '<option value="'.$key.'"';
-            if ($key == $selected)
+			if ($key == $selected)
 			{
 				print '	selected';
 			}
@@ -272,21 +272,21 @@ 
 			print '</option>'."\n";
 		}
 		print '</select>';
-    }
-
-
-    /**
-     *  Return a HTML select list of timezones
-     *
-     *  @param	string		$selected        Menu pre-selectionnee
-     *  @param  string		$htmlname        Nom de la zone select
-     *  @return	void
-     */
-    function select_timezone($selected,$htmlname)
-    {
+	}
+
+
+	/**
+	 *  Return a HTML select list of timezones
+	 *
+	 *  @param	string		$selected        Menu pre-selectionnee
+	 *  @param  string		$htmlname        Nom de la zone select
+	 *  @return	void
+	 */
+	function select_timezone($selected,$htmlname)
+	{
 		global $langs,$conf;
 
-        print '<select class="flat" id="'.$htmlname.'" name="'.$htmlname.'">';
+		print '<select class="flat" id="'.$htmlname.'" name="'.$htmlname.'">';
 		print '<option value="-1">&nbsp;</option>';
 
 		$arraytz=array(
@@ -345,24 +345,24 @@ 
 		$sql = "SELECT code, label, width, height, unit";
 		$sql.= " FROM ".MAIN_DB_PREFIX."c_paper_format";
 		$sql.= " WHERE active=1";
-        if ($filter) $sql.=" AND code LIKE '%".$this->db->escape($filter)."%'";
-
-        $resql=$this->db->query($sql);
-        if ($resql)
-        {
-            $num=$this->db->num_rows($resql);
-            $i=0;
-            while ($i < $num)
-            {
-                $obj=$this->db->fetch_object($resql);
-                $unitKey = $langs->trans('SizeUnit'.$obj->unit);
-
-                $paperformat[$obj->code]= $langs->trans('PaperFormat'.strtoupper($obj->code)).' - '.round($obj->width).'x'.round($obj->height).' '.($unitKey == 'SizeUnit'.$obj->unit ? $obj->unit : $unitKey);
-
-                $i++;
-            }
-        }
-        else
+		if ($filter) $sql.=" AND code LIKE '%".$this->db->escape($filter)."%'";
+
+		$resql=$this->db->query($sql);
+		if ($resql)
+		{
+			$num=$this->db->num_rows($resql);
+			$i=0;
+			while ($i < $num)
+			{
+				$obj=$this->db->fetch_object($resql);
+				$unitKey = $langs->trans('SizeUnit'.$obj->unit);
+
+				$paperformat[$obj->code]= $langs->trans('PaperFormat'.strtoupper($obj->code)).' - '.round($obj->width).'x'.round($obj->height).' '.($unitKey == 'SizeUnit'.$obj->unit ? $obj->unit : $unitKey);
+
+				$i++;
+			}
+		}
+		else
 		{
 			dol_print_error($this->db);
 			return '';
@@ -378,7 +378,7 @@ 
 		}
 		foreach ($paperformat as $key => $value)
 		{
-            if ($selected == $key)
+			if ($selected == $key)
 			{
 				$out.= '<option value="'.$key.'" selected>'.$value.'</option>';
 			}

Spacing +92 added lines, -92 removed lines

@@ -58,59 +58,59 @@ 
 	 *      @param      int         $showcode       Add language code into label
 	 *      @return		string						Return HTML select string with list of languages
 	 */
-	function select_language($selected='', $htmlname='lang_id', $showauto=0, $filter=null, $showempty='', $showwarning=0, $disabled=0, $morecss='', $showcode=0)
+	function select_language($selected = '', $htmlname = 'lang_id', $showauto = 0, $filter = null, $showempty = '', $showwarning = 0, $disabled = 0, $morecss = '', $showcode = 0)
 	{
 		global $langs;
 
-		$langs_available=$langs->get_available_languages(DOL_DOCUMENT_ROOT,12);
+		$langs_available = $langs->get_available_languages(DOL_DOCUMENT_ROOT, 12);
 
-		$out='';
+		$out = '';
 
-		$out.= '<select class="flat'.($morecss?' '.$morecss:'').'" id="'.$htmlname.'" name="'.$htmlname.'"'.($disabled?' disabled':'').'>';
+		$out .= '<select class="flat'.($morecss ? ' '.$morecss : '').'" id="'.$htmlname.'" name="'.$htmlname.'"'.($disabled ? ' disabled' : '').'>';
 		if ($showempty)
 		{
-			$out.= '<option value="0"';
-			if ($selected == '') $out.= ' selected';
-			$out.= '>';
-			if ($showempty != '1') $out.=$showempty;
-			else $out.='&nbsp;';
-			$out.='</option>';
+			$out .= '<option value="0"';
+			if ($selected == '') $out .= ' selected';
+			$out .= '>';
+			if ($showempty != '1') $out .= $showempty;
+			else $out .= '&nbsp;';
+			$out .= '</option>';
 		}
 		if ($showauto)
 		{
-			$out.= '<option value="auto"';
-			if ($selected == 'auto') $out.= ' selected';
-			$out.= '>'.$langs->trans("AutoDetectLang").'</option>';
+			$out .= '<option value="auto"';
+			if ($selected == 'auto') $out .= ' selected';
+			$out .= '>'.$langs->trans("AutoDetectLang").'</option>';
 		}
 
 		asort($langs_available);
 
 		foreach ($langs_available as $key => $value)
 		{
-		    $valuetoshow=$value;
-		    if ($showcode) $valuetoshow=$key.' - '.$value;
+		    $valuetoshow = $value;
+		    if ($showcode) $valuetoshow = $key.' - '.$value;
 
 			if ($filter && is_array($filter))
 			{
-				if ( ! array_key_exists($key, $filter))
+				if (!array_key_exists($key, $filter))
 				{
-					$out.= '<option value="'.$key.'">'.$valuetoshow.'</option>';
+					$out .= '<option value="'.$key.'">'.$valuetoshow.'</option>';
 				}
 			}
 			else if ($selected == $key)
 			{
-				$out.= '<option value="'.$key.'" selected>'.$valuetoshow.'</option>';
+				$out .= '<option value="'.$key.'" selected>'.$valuetoshow.'</option>';
 			}
 			else
 			{
-				$out.= '<option value="'.$key.'">'.$valuetoshow.'</option>';
+				$out .= '<option value="'.$key.'">'.$valuetoshow.'</option>';
 			}
 		}
-		$out.= '</select>';
+		$out .= '</select>';
 
 		// Make select dynamic
-        include_once DOL_DOCUMENT_ROOT . '/core/lib/ajax.lib.php';
-        $out.= ajax_combobox($htmlname);
+        include_once DOL_DOCUMENT_ROOT.'/core/lib/ajax.lib.php';
+        $out .= ajax_combobox($htmlname);
 
 		return $out;
 	}
@@ -124,51 +124,51 @@ 
      *    @param    string		$moreattrib      More attributes on html select tag
      *    @return	integer|null
      */
-    function select_menu($selected, $htmlname, $dirmenuarray, $moreattrib='')
+    function select_menu($selected, $htmlname, $dirmenuarray, $moreattrib = '')
     {
-        global $langs,$conf;
+        global $langs, $conf;
 
         // Clean parameters
 
 
         // Check parameters
-        if (! is_array($dirmenuarray)) return -1;
+        if (!is_array($dirmenuarray)) return -1;
 
-		$menuarray=array();
+		$menuarray = array();
         foreach ($conf->file->dol_document_root as $dirroot)
         {
-            foreach($dirmenuarray as $dirtoscan)
+            foreach ($dirmenuarray as $dirtoscan)
             {
-                $dir=$dirroot.$dirtoscan;
+                $dir = $dirroot.$dirtoscan;
                 //print $dir.'<br>';
                 if (is_dir($dir))
                 {
-    	            $handle=opendir($dir);
+    	            $handle = opendir($dir);
     	            if (is_resource($handle))
     	            {
-    	                while (($file = readdir($handle))!==false)
+    	                while (($file = readdir($handle)) !== false)
     	                {
     	                    if (is_file($dir."/".$file) && substr($file, 0, 1) <> '.' && substr($file, 0, 3) <> 'CVS' && substr($file, 0, 5) != 'index')
     	                    {
-    	                        if (preg_match('/lib\.php$/i',$file)) continue;	// We exclude library files
-    	                        if (preg_match('/eldy_(backoffice|frontoffice)\.php$/i',$file)) continue;		// We exclude all menu manager files
-    	                        if (preg_match('/auguria_(backoffice|frontoffice)\.php$/i',$file)) continue;	// We exclude all menu manager files
-    	                        if (preg_match('/smartphone_(backoffice|frontoffice)\.php$/i',$file)) continue;	// We exclude all menu manager files
+    	                        if (preg_match('/lib\.php$/i', $file)) continue; // We exclude library files
+    	                        if (preg_match('/eldy_(backoffice|frontoffice)\.php$/i', $file)) continue; // We exclude all menu manager files
+    	                        if (preg_match('/auguria_(backoffice|frontoffice)\.php$/i', $file)) continue; // We exclude all menu manager files
+    	                        if (preg_match('/smartphone_(backoffice|frontoffice)\.php$/i', $file)) continue; // We exclude all menu manager files
 
-    	                        $filelib=preg_replace('/\.php$/i','',$file);
-    	        				$prefix='';
+    	                        $filelib = preg_replace('/\.php$/i', '', $file);
+    	        				$prefix = '';
     	        				// 0=Recommanded, 1=Experimental, 2=Developpement, 3=Other
-    	        				if (preg_match('/^eldy/i',$file)) $prefix='0';
-                                else if (preg_match('/^smartphone/i',$file)) $prefix='2';
-    	        				else $prefix='3';
+    	        				if (preg_match('/^eldy/i', $file)) $prefix = '0';
+                                else if (preg_match('/^smartphone/i', $file)) $prefix = '2';
+    	        				else $prefix = '3';
 
     	                        if ($file == $selected)
     	                        {
-    	        					$menuarray[$prefix.'_'.$file]='<option value="'.$file.'" selected>'.$filelib.'</option>';
+    	        					$menuarray[$prefix.'_'.$file] = '<option value="'.$file.'" selected>'.$filelib.'</option>';
     	                        }
     	                        else
     	                        {
-    	                            $menuarray[$prefix.'_'.$file]='<option value="'.$file.'">'.$filelib.'</option>';
+    	                            $menuarray[$prefix.'_'.$file] = '<option value="'.$file.'">'.$filelib.'</option>';
     	                        }
     	                    }
     	                }
@@ -180,26 +180,26 @@ 
 		ksort($menuarray);
 
 		// Output combo list of menus
-        print '<select class="flat" id="'.$htmlname.'" name="'.$htmlname.'"'.($moreattrib?' '.$moreattrib:'').'>';
-        $oldprefix='';
+        print '<select class="flat" id="'.$htmlname.'" name="'.$htmlname.'"'.($moreattrib ? ' '.$moreattrib : '').'>';
+        $oldprefix = '';
 		foreach ($menuarray as $key => $val)
 		{
-			$tab=explode('_',$key);
-			$newprefix=$tab[0];
-			if ($newprefix=='1' && ($conf->global->MAIN_FEATURES_LEVEL < 1)) continue;
-			if ($newprefix=='2' && ($conf->global->MAIN_FEATURES_LEVEL < 2)) continue;
+			$tab = explode('_', $key);
+			$newprefix = $tab[0];
+			if ($newprefix == '1' && ($conf->global->MAIN_FEATURES_LEVEL < 1)) continue;
+			if ($newprefix == '2' && ($conf->global->MAIN_FEATURES_LEVEL < 2)) continue;
 			if ($newprefix != $oldprefix)	// Add separators
 			{
 				// Affiche titre
 				print '<option value="-1" disabled>';
-				if ($newprefix=='0') print '-- '.$langs->trans("VersionRecommanded").' --';
-                if ($newprefix=='1') print '-- '.$langs->trans("VersionExperimental").' --';
-				if ($newprefix=='2') print '-- '.$langs->trans("VersionDevelopment").' --';
-				if ($newprefix=='3') print '-- '.$langs->trans("Other").' --';
+				if ($newprefix == '0') print '-- '.$langs->trans("VersionRecommanded").' --';
+                if ($newprefix == '1') print '-- '.$langs->trans("VersionExperimental").' --';
+				if ($newprefix == '2') print '-- '.$langs->trans("VersionDevelopment").' --';
+				if ($newprefix == '3') print '-- '.$langs->trans("Other").' --';
 				print '</option>';
-				$oldprefix=$newprefix;
+				$oldprefix = $newprefix;
 			}
-			print $val."\n";	// Show menu entry
+			print $val."\n"; // Show menu entry
 		}
 		print '</select>';
     }
@@ -214,37 +214,37 @@ 
      */
     function select_menu_families($selected, $htmlname, $dirmenuarray)
     {
-		global $langs,$conf;
+		global $langs, $conf;
 
         //$expdevmenu=array('smartphone_backoffice.php','smartphone_frontoffice.php');  // Menu to disable if $conf->global->MAIN_FEATURES_LEVEL is not set
-		$expdevmenu=array();
+		$expdevmenu = array();
 
-		$menuarray=array();
+		$menuarray = array();
 
-		foreach($dirmenuarray as $dirmenu)
+		foreach ($dirmenuarray as $dirmenu)
 		{
             foreach ($conf->file->dol_document_root as $dirroot)
             {
-                $dir=$dirroot.$dirmenu;
+                $dir = $dirroot.$dirmenu;
                 if (is_dir($dir))
                 {
-	                $handle=opendir($dir);
+	                $handle = opendir($dir);
 	                if (is_resource($handle))
 	                {
-	        			while (($file = readdir($handle))!==false)
+	        			while (($file = readdir($handle)) !== false)
 	        			{
 	        				if (is_file($dir."/".$file) && substr($file, 0, 1) <> '.' && substr($file, 0, 3) <> 'CVS')
 	        				{
-	        					$filelib=preg_replace('/(_backoffice|_frontoffice)?\.php$/i','',$file);
-	        					if (preg_match('/^index/i',$filelib)) continue;
-	        					if (preg_match('/^default/i',$filelib)) continue;
-	        					if (preg_match('/^empty/i',$filelib)) continue;
-	        					if (preg_match('/\.lib/i',$filelib)) continue;
-	        					if (empty($conf->global->MAIN_FEATURES_LEVEL) && in_array($file,$expdevmenu)) continue;
-
-	        					$menuarray[$filelib]=1;
+	        					$filelib = preg_replace('/(_backoffice|_frontoffice)?\.php$/i', '', $file);
+	        					if (preg_match('/^index/i', $filelib)) continue;
+	        					if (preg_match('/^default/i', $filelib)) continue;
+	        					if (preg_match('/^empty/i', $filelib)) continue;
+	        					if (preg_match('/\.lib/i', $filelib)) continue;
+	        					if (empty($conf->global->MAIN_FEATURES_LEVEL) && in_array($file, $expdevmenu)) continue;
+
+	        					$menuarray[$filelib] = 1;
 	        				}
-	        				$menuarray['all']=1;
+	        				$menuarray['all'] = 1;
 	        			}
 	        			closedir($handle);
 	                }
@@ -256,11 +256,11 @@ 
 
 		// Affichage liste deroulante des menus
         print '<select class="flat" id="'.$htmlname.'" name="'.$htmlname.'">';
-        $oldprefix='';
+        $oldprefix = '';
 		foreach ($menuarray as $key => $val)
 		{
-			$tab=explode('_',$key);
-			$newprefix=$tab[0];
+			$tab = explode('_', $key);
+			$newprefix = $tab[0];
 			print '<option value="'.$key.'"';
             if ($key == $selected)
 			{
@@ -282,14 +282,14 @@ 
      *  @param  string		$htmlname        Nom de la zone select
      *  @return	void
      */
-    function select_timezone($selected,$htmlname)
+    function select_timezone($selected, $htmlname)
     {
-		global $langs,$conf;
+		global $langs, $conf;
 
         print '<select class="flat" id="'.$htmlname.'" name="'.$htmlname.'">';
 		print '<option value="-1">&nbsp;</option>';
 
-		$arraytz=array(
+		$arraytz = array(
 			"Pacific/Midway"=>"GMT-11:00",
 			"Pacific/Fakaofo"=>"GMT-10:00",
 			"America/Anchorage"=>"GMT-09:00",
@@ -336,28 +336,28 @@ 
 	 * 		@param		int		$showempty		Add empty value
 	 * 		@return		string					Return HTML output
 	 */
-	function select_paper_format($selected='',$htmlname='paperformat_id',$filter=0,$showempty=0)
+	function select_paper_format($selected = '', $htmlname = 'paperformat_id', $filter = 0, $showempty = 0)
 	{
 		global $langs;
 
 		$langs->load("dict");
 
 		$sql = "SELECT code, label, width, height, unit";
-		$sql.= " FROM ".MAIN_DB_PREFIX."c_paper_format";
-		$sql.= " WHERE active=1";
-        if ($filter) $sql.=" AND code LIKE '%".$this->db->escape($filter)."%'";
+		$sql .= " FROM ".MAIN_DB_PREFIX."c_paper_format";
+		$sql .= " WHERE active=1";
+        if ($filter) $sql .= " AND code LIKE '%".$this->db->escape($filter)."%'";
 
-        $resql=$this->db->query($sql);
+        $resql = $this->db->query($sql);
         if ($resql)
         {
-            $num=$this->db->num_rows($resql);
-            $i=0;
+            $num = $this->db->num_rows($resql);
+            $i = 0;
             while ($i < $num)
             {
-                $obj=$this->db->fetch_object($resql);
+                $obj = $this->db->fetch_object($resql);
                 $unitKey = $langs->trans('SizeUnit'.$obj->unit);
 
-                $paperformat[$obj->code]= $langs->trans('PaperFormat'.strtoupper($obj->code)).' - '.round($obj->width).'x'.round($obj->height).' '.($unitKey == 'SizeUnit'.$obj->unit ? $obj->unit : $unitKey);
+                $paperformat[$obj->code] = $langs->trans('PaperFormat'.strtoupper($obj->code)).' - '.round($obj->width).'x'.round($obj->height).' '.($unitKey == 'SizeUnit'.$obj->unit ? $obj->unit : $unitKey);
 
                 $i++;
             }
@@ -367,27 +367,27 @@ 
 			dol_print_error($this->db);
 			return '';
 		}
-		$out='';
+		$out = '';
 
-		$out.= '<select class="flat" id="'.$htmlname.'" name="'.$htmlname.'">';
+		$out .= '<select class="flat" id="'.$htmlname.'" name="'.$htmlname.'">';
 		if ($showempty)
 		{
-			$out.= '<option value=""';
-			if ($selected == '') $out.= ' selected';
-			$out.= '>&nbsp;</option>';
+			$out .= '<option value=""';
+			if ($selected == '') $out .= ' selected';
+			$out .= '>&nbsp;</option>';
 		}
 		foreach ($paperformat as $key => $value)
 		{
             if ($selected == $key)
 			{
-				$out.= '<option value="'.$key.'" selected>'.$value.'</option>';
+				$out .= '<option value="'.$key.'" selected>'.$value.'</option>';
 			}
 			else
 			{
-				$out.= '<option value="'.$key.'">'.$value.'</option>';
+				$out .= '<option value="'.$key.'">'.$value.'</option>';
 			}
 		}
-		$out.= '</select>';
+		$out .= '</select>';
 
 		return $out;
 	}

Braces +95 added lines, -40 removed lines

@@ -70,16 +70,23 @@ 
 		if ($showempty)
 		{
 			$out.= '<option value="0"';
-			if ($selected == '') $out.= ' selected';
+			if ($selected == '') {
+				$out.= ' selected';
+			}
 			$out.= '>';
-			if ($showempty != '1') $out.=$showempty;
-			else $out.='&nbsp;';
+			if ($showempty != '1') {
+				$out.=$showempty;
+			} else {
+				$out.='&nbsp;';
+			}
 			$out.='</option>';
 		}
 		if ($showauto)
 		{
 			$out.= '<option value="auto"';
-			if ($selected == 'auto') $out.= ' selected';
+			if ($selected == 'auto') {
+				$out.= ' selected';
+			}
 			$out.= '>'.$langs->trans("AutoDetectLang").'</option>';
 		}
 
@@ -88,7 +95,9 @@ 
 		foreach ($langs_available as $key => $value)
 		{
 		    $valuetoshow=$value;
-		    if ($showcode) $valuetoshow=$key.' - '.$value;
+		    if ($showcode) {
+		    	$valuetoshow=$key.' - '.$value;
+		    }
 
 			if ($filter && is_array($filter))
 			{
@@ -96,12 +105,10 @@ 
 				{
 					$out.= '<option value="'.$key.'">'.$valuetoshow.'</option>';
 				}
-			}
-			else if ($selected == $key)
+			} else if ($selected == $key)
 			{
 				$out.= '<option value="'.$key.'" selected>'.$valuetoshow.'</option>';
-			}
-			else
+			} else
 			{
 				$out.= '<option value="'.$key.'">'.$valuetoshow.'</option>';
 			}
@@ -132,7 +139,9 @@ 
 
 
         // Check parameters
-        if (! is_array($dirmenuarray)) return -1;
+        if (! is_array($dirmenuarray)) {
+        	return -1;
+        }
 
 		$menuarray=array();
         foreach ($conf->file->dol_document_root as $dirroot)
@@ -150,23 +159,38 @@ 
     	                {
     	                    if (is_file($dir."/".$file) && substr($file, 0, 1) <> '.' && substr($file, 0, 3) <> 'CVS' && substr($file, 0, 5) != 'index')
     	                    {
-    	                        if (preg_match('/lib\.php$/i',$file)) continue;	// We exclude library files
-    	                        if (preg_match('/eldy_(backoffice|frontoffice)\.php$/i',$file)) continue;		// We exclude all menu manager files
-    	                        if (preg_match('/auguria_(backoffice|frontoffice)\.php$/i',$file)) continue;	// We exclude all menu manager files
-    	                        if (preg_match('/smartphone_(backoffice|frontoffice)\.php$/i',$file)) continue;	// We exclude all menu manager files
+    	                        if (preg_match('/lib\.php$/i',$file)) {
+    	                        	continue;
+    	                        }
+    	                        // We exclude library files
+    	                        if (preg_match('/eldy_(backoffice|frontoffice)\.php$/i',$file)) {
+    	                        	continue;
+    	                        }
+    	                        // We exclude all menu manager files
+    	                        if (preg_match('/auguria_(backoffice|frontoffice)\.php$/i',$file)) {
+    	                        	continue;
+    	                        }
+    	                        // We exclude all menu manager files
+    	                        if (preg_match('/smartphone_(backoffice|frontoffice)\.php$/i',$file)) {
+    	                        	continue;
+    	                        }
+    	                        // We exclude all menu manager files
 
     	                        $filelib=preg_replace('/\.php$/i','',$file);
     	        				$prefix='';
     	        				// 0=Recommanded, 1=Experimental, 2=Developpement, 3=Other
-    	        				if (preg_match('/^eldy/i',$file)) $prefix='0';
-                                else if (preg_match('/^smartphone/i',$file)) $prefix='2';
-    	        				else $prefix='3';
+    	        				if (preg_match('/^eldy/i',$file)) {
+    	        					$prefix='0';
+    	        				} else if (preg_match('/^smartphone/i',$file)) {
+                                	$prefix='2';
+                                } else {
+    	        					$prefix='3';
+    	        				}
 
     	                        if ($file == $selected)
     	                        {
     	        					$menuarray[$prefix.'_'.$file]='<option value="'.$file.'" selected>'.$filelib.'</option>';
-    	                        }
-    	                        else
+    	                        } else
     	                        {
     	                            $menuarray[$prefix.'_'.$file]='<option value="'.$file.'">'.$filelib.'</option>';
     	                        }
@@ -186,16 +210,30 @@ 
 		{
 			$tab=explode('_',$key);
 			$newprefix=$tab[0];
-			if ($newprefix=='1' && ($conf->global->MAIN_FEATURES_LEVEL < 1)) continue;
-			if ($newprefix=='2' && ($conf->global->MAIN_FEATURES_LEVEL < 2)) continue;
-			if ($newprefix != $oldprefix)	// Add separators
+			if ($newprefix=='1' && ($conf->global->MAIN_FEATURES_LEVEL < 1)) {
+				continue;
+			}
+			if ($newprefix=='2' && ($conf->global->MAIN_FEATURES_LEVEL < 2)) {
+				continue;
+			}
+			if ($newprefix != $oldprefix) {
+				// Add separators
 			{
 				// Affiche titre
 				print '<option value="-1" disabled>';
-				if ($newprefix=='0') print '-- '.$langs->trans("VersionRecommanded").' --';
-                if ($newprefix=='1') print '-- '.$langs->trans("VersionExperimental").' --';
-				if ($newprefix=='2') print '-- '.$langs->trans("VersionDevelopment").' --';
-				if ($newprefix=='3') print '-- '.$langs->trans("Other").' --';
+			}
+				if ($newprefix=='0') {
+					print '-- '.$langs->trans("VersionRecommanded").' --';
+				}
+                if ($newprefix=='1') {
+                	print '-- '.$langs->trans("VersionExperimental").' --';
+                }
+				if ($newprefix=='2') {
+					print '-- '.$langs->trans("VersionDevelopment").' --';
+				}
+				if ($newprefix=='3') {
+					print '-- '.$langs->trans("Other").' --';
+				}
 				print '</option>';
 				$oldprefix=$newprefix;
 			}
@@ -236,11 +274,21 @@ 
 	        				if (is_file($dir."/".$file) && substr($file, 0, 1) <> '.' && substr($file, 0, 3) <> 'CVS')
 	        				{
 	        					$filelib=preg_replace('/(_backoffice|_frontoffice)?\.php$/i','',$file);
-	        					if (preg_match('/^index/i',$filelib)) continue;
-	        					if (preg_match('/^default/i',$filelib)) continue;
-	        					if (preg_match('/^empty/i',$filelib)) continue;
-	        					if (preg_match('/\.lib/i',$filelib)) continue;
-	        					if (empty($conf->global->MAIN_FEATURES_LEVEL) && in_array($file,$expdevmenu)) continue;
+	        					if (preg_match('/^index/i',$filelib)) {
+	        						continue;
+	        					}
+	        					if (preg_match('/^default/i',$filelib)) {
+	        						continue;
+	        					}
+	        					if (preg_match('/^empty/i',$filelib)) {
+	        						continue;
+	        					}
+	        					if (preg_match('/\.lib/i',$filelib)) {
+	        						continue;
+	        					}
+	        					if (empty($conf->global->MAIN_FEATURES_LEVEL) && in_array($file,$expdevmenu)) {
+	        						continue;
+	        					}
 
 	        					$menuarray[$filelib]=1;
 	        				}
@@ -267,8 +315,11 @@ 
 				print '	selected';
 			}
 			print '>';
-			if ($key == 'all') print $langs->trans("AllMenus");
-			else print $key;
+			if ($key == 'all') {
+				print $langs->trans("AllMenus");
+			} else {
+				print $key;
+			}
 			print '</option>'."\n";
 		}
 		print '</select>';
@@ -319,7 +370,9 @@ 
 		foreach ($arraytz as $lib => $gmt)
 		{
 			print '<option value="'.$lib.'"';
-			if ($selected == $lib || $selected == $gmt) print ' selected';
+			if ($selected == $lib || $selected == $gmt) {
+				print ' selected';
+			}
 			print '>'.$gmt.'</option>'."\n";
 		}
 		print '</select>';
@@ -345,7 +398,9 @@ 
 		$sql = "SELECT code, label, width, height, unit";
 		$sql.= " FROM ".MAIN_DB_PREFIX."c_paper_format";
 		$sql.= " WHERE active=1";
-        if ($filter) $sql.=" AND code LIKE '%".$this->db->escape($filter)."%'";
+        if ($filter) {
+        	$sql.=" AND code LIKE '%".$this->db->escape($filter)."%'";
+        }
 
         $resql=$this->db->query($sql);
         if ($resql)
@@ -361,8 +416,7 @@ 
 
                 $i++;
             }
-        }
-        else
+        } else
 		{
 			dol_print_error($this->db);
 			return '';
@@ -373,7 +427,9 @@ 
 		if ($showempty)
 		{
 			$out.= '<option value=""';
-			if ($selected == '') $out.= ' selected';
+			if ($selected == '') {
+				$out.= ' selected';
+			}
 			$out.= '>&nbsp;</option>';
 		}
 		foreach ($paperformat as $key => $value)
@@ -381,8 +437,7 @@ 
             if ($selected == $key)
 			{
 				$out.= '<option value="'.$key.'" selected>'.$value.'</option>';
-			}
-			else
+			} else
 			{
 				$out.= '<option value="'.$key.'">'.$value.'</option>';
 			}