Dolibarr / dolibarr

htdocs/compta/deplacement/class/deplacementstats.class.php

Doc Comments +1 added lines, -1 removed lines

@@ -45,7 +45,7 @@
 	 *
 	 * @param 	DoliDB		$db		   Database handler
 	 * @param 	int			$socid	   Id third party
-     * @param   mixed		$userid    Id user for filter or array of user ids
+     * @param   integer		$userid    Id user for filter or array of user ids
 	 * @return 	void
 	 */
 	function __construct($db, $socid=0, $userid=0)

Braces +5 added lines, -2 removed lines

@@ -66,8 +66,11 @@
 		{
 			$this->where.=" AND fk_soc = ".$this->socid;
 		}
-		if (is_array($this->userid) && count($this->userid) > 0) $this->where.=' AND fk_user IN ('.join(',',$this->userid).')';
-        else if ($this->userid > 0) $this->where.=' AND fk_user = '.$this->userid;
+		if (is_array($this->userid) && count($this->userid) > 0) {
+			$this->where.=' AND fk_user IN ('.join(',',$this->userid).')';
+		} else if ($this->userid > 0) {
+        	$this->where.=' AND fk_user = '.$this->userid;
+        }
 	}
 
 

htdocs/contrat/class/contrat.class.php

Doc Comments +2 added lines, -2 removed lines

@@ -1285,7 +1285,7 @@ 
 	 * 	@param  int			$info_bits			Bits de type de lignes
 	 * 	@param  int			$fk_fournprice		Fourn price id
 	 *  @param  int			$pa_ht				Buying price HT
-	 *  @param	array		$array_options		extrafields array
+	 *  @param	integer		$array_options		extrafields array
 	 * 	@param 	string		$fk_unit 			Code of the unit to use. Null to use the default one
 	 *  @return int             				<0 si erreur, >0 si ok
 	 */
@@ -1474,7 +1474,7 @@ 
 	 * 	@param  int			$info_bits			Bits de type de lignes
 	 * 	@param  int			$fk_fournprice		Fourn price id
 	 *  @param  int			$pa_ht				Buying price HT
-	 *  @param	array		$array_options		extrafields array
+	 *  @param	integer		$array_options		extrafields array
 	 * 	@param 	string		$fk_unit 			Code of the unit to use. Null to use the default one
 	 *  @return int              				< 0 si erreur, > 0 si ok
 	 */

Braces +313 added lines, -178 removed lines

@@ -200,15 +200,13 @@ 
 			if ( $numref != "")
 			{
 				return $numref;
-			}
-			else
+			} else
 			{
 				$this->error = $obj->error;
 				dol_print_error($db,get_class($this)."::getNextValue ".$obj->error);
 				return "";
 			}
-		}
-		else
+		} else
 		{
 			$langs->load("errors");
 			print $langs->trans("Error")." ".$langs->trans("ErrorModuleSetupNotComplete");
@@ -256,7 +254,9 @@ 
 	 */
 	function activateAll($user, $date_start='')
 	{
-		if (empty($date_start)) $date_start = dol_now();
+		if (empty($date_start)) {
+			$date_start = dol_now();
+		}
 
 		$this->db->begin();
 
@@ -281,15 +281,16 @@ 
 		if ($this->statut == 0)
 		{
 			$result=$this->validate($user);
-			if ($result < 0) $ok=false;
+			if ($result < 0) {
+				$ok=false;
+			}
 		}
 
 		if ($ok)
 		{
 			$this->db->commit();
 			return 1;
-		}
-		else
+		} else
 		{
 			dol_print_error($this->db,'Error in activateAll function');
 			$this->db->rollback();
@@ -331,15 +332,16 @@ 
 		if ($this->statut == 0)
 		{
 			$result=$this->validate($user);
-			if ($result < 0) $ok=false;
+			if ($result < 0) {
+				$ok=false;
+			}
 		}
 
         if ($ok)
         {
             $this->db->commit();
             return 1;
-        }
-        else
+        } else
         {
             dol_print_error($this->db,'Error in closeAll function');
             $this->db->rollback();
@@ -374,11 +376,12 @@ 
 		$result=$this->thirdparty->set_as_client();
 
 		// Define new ref
-		if (! $error && (preg_match('/^[\(]?PROV/i', $this->ref) || empty($this->ref))) // empty should not happened, but when it occurs, the test save life
+		if (! $error && (preg_match('/^[\(]?PROV/i', $this->ref) || empty($this->ref))) {
+			// empty should not happened, but when it occurs, the test save life
 		{
 			$num = $this->getNextNumRef($this->thirdparty);
 		}
-		else
+		} else
 		{
 			$num = $this->ref;
 		}
@@ -451,8 +454,7 @@ 
 				$this->brouillon=0;
 				$this->date_validation=$now;
 			}
-		}
-		else
+		} else
 		{
 			$error++;
 		}
@@ -461,8 +463,7 @@ 
 		{
 			$this->db->commit();
 			return 1;
-		}
-		else
+		} else
 		{
 			$this->db->rollback();
 			return -1;
@@ -527,8 +528,7 @@ 
 		{
 			$this->db->commit();
 			return 1;
-		}
-		else
+		} else
 		{
 			$this->db->rollback();
 			return -1;
@@ -555,8 +555,11 @@ 
 		$sql.= " fk_commercial_signature, fk_commercial_suivi,";
 		$sql.= " note_private, note_public, model_pdf, extraparams";
 		$sql.= " FROM ".MAIN_DB_PREFIX."contrat";
-		if (! $id) $sql.=" WHERE entity IN (".getEntity('contract', 0).")";
-		else $sql.= " WHERE rowid=".$id;
+		if (! $id) {
+			$sql.=" WHERE entity IN (".getEntity('contract', 0).")";
+		} else {
+			$sql.= " WHERE rowid=".$id;
+		}
 		if ($ref_customer)
 		{
 			$sql.= " AND ref_customer = '".$this->db->escape($ref_customer)."'";
@@ -633,15 +636,13 @@ 
 				}
 
 				return $this->id;
-			}
-			else
+			} else
 			{
 				dol_syslog(get_class($this)."::Fetch Erreur contrat non trouve");
 				$this->error="Contract not found";
 				return 0;
 			}
-		}
-		else
+		} else
 		{
 			dol_syslog(get_class($this)."::Fetch Erreur lecture contrat");
 			$this->error=$this->db->error();
@@ -769,10 +770,18 @@ 
 				//dol_syslog("1 ".$line->desc);
 				//dol_syslog("2 ".$line->product_desc);
 
-				if ($line->statut == 0) $this->nbofserviceswait++;
-				if ($line->statut == 4 && (empty($line->date_fin_prevue) || $line->date_fin_prevue >= $now)) $this->nbofservicesopened++;
-				if ($line->statut == 4 && (! empty($line->date_fin_prevue) && $line->date_fin_prevue < $now)) $this->nbofservicesexpired++;
-				if ($line->statut == 5) $this->nbofservicesclosed++;
+				if ($line->statut == 0) {
+					$this->nbofserviceswait++;
+				}
+				if ($line->statut == 4 && (empty($line->date_fin_prevue) || $line->date_fin_prevue >= $now)) {
+					$this->nbofservicesopened++;
+				}
+				if ($line->statut == 4 && (! empty($line->date_fin_prevue) && $line->date_fin_prevue < $now)) {
+					$this->nbofservicesexpired++;
+				}
+				if ($line->statut == 5) {
+					$this->nbofservicesclosed++;
+				}
 
 				$total_ttc+=$objp->total_ttc;   // TODO Not saved into database
                 $total_vat+=$objp->total_tva;
@@ -782,8 +791,7 @@ 
 				$pos++;
 			}
 			$this->db->free($result);
-		}
-		else
+		} else
 		{
 			dol_syslog(get_class($this)."::Fetch Erreur lecture des lignes de contrats liees aux produits");
 			return -3;
@@ -859,10 +867,18 @@ 
 				$line->date_fin_reel     = $this->db->jdate($objp->date_cloture);
 				$line->fk_unit        = $objp->fk_unit;
 
-				if ($line->statut == 0) $this->nbofserviceswait++;
-				if ($line->statut == 4 && (empty($line->date_fin_prevue) || $line->date_fin_prevue >= $now)) $this->nbofservicesopened++;
-				if ($line->statut == 4 && (! empty($line->date_fin_prevue) && $line->date_fin_prevue < $now)) $this->nbofservicesexpired++;
-				if ($line->statut == 5) $this->nbofservicesclosed++;
+				if ($line->statut == 0) {
+					$this->nbofserviceswait++;
+				}
+				if ($line->statut == 4 && (empty($line->date_fin_prevue) || $line->date_fin_prevue >= $now)) {
+					$this->nbofservicesopened++;
+				}
+				if ($line->statut == 4 && (! empty($line->date_fin_prevue) && $line->date_fin_prevue < $now)) {
+					$this->nbofservicesexpired++;
+				}
+				if ($line->statut == 5) {
+					$this->nbofservicesclosed++;
+				}
 
 
 				// Retreive all extrafield for propal
@@ -883,8 +899,7 @@ 
 			}
 
 			$this->db->free($result);
-		}
-		else
+		} else
 		{
 			dol_syslog(get_class($this)."::Fetch Erreur lecture des lignes de contrat non liees aux produits");
 			$this->error=$this->db->error();
@@ -924,7 +939,9 @@ 
 			$this->error.=$langs->trans("ErrorFieldRequired",$langs->trans("SalesRepresentativeFollowUp"));
 			$paramsok=0;
 		}
-		if (! $paramsok) return -1;
+		if (! $paramsok) {
+			return -1;
+		}
 
 
 		$this->db->begin();
@@ -982,9 +999,11 @@ 
 
 			if (! $error)
 			{
-			    if (empty($conf->global->MAIN_EXTRAFIELDS_DISABLED)) // For avoid conflicts if trigger used
+			    if (empty($conf->global->MAIN_EXTRAFIELDS_DISABLED)) {
+			    	// For avoid conflicts if trigger used
 			    {
 			    	$result=$this->insertExtraFields();
+			    }
 			    	if ($result < 0)
 			        {
 			            $error++;
@@ -996,14 +1015,18 @@ 
 			if (! $error)
 			{
     			$result=$this->add_contact($this->commercial_signature_id,'SALESREPSIGN','internal');
-    			if ($result < 0) $error++;
+    			if ($result < 0) {
+    				$error++;
+    			}
 			}
 
 			// Insert contacts commerciaux ('SALESREPFOLL','contrat')
 			if (! $error)
 			{
                 $result=$this->add_contact($this->commercial_suivi_id,'SALESREPFOLL','internal');
-			    if ($result < 0) $error++;
+			    if ($result < 0) {
+			    	$error++;
+			    }
 			}
 
 			if (! $error)
@@ -1013,19 +1036,20 @@ 
     			{
     			    foreach($this->linked_objects as $origin => $tmp_origin_id)
     			    {
-    			        if (is_array($tmp_origin_id))       // New behaviour, if linked_object can have several links per type, so is something like array('contract'=>array(id1, id2, ...))
+    			        if (is_array($tmp_origin_id)) {
+    			        	// New behaviour, if linked_object can have several links per type, so is something like array('contract'=>array(id1, id2, ...))
     			        {
     			            foreach($tmp_origin_id as $origin_id)
     			            {
     			                $ret = $this->add_object_linked($origin, $origin_id);
+    			        }
     			                if (! $ret)
     			                {
     			                    dol_print_error($this->db);
     			                    $error++;
     			                }
     			            }
-    			        }
-    			        else                                // Old behaviour, if linked_object has only one link per type, so is something like array('contract'=>id1))
+    			        } else                                // Old behaviour, if linked_object has only one link per type, so is something like array('contract'=>id1))
     			        {
     			            $origin_id = $tmp_origin_id;
     			            $ret = $this->add_object_linked($origin, $origin_id);
@@ -1038,13 +1062,17 @@ 
     			    }
     			}
 
-    			if (! $error && $this->id && ! empty($conf->global->MAIN_PROPAGATE_CONTACTS_FROM_ORIGIN) && ! empty($this->origin) && ! empty($this->origin_id))   // Get contact from origin object
+    			if (! $error && $this->id && ! empty($conf->global->MAIN_PROPAGATE_CONTACTS_FROM_ORIGIN) && ! empty($this->origin) && ! empty($this->origin_id)) {
+    				// Get contact from origin object
     			{
     			    $originforcontact = $this->origin;
+    			}
     			    $originidforcontact = $this->origin_id;
-    			    if ($originforcontact == 'shipping')     // shipment and order share the same contacts. If creating from shipment we take data of order
+    			    if ($originforcontact == 'shipping') {
+    			    	// shipment and order share the same contacts. If creating from shipment we take data of order
     			    {
     			        require_once DOL_DOCUMENT_ROOT . '/expedition/class/expedition.class.php';
+    			    }
     			        $exp = new Expedition($db);
     			        $exp->fetch($this->origin_id);
     			        $exp->fetchObjectLinked();
@@ -1067,13 +1095,17 @@ 
     			    {
     			        while($objcontact = $this->db->fetch_object($resqlcontact))
     			        {
-    			            if ($objcontact->source == 'internal' && in_array($objcontact->code, array('SALESREPSIGN', 'SALESREPFOLL'))) continue;    // ignore this, already forced previously
+    			            if ($objcontact->source == 'internal' && in_array($objcontact->code, array('SALESREPSIGN', 'SALESREPFOLL'))) {
+    			            	continue;
+    			            }
+    			            // ignore this, already forced previously
 
     			            //print $objcontact->code.'-'.$objcontact->source.'-'.$objcontact->fk_socpeople."\n";
     			            $this->add_contact($objcontact->fk_socpeople, $objcontact->code, $objcontact->source);    // May failed because of duplicate key or because code of contact type does not exists for new object
     			        }
+    			    } else {
+    			    	dol_print_error($resqlcontact);
     			    }
-    			    else dol_print_error($resqlcontact);
     			}
 			}
 
@@ -1088,23 +1120,20 @@ 
 				{
 					$this->db->commit();
 					return $this->id;
-				}
-				else
+				} else
 				{
 					dol_syslog(get_class($this)."::create - 30 - ".$this->error, LOG_ERR);
 					$this->db->rollback();
 					return -3;
 				}
-			}
-			else
+			} else
 			{
 				$this->error="Failed to add contact";
 				dol_syslog(get_class($this)."::create - 20 - ".$this->error, LOG_ERR);
 				$this->db->rollback();
 				return -2;
 			}
-		}
-		else
+		} else
 		{
 			$this->error=$langs->trans("UnknownError: ".$this->db->error()." -", LOG_DEBUG);
 
@@ -1149,7 +1178,9 @@ 
 		{
 			// Delete linked object
 			$res = $this->deleteObjectLinked();
-			if ($res < 0) $error++;
+			if ($res < 0) {
+				$error++;
+			}
 		}
 
 		if (! $error)
@@ -1258,8 +1289,7 @@ 
 		{
 			$this->db->commit();
 			return 1;
-		}
-		else
+		} else
 		{
 			$this->error=$this->db->lasterror();
 			$this->db->rollback();
@@ -1280,21 +1310,51 @@ 
 		$error=0;
 
 		// Clean parameters
-		if (isset($this->ref)) $this->ref=trim($this->ref);
-		if (isset($this->ref_customer)) $this->ref_customer=trim($this->ref_customer);
-		if (isset($this->ref_supplier)) $this->ref_supplier=trim($this->ref_supplier);
-		if (isset($this->ref_ext)) $this->ref_ext=trim($this->ref_ext);
-		if (isset($this->entity)) $this->entity=trim($this->entity);
-		if (isset($this->statut)) $this->statut=(int) $this->statut;
-		if (isset($this->fk_soc)) $this->fk_soc=trim($this->fk_soc);
-		if (isset($this->fk_projet)) $this->fk_projet=trim($this->fk_projet);
-		if (isset($this->fk_commercial_signature)) $this->fk_commercial_signature=trim($this->fk_commercial_signature);
-		if (isset($this->fk_commercial_suivi)) $this->fk_commercial_suivi=trim($this->fk_commercial_suivi);
-		if (isset($this->fk_user_mise_en_service)) $this->fk_user_mise_en_service=trim($this->fk_user_mise_en_service);
-		if (isset($this->fk_user_cloture)) $this->fk_user_cloture=trim($this->fk_user_cloture);
-		if (isset($this->note_private)) $this->note_private=trim($this->note_private);
-		if (isset($this->note_public)) $this->note_public=trim($this->note_public);
-		if (isset($this->import_key)) $this->import_key=trim($this->import_key);
+		if (isset($this->ref)) {
+			$this->ref=trim($this->ref);
+		}
+		if (isset($this->ref_customer)) {
+			$this->ref_customer=trim($this->ref_customer);
+		}
+		if (isset($this->ref_supplier)) {
+			$this->ref_supplier=trim($this->ref_supplier);
+		}
+		if (isset($this->ref_ext)) {
+			$this->ref_ext=trim($this->ref_ext);
+		}
+		if (isset($this->entity)) {
+			$this->entity=trim($this->entity);
+		}
+		if (isset($this->statut)) {
+			$this->statut=(int) $this->statut;
+		}
+		if (isset($this->fk_soc)) {
+			$this->fk_soc=trim($this->fk_soc);
+		}
+		if (isset($this->fk_projet)) {
+			$this->fk_projet=trim($this->fk_projet);
+		}
+		if (isset($this->fk_commercial_signature)) {
+			$this->fk_commercial_signature=trim($this->fk_commercial_signature);
+		}
+		if (isset($this->fk_commercial_suivi)) {
+			$this->fk_commercial_suivi=trim($this->fk_commercial_suivi);
+		}
+		if (isset($this->fk_user_mise_en_service)) {
+			$this->fk_user_mise_en_service=trim($this->fk_user_mise_en_service);
+		}
+		if (isset($this->fk_user_cloture)) {
+			$this->fk_user_cloture=trim($this->fk_user_cloture);
+		}
+		if (isset($this->note_private)) {
+			$this->note_private=trim($this->note_private);
+		}
+		if (isset($this->note_public)) {
+			$this->note_public=trim($this->note_public);
+		}
+		if (isset($this->import_key)) {
+			$this->import_key=trim($this->import_key);
+		}
 		//if (isset($this->extraparams)) $this->extraparams=trim($this->extraparams);
 
 		// Check parameters
@@ -1343,18 +1403,22 @@ 
 				}
 			}
 
