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/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/class/rssparser.class.php

Doc Comments +1 added lines, -1 removed lines

@@ -151,7 +151,7 @@
     /**
      * getLastFetchDate
      *
-     * @return string
+     * @return integer
      */
     public function getLastFetchDate()
     {

Braces +148 added lines, -107 removed lines

@@ -211,19 +211,19 @@ 
                 $foundintocache=1;
 
                 $this->_lastfetchdate=$filedate;
-            }
-            else
+            } else
             {
                 dol_syslog(get_class($this)."::parser cache file ".$newpathofdestfile." is not found or older than now - cachedelay (".$nowgmt." - ".$cachedelay.") so we can't use it.");
             }
         }
 
         // Load file into $str
-        if ($foundintocache)    // Cache file found and is not too old
+        if ($foundintocache) {
+        	// Cache file found and is not too old
         {
             $str = file_get_contents($newpathofdestfile);
         }
-        else
+        } else
         {
             try {
                 ini_set("user_agent","Dolibarr ERP-CRM RSS reader");
@@ -231,14 +231,17 @@ 
                 ini_set("default_socket_timeout", $conf->global->MAIN_USE_RESPONSE_TIMEOUT);
 
                 $opts = array('http'=>array('method'=>"GET"));
-                if (! empty($conf->global->MAIN_USE_CONNECT_TIMEOUT)) $opts['http']['timeout']=$conf->global->MAIN_USE_CONNECT_TIMEOUT;
-                if (! empty($conf->global->MAIN_PROXY_USE))           $opts['http']['proxy']='tcp://'.$conf->global->MAIN_PROXY_HOST.':'.$conf->global->MAIN_PROXY_PORT;
+                if (! empty($conf->global->MAIN_USE_CONNECT_TIMEOUT)) {
+                	$opts['http']['timeout']=$conf->global->MAIN_USE_CONNECT_TIMEOUT;
+                }
+                if (! empty($conf->global->MAIN_PROXY_USE)) {
+                	$opts['http']['proxy']='tcp://'.$conf->global->MAIN_PROXY_HOST.':'.$conf->global->MAIN_PROXY_PORT;
+                }
                 //var_dump($opts);exit;
                 $context = stream_context_create($opts);
 
                 $str = file_get_contents($this->_urlRSS, false, $context);
-            }
-            catch (Exception $e) {
+            } catch (Exception $e) {
                 print 'Error retrieving URL '.$this->urlRSS.' - '.$e->getMessage();
             }
         }
@@ -251,8 +254,7 @@ 
 	            //print 'xx'.LIBXML_NOCDATA;
 	            libxml_use_internal_errors(false);
 	            $rss = simplexml_load_string($str, "SimpleXMLElement", LIBXML_NOCDATA);
