alxarafe / alixar

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

Indentation +20 added lines, -20 removed lines

@@ -27,26 +27,26 @@ 
  */
 class FormPropal
 {
-	/**
+    /**
      * @var DoliDB Database handler.
      */
     public $db;
 	
-	/**
-	 * @var string Error code (or message)
-	 */
-	public $error='';
+    /**
+     * @var string Error code (or message)
+     */
+    public $error='';
 
 
-	/**
-	 * Constructor
-	 *
-	 * @param		DoliDB		$db      Database handler
-	 */
-	public function __construct($db)
-	{
-		$this->db = $db;
-	}
+    /**
+     * Constructor
+     *
+     * @param		DoliDB		$db      Database handler
+     */
+    public function __construct($db)
+    {
+        $this->db = $db;
+    }
 
     /**
      *    Return combo list of differents status of a proposal
@@ -114,11 +114,11 @@ 
         {
             if ($excludedraft)
             {
-				if ($obj['code'] == 'Draft' || $obj['code'] == 'PR_DRAFT')
-				{
-					$i++;
-					continue;
-				}
+                if ($obj['code'] == 'Draft' || $obj['code'] == 'PR_DRAFT')
+                {
+                    $i++;
+                    continue;
+                }
             }
             if ($selected != '' && $selected == $obj['id'])
             {
@@ -134,7 +134,7 @@ 
                 print $langs->trans($prefix.$key.($short?'Short':''));
             }
             else
-			{
+            {
                 $conv_to_new_code=array('PR_DRAFT'=>'Draft','PR_OPEN'=>'Validated','PR_CLOSED'=>'Closed','PR_SIGNED'=>'Signed','PR_NOTSIGNED'=>'NotSigned','PR_FAC'=>'Billed');
                 if (! empty($conv_to_new_code[$obj['code']])) $key=$conv_to_new_code[$obj['code']];
 

Spacing +16 added lines, -16 removed lines

@@ -35,7 +35,7 @@ 
 	/**
 	 * @var string Error code (or message)
 	 */
-	public $error='';
+	public $error = '';
 
 
 	/**
@@ -60,18 +60,18 @@ 
      *    @param    string  $htmlname       Name of select field
      *    @return	void
      */
-    function selectProposalStatus($selected='',$short=0, $excludedraft=0, $showempty=1, $mode='customer',$htmlname='propal_statut')
+    function selectProposalStatus($selected = '', $short = 0, $excludedraft = 0, $showempty = 1, $mode = 'customer', $htmlname = 'propal_statut')
     {
         global $langs;
 
-        $prefix='';
-        $listofstatus=array();
+        $prefix = '';
+        $listofstatus = array();
         if ($mode == 'supplier')
         {
-            $prefix='SupplierProposalStatus';
+            $prefix = 'SupplierProposalStatus';
 
             $langs->load("supplier_proposal");
-            $listofstatus=array(
+            $listofstatus = array(
                 0=>array('id'=>0, 'code'=>'PR_DRAFT'),
                 1=>array('id'=>1, 'code'=>'PR_OPEN'),
                 2=>array('id'=>2, 'code'=>'PR_SIGNED'),
@@ -81,12 +81,12 @@ 
         }
         else
         {
-            $prefix="PropalStatus";
+            $prefix = "PropalStatus";
 
             $sql = "SELECT id, code, label, active FROM ".MAIN_DB_PREFIX."c_propalst";
             $sql .= " WHERE active = 1";
             dol_syslog(get_class($this)."::selectProposalStatus", LOG_DEBUG);
-            $resql=$this->db->query($sql);
+            $resql = $this->db->query($sql);
             if ($resql)
             {
                 $num = $this->db->num_rows($resql);
@@ -96,7 +96,7 @@ 
                     while ($i < $num)
                     {
                         $obj = $this->db->fetch_object($resql);
-                        $listofstatus[$obj->id]=array('id'=>$obj->id,'code'=>$obj->code,'label'=>$obj->label);
+                        $listofstatus[$obj->id] = array('id'=>$obj->id, 'code'=>$obj->code, 'label'=>$obj->label);
                         $i++;
                     }
                 }
@@ -110,7 +110,7 @@ 
         print '<select class="flat" name="'.$htmlname.'">';
         if ($showempty) print '<option value="-1">&nbsp;</option>';
 
-        foreach($listofstatus as $key => $obj)
+        foreach ($listofstatus as $key => $obj)
         {
             if ($excludedraft)
             {
@@ -128,17 +128,17 @@ 
             {
                 print '<option value="'.$obj['id'].'">';
             }
-            $key=$obj['code'];
-            if ($langs->trans($prefix.$key.($short?'Short':'')) != $prefix.$key.($short?'Short':''))
+            $key = $obj['code'];
+            if ($langs->trans($prefix.$key.($short ? 'Short' : '')) != $prefix.$key.($short ? 'Short' : ''))
             {
-                print $langs->trans($prefix.$key.($short?'Short':''));
+                print $langs->trans($prefix.$key.($short ? 'Short' : ''));
             }
             else
 			{
-                $conv_to_new_code=array('PR_DRAFT'=>'Draft','PR_OPEN'=>'Validated','PR_CLOSED'=>'Closed','PR_SIGNED'=>'Signed','PR_NOTSIGNED'=>'NotSigned','PR_FAC'=>'Billed');
-                if (! empty($conv_to_new_code[$obj['code']])) $key=$conv_to_new_code[$obj['code']];
+                $conv_to_new_code = array('PR_DRAFT'=>'Draft', 'PR_OPEN'=>'Validated', 'PR_CLOSED'=>'Closed', 'PR_SIGNED'=>'Signed', 'PR_NOTSIGNED'=>'NotSigned', 'PR_FAC'=>'Billed');
+                if (!empty($conv_to_new_code[$obj['code']])) $key = $conv_to_new_code[$obj['code']];
 
-                print ($langs->trans($prefix.$key.($short?'Short':''))!=$prefix.$key.($short?'Short':''))?$langs->trans($prefix.$key.($short?'Short':'')):($obj['label']?$obj['label']:$obj['code']);
+                print ($langs->trans($prefix.$key.($short ? 'Short' : '')) != $prefix.$key.($short ? 'Short' : '')) ? $langs->trans($prefix.$key.($short ? 'Short' : '')) : ($obj['label'] ? $obj['label'] : $obj['code']);
             }
             print '</option>';
             $i++;

Braces +10 added lines, -10 removed lines

@@ -78,8 +78,7 @@ 
                 3=>array('id'=>3, 'code'=>'PR_NOTSIGNED'),
                 4=>array('id'=>4, 'code'=>'PR_CLOSED')
             );
-        }
-        else
+        } else
         {
             $prefix="PropalStatus";
 
@@ -100,15 +99,16 @@ 
                         $i++;
                     }
                 }
-            }
-            else
+            } else
             {
                 dol_print_error($this->db);
             }
         }
 
         print '<select class="flat" name="'.$htmlname.'">';
-        if ($showempty) print '<option value="-1">&nbsp;</option>';
+        if ($showempty) {
+            print '<option value="-1">&nbsp;</option>';
+        }
 
         foreach($listofstatus as $key => $obj)
         {
@@ -123,8 +123,7 @@ 
             if ($selected != '' && $selected == $obj['id'])
             {
                 print '<option value="'.$obj['id'].'" selected>';
-            }
-            else
+            } else
             {
                 print '<option value="'.$obj['id'].'">';
             }
@@ -132,11 +131,12 @@ 
             if ($langs->trans($prefix.$key.($short?'Short':'')) != $prefix.$key.($short?'Short':''))
             {
                 print $langs->trans($prefix.$key.($short?'Short':''));
-            }
-            else
+            } else
 			{
                 $conv_to_new_code=array('PR_DRAFT'=>'Draft','PR_OPEN'=>'Validated','PR_CLOSED'=>'Closed','PR_SIGNED'=>'Signed','PR_NOTSIGNED'=>'NotSigned','PR_FAC'=>'Billed');
-                if (! empty($conv_to_new_code[$obj['code']])) $key=$conv_to_new_code[$obj['code']];
+                if (! empty($conv_to_new_code[$obj['code']])) {
+                    $key=$conv_to_new_code[$obj['code']];
+                }
 
                 print ($langs->trans($prefix.$key.($short?'Short':''))!=$prefix.$key.($short?'Short':''))?$langs->trans($prefix.$key.($short?'Short':'')):($obj['label']?$obj['label']:$obj['code']);
             }

dolibarr/htdocs/core/class/discount.class.php

Indentation +96 added lines, -96 removed lines

@@ -34,23 +34,23 @@ 
     public $db;
 
     /**
-	 * @var string Error code (or message)
-	 */
-	public $error;
+     * @var string Error code (or message)
+     */
+    public $error;
 
-	/**
-	 * @var string[]	Array of error strings
-	 */
-	public $errors=array();
+    /**
+     * @var string[]	Array of error strings
+     */
+    public $errors=array();
 
-	/**
-	 * @var int ID discount
-	 */
-	public $id;
+    /**
+     * @var int ID discount
+     */
+    public $id;
 
     /**
-	 * @var int Thirdparty ID
-	 */
+     * @var int Thirdparty ID
+     */
     public $fk_soc;
 
     public $discount_type;			// 0 => customer discount, 1 => supplier discount
@@ -60,14 +60,14 @@ 
     public $tva_tx;				// Vat rate
 
     /**
-	 * @var int User ID Id utilisateur qui accorde la remise
-	 */
-	public $fk_user;
+     * @var int User ID Id utilisateur qui accorde la remise
+     */
+    public $fk_user;
 
     /**
-	 * @var string description
-	 */
-	public $description;
+     * @var string description
+     */
+    public $description;
 
     public $datec;					// Date creation
 