-			if (empty($conf->global->MAIN_EXTRAFIELDS_DISABLED) && is_array($this->array_options) && count($this->array_options)>0) // For avoid conflicts if trigger used
+			if (empty($conf->global->MAIN_EXTRAFIELDS_DISABLED) && is_array($this->array_options) && count($this->array_options)>0) {
+				// For avoid conflicts if trigger used
 			{
 				$result=$this->insertExtraFields();
+			}
 				if ($result < 0)
 				{
 					$error++;
 				}
 			}
 
-			if (empty($conf->global->MAIN_EXTRAFIELDS_DISABLED) && is_array($this->array_options) && count($this->array_options)>0) // For avoid conflicts if trigger used
+			if (empty($conf->global->MAIN_EXTRAFIELDS_DISABLED) && is_array($this->array_options) && count($this->array_options)>0) {
+				// For avoid conflicts if trigger used
 			{
 				$result=$this->insertExtraFields();
+			}
 				if ($result < 0)
 				{
 					$error++;
@@ -1371,8 +1435,7 @@ 
 				}
 				$this->db->rollback();
 				return -1*$error;
-			}
-			else
+			} else
 			{
 				$this->db->commit();
 				return 1;
@@ -1421,25 +1484,40 @@ 
 			$txlocaltax2=price2num($txlocaltax2);
 			$remise_percent=price2num($remise_percent);
 			$qty=price2num($qty);
-			if (empty($qty)) $qty=1;
-			if (empty($info_bits)) $info_bits=0;
-			if (empty($pu_ht) || ! is_numeric($pu_ht))  $pu_ht=0;
-			if (empty($pu_ttc)) $pu_ttc=0;
-			if (empty($txtva) || ! is_numeric($txtva)) $txtva=0;
-			if (empty($txlocaltax1) || ! is_numeric($txlocaltax1)) $txlocaltax1=0;
-            if (empty($txlocaltax2) || ! is_numeric($txlocaltax2)) $txlocaltax2=0;
+			if (empty($qty)) {
+				$qty=1;
+			}
+			if (empty($info_bits)) {
+				$info_bits=0;
+			}
+			if (empty($pu_ht) || ! is_numeric($pu_ht)) {
+				$pu_ht=0;
+			}
+			if (empty($pu_ttc)) {
+				$pu_ttc=0;
+			}
+			if (empty($txtva) || ! is_numeric($txtva)) {
+				$txtva=0;
+			}
+			if (empty($txlocaltax1) || ! is_numeric($txlocaltax1)) {
+				$txlocaltax1=0;
+			}
+            if (empty($txlocaltax2) || ! is_numeric($txlocaltax2)) {
+            	$txlocaltax2=0;
+            }
 
 			if ($price_base_type=='HT')
 			{
 				$pu=$pu_ht;
-			}
-			else
+			} else
 			{
 				$pu=$pu_ttc;
 			}
 
 			// Check parameters
-			if (empty($remise_percent)) $remise_percent=0;
+			if (empty($remise_percent)) {
+				$remise_percent=0;
+			}
 
 			// Calcul du total TTC et de la TVA pour la ligne a partir de
 			// qty, pu, remise_percent et txtva
@@ -1476,7 +1554,9 @@ 
 				$price = $pu_ht - $remise;
 			}
 
-		    if (empty($pa_ht)) $pa_ht=0;
+		    if (empty($pa_ht)) {
+		    	$pa_ht=0;
+		    }
 
 
 			// if buy price not defined, define buyprice as configured in margin admin
@@ -1485,8 +1565,7 @@ 
 				if (($result = $this->defineBuyPrice($pu_ht, $remise_percent, $fk_product)) < 0)
 				{
 					return $result;
-				}
-				else
+				} else
 				{
 					$pa_ht = $result;
 				}
@@ -1517,10 +1596,16 @@ 
 			$sql.= " ".price2num($total_ht).",".price2num($total_tva).",".price2num($total_localtax1).",".price2num($total_localtax2).",".price2num($total_ttc).",";
 			$sql.= " '".$info_bits."',";
 			$sql.= " ".price2num($price).",".price2num($remise).",";
-			if (isset($fk_fournprice)) $sql.= ' '.$fk_fournprice.',';
-			else $sql.= ' null,';
-			if (isset($pa_ht)) $sql.= ' '.price2num($pa_ht);
-			else $sql.= ' null';
+			if (isset($fk_fournprice)) {
+				$sql.= ' '.$fk_fournprice.',';
+			} else {
+				$sql.= ' null,';
+			}
+			if (isset($pa_ht)) {
+				$sql.= ' '.price2num($pa_ht);
+			} else {
+				$sql.= ' null';
+			}
 			if ($date_start > 0) { $sql.= ",'".$this->db->idate($date_start)."'"; }
 			if ($date_end > 0) { $sql.= ",'".$this->db->idate($date_end)."'"; }
 			$sql.= ", ".($fk_unit?"'".$this->db->escape($fk_unit)."'":"null");
@@ -1535,9 +1620,11 @@ 
 				if ($result > 0)
 				{
 
-					if (empty($conf->global->MAIN_EXTRAFIELDS_DISABLED) && is_array($array_options) && count($array_options)>0) // For avoid conflicts if trigger used
+					if (empty($conf->global->MAIN_EXTRAFIELDS_DISABLED) && is_array($array_options) && count($array_options)>0) {
+						// For avoid conflicts if trigger used
 					{
 						$contractline = new ContratLigne($this->db);
+					}
 						$contractline->array_options=$array_options;
 						$contractline->id=$contractlineid;
 						$result=$contractline->insertExtraFields();
@@ -1562,27 +1649,23 @@ 
 					{
 						$this->db->rollback();
 						return -1;
-					}
-					else
+					} else
 					{
 						$this->db->commit();
 						return $contractlineid;
 					}
-				}
-				else
+				} else
 				{
 					$this->db->rollback();
 					return -1;
 				}
-			}
-			else
+			} else
 			{
 				$this->db->rollback();
 				$this->error=$this->db->error()." sql=".$sql;
 				return -1;
 			}
-		}
-		else
+		} else
 		{
 			dol_syslog(get_class($this)."::addline ErrorTryToAddLineOnValidatedContract", LOG_ERR);
 			return -2;
@@ -1632,8 +1715,7 @@ 
 		{
 			$remise = round(($pu * $remise_percent / 100), 2);
 			$price = $pu - $remise;
-		}
-		else
+		} else
 		{
 			$remise_percent=0;
 		}
@@ -1670,7 +1752,9 @@ 
 		    $price = $pu - $remise;
 		}
 
-	    if (empty($pa_ht)) $pa_ht=0;
+	    if (empty($pa_ht)) {
+	    	$pa_ht=0;
+	    }
 
 		// if buy price not defined, define buyprice as configured in margin admin
 		if ($this->pa_ht == 0)
@@ -1678,8 +1762,7 @@ 
 			if (($result = $this->defineBuyPrice($pu_ht, $remise_percent)) < 0)
 			{
 				return $result;
-			}
-			else
+			} else
 			{
 				$pa_ht = $result;
 			}
@@ -1703,14 +1786,10 @@ 
 		$sql.= ", total_ttc='".      price2num($total_ttc)."'";
 		$sql.= ", fk_product_fournisseur_price='".$fk_fournprice."'";
 		$sql.= ", buy_price_ht='".price2num($pa_ht)."'";
-		if ($date_start > 0) { $sql.= ",date_ouverture_prevue='".$this->db->idate($date_start)."'"; }
-		else { $sql.=",date_ouverture_prevue=null"; }
-		if ($date_end > 0) { $sql.= ",date_fin_validite='".$this->db->idate($date_end)."'"; }
-		else { $sql.=",date_fin_validite=null"; }
-		if ($date_debut_reel > 0) { $sql.= ",date_ouverture='".$this->db->idate($date_debut_reel)."'"; }
-		else { $sql.=",date_ouverture=null"; }
-		if ($date_fin_reel > 0) { $sql.= ",date_cloture='".$this->db->idate($date_fin_reel)."'"; }
-		else { $sql.=",date_cloture=null"; }
+		if ($date_start > 0) { $sql.= ",date_ouverture_prevue='".$this->db->idate($date_start)."'"; } else { $sql.=",date_ouverture_prevue=null"; }
+		if ($date_end > 0) { $sql.= ",date_fin_validite='".$this->db->idate($date_end)."'"; } else { $sql.=",date_fin_validite=null"; }
+		if ($date_debut_reel > 0) { $sql.= ",date_ouverture='".$this->db->idate($date_debut_reel)."'"; } else { $sql.=",date_ouverture=null"; }
+		if ($date_fin_reel > 0) { $sql.= ",date_cloture='".$this->db->idate($date_fin_reel)."'"; } else { $sql.=",date_cloture=null"; }
 		$sql .= ", fk_unit=".($fk_unit?"'".$this->db->escape($fk_unit)."'":"null");
 		$sql .= " WHERE rowid = ".$rowid;
 
@@ -1722,9 +1801,11 @@ 
 			if ($result >= 0)
 			{
 
-				if (empty($conf->global->MAIN_EXTRAFIELDS_DISABLED) && is_array($array_options) && count($array_options)>0) // For avoid conflicts if trigger used
+				if (empty($conf->global->MAIN_EXTRAFIELDS_DISABLED) && is_array($array_options) && count($array_options)>0) {
+					// For avoid conflicts if trigger used
 				{
 					$contractline = new ContratLigne($this->db);
+				}
 					$contractline->array_options=$array_options;
 					$contractline->id= $rowid;
 					$result=$contractline->insertExtraFields();
@@ -1748,15 +1829,13 @@ 
 					$this->db->commit();
 					return 1;
 				}
-			}
-			else
+			} else
 			{
 				$this->db->rollback();
 				dol_syslog(get_class($this)."::updateligne Erreur -2");
 				return -2;
 			}
-		}
-		else
+		} else
 		{
 			$this->db->rollback();
 			$this->error=$this->db->error();
@@ -1783,7 +1862,9 @@ 
 
 		    // Call trigger
 		    $result=$this->call_trigger('LINECONTRACT_DELETE',$user);
-		    if ($result < 0) return -1;
+		    if ($result < 0) {
+		    	return -1;
+		    }
 		    // End call triggers
 
 		    $this->db->begin();
@@ -1801,9 +1882,11 @@ 
 
 			if (empty($error)) {
 				// Remove extrafields
-				if (empty($conf->global->MAIN_EXTRAFIELDS_DISABLED)) // For avoid conflicts if trigger used
+				if (empty($conf->global->MAIN_EXTRAFIELDS_DISABLED)) {
+					// For avoid conflicts if trigger used
 				{
 					$contractline = new ContratLigne($this->db);
+				}
 					$contractline->id= $idline;
 					$result=$contractline->deleteExtraFields();
 					if ($result < 0)
@@ -1822,8 +1905,7 @@ 
 				$this->db->rollback();
 				return -1;
 			}
-		}
-		else
+		} else
 		{
 			return -2;
 		}
@@ -1842,7 +1924,9 @@ 
 		dol_syslog(__METHOD__ . " is deprecated", LOG_WARNING);
 
 		// If draft, we keep it (should not happen)
-		if ($this->statut == 0) return 1;
+		if ($this->statut == 0) {
+			return 1;
+		}
 
 		// Load $this->lines array
 		//		$this->fetch_lines();
@@ -1956,8 +2040,12 @@ 
 		//{
 			// Add param to save lastsearch_values or not
 			$add_save_lastsearch_values=($save_lastsearch_value == 1 ? 1 : 0);
-			if ($save_lastsearch_value == -1 && preg_match('/list\.php/',$_SERVER["PHP_SELF"])) $add_save_lastsearch_values=1;
-			if ($add_save_lastsearch_values) $url.='&save_lastsearch_values=1';
+			if ($save_lastsearch_value == -1 && preg_match('/list\.php/',$_SERVER["PHP_SELF"])) {
+				$add_save_lastsearch_values=1;
+			}
+			if ($add_save_lastsearch_values) {
+				$url.='&save_lastsearch_values=1';
+			}
 		//}
 
 		$picto = 'contract';
@@ -1995,8 +2083,12 @@ 
 		$linkstart.=$linkclose.'>';
 		$linkend='</a>';
 
-		if ($withpicto) $result.=($linkstart.img_object(($notooltip?'':$label), $picto, ($notooltip?'':'class="classfortooltip"'), 0, 0, $notooltip?0:1).$linkend);
-		if ($withpicto && $withpicto != 2) $result.=' ';
+		if ($withpicto) {
+			$result.=($linkstart.img_object(($notooltip?'':$label), $picto, ($notooltip?'':'class="classfortooltip"'), 0, 0, $notooltip?0:1).$linkend);
+		}
+		if ($withpicto && $withpicto != 2) {
+			$result.=' ';
+		}
 		$result.=$linkstart.$this->ref.$linkend;
 		return $result;
 	}
@@ -2043,8 +2135,7 @@ 
 
 			$this->db->free($result);
 
-		}
-		else
+		} else
 		{
 			dol_print_error($this->db);
 		}
@@ -2063,7 +2154,9 @@ 
 		$sql = "SELECT cd.rowid";
 		$sql.= " FROM ".MAIN_DB_PREFIX."contratdet as cd";
 		$sql.= " WHERE fk_contrat =".$this->id;
-		if ($statut >= 0) $sql.= " AND statut = '$statut'";
+		if ($statut >= 0) {
+			$sql.= " AND statut = '$statut'";
+		}
 
 		dol_syslog(get_class($this)."::array_detail()", LOG_DEBUG);
 		$resql=$this->db->query($sql);
@@ -2078,8 +2171,7 @@ 
 				$i++;
 			}
 			return $tab;
-		}
-		else
+		} else
 		{
 			$this->error=$this->db->error();
 			return -1;
@@ -2099,7 +2191,9 @@ 
 		$sql = "SELECT c.rowid, c.ref";
 		$sql.= " FROM ".MAIN_DB_PREFIX."contrat as c";
 		$sql.= " WHERE fk_soc =".$this->socid;
-		if ($option == 'others') $sql.= " AND c.rowid != ".$this->id;
+		if ($option == 'others') {
+			$sql.= " AND c.rowid != ".$this->id;
+		}
 
 		dol_syslog(get_class($this)."::getOtherContracts()", LOG_DEBUG);
 		$resql=$this->db->query($sql);
@@ -2116,8 +2210,7 @@ 
 				$i++;
 			}
 			return $tab;