-	        }
-	        else
+	        } else
 	        {
 	            $xmlparser=xml_parser_create('');
 	            if (!is_resource($xmlparser)) {
@@ -276,18 +278,21 @@ 
             if (empty($foundintocache) && $cachedir)
             {
                 dol_syslog(get_class($this)."::parser cache file ".$newpathofdestfile." is saved onto disk.");
-                if (! dol_is_dir($cachedir)) dol_mkdir($cachedir);
+                if (! dol_is_dir($cachedir)) {
+                	dol_mkdir($cachedir);
+                }
                 $fp = fopen($newpathofdestfile, 'w');
                 if ($fp)
                 {
                 	fwrite($fp, $str);
                 	fclose($fp);
-                	if (! empty($conf->global->MAIN_UMASK)) $newmask=$conf->global->MAIN_UMASK;
+                	if (! empty($conf->global->MAIN_UMASK)) {
+                		$newmask=$conf->global->MAIN_UMASK;
+                	}
                 	@chmod($newpathofdestfile, octdec($newmask));
 
 	                $this->_lastfetchdate=$nowgmt;
-                }
-                else
+                } else
                 {
                 	print 'Error, failed to open file '.$newpathofdestfile.' for write';
                 }
@@ -295,10 +300,14 @@ 
 
             unset($str);    // Free memory
 
-            if (empty($rss->_format))    // If format not detected automatically
+            if (empty($rss->_format)) {
+            	// If format not detected automatically
             {
                 $rss->_format='rss';
-                if (empty($rss->channel)) $rss->_format='atom';
+            }
+                if (empty($rss->channel)) {
+                	$rss->_format='atom';
+                }
             }
 
             $items=array();
@@ -309,58 +318,114 @@ 
                 //var_dump($rss);
                 if (! empty($conf->global->EXTERNALRSS_USE_SIMPLEXML))
                 {
-                    if (!empty($rss->channel->language))      $this->_language = (string) $rss->channel->language;
-                    if (!empty($rss->channel->generator))     $this->_generator = (string) $rss->channel->generator;
-                    if (!empty($rss->channel->copyright))     $this->_copyright = (string) $rss->channel->copyright;
-                    if (!empty($rss->channel->lastbuilddate)) $this->_lastbuilddate = (string) $rss->channel->lastbuilddate;
-                    if (!empty($rss->channel->image->url[0])) $this->_imageurl = (string) $rss->channel->image->url[0];
-                    if (!empty($rss->channel->link))		  $this->_link = (string) $rss->channel->link;
-                    if (!empty($rss->channel->title))         $this->_title = (string) $rss->channel->title;
-                    if (!empty($rss->channel->description))	  $this->_description = (string) $rss->channel->description;
-                }
-                else
+                    if (!empty($rss->channel->language)) {
+                    	$this->_language = (string) $rss->channel->language;
+                    }
+                    if (!empty($rss->channel->generator)) {
+                    	$this->_generator = (string) $rss->channel->generator;
+                    }
+                    if (!empty($rss->channel->copyright)) {
+                    	$this->_copyright = (string) $rss->channel->copyright;
+                    }
+                    if (!empty($rss->channel->lastbuilddate)) {
+                    	$this->_lastbuilddate = (string) $rss->channel->lastbuilddate;
+                    }
+                    if (!empty($rss->channel->image->url[0])) {
+                    	$this->_imageurl = (string) $rss->channel->image->url[0];
+                    }
+                    if (!empty($rss->channel->link)) {
+                    	$this->_link = (string) $rss->channel->link;
+                    }
+                    if (!empty($rss->channel->title)) {
+                    	$this->_title = (string) $rss->channel->title;
+                    }
+                    if (!empty($rss->channel->description)) {
+                    	$this->_description = (string) $rss->channel->description;
+                    }
+                } else
                 {
                     //var_dump($rss->channel);
-                    if (!empty($rss->channel['language']))      $this->_language = (string) $rss->channel['language'];
-                    if (!empty($rss->channel['generator']))     $this->_generator = (string) $rss->channel['generator'];
-                    if (!empty($rss->channel['copyright']))     $this->_copyright = (string) $rss->channel['copyright'];
-                    if (!empty($rss->channel['lastbuilddate'])) $this->_lastbuilddate = (string) $rss->channel['lastbuilddate'];
-                    if (!empty($rss->image['url']))             $this->_imageurl = (string) $rss->image['url'];
-                    if (!empty($rss->channel['link']))		    $this->_link = (string) $rss->channel['link'];
-                    if (!empty($rss->channel['title']))         $this->_title = (string) $rss->channel['title'];
-                    if (!empty($rss->channel['description']))   $this->_description = (string) $rss->channel['description'];
+                    if (!empty($rss->channel['language'])) {
+                    	$this->_language = (string) $rss->channel['language'];
+                    }
+                    if (!empty($rss->channel['generator'])) {
+                    	$this->_generator = (string) $rss->channel['generator'];
+                    }
+                    if (!empty($rss->channel['copyright'])) {
+                    	$this->_copyright = (string) $rss->channel['copyright'];
+                    }
+                    if (!empty($rss->channel['lastbuilddate'])) {
+                    	$this->_lastbuilddate = (string) $rss->channel['lastbuilddate'];
+                    }
+                    if (!empty($rss->image['url'])) {
+                    	$this->_imageurl = (string) $rss->image['url'];
+                    }
+                    if (!empty($rss->channel['link'])) {
+                    	$this->_link = (string) $rss->channel['link'];
+                    }
+                    if (!empty($rss->channel['title'])) {
+                    	$this->_title = (string) $rss->channel['title'];
+                    }
+                    if (!empty($rss->channel['description'])) {
+                    	$this->_description = (string) $rss->channel['description'];
+                    }
                 }
 
-                if (! empty($conf->global->EXTERNALRSS_USE_SIMPLEXML)) $items=$rss->channel->item;    // With simplexml
-                else $items=$rss->items;                                                              // With xmlparse
+                if (! empty($conf->global->EXTERNALRSS_USE_SIMPLEXML)) {
+                	$items=$rss->channel->item;
+                }
+                // With simplexml
+                else {
+                	$items=$rss->items;
+                }
+                // With xmlparse
                 //var_dump($items);exit;
-            }
-            else if ($rss->_format == 'atom')
+            } else if ($rss->_format == 'atom')
             {
                 //var_dump($rss);
                 if (! empty($conf->global->EXTERNALRSS_USE_SIMPLEXML))
                 {
-                    if (!empty($rss->generator))     $this->_generator = (string) $rss->generator;
-                    if (!empty($rss->lastbuilddate)) $this->_lastbuilddate = (string) $rss->modified;
-                    if (!empty($rss->link->href))    $this->_link = (string) $rss->link->href;
-                    if (!empty($rss->title))         $this->_title = (string) $rss->title;
-                    if (!empty($rss->description))	 $this->_description = (string) $rss->description;
-                }
-                else
+                    if (!empty($rss->generator)) {
+                    	$this->_generator = (string) $rss->generator;
+                    }
+                    if (!empty($rss->lastbuilddate)) {
+                    	$this->_lastbuilddate = (string) $rss->modified;
+                    }
+                    if (!empty($rss->link->href)) {
+                    	$this->_link = (string) $rss->link->href;
+                    }
+                    if (!empty($rss->title)) {
+                    	$this->_title = (string) $rss->title;
+                    }
+                    if (!empty($rss->description)) {
+                    	$this->_description = (string) $rss->description;
+                    }
+                } else
                 {
                     //if (!empty($rss->channel['rss_language']))      $this->_language = (string) $rss->channel['rss_language'];
-                    if (!empty($rss->channel['generator']))     $this->_generator = (string) $rss->channel['generator'];
+                    if (!empty($rss->channel['generator'])) {
+                    	$this->_generator = (string) $rss->channel['generator'];
+                    }
                     //if (!empty($rss->channel['rss_copyright']))     $this->_copyright = (string) $rss->channel['rss_copyright'];
-                    if (!empty($rss->channel['modified'])) $this->_lastbuilddate = (string) $rss->channel['modified'];
+                    if (!empty($rss->channel['modified'])) {
+                    	$this->_lastbuilddate = (string) $rss->channel['modified'];
+                    }
                     //if (!empty($rss->image['rss_url']))             $this->_imageurl = (string) $rss->image['rss_url'];
-                    if (!empty($rss->channel['link']))		    $this->_link = (string) $rss->channel['link'];
-                    if (!empty($rss->channel['title']))         $this->_title = (string) $rss->channel['title'];
+                    if (!empty($rss->channel['link'])) {
+                    	$this->_link = (string) $rss->channel['link'];
+                    }
+                    if (!empty($rss->channel['title'])) {
+                    	$this->_title = (string) $rss->channel['title'];
+                    }
                     //if (!empty($rss->channel['rss_description']))   $this->_description = (string) $rss->channel['rss_description'];
                 }
                 if (! empty($conf->global->EXTERNALRSS_USE_SIMPLEXML))  {
                     $tmprss=xml2php($rss); $items=$tmprss['entry'];
                 } // With simplexml