@@ -111,7 +111,7 @@ 
      */
     function fetch($rowid, $fk_facture_source=0, $fk_invoice_supplier_source=0)
     {
-    	global $conf;
+        global $conf;
 
         // Check parameters
         if (! $rowid && ! $fk_facture_source && ! $fk_invoice_supplier_source)
@@ -288,29 +288,29 @@ 
         // Check if we can remove the discount
         if ($this->fk_invoice_supplier_source)
         {
-        	$sql="SELECT COUNT(rowid) as nb";
-        	$sql.=" FROM ".MAIN_DB_PREFIX."societe_remise_except";
-        	$sql.=" WHERE (fk_invoice_supplier_line IS NOT NULL";	// Not used as absolute simple discount
-        	$sql.=" OR fk_invoice_supplier IS NOT NULL)"; 			// Not used as credit note and not used as deposit
-        	$sql.=" AND fk_invoice_supplier_source = ".$this->fk_invoice_supplier_source;
-        	//$sql.=" AND rowid != ".$this->id;
-
-        	dol_syslog(get_class($this)."::delete Check if we can remove discount", LOG_DEBUG);
-        	$resql=$this->db->query($sql);
-        	if ($resql)
-        	{
-        		$obj = $this->db->fetch_object($resql);
-        		if ($obj->nb > 0)
-        		{
-        			$this->error='ErrorThisPartOrAnotherIsAlreadyUsedSoDiscountSerieCantBeRemoved';
-        			return -2;
-        		}
-        	}
-        	else
-        	{
-        		dol_print_error($this->db);
-        		return -1;
-        	}
+            $sql="SELECT COUNT(rowid) as nb";
+            $sql.=" FROM ".MAIN_DB_PREFIX."societe_remise_except";
+            $sql.=" WHERE (fk_invoice_supplier_line IS NOT NULL";	// Not used as absolute simple discount
+            $sql.=" OR fk_invoice_supplier IS NOT NULL)"; 			// Not used as credit note and not used as deposit
+            $sql.=" AND fk_invoice_supplier_source = ".$this->fk_invoice_supplier_source;
+            //$sql.=" AND rowid != ".$this->id;
+
+            dol_syslog(get_class($this)."::delete Check if we can remove discount", LOG_DEBUG);
+            $resql=$this->db->query($sql);
+            if ($resql)
+            {
+                $obj = $this->db->fetch_object($resql);
+                if ($obj->nb > 0)
+                {
+                    $this->error='ErrorThisPartOrAnotherIsAlreadyUsedSoDiscountSerieCantBeRemoved';
+                    return -2;
+                }
+            }
+            else
+            {
+                dol_print_error($this->db);
+                return -1;
+            }
         }
 
         $this->db->begin();
@@ -352,23 +352,23 @@ 
             }
             elseif($this->fk_invoice_supplier_source) {
 
-            	$sql = "UPDATE ".MAIN_DB_PREFIX."facture_fourn";
-            	$sql.=" set paye=0, fk_statut=1";
-            	$sql.=" WHERE (type = 2 or type = 3) AND rowid=".$this->fk_invoice_supplier_source;
-
-            	dol_syslog(get_class($this)."::delete Update credit note or deposit invoice statut", LOG_DEBUG);
-            	$result=$this->db->query($sql);
-            	if ($result)
-            	{
-            		$this->db->commit();
-            		return 1;
-            	}
-            	else
-            	{
-            		$this->error=$this->db->lasterror();
-            		$this->db->rollback();
-            		return -1;
-            	}
+                $sql = "UPDATE ".MAIN_DB_PREFIX."facture_fourn";
+                $sql.=" set paye=0, fk_statut=1";
+                $sql.=" WHERE (type = 2 or type = 3) AND rowid=".$this->fk_invoice_supplier_source;
+
+                dol_syslog(get_class($this)."::delete Update credit note or deposit invoice statut", LOG_DEBUG);
+                $result=$this->db->query($sql);
+                if ($result)
+                {
+                    $this->db->commit();
+                    return 1;
+                }
+                else
+                {
+                    $this->error=$this->db->lasterror();
+                    $this->db->rollback();
+                    return -1;
+                }
             }
             else
             {
@@ -413,11 +413,11 @@ 
 
         $sql ="UPDATE ".MAIN_DB_PREFIX."societe_remise_except";
         if(! empty($this->discount_type)) {
-        	if ($rowidline)    $sql.=" SET fk_invoice_supplier_line = ".$rowidline;
-        	if ($rowidinvoice) $sql.=" SET fk_invoice_supplier = ".$rowidinvoice;
+            if ($rowidline)    $sql.=" SET fk_invoice_supplier_line = ".$rowidline;
+            if ($rowidinvoice) $sql.=" SET fk_invoice_supplier = ".$rowidinvoice;
         } else {
-        	if ($rowidline)    $sql.=" SET fk_facture_line = ".$rowidline;
-        	if ($rowidinvoice) $sql.=" SET fk_facture = ".$rowidinvoice;
+            if ($rowidline)    $sql.=" SET fk_facture_line = ".$rowidline;
+            if ($rowidinvoice) $sql.=" SET fk_facture = ".$rowidinvoice;
         }
         $sql.=" WHERE rowid = ".$this->id;
 
@@ -425,13 +425,13 @@ 
         $resql = $this->db->query($sql);
         if ($resql)
         {
-        	if(! empty($this->discount_type)) {
-        		$this->fk_invoice_supplier_line=$rowidline;
-        		$this->fk_invoice_supplier=$rowidinvoice;
-        	} else {
-        		$this->fk_facture_line=$rowidline;
-        		$this->fk_facture=$rowidinvoice;
-        	}
+            if(! empty($this->discount_type)) {
+                $this->fk_invoice_supplier_line=$rowidline;
+                $this->fk_invoice_supplier=$rowidinvoice;
+            } else {
+                $this->fk_facture_line=$rowidline;
+                $this->fk_facture=$rowidinvoice;
+            }
             return 1;
         }
         else
@@ -453,11 +453,11 @@ 
     {
         // phpcs:enable
         $sql ="UPDATE ".MAIN_DB_PREFIX."societe_remise_except";
-		if(! empty($this->discount_type)) {
-       		$sql.=" SET fk_invoice_supplier_line = NULL, fk_invoice_supplier = NULL";
-		} else {
-			$sql.=" SET fk_facture_line = NULL, fk_facture = NULL";
-		}
+        if(! empty($this->discount_type)) {
+                $sql.=" SET fk_invoice_supplier_line = NULL, fk_invoice_supplier = NULL";
+        } else {
+            $sql.=" SET fk_facture_line = NULL, fk_facture = NULL";
+        }
         $sql.=" WHERE rowid = ".$this->id;
 
         dol_syslog(get_class($this)."::unlink_invoice", LOG_DEBUG);
@@ -486,7 +486,7 @@ 
      */
     function getAvailableDiscounts($company='', $user='',$filter='', $maxvalue=0, $discount_type=0)
     {
-    	global $conf;
+        global $conf;
 
         $sql  = "SELECT SUM(rc.amount_ttc) as amount";
         //$sql  = "SELECT rc.amount_ttc as amount";
@@ -494,9 +494,9 @@ 
         $sql.= " WHERE rc.entity = " . $conf->entity;
         $sql.= " AND rc.discount_type=".intval($discount_type);
         if (! empty($discount_type)) {
-        	$sql.= " AND (rc.fk_invoice_supplier IS NULL AND rc.fk_invoice_supplier_line IS NULL)"; // Available from supplier
+            $sql.= " AND (rc.fk_invoice_supplier IS NULL AND rc.fk_invoice_supplier_line IS NULL)"; // Available from supplier
         } else {
-        	$sql.= " AND (rc.fk_facture IS NULL AND rc.fk_facture_line IS NULL)"; // Available to customer
+            $sql.= " AND (rc.fk_facture IS NULL AND rc.fk_facture_line IS NULL)"; // Available to customer
         }
         if (is_object($company)) $sql.= " AND rc.fk_soc = ".$company->id;
         if (is_object($user))    $sql.= " AND rc.fk_user = ".$user->id;
@@ -524,7 +524,7 @@ 
      *  Should always be empty, except if option FACTURE_DEPOSITS_ARE_JUST_PAYMENTS is on (not recommended).
      *
      *	@param		CommonInvoice	$invoice		Object invoice (customer of supplier)
-	 *  @param 		int 		    $multicurrency 	Return multicurrency_amount instead of amount
+     *  @param 		int 		    $multicurrency 	Return multicurrency_amount instead of amount
      *	@return		int				     			<0 if KO, Sum of credit notes and deposits amount otherwise
      */
     function getSumDepositsUsed($invoice, $multicurrency=0)
@@ -557,7 +557,7 @@ 
         {
             $obj = $this->db->fetch_object($resql);
             if ($multicurrency) return $obj->multicurrency_amount;
-			else return $obj->amount;
+            else return $obj->amount;
         }
         else
         {
@@ -570,7 +570,7 @@ 
      *  Return amount (with tax) of all credit notes invoices + excess received used by invoice as a payment
      *
      *	@param		CommonInvoice	  $invoice	    	Object invoice
-	 *	@param		int			      $multicurrency	Return multicurrency_amount instead of amount
+     *	@param		int			      $multicurrency	Return multicurrency_amount instead of amount
      *	@return		int					        		<0 if KO, Sum of credit notes and excess received amount otherwise
      */
     function getSumCreditNotesUsed($invoice, $multicurrency=0)
@@ -603,7 +603,7 @@ 
         {
             $obj = $this->db->fetch_object($resql);
             if ($multicurrency) return $obj->multicurrency_amount;
-			else return $obj->amount;
+            else return $obj->amount;
         }
         else
         {
@@ -650,22 +650,22 @@ 
     }
 
 
-	/**
+    /**
      *  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()
-	{
-		global $user,$langs,$conf;
-
-		$this->fk_soc         = 1;
-		$this->amount_ht      = 10;
-		$this->amount_tva     = 1.96;
-		$this->amount_ttc     = 11.96;
-		$this->tva_tx         = 19.6;
-		$this->description    = 'Specimen discount';
-	}
+     */
+    function initAsSpecimen()
+    {
+        global $user,$langs,$conf;
+
+        $this->fk_soc         = 1;
+        $this->amount_ht      = 10;
+        $this->amount_tva     = 1.96;
+        $this->amount_ttc     = 11.96;
+        $this->tva_tx         = 19.6;
+        $this->description    = 'Specimen discount';
+    }
 }

Spacing +156 added lines, -156 removed lines

@@ -41,7 +41,7 @@ 
 	/**
 	 * @var string[]	Array of error strings
 	 */
-	public $errors=array();
+	public $errors = array();
 
 	/**
 	 * @var int ID discount
@@ -53,11 +53,11 @@ 
 	 */
     public $fk_soc;
 
-    public $discount_type;			// 0 => customer discount, 1 => supplier discount
-    public $amount_ht;				//
-    public $amount_tva;			//
-    public $amount_ttc;			//
-    public $tva_tx;				// Vat rate
+    public $discount_type; // 0 => customer discount, 1 => supplier discount
+    public $amount_ht; //
+    public $amount_tva; //
+    public $amount_ttc; //
+    public $tva_tx; // Vat rate
 
     /**
 	 * @var int User ID Id utilisateur qui accorde la remise
@@ -69,7 +69,7 @@ 
 	 */
 	public $description;
 
-    public $datec;					// Date creation
+    public $datec; // Date creation
 
     /**
      * @var int ID invoice line when a discount is used into an invoice line (for absolute discounts)
@@ -86,7 +86,7 @@ 
      */
     public $fk_facture_source;
 
-    public $ref_facture_source;	    // Ref credit note having caused the discount
+    public $ref_facture_source; // Ref credit note having caused the discount
 
     public $ref_invoice_supplier_source;
 
@@ -109,31 +109,31 @@ 
      *  @param		int		$fk_invoice_supplier_source		fk_invoice_supplier_source
      *	@return		int										<0 if KO, =0 if not found, >0 if OK
      */
-    function fetch($rowid, $fk_facture_source=0, $fk_invoice_supplier_source=0)
+    function fetch($rowid, $fk_facture_source = 0, $fk_invoice_supplier_source = 0)
     {
     	global $conf;
 
         // Check parameters
-        if (! $rowid && ! $fk_facture_source && ! $fk_invoice_supplier_source)
+        if (!$rowid && !$fk_facture_source && !$fk_invoice_supplier_source)
         {
-            $this->error='ErrorBadParameters';
+            $this->error = 'ErrorBadParameters';
             return -1;
         }
 
         $sql = "SELECT sr.rowid, sr.fk_soc, sr.discount_type,";
-        $sql.= " sr.fk_user,";
-        $sql.= " sr.amount_ht, sr.amount_tva, sr.amount_ttc, sr.tva_tx,";
-        $sql.= " sr.multicurrency_amount_ht, sr.multicurrency_amount_tva, sr.multicurrency_amount_ttc,";
-        $sql.= " sr.fk_facture_line, sr.fk_facture, sr.fk_facture_source, sr.fk_invoice_supplier_line, sr.fk_invoice_supplier, sr.fk_invoice_supplier_source, sr.description,";
-        $sql.= " sr.datec,";
-        $sql.= " f.ref as ref_facture_source, fsup.ref as ref_invoice_supplier_source";
-        $sql.= " FROM ".MAIN_DB_PREFIX."societe_remise_except as sr";
-        $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."facture as f ON sr.fk_facture_source = f.rowid";
-        $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."facture as fsup ON sr.fk_invoice_supplier_source = fsup.rowid";
-        $sql.= " WHERE sr.entity = " . $conf->entity;
-        if ($rowid) $sql.= " AND sr.rowid=".$rowid;
-        if ($fk_facture_source) $sql.= " AND sr.fk_facture_source=".$fk_facture_source;
-        if ($fk_invoice_supplier_source) $sql.= " AND sr.fk_invoice_supplier_source=".$fk_invoice_supplier_source;
+        $sql .= " sr.fk_user,";
+        $sql .= " sr.amount_ht, sr.amount_tva, sr.amount_ttc, sr.tva_tx,";
+        $sql .= " sr.multicurrency_amount_ht, sr.multicurrency_amount_tva, sr.multicurrency_amount_ttc,";
+        $sql .= " sr.fk_facture_line, sr.fk_facture, sr.fk_facture_source, sr.fk_invoice_supplier_line, sr.fk_invoice_supplier, sr.fk_invoice_supplier_source, sr.description,";
+        $sql .= " sr.datec,";
+        $sql .= " f.ref as ref_facture_source, fsup.ref as ref_invoice_supplier_source";
+        $sql .= " FROM ".MAIN_DB_PREFIX."societe_remise_except as sr";
+        $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."facture as f ON sr.fk_facture_source = f.rowid";
+        $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."facture as fsup ON sr.fk_invoice_supplier_source = fsup.rowid";
+        $sql .= " WHERE sr.entity = ".$conf->entity;
+        if ($rowid) $sql .= " AND sr.rowid=".$rowid;
+        if ($fk_facture_source) $sql .= " AND sr.fk_facture_source=".$fk_facture_source;
+        if ($fk_invoice_supplier_source) $sql .= " AND sr.fk_invoice_supplier_source=".$fk_invoice_supplier_source;
 
         dol_syslog(get_class($this)."::fetch", LOG_DEBUG);
         $resql = $this->db->query($sql);
@@ -159,12 +159,12 @@ 
                 $this->fk_user = $obj->fk_user;
                 $this->fk_facture_line = $obj->fk_facture_line;
                 $this->fk_facture = $obj->fk_facture;
-                $this->fk_facture_source = $obj->fk_facture_source;		// Id avoir source
-                $this->ref_facture_source = $obj->ref_facture_source;	// Ref avoir source
+                $this->fk_facture_source = $obj->fk_facture_source; // Id avoir source
+                $this->ref_facture_source = $obj->ref_facture_source; // Ref avoir source
                 $this->fk_invoice_supplier_line = $obj->fk_invoice_supplier_line;
                 $this->fk_invoice_supplier = $obj->fk_invoice_supplier;
-                $this->fk_invoice_supplier_source = $obj->fk_invoice_supplier_source;		// Id avoir source
-                $this->ref_invoice_supplier_source = $obj->ref_invoice_supplier_source;	// Ref avoir source
+                $this->fk_invoice_supplier_source = $obj->fk_invoice_supplier_source; // Id avoir source
+                $this->ref_invoice_supplier_source = $obj->ref_invoice_supplier_source; // Ref avoir source
                 $this->description = $obj->description;
                 $this->datec = $this->db->jdate($obj->datec);
 
@@ -179,7 +179,7 @@ 
         }
         else
         {
-            $this->error=$this->db->error();
+            $this->error = $this->db->error();
             return -1;
         }
     }
@@ -196,52 +196,52 @@ 
         global $conf, $langs;
 
         // Clean parameters
-        $this->amount_ht=price2num($this->amount_ht);
-        $this->amount_tva=price2num($this->amount_tva);
-        $this->amount_ttc=price2num($this->amount_ttc);
+        $this->amount_ht = price2num($this->amount_ht);
+        $this->amount_tva = price2num($this->amount_tva);
+        $this->amount_ttc = price2num($this->amount_ttc);
 
-        $this->tva_tx=price2num($this->tva_tx);
+        $this->tva_tx = price2num($this->tva_tx);
 
-        $this->multicurrency_amount_ht=price2num($this->multicurrency_amount_ht);
-        $this->multicurrency_amount_tva=price2num($this->multicurrency_amount_tva);
-        $this->multicurrency_amount_ttc=price2num($this->multicurrency_amount_ttc);
+        $this->multicurrency_amount_ht = price2num($this->multicurrency_amount_ht);
+        $this->multicurrency_amount_tva = price2num($this->multicurrency_amount_tva);
+        $this->multicurrency_amount_ttc = price2num($this->multicurrency_amount_ttc);
 
-        if (empty($this->multicurrency_amount_ht)) $this->multicurrency_amount_ht=0;
-        if (empty($this->multicurrency_amount_tva)) $this->multicurrency_amount_tva=0;
-        if (empty($this->multicurrency_amount_ttc)) $this->multicurrency_amount_ttc=0;
+        if (empty($this->multicurrency_amount_ht)) $this->multicurrency_amount_ht = 0;
+        if (empty($this->multicurrency_amount_tva)) $this->multicurrency_amount_tva = 0;
+        if (empty($this->multicurrency_amount_ttc)) $this->multicurrency_amount_ttc = 0;
 
         // Check parameters
         if (empty($this->description))
         {
-            $this->error='BadValueForPropertyDescription';
+            $this->error = 'BadValueForPropertyDescription';
             dol_syslog(get_class($this)."::create ".$this->error, LOG_ERR);
             return -1;
         }
 
         // Insert request
         $sql = "INSERT INTO ".MAIN_DB_PREFIX."societe_remise_except";
-        $sql.= " (entity, datec, fk_soc, discount_type, fk_user, description,";
-        $sql.= " amount_ht, amount_tva, amount_ttc, tva_tx,";
-        $sql.= " multicurrency_amount_ht, multicurrency_amount_tva, multicurrency_amount_ttc,";
-        $sql.= " fk_facture_source, fk_invoice_supplier_source";
-        $sql.= ")";
-        $sql.= " VALUES (".$conf->entity.", '".$this->db->idate($this->datec!=''?$this->datec:dol_now())."', ".$this->fk_soc.", ".(empty($this->discount_type)?0:intval($this->discount_type)).", ".$user->id.", '".$this->db->escape($this->description)."',";
-        $sql.= " ".$this->amount_ht.", ".$this->amount_tva.", ".$this->amount_ttc.", ".$this->tva_tx.",";
-        $sql.= " ".$this->multicurrency_amount_ht.", ".$this->multicurrency_amount_tva.", ".$this->multicurrency_amount_ttc.", ";
-        $sql.= " ".($this->fk_facture_source ? "'".$this->db->escape($this->fk_facture_source)."'":"null").",";
-        $sql.= " ".($this->fk_invoice_supplier_source ? "'".$this->db->escape($this->fk_invoice_supplier_source)."'":"null");
-        $sql.= ")";
+        $sql .= " (entity, datec, fk_soc, discount_type, fk_user, description,";
+        $sql .= " amount_ht, amount_tva, amount_ttc, tva_tx,";
+        $sql .= " multicurrency_amount_ht, multicurrency_amount_tva, multicurrency_amount_ttc,";
+        $sql .= " fk_facture_source, fk_invoice_supplier_source";
+        $sql .= ")";
+        $sql .= " VALUES (".$conf->entity.", '".$this->db->idate($this->datec != '' ? $this->datec : dol_now())."', ".$this->fk_soc.", ".(empty($this->discount_type) ? 0 : intval($this->discount_type)).", ".$user->id.", '".$this->db->escape($this->description)."',";
+        $sql .= " ".$this->amount_ht.", ".$this->amount_tva.", ".$this->amount_ttc.", ".$this->tva_tx.",";
+        $sql .= " ".$this->multicurrency_amount_ht.", ".$this->multicurrency_amount_tva.", ".$this->multicurrency_amount_ttc.", ";
+        $sql .= " ".($this->fk_facture_source ? "'".$this->db->escape($this->fk_facture_source)."'" : "null").",";
+        $sql .= " ".($this->fk_invoice_supplier_source ? "'".$this->db->escape($this->fk_invoice_supplier_source)."'" : "null");
+        $sql .= ")";
 
         dol_syslog(get_class($this)."::create", LOG_DEBUG);
-        $resql=$this->db->query($sql);
+        $resql = $this->db->query($sql);
         if ($resql)
         {
-            $this->id=$this->db->last_insert_id(MAIN_DB_PREFIX."societe_remise_except");
+            $this->id = $this->db->last_insert_id(MAIN_DB_PREFIX."societe_remise_except");
             return $this->id;
         }
         else
         {
-            $this->error=$this->db->lasterror().' - sql='.$sql;
+            $this->error = $this->db->lasterror().' - sql='.$sql;
             return -1;
         }
     }
@@ -260,21 +260,21 @@ 
         // Check if we can remove the discount
         if ($this->fk_facture_source)
         {
-            $sql="SELECT COUNT(rowid) as nb";
-            $sql.=" FROM ".MAIN_DB_PREFIX."societe_remise_except";
-            $sql.=" WHERE (fk_facture_line IS NOT NULL";	// Not used as absolute simple discount
-            $sql.=" OR fk_facture IS NOT NULL)"; 			// Not used as credit note and not used as deposit
-            $sql.=" AND fk_facture_source = ".$this->fk_facture_source;
+            $sql = "SELECT COUNT(rowid) as nb";
+            $sql .= " FROM ".MAIN_DB_PREFIX."societe_remise_except";
+            $sql .= " WHERE (fk_facture_line IS NOT NULL"; // Not used as absolute simple discount
+            $sql .= " OR fk_facture IS NOT NULL)"; // Not used as credit note and not used as deposit
+            $sql .= " AND fk_facture_source = ".$this->fk_facture_source;
             //$sql.=" AND rowid != ".$this->id;
 
             dol_syslog(get_class($this)."::delete Check if we can remove discount", LOG_DEBUG);
-            $resql=$this->db->query($sql);
+            $resql = $this->db->query($sql);
             if ($resql)
             {
                 $obj = $this->db->fetch_object($resql);
                 if ($obj->nb > 0)
                 {
-                    $this->error='ErrorThisPartOrAnotherIsAlreadyUsedSoDiscountSerieCantBeRemoved';
+                    $this->error = 'ErrorThisPartOrAnotherIsAlreadyUsedSoDiscountSerieCantBeRemoved';
                     return -2;
                 }
             }
@@ -288,21 +288,21 @@ 
         // Check if we can remove the discount
         if ($this->fk_invoice_supplier_source)
         {
-        	$sql="SELECT COUNT(rowid) as nb";
-        	$sql.=" FROM ".MAIN_DB_PREFIX."societe_remise_except";
-        	$sql.=" WHERE (fk_invoice_supplier_line IS NOT NULL";	// Not used as absolute simple discount
-        	$sql.=" OR fk_invoice_supplier IS NOT NULL)"; 			// Not used as credit note and not used as deposit
-        	$sql.=" AND fk_invoice_supplier_source = ".$this->fk_invoice_supplier_source;
+        	$sql = "SELECT COUNT(rowid) as nb";
+        	$sql .= " FROM ".MAIN_DB_PREFIX."societe_remise_except";
+        	$sql .= " WHERE (fk_invoice_supplier_line IS NOT NULL"; // Not used as absolute simple discount
+        	$sql .= " OR fk_invoice_supplier IS NOT NULL)"; // Not used as credit note and not used as deposit
+        	$sql .= " AND fk_invoice_supplier_source = ".$this->fk_invoice_supplier_source;
         	//$sql.=" AND rowid != ".$this->id;
 
         	dol_syslog(get_class($this)."::delete Check if we can remove discount", LOG_DEBUG);
-        	$resql=$this->db->query($sql);
+        	$resql = $this->db->query($sql);
         	if ($resql)
         	{
         		$obj = $this->db->fetch_object($resql);
         		if ($obj->nb > 0)
         		{
-        			$this->error='ErrorThisPartOrAnotherIsAlreadyUsedSoDiscountSerieCantBeRemoved';
+        			$this->error = 'ErrorThisPartOrAnotherIsAlreadyUsedSoDiscountSerieCantBeRemoved';
         			return -2;
         		}
         	}
@@ -317,27 +317,27 @@ 
 
         // Delete but only if not used
         $sql = "DELETE FROM ".MAIN_DB_PREFIX."societe_remise_except ";
-        if ($this->fk_facture_source) $sql.= " WHERE fk_facture_source = ".$this->fk_facture_source;	// Delete all lines of same serie
-        elseif ($this->fk_invoice_supplier_source) $sql.= " WHERE fk_invoice_supplier_source = ".$this->fk_invoice_supplier_source;	// Delete all lines of same serie
-        else $sql.= " WHERE rowid = ".$this->id;	// Delete only line
-        $sql.= " AND (fk_facture_line IS NULL";	// Not used as absolute simple discount
-        $sql.= " AND fk_facture IS NULL)";		// Not used as credit note and not used as deposit
-        $sql.= " AND (fk_invoice_supplier_line IS NULL";	// Not used as absolute simple discount
-        $sql.= " AND fk_invoice_supplier IS NULL)";		// Not used as credit note and not used as deposit
+        if ($this->fk_facture_source) $sql .= " WHERE fk_facture_source = ".$this->fk_facture_source; // Delete all lines of same serie
+        elseif ($this->fk_invoice_supplier_source) $sql .= " WHERE fk_invoice_supplier_source = ".$this->fk_invoice_supplier_source; // Delete all lines of same serie
+        else $sql .= " WHERE rowid = ".$this->id; // Delete only line
+        $sql .= " AND (fk_facture_line IS NULL"; // Not used as absolute simple discount
+        $sql .= " AND fk_facture IS NULL)"; // Not used as credit note and not used as deposit
+        $sql .= " AND (fk_invoice_supplier_line IS NULL"; // Not used as absolute simple discount
+        $sql .= " AND fk_invoice_supplier IS NULL)"; // Not used as credit note and not used as deposit
 
         dol_syslog(get_class($this)."::delete Delete discount", LOG_DEBUG);
-        $result=$this->db->query($sql);
+        $result = $this->db->query($sql);
         if ($result)
         {
             // If source of discount was a credit note or deposit, we change source statut.
             if ($this->fk_facture_source)
             {
                 $sql = "UPDATE ".MAIN_DB_PREFIX."facture";
-                $sql.=" set paye=0, fk_statut=1";
-                $sql.=" WHERE (type = 2 or type = 3) AND rowid=".$this->fk_facture_source;
+                $sql .= " set paye=0, fk_statut=1";
+                $sql .= " WHERE (type = 2 or type = 3) AND rowid=".$this->fk_facture_source;
 
                 dol_syslog(get_class($this)."::delete Update credit note or deposit invoice statut", LOG_DEBUG);
-                $result=$this->db->query($sql);
+                $result = $this->db->query($sql);
                 if ($result)
                 {
                     $this->db->commit();
@@ -345,19 +345,19 @@ 
                 }
                 else
                 {
-                    $this->error=$this->db->lasterror();
+                    $this->error = $this->db->lasterror();
                     $this->db->rollback();
                     return -1;
                 }
             }
-            elseif($this->fk_invoice_supplier_source) {
+            elseif ($this->fk_invoice_supplier_source) {
 
             	$sql = "UPDATE ".MAIN_DB_PREFIX."facture_fourn";
-            	$sql.=" set paye=0, fk_statut=1";
-            	$sql.=" WHERE (type = 2 or type = 3) AND rowid=".$this->fk_invoice_supplier_source;
+            	$sql .= " set paye=0, fk_statut=1";
+            	$sql .= " WHERE (type = 2 or type = 3) AND rowid=".$this->fk_invoice_supplier_source;
 
             	dol_syslog(get_class($this)."::delete Update credit note or deposit invoice statut", LOG_DEBUG);
-            	$result=$this->db->query($sql);
+            	$result = $this->db->query($sql);
             	if ($result)
             	{
             		$this->db->commit();
@@ -365,7 +365,7 @@ 
             	}
             	else
             	{
-            		$this->error=$this->db->lasterror();
+            		$this->error = $this->db->lasterror();
             		$this->db->rollback();
             		return -1;
             	}
@@ -378,7 +378,7 @@ 
         }
         else
         {
-            $this->error=$this->db->lasterror();
+            $this->error = $this->db->lasterror();
             $this->db->rollback();
             return -1;
         }
@@ -396,47 +396,47 @@ 
      *	@param		int		$rowidinvoice	Invoice id (To use discount as a credit note to reduc payment of invoice)
      *	@return		int						<0 if KO, >0 if OK
      */
-    function link_to_invoice($rowidline,$rowidinvoice)
+    function link_to_invoice($rowidline, $rowidinvoice)
     {
         // phpcs:enable
         // Check parameters
-        if (! $rowidline && ! $rowidinvoice)
+        if (!$rowidline && !$rowidinvoice)
         {
-            $this->error='ErrorBadParameters';
+            $this->error = 'ErrorBadParameters';
             return -1;
         }
         if ($rowidline && $rowidinvoice)
         {
-            $this->error='ErrorBadParameters';
+            $this->error = 'ErrorBadParameters';
             return -2;
         }
 
-        $sql ="UPDATE ".MAIN_DB_PREFIX."societe_remise_except";
-        if(! empty($this->discount_type)) {
-        	if ($rowidline)    $sql.=" SET fk_invoice_supplier_line = ".$rowidline;
-        	if ($rowidinvoice) $sql.=" SET fk_invoice_supplier = ".$rowidinvoice;
+        $sql = "UPDATE ".MAIN_DB_PREFIX."societe_remise_except";
+        if (!empty($this->discount_type)) {
+        	if ($rowidline)    $sql .= " SET fk_invoice_supplier_line = ".$rowidline;
+        	if ($rowidinvoice) $sql .= " SET fk_invoice_supplier = ".$rowidinvoice;
         } else {
-        	if ($rowidline)    $sql.=" SET fk_facture_line = ".$rowidline;
-        	if ($rowidinvoice) $sql.=" SET fk_facture = ".$rowidinvoice;
+        	if ($rowidline)    $sql .= " SET fk_facture_line = ".$rowidline;
+        	if ($rowidinvoice) $sql .= " SET fk_facture = ".$rowidinvoice;
         }
-        $sql.=" WHERE rowid = ".$this->id;
+        $sql .= " WHERE rowid = ".$this->id;
 
         dol_syslog(get_class($this)."::link_to_invoice", LOG_DEBUG);
         $resql = $this->db->query($sql);
         if ($resql)
         {
-        	if(! empty($this->discount_type)) {
-        		$this->fk_invoice_supplier_line=$rowidline;
-        		$this->fk_invoice_supplier=$rowidinvoice;
+        	if (!empty($this->discount_type)) {
+        		$this->fk_invoice_supplier_line = $rowidline;
+        		$this->fk_invoice_supplier = $rowidinvoice;
         	} else {
-        		$this->fk_facture_line=$rowidline;
-        		$this->fk_facture=$rowidinvoice;
+        		$this->fk_facture_line = $rowidline;
+        		$this->fk_facture = $rowidinvoice;
         	}
             return 1;
         }
         else
         {
-            $this->error=$this->db->error();
+            $this->error = $this->db->error();
             return -3;
         }
     }
@@ -452,13 +452,13 @@ 
     function unlink_invoice()
     {
         // phpcs:enable
-        $sql ="UPDATE ".MAIN_DB_PREFIX."societe_remise_except";
-		if(! empty($this->discount_type)) {
-       		$sql.=" SET fk_invoice_supplier_line = NULL, fk_invoice_supplier = NULL";
+        $sql = "UPDATE ".MAIN_DB_PREFIX."societe_remise_except";
+		if (!empty($this->discount_type)) {
+       		$sql .= " SET fk_invoice_supplier_line = NULL, fk_invoice_supplier = NULL";
 		} else {
-			$sql.=" SET fk_facture_line = NULL, fk_facture = NULL";
+			$sql .= " SET fk_facture_line = NULL, fk_facture = NULL";
 		}
-        $sql.=" WHERE rowid = ".$this->id;
+        $sql .= " WHERE rowid = ".$this->id;
 
         dol_syslog(get_class($this)."::unlink_invoice", LOG_DEBUG);
         $resql = $this->db->query($sql);
@@ -468,7 +468,7 @@ 
         }
         else
         {
-            $this->error=$this->db->error();
+            $this->error = $this->db->error();
             return -3;
         }
     }
@@ -484,27 +484,27 @@ 
      *  @param      int			$discount_type  0 => customer discount, 1 => supplier discount
      * 	@return		int						<0 if KO, amount otherwise
      */
-    function getAvailableDiscounts($company='', $user='',$filter='', $maxvalue=0, $discount_type=0)
+    function getAvailableDiscounts($company = '', $user = '', $filter = '', $maxvalue = 0, $discount_type = 0)
     {
     	global $conf;
 
-        $sql  = "SELECT SUM(rc.amount_ttc) as amount";
+        $sql = "SELECT SUM(rc.amount_ttc) as amount";
         //$sql  = "SELECT rc.amount_ttc as amount";
-        $sql.= " FROM ".MAIN_DB_PREFIX."societe_remise_except as rc";
-        $sql.= " WHERE rc.entity = " . $conf->entity;
-        $sql.= " AND rc.discount_type=".intval($discount_type);
-        if (! empty($discount_type)) {
-        	$sql.= " AND (rc.fk_invoice_supplier IS NULL AND rc.fk_invoice_supplier_line IS NULL)"; // Available from supplier
+        $sql .= " FROM ".MAIN_DB_PREFIX."societe_remise_except as rc";
+        $sql .= " WHERE rc.entity = ".$conf->entity;
+        $sql .= " AND rc.discount_type=".intval($discount_type);
+        if (!empty($discount_type)) {
+        	$sql .= " AND (rc.fk_invoice_supplier IS NULL AND rc.fk_invoice_supplier_line IS NULL)"; // Available from supplier
         } else {
-        	$sql.= " AND (rc.fk_facture IS NULL AND rc.fk_facture_line IS NULL)"; // Available to customer
+        	$sql .= " AND (rc.fk_facture IS NULL AND rc.fk_facture_line IS NULL)"; // Available to customer
         }
-        if (is_object($company)) $sql.= " AND rc.fk_soc = ".$company->id;
-        if (is_object($user))    $sql.= " AND rc.fk_user = ".$user->id;
-        if ($filter)   $sql.=' AND ('.$filter.')';
-        if ($maxvalue) $sql.=' AND rc.amount_ttc <= '.price2num($maxvalue);
+        if (is_object($company)) $sql .= " AND rc.fk_soc = ".$company->id;
+        if (is_object($user))    $sql .= " AND rc.fk_user = ".$user->id;
+        if ($filter)   $sql .= ' AND ('.$filter.')';
+        if ($maxvalue) $sql .= ' AND rc.amount_ttc <= '.price2num($maxvalue);
 
         dol_syslog(get_class($this)."::getAvailableDiscounts", LOG_DEBUG);
-        $resql=$this->db->query($sql);
+        $resql = $this->db->query($sql);
         if ($resql)
         {
             $obj = $this->db->fetch_object($resql);
@@ -527,32 +527,32 @@ 
 	 *  @param 		int 		    $multicurrency 	Return multicurrency_amount instead of amount
      *	@return		int				     			<0 if KO, Sum of credit notes and deposits amount otherwise
      */
-    function getSumDepositsUsed($invoice, $multicurrency=0)
+    function getSumDepositsUsed($invoice, $multicurrency = 0)
     {
         dol_syslog(get_class($this)."::getSumDepositsUsed", LOG_DEBUG);
 
         if ($invoice->element == 'facture' || $invoice->element == 'invoice')
         {
             $sql = 'SELECT sum(rc.amount_ttc) as amount, sum(rc.multicurrency_amount_ttc) as multicurrency_amount';
-            $sql.= ' FROM '.MAIN_DB_PREFIX.'societe_remise_except as rc, '.MAIN_DB_PREFIX.'facture as f';
-            $sql.= ' WHERE rc.fk_facture_source=f.rowid AND rc.fk_facture = '.$invoice->id;
-            $sql.= ' AND f.type = 3';
+            $sql .= ' FROM '.MAIN_DB_PREFIX.'societe_remise_except as rc, '.MAIN_DB_PREFIX.'facture as f';
+            $sql .= ' WHERE rc.fk_facture_source=f.rowid AND rc.fk_facture = '.$invoice->id;
+            $sql .= ' AND f.type = 3';
         }
         else if ($invoice->element == 'invoice_supplier')
         {
             $sql = 'SELECT sum(rc.amount_ttc) as amount, sum(rc.multicurrency_amount_ttc) as multicurrency_amount';
-            $sql.= ' FROM '.MAIN_DB_PREFIX.'societe_remise_except as rc, '.MAIN_DB_PREFIX.'facture_fourn as f';
-            $sql.= ' WHERE rc.fk_invoice_supplier_source=f.rowid AND rc.fk_invoice_supplier = '.$invoice->id;
-            $sql.= ' AND f.type = 3';
+            $sql .= ' FROM '.MAIN_DB_PREFIX.'societe_remise_except as rc, '.MAIN_DB_PREFIX.'facture_fourn as f';
+            $sql .= ' WHERE rc.fk_invoice_supplier_source=f.rowid AND rc.fk_invoice_supplier = '.$invoice->id;
+            $sql .= ' AND f.type = 3';
         }
         else
         {
-            $this->error=get_class($this)."::getSumDepositsUsed was called with a bad object as a first parameter";
+            $this->error = get_class($this)."::getSumDepositsUsed was called with a bad object as a first parameter";
             dol_print_error($this->error);
             return -1;
         }
 
-        $resql=$this->db->query($sql);
+        $resql = $this->db->query($sql);
         if ($resql)
         {
             $obj = $this->db->fetch_object($resql);
@@ -573,32 +573,32 @@ 
 	 *	@param		int			      $multicurrency	Return multicurrency_amount instead of amount
      *	@return		int					        		<0 if KO, Sum of credit notes and excess received amount otherwise
      */
-    function getSumCreditNotesUsed($invoice, $multicurrency=0)
+    function getSumCreditNotesUsed($invoice, $multicurrency = 0)
     {
         dol_syslog(get_class($this)."::getSumCreditNotesUsed", LOG_DEBUG);
 
         if ($invoice->element == 'facture' || $invoice->element == 'invoice')
         {
             $sql = 'SELECT sum(rc.amount_ttc) as amount, sum(rc.multicurrency_amount_ttc) as multicurrency_amount';
-            $sql.= ' FROM '.MAIN_DB_PREFIX.'societe_remise_except as rc, '.MAIN_DB_PREFIX.'facture as f';
-            $sql.= ' WHERE rc.fk_facture_source=f.rowid AND rc.fk_facture = '.$invoice->id;
-            $sql.= ' AND (f.type = 2 OR f.type = 0)';	// Find discount coming from credit note or excess received
+            $sql .= ' FROM '.MAIN_DB_PREFIX.'societe_remise_except as rc, '.MAIN_DB_PREFIX.'facture as f';
+            $sql .= ' WHERE rc.fk_facture_source=f.rowid AND rc.fk_facture = '.$invoice->id;
+            $sql .= ' AND (f.type = 2 OR f.type = 0)'; // Find discount coming from credit note or excess received
         }
         else if ($invoice->element == 'invoice_supplier')
         {
             $sql = 'SELECT sum(rc.amount_ttc) as amount, sum(rc.multicurrency_amount_ttc) as multicurrency_amount';
-            $sql.= ' FROM '.MAIN_DB_PREFIX.'societe_remise_except as rc, '.MAIN_DB_PREFIX.'facture_fourn as f';
-            $sql.= ' WHERE rc.fk_invoice_supplier_source=f.rowid AND rc.fk_invoice_supplier = '.$invoice->id;
-            $sql.= ' AND (f.type = 2 OR f.type = 0)';	// Find discount coming from credit note or excess paid
+            $sql .= ' FROM '.MAIN_DB_PREFIX.'societe_remise_except as rc, '.MAIN_DB_PREFIX.'facture_fourn as f';
+            $sql .= ' WHERE rc.fk_invoice_supplier_source=f.rowid AND rc.fk_invoice_supplier = '.$invoice->id;
+            $sql .= ' AND (f.type = 2 OR f.type = 0)'; // Find discount coming from credit note or excess paid
         }
         else
         {
-            $this->error=get_class($this)."::getSumCreditNotesUsed was called with a bad object as a first parameter";
+            $this->error = get_class($this)."::getSumCreditNotesUsed was called with a bad object as a first parameter";
             dol_print_error($this->error);
             return -1;
         }
 
-        $resql=$this->db->query($sql);
+        $resql = $this->db->query($sql);
         if ($resql)
         {
             $obj = $this->db->fetch_object($resql);
@@ -619,33 +619,33 @@ 
      *	@param		string	$option			Where to link to ('invoice' or 'discount')
      *	@return		string					String with URL
      */
-    function getNomUrl($withpicto,$option='invoice')
+    function getNomUrl($withpicto, $option = 'invoice')
     {
         global $langs;
 
-        $result='';
+        $result = '';
 
         if ($option == 'invoice') {
-            $facid=! empty($this->discount_type)?$this->fk_invoice_supplier_source:$this->fk_facture_source;
-            $link=! empty($this->discount_type)?'/fourn/facture/card.php':'/compta/facture/card.php';
-            $label=$langs->trans("ShowDiscount").': '.$this->ref_facture_source;
+            $facid = !empty($this->discount_type) ? $this->fk_invoice_supplier_source : $this->fk_facture_source;
+            $link = !empty($this->discount_type) ? '/fourn/facture/card.php' : '/compta/facture/card.php';
+            $label = $langs->trans("ShowDiscount").': '.$this->ref_facture_source;
             $link = '<a href="'.DOL_URL_ROOT.$link.'?facid='.$facid.'" title="'.dol_escape_htmltag($label, 1).'" class="classfortooltip">';
-            $linkend='</a>';
-            $ref=! empty($this->discount_type)?$this->ref_invoice_supplier_source:$this->ref_facture_source;
-            $picto='bill';
+            $linkend = '</a>';
+            $ref = !empty($this->discount_type) ? $this->ref_invoice_supplier_source : $this->ref_facture_source;
+            $picto = 'bill';
         }
         if ($option == 'discount') {
-            $label=$langs->trans("Discount");
+            $label = $langs->trans("Discount");
             $link = '<a href="'.DOL_URL_ROOT.'/comm/remx.php?id='.$this->fk_soc.'" title="'.dol_escape_htmltag($label, 1).'" class="classfortooltip">';
-            $linkend='</a>';
-            $ref=$langs->trans("Discount");
-            $picto='generic';
+            $linkend = '</a>';
+            $ref = $langs->trans("Discount");
+            $picto = 'generic';
         }
 
 
-        if ($withpicto) $result.=($link.img_object($label, $picto, 'class="classfortooltip"').$linkend);
-        if ($withpicto && $withpicto != 2) $result.=' ';
-        $result.=$link.$ref.$linkend;
+        if ($withpicto) $result .= ($link.img_object($label, $picto, 'class="classfortooltip"').$linkend);
+        if ($withpicto && $withpicto != 2) $result .= ' ';
+        $result .= $link.$ref.$linkend;
         return $result;
     }
 
@@ -659,7 +659,7 @@ 
 	 */
 	function initAsSpecimen()
 	{
-		global $user,$langs,$conf;
+		global $user, $langs, $conf;
 
 		$this->fk_soc         = 1;
 		$this->amount_ht      = 10;

Braces +88 added lines, -59 removed lines

@@ -131,9 +131,15 @@ 
         $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."facture as f ON sr.fk_facture_source = f.rowid";
         $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."facture as fsup ON sr.fk_invoice_supplier_source = fsup.rowid";
         $sql.= " WHERE sr.entity = " . $conf->entity;
-        if ($rowid) $sql.= " AND sr.rowid=".$rowid;
-        if ($fk_facture_source) $sql.= " AND sr.fk_facture_source=".$fk_facture_source;
-        if ($fk_invoice_supplier_source) $sql.= " AND sr.fk_invoice_supplier_source=".$fk_invoice_supplier_source;
+        if ($rowid) {
+            $sql.= " AND sr.rowid=".$rowid;
+        }
+        if ($fk_facture_source) {
+            $sql.= " AND sr.fk_facture_source=".$fk_facture_source;
+        }
+        if ($fk_invoice_supplier_source) {
+            $sql.= " AND sr.fk_invoice_supplier_source=".$fk_invoice_supplier_source;
+        }
 
         dol_syslog(get_class($this)."::fetch", LOG_DEBUG);
         $resql = $this->db->query($sql);
@@ -170,14 +176,12 @@ 
 
                 $this->db->free($resql);
                 return 1;
-            }
-            else
+            } else
             {
                 $this->db->free($resql);
                 return 0;
             }
-        }
-        else
+        } else
         {
             $this->error=$this->db->error();
             return -1;
@@ -206,9 +210,15 @@ 
         $this->multicurrency_amount_tva=price2num($this->multicurrency_amount_tva);
         $this->multicurrency_amount_ttc=price2num($this->multicurrency_amount_ttc);
 
-        if (empty($this->multicurrency_amount_ht)) $this->multicurrency_amount_ht=0;
-        if (empty($this->multicurrency_amount_tva)) $this->multicurrency_amount_tva=0;
-        if (empty($this->multicurrency_amount_ttc)) $this->multicurrency_amount_ttc=0;
+        if (empty($this->multicurrency_amount_ht)) {
+            $this->multicurrency_amount_ht=0;
+        }
+        if (empty($this->multicurrency_amount_tva)) {
+            $this->multicurrency_amount_tva=0;
+        }
+        if (empty($this->multicurrency_amount_ttc)) {
+            $this->multicurrency_amount_ttc=0;
+        }
 
         // Check parameters
         if (empty($this->description))
@@ -238,8 +248,7 @@ 
         {
             $this->id=$this->db->last_insert_id(MAIN_DB_PREFIX."societe_remise_except");
             return $this->id;
-        }
-        else
+        } else
         {
             $this->error=$this->db->lasterror().' - sql='.$sql;
             return -1;
@@ -277,8 +286,7 @@ 
                     $this->error='ErrorThisPartOrAnotherIsAlreadyUsedSoDiscountSerieCantBeRemoved';
                     return -2;
                 }
-            }
-            else
+            } else
             {
                 dol_print_error($this->db);
                 return -1;
@@ -305,8 +313,7 @@ 
         			$this->error='ErrorThisPartOrAnotherIsAlreadyUsedSoDiscountSerieCantBeRemoved';
         			return -2;
         		}
-        	}
-        	else
+        	} else
         	{
         		dol_print_error($this->db);
         		return -1;
@@ -317,9 +324,18 @@ 
 
         // Delete but only if not used
         $sql = "DELETE FROM ".MAIN_DB_PREFIX."societe_remise_except ";
-        if ($this->fk_facture_source) $sql.= " WHERE fk_facture_source = ".$this->fk_facture_source;	// Delete all lines of same serie
-        elseif ($this->fk_invoice_supplier_source) $sql.= " WHERE fk_invoice_supplier_source = ".$this->fk_invoice_supplier_source;	// Delete all lines of same serie
-        else $sql.= " WHERE rowid = ".$this->id;	// Delete only line
+        if ($this->fk_facture_source) {
+            $sql.= " WHERE fk_facture_source = ".$this->fk_facture_source;
+        }
+        // Delete all lines of same serie
+        elseif ($this->fk_invoice_supplier_source) {
+            $sql.= " WHERE fk_invoice_supplier_source = ".$this->fk_invoice_supplier_source;
+        }
+        // Delete all lines of same serie
+        else {
+            $sql.= " WHERE rowid = ".$this->id;
+        }
+        // Delete only line
         $sql.= " AND (fk_facture_line IS NULL";	// Not used as absolute simple discount
         $sql.= " AND fk_facture IS NULL)";		// Not used as credit note and not used as deposit
         $sql.= " AND (fk_invoice_supplier_line IS NULL";	// Not used as absolute simple discount
@@ -342,15 +358,13 @@ 
                 {
                     $this->db->commit();
                     return 1;
-                }
-                else
+                } else
                 {
                     $this->error=$this->db->lasterror();
                     $this->db->rollback();
                     return -1;
                 }
-            }
-            elseif($this->fk_invoice_supplier_source) {
+            } elseif($this->fk_invoice_supplier_source) {
 
             	$sql = "UPDATE ".MAIN_DB_PREFIX."facture_fourn";
             	$sql.=" set paye=0, fk_statut=1";
@@ -362,21 +376,18 @@ 
             	{
             		$this->db->commit();
             		return 1;
-            	}
-            	else
+            	} else
             	{
             		$this->error=$this->db->lasterror();
             		$this->db->rollback();
             		return -1;
             	}
-            }
-            else
+            } else
             {
                 $this->db->commit();
                 return 1;
             }
-        }
-        else
+        } else
         {
             $this->error=$this->db->lasterror();
             $this->db->rollback();
@@ -413,11 +424,19 @@ 
 
         $sql ="UPDATE ".MAIN_DB_PREFIX."societe_remise_except";
         if(! empty($this->discount_type)) {
-        	if ($rowidline)    $sql.=" SET fk_invoice_supplier_line = ".$rowidline;
-        	if ($rowidinvoice) $sql.=" SET fk_invoice_supplier = ".$rowidinvoice;
+        	if ($rowidline) {
+        	    $sql.=" SET fk_invoice_supplier_line = ".$rowidline;
+        	}
+        	if ($rowidinvoice) {
+        	    $sql.=" SET fk_invoice_supplier = ".$rowidinvoice;
+        	}
         } else {
-        	if ($rowidline)    $sql.=" SET fk_facture_line = ".$rowidline;
-        	if ($rowidinvoice) $sql.=" SET fk_facture = ".$rowidinvoice;
+        	if ($rowidline) {
+        	    $sql.=" SET fk_facture_line = ".$rowidline;
+        	}
+        	if ($rowidinvoice) {
+        	    $sql.=" SET fk_facture = ".$rowidinvoice;
+        	}
         }
         $sql.=" WHERE rowid = ".$this->id;
 
@@ -433,8 +452,7 @@ 
         		$this->fk_facture=$rowidinvoice;
         	}
             return 1;
-        }
-        else
+        } else
         {
             $this->error=$this->db->error();
             return -3;
@@ -465,8 +483,7 @@ 
         if ($resql)
         {
             return 1;
-        }
-        else
+        } else
         {
             $this->error=$this->db->error();
             return -3;
@@ -498,10 +515,18 @@ 
         } else {
         	$sql.= " AND (rc.fk_facture IS NULL AND rc.fk_facture_line IS NULL)"; // Available to customer
         }