-		}
-		else
+		} else
 		{
 			$this->error=$this->db->error();
 			return -1;
@@ -2139,7 +2232,9 @@ 
 		$this->from = " FROM ".MAIN_DB_PREFIX."contrat as c";
 		$this->from.= ", ".MAIN_DB_PREFIX."contratdet as cd";
 		$this->from.= ", ".MAIN_DB_PREFIX."societe as s";
-		if (!$user->rights->societe->client->voir && !$user->societe_id) $this->from.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+		if (!$user->rights->societe->client->voir && !$user->societe_id) {
+			$this->from.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+		}
 
 		if ($mode == 'inactives')
 		{
@@ -2160,8 +2255,12 @@ 
 		}
 		$sql.= " AND c.fk_soc = s.rowid";
 		$sql.= " AND c.entity = ".$conf->entity;
-		if ($user->societe_id) $sql.=" AND c.fk_soc = ".$user->societe_id;
-		if (!$user->rights->societe->client->voir && !$user->societe_id) $sql.= " AND c.fk_soc = sc.fk_soc AND sc.fk_user = " .$user->id;
+		if ($user->societe_id) {
+			$sql.=" AND c.fk_soc = ".$user->societe_id;
+		}
+		if (!$user->rights->societe->client->voir && !$user->societe_id) {
+			$sql.= " AND c.fk_soc = sc.fk_soc AND sc.fk_user = " .$user->id;
+		}
 		$resql=$this->db->query($sql);
 		if ($resql)
 		{
@@ -2194,8 +2293,7 @@ 
 			}
 
 			return $response;
-		}
-		else
+		} else
 		{
 			dol_print_error($this->db);
 			$this->error=$this->db->error();
@@ -2235,8 +2333,7 @@ 
 			}
             $this->db->free($resql);
 			return 1;
-		}
-		else
+		} else
 		{
 			dol_print_error($this->db);
 			$this->error=$this->db->error();
@@ -2474,8 +2571,9 @@ 
 				);
 				$action = '';
 				$reshook = $hookmanager->executeHooks('createFrom', $parameters, $clonedObj, $action); // Note that $action and $object may have been modified by some hooks
-				if ($reshook < 0)
-					$error ++;
+				if ($reshook < 0) {
+									$error ++;
+				}
 			}
 
 		}
@@ -2674,17 +2772,27 @@ 
 
 		$result='';
         $label=$langs->trans("ShowContractOfService").': '.$this->label;
-        if (empty($label)) $label=$this->description;
+        if (empty($label)) {
+        	$label=$this->description;
+        }
 
         $link = '<a href="'.DOL_URL_ROOT.'/contrat/card.php?id='.$this->fk_contrat.'" title="'.dol_escape_htmltag($label, 1).'" class="classfortooltip">';
 		$linkend='</a>';
 
 		$picto='service';
-		if ($this->type == 0) $picto='product';
+		if ($this->type == 0) {
+			$picto='product';
+		}
 
-        if ($withpicto) $result.=($link.img_object($label, $picto, 'class="classfortooltip"').$linkend);
-		if ($withpicto && $withpicto != 2) $result.=' ';
-		if ($withpicto != 2) $result.=$link.($this->product_ref?$this->product_ref.' ':'').($this->label?$this->label:$this->description).$linkend;
+        if ($withpicto) {
+        	$result.=($link.img_object($label, $picto, 'class="classfortooltip"').$linkend);
+        }
+		if ($withpicto && $withpicto != 2) {
+			$result.=' ';
+		}
+		if ($withpicto != 2) {
+			$result.=$link.($this->product_ref?$this->product_ref.' ':'').($this->label?$this->label:$this->description).$linkend;
+		}
 		return $result;
 	}
 
@@ -2699,7 +2807,9 @@ 
 	{
 
 		// Check parameters
-		if (empty($id) && empty($ref)) return -1;
+		if (empty($id) && empty($ref)) {
+			return -1;
+		}
 
 		$sql = "SELECT";
 		$sql.= " t.rowid,";
@@ -2745,8 +2855,12 @@ 
 		$sql.= " t.commentaire,";
 		$sql.= " t.fk_unit";
 		$sql.= " FROM ".MAIN_DB_PREFIX."contratdet as t LEFT JOIN ".MAIN_DB_PREFIX."product as p ON p.rowid = t.fk_product";
-		if ($id)  $sql.= " WHERE t.rowid = ".$id;
-		if ($ref) $sql.= " WHERE t.rowid = '".$this->db->escape($ref)."'";
+		if ($id) {
+			$sql.= " WHERE t.rowid = ".$id;
+		}
+		if ($ref) {
+			$sql.= " WHERE t.rowid = '".$this->db->escape($ref)."'";
+		}
 
 		dol_syslog(get_class($this)."::fetch", LOG_DEBUG);
 		$resql=$this->db->query($sql);
@@ -2805,8 +2919,7 @@ 
 			$this->db->free($resql);
 
 			return 1;
-		}
-		else
+		} else
 		{
 			$this->error="Error ".$this->db->lasterror();
 			return -1;
@@ -2854,13 +2967,27 @@ 
 		$this->fk_user_cloture=trim($this->fk_user_cloture);
 		$this->commentaire=trim($this->commentaire);
 		//if (empty($this->subprice)) $this->subprice = 0;
-		if (empty($this->price_ht)) $this->price_ht = 0;
-		if (empty($this->total_ht)) $this->total_ht = 0;
-		if (empty($this->total_tva)) $this->total_tva = 0;
-		if (empty($this->total_ttc)) $this->total_ttc = 0;
-		if (empty($this->localtax1_tx)) $this->localtax1_tx = 0;
-		if (empty($this->localtax2_tx)) $this->localtax2_tx = 0;
-		if (empty($this->remise_percent)) $this->remise_percent = 0;
+		if (empty($this->price_ht)) {
+			$this->price_ht = 0;
+		}
+		if (empty($this->total_ht)) {
+			$this->total_ht = 0;
+		}
+		if (empty($this->total_tva)) {
+			$this->total_tva = 0;
+		}
+		if (empty($this->total_ttc)) {
+			$this->total_ttc = 0;
+		}
+		if (empty($this->localtax1_tx)) {
+			$this->localtax1_tx = 0;
+		}
+		if (empty($this->localtax2_tx)) {
+			$this->localtax2_tx = 0;
+		}
+		if (empty($this->remise_percent)) {
+			$this->remise_percent = 0;
+		}
 
 		// Check parameters
 		// Put here code to add control on parameters values
@@ -2878,7 +3005,9 @@ 
 		$this->total_localtax1= $tabprice[9];
 		$this->total_localtax2= $tabprice[10];
 
-	    if (empty($this->pa_ht)) $this->pa_ht=0;
+	    if (empty($this->pa_ht)) {
+	    	$this->pa_ht=0;
+	    }
 
 		// if buy price not defined, define buyprice as configured in margin admin
 		if ($this->pa_ht == 0)
@@ -2886,8 +3015,7 @@ 
 			if (($result = $this->defineBuyPrice($this->subprice, $this->remise_percent, $this->fk_product)) < 0)
 			{
 				return $result;
-			}
-			else
+			} else
 			{
 				$this->pa_ht = $result;
 			}
@@ -2940,18 +3068,19 @@ 
 			$contrat=new Contrat($this->db);
 			$contrat->fetch($this->fk_contrat);
 			$result=$contrat->update_statut($user);
-		}
-		else
+		} else
 		{
 			$this->error="Error ".$this->db->lasterror();
 			$error++;
 			//return -1;
 		}
 
-		if (empty($conf->global->MAIN_EXTRAFIELDS_DISABLED) && is_array($this->array_options) && count($this->array_options)>0) // For avoid conflicts if trigger used
+		if (empty($conf->global->MAIN_EXTRAFIELDS_DISABLED) && is_array($this->array_options) && count($this->array_options)>0) {
+			// For avoid conflicts if trigger used
 		{
 
 			$result=$this->insertExtraFields();
+		}
 			if ($result < 0)
 			{
 				$error++;
@@ -3005,8 +3134,7 @@ 
 		{
 			$this->db->commit();
 			return 1;
-		}
-		else
+		} else
 		{
 			$this->error=$this->db->error();
 			$this->db->rollback();
@@ -3047,10 +3175,16 @@ 
 		$sql.= " ".price2num($this->total_ht).",".price2num($this->total_tva).",".price2num($this->total_localtax1).",".price2num($this->total_localtax2).",".price2num($this->total_ttc).",";
 		$sql.= " '".$this->db->escape($this->info_bits)."',";
 		$sql.= " ".price2num($this->price_ht).",".price2num($this->remise).",";
-		if ($this->fk_fournprice > 0) $sql.= ' '.$this->fk_fournprice.',';
-		else $sql.= ' null,';
-		if ($this->pa_ht > 0) $sql.= ' '.price2num($this->pa_ht);
-		else $sql.= ' null';
+		if ($this->fk_fournprice > 0) {
+			$sql.= ' '.$this->fk_fournprice.',';
+		} else {
+			$sql.= ' null,';
+		}
+		if ($this->pa_ht > 0) {
+			$sql.= ' '.price2num($this->pa_ht);
+		} else {
+			$sql.= ' null';
+		}
 		if ($this->date_ouverture_prevue > 0) { $sql.= ",'".$this->db->idate($this->date_ouverture_prevue)."'"; }
 		if ($this->date_fin_validite > 0) { $sql.= ",'".$this->db->idate($this->date_fin_validite)."'"; }
 		$sql.= ")";
@@ -3077,8 +3211,7 @@ 
 
 			$this->db->commit();
 			return 1;
-		}
-		else
+		} else
 		{
 			$this->db->rollback();
 			$this->error=$this->db->error()." sql=".$sql;
@@ -3112,7 +3245,9 @@ 
 
 		$sql = "UPDATE " . MAIN_DB_PREFIX . "contratdet SET statut = 4,";
 		$sql .= " date_ouverture = " . (dol_strlen($date) != 0 ? "'" . $this->db->idate($date) . "'" : "null") . ",";
-		if ($date_end >= 0) $sql .= " date_fin_validite = " . (dol_strlen($date_end) != 0 ? "'" . $this->db->idate($date_end) . "'" : "null") . ",";
+		if ($date_end >= 0) {
+			$sql .= " date_fin_validite = " . (dol_strlen($date_end) != 0 ? "'" . $this->db->idate($date_end) . "'" : "null") . ",";
+		}
 		$sql .= " fk_user_ouverture = " . $user->id . ",";
 		$sql .= " date_cloture = null,";
 		$sql .= " commentaire = '" . $this->db->escape($comment) . "'";

htdocs/core/class/html.formintervention.class.php

Doc Comments +1 added lines, -1 removed lines

@@ -50,7 +50,7 @@
 	 *	@param  string	$htmlname   Nom de la zone html
 	 *	@param	int		$maxlength	Maximum length of label
 	 *	@param	int		$showempty	Show empty line
-	 *	@return int         		Nbre of project if OK, <0 if KO
+	 *	@return string         		Nbre of project if OK, <0 if KO
 	 */
 	function select_interventions($socid=-1, $selected='', $htmlname='interventionid', $maxlength=16, $showempty=1)
 	{

Braces +15 added lines, -12 removed lines

@@ -66,8 +66,11 @@ 
 		$sql.= " WHERE f.entity = ".$conf->entity;
 		if ($socid != '')
 		{
-			if ($socid == '0') $sql.= " AND (f.fk_soc = 0 OR f.fk_soc IS NULL)";
-			else $sql.= " AND f.fk_soc = ".$socid;
+			if ($socid == '0') {
+				$sql.= " AND (f.fk_soc = 0 OR f.fk_soc IS NULL)";
+			} else {
+				$sql.= " AND f.fk_soc = ".$socid;
+			}
 		}
 
 		dol_syslog(get_class($this)."::select_intervention", LOG_DEBUG);
@@ -75,7 +78,9 @@ 
 		if ($resql)
 		{
 			$out.='<select id="interventionid" class="flat" name="'.$htmlname.'">';
-			if ($showempty) $out.='<option value="0">&nbsp;</option>';
+			if ($showempty) {
+				$out.='<option value="0">&nbsp;</option>';
+			}
 			$num = $db->num_rows($resql);
 			$i = 0;
 			if ($num)
@@ -87,15 +92,13 @@ 
 					if ($socid > 0 && (empty($obj->fk_soc) || $obj->fk_soc == $socid) && ! $user->rights->societe->lire)
 					{
 						// Do nothing
-					}
-					else
+					} else
 					{
 						$labeltoshow=dol_trunc($obj->ref,18);
 						if (!empty($selected) && $selected == $obj->rowid && $obj->statut > 0)
 						{
 							$out.='<option value="'.$obj->rowid.'" selected>'.$labeltoshow.'</option>';
-						}
-						else
+						} else
 						{
 							$disabled=0;
 							if (! $obj->fk_statut > 0)
@@ -112,11 +115,12 @@ 
 							if ($hideunselectables && $disabled)
 							{
 								$resultat='';
-							}
-							else
+							} else
 							{
 								$resultat='<option value="'.$obj->rowid.'"';
-								if ($disabled) $resultat.=' disabled';
+								if ($disabled) {
+									$resultat.=' disabled';
+								}
 								$resultat.='>'.$labeltoshow;
 								$resultat.='</option>';
 							}
@@ -129,8 +133,7 @@ 
 			$out.='</select>';
 			$db->free($resql);
 			return $out;
-		}
-		else
+		} else
 		{
 			dol_print_error($db);
 			return '';

htdocs/core/class/html.formmargin.class.php

Doc Comments +1 added lines, -1 removed lines

@@ -51,7 +51,7 @@
 	 *
 	 * 	@param	CommonObject	$object			Object we want to get margin information for
 	 * 	@param 	boolean			$force_price	True of not
-	 * 	@return array							Array with info
+	 * 	@return integer							Array with info
 	 */
 	function getMarginInfosArray($object, $force_price=false)
 	{

Braces +69 added lines, -48 removed lines

@@ -83,10 +83,12 @@ 
 			{
 				require_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.product.class.php';
 				$product = new ProductFournisseur($db);
-				if ($product->fetch_product_fournisseur_price($line->fk_fournprice))
-					$line->pa_ht = $product->fourn_unitprice * (1 - $product->fourn_remise_percent / 100);
-				if (isset($conf->global->MARGIN_TYPE) && $conf->global->MARGIN_TYPE == "2" && $product->fourn_unitcharges > 0)
-					$line->pa_ht += $product->fourn_unitcharges;
+				if ($product->fetch_product_fournisseur_price($line->fk_fournprice)) {
+									$line->pa_ht = $product->fourn_unitprice * (1 - $product->fourn_remise_percent / 100);
+				}
+				if (isset($conf->global->MARGIN_TYPE) && $conf->global->MARGIN_TYPE == "2" && $product->fourn_unitcharges > 0) {
+									$line->pa_ht += $product->fourn_unitcharges;
+				}
 			}
 			// si prix d'achat non renseigné et devrait l'être, alors prix achat = prix vente
 			if ((!isset($line->pa_ht) || $line->pa_ht == 0) && $line->subprice > 0 && (isset($conf->global->ForceBuyingPriceIfNull) && $conf->global->ForceBuyingPriceIfNull == 1)) {
@@ -111,8 +113,7 @@ 
 					//}
 					//else
 						$marginInfos['margin_on_products'] += $pv - $pa;
-				}
-				elseif ($conf->global->MARGIN_METHODE_FOR_DISCOUNT == '2') { // remise globale considérée comme service
+				} elseif ($conf->global->MARGIN_METHODE_FOR_DISCOUNT == '2') { // remise globale considérée comme service
 					$marginInfos['pa_services'] += $pa;
 					$marginInfos['pv_services'] += $pv;
 					$marginInfos['pa_total'] +=  $pa;
@@ -122,13 +123,11 @@ 
 					//	$marginInfos['margin_on_services'] += -1 * (abs($pv) - $pa);
 					//else
 						$marginInfos['margin_on_services'] += $pv - $pa;
-				}
-				elseif ($conf->global->MARGIN_METHODE_FOR_DISCOUNT == '3') { // remise globale prise en compte uniqt sur total
+				} elseif ($conf->global->MARGIN_METHODE_FOR_DISCOUNT == '3') { // remise globale prise en compte uniqt sur total
 					$marginInfos['pa_total'] += $pa;
 					$marginInfos['pv_total'] += $pv;
 				}
-			}
-			else {
+			} else {
 				$type=$line->product_type?$line->product_type:$line->fk_product_type;
 				if ($type == 0) {  // product
 					$marginInfos['pa_products'] += $pa;
@@ -144,8 +143,7 @@ 
 					//{
 					    $marginInfos['margin_on_products'] += $pv - $pa;
 					//}
-				}
-				elseif ($type == 1) {  // service
+				} elseif ($type == 1) {  // service
 					$marginInfos['pa_services'] += $pa;
 					$marginInfos['pv_services'] += $pv;
 					$marginInfos['pa_total'] +=  $pa;
@@ -158,25 +156,31 @@ 
 				}
 			}
 		}