-                else $items=$rss->items;                                                              // With xmlparse
+                else {
+                	$items=$rss->items;
+                }
+                // With xmlparse
                 //var_dump($items);exit;
             }
 
@@ -382,8 +447,7 @@ 
                             $itemPubDate = (string) $item->pubDate;
                             $itemId = '';
                             $itemAuthor = '';
-                        }
-                        else
+                        } else
                         {
                             $itemLink = (string) $item['link'];
                             $itemTitle = (string) $item['title'];
@@ -402,8 +466,7 @@ 
                                 $itemCategory[] = (string) $cat;
                             }
                         }
-                    }
-                    else if ($rss->_format == 'atom')
+                    } else if ($rss->_format == 'atom')
                     {
                         if (! empty($conf->global->EXTERNALRSS_USE_SIMPLEXML))
                         {
@@ -413,8 +476,7 @@ 
                             $itemPubDate = (string) $item['created'];
                             $itemId = (string) $item['id'];
                             $itemAuthor = (string) ($item['author']?$item['author']:$item['author_name']);
-                        }
-                        else
+                        } else
                         {
                             $itemLink = (isset($item['link']['href']) ? (string) $item['link']['href'] : '');
                             $itemTitle = (string) $item['title'];
@@ -423,8 +485,9 @@ 
                             $itemId = (string) $item['id'];
                             $itemAuthor = (string) ($item['author']?$item['author']:$item['author_name']);
                         }