-        if (is_object($company)) $sql.= " AND rc.fk_soc = ".$company->id;
-        if (is_object($user))    $sql.= " AND rc.fk_user = ".$user->id;
-        if ($filter)   $sql.=' AND ('.$filter.')';
-        if ($maxvalue) $sql.=' AND rc.amount_ttc <= '.price2num($maxvalue);
+        if (is_object($company)) {
+            $sql.= " AND rc.fk_soc = ".$company->id;
+        }
+        if (is_object($user)) {
+            $sql.= " AND rc.fk_user = ".$user->id;
+        }
+        if ($filter) {
+            $sql.=' AND ('.$filter.')';
+        }
+        if ($maxvalue) {
+            $sql.=' AND rc.amount_ttc <= '.price2num($maxvalue);
+        }
 
         dol_syslog(get_class($this)."::getAvailableDiscounts", LOG_DEBUG);
         $resql=$this->db->query($sql);
@@ -537,15 +562,13 @@ 
             $sql.= ' FROM '.MAIN_DB_PREFIX.'societe_remise_except as rc, '.MAIN_DB_PREFIX.'facture as f';
             $sql.= ' WHERE rc.fk_facture_source=f.rowid AND rc.fk_facture = '.$invoice->id;
             $sql.= ' AND f.type = 3';