-		if ($marginInfos['pa_products'] > 0)
-			$marginInfos['margin_rate_products'] = 100 * $marginInfos['margin_on_products'] / $marginInfos['pa_products'];
-		if ($marginInfos['pv_products'] > 0)
-			$marginInfos['mark_rate_products'] = 100 * $marginInfos['margin_on_products'] / $marginInfos['pv_products'];
+		if ($marginInfos['pa_products'] > 0) {
+					$marginInfos['margin_rate_products'] = 100 * $marginInfos['margin_on_products'] / $marginInfos['pa_products'];
+		}
+		if ($marginInfos['pv_products'] > 0) {
+					$marginInfos['mark_rate_products'] = 100 * $marginInfos['margin_on_products'] / $marginInfos['pv_products'];
+		}
 
-		if ($marginInfos['pa_services'] > 0)
-			$marginInfos['margin_rate_services'] = 100 * $marginInfos['margin_on_services'] / $marginInfos['pa_services'];
-		if ($marginInfos['pv_services'] > 0)
-			$marginInfos['mark_rate_services'] = 100 * $marginInfos['margin_on_services'] / $marginInfos['pv_services'];
+		if ($marginInfos['pa_services'] > 0) {
+					$marginInfos['margin_rate_services'] = 100 * $marginInfos['margin_on_services'] / $marginInfos['pa_services'];
+		}
+		if ($marginInfos['pv_services'] > 0) {
+					$marginInfos['mark_rate_services'] = 100 * $marginInfos['margin_on_services'] / $marginInfos['pv_services'];
+		}
 
 		// if credit note, margin = -1 * (abs(selling_price) - buying_price)
 		//if ($marginInfos['pv_total'] < 0)
 		//	$marginInfos['total_margin'] = -1 * (abs($marginInfos['pv_total']) - $marginInfos['pa_total']);
 		//else
 			$marginInfos['total_margin'] = $marginInfos['pv_total'] - $marginInfos['pa_total'];
-		if ($marginInfos['pa_total'] > 0)
-			$marginInfos['total_margin_rate'] = 100 * $marginInfos['total_margin'] / $marginInfos['pa_total'];
-		if ($marginInfos['pv_total'] > 0)
-			$marginInfos['total_mark_rate'] = 100 * $marginInfos['total_margin'] / $marginInfos['pv_total'];
+		if ($marginInfos['pa_total'] > 0) {
+					$marginInfos['total_margin_rate'] = 100 * $marginInfos['total_margin'] / $marginInfos['pa_total'];
+		}
+		if ($marginInfos['pv_total'] > 0) {
+					$marginInfos['total_mark_rate'] = 100 * $marginInfos['total_margin'] / $marginInfos['pv_total'];
+		}
 
 		return $marginInfos;
 	}
@@ -192,17 +196,23 @@ 
 	{
 		global $langs, $conf, $user;
 
-    	if (! empty($user->societe_id)) return;
+    	if (! empty($user->societe_id)) {
+    		return;
+    	}
 
-    	if (! $user->rights->margins->liretous) return;
+    	if (! $user->rights->margins->liretous) {
+    		return;
+    	}
 
         $rounding = min($conf->global->MAIN_MAX_DECIMALS_UNIT, $conf->global->MAIN_MAX_DECIMALS_TOT);
 
 		$marginInfo = $this->getMarginInfosArray($object, $force_price);
 
-		if (! empty($conf->global->MARGIN_ADD_SHOWHIDE_BUTTON))	// TODO Warning this feature rely on an external js file that may be removed. Using native js function document.cookie should be better
+		if (! empty($conf->global->MARGIN_ADD_SHOWHIDE_BUTTON)) {
+			// TODO Warning this feature rely on an external js file that may be removed. Using native js function document.cookie should be better
 		{
 			print $langs->trans('ShowMarginInfos').' : ';
+		}
 	        $hidemargininfos = $_COOKIE['DOLUSER_MARGININFO_HIDE_SHOW'];
 	    	print '<span id="showMarginInfos" class="linkobject '.(!empty($hidemargininfos)?'':'hideobject').'">'.img_picto($langs->trans("Disabled"),'switch_off').'</span>';
 	    	print '<span id="hideMarginInfos" class="linkobject '.(!empty($hidemargininfos)?'hideobject':'').'">'.img_picto($langs->trans("Enabled"),'switch_on').'</span>';
@@ -211,7 +221,9 @@ 
         	    $("span#showMarginInfos").click(function() { $.getScript( "'.dol_buildpath('/includes/jquery/plugins/jquerytreeview/lib/jquery.cookie.js', 1).'", function( data, textStatus, jqxhr ) { $.cookie("DOLUSER_MARGININFO_HIDE_SHOW", 0); $(".margininfos").show(); $("span#showMarginInfos").addClass("hideobject"); $("span#hideMarginInfos").removeClass("hideobject");})});
         	    $("span#hideMarginInfos").click(function() { $.getScript( "'.dol_buildpath('/includes/jquery/plugins/jquerytreeview/lib/jquery.cookie.js', 1).'", function( data, textStatus, jqxhr ) { $.cookie("DOLUSER_MARGININFO_HIDE_SHOW", 1); $(".margininfos").hide(); $("span#hideMarginInfos").addClass("hideobject"); $("span#showMarginInfos").removeClass("hideobject");})});
       	        });</script>';
-    	    if (!empty($hidemargininfos)) print '<script>$(document).ready(function() {$(".margininfos").hide();});</script>';
+    	    if (!empty($hidemargininfos)) {
+    	    	print '<script>$(document).ready(function() {$(".margininfos").hide();});</script>';
+    	    }
 		}
 
 		print '<!-- Margin table -->'."\n";
@@ -219,15 +231,18 @@ 
 		print '<tr class="liste_titre">';
 		print '<td class="liste_titre">'.$langs->trans('Margins').'</td>';
 		print '<td class="liste_titre" align="right">'.$langs->trans('SellingPrice').'</td>';
-		if ($conf->global->MARGIN_TYPE == "1")
-			print '<td class="liste_titre" align="right">'.$langs->trans('BuyingPrice').'</td>';
-		else
-			print '<td class="liste_titre" align="right">'.$langs->trans('CostPrice').'</td>';
+		if ($conf->global->MARGIN_TYPE == "1") {
+					print '<td class="liste_titre" align="right">'.$langs->trans('BuyingPrice').'</td>';
+		} else {
+					print '<td class="liste_titre" align="right">'.$langs->trans('CostPrice').'</td>';
+		}
 		print '<td class="liste_titre" align="right">'.$langs->trans('Margin').'</td>';
-		if (! empty($conf->global->DISPLAY_MARGIN_RATES))
-			print '<td class="liste_titre" align="right">'.$langs->trans('MarginRate').'</td>';
-		if (! empty($conf->global->DISPLAY_MARK_RATES))
-			print '<td class="liste_titre" align="right">'.$langs->trans('MarkRate').'</td>';
+		if (! empty($conf->global->DISPLAY_MARGIN_RATES)) {
+					print '<td class="liste_titre" align="right">'.$langs->trans('MarginRate').'</td>';
+		}
+		if (! empty($conf->global->DISPLAY_MARK_RATES)) {
+					print '<td class="liste_titre" align="right">'.$langs->trans('MarkRate').'</td>';
+		}
 		print '</tr>';
 
 		if (! empty($conf->product->enabled))
@@ -238,10 +253,12 @@ 
 			print '<td align="right">'.price($marginInfo['pv_products'], null, null, null, null, $rounding).'</td>';
 			print '<td align="right">'.price($marginInfo['pa_products'], null, null, null, null, $rounding).'</td>';
 			print '<td align="right">'.price($marginInfo['margin_on_products'], null, null, null, null, $rounding).'</td>';
-			if (! empty($conf->global->DISPLAY_MARGIN_RATES))
-				print '<td align="right">'.(($marginInfo['margin_rate_products'] == '')?'':price($marginInfo['margin_rate_products'], null, null, null, null, $rounding).'%').'</td>';
-			if (! empty($conf->global->DISPLAY_MARK_RATES))
-				print '<td align="right">'.(($marginInfo['mark_rate_products'] == '')?'':price($marginInfo['mark_rate_products'], null, null, null, null, $rounding).'%').'</td>';
+			if (! empty($conf->global->DISPLAY_MARGIN_RATES)) {
+							print '<td align="right">'.(($marginInfo['margin_rate_products'] == '')?'':price($marginInfo['margin_rate_products'], null, null, null, null, $rounding).'%').'</td>';
+			}
+			if (! empty($conf->global->DISPLAY_MARK_RATES)) {
+							print '<td align="right">'.(($marginInfo['mark_rate_products'] == '')?'':price($marginInfo['mark_rate_products'], null, null, null, null, $rounding).'%').'</td>';
+			}
 			print '</tr>';
 		}
 
@@ -252,10 +269,12 @@ 
 			print '<td align="right">'.price($marginInfo['pv_services'], null, null, null, null, $rounding).'</td>';
 			print '<td align="right">'.price($marginInfo['pa_services'], null, null, null, null, $rounding).'</td>';
 			print '<td align="right">'.price($marginInfo['margin_on_services'], null, null, null, null, $rounding).'</td>';
-			if (! empty($conf->global->DISPLAY_MARGIN_RATES))
-				print '<td align="right">'.(($marginInfo['margin_rate_services'] == '')?'':price($marginInfo['margin_rate_services'], null, null, null, null, $rounding).'%').'</td>';
-			if (! empty($conf->global->DISPLAY_MARK_RATES))
-				print '<td align="right">'.(($marginInfo['mark_rate_services'] == '')?'':price($marginInfo['mark_rate_services'], null, null, null, null, $rounding).'%').'</td>';
+			if (! empty($conf->global->DISPLAY_MARGIN_RATES)) {
+							print '<td align="right">'.(($marginInfo['margin_rate_services'] == '')?'':price($marginInfo['margin_rate_services'], null, null, null, null, $rounding).'%').'</td>';
+			}
+			if (! empty($conf->global->DISPLAY_MARK_RATES)) {
+							print '<td align="right">'.(($marginInfo['mark_rate_services'] == '')?'':price($marginInfo['mark_rate_services'], null, null, null, null, $rounding).'%').'</td>';
+			}
 			print '</tr>';
 		}
 
@@ -266,10 +285,12 @@ 
 			print '<td align="right">'.price($marginInfo['pv_total'], null, null, null, null, $rounding).'</td>';
 			print '<td align="right">'.price($marginInfo['pa_total'], null, null, null, null, $rounding).'</td>';
 			print '<td align="right">'.price($marginInfo['total_margin'], null, null, null, null, $rounding).'</td>';
-			if (! empty($conf->global->DISPLAY_MARGIN_RATES))
-				print '<td align="right">'.(($marginInfo['total_margin_rate'] == '')?'':price($marginInfo['total_margin_rate'], null, null, null, null, $rounding).'%').'</td>';
-			if (! empty($conf->global->DISPLAY_MARK_RATES))
-				print '<td align="right">'.(($marginInfo['total_mark_rate'] == '')?'':price($marginInfo['total_mark_rate'], null, null, null, null, $rounding).'%').'</td>';
+			if (! empty($conf->global->DISPLAY_MARGIN_RATES)) {
+							print '<td align="right">'.(($marginInfo['total_margin_rate'] == '')?'':price($marginInfo['total_margin_rate'], null, null, null, null, $rounding).'%').'</td>';
+			}
+			if (! empty($conf->global->DISPLAY_MARK_RATES)) {
+							print '<td align="right">'.(($marginInfo['total_mark_rate'] == '')?'':price($marginInfo['total_mark_rate'], null, null, null, null, $rounding).'%').'</td>';
+			}
 			print '</tr>';
 		}
 		print '</table>';

htdocs/core/db/DoliDB.class.php

Doc Comments +1 added lines, -1 removed lines

@@ -95,7 +95,7 @@
 	/**
 	 *	Return last error code
 	 *
-	 *	@return	    string	lasterrno
+	 *	@return	    integer	lasterrno
 	 */
 	function lasterrno()
 	{

Braces +24 added lines, -17 removed lines

@@ -119,8 +119,7 @@ 
 				dol_syslog('',0,1);
 			}
 			return $ret;
-		}
-		else
+		} else
 		{
 			$this->transaction_opened++;
 			dol_syslog('',0,1);
@@ -145,13 +144,11 @@ 
 				$this->transaction_opened=0;
 				dol_syslog("COMMIT Transaction".($log?' '.$log:''),LOG_DEBUG);
 				return 1;
-			}
-			else
+			} else
 			{
 				return 0;
 			}