+                    } else {
+                    	print 'ErrorBadFeedFormat';
                     }
-                    else print 'ErrorBadFeedFormat';
 
                     // Add record to result array
                     $this->_rssarray[$i] = array(
@@ -439,13 +502,15 @@ 
 
                     $i++;
 
-                    if ($i > $maxNb)    break;    // We get all records we want
+                    if ($i > $maxNb) {
+                    	break;
+                    }
+                    // We get all records we want
                 }
             }
 
             return 1;
-        }
-        else
+        } else
         {
             $this->error='ErrorFailedToLoadRSSFile';
             return -1;
@@ -484,12 +549,10 @@ 
             if ( $el == 'rdf' ) {
                 $this->_format = 'rss';
                 $this->feed_version = '1.0';
-            }
-            elseif ( $el == 'rss' ) {
+            } elseif ( $el == 'rss' ) {
                 $this->_format = 'rss';
                 $this->feed_version = $attrs['version'];
-            }
-            elseif ( $el == 'feed' ) {
+            } elseif ( $el == 'feed' ) {
                 $this->_format = 'atom';
                 $this->feed_version = $attrs['version'];
                 $this->inchannel = true;
@@ -500,8 +563,7 @@ 
         if ( $el == 'channel' )
         {
             $this->inchannel = true;
-        }
-        elseif ($el == 'item' or $el == 'entry' )
+        } elseif ($el == 'item' or $el == 'entry' )
         {
             $this->initem = true;
             if ( isset($attrs['rdf:about']) ) {
@@ -517,9 +579,7 @@ 
         $el == 'textinput' )
         {
             $this->intextinput = true;
-        }
-
-        elseif (
+        } elseif (
         $this->_format == 'rss' and
         $this->current_namespace == '' and
         $el == 'image' )
@@ -560,8 +620,7 @@ 
             if ( isset($attrs['rel']) && $attrs['rel'] == 'alternate' )
             {
                 $link_el = 'link';
-            }
-            else {
+            } else {
                 $link_el = 'link_' . $attrs['rel'];
             }
 
@@ -586,8 +645,7 @@ 
         if ($this->_format == 'atom' and $this->incontent)
         {
             $this->append_content($text);
-        }
-        else
+        } else
         {
             $current_el = join('_', array_reverse($this->stack));
             $this->append($current_el, $text);
@@ -610,37 +668,30 @@ 
             $this->items[] = $this->current_item;
             $this->current_item = array();
             $this->initem = false;
-        }
-        elseif ($this->_format == 'rss' and $this->current_namespace == '' and $el == 'textinput' )
+        } elseif ($this->_format == 'rss' and $this->current_namespace == '' and $el == 'textinput' )
         {
             $this->intextinput = false;
-        }
-        elseif ($this->_format == 'rss' and $this->current_namespace == '' and $el == 'image' )
+        } elseif ($this->_format == 'rss' and $this->current_namespace == '' and $el == 'image' )
         {
             $this->inimage = false;
-        }
-        elseif ($this->_format == 'atom' and in_array($el, $this->_CONTENT_CONSTRUCTS) )
+        } elseif ($this->_format == 'atom' and in_array($el, $this->_CONTENT_CONSTRUCTS) )
         {
             $this->incontent = false;
-        }
-        elseif ($el == 'channel' or $el == 'feed' )
+        } elseif ($el == 'channel' or $el == 'feed' )
         {
             $this->inchannel = false;
-        }
-        elseif ($this->_format == 'atom' and $this->incontent  ) {
+        } elseif ($this->_format == 'atom' and $this->incontent  ) {
             // balance tags properly
             // note:  i don't think this is actually neccessary
             if ( $this->stack[0] == $el )
             {
                 $this->append_content("</$el>");
-            }
-            else {
+            } else {
                 $this->append_content("<$el />");
             }
 
             array_shift($this->stack);
-        }
-        else {
+        } else {
             array_shift($this->stack);
         }
 