-        }
-        else if ($invoice->element == 'invoice_supplier')
+        } else if ($invoice->element == 'invoice_supplier')
         {
             $sql = 'SELECT sum(rc.amount_ttc) as amount, sum(rc.multicurrency_amount_ttc) as multicurrency_amount';
             $sql.= ' FROM '.MAIN_DB_PREFIX.'societe_remise_except as rc, '.MAIN_DB_PREFIX.'facture_fourn as f';
             $sql.= ' WHERE rc.fk_invoice_supplier_source=f.rowid AND rc.fk_invoice_supplier = '.$invoice->id;
             $sql.= ' AND f.type = 3';
-        }
-        else
+        } else
         {
             $this->error=get_class($this)."::getSumDepositsUsed was called with a bad object as a first parameter";
             dol_print_error($this->error);
@@ -556,10 +579,12 @@ 
         if ($resql)
         {
             $obj = $this->db->fetch_object($resql);
-            if ($multicurrency) return $obj->multicurrency_amount;
-			else return $obj->amount;
-        }
-        else
+            if ($multicurrency) {
+                return $obj->multicurrency_amount;
+            } else {
+			    return $obj->amount;
+			}
+        } else
         {
             $this->error = $this->db->lasterror();
             return -1;
@@ -583,15 +608,13 @@ 
             $sql.= ' FROM '.MAIN_DB_PREFIX.'societe_remise_except as rc, '.MAIN_DB_PREFIX.'facture as f';
             $sql.= ' WHERE rc.fk_facture_source=f.rowid AND rc.fk_facture = '.$invoice->id;
             $sql.= ' AND (f.type = 2 OR f.type = 0)';	// Find discount coming from credit note or excess received
-        }
-        else if ($invoice->element == 'invoice_supplier')
+        } else if ($invoice->element == 'invoice_supplier')
         {
             $sql = 'SELECT sum(rc.amount_ttc) as amount, sum(rc.multicurrency_amount_ttc) as multicurrency_amount';
             $sql.= ' FROM '.MAIN_DB_PREFIX.'societe_remise_except as rc, '.MAIN_DB_PREFIX.'facture_fourn as f';
             $sql.= ' WHERE rc.fk_invoice_supplier_source=f.rowid AND rc.fk_invoice_supplier = '.$invoice->id;
             $sql.= ' AND (f.type = 2 OR f.type = 0)';	// Find discount coming from credit note or excess paid
-        }
-        else
+        } else
         {
             $this->error=get_class($this)."::getSumCreditNotesUsed was called with a bad object as a first parameter";
             dol_print_error($this->error);
@@ -602,10 +625,12 @@ 
         if ($resql)
         {
             $obj = $this->db->fetch_object($resql);
-            if ($multicurrency) return $obj->multicurrency_amount;
-			else return $obj->amount;
-        }
-        else
+            if ($multicurrency) {
+                return $obj->multicurrency_amount;
+            } else {
+			    return $obj->amount;
+			}
+        } else
         {
             $this->error = $this->db->lasterror();
             return -1;
@@ -643,8 +668,12 @@ 
         }
 
 
-        if ($withpicto) $result.=($link.img_object($label, $picto, 'class="classfortooltip"').$linkend);
-        if ($withpicto && $withpicto != 2) $result.=' ';
+        if ($withpicto) {
+            $result.=($link.img_object($label, $picto, 'class="classfortooltip"').$linkend);
+        }
+        if ($withpicto && $withpicto != 2) {
+            $result.=' ';
+        }
         $result.=$link.$ref.$linkend;
         return $result;
     }

dolibarr/htdocs/core/class/openid.class.php

Indentation +20 added lines, -20 removed lines

@@ -30,8 +30,8 @@ 
     var $URLs = array();
     var $error = array();
     var $fields = array(
-		'required' => array(),
-		'optional' => array(),
+        'required' => array(),
+        'optional' => array(),
     );
 
     /**
@@ -399,8 +399,8 @@ 
         // phpcs:enable
         global $conf;
 
-		include_once DOL_DOCUMENT_ROOT.'/core/lib/geturl.lib.php';
-		if (empty($url)) $url=$conf->global->MAIN_AUTHENTICATION_OPENID_URL;
+        include_once DOL_DOCUMENT_ROOT.'/core/lib/geturl.lib.php';
+        if (empty($url)) $url=$conf->global->MAIN_AUTHENTICATION_OPENID_URL;
 
         $response = getURLContent($url);
 
@@ -475,9 +475,9 @@ 
     {
         // phpcs:enable
         $params = array(
-			'openid.assoc_handle' => urlencode($_GET['openid_assoc_handle']),
-			'openid.signed' => urlencode($_GET['openid_signed']),
-			'openid.sig' => urlencode($_GET['openid_sig'])
+            'openid.assoc_handle' => urlencode($_GET['openid_assoc_handle']),
+            'openid.signed' => urlencode($_GET['openid_signed']),
+            'openid.sig' => urlencode($_GET['openid_sig'])
         );
         // Send only required parameters to confirm validity
         $arr_signed = explode(",",str_replace('sreg.','sreg_',$_GET['openid_signed']));
@@ -520,16 +520,16 @@ 
      */
     function sendDiscoveryRequestToGetXRDS($url='')
     {
-    	global $conf;
+        global $conf;
 
-		include_once DOL_DOCUMENT_ROOT.'/core/lib/geturl.lib.php';
-		if (empty($url)) $url=$conf->global->MAIN_AUTHENTICATION_OPENID_URL;
+        include_once DOL_DOCUMENT_ROOT.'/core/lib/geturl.lib.php';
+        if (empty($url)) $url=$conf->global->MAIN_AUTHENTICATION_OPENID_URL;
 
-		dol_syslog(get_class($this).'::sendDiscoveryRequestToGetXRDS get XRDS');
+        dol_syslog(get_class($this).'::sendDiscoveryRequestToGetXRDS get XRDS');
 
-		$addheaders=array('Accept: application/xrds+xml');
+        $addheaders=array('Accept: application/xrds+xml');
         $response = getURLContent($url, 'GET', '', 1, $addheaders);
-		/* response should like this:
+        /* response should like this:
 		<?xml version="1.0" encoding="UTF-8"?>
 		<xrds:XRDS xmlns:xrds="xri://$xrds" xmlns="xri://$xrd*($v*2.0)">
 		<XRD>
@@ -542,12 +542,12 @@ 
 		</XRD>
 		</xrds:XRDS>
 		*/
-		$content=$response['content'];
+        $content=$response['content'];
 
         $server='';
         if (preg_match('/'.preg_quote('<URI>','/').'(.*)'.preg_quote('</URI>','/').'/is', $content, $reg))
         {
-        	$server=$reg[1];
+            $server=$reg[1];
         }
 
         if (empty($server))
@@ -556,10 +556,10 @@ 
             return false;
         }
         else
-       {
-       		dol_syslog(get_class($this).'::sendDiscoveryRequestToGetXRDS found endpoint = '.$server);
-        	$this->SetOpenIDServer($server);
-        	return $server;
-	    }
+        {
+                dol_syslog(get_class($this).'::sendDiscoveryRequestToGetXRDS found endpoint = '.$server);
+            $this->SetOpenIDServer($server);
+            return $server;
+        }
     }
 }

Spacing +37 added lines, -37 removed lines