-		}
-		else
+		} else
 		{
 			$this->transaction_opened--;
 			return 1;
@@ -173,8 +170,7 @@ 
 			$this->transaction_opened=0;
 			dol_syslog("ROLLBACK Transaction".($log?' '.$log:''),LOG_DEBUG);
 			return $ret;
-		}
-		else
+		} else
 		{
 			$this->transaction_opened--;
 			return 1;
@@ -191,10 +187,17 @@ 
 	function plimit($limit=0,$offset=0)
 	{
 		global $conf;
-		if (empty($limit)) return "";
-		if ($limit < 0) $limit=$conf->liste_limit;
-		if ($offset > 0) return " LIMIT $offset,$limit ";
-		else return " LIMIT $limit ";
+		if (empty($limit)) {
+			return "";
+		}
+		if ($limit < 0) {
+			$limit=$conf->liste_limit;
+		}
+		if ($offset > 0) {
+			return " LIMIT $offset,$limit ";
+		} else {
+			return " LIMIT $limit ";
+		}
 	}
 
 	/**
@@ -234,8 +237,11 @@ 
 			$i=0;
 			foreach($fields as $val)
 			{
-				if (! $return) $return.=' ORDER BY ';
-				else $return.=', ';
+				if (! $return) {
+					$return.=' ORDER BY ';
+				} else {
+					$return.=', ';
+				}
 
 				$return.=preg_replace('/[^0-9a-z_\.]/i','',$val);
 				
@@ -251,8 +257,7 @@ 
 				$i++;
 			}
 			return $return;
-		}
-		else
+		} else
 		{
 			return '';
 		}
@@ -279,7 +284,9 @@ 
 	 */
 	function jdate($string, $gm=false)
 	{
-		if ($string==0 || $string=="0000-00-00 00:00:00") return '';
+		if ($string==0 || $string=="0000-00-00 00:00:00") {
+			return '';
+		}
 		$string=preg_replace('/([^0-9])/i','',$string);
 		$tmp=$string.'000000';
 		$date=dol_mktime(substr($tmp,8,2),substr($tmp,10,2),substr($tmp,12,2),substr($tmp,4,2),substr($tmp,6,2),substr($tmp,0,4),$gm);

htdocs/core/db/mssql.class.php

Doc Comments +4 added lines, -4 removed lines

@@ -319,7 +319,7 @@ 
      *  @param  int		$usesavepoint	0=Default mode, 1=Run a savepoint before and a rollbock to savepoint if error (this allow to have some request with errors inside global transactions).
      *                   		 		Note that with Mysql, this parameter is not used as Myssql can already commit a transaction even if one request is in error, without using savepoints.
      *  @param  string	$type           Type of SQL order ('ddl' for insert, update, select, delete or 'dml' for create, alter...)
-     *  @return false|resource|true		Resultset of answer
+     *  @return resource		Resultset of answer
 	 */
 	function query($query,$usesavepoint=0,$type='auto')
 	{
@@ -516,7 +516,7 @@ 
 	 *	Renvoie le nombre de lignes dans le resultat d'une requete INSERT, DELETE ou UPDATE
 	 *
 	 *	@param	resource	$resultset   Curseur de la requete voulue
-	 *	@return int		    Nombre de lignes
+	 *	@return string		    Nombre de lignes
 	 *	@see    num_rows
 	 */
 	function affected_rows($resultset)
@@ -535,7 +535,7 @@ 
 	 *	Free last resultset used.
 	 *
 	 *	@param  resource	$resultset   Curseur de la requete voulue
-	 *	@return	bool
+	 *	@return	boolean|null
 	 */
 	function free($resultset=null)
 	{
@@ -1015,7 +1015,7 @@ 
 	/**
 	 *	Return list of available charset that can be used to store data in database
 	 *
-	 *	@return		array		List of Charset
+	 *	@return		string		List of Charset
 	 */
 	function getListOfCharacterSet()
 	{

Braces +102 added lines, -89 removed lines

@@ -90,8 +90,7 @@ 
 			// (La base Dolibarr a ete forcee en this->forcecharset a l'install)
 			$this->connected = true;
 			$this->ok = true;
-		}
-		else
+		} else
 		{
 			// host, login ou password incorrect
 			$this->connected = false;
@@ -108,8 +107,7 @@ 
 				$this->database_selected = true;
 				$this->database_name = $name;
 				$this->ok = true;
-			}
-			else
+			} else
 			{
 				$this->database_selected = false;
 				$this->database_name = '';
@@ -117,8 +115,7 @@ 
 				$this->error=$this->error();
 				dol_syslog(get_class($this)."::DoliDBMssql : Erreur Select_db ".$this->error,LOG_ERR);
 			}
-		}
-		else
+		} else
 		{
 			// Pas de selection de base demandee, ok ou ko
 			$this->database_selected = false;
@@ -165,7 +162,9 @@ 
 	{
 		dol_syslog(get_class($this)."::connect host=$host, port=$port, login=$login, passwd=--hidden--, name=$name");
 		$newhost=$host;
-		if ($port) $newhost.=':'.$port;
+		if ($port) {
+			$newhost.=':'.$port;
+		}
 		$this->db  = @mssql_connect($newhost, $login, $passwd);
 		//force les enregistrement en latin1 si la base est en utf8 par defaut
 		// Supprime car plante sur mon PHP-Mysql. De plus, la base est forcement en latin1 avec
@@ -196,8 +195,9 @@ 
 		{
             $version=$this->fetch_array($resql);
             return $version['computed'];
+		} else {
+			return '';
 		}
-		else return '';
 	}
 
 	/**
@@ -220,7 +220,9 @@ 
     {
         if ($this->db)
         {
-          if ($this->transaction_opened > 0) dol_syslog(get_class($this)."::close Closing a connection with an opened transaction depth=".$this->transaction_opened,LOG_ERR);
+          if ($this->transaction_opened > 0) {
+          	dol_syslog(get_class($this)."::close Closing a connection with an opened transaction depth=".$this->transaction_opened,LOG_ERR);
+          }
           $this->connected=false;
           return mssql_close($this->db);
         }
@@ -248,8 +250,7 @@ 
 				dol_syslog("BEGIN Transaction",LOG_DEBUG);
 			}
 			return $ret;
-		}
-		else
+		} else
 		{
 			return true;
 		}
@@ -274,13 +275,11 @@ 
 			{
 				dol_syslog("COMMIT Transaction",LOG_DEBUG);
 				return true;
-			}
-			else
+			} else
 			{
 				return false;
 			}
-		}
-		elseif ($this->transaction_opened > 1)
+		} elseif ($this->transaction_opened > 1)
 		{
 			return true;
 		}
@@ -304,8 +303,7 @@ 
 			$ret=mssql_query("ROLLBACK TRANSACTION",$this->db);
 			dol_syslog("ROLLBACK Transaction".($log?' '.$log:''),LOG_DEBUG);
 			return $ret;
-		}
-		elseif ($this->transaction_opened > 1)
+		} elseif ($this->transaction_opened > 1)
 		{
 			return true;
 		}
@@ -326,7 +324,9 @@ 
 	{
 		$query = trim($query);
 
-		if (preg_match('/^--/',$query)) return true;
+		if (preg_match('/^--/',$query)) {
+			return true;
+		}
 
 		// Conversion syntaxe MySql vers MSDE.
 		$query = str_ireplace("now()", "getdate()", $query);
@@ -360,11 +360,11 @@ 
                             $query_comp[]=$fld->COLUMN_NAME." IS NOT NULL";
                         }
                     }
-                    if (! empty($query_comp))
-                        $query.=" WHERE ".implode(" AND ",$query_comp);
+                    if (! empty($query_comp)) {
+                                            $query.=" WHERE ".implode(" AND ",$query_comp);
+                    }
                 }
-    		}
-    		else
+    		} else
     		{
     		    if (preg_match('/ALTER TABLE\h+(\w+?)\h+ADD\h+PRIMARY\h+KEY\h+(\w+?)\h*\((.+)\)/is', $query, $matches))
     		    {
@@ -419,14 +419,15 @@ 
 		}
 		//print "<!--".$query."-->";
 
-		if (! in_array($query,array('BEGIN','COMMIT','ROLLBACK'))) dol_syslog('sql='.$query, LOG_DEBUG);
+		if (! in_array($query,array('BEGIN','COMMIT','ROLLBACK'))) {
+			dol_syslog('sql='.$query, LOG_DEBUG);
+		}
 
 		if (! $this->database_name)
 		{
 			// Ordre SQL ne necessitant pas de connexion a une base (exemple: CREATE DATABASE)
 			$ret = mssql_query($query, $this->db);
-		}
-		else
+		} else
 		{
 			$ret = mssql_query($query, $this->db);
 		}
@@ -449,7 +450,9 @@ 
 				$this->lasterrno = $row["code"];
 
 				dol_syslog(get_class($this)."::query SQL Error query: ".$query, LOG_ERR);
-				if ($original_query) dol_syslog(get_class($this)."::query SQL Original query: ".$original_query, LOG_ERR);
+				if ($original_query) {
+					dol_syslog(get_class($this)."::query SQL Original query: ".$original_query, LOG_ERR);
+				}
 				dol_syslog(get_class($this)."::query SQL Error message: ".$this->lasterror." (".$this->lasterrno.")", LOG_ERR);
 			}
 			$this->lastquery=$query;
@@ -543,7 +546,9 @@ 
 		// Si le resultset n'est pas fourni, on prend le dernier utilise sur cette connexion
 		if (! is_resource($resultset)) { $resultset=$this->_results; }
 		// Si resultset en est un, on libere la memoire
-		if (is_resource($resultset)) mssql_free_result($resultset);
+		if (is_resource($resultset)) {
+			mssql_free_result($resultset);
+		}
 	}
 
 	/**
@@ -581,8 +586,7 @@ 
 		{
 			// Si il y a eu echec de connexion, $this->db n'est pas valide.
 			return 'DB_ERROR_FAILED_TO_CONNECT';
-		}
-		else
+		} else
 		{
 			// Constants to convert a MSSql error code to a generic Dolibarr error code
 			$errorcode_map = array(
@@ -633,8 +637,7 @@ 
 		if (! $this->connected) {
 			// Si il y a eu echec de connexion, $this->db n'est pas valide pour mssql_get_last_message.
 			return 'Not connected. Check setup parameters in conf/conf.php file and your mssql client and server versions';
-		}
-		else {
+		} else {
 			return mssql_get_last_message();
 		}
 	}
@@ -652,8 +655,7 @@ 
 		if ($res && $data = $this->fetch_array($res))
 		{
 			return $data["id"];
-		}
-		else
+		} else
 		{
 			return -1;
 		}
@@ -714,8 +716,9 @@ 
 		{
             $row=$this->fetch_row($resql);
             return $row[0];
+		} else {
+			return '?';
 		}
-		else return '?';
 	}
 
 	/**
@@ -808,26 +811,27 @@ 
 		{
 			$sqlfields[$i] = $field_name." ";
 			$sqlfields[$i]  .= $field_desc['type'];
-			if( preg_match("/^[^\s]/i",$field_desc['value']))
-			$sqlfields[$i]  .= "(".$field_desc['value'].")";
-			else if( preg_match("/^[^\s]/i",$field_desc['attribute']))
-			$sqlfields[$i]  .= " ".$field_desc['attribute'];
-			else if( preg_match("/^[^\s]/i",$field_desc['default']))
+			if( preg_match("/^[^\s]/i",$field_desc['value'])) {
+						$sqlfields[$i]  .= "(".$field_desc['value'].")";
+			} else if( preg_match("/^[^\s]/i",$field_desc['attribute'])) {
+						$sqlfields[$i]  .= " ".$field_desc['attribute'];
+			} else if( preg_match("/^[^\s]/i",$field_desc['default']))
 			{
-				if(preg_match("/null/i",$field_desc['default']))
-				$sqlfields[$i]  .= " default ".$field_desc['default'];
-				else
-				$sqlfields[$i]  .= " default '".$field_desc['default']."'";
+				if(preg_match("/null/i",$field_desc['default'])) {
+								$sqlfields[$i]  .= " default ".$field_desc['default'];
+				} else {
+								$sqlfields[$i]  .= " default '".$field_desc['default']."'";
+				}
+			} else if( preg_match("/^[^\s]/i",$field_desc['null'])) {
+						$sqlfields[$i]  .= " ".$field_desc['null'];
+			} else if( preg_match("/^[^\s]/i",$field_desc['extra'])) {
+						$sqlfields[$i]  .= " ".$field_desc['extra'];
 			}
-			else if( preg_match("/^[^\s]/i",$field_desc['null']))
-			$sqlfields[$i]  .= " ".$field_desc['null'];
-
-			else if( preg_match("/^[^\s]/i",$field_desc['extra']))
-			$sqlfields[$i]  .= " ".$field_desc['extra'];
 			$i++;
 		}
-		if($primary_key != "")
-		$pk = "primary key(".$primary_key.")";
+		if($primary_key != "") {
+				$pk = "primary key(".$primary_key.")";
+		}
 
 		if(is_array($unique_keys))
 		{
@@ -848,19 +852,23 @@ 
 			}
 		}
 		$sql .= implode(',',$sqlfields);
-		if($primary_key != "")
-		$sql .= ",".$pk;
-		if(is_array($unique_keys))
-		$sql .= ",".implode(',',$sqluq);
-		if(is_array($keys))
-		$sql .= ",".implode(',',$sqlk);
+		if($primary_key != "") {
+				$sql .= ",".$pk;
+		}
+		if(is_array($unique_keys)) {
+				$sql .= ",".implode(',',$sqluq);
+		}
+		if(is_array($keys)) {
+				$sql .= ",".implode(',',$sqlk);
+		}
 		$sql .=") type=".$type;
 
 		dol_syslog($sql);
-		if(! $this -> query($sql))
-		return -1;
-		else
-		return 1;
+		if(! $this -> query($sql)) {
+				return -1;
+		} else {
+				return 1;
+		}
 	}
 
 	/**
@@ -894,25 +902,31 @@ 
 		// ex. : $field_desc = array('type'=>'int','value'=>'11','null'=>'not null','extra'=> 'auto_increment');
 		$sql= "ALTER TABLE ".$table." ADD ".$field_name." ";
 		$sql .= $field_desc['type'];
-		if( preg_match("/^[^\s]/i",$field_desc['value']))
-		$sql  .= "(".$field_desc['value'].")";
-		if( preg_match("/^[^\s]/i",$field_desc['attribute']))
-		$sql  .= " ".$field_desc['attribute'];
-		if( preg_match("/^[^\s]/i",$field_desc['null']))
-		$sql  .= " ".$field_desc['null'];
-		if( preg_match("/^[^\s]/i",$field_desc['default']))
-		if(preg_match("/null/i",$field_desc['default']))
+		if( preg_match("/^[^\s]/i",$field_desc['value'])) {
+				$sql  .= "(".$field_desc['value'].")";
+		}
+		if( preg_match("/^[^\s]/i",$field_desc['attribute'])) {
+				$sql  .= " ".$field_desc['attribute'];
+		}
+		if( preg_match("/^[^\s]/i",$field_desc['null'])) {
+				$sql  .= " ".$field_desc['null'];
+		}
+		if( preg_match("/^[^\s]/i",$field_desc['default'])) {
+				if(preg_match("/null/i",$field_desc['default']))
 		$sql  .= " default ".$field_desc['default'];
-		else
-		$sql  .= " default '".$field_desc['default']."'";
-		if( preg_match("/^[^\s]/i",$field_desc['extra']))
-		$sql  .= " ".$field_desc['extra'];
+		} else {
+				$sql  .= " default '".$field_desc['default']."'";
+		}
+		if( preg_match("/^[^\s]/i",$field_desc['extra'])) {
+				$sql  .= " ".$field_desc['extra'];
+		}
 		$sql .= " ".$field_position;
 
-		if(! $this -> query($sql))
-		return -1;
-		else
-		return 1;
+		if(! $this -> query($sql)) {
+				return -1;
+		} else {
+				return 1;
+		}
 	}
 
 	/**
@@ -932,10 +946,11 @@ 
 		}
 
 		dol_syslog($sql,LOG_DEBUG);
-		if (! $this->query($sql))
-		return -1;
-		else
-		return 1;
+		if (! $this->query($sql)) {
+				return -1;
+		} else {
+				return 1;
+		}
 	}
 
 	/**
@@ -953,8 +968,9 @@ 
 		{
 			$this->error=$this->lasterror();
 			return -1;
+		} else {
+			return 1;
 		}
-		else return 1;
 	}
 
 	/**
@@ -976,8 +992,7 @@ 
             if ($this->lasterrno != '15025')
             {
 	            return -1;
-            }
-            else
+            } else
 			{
             	// If user already exists, we continue to set permissions
             	dol_syslog(get_class($this)."::DDLCreateUser sql=".$sql, LOG_WARNING);
@@ -989,8 +1004,7 @@ 
         {
             dol_syslog(get_class($this)."::DDLCreateUser sql=".$sql, LOG_WARNING);
             return -1;
-        }
-        else
+        } else
         {
             if ($num)
             {
@@ -1139,8 +1153,7 @@ 
 	    if (is_array($fields))
 	    {
 	        $where=" IN ('".implode("','",$fields)."')";
-	    }
-	    else
+	    } else
 	    {
 	        $where="='".$this->escape($fields)."'";
 	    }
@@ -1152,9 +1165,9 @@ 
 	        {
 	            $result[]=$obj;
 	        }
+	    } else {
+	    	        return false;
 	    }
-	    else
-	        return false;
 
 	    return $result;
 	}

htdocs/core/db/mysqli.class.php

Doc Comments +1 added lines, -1 removed lines

@@ -233,7 +233,7 @@
      * 	@param	int		$usesavepoint	0=Default mode, 1=Run a savepoint before and a rollbock to savepoint if error (this allow to have some request with errors inside global transactions).
      * 									Note that with Mysql, this parameter is not used as Myssql can already commit a transaction even if one request is in error, without using savepoints.
      *  @param  string	$type           Type of SQL order ('ddl' for insert, update, select, delete or 'dml' for create, alter...)
-     *	@return	bool|mysqli_result		Resultset of answer
+     *	@return	mysqli_result|null		Resultset of answer
      */
     function query($query,$usesavepoint=0,$type='auto')
     {

Braces +109 added lines, -68 removed lines

@@ -59,8 +59,12 @@ 
         global $conf,$langs;
 
         // Note that having "static" property for "$forcecharset" and "$forcecollate" will make error here in strict mode, so they are not static
-        if (! empty($conf->db->character_set)) $this->forcecharset=$conf->db->character_set;
-        if (! empty($conf->db->dolibarr_main_db_collation)) $this->forcecollate=$conf->db->dolibarr_main_db_collation;
+        if (! empty($conf->db->character_set)) {
+        	$this->forcecharset=$conf->db->character_set;
+        }
+        if (! empty($conf->db->dolibarr_main_db_collation)) {
+        	$this->forcecollate=$conf->db->dolibarr_main_db_collation;
+        }
 
         $this->database_user=$user;
         $this->database_host=$host;
@@ -111,13 +115,16 @@ 
 
                 // If client connected with different charset than Dolibarr HTML output
                 $clientmustbe='';
-                if (preg_match('/UTF-8/i',$conf->file->character_set_client))      $clientmustbe='utf8';
-                if (preg_match('/ISO-8859-1/i',$conf->file->character_set_client)) $clientmustbe='latin1';
+                if (preg_match('/UTF-8/i',$conf->file->character_set_client)) {
+                	$clientmustbe='utf8';
+                }
+                if (preg_match('/ISO-8859-1/i',$conf->file->character_set_client)) {
+                	$clientmustbe='latin1';
+                }
 				if ($this->db->character_set_name() != $clientmustbe) {
 					$this->db->set_charset($clientmustbe);
 				}
-            }
-            else
+            } else
             {
                 $this->database_selected = false;
                 $this->database_name = '';
@@ -125,8 +132,7 @@ 
                 $this->error=$this->error();
                 dol_syslog(get_class($this)."::DoliDBMysqli : Select_db error ".$this->error,LOG_ERR);
             }