@@ -673,8 +724,7 @@ 
     {
         if ( $this->initem ) {
             $this->concat($this->current_item[ $this->incontent ], $text);
-        }
-        elseif ( $this->inchannel ) {
+        } elseif ( $this->inchannel ) {
             $this->concat($this->channel[ $this->incontent ], $text);
         }
     }
@@ -695,28 +745,21 @@ 
         {
             if ( $this->initem ) {
                 $this->concat($this->current_item[ $this->current_namespace ][ $el ], $text);
-            }
-            elseif ($this->inchannel) {
+            } elseif ($this->inchannel) {
                 $this->concat($this->channel[ $this->current_namespace][ $el ], $text);
-            }
-            elseif ($this->intextinput) {
+            } elseif ($this->intextinput) {
                 $this->concat($this->textinput[ $this->current_namespace][ $el ], $text);
-            }
-            elseif ($this->inimage) {
+            } elseif ($this->inimage) {
                 $this->concat($this->image[ $this->current_namespace ][ $el ], $text);
             }
-        }
-        else {
+        } else {
             if ( $this->initem ) {
                 $this->concat($this->current_item[ $el ], $text);
-            }
-            elseif ($this->intextinput) {
+            } elseif ($this->intextinput) {
                 $this->concat($this->textinput[ $el ], $text);
-            }
-            elseif ($this->inimage) {
+            } elseif ($this->inimage) {
                 $this->concat($this->image[ $el ], $text);
-            }
-            elseif ($this->inchannel) {
+            } elseif ($this->inchannel) {
                 $this->concat($this->channel[ $el ], $text);
             }
 
@@ -757,13 +800,11 @@ 
             $array[$key][] = $tmp;
             $array[$key][] = $child;
             $tab = true;
-        }
-        elseif($tab == true)
+        } elseif($tab == true)
         {
             //Add an element in an existing array
             $array[$key][] = $child;
-        }
-        else
+        } else
         {
             //Add a simple element
             $array[$key] = $child;

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 +107 added lines, -93 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;
+		}
 	}
 
 	/**
@@ -873,10 +881,11 @@ 
 	{
 		$sql = "DROP TABLE ".$table;
 
-		if (! $this->query($sql))
-			return -1;
-		else
-			return 1;
+		if (! $this->query($sql)) {
+					return -1;
+		} else {
+					return 1;
+		}
 	}
 
 	/**
@@ -910,25 +919,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;
+		}
 	}
 
 	/**
@@ -948,10 +963,11 @@ 
 		}
 
 		dol_syslog($sql,LOG_DEBUG);
-		if (! $this->query($sql))
-		return -1;
-		else
-		return 1;
+		if (! $this->query($sql)) {
+				return -1;
+		} else {
+				return 1;
+		}
 	}
 
 	/**
@@ -969,8 +985,9 @@ 
 		{
 			$this->error=$this->lasterror();
 			return -1;
+		} else {
+			return 1;
 		}
-		else return 1;
 	}
 
 	/**
@@ -992,8 +1009,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);
@@ -1005,8 +1021,7 @@ 
         {
             dol_syslog(get_class($this)."::DDLCreateUser sql=".$sql, LOG_WARNING);
             return -1;
-        }
-        else
+        } else
         {
             if ($num)
             {
@@ -1155,8 +1170,7 @@ 
 	    if (is_array($fields))
 	    {
 	        $where=" IN ('".implode("','",$fields)."')";
-	    }
-	    else
+	    } else
 	    {
 	        $where="='".$this->escape($fields)."'";
 	    }
@@ -1168,9 +1182,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 +120 added lines, -74 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,18 +115,23 @@ 
 
                 // If client is old latin, we force utf8
                 $clientmustbe=empty($conf->db->dolibarr_main_db_character_set)?'utf8':$conf->db->dolibarr_main_db_character_set;
-                if (preg_match('/latin1/', $clientmustbe)) $clientmustbe='utf8';
+                if (preg_match('/latin1/', $clientmustbe)) {
+                	$clientmustbe='utf8';
+                }
 
 				if ($this->db->character_set_name() != $clientmustbe) {
 					$this->db->set_charset($clientmustbe);	// This set charset, but with a bad collation
 
 					$collation = $conf->db->dolibarr_main_db_collation;
-					if (preg_match('/latin1/', $collation)) $collation='utf8_unicode_ci';
+					if (preg_match('/latin1/', $collation)) {
+						$collation='utf8_unicode_ci';
+					}
 
-					if (! preg_match('/general/', $collation)) $this->db->query("SET collation_connection = ".$collation);
+					if (! preg_match('/general/', $collation)) {
+						$this->db->query("SET collation_connection = ".$collation);
+					}
 				}
-            }
-            else
+            } else
             {
                 $this->database_selected = false;
                 $this->database_name = '';
@@ -130,8 +139,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;
@@ -140,15 +148,21 @@ 
             {
             	// If client is old latin, we force utf8
             	$clientmustbe=empty($conf->db->dolibarr_main_db_character_set)?'utf8':$conf->db->dolibarr_main_db_character_set;
-            	if (preg_match('/latin1/', $clientmustbe)) $clientmustbe='utf8';
+            	if (preg_match('/latin1/', $clientmustbe)) {
+            		$clientmustbe='utf8';
+            	}
 
 				if ($this->db->character_set_name() != $clientmustbe) {
 					$this->db->set_charset($clientmustbe);	// This set utf8_general_ci
 
 					$collation = $conf->db->dolibarr_main_db_collation;
-					if (preg_match('/latin1/', $collation)) $collation='utf8_unicode_ci';
+					if (preg_match('/latin1/', $collation)) {
+						$collation='utf8_unicode_ci';
+					}
 
-					if (! preg_match('/general/', $collation)) $this->db->query("SET collation_connection = ".$collation);
+					if (! preg_match('/general/', $collation)) {
+						$this->db->query("SET collation_connection = ".$collation);
+					}
 				}
 			}
         }
@@ -232,7 +246,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();
         }
@@ -254,14 +270,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);
         }
@@ -275,7 +292,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;
@@ -325,8 +345,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;
@@ -375,7 +394,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();
+        }
     }
 
     /**
@@ -450,8 +471,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;
         }
     }
@@ -494,8 +514,7 @@ 
             if ($cryptType == 2)
             {
                 $return = 'AES_ENCRYPT('.$return.',\''.$cryptKey.'\')';
-            }
-            else if ($cryptType == 1)
+            } else if ($cryptType == 1)
             {
                 $return = 'DES_ENCRYPT('.$return.',\''.$cryptKey.'\')';
             }
@@ -527,8 +546,7 @@ 
             if ($cryptType == 2)
             {
                 $return = 'AES_DECRYPT('.$value.',\''.$cryptKey.'\')';
-            }
-            else if ($cryptType == 1)
+            } else if ($cryptType == 1)
             {
                 $return = 'DES_DECRYPT('.$value.',\''.$cryptKey.'\')';
             }
@@ -550,8 +568,9 @@ 
         {
             $row=$this->fetch_row($resql);
             return $row[0];
+        } else {
+        	return '?';
         }
-        else return '?';
     }
 
     /**
@@ -567,8 +586,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)."`";
@@ -598,7 +621,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);
@@ -670,8 +695,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']."'";
 				}
 			}
@@ -683,8 +707,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;
@@ -704,18 +729,22 @@ 
             }
         }
         $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;
 
-        if(! $this->query($sql))
-        return -1;
-        else
-        return 1;
+        if(! $this->query($sql)) {
+                return -1;
+        } else {
+                return 1;
+        }
     }
 
     /**
@@ -728,10 +757,11 @@ 
     {
     	$sql = "DROP TABLE ".$table;
 
-		if (! $this->query($sql))
- 			return -1;
-    	else
-    		return 1;
+		if (! $this->query($sql)) {
+		 			return -1;
+		} else {
+    	    		return 1;
+    	}
     }
 
     /**
@@ -765,24 +795,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);
@@ -814,8 +849,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);
@@ -826,15 +860,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;
+        }
     }
 
     /**
@@ -875,8 +914,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);
@@ -1042,11 +1080,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;
@@ -1063,11 +1105,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 +160 added lines, -93 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);
@@ -321,10 +326,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
@@ -351,7 +358,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";
 		}
@@ -369,8 +378,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;
+		}
 	}
 
 	/**
@@ -397,7 +409,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'))
@@ -409,8 +424,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);
@@ -463,7 +482,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);
         }
@@ -498,8 +519,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;
 			}
 		}
 
@@ -508,30 +530,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;
@@ -621,7 +652,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);
+		}
 	}
 
 
@@ -635,10 +668,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 ";
+		}
 	}
 
 
@@ -688,8 +728,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',
@@ -844,8 +883,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;
@@ -868,7 +911,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)
         {
@@ -944,26 +989,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))
 		{
@@ -984,19 +1030,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;
+		}
 	}
 
 	/**
@@ -1009,10 +1059,11 @@ 
 	{
 		$sql = "DROP TABLE ".$table;
 
-		if (! $this->query($sql))
-			return -1;
-		else
-			return 1;
+		if (! $this->query($sql)) {
+					return -1;
+		} else {
+					return 1;
+		}
 	}
 
 	/**
@@ -1050,7 +1101,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);
@@ -1072,27 +1125,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;
 	}
 
@@ -1119,8 +1178,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);
@@ -1129,13 +1187,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;
 	}
 
@@ -1170,8 +1233,9 @@ 
 		{
             $liste=$this->fetch_array($resql);
 		    return $liste['server_encoding'];
+		} else {
+			return '';
 		}
-		else return '';
 	}
 
 	/**
@@ -1211,8 +1275,9 @@ 
 		{
 		    $liste=$this->fetch_array($resql);
 			return $liste['lc_collate'];
+		} else {
+			return '';
 		}
-		else return '';
 	}
 
 	/**
@@ -1251,8 +1316,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');
@@ -1282,8 +1346,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');
@@ -1309,11 +1372,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 +117 added lines, -84 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;
     }
 
@@ -955,10 +981,11 @@ 
     {
     	$sql = "DROP TABLE ".$table;
 
-    	if (! $this->query($sql))
-    		return -1;
-    	else
-    		return 1;
+    	if (! $this->query($sql)) {
+    	    		return -1;
+    	} else {
+    	    		return 1;
+    	}
     }
 
     /**
@@ -992,24 +1019,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);
@@ -1037,8 +1069,9 @@ 
         }
 
         dol_syslog(get_class($this)."::DDLUpdateField ".$sql,LOG_DEBUG);
-        if (! $this->query($sql))
-            return -1;
+        if (! $this->query($sql)) {
+                    return -1;
+        }
         return 1;
     }
 
@@ -1236,8 +1269,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';
             }
@@ -1304,11 +1336,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);
@@ -1360,8 +1393,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));
@@ -1370,8 +1404,7 @@ 
 
       if (($first_weekday && $weekday != 0) || (!$first_weekday && $weekday >= 4)) {
         $days= $daynr - ($first_daynr+ (7-$weekday));
-      }
-      else {
+      } else {
         $days= $daynr - ($first_daynr - $weekday);
       }
 

htdocs/core/filemanagerdol/connectors/php/util.php

Doc Comments +2 added lines, -2 removed lines

@@ -130,7 +130,7 @@ 
  * Returns true if file contain insecure HTML code at the beginning.
  *
  * @param string $filePath absolute path to file
- * @return boolean
+ * @return string
  */
 function DetectHtml( $filePath )
 {
@@ -200,7 +200,7 @@ 
  *
  * @param 	string 	$filePath 		Absolute path to file
  * @param 	string 	$extension 		File extension
- * @return 	boolean					True or false
+ * @return 	string					True or false
  */
 function IsImageValid( $filePath, $extension )
 {

Braces +2 added lines, -4 removed lines

@@ -87,8 +87,7 @@ 
 	if ( defined('PHP_OS') )
 	{
 		$os = PHP_OS ;
-	}
-	else
+	} else
 	{
 		$os = php_uname();
 	}
@@ -96,8 +95,7 @@ 
 	if (strtoupper(substr($os, 0, 3)) === 'WIN' || FindBadUtf8($value))
 	{
 		return (utf8_encode(htmlspecialchars($value)));
-	}
-	else
+	} else
 	{
 		return (htmlspecialchars($value));
 	}