@@ -185,7 +185,7 @@ 
     {
         // phpcs:enable
         $e = $this->error;
-        return array('code'=>$e[0],'description'=>$e[1]);
+        return array('code'=>$e[0], 'description'=>$e[1]);
     }
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
@@ -200,10 +200,10 @@ 
     {
         // phpcs:enable
         $errs['OPENID_NOSERVERSFOUND'] = 'Cannot find OpenID Server TAG on Identity page.';
-        if ($desc == null){
+        if ($desc == null) {
             $desc = $errs[$code];
         }
-        $this->error = array($code,$desc);
+        $this->error = array($code, $desc);
     }
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
@@ -235,7 +235,7 @@ 
     {
         $r = array();
         $response = explode("\n", $response);
-        foreach($response as $line) {
+        foreach ($response as $line) {
             $line = trim($line);
             if ($line != "") {
                 list($key, $value) = explode(":", $line, 2);
@@ -263,13 +263,13 @@ 
         if (!isset($u['path']) || ($u['path'] == '/')) {
             $u['path'] = '';
         }
-        if(substr($u['path'],-1,1) == '/'){
-            $u['path'] = substr($u['path'], 0, strlen($u['path'])-1);
+        if (substr($u['path'], -1, 1) == '/') {
+            $u['path'] = substr($u['path'], 0, strlen($u['path']) - 1);
         }
-        if (isset($u['query'])){ // If there is a query string, then use identity as is
-            return $u['host'] . $u['path'] . '?' . $u['query'];
-        }else{
-            return $u['host'] . $u['path'];
+        if (isset($u['query'])) { // If there is a query string, then use identity as is
+            return $u['host'].$u['path'].'?'.$u['query'];
+        } else {
+            return $u['host'].$u['path'];
         }
     }
 
@@ -282,12 +282,12 @@ 
     function array2url($arr)
     {
         // converts associated array to URL Query String
-        if (!is_array($arr)){
+        if (!is_array($arr)) {
             return false;
         }
         $query = '';
-        foreach($arr as $key => $value){
-            $query .= $key . "=" . $value . "&";
+        foreach ($arr as $key => $value) {
+            $query .= $key."=".$value."&";
         }
         return $query;
     }
@@ -301,7 +301,7 @@ 
      * @param string	$params		Params
      * @return boolean|unknown
      */
-    function FSOCK_Request($url, $method="GET", $params = "")
+    function FSOCK_Request($url, $method = "GET", $params = "")
     {
         // phpcs:enable
         $fp = fsockopen("ssl://www.myopenid.com", 443, $errno, $errstr, 3); // Connection timeout is 3 seconds
@@ -309,7 +309,7 @@ 
             $this->ErrorStore('OPENID_SOCKETERROR', $errstr);
             return false;
         } else {
-            $request = $method . " /server HTTP/1.0\r\n";
+            $request = $method." /server HTTP/1.0\r\n";
             $request .= "User-Agent: Dolibarr\r\n";
             $request .= "Connection: close\r\n\r\n";
             fwrite($fp, $request);
@@ -335,13 +335,13 @@ 
      * @param 	string	$params		Params
      * @return string
      */
-    function CURL_Request($url, $method="GET", $params = "")
+    function CURL_Request($url, $method = "GET", $params = "")
     {
         // phpcs:enable
         // Remember, SSL MUST BE SUPPORTED
         if (is_array($params)) $params = $this->array2url($params);
 
-        $curl = curl_init($url . ($method == "GET" && $params != "" ? "?" . $params : ""));
+        $curl = curl_init($url.($method == "GET" && $params != "" ? "?".$params : ""));
         @curl_setopt($curl, CURLOPT_FOLLOWLOCATION, true);
         curl_setopt($curl, CURLOPT_HEADER, false);
         curl_setopt($curl, CURLOPT_SSL_VERIFYPEER, false);
@@ -351,9 +351,9 @@ 
         curl_setopt($curl, CURLOPT_RETURNTRANSFER, true);
         $response = curl_exec($curl);
 
-        if (curl_errno($curl) == 0){
+        if (curl_errno($curl) == 0) {
             $response;
-        }else{
+        } else {
             $this->ErrorStore('OPENID_CURL', curl_error($curl));
         }
         return $response;
@@ -394,13 +394,13 @@ 
      * @param	string	$url	Url to found endpoint
      * @return 	string			Endpoint
      */
-    function GetOpenIDServer($url='')
+    function GetOpenIDServer($url = '')
     {
         // phpcs:enable
         global $conf;
 
 		include_once DOL_DOCUMENT_ROOT.'/core/lib/geturl.lib.php';
-		if (empty($url)) $url=$conf->global->MAIN_AUTHENTICATION_OPENID_URL;
+		if (empty($url)) $url = $conf->global->MAIN_AUTHENTICATION_OPENID_URL;
 
         $response = getURLContent($url);
 
@@ -434,13 +434,13 @@ 
 
         if (isset($this->fields['required'])
         && (count($this->fields['required']) > 0)) {
-            $params['openid.sreg.required'] = implode(',',$this->fields['required']);
+            $params['openid.sreg.required'] = implode(',', $this->fields['required']);
         }
         if (isset($this->fields['optional'])
         && (count($this->fields['optional']) > 0)) {
-            $params['openid.sreg.optional'] = implode(',',$this->fields['optional']);
+            $params['openid.sreg.optional'] = implode(',', $this->fields['optional']);
         }
-        return $this->URLs['openid_server'] . "?". $this->array2url($params);
+        return $this->URLs['openid_server']."?".$this->array2url($params);
     }
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
@@ -461,7 +461,7 @@ 
         }
         else
         {	// Default Header Redirect
-            header('Location: ' . $redirect_to);
+            header('Location: '.$redirect_to);
         }
     }
 
@@ -480,14 +480,14 @@ 
 			'openid.sig' => urlencode($_GET['openid_sig'])
         );
         // Send only required parameters to confirm validity
-        $arr_signed = explode(",",str_replace('sreg.','sreg_',$_GET['openid_signed']));
+        $arr_signed = explode(",", str_replace('sreg.', 'sreg_', $_GET['openid_signed']));
         $num = count($arr_signed);
         for ($i = 0; $i < $num; $i++)
         {
-            $s = str_replace('sreg_','sreg.', $arr_signed[$i]);
-            $c = $_GET['openid_' . $arr_signed[$i]];
+            $s = str_replace('sreg_', 'sreg.', $arr_signed[$i]);
+            $c = $_GET['openid_'.$arr_signed[$i]];
             // if ($c != ""){
-            $params['openid.' . $s] = urlencode($c);
+            $params['openid.'.$s] = urlencode($c);
             // }
         }
         $params['openid.mode'] = "check_authentication";
@@ -497,7 +497,7 @@ 
         {
             return false;
         }
-        $response = $this->CURL_Request($openid_server,'POST',$params);
+        $response = $this->CURL_Request($openid_server, 'POST', $params);
         $data = $this->splitResponse($response);
         if ($data['is_valid'] == "true")
         {
@@ -518,16 +518,16 @@ 
      * @param	string	$url	Url of endpoint to request
      * @return 	string			First endpoint OpenID server found. False if it failed to found.
      */
-    function sendDiscoveryRequestToGetXRDS($url='')
+    function sendDiscoveryRequestToGetXRDS($url = '')
     {
     	global $conf;
 
 		include_once DOL_DOCUMENT_ROOT.'/core/lib/geturl.lib.php';
-		if (empty($url)) $url=$conf->global->MAIN_AUTHENTICATION_OPENID_URL;
+		if (empty($url)) $url = $conf->global->MAIN_AUTHENTICATION_OPENID_URL;
 
 		dol_syslog(get_class($this).'::sendDiscoveryRequestToGetXRDS get XRDS');
 
-		$addheaders=array('Accept: application/xrds+xml');
+		$addheaders = array('Accept: application/xrds+xml');
         $response = getURLContent($url, 'GET', '', 1, $addheaders);
 		/* response should like this:
 		<?xml version="1.0" encoding="UTF-8"?>
@@ -542,12 +542,12 @@ 
 		</XRD>
 		</xrds:XRDS>
 		*/
-		$content=$response['content'];
+		$content = $response['content'];
 
-        $server='';
-        if (preg_match('/'.preg_quote('<URI>','/').'(.*)'.preg_quote('</URI>','/').'/is', $content, $reg))
+        $server = '';
+        if (preg_match('/'.preg_quote('<URI>', '/').'(.*)'.preg_quote('</URI>', '/').'/is', $content, $reg))
         {
-        	$server=$reg[1];
+        	$server = $reg[1];
         }
 
         if (empty($server))

Braces +21 added lines, -16 removed lines

@@ -218,8 +218,7 @@ 
         if (count($this->error) > 0)
         {
             return true;
-        }
-        else
+        } else
         {
             return false;
         }
@@ -255,8 +254,9 @@ 
     function OpenID_Standarize($openid_identity = null)
     {
         // phpcs:enable
-        if ($openid_identity === null)
-        $openid_identity = $this->openid_url_identity;
+        if ($openid_identity === null) {
+                $openid_identity = $this->openid_url_identity;
+        }
 
         $u = parse_url(strtolower(trim($openid_identity)));
 
@@ -268,7 +268,7 @@ 
         }
         if (isset($u['query'])){ // If there is a query string, then use identity as is
             return $u['host'] . $u['path'] . '?' . $u['query'];
-        }else{
+        } else{
             return $u['host'] . $u['path'];
         }
     }
@@ -339,7 +339,9 @@ 
     {
         // phpcs:enable
         // Remember, SSL MUST BE SUPPORTED
-        if (is_array($params)) $params = $this->array2url($params);
+        if (is_array($params)) {
+            $params = $this->array2url($params);
+        }
 
         $curl = curl_init($url . ($method == "GET" && $params != "" ? "?" . $params : ""));
         @curl_setopt($curl, CURLOPT_FOLLOWLOCATION, true);
@@ -347,13 +349,15 @@ 
         curl_setopt($curl, CURLOPT_SSL_VERIFYPEER, false);
         curl_setopt($curl, CURLOPT_HTTPGET, ($method == "GET"));
         curl_setopt($curl, CURLOPT_POST, ($method == "POST"));
-        if ($method == "POST") curl_setopt($curl, CURLOPT_POSTFIELDS, $params);
+        if ($method == "POST") {
+            curl_setopt($curl, CURLOPT_POSTFIELDS, $params);
+        }
         curl_setopt($curl, CURLOPT_RETURNTRANSFER, true);
         $response = curl_exec($curl);
 
         if (curl_errno($curl) == 0){
             $response;
-        }else{
+        } else{
             $this->ErrorStore('OPENID_CURL', curl_error($curl));
         }
         return $response;
@@ -400,7 +404,9 @@ 
         global $conf;
 
 		include_once DOL_DOCUMENT_ROOT.'/core/lib/geturl.lib.php';
-		if (empty($url)) $url=$conf->global->MAIN_AUTHENTICATION_OPENID_URL;
+		if (empty($url)) {
+		    $url=$conf->global->MAIN_AUTHENTICATION_OPENID_URL;
+		}
 
         $response = getURLContent($url);
 
@@ -458,8 +464,7 @@ 
             echo '<script language="JavaScript" type="text/javascript">window.location=\'';
             echo $redirect_to;
             echo '\';</script>';
-        }
-        else
+        } else
         {	// Default Header Redirect
             header('Location: ' . $redirect_to);
         }
@@ -502,8 +507,7 @@ 
         if ($data['is_valid'] == "true")
         {
             return true;
-        }
-        else
+        } else
         {
             return false;
         }
@@ -523,7 +527,9 @@ 
     	global $conf;
 
 		include_once DOL_DOCUMENT_ROOT.'/core/lib/geturl.lib.php';
-		if (empty($url)) $url=$conf->global->MAIN_AUTHENTICATION_OPENID_URL;
+		if (empty($url)) {
+		    $url=$conf->global->MAIN_AUTHENTICATION_OPENID_URL;
+		}
 
 		dol_syslog(get_class($this).'::sendDiscoveryRequestToGetXRDS get XRDS');
 
@@ -554,8 +560,7 @@ 
         {
             $this->ErrorStore('OPENID_NOSERVERSFOUND');
             return false;
-        }
-        else
+        } else
        {
        		dol_syslog(get_class($this).'::sendDiscoveryRequestToGetXRDS found endpoint = '.$server);
         	$this->SetOpenIDServer($server);

dolibarr/htdocs/core/class/emailsenderprofile.class.php

Indentation +385 added lines, -385 removed lines

@@ -35,401 +35,401 @@
  */
 class EmailSenderProfile extends CommonObject
 {
-	/**
-	 * @var string ID to identify managed object
-	 */
-	public $element = 'emailsenderprofile';
-
-	/**
-	 * @var string Name of table without prefix where object is stored
-	 */
-	public $table_element = 'c_email_senderprofile';
-
-	/**
-	 * @var array  Does emailsenderprofile support multicompany module ? 0=No test on entity, 1=Test with field entity, 2=Test with link by societe
-	 */
-	public $ismultientitymanaged = 1;
-
-	/**
-	 * @var string String with name of icon for emailsenderprofile
-	 */
-	public $picto = 'emailsenderprofile@monmodule';
-
-
-	/**
-	 *             'type' if the field format.
-	 *             'label' the translation key.
-	 *             'enabled' is a condition when the filed must be managed.
-	 *             'visible' says if field is visible in list (-1 means not shown by default but can be added into list to be viewed).
-	 *             'notnull' is set to 1 if not null in database. Set to -1 if we must set data to null if empty ('' or 0).
-	 *             'index' if we want an index in database.
-	 *             'foreignkey'=>'tablename.field' if the field is a foreign key (it is recommanded to name the field fk_...).
-	 *             'position' is the sort order of field.
-	 *             'searchall' is 1 if we want to search in this field when making a search from the quick search button.
-	 *             'isameasure' must be set to 1 if you want to have a total on list for this field. Field type must be summable like integer or double(24,8).
-	 *             'help' is a string visible as a tooltip on field
-	 *             'comment' is not used. You can store here any text of your choice.
-	 */
-
-	// BEGIN MODULEBUILDER PROPERTIES
-	/**
-	 * @var array  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
-	 */
-	public $fields=array(
-		'rowid' => array('type'=>'integer', 'label'=>'TechnicalID', 'visible'=>-1, 'enabled'=>1, 'position'=>1, 'notnull'=>1, 'index'=>1, 'comment'=>'Id',),
-		'entity' => array('type'=>'integer', 'label'=>'Entity', 'visible'=>-1, 'enabled'=>1, 'position'=>20, 'notnull'=>1, 'index'=>1,),
-		'label' => array('type'=>'varchar(255)', 'label'=>'Label', 'visible'=>1, 'enabled'=>1, 'position'=>30, 'notnull'=>-1),
-		'email' => array('type'=>'varchar(255)', 'label'=>'Email', 'visible'=>1, 'enabled'=>1, 'position'=>40, 'notnull'=>-1),
-		//'fk_user_creat' => array('type'=>'integer', 'label'=>'UserAuthor', 'visible'=>-1, 'enabled'=>1, 'position'=>500, 'notnull'=>1,),
-		//'fk_user_modif' => array('type'=>'integer', 'label'=>'UserModif', 'visible'=>-1, 'enabled'=>1, 'position'=>500, 'notnull'=>-1,),
-		'signature' => array('type'=>'text', 'label'=>'Signature', 'visible'=>-1, 'enabled'=>1, 'position'=>1000, 'notnull'=>-1, 'index'=>1,),
-		'position' => array('type'=>'integer', 'label'=>'Position', 'visible'=>-1, 'enabled'=>1, 'position'=>1000, 'notnull'=>-1, 'index'=>1,),
-		'date_creation' => array('type'=>'datetime', 'label'=>'DateCreation', 'visible'=>-1, 'enabled'=>1, 'position'=>500, 'notnull'=>1,),
-		'tms' => array('type'=>'timestamp', 'label'=>'DateModification', 'visible'=>-1, 'enabled'=>1, 'position'=>500, 'notnull'=>1,),
-		'active' => array('type'=>'integer', 'label'=>'Status', 'visible'=>1, 'enabled'=>1, 'position'=>1000, 'notnull'=>-1, 'index'=>1),
-	);
-
-	/**
-	 * @var int ID
-	 */
-	public $rowid;
-
-	/**
-	 * @var int Entity
-	 */
-	public $entity;
-
-	/**
+    /**
+     * @var string ID to identify managed object
+     */
+    public $element = 'emailsenderprofile';
+
+    /**
+     * @var string Name of table without prefix where object is stored
+     */
+    public $table_element = 'c_email_senderprofile';
+
+    /**
+     * @var array  Does emailsenderprofile support multicompany module ? 0=No test on entity, 1=Test with field entity, 2=Test with link by societe
+     */
+    public $ismultientitymanaged = 1;
+
+    /**
+     * @var string String with name of icon for emailsenderprofile
+     */
+    public $picto = 'emailsenderprofile@monmodule';
+
+
+    /**
+     *             'type' if the field format.
+     *             'label' the translation key.
+     *             'enabled' is a condition when the filed must be managed.
+     *             'visible' says if field is visible in list (-1 means not shown by default but can be added into list to be viewed).
+     *             'notnull' is set to 1 if not null in database. Set to -1 if we must set data to null if empty ('' or 0).
+     *             'index' if we want an index in database.
+     *             'foreignkey'=>'tablename.field' if the field is a foreign key (it is recommanded to name the field fk_...).
+     *             'position' is the sort order of field.
+     *             'searchall' is 1 if we want to search in this field when making a search from the quick search button.
+     *             'isameasure' must be set to 1 if you want to have a total on list for this field. Field type must be summable like integer or double(24,8).
+     *             'help' is a string visible as a tooltip on field
+     *             'comment' is not used. You can store here any text of your choice.
+     */
+
+    // BEGIN MODULEBUILDER PROPERTIES
+    /**
+     * @var array  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
+     */
+    public $fields=array(
+        'rowid' => array('type'=>'integer', 'label'=>'TechnicalID', 'visible'=>-1, 'enabled'=>1, 'position'=>1, 'notnull'=>1, 'index'=>1, 'comment'=>'Id',),
+        'entity' => array('type'=>'integer', 'label'=>'Entity', 'visible'=>-1, 'enabled'=>1, 'position'=>20, 'notnull'=>1, 'index'=>1,),
+        'label' => array('type'=>'varchar(255)', 'label'=>'Label', 'visible'=>1, 'enabled'=>1, 'position'=>30, 'notnull'=>-1),
+        'email' => array('type'=>'varchar(255)', 'label'=>'Email', 'visible'=>1, 'enabled'=>1, 'position'=>40, 'notnull'=>-1),
+        //'fk_user_creat' => array('type'=>'integer', 'label'=>'UserAuthor', 'visible'=>-1, 'enabled'=>1, 'position'=>500, 'notnull'=>1,),
+        //'fk_user_modif' => array('type'=>'integer', 'label'=>'UserModif', 'visible'=>-1, 'enabled'=>1, 'position'=>500, 'notnull'=>-1,),
+        'signature' => array('type'=>'text', 'label'=>'Signature', 'visible'=>-1, 'enabled'=>1, 'position'=>1000, 'notnull'=>-1, 'index'=>1,),
+        'position' => array('type'=>'integer', 'label'=>'Position', 'visible'=>-1, 'enabled'=>1, 'position'=>1000, 'notnull'=>-1, 'index'=>1,),
+        'date_creation' => array('type'=>'datetime', 'label'=>'DateCreation', 'visible'=>-1, 'enabled'=>1, 'position'=>500, 'notnull'=>1,),
+        'tms' => array('type'=>'timestamp', 'label'=>'DateModification', 'visible'=>-1, 'enabled'=>1, 'position'=>500, 'notnull'=>1,),
+        'active' => array('type'=>'integer', 'label'=>'Status', 'visible'=>1, 'enabled'=>1, 'position'=>1000, 'notnull'=>-1, 'index'=>1),
+    );
+
+    /**
+     * @var int ID
+     */
+    public $rowid;
+
+    /**
+     * @var int Entity
+     */
+    public $entity;
+
+    /**
      * @var string Email Sender Profile label
      */
     public $label;
 
-	public $email;
-	public $date_creation;
-	public $tms;
-	//public $fk_user_creat;
-	//public $fk_user_modif;
-	public $signature;
-	public $position;
-	public $active;
-	// END MODULEBUILDER PROPERTIES
-
-
-
-	// If this object has a subtable with lines
-
-	/**
-	 * @var int    Name of subtable line
-	 */
-	//public $table_element_line = 'emailsenderprofiledet';
-	/**
-	 * @var int    Field with ID of parent key if this field has a parent
-	 */
-	//public $fk_element = 'fk_emailsenderprofile';
-	/**
-	 * @var int    Name of subtable class that manage subtable lines
-	 */
-	//public $class_element_line = 'EmailSenderProfileline';
-	/**
-	 * @var array  Array of child tables (child tables to delete before deleting a record)
-	 */
-	//protected $childtables=array('emailsenderprofiledet');
-	/**
-	 * @var EmailSenderProfileLine[]     Array of subtable lines
-	 */
-	//public $lines = array();
-
-
-
-	/**
-	 * Constructor
-	 *
-	 * @param DoliDb $db Database handler
-	 */
-	public function __construct(DoliDB $db)
-	{
-		global $conf;
-
-		$this->db = $db;
-
-		if (empty($conf->global->MAIN_SHOW_TECHNICAL_ID)) $this->fields['rowid']['visible']=0;
-		if (empty($conf->multicompany->enabled)) $this->fields['entity']['enabled']=0;
-	}
-
-	/**
-	 * Create object into database
-	 *
-	 * @param  User $user      User that creates
-	 * @param  bool $notrigger false=launch triggers after, true=disable triggers
-	 * @return int             <0 if KO, Id of created object if OK
-	 */
-	public function create(User $user, $notrigger = false)
-	{
-		return $this->createCommon($user, $notrigger);
-	}
-
-	/**
-	 * Clone and object into another one
-	 *
-	 * @param  	User 	$user      	User that creates
-	 * @param  	int 	$fromid     Id of object to clone
-	 * @return 	mixed 				New object created, <0 if KO
-	 */
-	public function createFromClone(User $user, $fromid)
-	{
-		global $hookmanager, $langs;
-		$error = 0;
-
-		dol_syslog(__METHOD__, LOG_DEBUG);
-
-		$object = new self($this->db);
-
-		$this->db->begin();
-
-		// Load source object
-		$object->fetchCommon($fromid);
-		// Reset some properties
-		unset($object->id);
-		unset($object->fk_user_creat);
-		unset($object->import_key);
-
-		// Clear fields
-		$object->ref = "copy_of_".$object->ref;
-		$object->title = $langs->trans("CopyOf")." ".$object->title;
-		// ...
-
-		// Create clone
-		$object->context['createfromclone'] = 'createfromclone';
-		$result = $object->createCommon($user);
-		if ($result < 0) {
-			$error++;
-			$this->error = $object->error;
-			$this->errors = $object->errors;
-		}
-
-		// End
-		if (!$error) {
-			$this->db->commit();
-			return $object;
-		} else {
-			$this->db->rollback();
-			return -1;
-		}
-	}
-
-	/**
-	 * Load object in memory from the database
-	 *
-	 * @param int    $id   Id object
-	 * @param string $ref  Ref
-	 * @return int         <0 if KO, 0 if not found, >0 if OK
-	 */
-	public function fetch($id, $ref = null)
-	{
-		$result = $this->fetchCommon($id, $ref);
-		if ($result > 0 && ! empty($this->table_element_line)) $this->fetchLines();
-		return $result;
-	}
-
-	/**
-	 * Load object lines in memory from the database
-	 *
-	 * @return int         <0 if KO, 0 if not found, >0 if OK
-	 */
-	public function fetchLines()
-	{
-		$this->lines=array();
-
-		// Load lines with object EmailSenderProfileLine
-
-		return count($this->lines)?1:0;
-	}
-
-	/**
-	 * Update object into database
-	 *
-	 * @param  User $user      User that modifies
-	 * @param  bool $notrigger false=launch triggers after, true=disable triggers
-	 * @return int             <0 if KO, >0 if OK
-	 */
-	public function update(User $user, $notrigger = false)
-	{
-		return $this->updateCommon($user, $notrigger);
-	}
-
-	/**
-	 * Delete object in database
-	 *
-	 * @param User $user       User that deletes
-	 * @param bool $notrigger  false=launch triggers after, true=disable triggers
-	 * @return int             <0 if KO, >0 if OK
-	 */
-	public function delete(User $user, $notrigger = false)
-	{
-		return $this->deleteCommon($user, $notrigger);
-	}
-
-	/**
-	 *  Return a link to the object card (with optionaly the picto)
-	 *
-	 *	@param	int		$withpicto					Include picto in link (0=No picto, 1=Include picto into link, 2=Only picto)
-	 *	@return	string								String with URL
-	 */
-	function getNomUrl($withpicto=0)
-	{
-		global $db, $conf, $langs;
-		global $dolibarr_main_authentication, $dolibarr_main_demo;
-		global $menumanager;
-
-		$result = '';
-		$companylink = '';
+    public $email;
+    public $date_creation;
+    public $tms;
+    //public $fk_user_creat;
+    //public $fk_user_modif;
+    public $signature;
+    public $position;
+    public $active;
+    // END MODULEBUILDER PROPERTIES
+
+
+
+    // If this object has a subtable with lines
+
+    /**
+     * @var int    Name of subtable line
+     */
+    //public $table_element_line = 'emailsenderprofiledet';
+    /**
+     * @var int    Field with ID of parent key if this field has a parent
+     */
+    //public $fk_element = 'fk_emailsenderprofile';
+    /**
+     * @var int    Name of subtable class that manage subtable lines
+     */
+    //public $class_element_line = 'EmailSenderProfileline';
+    /**
+     * @var array  Array of child tables (child tables to delete before deleting a record)
+     */
+    //protected $childtables=array('emailsenderprofiledet');
+    /**
+     * @var EmailSenderProfileLine[]     Array of subtable lines
+     */
+    //public $lines = array();
+
+
+
+    /**
+     * Constructor
+     *
+     * @param DoliDb $db Database handler
+     */
+    public function __construct(DoliDB $db)
+    {
+        global $conf;
+
+        $this->db = $db;
+
+        if (empty($conf->global->MAIN_SHOW_TECHNICAL_ID)) $this->fields['rowid']['visible']=0;
+        if (empty($conf->multicompany->enabled)) $this->fields['entity']['enabled']=0;
+    }
+
+    /**
+     * Create object into database
+     *
+     * @param  User $user      User that creates
+     * @param  bool $notrigger false=launch triggers after, true=disable triggers
+     * @return int             <0 if KO, Id of created object if OK
+     */
+    public function create(User $user, $notrigger = false)
+    {
+        return $this->createCommon($user, $notrigger);
+    }
+
+    /**
+     * Clone and object into another one
+     *
+     * @param  	User 	$user      	User that creates
+     * @param  	int 	$fromid     Id of object to clone
+     * @return 	mixed 				New object created, <0 if KO
+     */
+    public function createFromClone(User $user, $fromid)
+    {
+        global $hookmanager, $langs;
+        $error = 0;
+
+        dol_syslog(__METHOD__, LOG_DEBUG);
+
+        $object = new self($this->db);
+
+        $this->db->begin();
+
+        // Load source object
+        $object->fetchCommon($fromid);
+        // Reset some properties
+        unset($object->id);
+        unset($object->fk_user_creat);
+        unset($object->import_key);
+
+        // Clear fields
+        $object->ref = "copy_of_".$object->ref;
+        $object->title = $langs->trans("CopyOf")." ".$object->title;
+        // ...
+
+        // Create clone
+        $object->context['createfromclone'] = 'createfromclone';
+        $result = $object->createCommon($user);
+        if ($result < 0) {
+            $error++;
+            $this->error = $object->error;
+            $this->errors = $object->errors;
+        }
+
+        // End
+        if (!$error) {
+            $this->db->commit();
+            return $object;
+        } else {
+            $this->db->rollback();
+            return -1;
+        }
+    }
+
+    /**
+     * Load object in memory from the database
+     *
+     * @param int    $id   Id object
+     * @param string $ref  Ref
+     * @return int         <0 if KO, 0 if not found, >0 if OK
+     */
+    public function fetch($id, $ref = null)
+    {
+        $result = $this->fetchCommon($id, $ref);
+        if ($result > 0 && ! empty($this->table_element_line)) $this->fetchLines();
+        return $result;
+    }
+
+    /**
+     * Load object lines in memory from the database
+     *
+     * @return int         <0 if KO, 0 if not found, >0 if OK
+     */
+    public function fetchLines()
+    {
+        $this->lines=array();
+
+        // Load lines with object EmailSenderProfileLine
+
+        return count($this->lines)?1:0;
+    }
+
+    /**
+     * Update object into database
+     *
+     * @param  User $user      User that modifies
+     * @param  bool $notrigger false=launch triggers after, true=disable triggers
+     * @return int             <0 if KO, >0 if OK
+     */
+    public function update(User $user, $notrigger = false)
+    {
+        return $this->updateCommon($user, $notrigger);
+    }
+
+    /**
+     * Delete object in database
+     *
+     * @param User $user       User that deletes
+     * @param bool $notrigger  false=launch triggers after, true=disable triggers
+     * @return int             <0 if KO, >0 if OK
+     */
+    public function delete(User $user, $notrigger = false)
+    {
+        return $this->deleteCommon($user, $notrigger);
+    }
+
+    /**
+     *  Return a link to the object card (with optionaly the picto)
+     *
+     *	@param	int		$withpicto					Include picto in link (0=No picto, 1=Include picto into link, 2=Only picto)
+     *	@return	string								String with URL
+     */
+    function getNomUrl($withpicto=0)
+    {
+        global $db, $conf, $langs;
+        global $dolibarr_main_authentication, $dolibarr_main_demo;
+        global $menumanager;
+
+        $result = '';
+        $companylink = '';
 
     $label=$this->label;
 
     $url='';
-		//$url = dol_buildpath('/monmodule/emailsenderprofile_card.php',1).'?id='.$this->id;
-
-		$linkstart = '';
-		$linkend='';
-
-		if ($withpicto)
-		{
-			$result.=($linkstart.img_object($label, 'label', 'class="classfortooltip"').$linkend);
-			if ($withpicto != 2) $result.=' ';
-		}
-		$result.= $linkstart . $this->label . $linkend;
-		return $result;
-	}
-
-	/**
-	 * Return link to download file from a direct external access
-	 *
-	 * @param	int				$withpicto			Add download picto into link
-	 * @return	string			HTML link to file
-	 */
-	function getDirectExternalLink($withpicto=0)
-	{
-		return 'todo';
-	}
-
-	/**
-	 *  Retourne le libelle du status d'un user (actif, inactif)
-	 *
-	 *  @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 of status
-	 */
-	function getLibStatut($mode=0)
-	{
-		return $this->LibStatut($this->status,$mode);
-	}
+        //$url = dol_buildpath('/monmodule/emailsenderprofile_card.php',1).'?id='.$this->id;
+
+        $linkstart = '';
+        $linkend='';
+
+        if ($withpicto)
+        {
+            $result.=($linkstart.img_object($label, 'label', 'class="classfortooltip"').$linkend);
+            if ($withpicto != 2) $result.=' ';
+        }
+        $result.= $linkstart . $this->label . $linkend;
+        return $result;
+    }
+
+    /**
+     * Return link to download file from a direct external access
+     *
+     * @param	int				$withpicto			Add download picto into link
+     * @return	string			HTML link to file
+     */
+    function getDirectExternalLink($withpicto=0)
+    {
+        return 'todo';
+    }
+
+    /**
+     *  Retourne le libelle du status d'un user (actif, inactif)
+     *
+     *  @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 of status
+     */
+    function getLibStatut($mode=0)
+    {
+        return $this->LibStatut($this->status,$mode);
+    }
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
-	/**
-	 *  Return the status
-	 *
-	 *  @param	int		$status        	Id status
-	 *  @param  int		$mode          	0=long label, 1=short label, 2=Picto + short label, 3=Picto, 4=Picto + long label, 5=Short label + Picto, 6=Long label + Picto
-	 *  @return string 			       	Label of status
-	 */
-	static function LibStatut($status,$mode=0)
-	{
-		global $langs;
-
-		if ($mode == 0 || $mode == 1)
-		{
-			if ($status == 1) return $langs->trans('Enabled');
-			if ($status == 0) return $langs->trans('Disabled');
-		}
-		elseif ($mode == 2)
-		{
-			if ($status == 1) return img_picto($langs->trans('Enabled'),'statut4').' '.$langs->trans('Enabled');
-			if ($status == 0) return img_picto($langs->trans('Disabled'),'statut5').' '.$langs->trans('Disabled');
-		}
-		elseif ($mode == 3)
-		{
-			if ($status == 1) return img_picto($langs->trans('Enabled'),'statut4');
-			if ($status == 0) return img_picto($langs->trans('Disabled'),'statut5');
-		}
-		elseif ($mode == 4)
-		{
-			if ($status == 1) return img_picto($langs->trans('Enabled'),'statut4').' '.$langs->trans('Enabled');
-			if ($status == 0) return img_picto($langs->trans('Disabled'),'statut5').' '.$langs->trans('Disabled');
-		}
-		elseif ($mode == 5)
-		{
-			if ($status == 1) return $langs->trans('Enabled').' '.img_picto($langs->trans('Enabled'),'statut4');
-			if ($status == 0) return $langs->trans('Disabled').' '.img_picto($langs->trans('Disabled'),'statut5');
-		}
-		elseif ($mode == 6)
-		{
-			if ($status == 1) return $langs->trans('Enabled').' '.img_picto($langs->trans('Enabled'),'statut4');
-			if ($status == 0) return $langs->trans('Disabled').' '.img_picto($langs->trans('Disabled'),'statut5');
-		}
-	}
-
-	/**
-	 *	Charge les informations d'ordre info dans l'objet commande
-	 *
-	 *	@param  int		$id       Id of order
-	 *	@return	void
-	 */
-	function info($id)
-	{
-		$sql = 'SELECT rowid, date_creation as datec, tms as datem,';
-		$sql.= ' fk_user_creat, fk_user_modif';
-		$sql.= ' FROM '.MAIN_DB_PREFIX.$this->table_element.' as t';
-		$sql.= ' WHERE t.rowid = '.$id;
-		$result=$this->db->query($sql);
-		if ($result)
-		{
-			if ($this->db->num_rows($result))
-			{
-				$obj = $this->db->fetch_object($result);
-				$this->id = $obj->rowid;
-				if ($obj->fk_user_author)
-				{
-					$cuser = new User($this->db);
-					$cuser->fetch($obj->fk_user_author);
-					$this->user_creation   = $cuser;
-				}
-
-				if ($obj->fk_user_valid)
-				{
-					$vuser = new User($this->db);
-					$vuser->fetch($obj->fk_user_valid);
-					$this->user_validation = $vuser;
-				}
-
-				if ($obj->fk_user_cloture)
-				{
-					$cluser = new User($this->db);
-					$cluser->fetch($obj->fk_user_cloture);
-					$this->user_cloture   = $cluser;
-				}
-
-				$this->date_creation     = $this->db->jdate($obj->datec);
-				$this->date_modification = $this->db->jdate($obj->datem);
-				$this->date_validation   = $this->db->jdate($obj->datev);
-			}
-
-			$this->db->free($result);
-		}
-		else
-		{
-			dol_print_error($this->db);
-		}
-	}
-
-	/**
-	 * Initialise object with example values
-	 * Id must be 0 if object instance is a specimen
-	 *
-	 * @return void
-	 */
-	public function initAsSpecimen()
-	{
-		$this->initAsSpecimenCommon();
-	}
+    /**
+     *  Return the status
+     *
+     *  @param	int		$status        	Id status
+     *  @param  int		$mode          	0=long label, 1=short label, 2=Picto + short label, 3=Picto, 4=Picto + long label, 5=Short label + Picto, 6=Long label + Picto
+     *  @return string 			       	Label of status
+     */
+    static function LibStatut($status,$mode=0)
+    {
+        global $langs;
+
+        if ($mode == 0 || $mode == 1)
+        {
+            if ($status == 1) return $langs->trans('Enabled');
+            if ($status == 0) return $langs->trans('Disabled');
+        }
+        elseif ($mode == 2)
+        {
+            if ($status == 1) return img_picto($langs->trans('Enabled'),'statut4').' '.$langs->trans('Enabled');
+            if ($status == 0) return img_picto($langs->trans('Disabled'),'statut5').' '.$langs->trans('Disabled');
+        }
+        elseif ($mode == 3)
+        {
+            if ($status == 1) return img_picto($langs->trans('Enabled'),'statut4');
+            if ($status == 0) return img_picto($langs->trans('Disabled'),'statut5');
+        }
+        elseif ($mode == 4)
+        {
+            if ($status == 1) return img_picto($langs->trans('Enabled'),'statut4').' '.$langs->trans('Enabled');
+            if ($status == 0) return img_picto($langs->trans('Disabled'),'statut5').' '.$langs->trans('Disabled');
+        }
+        elseif ($mode == 5)
+        {
+            if ($status == 1) return $langs->trans('Enabled').' '.img_picto($langs->trans('Enabled'),'statut4');
+            if ($status == 0) return $langs->trans('Disabled').' '.img_picto($langs->trans('Disabled'),'statut5');
+        }
+        elseif ($mode == 6)
+        {
+            if ($status == 1) return $langs->trans('Enabled').' '.img_picto($langs->trans('Enabled'),'statut4');
+            if ($status == 0) return $langs->trans('Disabled').' '.img_picto($langs->trans('Disabled'),'statut5');
+        }
+    }
+
+    /**
+     *	Charge les informations d'ordre info dans l'objet commande
+     *
+     *	@param  int		$id       Id of order
+     *	@return	void
+     */
+    function info($id)
+    {
+        $sql = 'SELECT rowid, date_creation as datec, tms as datem,';
+        $sql.= ' fk_user_creat, fk_user_modif';
+        $sql.= ' FROM '.MAIN_DB_PREFIX.$this->table_element.' as t';
+        $sql.= ' WHERE t.rowid = '.$id;
+        $result=$this->db->query($sql);
+        if ($result)
+        {
+            if ($this->db->num_rows($result))
+            {
+                $obj = $this->db->fetch_object($result);
+                $this->id = $obj->rowid;
+                if ($obj->fk_user_author)
+                {
+                    $cuser = new User($this->db);
+                    $cuser->fetch($obj->fk_user_author);
+                    $this->user_creation   = $cuser;
+                }
+
+                if ($obj->fk_user_valid)
+                {
+                    $vuser = new User($this->db);
+                    $vuser->fetch($obj->fk_user_valid);
+                    $this->user_validation = $vuser;
+                }
+
+                if ($obj->fk_user_cloture)
+                {
+                    $cluser = new User($this->db);
+                    $cluser->fetch($obj->fk_user_cloture);
+                    $this->user_cloture   = $cluser;
+                }
+
+                $this->date_creation     = $this->db->jdate($obj->datec);
+                $this->date_modification = $this->db->jdate($obj->datem);
+                $this->date_validation   = $this->db->jdate($obj->datev);
+            }
+
+            $this->db->free($result);
+        }
+        else
+        {
+            dol_print_error($this->db);
+        }
+    }
+
+    /**
+     * Initialise object with example values
+     * Id must be 0 if object instance is a specimen
+     *
+     * @return void
+     */
+    public function initAsSpecimen()
+    {
+        $this->initAsSpecimenCommon();
+    }
 }
 
 /**

Spacing +34 added lines, -34 removed lines

@@ -26,7 +26,7 @@ 
  */
 
 // Put here all includes required by your class file
-require_once DOL_DOCUMENT_ROOT . '/core/class/commonobject.class.php';
+require_once DOL_DOCUMENT_ROOT.'/core/class/commonobject.class.php';
 //require_once DOL_DOCUMENT_ROOT . '/societe/class/societe.class.php';
 //require_once DOL_DOCUMENT_ROOT . '/product/class/product.class.php';
 
@@ -75,7 +75,7 @@ 
 	/**
 	 * @var array  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
 	 */
-	public $fields=array(
+	public $fields = array(
 		'rowid' => array('type'=>'integer', 'label'=>'TechnicalID', 'visible'=>-1, 'enabled'=>1, 'position'=>1, 'notnull'=>1, 'index'=>1, 'comment'=>'Id',),
 		'entity' => array('type'=>'integer', 'label'=>'Entity', 'visible'=>-1, 'enabled'=>1, 'position'=>20, 'notnull'=>1, 'index'=>1,),
 		'label' => array('type'=>'varchar(255)', 'label'=>'Label', 'visible'=>1, 'enabled'=>1, 'position'=>30, 'notnull'=>-1),
@@ -152,8 +152,8 @@ 
 
 		$this->db = $db;
 
-		if (empty($conf->global->MAIN_SHOW_TECHNICAL_ID)) $this->fields['rowid']['visible']=0;
-		if (empty($conf->multicompany->enabled)) $this->fields['entity']['enabled']=0;
+		if (empty($conf->global->MAIN_SHOW_TECHNICAL_ID)) $this->fields['rowid']['visible'] = 0;
+		if (empty($conf->multicompany->enabled)) $this->fields['entity']['enabled'] = 0;
 	}
 
 	/**
@@ -227,7 +227,7 @@ 
 	public function fetch($id, $ref = null)
 	{
 		$result = $this->fetchCommon($id, $ref);
-		if ($result > 0 && ! empty($this->table_element_line)) $this->fetchLines();
+		if ($result > 0 && !empty($this->table_element_line)) $this->fetchLines();
 		return $result;
 	}
 
@@ -238,11 +238,11 @@ 
 	 */
 	public function fetchLines()
 	{
-		$this->lines=array();
+		$this->lines = array();
 
 		// Load lines with object EmailSenderProfileLine
 
-		return count($this->lines)?1:0;
+		return count($this->lines) ? 1 : 0;
 	}
 
 	/**
@@ -275,7 +275,7 @@ 
 	 *	@param	int		$withpicto					Include picto in link (0=No picto, 1=Include picto into link, 2=Only picto)
 	 *	@return	string								String with URL
 	 */
-	function getNomUrl($withpicto=0)
+	function getNomUrl($withpicto = 0)
 	{
 		global $db, $conf, $langs;
 		global $dolibarr_main_authentication, $dolibarr_main_demo;
@@ -284,20 +284,20 @@ 
 		$result = '';
 		$companylink = '';
 
-    $label=$this->label;
+    $label = $this->label;
 
-    $url='';
+    $url = '';
 		//$url = dol_buildpath('/monmodule/emailsenderprofile_card.php',1).'?id='.$this->id;
 
 		$linkstart = '';
-		$linkend='';
+		$linkend = '';
 
 		if ($withpicto)
 		{
-			$result.=($linkstart.img_object($label, 'label', 'class="classfortooltip"').$linkend);
-			if ($withpicto != 2) $result.=' ';
+			$result .= ($linkstart.img_object($label, 'label', 'class="classfortooltip"').$linkend);
+			if ($withpicto != 2) $result .= ' ';
 		}
-		$result.= $linkstart . $this->label . $linkend;
+		$result .= $linkstart.$this->label.$linkend;
 		return $result;
 	}
 
@@ -307,7 +307,7 @@ 
 	 * @param	int				$withpicto			Add download picto into link
 	 * @return	string			HTML link to file
 	 */
-	function getDirectExternalLink($withpicto=0)
+	function getDirectExternalLink($withpicto = 0)
 	{
 		return 'todo';
 	}
@@ -318,9 +318,9 @@ 
 	 *  @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 of status
 	 */
-	function getLibStatut($mode=0)
+	function getLibStatut($mode = 0)
 	{
-		return $this->LibStatut($this->status,$mode);
+		return $this->LibStatut($this->status, $mode);
 	}
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
@@ -331,7 +331,7 @@ 
 	 *  @param  int		$mode          	0=long label, 1=short label, 2=Picto + short label, 3=Picto, 4=Picto + long label, 5=Short label + Picto, 6=Long label + Picto
 	 *  @return string 			       	Label of status
 	 */
-	static function LibStatut($status,$mode=0)
+	static function LibStatut($status, $mode = 0)
 	{
 		global $langs;
 
@@ -342,28 +342,28 @@ 
 		}
 		elseif ($mode == 2)
 		{
-			if ($status == 1) return img_picto($langs->trans('Enabled'),'statut4').' '.$langs->trans('Enabled');
-			if ($status == 0) return img_picto($langs->trans('Disabled'),'statut5').' '.$langs->trans('Disabled');
+			if ($status == 1) return img_picto($langs->trans('Enabled'), 'statut4').' '.$langs->trans('Enabled');
+			if ($status == 0) return img_picto($langs->trans('Disabled'), 'statut5').' '.$langs->trans('Disabled');
 		}
 		elseif ($mode == 3)
 		{
-			if ($status == 1) return img_picto($langs->trans('Enabled'),'statut4');
-			if ($status == 0) return img_picto($langs->trans('Disabled'),'statut5');
+			if ($status == 1) return img_picto($langs->trans('Enabled'), 'statut4');
+			if ($status == 0) return img_picto($langs->trans('Disabled'), 'statut5');
 		}
 		elseif ($mode == 4)
 		{
-			if ($status == 1) return img_picto($langs->trans('Enabled'),'statut4').' '.$langs->trans('Enabled');
-			if ($status == 0) return img_picto($langs->trans('Disabled'),'statut5').' '.$langs->trans('Disabled');
+			if ($status == 1) return img_picto($langs->trans('Enabled'), 'statut4').' '.$langs->trans('Enabled');
+			if ($status == 0) return img_picto($langs->trans('Disabled'), 'statut5').' '.$langs->trans('Disabled');
 		}
 		elseif ($mode == 5)
 		{
-			if ($status == 1) return $langs->trans('Enabled').' '.img_picto($langs->trans('Enabled'),'statut4');
-			if ($status == 0) return $langs->trans('Disabled').' '.img_picto($langs->trans('Disabled'),'statut5');
+			if ($status == 1) return $langs->trans('Enabled').' '.img_picto($langs->trans('Enabled'), 'statut4');
+			if ($status == 0) return $langs->trans('Disabled').' '.img_picto($langs->trans('Disabled'), 'statut5');
 		}
 		elseif ($mode == 6)
 		{
-			if ($status == 1) return $langs->trans('Enabled').' '.img_picto($langs->trans('Enabled'),'statut4');
-			if ($status == 0) return $langs->trans('Disabled').' '.img_picto($langs->trans('Disabled'),'statut5');
+			if ($status == 1) return $langs->trans('Enabled').' '.img_picto($langs->trans('Enabled'), 'statut4');
+			if ($status == 0) return $langs->trans('Disabled').' '.img_picto($langs->trans('Disabled'), 'statut5');
 		}
 	}
 
@@ -376,10 +376,10 @@ 
 	function info($id)
 	{
 		$sql = 'SELECT rowid, date_creation as datec, tms as datem,';
-		$sql.= ' fk_user_creat, fk_user_modif';
-		$sql.= ' FROM '.MAIN_DB_PREFIX.$this->table_element.' as t';
-		$sql.= ' WHERE t.rowid = '.$id;
-		$result=$this->db->query($sql);
+		$sql .= ' fk_user_creat, fk_user_modif';
+		$sql .= ' FROM '.MAIN_DB_PREFIX.$this->table_element.' as t';
+		$sql .= ' WHERE t.rowid = '.$id;
+		$result = $this->db->query($sql);
 		if ($result)
 		{
 			if ($this->db->num_rows($result))
@@ -390,7 +390,7 @@ 
 				{
 					$cuser = new User($this->db);
 					$cuser->fetch($obj->fk_user_author);
-					$this->user_creation   = $cuser;
+					$this->user_creation = $cuser;
 				}
 
 				if ($obj->fk_user_valid)
@@ -404,7 +404,7 @@ 
 				{
 					$cluser = new User($this->db);
 					$cluser->fetch($obj->fk_user_cloture);
-					$this->user_cloture   = $cluser;
+					$this->user_cloture = $cluser;
 				}
 
 				$this->date_creation     = $this->db->jdate($obj->datec);

Braces +54 added lines, -28 removed lines

@@ -152,8 +152,12 @@ 
 
 		$this->db = $db;
 
-		if (empty($conf->global->MAIN_SHOW_TECHNICAL_ID)) $this->fields['rowid']['visible']=0;
-		if (empty($conf->multicompany->enabled)) $this->fields['entity']['enabled']=0;
+		if (empty($conf->global->MAIN_SHOW_TECHNICAL_ID)) {
+		    $this->fields['rowid']['visible']=0;
+		}
+		if (empty($conf->multicompany->enabled)) {
+		    $this->fields['entity']['enabled']=0;
+		}
 	}
 
 	/**
@@ -227,7 +231,9 @@ 
 	public function fetch($id, $ref = null)
 	{
 		$result = $this->fetchCommon($id, $ref);
-		if ($result > 0 && ! empty($this->table_element_line)) $this->fetchLines();
+		if ($result > 0 && ! empty($this->table_element_line)) {
+		    $this->fetchLines();
+		}
 		return $result;
 	}
 
@@ -295,7 +301,9 @@ 
 		if ($withpicto)
 		{
 			$result.=($linkstart.img_object($label, 'label', 'class="classfortooltip"').$linkend);
-			if ($withpicto != 2) $result.=' ';
+			if ($withpicto != 2) {
+			    $result.=' ';
+			}
 		}
 		$result.= $linkstart . $this->label . $linkend;
 		return $result;
@@ -337,33 +345,52 @@ 
 
 		if ($mode == 0 || $mode == 1)
 		{
-			if ($status == 1) return $langs->trans('Enabled');
-			if ($status == 0) return $langs->trans('Disabled');
-		}
-		elseif ($mode == 2)
+			if ($status == 1) {
+			    return $langs->trans('Enabled');
+			}
+			if ($status == 0) {
+			    return $langs->trans('Disabled');
+			}
+		} elseif ($mode == 2)
 		{
-			if ($status == 1) return img_picto($langs->trans('Enabled'),'statut4').' '.$langs->trans('Enabled');
-			if ($status == 0) return img_picto($langs->trans('Disabled'),'statut5').' '.$langs->trans('Disabled');
-		}
-		elseif ($mode == 3)
+			if ($status == 1) {
+			    return img_picto($langs->trans('Enabled'),'statut4').' '.$langs->trans('Enabled');
+			}
+			if ($status == 0) {
+			    return img_picto($langs->trans('Disabled'),'statut5').' '.$langs->trans('Disabled');
+			}
+		} elseif ($mode == 3)
 		{
-			if ($status == 1) return img_picto($langs->trans('Enabled'),'statut4');
-			if ($status == 0) return img_picto($langs->trans('Disabled'),'statut5');
-		}
-		elseif ($mode == 4)
+			if ($status == 1) {
+			    return img_picto($langs->trans('Enabled'),'statut4');
+			}
+			if ($status == 0) {
+			    return img_picto($langs->trans('Disabled'),'statut5');
+			}
+		} elseif ($mode == 4)
 		{
-			if ($status == 1) return img_picto($langs->trans('Enabled'),'statut4').' '.$langs->trans('Enabled');
-			if ($status == 0) return img_picto($langs->trans('Disabled'),'statut5').' '.$langs->trans('Disabled');
-		}
-		elseif ($mode == 5)
+			if ($status == 1) {
+			    return img_picto($langs->trans('Enabled'),'statut4').' '.$langs->trans('Enabled');
+			}
+			if ($status == 0) {
+			    return img_picto($langs->trans('Disabled'),'statut5').' '.$langs->trans('Disabled');
+			}
+		} elseif ($mode == 5)
 		{
-			if ($status == 1) return $langs->trans('Enabled').' '.img_picto($langs->trans('Enabled'),'statut4');
-			if ($status == 0) return $langs->trans('Disabled').' '.img_picto($langs->trans('Disabled'),'statut5');
-		}
-		elseif ($mode == 6)
+			if ($status == 1) {
+			    return $langs->trans('Enabled').' '.img_picto($langs->trans('Enabled'),'statut4');
+			}
+			if ($status == 0) {
+			    return $langs->trans('Disabled').' '.img_picto($langs->trans('Disabled'),'statut5');
+			}
+		} elseif ($mode == 6)
 		{
-			if ($status == 1) return $langs->trans('Enabled').' '.img_picto($langs->trans('Enabled'),'statut4');
-			if ($status == 0) return $langs->trans('Disabled').' '.img_picto($langs->trans('Disabled'),'statut5');
+			if ($status == 1) {
+			    return $langs->trans('Enabled').' '.img_picto($langs->trans('Enabled'),'statut4');
+			}
+			if ($status == 0) {
+			    return $langs->trans('Disabled').' '.img_picto($langs->trans('Disabled'),'statut5');
+			}
 		}
 	}
 
@@ -413,8 +440,7 @@ 
 			}
 
 			$this->db->free($result);
-		}
-		else
+		} else
 		{
 			dol_print_error($this->db);
 		}

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

Indentation +83 added lines, -83 removed lines

@@ -30,9 +30,9 @@ 
     private $db;
 
     /**
-	 * @var string Error code (or message)
-	 */
-	public $error;
+     * @var string Error code (or message)
+     */
+    public $error;
 
 
     /**
@@ -56,7 +56,7 @@ 
      */
     function selectWebsite($selected='',$htmlname='exportmodelid',$useempty=0)
     {
-    	$out='';
+        $out='';
 
         $sql = "SELECT rowid, ref";
         $sql.= " FROM ".MAIN_DB_PREFIX."website";
@@ -109,55 +109,55 @@ 
      */
     function selectTypeOfContainer($htmlname, $selected='', $useempty=0, $moreattrib='')
     {
-    	global $langs, $conf, $user;
-
-    	$langs->load("admin");
-
-    	$sql = "SELECT rowid, code, label, entity";
-    	$sql.= " FROM ".MAIN_DB_PREFIX.'c_type_container';
-    	$sql.= " WHERE active = 1 AND entity IN (".getEntity('c_type_container').")";
-    	$sql.= " ORDER BY label";
-
-    	dol_syslog(get_class($this)."::selectTypeOfContainer", LOG_DEBUG);
-    	$result = $this->db->query($sql);
-    	if ($result)
-    	{
-    		$num = $this->db->num_rows($result);
-    		$i = 0;
-    		if ($num)
-    		{
-    			print '<select id="select'.$htmlname.'" class="flat selectTypeOfContainer" name="'.$htmlname.'"'.($moreattrib?' '.$moreattrib:'').'>';
-    			if ($useempty == 1 || ($useempty == 2 && $num > 1))
-    			{
-    				print '<option value="-1">&nbsp;</option>';
-    			}
-
-    			while ($i < $num)
-    			{
-    				$obj = $this->db->fetch_object($result);
-    				if ($selected == $obj->rowid || $selected == $obj->code)
-    				{
-    					print '<option value="'.$obj->code.'" selected>';
-    				}
-    				else
-    				{
-    					print '<option value="'.$obj->code.'">';
-    				}
-    				print $obj->label;
-    				print '</option>';
-    				$i++;
-    			}
-    			print "</select>";
-    			if ($user->admin) print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"),1);
-    		}
-    		else
-    		{
-    			print $langs->trans("NoTypeOfPagePleaseEditDictionary");
-    		}
-    	}
-    	else {
-    		dol_print_error($this->db);
-    	}
+        global $langs, $conf, $user;
+
+        $langs->load("admin");
+
+        $sql = "SELECT rowid, code, label, entity";
+        $sql.= " FROM ".MAIN_DB_PREFIX.'c_type_container';
+        $sql.= " WHERE active = 1 AND entity IN (".getEntity('c_type_container').")";
+        $sql.= " ORDER BY label";
+
+        dol_syslog(get_class($this)."::selectTypeOfContainer", LOG_DEBUG);
+        $result = $this->db->query($sql);
+        if ($result)
+        {
+            $num = $this->db->num_rows($result);
+            $i = 0;
+            if ($num)
+            {
+                print '<select id="select'.$htmlname.'" class="flat selectTypeOfContainer" name="'.$htmlname.'"'.($moreattrib?' '.$moreattrib:'').'>';
+                if ($useempty == 1 || ($useempty == 2 && $num > 1))
+                {
+                    print '<option value="-1">&nbsp;</option>';
+                }
+
+                while ($i < $num)
+                {
+                    $obj = $this->db->fetch_object($result);
+                    if ($selected == $obj->rowid || $selected == $obj->code)
+                    {
+                        print '<option value="'.$obj->code.'" selected>';
+                    }
+                    else
+                    {
+                        print '<option value="'.$obj->code.'">';
+                    }
+                    print $obj->label;
+                    print '</option>';
+                    $i++;
+                }
+                print "</select>";
+                if ($user->admin) print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"),1);
+            }
+            else
+            {
+                print $langs->trans("NoTypeOfPagePleaseEditDictionary");
+            }
+        }
+        else {
+            dol_print_error($this->db);
+        }
     }
 
 
@@ -172,35 +172,35 @@ 
      */
     function selectSampleOfContainer($htmlname, $selected='', $useempty=0, $moreattrib='')
     {
-    	global $langs, $conf, $user;
-
-    	$langs->load("admin");
-
-    	$arrayofsamples=array('empty'=>'EmptyPage', 'corporatehome'=>'CorporateHomePage');
-
-    	$out = '';
-    	$out .= '<select id="select'.$htmlname.'" class="flat selectTypeOfContainer" name="'.$htmlname.'"'.($moreattrib?' '.$moreattrib:'').'>';
-
-    	if ($useempty == 1 || $useempty == 2)
-    	{
-    		$out .= '<option value="-1">&nbsp;</option>';
-    	}
-
-    	foreach($arrayofsamples as $key => $val)
-    	{
-    		if ($selected == $key)
-    		{
-    			$out .= '<option value="'.$key.'" selected>';
-    		}
-    		else
-    		{
-    			$out .= '<option value="'.$key.'">';
-    		}
-    		$out .= $langs->trans($val);
-    		$out .= '</option>';
-    	}
-    	$out .= "</select>";
-
-    	return $out;
+        global $langs, $conf, $user;
+
+        $langs->load("admin");
+
+        $arrayofsamples=array('empty'=>'EmptyPage', 'corporatehome'=>'CorporateHomePage');
+
+        $out = '';
+        $out .= '<select id="select'.$htmlname.'" class="flat selectTypeOfContainer" name="'.$htmlname.'"'.($moreattrib?' '.$moreattrib:'').'>';
+
+        if ($useempty == 1 || $useempty == 2)
+        {
+            $out .= '<option value="-1">&nbsp;</option>';
+        }
+
+        foreach($arrayofsamples as $key => $val)
+        {
+            if ($selected == $key)
+            {
+                $out .= '<option value="'.$key.'" selected>';
+            }
+            else
+            {
+                $out .= '<option value="'.$key.'">';
+            }
+            $out .= $langs->trans($val);
+            $out .= '</option>';
+        }
+        $out .= "</select>";
+
+        return $out;
     }
 }

Spacing +22 added lines, -22 removed lines

@@ -54,21 +54,21 @@ 
      *    @param    int		$useempty          Show empty value or not
      *    @return	string					   Html component
      */
-    function selectWebsite($selected='',$htmlname='exportmodelid',$useempty=0)
+    function selectWebsite($selected = '', $htmlname = 'exportmodelid', $useempty = 0)
     {
-    	$out='';
+    	$out = '';
 
         $sql = "SELECT rowid, ref";
-        $sql.= " FROM ".MAIN_DB_PREFIX."website";
-        $sql.= " WHERE 1 = 1";
-        $sql.= " ORDER BY rowid";
+        $sql .= " FROM ".MAIN_DB_PREFIX."website";
+        $sql .= " WHERE 1 = 1";
+        $sql .= " ORDER BY rowid";
         $result = $this->db->query($sql);
         if ($result)
         {
-            $out.='<select class="flat minwidth100" name="'.$htmlname.'" id="'.$htmlname.'">';
+            $out .= '<select class="flat minwidth100" name="'.$htmlname.'" id="'.$htmlname.'">';
             if ($useempty)
             {
-                $out.='<option value="-1">&nbsp;</option>';
+                $out .= '<option value="-1">&nbsp;</option>';
             }
 
             $num = $this->db->num_rows($result);
@@ -78,17 +78,17 @@ 
                 $obj = $this->db->fetch_object($result);
                 if ($selected == $obj->rowid)
                 {
-                    $out.='<option value="'.$obj->rowid.'" selected>';
+                    $out .= '<option value="'.$obj->rowid.'" selected>';
                 }
                 else
                 {
-                    $out.='<option value="'.$obj->rowid.'">';
+                    $out .= '<option value="'.$obj->rowid.'">';
                 }
-                $out.=$obj->ref;
-                $out.='</option>';
+                $out .= $obj->ref;
+                $out .= '</option>';
                 $i++;
             }
-            $out.="</select>";
+            $out .= "</select>";
         }
         else {
             dol_print_error($this->db);
@@ -107,16 +107,16 @@ 
      *  @param  string  $moreattrib         More attributes on HTML select tag
      * 	@return	void
      */
-    function selectTypeOfContainer($htmlname, $selected='', $useempty=0, $moreattrib='')
+    function selectTypeOfContainer($htmlname, $selected = '', $useempty = 0, $moreattrib = '')
     {
     	global $langs, $conf, $user;
 
     	$langs->load("admin");
 
     	$sql = "SELECT rowid, code, label, entity";
-    	$sql.= " FROM ".MAIN_DB_PREFIX.'c_type_container';
-    	$sql.= " WHERE active = 1 AND entity IN (".getEntity('c_type_container').")";
-    	$sql.= " ORDER BY label";
+    	$sql .= " FROM ".MAIN_DB_PREFIX.'c_type_container';
+    	$sql .= " WHERE active = 1 AND entity IN (".getEntity('c_type_container').")";
+    	$sql .= " ORDER BY label";
 
     	dol_syslog(get_class($this)."::selectTypeOfContainer", LOG_DEBUG);
     	$result = $this->db->query($sql);
@@ -126,7 +126,7 @@ 
     		$i = 0;
     		if ($num)
     		{
-    			print '<select id="select'.$htmlname.'" class="flat selectTypeOfContainer" name="'.$htmlname.'"'.($moreattrib?' '.$moreattrib:'').'>';
+    			print '<select id="select'.$htmlname.'" class="flat selectTypeOfContainer" name="'.$htmlname.'"'.($moreattrib ? ' '.$moreattrib : '').'>';
     			if ($useempty == 1 || ($useempty == 2 && $num > 1))
     			{
     				print '<option value="-1">&nbsp;</option>';
@@ -148,7 +148,7 @@ 
     				$i++;
     			}
     			print "</select>";
-    			if ($user->admin) print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"),1);
+    			if ($user->admin) print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"), 1);
     		}
     		else
     		{
@@ -170,23 +170,23 @@ 
      *  @param  string  $moreattrib         More attributes on HTML select tag
      * 	@return	void
      */
-    function selectSampleOfContainer($htmlname, $selected='', $useempty=0, $moreattrib='')
+    function selectSampleOfContainer($htmlname, $selected = '', $useempty = 0, $moreattrib = '')
     {
     	global $langs, $conf, $user;
 
     	$langs->load("admin");
 
-    	$arrayofsamples=array('empty'=>'EmptyPage', 'corporatehome'=>'CorporateHomePage');
+    	$arrayofsamples = array('empty'=>'EmptyPage', 'corporatehome'=>'CorporateHomePage');
 
     	$out = '';
-    	$out .= '<select id="select'.$htmlname.'" class="flat selectTypeOfContainer" name="'.$htmlname.'"'.($moreattrib?' '.$moreattrib:'').'>';
+    	$out .= '<select id="select'.$htmlname.'" class="flat selectTypeOfContainer" name="'.$htmlname.'"'.($moreattrib ? ' '.$moreattrib : '').'>';
 
     	if ($useempty == 1 || $useempty == 2)
     	{
     		$out .= '<option value="-1">&nbsp;</option>';
     	}
 
-    	foreach($arrayofsamples as $key => $val)
+    	foreach ($arrayofsamples as $key => $val)
     	{
     		if ($selected == $key)
     		{

Braces +9 added lines, -13 removed lines

@@ -79,8 +79,7 @@ 
                 if ($selected == $obj->rowid)
                 {
                     $out.='<option value="'.$obj->rowid.'" selected>';
-                }
-                else
+                } else
                 {
                     $out.='<option value="'.$obj->rowid.'">';
                 }
@@ -89,8 +88,7 @@ 
                 $i++;
             }
             $out.="</select>";
-        }
-        else {
+        } else {
             dol_print_error($this->db);
         }
 
@@ -138,8 +136,7 @@ 
     				if ($selected == $obj->rowid || $selected == $obj->code)
     				{
     					print '<option value="'.$obj->code.'" selected>';
-    				}
-    				else
+    				} else
     				{
     					print '<option value="'.$obj->code.'">';
     				}
@@ -148,14 +145,14 @@ 
     				$i++;
     			}
     			print "</select>";
-    			if ($user->admin) print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"),1);
-    		}
-    		else
+    			if ($user->admin) {
+    			    print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"),1);
+    			}
+    		} else
     		{
     			print $langs->trans("NoTypeOfPagePleaseEditDictionary");
     		}
-    	}
-    	else {
+    	} else {
     		dol_print_error($this->db);
     	}
     }
@@ -191,8 +188,7 @@ 
     		if ($selected == $key)
     		{
     			$out .= '<option value="'.$key.'" selected>';
-    		}
-    		else
+    		} else
     		{
     			$out .= '<option value="'.$key.'">';
     		}

dolibarr/htdocs/core/actions_addupdatedelete.inc.php

Indentation +158 added lines, -158 removed lines

@@ -32,187 +32,187 @@
 
 if ($cancel)
 {
-	if (! empty($backtopage))
-	{
-		header("Location: ".$backtopage);
-		exit;
-	}
-	$action='';
+    if (! empty($backtopage))
+    {
+        header("Location: ".$backtopage);
+        exit;
+    }
+    $action='';
 }
 
 // Action to add record
 if ($action == 'add' && ! empty($permissiontoadd))
 {
-	foreach ($object->fields as $key => $val)
-	{
-		if (in_array($key, array('rowid', 'entity', 'date_creation', 'tms', 'fk_user_creat', 'fk_user_modif', 'import_key'))) continue;	// Ignore special fields
-
-		// Set value to insert
-		if (in_array($object->fields[$key]['type'], array('text', 'html'))) {
-			$value = GETPOST($key,'none');
-		} elseif ($object->fields[$key]['type']=='date') {
-			$value = dol_mktime(12, 0, 0, GETPOST($key.'month'), GETPOST($key.'day'), GETPOST($key.'year'));
-		} elseif ($object->fields[$key]['type']=='datetime') {
-			$value = dol_mktime(GETPOST($key.'hour'), GETPOST($key.'min'), 0, GETPOST($key.'month'), GETPOST($key.'day'), GETPOST($key.'year'));
-		} elseif ($object->fields[$key]['type']=='price') {
-			$value = price2num(GETPOST($key));
-		} else {
-			$value = GETPOST($key,'alpha');
-		}
-		if (preg_match('/^integer:/i', $object->fields[$key]['type']) && $value == '-1') $value='';		// This is an implicit foreign key field
-		if (! empty($object->fields[$key]['foreignkey']) && $value == '-1') $value='';					// This is an explicit foreign key field
-
-		$object->$key=$value;
-		if ($val['notnull'] > 0 && $object->$key == '' && is_null($val['default']))
-		{
-			$error++;
-			setEventMessages($langs->trans("ErrorFieldRequired",$langs->transnoentitiesnoconv($val['label'])), null, 'errors');
-		}
-	}
-
-	if (! $error)
-	{
-		$result=$object->create($user);
-		if ($result > 0)
-		{
-			// Creation OK
-			$urltogo=$backtopage?str_replace('__ID__', $result, $backtopage):$backurlforlist;
-			header("Location: ".$urltogo);
-			exit;
-		}
-		else
-		{
-			// Creation KO
-			if (! empty($object->errors)) setEventMessages(null, $object->errors, 'errors');
-			else  setEventMessages($object->error, null, 'errors');
-			$action='create';
-		}
-	}
-	else
-	{
-		$action='create';
-	}
+    foreach ($object->fields as $key => $val)
+    {
+        if (in_array($key, array('rowid', 'entity', 'date_creation', 'tms', 'fk_user_creat', 'fk_user_modif', 'import_key'))) continue;	// Ignore special fields
+
+        // Set value to insert
+        if (in_array($object->fields[$key]['type'], array('text', 'html'))) {
+            $value = GETPOST($key,'none');
+        } elseif ($object->fields[$key]['type']=='date') {
+            $value = dol_mktime(12, 0, 0, GETPOST($key.'month'), GETPOST($key.'day'), GETPOST($key.'year'));
+        } elseif ($object->fields[$key]['type']=='datetime') {
+            $value = dol_mktime(GETPOST($key.'hour'), GETPOST($key.'min'), 0, GETPOST($key.'month'), GETPOST($key.'day'), GETPOST($key.'year'));
+        } elseif ($object->fields[$key]['type']=='price') {
+            $value = price2num(GETPOST($key));
+        } else {
+            $value = GETPOST($key,'alpha');
+        }
+        if (preg_match('/^integer:/i', $object->fields[$key]['type']) && $value == '-1') $value='';		// This is an implicit foreign key field
+        if (! empty($object->fields[$key]['foreignkey']) && $value == '-1') $value='';					// This is an explicit foreign key field
+
+        $object->$key=$value;
+        if ($val['notnull'] > 0 && $object->$key == '' && is_null($val['default']))
+        {
+            $error++;
+            setEventMessages($langs->trans("ErrorFieldRequired",$langs->transnoentitiesnoconv($val['label'])), null, 'errors');
+        }
+    }
+
+    if (! $error)
+    {
+        $result=$object->create($user);
+        if ($result > 0)
+        {
+            // Creation OK
+            $urltogo=$backtopage?str_replace('__ID__', $result, $backtopage):$backurlforlist;
+            header("Location: ".$urltogo);
+            exit;
+        }
+        else
+        {
+            // Creation KO
+            if (! empty($object->errors)) setEventMessages(null, $object->errors, 'errors');
+            else  setEventMessages($object->error, null, 'errors');
+            $action='create';
+        }
+    }
+    else
+    {
+        $action='create';
+    }
 }
 
 // Action to update record
 if ($action == 'update' && ! empty($permissiontoadd))
 {
-	foreach ($object->fields as $key => $val)
-	{
-		if (! GETPOSTISSET($key)) continue;		// The field was not submited to be edited
-		if (in_array($key, array('rowid', 'entity', 'date_creation', 'tms', 'fk_user_creat', 'fk_user_modif', 'import_key'))) continue;	// Ignore special fields
-
-		// Set value to update
-		if (in_array($object->fields[$key]['type'], array('text', 'html'))) {
-			$value = GETPOST($key,'none');
-		} elseif ($object->fields[$key]['type']=='date') {
-			$value = dol_mktime(12, 0, 0, GETPOST($key.'month'), GETPOST($key.'day'), GETPOST($key.'year'));
-		} elseif ($object->fields[$key]['type']=='datetime') {
-			$value = dol_mktime(GETPOST($key.'hour'), GETPOST($key.'min'), 0, GETPOST($key.'month'), GETPOST($key.'day'), GETPOST($key.'year'));
-		} elseif ($object->fields[$key]['type']=='price') {
-			$value = price2num(GETPOST($key));
-		} else {
-			$value = GETPOST($key,'alpha');
-		}
-		if (preg_match('/^integer:/i', $object->fields[$key]['type']) && $value == '-1') $value='';		// This is an implicit foreign key field
-		if (! empty($object->fields[$key]['foreignkey']) && $value == '-1') $value='';					// This is an explicit foreign key field
-
-		$object->$key=$value;
-		if ($val['notnull'] > 0 && $object->$key == '' && is_null($val['default']))
-		{
-			$error++;
-			setEventMessages($langs->trans("ErrorFieldRequired",$langs->transnoentitiesnoconv($val['label'])), null, 'errors');
-		}
-	}
-
-	if (! $error)
-	{
-		$result=$object->update($user);
-		if ($result > 0)
-		{
-			$action='view';
-		}
-		else
-		{
-			// Creation KO
-			setEventMessages($object->error, $object->errors, 'errors');
-			$action='edit';
-		}
-	}
-	else
-	{
-		$action='edit';
-	}
+    foreach ($object->fields as $key => $val)
+    {
+        if (! GETPOSTISSET($key)) continue;		// The field was not submited to be edited
+        if (in_array($key, array('rowid', 'entity', 'date_creation', 'tms', 'fk_user_creat', 'fk_user_modif', 'import_key'))) continue;	// Ignore special fields
+
+        // Set value to update
+        if (in_array($object->fields[$key]['type'], array('text', 'html'))) {
+            $value = GETPOST($key,'none');
+        } elseif ($object->fields[$key]['type']=='date') {
+            $value = dol_mktime(12, 0, 0, GETPOST($key.'month'), GETPOST($key.'day'), GETPOST($key.'year'));
+        } elseif ($object->fields[$key]['type']=='datetime') {
+            $value = dol_mktime(GETPOST($key.'hour'), GETPOST($key.'min'), 0, GETPOST($key.'month'), GETPOST($key.'day'), GETPOST($key.'year'));
+        } elseif ($object->fields[$key]['type']=='price') {
+            $value = price2num(GETPOST($key));
+        } else {
+            $value = GETPOST($key,'alpha');
+        }
+        if (preg_match('/^integer:/i', $object->fields[$key]['type']) && $value == '-1') $value='';		// This is an implicit foreign key field
+        if (! empty($object->fields[$key]['foreignkey']) && $value == '-1') $value='';					// This is an explicit foreign key field
+
+        $object->$key=$value;
+        if ($val['notnull'] > 0 && $object->$key == '' && is_null($val['default']))
+        {
+            $error++;
+            setEventMessages($langs->trans("ErrorFieldRequired",$langs->transnoentitiesnoconv($val['label'])), null, 'errors');
+        }
+    }
+
+    if (! $error)
+    {
+        $result=$object->update($user);
+        if ($result > 0)
+        {
+            $action='view';
+        }
+        else
+        {
+            // Creation KO
+            setEventMessages($object->error, $object->errors, 'errors');
+            $action='edit';
+        }
+    }
+    else
+    {
+        $action='edit';
+    }
 }
 
 // Action to update one extrafield
 if ($action == "update_extras" && ! empty($permissiontoadd))
 {
-	$object->fetch(GETPOST('id','int'));
-	$attributekey = GETPOST('attribute','alpha');
-	$attributekeylong = 'options_'.$attributekey;
-	$object->array_options['options_'.$attributekey] = GETPOST($attributekeylong,' alpha');
-
-	$result = $object->insertExtraFields(empty($triggermodname)?'':$triggermodname, $user);
-	if ($result > 0)
-	{
-		setEventMessages($langs->trans('RecordSaved'), null, 'mesgs');
-		$action = 'view';
-	}
-	else
-	{
-		setEventMessages($object->error, $object->errors, 'errors');
-		$action = 'edit_extras';
-	}
+    $object->fetch(GETPOST('id','int'));
+    $attributekey = GETPOST('attribute','alpha');
+    $attributekeylong = 'options_'.$attributekey;
+    $object->array_options['options_'.$attributekey] = GETPOST($attributekeylong,' alpha');
+
+    $result = $object->insertExtraFields(empty($triggermodname)?'':$triggermodname, $user);
+    if ($result > 0)
+    {
+        setEventMessages($langs->trans('RecordSaved'), null, 'mesgs');
+        $action = 'view';
+    }
+    else
+    {
+        setEventMessages($object->error, $object->errors, 'errors');
+        $action = 'edit_extras';
+    }
 }
 
 // Action to delete
 if ($action == 'confirm_delete' && ! empty($permissiontodelete))
 {
-	$result=$object->delete($user);
-	if ($result > 0)
-	{
-		// Delete OK
-		setEventMessages("RecordDeleted", null, 'mesgs');
-		header("Location: ".$backurlforlist);
-		exit;
-	}
-	else
-	{
-		if (! empty($object->errors)) setEventMessages(null, $object->errors, 'errors');
-		else setEventMessages($object->error, null, 'errors');
-	}
+    $result=$object->delete($user);
+    if ($result > 0)
+    {
+        // Delete OK
+        setEventMessages("RecordDeleted", null, 'mesgs');
+        header("Location: ".$backurlforlist);
+        exit;
+    }
+    else
+    {
+        if (! empty($object->errors)) setEventMessages(null, $object->errors, 'errors');
+        else setEventMessages($object->error, null, 'errors');
+    }
 }
 
 // Action clone object
 if ($action == 'confirm_clone' && $confirm == 'yes' && ! empty($permissiontoadd))
 {
-	if (1==0 && ! GETPOST('clone_content') && ! GETPOST('clone_receivers'))
-	{
-		setEventMessages($langs->trans("NoCloneOptionsSpecified"), null, 'errors');
-	}
-	else
-	{
-		if ($object->id > 0)
-		{
-			// Because createFromClone modifies the object, we must clone it so that we can restore it later
-			$orig = clone $object;
-
-			$result=$object->createFromClone($user, $object->id);
-			if ($result > 0)
-			{
-				$newid = 0;
-				if (is_object($result)) $newid = $result->id;
-				else $newid = $result;
-				header("Location: ".$_SERVER['PHP_SELF'].'?id='.$newid);	// Open record of new object
-				exit;
-			}
-			else
-			{
-				setEventMessages($object->error, $object->errors, 'errors');
-				$object = $orig;
-				$action='';
-			}
-		}
-	}
+    if (1==0 && ! GETPOST('clone_content') && ! GETPOST('clone_receivers'))
+    {
+        setEventMessages($langs->trans("NoCloneOptionsSpecified"), null, 'errors');
+    }
+    else
+    {
+        if ($object->id > 0)
+        {
+            // Because createFromClone modifies the object, we must clone it so that we can restore it later
+            $orig = clone $object;
+
+            $result=$object->createFromClone($user, $object->id);
+            if ($result > 0)
+            {
+                $newid = 0;
+                if (is_object($result)) $newid = $result->id;
+                else $newid = $result;
+                header("Location: ".$_SERVER['PHP_SELF'].'?id='.$newid);	// Open record of new object
+                exit;
+            }
+            else
+            {
+                setEventMessages($object->error, $object->errors, 'errors');
+                $object = $orig;
+                $action='';
+            }
+        }
+    }
 }

Spacing +49 added lines, -49 removed lines

@@ -32,128 +32,128 @@ 
 
 if ($cancel)
 {
-	if (! empty($backtopage))
+	if (!empty($backtopage))
 	{
 		header("Location: ".$backtopage);
 		exit;
 	}
-	$action='';
+	$action = '';
 }
 
 // Action to add record
-if ($action == 'add' && ! empty($permissiontoadd))
+if ($action == 'add' && !empty($permissiontoadd))
 {
 	foreach ($object->fields as $key => $val)
 	{
-		if (in_array($key, array('rowid', 'entity', 'date_creation', 'tms', 'fk_user_creat', 'fk_user_modif', 'import_key'))) continue;	// Ignore special fields
+		if (in_array($key, array('rowid', 'entity', 'date_creation', 'tms', 'fk_user_creat', 'fk_user_modif', 'import_key'))) continue; // Ignore special fields
 
 		// Set value to insert
 		if (in_array($object->fields[$key]['type'], array('text', 'html'))) {
-			$value = GETPOST($key,'none');
-		} elseif ($object->fields[$key]['type']=='date') {
+			$value = GETPOST($key, 'none');
+		} elseif ($object->fields[$key]['type'] == 'date') {
 			$value = dol_mktime(12, 0, 0, GETPOST($key.'month'), GETPOST($key.'day'), GETPOST($key.'year'));
-		} elseif ($object->fields[$key]['type']=='datetime') {
+		} elseif ($object->fields[$key]['type'] == 'datetime') {
 			$value = dol_mktime(GETPOST($key.'hour'), GETPOST($key.'min'), 0, GETPOST($key.'month'), GETPOST($key.'day'), GETPOST($key.'year'));
-		} elseif ($object->fields[$key]['type']=='price') {
+		} elseif ($object->fields[$key]['type'] == 'price') {
 			$value = price2num(GETPOST($key));
 		} else {
-			$value = GETPOST($key,'alpha');
+			$value = GETPOST($key, 'alpha');
 		}
-		if (preg_match('/^integer:/i', $object->fields[$key]['type']) && $value == '-1') $value='';		// This is an implicit foreign key field
-		if (! empty($object->fields[$key]['foreignkey']) && $value == '-1') $value='';					// This is an explicit foreign key field
+		if (preg_match('/^integer:/i', $object->fields[$key]['type']) && $value == '-1') $value = ''; // This is an implicit foreign key field
+		if (!empty($object->fields[$key]['foreignkey']) && $value == '-1') $value = ''; // This is an explicit foreign key field
 
-		$object->$key=$value;
+		$object->$key = $value;
 		if ($val['notnull'] > 0 && $object->$key == '' && is_null($val['default']))
 		{
 			$error++;
-			setEventMessages($langs->trans("ErrorFieldRequired",$langs->transnoentitiesnoconv($val['label'])), null, 'errors');
+			setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv($val['label'])), null, 'errors');
 		}
 	}
 
-	if (! $error)
+	if (!$error)
 	{
-		$result=$object->create($user);
+		$result = $object->create($user);
 		if ($result > 0)
 		{
 			// Creation OK
-			$urltogo=$backtopage?str_replace('__ID__', $result, $backtopage):$backurlforlist;
+			$urltogo = $backtopage ?str_replace('__ID__', $result, $backtopage) : $backurlforlist;
 			header("Location: ".$urltogo);
 			exit;
 		}
 		else
 		{
 			// Creation KO
-			if (! empty($object->errors)) setEventMessages(null, $object->errors, 'errors');
+			if (!empty($object->errors)) setEventMessages(null, $object->errors, 'errors');
 			else  setEventMessages($object->error, null, 'errors');
-			$action='create';
+			$action = 'create';
 		}
 	}
 	else
 	{
-		$action='create';
+		$action = 'create';
 	}
 }
 
 // Action to update record
-if ($action == 'update' && ! empty($permissiontoadd))
+if ($action == 'update' && !empty($permissiontoadd))
 {
 	foreach ($object->fields as $key => $val)
 	{
-		if (! GETPOSTISSET($key)) continue;		// The field was not submited to be edited
-		if (in_array($key, array('rowid', 'entity', 'date_creation', 'tms', 'fk_user_creat', 'fk_user_modif', 'import_key'))) continue;	// Ignore special fields
+		if (!GETPOSTISSET($key)) continue; // The field was not submited to be edited
+		if (in_array($key, array('rowid', 'entity', 'date_creation', 'tms', 'fk_user_creat', 'fk_user_modif', 'import_key'))) continue; // Ignore special fields
 
 		// Set value to update
 		if (in_array($object->fields[$key]['type'], array('text', 'html'))) {
-			$value = GETPOST($key,'none');
-		} elseif ($object->fields[$key]['type']=='date') {
+			$value = GETPOST($key, 'none');
+		} elseif ($object->fields[$key]['type'] == 'date') {
 			$value = dol_mktime(12, 0, 0, GETPOST($key.'month'), GETPOST($key.'day'), GETPOST($key.'year'));
-		} elseif ($object->fields[$key]['type']=='datetime') {
+		} elseif ($object->fields[$key]['type'] == 'datetime') {
 			$value = dol_mktime(GETPOST($key.'hour'), GETPOST($key.'min'), 0, GETPOST($key.'month'), GETPOST($key.'day'), GETPOST($key.'year'));
-		} elseif ($object->fields[$key]['type']=='price') {
+		} elseif ($object->fields[$key]['type'] == 'price') {
 			$value = price2num(GETPOST($key));
 		} else {
-			$value = GETPOST($key,'alpha');
+			$value = GETPOST($key, 'alpha');
 		}
-		if (preg_match('/^integer:/i', $object->fields[$key]['type']) && $value == '-1') $value='';		// This is an implicit foreign key field
-		if (! empty($object->fields[$key]['foreignkey']) && $value == '-1') $value='';					// This is an explicit foreign key field
+		if (preg_match('/^integer:/i', $object->fields[$key]['type']) && $value == '-1') $value = ''; // This is an implicit foreign key field
+		if (!empty($object->fields[$key]['foreignkey']) && $value == '-1') $value = ''; // This is an explicit foreign key field
 
-		$object->$key=$value;
+		$object->$key = $value;
 		if ($val['notnull'] > 0 && $object->$key == '' && is_null($val['default']))
 		{
 			$error++;
-			setEventMessages($langs->trans("ErrorFieldRequired",$langs->transnoentitiesnoconv($val['label'])), null, 'errors');
+			setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv($val['label'])), null, 'errors');
 		}
 	}
 