-        }
-        else
+        } else
         {
             // Pas de selection de base demandee, ok ou ko
             $this->database_selected = false;
@@ -135,8 +141,12 @@ 
             {
                 // If client connected with different charset than Dolibarr HTML output
                 $clientmustbe='';
-                if (preg_match('/UTF-8/i',$conf->file->character_set_client))      $clientmustbe='utf8';
-                if (preg_match('/ISO-8859-1/i',$conf->file->character_set_client)) $clientmustbe='latin1';
+                if (preg_match('/UTF-8/i',$conf->file->character_set_client)) {
+                	$clientmustbe='utf8';
+                }
+                if (preg_match('/ISO-8859-1/i',$conf->file->character_set_client)) {
+                	$clientmustbe='latin1';
+                }
 				if ($this->db->character_set_name() != $clientmustbe) {
 					$this->db->set_charset($clientmustbe);
 				}
@@ -219,7 +229,9 @@ 
     {
         if ($this->db)
         {
-	        if ($this->transaction_opened > 0) dol_syslog(get_class($this)."::close Closing a connection with an opened transaction depth=".$this->transaction_opened,LOG_ERR);
+	        if ($this->transaction_opened > 0) {
+	        	dol_syslog(get_class($this)."::close Closing a connection with an opened transaction depth=".$this->transaction_opened,LOG_ERR);
+	        }
             $this->connected=false;
             return $this->db->close();
         }
@@ -241,14 +253,15 @@ 
 
         $query = trim($query);
 
-	    if (! in_array($query,array('BEGIN','COMMIT','ROLLBACK'))) dol_syslog('sql='.$query, LOG_DEBUG);
+	    if (! in_array($query,array('BEGIN','COMMIT','ROLLBACK'))) {
+	    	dol_syslog('sql='.$query, LOG_DEBUG);
+	    }
 
         if (! $this->database_name)
         {
             // Ordre SQL ne necessitant pas de connexion a une base (exemple: CREATE DATABASE)
             $ret = $this->db->query($query);
-        }
-        else
+        } else
         {
             $ret = $this->db->query($query);
         }
@@ -262,7 +275,10 @@ 
                 $this->lasterror = $this->error();
                 $this->lasterrno = $this->errno();
 
-				if ($conf->global->SYSLOG_LEVEL < LOG_DEBUG) dol_syslog(get_class($this)."::query SQL Error query: ".$query, LOG_ERR);	// Log of request was not yet done previously
+				if ($conf->global->SYSLOG_LEVEL < LOG_DEBUG) {
+					dol_syslog(get_class($this)."::query SQL Error query: ".$query, LOG_ERR);
+				}
+				// Log of request was not yet done previously
                 dol_syslog(get_class($this)."::query SQL Error message: ".$this->lasterrno." ".$this->lasterror, LOG_ERR);
             }
             $this->lastquery=$query;
@@ -312,8 +328,7 @@ 
         {
             if (! is_object($resultset)) { $resultset=$this->_results; }
             return $resultset->fetch_row();
-        }
-        else
+        } else
         {
             // si le curseur est un booleen on retourne la valeur 0
             return 0;
@@ -362,7 +377,9 @@ 
         // If resultset not provided, we take the last used by connexion
         if (! is_object($resultset)) { $resultset=$this->_results; }
         // Si resultset en est un, on libere la memoire
-        if (is_object($resultset)) $resultset->free_result();
+        if (is_object($resultset)) {
+        	$resultset->free_result();
+        }
     }
 
     /**
@@ -437,8 +454,7 @@ 
         if (! $this->connected) {
             // Si il y a eu echec de connexion, $this->db n'est pas valide pour mysqli_error.
             return 'Not connected. Check setup parameters in conf/conf.php file and your mysql client and server versions';
-        }
-        else {
+        } else {
             return $this->db->error;
         }
     }
@@ -481,8 +497,7 @@ 
             if ($cryptType == 2)
             {
                 $return = 'AES_ENCRYPT('.$return.',\''.$cryptKey.'\')';
-            }
-            else if ($cryptType == 1)
+            } else if ($cryptType == 1)
             {
                 $return = 'DES_ENCRYPT('.$return.',\''.$cryptKey.'\')';
             }
@@ -514,8 +529,7 @@ 
             if ($cryptType == 2)
             {
                 $return = 'AES_DECRYPT('.$value.',\''.$cryptKey.'\')';
-            }
-            else if ($cryptType == 1)
+            } else if ($cryptType == 1)
             {
                 $return = 'DES_DECRYPT('.$value.',\''.$cryptKey.'\')';
             }
@@ -537,8 +551,9 @@ 
         {
             $row=$this->fetch_row($resql);
             return $row[0];
+        } else {
+        	return '?';
         }
-        else return '?';
     }
 
     /**
@@ -554,8 +569,12 @@ 
      */
     function DDLCreateDb($database,$charset='',$collation='',$owner='')
     {
-        if (empty($charset))   $charset=$this->forcecharset;
-        if (empty($collation)) $collation=$this->forcecollate;
+        if (empty($charset)) {
+        	$charset=$this->forcecharset;
+        }
+        if (empty($collation)) {
+        	$collation=$this->forcecollate;
+        }
 
         // ALTER DATABASE dolibarr_db DEFAULT CHARACTER SET latin DEFAULT COLLATE latin1_swedish_ci
 		$sql = "CREATE DATABASE `".$this->escape($database)."`";
@@ -585,7 +604,9 @@ 
         $listtables=array();
 
         $like = '';
-        if ($table) $like = "LIKE '".$table."'";
+        if ($table) {
+        	$like = "LIKE '".$table."'";
+        }
         $sql="SHOW TABLES FROM ".$database." ".$like.";";
         //print $sql;
         $result = $this->query($sql);
@@ -657,8 +678,7 @@ 
 			{
 				if ((preg_match("/null/i",$field_desc['default'])) || (preg_match("/CURRENT_TIMESTAMP/i",$field_desc['default']))) {
 					$sqlfields[$i]  .= " default ".$field_desc['default'];
-				}
-				else {
+				} else {
 					$sqlfields[$i]  .= " default '".$field_desc['default']."'";
 				}
 			}
@@ -670,8 +690,9 @@ 
 			}
             $i++;
         }
-        if($primary_key != "")
-        $pk = "primary key(".$primary_key.")";
+        if($primary_key != "") {
+                $pk = "primary key(".$primary_key.")";
+        }
 
         if(is_array($unique_keys)) {
             $i = 0;
@@ -691,19 +712,23 @@ 
             }
         }
         $sql .= implode(',',$sqlfields);
-        if($primary_key != "")
-        $sql .= ",".$pk;
-        if($unique_keys != "")
-        $sql .= ",".implode(',',$sqluq);
-        if(is_array($keys))
-        $sql .= ",".implode(',',$sqlk);
+        if($primary_key != "") {
+                $sql .= ",".$pk;
+        }
+        if($unique_keys != "") {
+                $sql .= ",".implode(',',$sqluq);
+        }
+        if(is_array($keys)) {
+                $sql .= ",".implode(',',$sqlk);
+        }
         $sql .=") engine=".$type;
 
         dol_syslog($sql,LOG_DEBUG);
-        if(! $this -> query($sql))
-        return -1;
-        else
-        return 1;
+        if(! $this -> query($sql)) {
+                return -1;
+        } else {
+                return 1;
+        }
     }
 
     /**
@@ -737,24 +762,29 @@ 
         // ex. : $field_desc = array('type'=>'int','value'=>'11','null'=>'not null','extra'=> 'auto_increment');
         $sql= "ALTER TABLE ".$table." ADD ".$field_name." ";
         $sql.= $field_desc['type'];
-        if(preg_match("/^[^\s]/i",$field_desc['value']))
-            if (! in_array($field_desc['type'],array('date','datetime')))
+        if(preg_match("/^[^\s]/i",$field_desc['value'])) {
+                    if (! in_array($field_desc['type'],array('date','datetime')))
             {
                 $sql.= "(".$field_desc['value'].")";
+        }
             }
-        if(preg_match("/^[^\s]/i",$field_desc['attribute']))
-        $sql.= " ".$field_desc['attribute'];
-        if(preg_match("/^[^\s]/i",$field_desc['null']))
-        $sql.= " ".$field_desc['null'];
+        if(preg_match("/^[^\s]/i",$field_desc['attribute'])) {
+                $sql.= " ".$field_desc['attribute'];
+        }
+        if(preg_match("/^[^\s]/i",$field_desc['null'])) {
+                $sql.= " ".$field_desc['null'];
+        }
         if(preg_match("/^[^\s]/i",$field_desc['default']))
         {
-            if(preg_match("/null/i",$field_desc['default']))
-            $sql.= " default ".$field_desc['default'];
-            else
-            $sql.= " default '".$field_desc['default']."'";
+            if(preg_match("/null/i",$field_desc['default'])) {
+                        $sql.= " default ".$field_desc['default'];
+            } else {
+                        $sql.= " default '".$field_desc['default']."'";
+            }
+        }
+        if(preg_match("/^[^\s]/i",$field_desc['extra'])) {
+                $sql.= " ".$field_desc['extra'];
         }
-        if(preg_match("/^[^\s]/i",$field_desc['extra']))
-        $sql.= " ".$field_desc['extra'];
         $sql.= " ".$field_position;
 
         dol_syslog(get_class($this)."::DDLAddField ".$sql,LOG_DEBUG);
@@ -786,8 +816,7 @@ 
         	{
         		$sqlbis="UPDATE ".$table." SET ".$field_name." = '".$this->escape($field_desc['default'] ? $field_desc['default'] : '')."' WHERE ".$field_name." IS NULL";
         		$this->query($sqlbis);
-        	}
-        	elseif ($field_desc['type'] == 'tinyint' || $field_desc['type'] == 'int')
+        	} elseif ($field_desc['type'] == 'tinyint' || $field_desc['type'] == 'int')
         	{
         		$sqlbis="UPDATE ".$table." SET ".$field_name." = ".((int) $this->escape($field_desc['default'] ? $field_desc['default'] : 0))." WHERE ".$field_name." IS NULL";
         		$this->query($sqlbis);
@@ -798,15 +827,20 @@ 
 
         if ($field_desc['default'] != '')
         {
-			if ($field_desc['type'] == 'double' || $field_desc['type'] == 'tinyint' || $field_desc['type'] == 'int') $sql.=" DEFAULT ".$this->escape($field_desc['default']);
-        	elseif ($field_desc['type'] == 'text') $sql.=" DEFAULT '".$this->escape($field_desc['default'])."'";							// Default not supported on text fields
+			if ($field_desc['type'] == 'double' || $field_desc['type'] == 'tinyint' || $field_desc['type'] == 'int') {
+				$sql.=" DEFAULT ".$this->escape($field_desc['default']);
+			} elseif ($field_desc['type'] == 'text') {
+        		$sql.=" DEFAULT '".$this->escape($field_desc['default'])."'";
+        	}
+        	// Default not supported on text fields
         }
 
         dol_syslog(get_class($this)."::DDLUpdateField ".$sql,LOG_DEBUG);
-        if (! $this->query($sql))
-        return -1;
-        else
-        return 1;
+        if (! $this->query($sql)) {
+                return -1;
+        } else {
+                return 1;
+        }
     }
 
     /**
@@ -847,8 +881,7 @@ 
             if ($this->lasterrno != 'DB_ERROR_USER_ALREADY_EXISTS')
             {
             	return -1;
-            }
-            else
+            } else
 			{
             	// If user already exists, we continue to set permissions
             	dol_syslog(get_class($this)."::DDLCreateUser sql=".$sql, LOG_WARNING);
@@ -1014,11 +1047,15 @@ 
         $result=array();
 
         $sql='SHOW VARIABLES';
-        if ($filter) $sql.=" LIKE '".$this->escape($filter)."'";
+        if ($filter) {
+        	$sql.=" LIKE '".$this->escape($filter)."'";
+        }
         $resql=$this->query($sql);
         if ($resql)
         {
-        	while($obj=$this->fetch_object($resql)) $result[$obj->Variable_name]=$obj->Value;
+        	while($obj=$this->fetch_object($resql)) {
+        		$result[$obj->Variable_name]=$obj->Value;
+        	}
         }
 
         return $result;
@@ -1035,11 +1072,15 @@ 
         $result=array();
 
         $sql='SHOW STATUS';
-        if ($filter) $sql.=" LIKE '".$this->escape($filter)."'";
+        if ($filter) {
+        	$sql.=" LIKE '".$this->escape($filter)."'";
+        }
         $resql=$this->query($sql);
         if ($resql)
         {
-            while($obj=$this->fetch_object($resql)) $result[$obj->Variable_name]=$obj->Value;
+            while($obj=$this->fetch_object($resql)) {
+            	$result[$obj->Variable_name]=$obj->Value;
+            }
         }
 
         return $result;

htdocs/core/db/pgsql.class.php

Doc Comments +2 added lines, -2 removed lines

@@ -464,7 +464,7 @@ 
 	 * @param	string	$query			SQL query string
 	 * @param	int		$usesavepoint	0=Default mode, 1=Run a savepoint before and a rollback to savepoint if error (this allow to have some request with errors inside global transactions).
      * @param   string	$type           Type of SQL order ('ddl' for insert, update, select, delete or 'dml' for create, alter...)
-	 * @return	false|resource			Resultset of answer
+	 * @return	resource|null			Resultset of answer
 	 */
 	function query($query,$usesavepoint=0,$type='auto')
 	{
@@ -790,7 +790,7 @@ 
 	 *	Decrypt sensitive data in database
 	 *
 	 *	@param	int		$value			Value to decrypt
-	 * 	@return	string					Decrypted value if used
+	 * 	@return	integer					Decrypted value if used
 	 */
 	function decrypt($value)
 	{

Braces +155 added lines, -89 removed lines

@@ -67,8 +67,12 @@ 
 		global $conf,$langs;
 
         // Note that having "static" property for "$forcecharset" and "$forcecollate" will make error here in strict mode, so they are not static
-		if (! empty($conf->db->character_set)) $this->forcecharset=$conf->db->character_set;
-		if (! empty($conf->db->dolibarr_main_db_collation))	$this->forcecollate=$conf->db->dolibarr_main_db_collation;
+		if (! empty($conf->db->character_set)) {
+			$this->forcecharset=$conf->db->character_set;
+		}
+		if (! empty($conf->db->dolibarr_main_db_collation)) {
+			$this->forcecollate=$conf->db->dolibarr_main_db_collation;
+		}
 
 		$this->database_user=$user;
         $this->database_host=$host;
@@ -104,8 +108,7 @@ 
 		{
 			$this->connected = true;
 			$this->ok = true;
-		}
-		else
+		} else
 		{
 			// host, login ou password incorrect
 			$this->connected = false;
@@ -122,8 +125,7 @@ 
 				$this->database_selected = true;
 				$this->database_name = $name;
 				$this->ok = true;
-			}
-			else
+			} else
 			{
 				$this->database_selected = false;
 				$this->database_name = '';
@@ -131,8 +133,7 @@ 
 				$this->error=$this->error();
 				dol_syslog(get_class($this)."::DoliDBPgsql : Erreur Select_db ".$this->error,LOG_ERR);
 			}
-		}
-		else
+		} else
 		{
 			// Pas de selection de base demandee, ok ou ko
 			$this->database_selected = false;
@@ -172,9 +173,13 @@ 
 
 		    if ($type == 'auto')
 		    {
-              if (preg_match('/ALTER TABLE/i',$line)) $type='dml';
-              else if (preg_match('/CREATE TABLE/i',$line)) $type='dml';
-              else if (preg_match('/DROP TABLE/i',$line)) $type='dml';
+              if (preg_match('/ALTER TABLE/i',$line)) {
+              	$type='dml';
+              } else if (preg_match('/CREATE TABLE/i',$line)) {
+              	$type='dml';
+              } else if (preg_match('/DROP TABLE/i',$line)) {
+              	$type='dml';
+              }
 		    }
 
     		$line=preg_replace('/ as signed\)/i',' as integer)',$line);
@@ -313,10 +318,12 @@ 
 			// DELETE FROM tabletodelete USING tabletodelete, othertable -> DELETE FROM tabletodelete USING othertable
 			if (preg_match('/DELETE FROM ([a-z_]+) USING ([a-z_]+), ([a-z_]+)/i',$line,$reg))
 			{
-				if ($reg[1] == $reg[2])	// If same table, we remove second one
+				if ($reg[1] == $reg[2]) {
+					// If same table, we remove second one
 				{
 					$line=preg_replace('/DELETE FROM ([a-z_]+) USING ([a-z_]+), ([a-z_]+)/i','DELETE FROM \\1 USING \\3', $line);
 				}
+				}
 			}
 
 			// Remove () in the tables in FROM if 1 table
@@ -343,7 +350,9 @@ 
 			// By default we do not (should be already done by db->escape function if required
 			// except for sql insert in data file that are mysql escaped so we removed them to
 			// be compatible with standard_conforming_strings=on that considers \ as ordinary character).
-			if ($unescapeslashquot) $line=preg_replace("/\\\'/","''",$line);
+			if ($unescapeslashquot) {
+				$line=preg_replace("/\\\'/","''",$line);
+			}
 
 			//print "type=".$type." newline=".$line."<br>\n";
 		}