-	if (! $error)
+	if (!$error)
 	{
-		$result=$object->update($user);
+		$result = $object->update($user);
 		if ($result > 0)
 		{
-			$action='view';
+			$action = 'view';
 		}
 		else
 		{
 			// Creation KO
 			setEventMessages($object->error, $object->errors, 'errors');
-			$action='edit';
+			$action = 'edit';
 		}
 	}
 	else
 	{
-		$action='edit';
+		$action = 'edit';
 	}
 }
 
 // Action to update one extrafield
-if ($action == "update_extras" && ! empty($permissiontoadd))
+if ($action == "update_extras" && !empty($permissiontoadd))
 {
-	$object->fetch(GETPOST('id','int'));
-	$attributekey = GETPOST('attribute','alpha');
+	$object->fetch(GETPOST('id', 'int'));
+	$attributekey = GETPOST('attribute', 'alpha');
 	$attributekeylong = 'options_'.$attributekey;
-	$object->array_options['options_'.$attributekey] = GETPOST($attributekeylong,' alpha');
+	$object->array_options['options_'.$attributekey] = GETPOST($attributekeylong, ' alpha');
 
-	$result = $object->insertExtraFields(empty($triggermodname)?'':$triggermodname, $user);
+	$result = $object->insertExtraFields(empty($triggermodname) ? '' : $triggermodname, $user);
 	if ($result > 0)
 	{
 		setEventMessages($langs->trans('RecordSaved'), null, 'mesgs');
@@ -167,9 +167,9 @@ 
 }
 
 // Action to delete
-if ($action == 'confirm_delete' && ! empty($permissiontodelete))
+if ($action == 'confirm_delete' && !empty($permissiontodelete))
 {
-	$result=$object->delete($user);
+	$result = $object->delete($user);
 	if ($result > 0)
 	{
 		// Delete OK
@@ -179,15 +179,15 @@ 
 	}
 	else
 	{
-		if (! empty($object->errors)) setEventMessages(null, $object->errors, 'errors');
+		if (!empty($object->errors)) setEventMessages(null, $object->errors, 'errors');
 		else setEventMessages($object->error, null, 'errors');
 	}
 }
 
 // Action clone object
-if ($action == 'confirm_clone' && $confirm == 'yes' && ! empty($permissiontoadd))
+if ($action == 'confirm_clone' && $confirm == 'yes' && !empty($permissiontoadd))
 {
-	if (1==0 && ! GETPOST('clone_content') && ! GETPOST('clone_receivers'))
+	if (1 == 0 && !GETPOST('clone_content') && !GETPOST('clone_receivers'))
 	{
 		setEventMessages($langs->trans("NoCloneOptionsSpecified"), null, 'errors');
 	}
@@ -198,20 +198,20 @@ 
 			// Because createFromClone modifies the object, we must clone it so that we can restore it later
 			$orig = clone $object;
 
-			$result=$object->createFromClone($user, $object->id);
+			$result = $object->createFromClone($user, $object->id);
 			if ($result > 0)
 			{
 				$newid = 0;
 				if (is_object($result)) $newid = $result->id;
 				else $newid = $result;
-				header("Location: ".$_SERVER['PHP_SELF'].'?id='.$newid);	// Open record of new object
+				header("Location: ".$_SERVER['PHP_SELF'].'?id='.$newid); // Open record of new object
 				exit;
 			}
 			else
 			{
 				setEventMessages($object->error, $object->errors, 'errors');
 				$object = $orig;
-				$action='';
+				$action = '';
 			}
 		}
 	}

Braces +51 added lines, -29 removed lines

@@ -45,7 +45,10 @@ 
 {
 	foreach ($object->fields as $key => $val)
 	{
-		if (in_array($key, array('rowid', 'entity', 'date_creation', 'tms', 'fk_user_creat', 'fk_user_modif', 'import_key'))) continue;	// Ignore special fields
+		if (in_array($key, array('rowid', 'entity', 'date_creation', 'tms', 'fk_user_creat', 'fk_user_modif', 'import_key'))) {
+		    continue;
+		}
+		// Ignore special fields
 
 		// Set value to insert
 		if (in_array($object->fields[$key]['type'], array('text', 'html'))) {
@@ -59,8 +62,14 @@ 
 		} else {
 			$value = GETPOST($key,'alpha');
 		}
-		if (preg_match('/^integer:/i', $object->fields[$key]['type']) && $value == '-1') $value='';		// This is an implicit foreign key field
-		if (! empty($object->fields[$key]['foreignkey']) && $value == '-1') $value='';					// This is an explicit foreign key field
+		if (preg_match('/^integer:/i', $object->fields[$key]['type']) && $value == '-1') {
+		    $value='';
+		}
+		// This is an implicit foreign key field
+		if (! empty($object->fields[$key]['foreignkey']) && $value == '-1') {
+		    $value='';
+		}
+		// This is an explicit foreign key field
 
 		$object->$key=$value;
 		if ($val['notnull'] > 0 && $object->$key == '' && is_null($val['default']))
@@ -79,16 +88,17 @@ 
 			$urltogo=$backtopage?str_replace('__ID__', $result, $backtopage):$backurlforlist;
 			header("Location: ".$urltogo);
 			exit;
-		}
-		else
+		} else
 		{
 			// Creation KO
-			if (! empty($object->errors)) setEventMessages(null, $object->errors, 'errors');
-			else  setEventMessages($object->error, null, 'errors');
+			if (! empty($object->errors)) {
+			    setEventMessages(null, $object->errors, 'errors');
+			} else {
+			    setEventMessages($object->error, null, 'errors');
+			}
 			$action='create';
 		}