@@ -361,8 +370,11 @@ 
 	 */
 	function select_db($database)
 	{
-		if ($database == $this->database_name) return true;
-		else return false;
+		if ($database == $this->database_name) {
+			return true;
+		} else {
+			return false;
+		}
 	}
 
 	/**
@@ -389,7 +401,10 @@ 
 		$name = str_replace(array("\\", "'"), array("\\\\", "\\'"), $name);
 		$port = str_replace(array("\\", "'"), array("\\\\", "\\'"), $port);
 
-		if (! $name) $name="postgres";    // When try to connect using admin user
+		if (! $name) {
+			$name="postgres";
+		}
+		// When try to connect using admin user
 
 		// try first Unix domain socket (local)
 		if ((! empty($host) && $host == "socket") && ! defined('NOLOCALSOCKETPGCONNECT'))
@@ -401,8 +416,12 @@ 
 		// if local connection failed or not requested, use TCP/IP
 		if (! $this->db)
 		{
-		    if (! $host) $host = "localhost";
-			if (! $port) $port = 5432;
+		    if (! $host) {
+		    	$host = "localhost";
+		    }
+			if (! $port) {
+				$port = 5432;
+			}
 
 			$con_string = "host='".$host."' port='".$port."' dbname='".$name."' user='".$login."' password='".$passwd."'";
 			$this->db = @pg_connect($con_string);
@@ -455,7 +474,9 @@ 
     {
         if ($this->db)
         {
-          if ($this->transaction_opened > 0) dol_syslog(get_class($this)."::close Closing a connection with an opened transaction depth=".$this->transaction_opened,LOG_ERR);
+          if ($this->transaction_opened > 0) {
+          	dol_syslog(get_class($this)."::close Closing a connection with an opened transaction depth=".$this->transaction_opened,LOG_ERR);
+          }
           $this->connected=false;
           return pg_close($this->db);
         }
@@ -490,8 +511,9 @@ 
 				{
 					$query=preg_replace('/([^\'])([0-9][0-9][0-9][0-9]-[0-9][0-9]-[0-9][0-9] [0-9][0-9]:[0-9][0-9]:[0-9][0-9])/','\\1\'\\2\'',$query);
 					dol_syslog("Warning: Bad formed request converted into ".$query,LOG_WARNING);
+				} else {
+					$loop=false;
 				}
-				else $loop=false;
 			}
 		}
 
@@ -500,30 +522,39 @@ 
 			@pg_query($this->db, 'SAVEPOINT mysavepoint');
 		}
 
-		if (! in_array($query,array('BEGIN','COMMIT','ROLLBACK'))) dol_syslog('sql='.$query, LOG_DEBUG);
+		if (! in_array($query,array('BEGIN','COMMIT','ROLLBACK'))) {
+			dol_syslog('sql='.$query, LOG_DEBUG);
+		}
 
 		$ret = @pg_query($this->db, $query);
 
 		//print $query;
-		if (! preg_match("/^COMMIT/i",$query) && ! preg_match("/^ROLLBACK/i",$query)) // Si requete utilisateur, on la sauvegarde ainsi que son resultset
+		if (! preg_match("/^COMMIT/i",$query) && ! preg_match("/^ROLLBACK/i",$query)) {
+			// Si requete utilisateur, on la sauvegarde ainsi que son resultset
 		{
 			if (! $ret)
 			{
 			    if ($this->errno() != 'DB_ERROR_25P02')	// Do not overwrite errors if this is a consecutive error
 			    {
     				$this->lastqueryerror = $query;
+		}
     				$this->lasterror = $this->error();
     				$this->lasterrno = $this->errno();
 
-    				if ($conf->global->SYSLOG_LEVEL < LOG_DEBUG) dol_syslog(get_class($this)."::query SQL Error query: ".$query, LOG_ERR);	// Log of request was not yet done previously
+    				if ($conf->global->SYSLOG_LEVEL < LOG_DEBUG) {
+    					dol_syslog(get_class($this)."::query SQL Error query: ".$query, LOG_ERR);
+    				}
+    				// Log of request was not yet done previously
 					dol_syslog(get_class($this)."::query SQL Error message: ".$this->lasterror." (".$this->lasterrno.")", LOG_ERR);
 					dol_syslog(get_class($this)."::query SQL Error usesavepoint = ".$usesavepoint, LOG_ERR);
 			    }
 
-				if ($usesavepoint && $this->transaction_opened)	// Warning, after that errno will be erased
+				if ($usesavepoint && $this->transaction_opened) {
+					// Warning, after that errno will be erased
 				{
 					@pg_query($this->db, 'ROLLBACK TO SAVEPOINT mysavepoint');
 				}
+				}
 			}
 			$this->lastquery=$query;
 			$this->_results = $ret;
@@ -613,7 +644,9 @@ 
         // If resultset not provided, we take the last used by connexion
 		if (! is_resource($resultset)) { $resultset=$this->_results; }
 		// Si resultset en est un, on libere la memoire
-		if (is_resource($resultset)) pg_free_result($resultset);
+		if (is_resource($resultset)) {
+			pg_free_result($resultset);
+		}
 	}
 
 
@@ -627,10 +660,17 @@ 
 	function plimit($limit=0,$offset=0)
 	{
 		global $conf;
-        if (empty($limit)) return "";
-		if ($limit < 0) $limit=$conf->liste_limit;
-		if ($offset > 0) return " LIMIT ".$limit." OFFSET ".$offset." ";
-		else return " LIMIT $limit ";
+        if (empty($limit)) {
+        	return "";
+        }
+		if ($limit < 0) {
+			$limit=$conf->liste_limit;
+		}
+		if ($offset > 0) {
+			return " LIMIT ".$limit." OFFSET ".$offset." ";
+		} else {
+			return " LIMIT $limit ";
+		}
 	}
 
 
@@ -680,8 +720,7 @@ 
 		if (! $this->connected) {
 			// Si il y a eu echec de connexion, $this->db n'est pas valide.
 			return 'DB_ERROR_FAILED_TO_CONNECT';
-		}
-		else {
+		} else {
 			// Constants to convert error code to a generic Dolibarr error code
 			$errorcode_map = array(
 			1004 => 'DB_ERROR_CANNOT_CREATE',
@@ -836,8 +875,12 @@ 
 	 */
 	function DDLCreateDb($database,$charset='',$collation='',$owner='')
 	{
-	    if (empty($charset))   $charset=$this->forcecharset;
-		if (empty($collation)) $collation=$this->forcecollate;
+	    if (empty($charset)) {
+	    	$charset=$this->forcecharset;
+	    }
+		if (empty($collation)) {
+			$collation=$this->forcecollate;
+		}
 
 		// Test charset match LC_TYPE (pgsql error otherwise)
 		//print $charset.' '.setlocale(LC_CTYPE,'0'); exit;
@@ -860,7 +903,9 @@ 
 		$listtables=array();
 
 		$like = '';
-		if ($table) $like = " AND table_name LIKE '".$table."'";
+		if ($table) {
+			$like = " AND table_name LIKE '".$table."'";
+		}
 		$result = pg_query($this->db, "SELECT table_name FROM information_schema.tables WHERE table_schema = 'public'".$like." ORDER BY table_name");
         if ($result)
         {
@@ -936,26 +981,27 @@ 
 		{
 			$sqlfields[$i] = $field_name." ";
 			$sqlfields[$i]  .= $field_desc['type'];
-			if( preg_match("/^[^\s]/i",$field_desc['value']))
-			$sqlfields[$i]  .= "(".$field_desc['value'].")";
-			else if( preg_match("/^[^\s]/i",$field_desc['attribute']))
-			$sqlfields[$i]  .= " ".$field_desc['attribute'];
-			else if( preg_match("/^[^\s]/i",$field_desc['default']))
+			if( preg_match("/^[^\s]/i",$field_desc['value'])) {
+						$sqlfields[$i]  .= "(".$field_desc['value'].")";
+			} else if( preg_match("/^[^\s]/i",$field_desc['attribute'])) {
+						$sqlfields[$i]  .= " ".$field_desc['attribute'];
+			} else if( preg_match("/^[^\s]/i",$field_desc['default']))
 			{
-				if(preg_match("/null/i",$field_desc['default']))
-				$sqlfields[$i]  .= " default ".$field_desc['default'];
-				else
-				$sqlfields[$i]  .= " default '".$field_desc['default']."'";
+				if(preg_match("/null/i",$field_desc['default'])) {
+								$sqlfields[$i]  .= " default ".$field_desc['default'];
+				} else {
+								$sqlfields[$i]  .= " default '".$field_desc['default']."'";
+				}
+			} else if( preg_match("/^[^\s]/i",$field_desc['null'])) {
+						$sqlfields[$i]  .= " ".$field_desc['null'];
+			} else if( preg_match("/^[^\s]/i",$field_desc['extra'])) {
+						$sqlfields[$i]  .= " ".$field_desc['extra'];
 			}
-			else if( preg_match("/^[^\s]/i",$field_desc['null']))
-			$sqlfields[$i]  .= " ".$field_desc['null'];
-
-			else if( preg_match("/^[^\s]/i",$field_desc['extra']))
-			$sqlfields[$i]  .= " ".$field_desc['extra'];
 			$i++;
 		}
-		if($primary_key != "")
-		$pk = "primary key(".$primary_key.")";
+		if($primary_key != "") {
+				$pk = "primary key(".$primary_key.")";
+		}
 
 		if(is_array($unique_keys))
 		{
@@ -976,19 +1022,23 @@ 
 			}
 		}
 		$sql .= implode(',',$sqlfields);
-		if($primary_key != "")
-		$sql .= ",".$pk;
-		if(is_array($unique_keys))
-		$sql .= ",".implode(',',$sqluq);
-		if(is_array($keys))
-		$sql .= ",".implode(',',$sqlk);
+		if($primary_key != "") {
+				$sql .= ",".$pk;
+		}
+		if(is_array($unique_keys)) {
+				$sql .= ",".implode(',',$sqluq);
+		}
+		if(is_array($keys)) {
+				$sql .= ",".implode(',',$sqlk);
+		}
 		$sql .=") type=".$type;
 
 		dol_syslog($sql,LOG_DEBUG);
-		if(! $this->query($sql))
-		return -1;
-		else
-		return 1;
+		if(! $this->query($sql)) {
+				return -1;
+		} else {
+				return 1;
+		}
 	}
 
 	/**
@@ -1026,7 +1076,9 @@ 
 	{
 		$sql ="SELECT attname FROM pg_attribute, pg_type WHERE typname = '".$table."' AND attrelid = typrelid";
 		$sql.=" AND attname NOT IN ('cmin', 'cmax', 'ctid', 'oid', 'tableoid', 'xmin', 'xmax')";
-		if ($field) $sql.= " AND attname = '".$field."'";
+		if ($field) {
+			$sql.= " AND attname = '".$field."'";
+		}
 
 		dol_syslog($sql,LOG_DEBUG);
 		$this->_results = $this->query($sql);
@@ -1048,27 +1100,33 @@ 
 		// ex. : $field_desc = array('type'=>'int','value'=>'11','null'=>'not null','extra'=> 'auto_increment');
 		$sql= "ALTER TABLE ".$table." ADD ".$field_name." ";
 		$sql .= $field_desc['type'];
-		if(preg_match("/^[^\s]/i",$field_desc['value']))
-		    if (! in_array($field_desc['type'],array('int','date','datetime')))
+		if(preg_match("/^[^\s]/i",$field_desc['value'])) {
+				    if (! in_array($field_desc['type'],array('int','date','datetime')))
 		    {
 		        $sql.= "(".$field_desc['value'].")";
+		}
 		    }
-		if (preg_match("/^[^\s]/i",$field_desc['attribute']))
-		$sql .= " ".$field_desc['attribute'];
-		if (preg_match("/^[^\s]/i",$field_desc['null']))
-		$sql .= " ".$field_desc['null'];
-		if (preg_match("/^[^\s]/i",$field_desc['default']))
-		if (preg_match("/null/i",$field_desc['default']))
+		if (preg_match("/^[^\s]/i",$field_desc['attribute'])) {
+				$sql .= " ".$field_desc['attribute'];
+		}
+		if (preg_match("/^[^\s]/i",$field_desc['null'])) {
+				$sql .= " ".$field_desc['null'];
+		}
+		if (preg_match("/^[^\s]/i",$field_desc['default'])) {
+				if (preg_match("/null/i",$field_desc['default']))
 		$sql .= " default ".$field_desc['default'];
-		else
-		$sql .= " default '".$field_desc['default']."'";
-		if (preg_match("/^[^\s]/i",$field_desc['extra']))
-		$sql .= " ".$field_desc['extra'];
+		} else {
+				$sql .= " default '".$field_desc['default']."'";
+		}
+		if (preg_match("/^[^\s]/i",$field_desc['extra'])) {
+				$sql .= " ".$field_desc['extra'];
+		}
 		$sql .= " ".$field_position;
 
 		dol_syslog($sql,LOG_DEBUG);
-		if(! $this -> query($sql))
-			return -1;
+		if(! $this -> query($sql)) {
+					return -1;
+		}
 		return 1;
 	}
 
@@ -1095,8 +1153,7 @@ 
         	{
         		$sqlbis="UPDATE ".$table." SET ".$field_name." = '".$this->escape($field_desc['default'] ? $field_desc['default'] : '')."' WHERE ".$field_name." IS NULL";
         		$this->query($sqlbis);
-        	}
-        	elseif ($field_desc['type'] == 'tinyint' || $field_desc['type'] == 'int')
+        	} elseif ($field_desc['type'] == 'tinyint' || $field_desc['type'] == 'int')
         	{
         		$sqlbis="UPDATE ".$table." SET ".$field_name." = ".((int) $this->escape($field_desc['default'] ? $field_desc['default'] : 0))." WHERE ".$field_name." IS NULL";
         		$this->query($sqlbis);
@@ -1105,13 +1162,18 @@ 
 
 		if ($field_desc['default'] != '')
 		{
-			if ($field_desc['type'] == 'double' || $field_desc['type'] == 'tinyint' || $field_desc['type'] == 'int') $sql.=" DEFAULT ".$this->escape($field_desc['default']);
-        	elseif ($field_desc['type'] == 'text') $sql.=" DEFAULT '".$this->escape($field_desc['default'])."'";							// Default not supported on text fields
+			if ($field_desc['type'] == 'double' || $field_desc['type'] == 'tinyint' || $field_desc['type'] == 'int') {
+				$sql.=" DEFAULT ".$this->escape($field_desc['default']);
+			} elseif ($field_desc['type'] == 'text') {
+        		$sql.=" DEFAULT '".$this->escape($field_desc['default'])."'";
+        	}
+        	// Default not supported on text fields
 		}
 
 		dol_syslog($sql,LOG_DEBUG);
-		if (! $this->query($sql))
-			return -1;
+		if (! $this->query($sql)) {
+					return -1;
+		}
 		return 1;
 	}
 
@@ -1146,8 +1208,9 @@ 
 		{
             $liste=$this->fetch_array($resql);
 		    return $liste['server_encoding'];
+		} else {
+			return '';
 		}
-		else return '';
 	}
 
 	/**
@@ -1187,8 +1250,9 @@ 
 		{
 		    $liste=$this->fetch_array($resql);
 			return $liste['lc_collate'];
+		} else {
+			return '';
 		}
-		else return '';
 	}
 
 	/**
@@ -1227,8 +1291,7 @@ 
 		if (file_exists('/usr/bin/pg_dump'))
 		{
 		    $fullpathofdump='/usr/bin/pg_dump';
-		}
-		else
+		} else
 		{
             // TODO L'utilisateur de la base doit etre un superadmin pour lancer cette commande
 		    $resql=$this->query('SHOW data_directory');
@@ -1258,8 +1321,7 @@ 
         if (file_exists('/usr/bin/'.$tool))
         {
             $fullpathofdump='/usr/bin/'.$tool;
-        }
-        else
+        } else
         {
             // TODO L'utilisateur de la base doit etre un superadmin pour lancer cette commande
             $resql=$this->query('SHOW data_directory');
@@ -1285,11 +1347,15 @@ 
 		$result=array();
 
 		$resql='select name,setting from pg_settings';
-		if ($filter) $resql.=" WHERE name = '".$this->escape($filter)."'";
+		if ($filter) {
+			$resql.=" WHERE name = '".$this->escape($filter)."'";
+		}
 		$resql=$this->query($resql);
 		if ($resql)
 		{
-			while ($obj=$this->fetch_object($resql)) $result[$obj->name]=$obj->setting;
+			while ($obj=$this->fetch_object($resql)) {
+				$result[$obj->name]=$obj->setting;
+			}
 		}
 
 		return $result;

htdocs/core/db/sqlite3.class.php

Doc Comments +1 added lines, -1 removed lines

@@ -1449,7 +1449,7 @@
      *
      * @param int	$daynr							???
      * @param bool	$sunday_first_day_of_week		???
-     * @return int
+     * @return double
      */
     private static function calc_weekday($daynr, $sunday_first_day_of_week) {
       $ret = floor(($daynr + 5 + ($sunday_first_day_of_week ? 1 : 0)) % 7);

Braces +112 added lines, -80 removed lines

@@ -62,8 +62,12 @@ 
         global $conf;
 
         // Note that having "static" property for "$forcecharset" and "$forcecollate" will make error here in strict mode, so they are not static
-        if (! empty($conf->db->character_set)) $this->forcecharset=$conf->db->character_set;
-        if (! empty($conf->db->dolibarr_main_db_collation)) $this->forcecollate=$conf->db->dolibarr_main_db_collation;
+        if (! empty($conf->db->character_set)) {
+        	$this->forcecharset=$conf->db->character_set;
+        }
+        if (! empty($conf->db->dolibarr_main_db_collation)) {
+        	$this->forcecollate=$conf->db->dolibarr_main_db_collation;
+        }
 
         $this->database_user=$user;
         $this->database_host=$host;
@@ -111,8 +115,7 @@ 
             $this->addCustomFunction('WEEKDAY');
             $this->addCustomFunction('date_format');
             //$this->db->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_EXCEPTION);
-        }
-        else
+        } else
         {
             // host, login ou password incorrect
             $this->connected = false;
@@ -149,9 +152,13 @@ 
         {
             if ($type == 'auto')
             {
-              if (preg_match('/ALTER TABLE/i',$line)) $type='dml';
-              else if (preg_match('/CREATE TABLE/i',$line)) $type='dml';
-              else if (preg_match('/DROP TABLE/i',$line)) $type='dml';
+              if (preg_match('/ALTER TABLE/i',$line)) {
+              	$type='dml';
+              } else if (preg_match('/CREATE TABLE/i',$line)) {
+              	$type='dml';
+              } else if (preg_match('/DROP TABLE/i',$line)) {
+              	$type='dml';
+              }
             }
 
             if ($type == 'dml')
@@ -272,9 +279,11 @@ 
             // DELETE FROM tabletodelete USING tabletodelete, othertable -> DELETE FROM tabletodelete USING othertable
             if (preg_match('/DELETE FROM ([a-z_]+) USING ([a-z_]+), ([a-z_]+)/i',$line,$reg))
             {
-				if ($reg[1] == $reg[2])	// If same table, we remove second one
+				if ($reg[1] == $reg[2]) {
+					// If same table, we remove second one
                 {
                     $line=preg_replace('/DELETE FROM ([a-z_]+) USING ([a-z_]+), ([a-z_]+)/i','DELETE FROM \\1 USING \\3', $line);
+				}
                 }
             }
 
@@ -329,7 +338,9 @@ 
         dol_syslog(get_class($this)."::connect name=".$name,LOG_DEBUG);
 
         $dir=$main_data_dir;
-        if (empty($dir)) $dir=DOL_DATA_ROOT;
+        if (empty($dir)) {
+        	$dir=DOL_DATA_ROOT;
+        }
         // With sqlite, port must be in connect parameters
         //if (! $newport) $newport=3306;
         $database_name = $dir.'/database_'.$name.'.sdb';
@@ -338,8 +349,7 @@ 
             //$this->db = new PDO("sqlite:".$dir.'/database_'.$name.'.sdb');
 			$this->db = new SQLite3($database_name);
             //$this->db->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_EXCEPTION);
-        }
-        catch(Exception $e)
+        } catch(Exception $e)
         {
             $this->error=  self::LABEL.' '.$e->getMessage().' current dir='.$database_name;
             return '';
@@ -382,7 +392,9 @@ 
     {
         if ($this->db)
         {
-            if ($this->transaction_opened > 0) dol_syslog(get_class($this)."::close Closing a connection with an opened transaction depth=".$this->transaction_opened,LOG_ERR);
+            if ($this->transaction_opened > 0) {
+            	dol_syslog(get_class($this)."::close Closing a connection with an opened transaction depth=".$this->transaction_opened,LOG_ERR);
+            }
             $this->connected=false;
             $this->db->close();
             unset($this->db);    // Clean this->db
@@ -458,8 +470,7 @@ 
             if ($ret) {
                 $ret->queryString = $query;
             }
-        }
-        catch(Exception $e)
+        } catch(Exception $e)
         {
             $this->error=$this->db->lastErrorMsg();
         }
@@ -537,8 +548,7 @@ 
         {
             if (! is_object($resultset)) { $resultset=$this->_results; }
             return $resultset->fetchArray(SQLITE3_NUM);
-        }
-        else
+        } else
         {
             // si le curseur est un booleen on retourne la valeur 0
             return false;
@@ -597,7 +607,9 @@ 
         // If resultset not provided, we take the last used by connexion
         if (! is_object($resultset)) { $resultset=$this->_results; }
         // Si resultset en est un, on libere la memoire
-        if ($resultset && is_object($resultset)) $resultset->finalize();
+        if ($resultset && is_object($resultset)) {
+        	$resultset->finalize();
+        }
     }
 
     /**
@@ -621,8 +633,7 @@ 
         if (! $this->connected) {
             // Si il y a eu echec de connexion, $this->db n'est pas valide.
             return 'DB_ERROR_FAILED_TO_CONNECT';
-        }
-        else {
+        } else {
             // Constants to convert error code to a generic Dolibarr error code
             /*$errorcode_map = array(
             1004 => 'DB_ERROR_CANNOT_CREATE',
@@ -659,14 +670,21 @@ 
             $errno=$this->db->lastErrorCode();
 			if ($errno=='HY000' || $errno == 0)
             {
-                if (preg_match('/table.*already exists/i',$this->error))     return 'DB_ERROR_TABLE_ALREADY_EXISTS';
-                elseif (preg_match('/index.*already exists/i',$this->error)) return 'DB_ERROR_KEY_NAME_ALREADY_EXISTS';
-                elseif (preg_match('/syntax error/i',$this->error))          return 'DB_ERROR_SYNTAX';
+                if (preg_match('/table.*already exists/i',$this->error)) {
+                	return 'DB_ERROR_TABLE_ALREADY_EXISTS';
+                } elseif (preg_match('/index.*already exists/i',$this->error)) {
+                	return 'DB_ERROR_KEY_NAME_ALREADY_EXISTS';
+                } elseif (preg_match('/syntax error/i',$this->error)) {
+                	return 'DB_ERROR_SYNTAX';
+                }
             }
             if ($errno=='23000')
             {
-                if (preg_match('/column.* not unique/i',$this->error))       return 'DB_ERROR_RECORD_ALREADY_EXISTS';
-                elseif (preg_match('/PRIMARY KEY must be unique/i',$this->error)) return 'DB_ERROR_RECORD_ALREADY_EXISTS';
+                if (preg_match('/column.* not unique/i',$this->error)) {
+                	return 'DB_ERROR_RECORD_ALREADY_EXISTS';
+                } elseif (preg_match('/PRIMARY KEY must be unique/i',$this->error)) {
+                	return 'DB_ERROR_RECORD_ALREADY_EXISTS';
+                }
             }
             if ($errno > 1) {
                 // TODO Voir la liste des messages d'erreur
@@ -686,8 +704,7 @@ 
         if (! $this->connected) {
             // Si il y a eu echec de connexion, $this->db n'est pas valide pour sqlite_error.
             return 'Not connected. Check setup parameters in conf/conf.php file and your sqlite version';
-        }
-        else {
+        } else {
             return $this->error;
         }
     }
@@ -729,8 +746,7 @@ 
             if ($cryptType == 2)
             {
                 $return = 'AES_ENCRYPT('.$return.',\''.$cryptKey.'\')';
-            }
-            else if ($cryptType == 1)
+            } else if ($cryptType == 1)
             {
                 $return = 'DES_ENCRYPT('.$return.',\''.$cryptKey.'\')';
             }
@@ -762,8 +778,7 @@ 
             if ($cryptType == 2)
             {
                 $return = 'AES_DECRYPT('.$value.',\''.$cryptKey.'\')';
-            }
-            else if ($cryptType == 1)
+            } else if ($cryptType == 1)
             {
                 $return = 'DES_DECRYPT('.$value.',\''.$cryptKey.'\')';
             }
@@ -797,8 +812,12 @@ 
      */
     function DDLCreateDb($database,$charset='',$collation='',$owner='')
     {
-        if (empty($charset))   $charset=$this->forcecharset;
-        if (empty($collation)) $collation=$this->forcecollate;
+        if (empty($charset)) {
+        	$charset=$this->forcecharset;
+        }
+        if (empty($collation)) {
+        	$collation=$this->forcecollate;
+        }
 
         // ALTER DATABASE dolibarr_db DEFAULT CHARACTER SET latin DEFAULT COLLATE latin1_swedish_ci
         $sql = 'CREATE DATABASE '.$database;
@@ -828,7 +847,9 @@ 
         $listtables=array();
 
         $like = '';
-        if ($table) $like = "LIKE '".$table."'";
+        if ($table) {
+        	$like = "LIKE '".$table."'";
+        }
         $sql="SHOW TABLES FROM ".$database." ".$like.";";
         //print $sql;
         $result = $this->query($sql);
@@ -891,26 +912,27 @@ 
         {
             $sqlfields[$i] = $field_name." ";
             $sqlfields[$i]  .= $field_desc['type'];
-            if( preg_match("/^[^\s]/i",$field_desc['value']))
-            $sqlfields[$i]  .= "(".$field_desc['value'].")";
-            else if( preg_match("/^[^\s]/i",$field_desc['attribute']))
-            $sqlfields[$i]  .= " ".$field_desc['attribute'];
-            else if( preg_match("/^[^\s]/i",$field_desc['default']))
+            if( preg_match("/^[^\s]/i",$field_desc['value'])) {
+                        $sqlfields[$i]  .= "(".$field_desc['value'].")";
+            } else if( preg_match("/^[^\s]/i",$field_desc['attribute'])) {
+                        $sqlfields[$i]  .= " ".$field_desc['attribute'];
+            } else if( preg_match("/^[^\s]/i",$field_desc['default']))
             {
-                if(preg_match("/null/i",$field_desc['default']))
-                $sqlfields[$i]  .= " default ".$field_desc['default'];
-                else
-                $sqlfields[$i]  .= " default '".$field_desc['default']."'";
+                if(preg_match("/null/i",$field_desc['default'])) {
+                                $sqlfields[$i]  .= " default ".$field_desc['default'];
+                } else {
+                                $sqlfields[$i]  .= " default '".$field_desc['default']."'";
+                }
+            } else if( preg_match("/^[^\s]/i",$field_desc['null'])) {
+                        $sqlfields[$i]  .= " ".$field_desc['null'];
+            } else if( preg_match("/^[^\s]/i",$field_desc['extra'])) {
+                        $sqlfields[$i]  .= " ".$field_desc['extra'];
             }
-            else if( preg_match("/^[^\s]/i",$field_desc['null']))
-            $sqlfields[$i]  .= " ".$field_desc['null'];
-
-            else if( preg_match("/^[^\s]/i",$field_desc['extra']))
-            $sqlfields[$i]  .= " ".$field_desc['extra'];
             $i++;
         }
-        if($primary_key != "")
-        $pk = "primary key(".$primary_key.")";
+        if($primary_key != "") {
+                $pk = "primary key(".$primary_key.")";
+        }
 
         if(is_array($unique_keys))
         {
@@ -931,17 +953,21 @@ 
             }
         }
         $sql .= implode(',',$sqlfields);