-	}
-	else
+	} else
 	{
 		$action='create';
 	}
@@ -99,8 +109,14 @@ 
 {
 	foreach ($object->fields as $key => $val)
 	{
-		if (! GETPOSTISSET($key)) continue;		// The field was not submited to be edited
-		if (in_array($key, array('rowid', 'entity', 'date_creation', 'tms', 'fk_user_creat', 'fk_user_modif', 'import_key'))) continue;	// Ignore special fields
+		if (! GETPOSTISSET($key)) {
+		    continue;
+		}
+		// The field was not submited to be edited
+		if (in_array($key, array('rowid', 'entity', 'date_creation', 'tms', 'fk_user_creat', 'fk_user_modif', 'import_key'))) {
+		    continue;
+		}
+		// Ignore special fields
 
 		// Set value to update
 		if (in_array($object->fields[$key]['type'], array('text', 'html'))) {
@@ -114,8 +130,14 @@ 
 		} else {
 			$value = GETPOST($key,'alpha');
 		}
-		if (preg_match('/^integer:/i', $object->fields[$key]['type']) && $value == '-1') $value='';		// This is an implicit foreign key field
-		if (! empty($object->fields[$key]['foreignkey']) && $value == '-1') $value='';					// This is an explicit foreign key field
+		if (preg_match('/^integer:/i', $object->fields[$key]['type']) && $value == '-1') {
+		    $value='';
+		}
+		// This is an implicit foreign key field
+		if (! empty($object->fields[$key]['foreignkey']) && $value == '-1') {
+		    $value='';
+		}
+		// This is an explicit foreign key field
 
 		$object->$key=$value;
 		if ($val['notnull'] > 0 && $object->$key == '' && is_null($val['default']))
@@ -131,15 +153,13 @@ 
 		if ($result > 0)
 		{
 			$action='view';
-		}
-		else
+		} else
 		{
 			// Creation KO
 			setEventMessages($object->error, $object->errors, 'errors');
 			$action='edit';
 		}
-	}
-	else
+	} else
 	{
 		$action='edit';
 	}
@@ -158,8 +178,7 @@ 
 	{
 		setEventMessages($langs->trans('RecordSaved'), null, 'mesgs');
 		$action = 'view';
-	}
-	else
+	} else
 	{
 		setEventMessages($object->error, $object->errors, 'errors');
 		$action = 'edit_extras';
@@ -176,11 +195,13 @@ 
 		setEventMessages("RecordDeleted", null, 'mesgs');
 		header("Location: ".$backurlforlist);
 		exit;
-	}
-	else
+	} else
 	{
-		if (! empty($object->errors)) setEventMessages(null, $object->errors, 'errors');
-		else setEventMessages($object->error, null, 'errors');
+		if (! empty($object->errors)) {
+		    setEventMessages(null, $object->errors, 'errors');
+		} else {
+		    setEventMessages($object->error, null, 'errors');
+		}
 	}
 }
 
@@ -190,8 +211,7 @@ 
 	if (1==0 && ! GETPOST('clone_content') && ! GETPOST('clone_receivers'))
 	{
 		setEventMessages($langs->trans("NoCloneOptionsSpecified"), null, 'errors');
-	}
-	else
+	} else
 	{
 		if ($object->id > 0)
 		{
@@ -202,12 +222,14 @@ 
 			if ($result > 0)
 			{
 				$newid = 0;
-				if (is_object($result)) $newid = $result->id;
-				else $newid = $result;
+				if (is_object($result)) {
+				    $newid = $result->id;
+				} else {
+				    $newid = $result;
+				}
 				header("Location: ".$_SERVER['PHP_SELF'].'?id='.$newid);	// Open record of new object
 				exit;
-			}
-			else
+			} else
 			{
 				setEventMessages($object->error, $object->errors, 'errors');
 				$object = $orig;

dolibarr/htdocs/core/actions_comments.inc.php

Indentation +35 added lines, -35 removed lines

@@ -35,42 +35,42 @@
 
 if ($action == 'addcomment')
 {
-	$description = GETPOST('comment_description', 'none');
-	if (!empty($description))
-	{
-		$comment->description = $description;
-		$comment->datec = time();
-		$comment->fk_element = GETPOST('id','int');
-		$comment->element_type = GETPOST('comment_element_type','alpha');
-		$comment->fk_user_author = $user->id;
-		$comment->entity = $conf->entity;
-		if ($comment->create($user) > 0)
-		{
-			setEventMessages($langs->trans("CommentAdded"), null, 'mesgs');
-			header('Location: '.$varpage.'?id='.$id.($withproject?'&withproject=1':''));
-			exit;
-		}
-		else
-		{
-			setEventMessages($comment->error, $comment->errors,'errors');
-			$action='';
-		}
-	}
+    $description = GETPOST('comment_description', 'none');
+    if (!empty($description))
+    {
+        $comment->description = $description;
+        $comment->datec = time();
+        $comment->fk_element = GETPOST('id','int');
+        $comment->element_type = GETPOST('comment_element_type','alpha');
+        $comment->fk_user_author = $user->id;
+        $comment->entity = $conf->entity;
+        if ($comment->create($user) > 0)
+        {
+            setEventMessages($langs->trans("CommentAdded"), null, 'mesgs');
+            header('Location: '.$varpage.'?id='.$id.($withproject?'&withproject=1':''));
+            exit;
+        }
+        else
+        {
+            setEventMessages($comment->error, $comment->errors,'errors');
+            $action='';
+        }
+    }
 }
 if ($action == 'deletecomment')
 {
-	if ($comment->fetch($idcomment) >= 0)
-	{
-		if ($comment->delete($user) > 0)
-		{
-			setEventMessages($langs->trans("CommentDeleted"), null, 'mesgs');
-			header('Location: '.$varpage.'?id='.$id.($withproject?'&withproject=1':''));
-			exit;
-		}
-		else
-		{
-			setEventMessages($comment->error, $comment->errors,'errors');
-			$action='';
-		}
-	}
+    if ($comment->fetch($idcomment) >= 0)
+    {
+        if ($comment->delete($user) > 0)
+        {
+            setEventMessages($langs->trans("CommentDeleted"), null, 'mesgs');
+            header('Location: '.$varpage.'?id='.$id.($withproject?'&withproject=1':''));
+            exit;
+        }
+        else
+        {
+            setEventMessages($comment->error, $comment->errors,'errors');
+            $action='';
+        }
+    }
 }
\ No newline at end of file

Spacing +9 added lines, -9 removed lines

@@ -26,7 +26,7 @@ 
 
 require_once DOL_DOCUMENT_ROOT.'/core/class/comment.class.php';
 
-$varpage=empty($contextpage)?$_SERVER["PHP_SELF"]:$contextpage;
+$varpage = empty($contextpage) ? $_SERVER["PHP_SELF"] : $contextpage;
 $comment = new Comment($db);
 
 /*
@@ -40,20 +40,20 @@ 
 	{
 		$comment->description = $description;
 		$comment->datec = time();
-		$comment->fk_element = GETPOST('id','int');
-		$comment->element_type = GETPOST('comment_element_type','alpha');
+		$comment->fk_element = GETPOST('id', 'int');
+		$comment->element_type = GETPOST('comment_element_type', 'alpha');
 		$comment->fk_user_author = $user->id;
 		$comment->entity = $conf->entity;
 		if ($comment->create($user) > 0)
 		{
 			setEventMessages($langs->trans("CommentAdded"), null, 'mesgs');
-			header('Location: '.$varpage.'?id='.$id.($withproject?'&withproject=1':''));
+			header('Location: '.$varpage.'?id='.$id.($withproject ? '&withproject=1' : ''));
 			exit;
 		}
 		else
 		{
-			setEventMessages($comment->error, $comment->errors,'errors');
-			$action='';
+			setEventMessages($comment->error, $comment->errors, 'errors');
+			$action = '';
 		}
 	}
 }
@@ -64,13 +64,13 @@ 
 		if ($comment->delete($user) > 0)
 		{
 			setEventMessages($langs->trans("CommentDeleted"), null, 'mesgs');
-			header('Location: '.$varpage.'?id='.$id.($withproject?'&withproject=1':''));
+			header('Location: '.$varpage.'?id='.$id.($withproject ? '&withproject=1' : ''));
 			exit;
 		}
 		else
 		{
-			setEventMessages($comment->error, $comment->errors,'errors');
-			$action='';
+			setEventMessages($comment->error, $comment->errors, 'errors');
+			$action = '';
 		}
 	}
 }
\ No newline at end of file

Braces +2 added lines, -4 removed lines

@@ -49,8 +49,7 @@ 
 			setEventMessages($langs->trans("CommentAdded"), null, 'mesgs');
 			header('Location: '.$varpage.'?id='.$id.($withproject?'&withproject=1':''));
 			exit;
-		}
-		else
+		} else
 		{
 			setEventMessages($comment->error, $comment->errors,'errors');
 			$action='';
@@ -66,8 +65,7 @@ 
 			setEventMessages($langs->trans("CommentDeleted"), null, 'mesgs');
 			header('Location: '.$varpage.'?id='.$id.($withproject?'&withproject=1':''));
 			exit;
-		}
-		else
+		} else
 		{
 			setEventMessages($comment->error, $comment->errors,'errors');
 			$action='';

dolibarr/htdocs/core/filemanagerdol/browser/default/frmcreatefolder.php

Spacing +2 added lines, -2 removed lines

@@ -19,7 +19,7 @@ 
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-define('NOTOKENRENEWAL',1); // Disables token renewal
+define('NOTOKENRENEWAL', 1); // Disables token renewal
 
 require '../../../../main.inc.php';
 ?>
@@ -126,7 +126,7 @@ 
 					<button type="button" style="WIDTH: 100%" onclick="CreateFolder();">
 						<table cellSpacing="0" cellPadding="0" border="0">
 							<tr>
-								<td><?php echo img_picto_common('','treemenu/folder.gif','width="16" height="16"'); ?></td>
+								<td><?php echo img_picto_common('', 'treemenu/folder.gif', 'width="16" height="16"'); ?></td>
 								<td>&nbsp;</td>
 								<td class="nowrap">Create New Folder</td>
 							</tr>

dolibarr/htdocs/core/filemanagerdol/browser/default/frmfolders.php

Spacing +1 added lines, -1 removed lines

@@ -19,7 +19,7 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-define('NOTOKENRENEWAL',1); // Disables token renewal
+define('NOTOKENRENEWAL', 1); // Disables token renewal
 
 require '../../../../main.inc.php';
 ?>