-        if($primary_key != "")
-        $sql .= ",".$pk;
-        if(is_array($unique_keys))
-        $sql .= ",".implode(',',$sqluq);
-        if(is_array($keys))
-        $sql .= ",".implode(',',$sqlk);
+        if($primary_key != "") {
+                $sql .= ",".$pk;
+        }
+        if(is_array($unique_keys)) {
+                $sql .= ",".implode(',',$sqluq);
+        }
+        if(is_array($keys)) {
+                $sql .= ",".implode(',',$sqlk);
+        }
         $sql .=") type=".$type;
 
         dol_syslog($sql,LOG_DEBUG);
-        if(! $this -> query($sql))
-            return -1;
+        if(! $this -> query($sql)) {
+                    return -1;
+        }
         return 1;
     }
 
@@ -976,24 +1002,29 @@ 
         // ex. : $field_desc = array('type'=>'int','value'=>'11','null'=>'not null','extra'=> 'auto_increment');
         $sql= "ALTER TABLE ".$table." ADD ".$field_name." ";
         $sql.= $field_desc['type'];
-        if(preg_match("/^[^\s]/i",$field_desc['value']))
-        if (! in_array($field_desc['type'],array('date','datetime')))
+        if(preg_match("/^[^\s]/i",$field_desc['value'])) {
+                if (! in_array($field_desc['type'],array('date','datetime')))
         {
             $sql.= "(".$field_desc['value'].")";
         }
-        if(preg_match("/^[^\s]/i",$field_desc['attribute']))
-        $sql.= " ".$field_desc['attribute'];
-        if(preg_match("/^[^\s]/i",$field_desc['null']))
-        $sql.= " ".$field_desc['null'];
+        }
+        if(preg_match("/^[^\s]/i",$field_desc['attribute'])) {
+                $sql.= " ".$field_desc['attribute'];
+        }
+        if(preg_match("/^[^\s]/i",$field_desc['null'])) {
+                $sql.= " ".$field_desc['null'];
+        }
         if(preg_match("/^[^\s]/i",$field_desc['default']))
         {
-            if(preg_match("/null/i",$field_desc['default']))
-            $sql.= " default ".$field_desc['default'];
-            else
-            $sql.= " default '".$field_desc['default']."'";
+            if(preg_match("/null/i",$field_desc['default'])) {
+                        $sql.= " default ".$field_desc['default'];
+            } else {
+                        $sql.= " default '".$field_desc['default']."'";
+            }
+        }
+        if(preg_match("/^[^\s]/i",$field_desc['extra'])) {
+                $sql.= " ".$field_desc['extra'];
         }
-        if(preg_match("/^[^\s]/i",$field_desc['extra']))
-        $sql.= " ".$field_desc['extra'];
         $sql.= " ".$field_position;
 
         dol_syslog(get_class($this)."::DDLAddField ".$sql,LOG_DEBUG);
@@ -1021,8 +1052,9 @@ 
         }
 
         dol_syslog(get_class($this)."::DDLUpdateField ".$sql,LOG_DEBUG);
-        if (! $this->query($sql))
-            return -1;
+        if (! $this->query($sql)) {
+                    return -1;
+        }
         return 1;
     }
 
@@ -1220,8 +1252,7 @@ 
                 $obj = $this->fetch_row($resql);
                 //dol_syslog(get_class($this)."::select_db getServerParametersValues $var=". print_r($obj, true), LOG_DEBUG);
                 $result[$var] = $obj[0];
-            }
-            else {
+            } else {
                 // TODO Récupérer le message
                 $result[$var] = 'FAIL';
             }
@@ -1288,11 +1319,12 @@ 
      */
     private static function calc_daynr($year, $month, $day) {
         $y = $year;
-        if ($y == 0 && $month == 0) return 0;
+        if ($y == 0 && $month == 0) {
+        	return 0;
+        }
         $num = (365* $y + 31 * ($month - 1) + $day);
         if ($month <= 2) {
-            $y--; }
-        else {
+            $y--; } else {
             $num -= floor(($month * 4 + 23) / 10);
         }
         $temp = floor(($y / 100 + 1) * 3 / 4);
@@ -1344,8 +1376,9 @@ 
 
         if ($month == 1 && $day <= 7-$weekday)
         {
-            if (!$week_year && (($first_weekday && $weekday != 0) || (!$first_weekday && $weekday >= 4)))
-                return 0;
+            if (!$week_year && (($first_weekday && $weekday != 0) || (!$first_weekday && $weekday >= 4))) {
+                            return 0;
+            }
             $week_year= 1;
             $calc_year--;
             $first_daynr-= ($days=self::calc_days_in_year($calc_year));
@@ -1354,8 +1387,7 @@ 
 
       if (($first_weekday && $weekday != 0) || (!$first_weekday && $weekday >= 4)) {
         $days= $daynr - ($first_daynr+ (7-$weekday));
-      }
-      else {
+      } else {
         $days= $daynr - ($first_daynr - $weekday);
       }