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;
+        }
 	}
 
 

Indentation +15 added lines, -15 removed lines

@@ -31,21 +31,21 @@ 
  */
 class DeplacementStats extends Stats
 {
-    public $table_element;
+	public $table_element;
 
-    var $socid;
-    var $userid;
+	var $socid;
+	var $userid;
 
-    var $from;
-    var $field;
-    var $where;
+	var $from;
+	var $field;
+	var $where;
 
 	/**
 	 * Constructor
 	 *
 	 * @param 	DoliDB		$db		   Database handler
 	 * @param 	int			$socid	   Id third party
-     * @param   mixed		$userid    Id user for filter or array of user ids
+	 * @param   mixed		$userid    Id user for filter or array of user ids
 	 * @return 	void
 	 */
 	function __construct($db, $socid=0, $userid=0)
@@ -53,8 +53,8 @@ 
 		global $conf;
 
 		$this->db = $db;
-        $this->socid = $socid;
-        $this->userid = $userid;
+		$this->socid = $socid;
+		$this->userid = $userid;
 
 		$object=new Deplacement($this->db);
 		$this->from = MAIN_DB_PREFIX.$object->table_element;
@@ -67,7 +67,7 @@ 
 			$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;
+		else if ($this->userid > 0) $this->where.=' AND fk_user = '.$this->userid;
 	}
 
 
@@ -91,7 +91,7 @@ 
 	 * 	Renvoie le nombre de facture par mois pour une annee donnee
 	 *
 	 *	@param	string	$year	Year to scan
-     *	@param	int		$format		0=Label of absiss is a translated text, 1=Label of absiss is month number, 2=Label of absiss is first letter of month
+	 *	@param	int		$format		0=Label of absiss is a translated text, 1=Label of absiss is month number, 2=Label of absiss is first letter of month
 	 *	@return	array			Array of values
 	 */
 	function getNbByMonth($year, $format=0)
@@ -101,7 +101,7 @@ 
 		$sql.= " WHERE YEAR(dated) = ".$year;
 		$sql.= " AND ".$this->where;
 		$sql.= " GROUP BY dm";
-        $sql.= $this->db->order('dm','DESC');
+		$sql.= $this->db->order('dm','DESC');
 
 		$res=$this->_getNbByMonth($year, $sql, $format);
 		//var_dump($res);print '<br>';
@@ -113,7 +113,7 @@ 
 	 * 	Renvoie le montant de facture par mois pour une annee donnee
 	 *
 	 *	@param	int		$year		Year to scan
-     *	@param	int		$format		0=Label of absiss is a translated text, 1=Label of absiss is month number, 2=Label of absiss is first letter of month
+	 *	@param	int		$format		0=Label of absiss is a translated text, 1=Label of absiss is month number, 2=Label of absiss is first letter of month
 	 *	@return	array				Array of values
 	 */
 	function getAmountByMonth($year, $format=0)
@@ -143,7 +143,7 @@ 
 		$sql.= " WHERE date_format(dated,'%Y') = '".$year."'";
 		$sql.= " AND ".$this->where;
 		$sql.= " GROUP BY dm";
-        $sql.= $this->db->order('dm','DESC');
+		$sql.= $this->db->order('dm','DESC');
 
 		return $this->_getAverageByMonth($year, $sql);
 	}
@@ -159,7 +159,7 @@ 
 		$sql.= " FROM ".$this->from;
 		$sql.= " WHERE ".$this->where;
 		$sql.= " GROUP BY year";
-        $sql.= $this->db->order('year','DESC');
+		$sql.= $this->db->order('year','DESC');
 
 		return $this->_getAllByYear($sql);
 	}

Spacing +35 added lines, -35 removed lines

@@ -22,8 +22,8 @@ 
  *       \ingroup    factures
  *       \brief      Fichier de la classe de gestion des stats des deplacement et notes de frais
  */
-include_once DOL_DOCUMENT_ROOT . '/core/class/stats.class.php';
-include_once DOL_DOCUMENT_ROOT . '/compta/deplacement/class/deplacement.class.php';
+include_once DOL_DOCUMENT_ROOT.'/core/class/stats.class.php';
+include_once DOL_DOCUMENT_ROOT.'/compta/deplacement/class/deplacement.class.php';
 
 /**
  *	Classe permettant la gestion des stats des deplacements et notes de frais
@@ -47,7 +47,7 @@ 
      * @param   mixed		$userid    Id user for filter or array of user ids
 	 * @return 	void
 	 */
-	function __construct($db, $socid=0, $userid=0)
+	function __construct($db, $socid = 0, $userid = 0)
 	{
 		global $conf;
 
@@ -55,18 +55,18 @@ 
         $this->socid = $socid;
         $this->userid = $userid;
 
-		$object=new Deplacement($this->db);
+		$object = new Deplacement($this->db);
 		$this->from = MAIN_DB_PREFIX.$object->table_element;
-		$this->field='km';
+		$this->field = 'km';
 
 		$this->where = " fk_statut > 0";
-		$this->where.= " AND entity = ".$conf->entity;
+		$this->where .= " AND entity = ".$conf->entity;
 		if ($this->socid)
 		{
-			$this->where.=" AND fk_soc = ".$this->socid;
+			$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;
 	}
 
 
@@ -78,9 +78,9 @@ 
 	function getNbByYear()
 	{
 		$sql = "SELECT YEAR(dated) as dm, count(*)";
-		$sql.= " FROM ".$this->from;
-		$sql.= " GROUP BY dm DESC";
-		$sql.= " WHERE ".$this->where;
+		$sql .= " FROM ".$this->from;
+		$sql .= " GROUP BY dm DESC";
+		$sql .= " WHERE ".$this->where;
 
 		return $this->_getNbByYear($sql);
 	}
@@ -93,16 +93,16 @@ 
      *	@param	int		$format		0=Label of absiss is a translated text, 1=Label of absiss is month number, 2=Label of absiss is first letter of month
 	 *	@return	array			Array of values
 	 */
-	function getNbByMonth($year, $format=0)
+	function getNbByMonth($year, $format = 0)
 	{
 		$sql = "SELECT MONTH(dated) as dm, count(*)";
-		$sql.= " FROM ".$this->from;
-		$sql.= " WHERE YEAR(dated) = ".$year;
-		$sql.= " AND ".$this->where;
-		$sql.= " GROUP BY dm";
-        $sql.= $this->db->order('dm','DESC');
+		$sql .= " FROM ".$this->from;
+		$sql .= " WHERE YEAR(dated) = ".$year;
+		$sql .= " AND ".$this->where;
+		$sql .= " GROUP BY dm";
+        $sql .= $this->db->order('dm', 'DESC');
 
-		$res=$this->_getNbByMonth($year, $sql, $format);
+		$res = $this->_getNbByMonth($year, $sql, $format);
 		//var_dump($res);print '<br>';
 		return $res;
 	}
@@ -115,16 +115,16 @@ 
      *	@param	int		$format		0=Label of absiss is a translated text, 1=Label of absiss is month number, 2=Label of absiss is first letter of month
 	 *	@return	array				Array of values
 	 */
-	function getAmountByMonth($year, $format=0)
+	function getAmountByMonth($year, $format = 0)
 	{
 		$sql = "SELECT date_format(dated,'%m') as dm, sum(".$this->field.")";
-		$sql.= " FROM ".$this->from;
-		$sql.= " WHERE date_format(dated,'%Y') = '".$year."'";
-		$sql.= " AND ".$this->where;
-		$sql.= " GROUP BY dm";
-		$sql.= $this->db->order('dm','DESC');
+		$sql .= " FROM ".$this->from;
+		$sql .= " WHERE date_format(dated,'%Y') = '".$year."'";
+		$sql .= " AND ".$this->where;
+		$sql .= " GROUP BY dm";
+		$sql .= $this->db->order('dm', 'DESC');
 
-		$res=$this->_getAmountByMonth($year, $sql, $format);
+		$res = $this->_getAmountByMonth($year, $sql, $format);
 		//var_dump($res);print '<br>';
 		return $res;
 	}
@@ -138,11 +138,11 @@ 
 	function getAverageByMonth($year)
 	{
 		$sql = "SELECT date_format(dated,'%m') as dm, avg(".$this->field.")";
-		$sql.= " FROM ".$this->from;
-		$sql.= " WHERE date_format(dated,'%Y') = '".$year."'";
-		$sql.= " AND ".$this->where;
-		$sql.= " GROUP BY dm";
-        $sql.= $this->db->order('dm','DESC');
+		$sql .= " FROM ".$this->from;
+		$sql .= " WHERE date_format(dated,'%Y') = '".$year."'";
+		$sql .= " AND ".$this->where;
+		$sql .= " GROUP BY dm";
+        $sql .= $this->db->order('dm', 'DESC');
 
 		return $this->_getAverageByMonth($year, $sql);
 	}
@@ -155,10 +155,10 @@ 
 	function getAllByYear()
 	{
 		$sql = "SELECT date_format(dated,'%Y') as year, count(*) as nb, sum(".$this->field.") as total, avg(".$this->field.") as avg";
-		$sql.= " FROM ".$this->from;
-		$sql.= " WHERE ".$this->where;
-		$sql.= " GROUP BY year";
-        $sql.= $this->db->order('year','DESC');
+		$sql .= " FROM ".$this->from;
+		$sql .= " WHERE ".$this->where;
+		$sql .= " GROUP BY year";
+        $sql .= $this->db->order('year', 'DESC');
 
 		return $this->_getAllByYear($sql);
 	}

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)
 	{

Indentation +11 added lines, -11 removed lines

@@ -27,19 +27,19 @@
  */
 class FormIntervention
 {
-    var $db;
-    var $error;
+	var $db;
+	var $error;
 
 
-    /**
-     * Constructor
-     *
-     * @param		DoliDB		$db      Database handler
-     */
-    public function __construct($db)
-    {
-        $this->db = $db;
-    }
+	/**
+	 * Constructor
+	 *
+	 * @param		DoliDB		$db      Database handler
+	 */
+	public function __construct($db)
+	{
+		$this->db = $db;
+	}
 
 
 	/**

Spacing +28 added lines, -28 removed lines

@@ -52,30 +52,30 @@ 
 	 *	@param	int		$showempty	Show empty line
 	 *	@return int         		Nbre of project if OK, <0 if KO
 	 */
-	function select_interventions($socid=-1, $selected='', $htmlname='interventionid', $maxlength=16, $showempty=1)
+	function select_interventions($socid = -1, $selected = '', $htmlname = 'interventionid', $maxlength = 16, $showempty = 1)
 	{
-		global $db,$user,$conf,$langs;
+		global $db, $user, $conf, $langs;
 
-		$out='';
+		$out = '';
 
-		$hideunselectables=false;
+		$hideunselectables = false;
 
 		// Search all contacts
 		$sql = 'SELECT f.rowid, f.ref, f.fk_soc, f.fk_statut';
-		$sql.= ' FROM '.MAIN_DB_PREFIX .'fichinter as f';
-		$sql.= " WHERE f.entity = ".$conf->entity;
+		$sql .= ' FROM '.MAIN_DB_PREFIX.'fichinter as f';
+		$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);
-		$resql=$db->query($sql);
+		$resql = $db->query($sql);
 		if ($resql)
 		{
-			$out.='<select id="interventionid" class="flat" name="'.$htmlname.'">';
-			if ($showempty) $out.='<option value="0">&nbsp;</option>';
+			$out .= '<select id="interventionid" class="flat" name="'.$htmlname.'">';
+			if ($showempty) $out .= '<option value="0">&nbsp;</option>';
 			$num = $db->num_rows($resql);
 			$i = 0;
 			if ($num)
@@ -84,49 +84,49 @@ 
 				{
 					$obj = $db->fetch_object($resql);
 					// If we ask to filter on a company and user has no permission to see all companies and project is linked to another company, we hide project.
-					if ($socid > 0 && (empty($obj->fk_soc) || $obj->fk_soc == $socid) && ! $user->rights->societe->lire)
+					if ($socid > 0 && (empty($obj->fk_soc) || $obj->fk_soc == $socid) && !$user->rights->societe->lire)
 					{
 						// Do nothing
 					}
 					else
 					{
-						$labeltoshow=dol_trunc($obj->ref,18);
+						$labeltoshow = dol_trunc($obj->ref, 18);
 						if (!empty($selected) && $selected == $obj->rowid && $obj->statut > 0)
 						{
-							$out.='<option value="'.$obj->rowid.'" selected>'.$labeltoshow.'</option>';
+							$out .= '<option value="'.$obj->rowid.'" selected>'.$labeltoshow.'</option>';
 						}
 						else
 						{
-							$disabled=0;
-							if (! $obj->fk_statut > 0)
+							$disabled = 0;
+							if (!$obj->fk_statut > 0)
 							{
-								$disabled=1;
-								$labeltoshow.=' ('.$langs->trans("Draft").')';
+								$disabled = 1;
+								$labeltoshow .= ' ('.$langs->trans("Draft").')';
 							}
-							if ($socid > 0 && (! empty($obj->fk_soc) && $obj->fk_soc != $socid))
+							if ($socid > 0 && (!empty($obj->fk_soc) && $obj->fk_soc != $socid))
 							{
-								$disabled=1;
-								$labeltoshow.=' - '.$langs->trans("LinkedToAnotherCompany");
+								$disabled = 1;
+								$labeltoshow .= ' - '.$langs->trans("LinkedToAnotherCompany");
 							}
 
 							if ($hideunselectables && $disabled)
 							{
-								$resultat='';
+								$resultat = '';
 							}
 							else
 							{
-								$resultat='<option value="'.$obj->rowid.'"';
-								if ($disabled) $resultat.=' disabled';
-								$resultat.='>'.$labeltoshow;
-								$resultat.='</option>';
+								$resultat = '<option value="'.$obj->rowid.'"';
+								if ($disabled) $resultat .= ' disabled';
+								$resultat .= '>'.$labeltoshow;
+								$resultat .= '</option>';
 							}
-							$out.=$resultat;
+							$out .= $resultat;
 						}
 					}
 					$i++;
 				}
 			}
-			$out.='</select>';
+			$out .= '</select>';
 			$db->free($resql);
 			return $out;
 		}

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)
 	{

Indentation +21 added lines, -21 removed lines

@@ -28,21 +28,21 @@ 
  */
 class FormMargin
 {
-    var $db;
-    var $error;
+	var $db;
+	var $error;
 
 
-    /**
-     *	Constructor
-     *
-     *	@param	DoliDB		$db      Database handler
-     */
-    function __construct($db)
-    {
-        $this->db = $db;
+	/**
+	 *	Constructor
+	 *
+	 *	@param	DoliDB		$db      Database handler
+	 */
+	function __construct($db)
+	{
+		$this->db = $db;
 
-        return 1;
-    }
+		return 1;
+	}
 
 
 
@@ -142,7 +142,7 @@ 
 					//}
 					//else
 					//{
-					    $marginInfos['margin_on_products'] += $pv - $pa;
+						$marginInfos['margin_on_products'] += $pv - $pa;
 					//}
 				}
 				elseif ($type == 1) {  // service
@@ -192,26 +192,26 @@ 
 	{
 		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);
+		$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
 		{
 			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>';
+			$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>';
 
-    	    print '<script>$(document).ready(function() {
+			print '<script>$(document).ready(function() {
         	    $("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";

Spacing +35 added lines, -35 removed lines

@@ -54,7 +54,7 @@ 
 	 * 	@param 	boolean			$force_price	True of not
 	 * 	@return array							Array with info
 	 */
-	function getMarginInfosArray($object, $force_price=false)
+	function getMarginInfosArray($object, $force_price = false)
 	{
 		global $conf, $db;
 
@@ -77,7 +77,7 @@ 
 				'total_mark_rate' => ''
 		);
 
-		foreach($object->lines as $line)
+		foreach ($object->lines as $line)
 		{
 			if (empty($line->pa_ht) && isset($line->fk_fournprice) && !$force_price)
 			{
@@ -94,7 +94,7 @@ 
 			}
 
 			$pv = $line->qty * $line->subprice * (1 - $line->remise_percent / 100);
-			$pa_ht = ($pv < 0 ? - $line->pa_ht : $line->pa_ht);      // We choosed to have line->pa_ht always positive in database, so we guess the correct sign
+			$pa_ht = ($pv < 0 ? -$line->pa_ht : $line->pa_ht); // We choosed to have line->pa_ht always positive in database, so we guess the correct sign
 			$pa = $line->qty * $pa_ht;
 			
 			// calcul des marges
@@ -102,8 +102,8 @@ 
 				if ($conf->global->MARGIN_METHODE_FOR_DISCOUNT == '1') { // remise globale considérée comme produit
 					$marginInfos['pa_products'] += $pa;
 					$marginInfos['pv_products'] += $pv;
-					$marginInfos['pa_total'] +=  $pa;
-					$marginInfos['pv_total'] +=  $pv;
+					$marginInfos['pa_total'] += $pa;
+					$marginInfos['pv_total'] += $pv;
 					// if credit note, margin = -1 * (abs(selling_price) - buying_price)
 					//if ($pv < 0)
 					//{
@@ -115,8 +115,8 @@ 
 				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;
-					$marginInfos['pv_total'] +=  $pv;
+					$marginInfos['pa_total'] += $pa;
+					$marginInfos['pv_total'] += $pv;
 					// if credit note, margin = -1 * (abs(selling_price) - buying_price)
 					//if ($pv < 0)
 					//	$marginInfos['margin_on_services'] += -1 * (abs($pv) - $pa);
@@ -129,12 +129,12 @@ 
 				}
 			}
 			else {
-				$type=$line->product_type?$line->product_type:$line->fk_product_type;
+				$type = $line->product_type ? $line->product_type : $line->fk_product_type;
 				if ($type == 0) {  // product
 					$marginInfos['pa_products'] += $pa;
 					$marginInfos['pv_products'] += $pv;
-					$marginInfos['pa_total'] +=  $pa;
-					$marginInfos['pv_total'] +=  $pv;
+					$marginInfos['pa_total'] += $pa;
+					$marginInfos['pv_total'] += $pv;
 					// if credit note, margin = -1 * (abs(selling_price) - buying_price)
 					//if ($pv < 0)
 					//{
@@ -148,8 +148,8 @@ 
 				elseif ($type == 1) {  // service
 					$marginInfos['pa_services'] += $pa;
 					$marginInfos['pv_services'] += $pv;
-					$marginInfos['pa_total'] +=  $pa;
-					$marginInfos['pv_total'] +=  $pv;
+					$marginInfos['pa_total'] += $pa;
+					$marginInfos['pv_total'] += $pv;
 					// if credit note, margin = -1 * (abs(selling_price) - buying_price)
 					//if ($pv < 0)
 					//	$marginInfos['margin_on_services'] += -1 * (abs($pv) - $pa);
@@ -188,24 +188,24 @@ 
 	 * 	@param 	boolean			$force_price	Force price
 	 * 	@return	void
 	 */
-	function displayMarginInfos($object, $force_price=false)
+	function displayMarginInfos($object, $force_price = false)
 	{
 		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>';
+	    	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>';
 
     	    print '<script>$(document).ready(function() {
         	    $("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");})});
@@ -224,13 +224,13 @@ 
 		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))
+		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))
+		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))
+		if (!empty($conf->product->enabled))
 		{
 			//if ($marginInfo['margin_on_products'] != 0 && $marginInfo['margin_on_services'] != 0) {
 			print '<tr class="oddeven">';
@@ -238,38 +238,38 @@ 
 			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>';
 		}
 
-		if (! empty($conf->service->enabled))
+		if (!empty($conf->service->enabled))
 		{
 			print '<tr class="oddeven">';
 			print '<td>'.$langs->trans('MarginOnServices').'</td>';
 			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>';
 		}
 
-		if (! empty($conf->product->enabled) && ! empty($conf->service->enabled))
+		if (!empty($conf->product->enabled) && !empty($conf->service->enabled))
 		{
 			print '<tr class="liste_total">';
 			print '<td>'.$langs->trans('TotalMargin').'</td>';
 			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>';

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()
     {

Indentation +741 added lines, -741 removed lines

@@ -26,702 +26,702 @@ 
  */
 class RssParser
 {
-    var $db;
-    var $error;
-
-    private $_format='';
-    private $_urlRSS;
-    private $_language;
-    private $_generator;
-    private $_copyright;
-    private $_lastbuilddate;
-    private $_imageurl;
-    private $_link;
-    private $_title;
-    private $_description;
-    private $_lastfetchdate;    // Last successful fetch
-    private $_rssarray=array();
-
-    // For parsing with xmlparser
-    var $stack               = array(); // parser stack
-    var $_CONTENT_CONSTRUCTS = array('content', 'summary', 'info', 'title', 'tagline', 'copyright');
-
-
-    /**
-     *	Constructor
-     *
-     *  @param		DoliDB		$db      Database handler
-     */
-    public function __construct($db)
-    {
-    	$this->db=$db;
-    }
-
-    /**
-     * getFormat
-     *
-     * @return string
-     */
-    public function getFormat()
-    {
-        return $this->_format;
-    }
-
-    /**
-     * getUrlRss
-     *
-     * @return string
-     */
-    public function getUrlRss()
-    {
-        return $this->_urlRSS;
-    }
-    /**
-     * getLanguage
-     *
-     * @return string
-     */
-    public function getLanguage()
-    {
-        return $this->_language;
-    }
-    /**
-     * getGenerator
-     *
-     * @return string
-     */
-    public function getGenerator()
-    {
-        return $this->_generator;
-    }
-    /**
-     * getCopyright
-     *
-     * @return string
-     */
-    public function getCopyright()
-    {
-        return $this->_copyright;
-    }
-    /**
-     * getLastBuildDate
-     *
-     * @return string
-     */
-    public function getLastBuildDate()
-    {
-        return $this->_lastbuilddate;
-    }
-    /**
-     * getImageUrl
-     *
-     * @return string
-     */
-    public function getImageUrl()
-    {
-        return $this->_imageurl;
-    }
-    /**
-     * getLink
-     *
-     * @return string
-     */
-    public function getLink()
-    {
-        return $this->_link;
-    }
-    /**
-     * getTitle
-     *
-     * @return string
-     */
-    public function getTitle()
-    {
-        return $this->_title;
-    }
-    /**
-     * getDescription
-     *
-     * @return string
-     */
-    public function getDescription()
-    {
-        return $this->_description;
-    }
-    /**
-     * getLastFetchDate
-     *
-     * @return string
-     */
-    public function getLastFetchDate()
-    {
-        return $this->_lastfetchdate;
-    }
-    /**
-     * getItems
-     *
-     * @return string
-     */
-    public function getItems()
-    {
-        return $this->_rssarray;
-    }
-
-
-    /**
-     * 	Parse rss URL
-     *
-     * 	@param	string	$urlRSS		Url to parse
-     * 	@param	int		$maxNb		Max nb of records to get (0 for no limit)
-     * 	@param	int		$cachedelay	0=No cache, nb of seconds we accept cache files (cachedir must also be defined)
-     * 	@param	string	$cachedir	Directory where to save cache file
-     *	@return	int					<0 if KO, >0 if OK
-     */
-    public function parser($urlRSS, $maxNb=0, $cachedelay=60, $cachedir='')
-    {
-        global $conf;
-
-        include_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
-
-        $rss='';
-        $str='';    // This will contain content of feed
-
-        // Check parameters
-        if (! dol_is_url($urlRSS))
-        {
-            $this->error="ErrorBadUrl";
-            return -1;
-        }
-
-        $this->_urlRSS = $urlRSS;
-        $newpathofdestfile=$cachedir.'/'.dol_hash($this->_urlRSS,3);	// Force md5 hash (does not contains special chars)
-        $newmask='0644';
-
-        //dol_syslog("RssPArser::parser parse url=".$urlRSS." => cache file=".$newpathofdestfile);
-        $nowgmt = dol_now();
-
-        // Search into cache
-        $foundintocache=0;
-        if ($cachedelay > 0 && $cachedir)
-        {
-            $filedate=dol_filemtime($newpathofdestfile);
-            if ($filedate >= ($nowgmt - $cachedelay))
-            {
-                //dol_syslog("RssParser::parser cache file ".$newpathofdestfile." is not older than now - cachedelay (".$nowgmt." - ".$cachedelay.") so we use it.");
-                $foundintocache=1;
-
-                $this->_lastfetchdate=$filedate;
-            }
-            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
-        {
-            $str = file_get_contents($newpathofdestfile);
-        }
-        else
-        {
-            try {
-                ini_set("user_agent","Dolibarr ERP-CRM RSS reader");
-                ini_set("max_execution_time", $conf->global->MAIN_USE_RESPONSE_TIMEOUT);
-                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;
-                //var_dump($opts);exit;
-                $context = stream_context_create($opts);
-
-                $str = file_get_contents($this->_urlRSS, false, $context);
-            }
-            catch (Exception $e) {
-                print 'Error retrieving URL '.$this->urlRSS.' - '.$e->getMessage();
-            }
-        }
-
-        if ($str !== false)
-        {
-	        // Convert $str into xml
-	        if (! empty($conf->global->EXTERNALRSS_USE_SIMPLEXML))
-	        {
-	            //print 'xx'.LIBXML_NOCDATA;
-	            libxml_use_internal_errors(false);
-	            $rss = simplexml_load_string($str, "SimpleXMLElement", LIBXML_NOCDATA);
-	        }
-	        else
-	        {
-	            $xmlparser=xml_parser_create('');
-	            if (!is_resource($xmlparser)) {
-	                $this->error="ErrorFailedToCreateParser"; return -1;
-	            }
-
-	            xml_set_object($xmlparser, $this);
-	            xml_set_element_handler($xmlparser, 'feed_start_element', 'feed_end_element');
-	            xml_set_character_data_handler($xmlparser, 'feed_cdata');
-	            $status = xml_parse($xmlparser, $str);
-	            xml_parser_free($xmlparser);
-	            $rss=$this;
-	            //var_dump($rss->_format);exit;
-	        }
-        }
-
-        // If $rss loaded
-        if ($rss)
-        {
-            // Save file into cache
-            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);
-                $fp = fopen($newpathofdestfile, 'w');
-                if ($fp)
-                {
-                	fwrite($fp, $str);
-                	fclose($fp);
-                	if (! empty($conf->global->MAIN_UMASK)) $newmask=$conf->global->MAIN_UMASK;
-                	@chmod($newpathofdestfile, octdec($newmask));
-
-	                $this->_lastfetchdate=$nowgmt;
-                }
-                else
-                {
-                	print 'Error, failed to open file '.$newpathofdestfile.' for write';
-                }
-            }
-
-            unset($str);    // Free memory
-
-            if (empty($rss->_format))    // If format not detected automatically
-            {
-                $rss->_format='rss';
-                if (empty($rss->channel)) $rss->_format='atom';
-            }
-
-            $items=array();
-
-            // Save description entries
-            if ($rss->_format == 'rss')
-            {
-                //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
-                {
-                    //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($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')
-            {
-                //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->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['rss_copyright']))     $this->_copyright = (string) $rss->channel['rss_copyright'];
-                    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['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
-                //var_dump($items);exit;
-            }
-
-            $i = 0;
-
-            // Loop on each record
-            if (is_array($items))
-            {
-                foreach($items as $item)
-                {
-                    //var_dump($item);exit;
-                    if ($rss->_format == 'rss')
-                    {
-                        if (! empty($conf->global->EXTERNALRSS_USE_SIMPLEXML))
-                        {
-                            $itemLink = (string) $item->link;
-                            $itemTitle = (string) $item->title;
-                            $itemDescription = (string) $item->description;
-                            $itemPubDate = (string) $item->pubDate;
-                            $itemId = '';
-                            $itemAuthor = '';
-                        }
-                        else
-                        {
-                            $itemLink = (string) $item['link'];
-                            $itemTitle = (string) $item['title'];
-                            $itemDescription = (string) $item['description'];
-                            $itemPubDate = (string) $item['pubdate'];
-                            $itemId = (string) $item['guid'];
-                            $itemAuthor = (string) $item['author'];
-                        }
-
-                        // Loop on each category
-                        $itemCategory=array();
-                        if (is_array($item->category))
-                        {
-                            foreach ($item->category as $cat)
-                            {
-                                $itemCategory[] = (string) $cat;
-                            }
-                        }
-                    }
-                    else if ($rss->_format == 'atom')
-                    {
-                        if (! empty($conf->global->EXTERNALRSS_USE_SIMPLEXML))
-                        {
-                            $itemLink = (isset($item['link']['href']) ? (string) $item['link']['href'] : '');
-                            $itemTitle = (string) $item['title'];
-                            $itemDescription = (string) $item['summary'];
-                            $itemPubDate = (string) $item['created'];
-                            $itemId = (string) $item['id'];
-                            $itemAuthor = (string) ($item['author']?$item['author']:$item['author_name']);
-                        }
-                        else
-                        {
-                            $itemLink = (isset($item['link']['href']) ? (string) $item['link']['href'] : '');
-                            $itemTitle = (string) $item['title'];
-                            $itemDescription = (string) $item['summary'];
-                            $itemPubDate = (string) $item['created'];
-                            $itemId = (string) $item['id'];
-                            $itemAuthor = (string) ($item['author']?$item['author']:$item['author_name']);
-                        }
-                    }
-                    else print 'ErrorBadFeedFormat';
-
-                    // Add record to result array
-                    $this->_rssarray[$i] = array(
-    					'link'=>$itemLink,
-    					'title'=>$itemTitle,
-    					'description'=>$itemDescription,
-    					'pubDate'=>$itemPubDate,
-    					'category'=>$itemCategory,
-    				    'id'=>$itemId,
-    				    'author'=>$itemAuthor);
-                    //var_dump($this->_rssarray);
-
-                    $i++;
-
-                    if ($i > $maxNb)    break;    // We get all records we want
-                }
-            }
-
-            return 1;
-        }
-        else
-        {
-            $this->error='ErrorFailedToLoadRSSFile';
-            return -1;
-        }
-    }
-
-
-
-    /**
-     * 	Triggered when opened tag is found
-     *
-     * 	@param	string		$p			Start
-     *  @param	string		$element	Tag
-     *  @param	array		$attrs		Attributes of tags
-     *  @return	void
-     */
-    function feed_start_element($p, $element, &$attrs)
-    {
-        $el = $element = strtolower($element);
-        $attrs = array_change_key_case($attrs, CASE_LOWER);
-
-        // check for a namespace, and split if found
-        $ns = false;
-        if (strpos($element, ':'))
-        {
-            list($ns, $el) = explode(':', $element, 2);
-        }
-        if ( $ns and $ns != 'rdf' )
-        {
-            $this->current_namespace = $ns;
-        }
-
-        // if feed type isn't set, then this is first element of feed identify feed from root element
-        if (empty($this->_format))
-        {
-            if ( $el == 'rdf' ) {
-                $this->_format = 'rss';
-                $this->feed_version = '1.0';
-            }
-            elseif ( $el == 'rss' ) {
-                $this->_format = 'rss';
-                $this->feed_version = $attrs['version'];
-            }
-            elseif ( $el == 'feed' ) {
-                $this->_format = 'atom';
-                $this->feed_version = $attrs['version'];
-                $this->inchannel = true;
-            }
-            return;
-        }
-
-        if ( $el == 'channel' )
-        {
-            $this->inchannel = true;
-        }
-        elseif ($el == 'item' or $el == 'entry' )
-        {
-            $this->initem = true;
-            if ( isset($attrs['rdf:about']) ) {
-                $this->current_item['about'] = $attrs['rdf:about'];
-            }
-        }
-
-        // if we're in the default namespace of an RSS feed,
-        //  record textinput or image fields
-        elseif (
-        $this->_format == 'rss' and
-        $this->current_namespace == '' and
-        $el == 'textinput' )
-        {
-            $this->intextinput = true;
-        }
-
-        elseif (
-        $this->_format == 'rss' and
-        $this->current_namespace == '' and
-        $el == 'image' )
-        {
-            $this->inimage = true;
-        }
-
-        // handle atom content constructs
-        elseif ( $this->_format == 'atom' and in_array($el, $this->_CONTENT_CONSTRUCTS) )
-        {
-            // avoid clashing w/ RSS mod_content
-            if ($el == 'content' ) {
-                $el = 'atom_content';
-            }
-
-            $this->incontent = $el;
-
-
-        }
-
-        // if inside an Atom content construct (e.g. content or summary) field treat tags as text
-        elseif ($this->_format == 'atom' and $this->incontent )
-        {
-            // if tags are inlined, then flatten
-            $attrs_str = join(' ', array_map('map_attrs', array_keys($attrs), array_values($attrs)));
-
-            $this->append_content("<$element $attrs_str>");
-
-            array_unshift($this->stack, $el);
-        }
-
-        // Atom support many links per containging element.
-        // Magpie treats link elements of type rel='alternate'
-        // as being equivalent to RSS's simple link element.
-        //
-        elseif ($this->_format == 'atom' and $el == 'link' )
-        {
-            if ( isset($attrs['rel']) && $attrs['rel'] == 'alternate' )
-            {
-                $link_el = 'link';
-            }
-            else {
-                $link_el = 'link_' . $attrs['rel'];
-            }
-
-            $this->append($link_el, $attrs['href']);
-        }
-        // set stack[0] to current element
-        else {
-            array_unshift($this->stack, $el);
-        }
-    }
-
-
-    /**
-     * 	Triggered when CDATA is found
-     *
-     * 	@param	string	$p		P
-     *  @param	string	$text	Tag
-     *  @return	void
-     */
-    function feed_cdata($p, $text)
-    {
-        if ($this->_format == 'atom' and $this->incontent)
-        {
-            $this->append_content($text);
-        }
-        else
-        {
-            $current_el = join('_', array_reverse($this->stack));
-            $this->append($current_el, $text);
-        }
-    }
-
-    /**
-     * 	Triggered when closed tag is found
-     *
-     * 	@param	string		$p		P
-     *  @param	string		$el		Tag
-     *  @return	void
-     */
-    function feed_end_element($p, $el)
-    {
-        $el = strtolower($el);
-
-        if ($el == 'item' or $el == 'entry')
-        {
-            $this->items[] = $this->current_item;
-            $this->current_item = array();
-            $this->initem = false;
-        }
-        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' )
-        {
-            $this->inimage = false;
-        }
-        elseif ($this->_format == 'atom' and in_array($el, $this->_CONTENT_CONSTRUCTS) )
-        {
-            $this->incontent = false;
-        }
-        elseif ($el == 'channel' or $el == 'feed' )
-        {
-            $this->inchannel = false;
-        }
-        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 {
-                $this->append_content("<$el />");
-            }
-
-            array_shift($this->stack);
-        }
-        else {
-            array_shift($this->stack);
-        }
-
-        $this->current_namespace = false;
-    }
-
-
-    /**
-     * 	To concat 2 string with no warning if an operand is not defined
-     *
-     * 	@param	string	$str1		Str1
-     *  @param	string	$str2		Str2
-     *  @return	string				String cancatenated
-     */
-    function concat(&$str1, $str2="")
-    {
-        if (!isset($str1) ) {
-            $str1="";
-        }
-        $str1 .= $str2;
-    }
-
-    /**
-     * Enter description here ...
-     *
-     * @param	string	$text		Text
-     * @return	void
-     */
-    function append_content($text)
-    {
-        if ( $this->initem ) {
-            $this->concat($this->current_item[ $this->incontent ], $text);
-        }
-        elseif ( $this->inchannel ) {
-            $this->concat($this->channel[ $this->incontent ], $text);
-        }
-    }
-
-    /**
-     * 	smart append - field and namespace aware
-     *
-     * 	@param	string	$el		El
-     * 	@param	string	$text	Text
-     * 	@return	void
-     */
-    function append($el, $text)
-    {
-        if (!$el) {
-            return;
-        }
-        if ( $this->current_namespace )
-        {
-            if ( $this->initem ) {
-                $this->concat($this->current_item[ $this->current_namespace ][ $el ], $text);
-            }
-            elseif ($this->inchannel) {
-                $this->concat($this->channel[ $this->current_namespace][ $el ], $text);
-            }
-            elseif ($this->intextinput) {
-                $this->concat($this->textinput[ $this->current_namespace][ $el ], $text);
-            }
-            elseif ($this->inimage) {
-                $this->concat($this->image[ $this->current_namespace ][ $el ], $text);
-            }
-        }
-        else {
-            if ( $this->initem ) {
-                $this->concat($this->current_item[ $el ], $text);
-            }
-            elseif ($this->intextinput) {
-                $this->concat($this->textinput[ $el ], $text);
-            }
-            elseif ($this->inimage) {
-                $this->concat($this->image[ $el ], $text);
-            }
-            elseif ($this->inchannel) {
-                $this->concat($this->channel[ $el ], $text);
-            }
-
-        }
-    }
+	var $db;
+	var $error;
+
+	private $_format='';
+	private $_urlRSS;
+	private $_language;
+	private $_generator;
+	private $_copyright;
+	private $_lastbuilddate;
+	private $_imageurl;
+	private $_link;
+	private $_title;
+	private $_description;
+	private $_lastfetchdate;    // Last successful fetch
+	private $_rssarray=array();
+
+	// For parsing with xmlparser
+	var $stack               = array(); // parser stack
+	var $_CONTENT_CONSTRUCTS = array('content', 'summary', 'info', 'title', 'tagline', 'copyright');
+
+
+	/**
+	 *	Constructor
+	 *
+	 *  @param		DoliDB		$db      Database handler
+	 */
+	public function __construct($db)
+	{
+		$this->db=$db;
+	}
+
+	/**
+	 * getFormat
+	 *
+	 * @return string
+	 */
+	public function getFormat()
+	{
+		return $this->_format;
+	}
+
+	/**
+	 * getUrlRss
+	 *
+	 * @return string
+	 */
+	public function getUrlRss()
+	{
+		return $this->_urlRSS;
+	}
+	/**
+	 * getLanguage
+	 *
+	 * @return string
+	 */
+	public function getLanguage()
+	{
+		return $this->_language;
+	}
+	/**
+	 * getGenerator
+	 *
+	 * @return string
+	 */
+	public function getGenerator()
+	{
+		return $this->_generator;
+	}
+	/**
+	 * getCopyright
+	 *
+	 * @return string
+	 */
+	public function getCopyright()
+	{
+		return $this->_copyright;
+	}
+	/**
+	 * getLastBuildDate
+	 *
+	 * @return string
+	 */
+	public function getLastBuildDate()
+	{
+		return $this->_lastbuilddate;
+	}
+	/**
+	 * getImageUrl
+	 *
+	 * @return string
+	 */
+	public function getImageUrl()
+	{
+		return $this->_imageurl;
+	}
+	/**
+	 * getLink
+	 *
+	 * @return string
+	 */
+	public function getLink()
+	{
+		return $this->_link;
+	}
+	/**
+	 * getTitle
+	 *
+	 * @return string
+	 */
+	public function getTitle()
+	{
+		return $this->_title;
+	}
+	/**
+	 * getDescription
+	 *
+	 * @return string
+	 */
+	public function getDescription()
+	{
+		return $this->_description;
+	}
+	/**
+	 * getLastFetchDate
+	 *
+	 * @return string
+	 */
+	public function getLastFetchDate()
+	{
+		return $this->_lastfetchdate;
+	}
+	/**
+	 * getItems
+	 *
+	 * @return string
+	 */
+	public function getItems()
+	{
+		return $this->_rssarray;
+	}
+
+
+	/**
+	 * 	Parse rss URL
+	 *
+	 * 	@param	string	$urlRSS		Url to parse
+	 * 	@param	int		$maxNb		Max nb of records to get (0 for no limit)
+	 * 	@param	int		$cachedelay	0=No cache, nb of seconds we accept cache files (cachedir must also be defined)
+	 * 	@param	string	$cachedir	Directory where to save cache file
+	 *	@return	int					<0 if KO, >0 if OK
+	 */
+	public function parser($urlRSS, $maxNb=0, $cachedelay=60, $cachedir='')
+	{
+		global $conf;
+
+		include_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
+
+		$rss='';
+		$str='';    // This will contain content of feed
+
+		// Check parameters
+		if (! dol_is_url($urlRSS))
+		{
+			$this->error="ErrorBadUrl";
+			return -1;
+		}
+
+		$this->_urlRSS = $urlRSS;
+		$newpathofdestfile=$cachedir.'/'.dol_hash($this->_urlRSS,3);	// Force md5 hash (does not contains special chars)
+		$newmask='0644';
+
+		//dol_syslog("RssPArser::parser parse url=".$urlRSS." => cache file=".$newpathofdestfile);
+		$nowgmt = dol_now();
+
+		// Search into cache
+		$foundintocache=0;
+		if ($cachedelay > 0 && $cachedir)
+		{
+			$filedate=dol_filemtime($newpathofdestfile);
+			if ($filedate >= ($nowgmt - $cachedelay))
+			{
+				//dol_syslog("RssParser::parser cache file ".$newpathofdestfile." is not older than now - cachedelay (".$nowgmt." - ".$cachedelay.") so we use it.");
+				$foundintocache=1;
+
+				$this->_lastfetchdate=$filedate;
+			}
+			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
+		{
+			$str = file_get_contents($newpathofdestfile);
+		}
+		else
+		{
+			try {
+				ini_set("user_agent","Dolibarr ERP-CRM RSS reader");
+				ini_set("max_execution_time", $conf->global->MAIN_USE_RESPONSE_TIMEOUT);
+				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;
+				//var_dump($opts);exit;
+				$context = stream_context_create($opts);
+
+				$str = file_get_contents($this->_urlRSS, false, $context);
+			}
+			catch (Exception $e) {
+				print 'Error retrieving URL '.$this->urlRSS.' - '.$e->getMessage();
+			}
+		}
+
+		if ($str !== false)
+		{
+			// Convert $str into xml
+			if (! empty($conf->global->EXTERNALRSS_USE_SIMPLEXML))
+			{
+				//print 'xx'.LIBXML_NOCDATA;
+				libxml_use_internal_errors(false);
+				$rss = simplexml_load_string($str, "SimpleXMLElement", LIBXML_NOCDATA);
+			}
+			else
+			{
+				$xmlparser=xml_parser_create('');
+				if (!is_resource($xmlparser)) {
+					$this->error="ErrorFailedToCreateParser"; return -1;
+				}
+
+				xml_set_object($xmlparser, $this);
+				xml_set_element_handler($xmlparser, 'feed_start_element', 'feed_end_element');
+				xml_set_character_data_handler($xmlparser, 'feed_cdata');
+				$status = xml_parse($xmlparser, $str);
+				xml_parser_free($xmlparser);
+				$rss=$this;
+				//var_dump($rss->_format);exit;
+			}
+		}
+
+		// If $rss loaded
+		if ($rss)
+		{
+			// Save file into cache
+			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);
+				$fp = fopen($newpathofdestfile, 'w');
+				if ($fp)
+				{
+					fwrite($fp, $str);
+					fclose($fp);
+					if (! empty($conf->global->MAIN_UMASK)) $newmask=$conf->global->MAIN_UMASK;
+					@chmod($newpathofdestfile, octdec($newmask));
+
+					$this->_lastfetchdate=$nowgmt;
+				}
+				else
+				{
+					print 'Error, failed to open file '.$newpathofdestfile.' for write';
+				}
+			}
+
+			unset($str);    // Free memory
+
+			if (empty($rss->_format))    // If format not detected automatically
+			{
+				$rss->_format='rss';
+				if (empty($rss->channel)) $rss->_format='atom';
+			}
+
+			$items=array();
+
+			// Save description entries
+			if ($rss->_format == 'rss')
+			{
+				//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
+				{
+					//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($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')
+			{
+				//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->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['rss_copyright']))     $this->_copyright = (string) $rss->channel['rss_copyright'];
+					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['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
+				//var_dump($items);exit;
+			}
+
+			$i = 0;
+
+			// Loop on each record
+			if (is_array($items))
+			{
+				foreach($items as $item)
+				{
+					//var_dump($item);exit;
+					if ($rss->_format == 'rss')
+					{
+						if (! empty($conf->global->EXTERNALRSS_USE_SIMPLEXML))
+						{
+							$itemLink = (string) $item->link;
+							$itemTitle = (string) $item->title;
+							$itemDescription = (string) $item->description;
+							$itemPubDate = (string) $item->pubDate;
+							$itemId = '';
+							$itemAuthor = '';
+						}
+						else
+						{
+							$itemLink = (string) $item['link'];
+							$itemTitle = (string) $item['title'];
+							$itemDescription = (string) $item['description'];
+							$itemPubDate = (string) $item['pubdate'];
+							$itemId = (string) $item['guid'];
+							$itemAuthor = (string) $item['author'];
+						}
+
+						// Loop on each category
+						$itemCategory=array();
+						if (is_array($item->category))
+						{
+							foreach ($item->category as $cat)
+							{
+								$itemCategory[] = (string) $cat;
+							}
+						}
+					}
+					else if ($rss->_format == 'atom')
+					{
+						if (! empty($conf->global->EXTERNALRSS_USE_SIMPLEXML))
+						{
+							$itemLink = (isset($item['link']['href']) ? (string) $item['link']['href'] : '');
+							$itemTitle = (string) $item['title'];
+							$itemDescription = (string) $item['summary'];
+							$itemPubDate = (string) $item['created'];
+							$itemId = (string) $item['id'];
+							$itemAuthor = (string) ($item['author']?$item['author']:$item['author_name']);
+						}
+						else
+						{
+							$itemLink = (isset($item['link']['href']) ? (string) $item['link']['href'] : '');
+							$itemTitle = (string) $item['title'];
+							$itemDescription = (string) $item['summary'];
+							$itemPubDate = (string) $item['created'];
+							$itemId = (string) $item['id'];
+							$itemAuthor = (string) ($item['author']?$item['author']:$item['author_name']);
+						}
+					}
+					else print 'ErrorBadFeedFormat';
+
+					// Add record to result array
+					$this->_rssarray[$i] = array(
+						'link'=>$itemLink,
+						'title'=>$itemTitle,
+						'description'=>$itemDescription,
+						'pubDate'=>$itemPubDate,
+						'category'=>$itemCategory,
+						'id'=>$itemId,
+						'author'=>$itemAuthor);
+					//var_dump($this->_rssarray);
+
+					$i++;
+
+					if ($i > $maxNb)    break;    // We get all records we want
+				}
+			}
+
+			return 1;
+		}
+		else
+		{
+			$this->error='ErrorFailedToLoadRSSFile';
+			return -1;
+		}
+	}
+
+
+
+	/**
+	 * 	Triggered when opened tag is found
+	 *
+	 * 	@param	string		$p			Start
+	 *  @param	string		$element	Tag
+	 *  @param	array		$attrs		Attributes of tags
+	 *  @return	void
+	 */
+	function feed_start_element($p, $element, &$attrs)
+	{
+		$el = $element = strtolower($element);
+		$attrs = array_change_key_case($attrs, CASE_LOWER);
+
+		// check for a namespace, and split if found
+		$ns = false;
+		if (strpos($element, ':'))
+		{
+			list($ns, $el) = explode(':', $element, 2);
+		}
+		if ( $ns and $ns != 'rdf' )
+		{
+			$this->current_namespace = $ns;
+		}
+
+		// if feed type isn't set, then this is first element of feed identify feed from root element
+		if (empty($this->_format))
+		{
+			if ( $el == 'rdf' ) {
+				$this->_format = 'rss';
+				$this->feed_version = '1.0';
+			}
+			elseif ( $el == 'rss' ) {
+				$this->_format = 'rss';
+				$this->feed_version = $attrs['version'];
+			}
+			elseif ( $el == 'feed' ) {
+				$this->_format = 'atom';
+				$this->feed_version = $attrs['version'];
+				$this->inchannel = true;
+			}
+			return;
+		}
+
+		if ( $el == 'channel' )
+		{
+			$this->inchannel = true;
+		}
+		elseif ($el == 'item' or $el == 'entry' )
+		{
+			$this->initem = true;
+			if ( isset($attrs['rdf:about']) ) {
+				$this->current_item['about'] = $attrs['rdf:about'];
+			}
+		}
+
+		// if we're in the default namespace of an RSS feed,
+		//  record textinput or image fields
+		elseif (
+		$this->_format == 'rss' and
+		$this->current_namespace == '' and
+		$el == 'textinput' )
+		{
+			$this->intextinput = true;
+		}
+
+		elseif (
+		$this->_format == 'rss' and
+		$this->current_namespace == '' and
+		$el == 'image' )
+		{
+			$this->inimage = true;
+		}
+
+		// handle atom content constructs
+		elseif ( $this->_format == 'atom' and in_array($el, $this->_CONTENT_CONSTRUCTS) )
+		{
+			// avoid clashing w/ RSS mod_content
+			if ($el == 'content' ) {
+				$el = 'atom_content';
+			}
+
+			$this->incontent = $el;
+
+
+		}
+
+		// if inside an Atom content construct (e.g. content or summary) field treat tags as text
+		elseif ($this->_format == 'atom' and $this->incontent )
+		{
+			// if tags are inlined, then flatten
+			$attrs_str = join(' ', array_map('map_attrs', array_keys($attrs), array_values($attrs)));
+
+			$this->append_content("<$element $attrs_str>");
+
+			array_unshift($this->stack, $el);
+		}
+
+		// Atom support many links per containging element.
+		// Magpie treats link elements of type rel='alternate'
+		// as being equivalent to RSS's simple link element.
+		//
+		elseif ($this->_format == 'atom' and $el == 'link' )
+		{
+			if ( isset($attrs['rel']) && $attrs['rel'] == 'alternate' )
+			{
+				$link_el = 'link';
+			}
+			else {
+				$link_el = 'link_' . $attrs['rel'];
+			}
+
+			$this->append($link_el, $attrs['href']);
+		}
+		// set stack[0] to current element
+		else {
+			array_unshift($this->stack, $el);
+		}
+	}
+
+
+	/**
+	 * 	Triggered when CDATA is found
+	 *
+	 * 	@param	string	$p		P
+	 *  @param	string	$text	Tag
+	 *  @return	void
+	 */
+	function feed_cdata($p, $text)
+	{
+		if ($this->_format == 'atom' and $this->incontent)
+		{
+			$this->append_content($text);
+		}
+		else
+		{
+			$current_el = join('_', array_reverse($this->stack));
+			$this->append($current_el, $text);
+		}
+	}
+
+	/**
+	 * 	Triggered when closed tag is found
+	 *
+	 * 	@param	string		$p		P
+	 *  @param	string		$el		Tag
+	 *  @return	void
+	 */
+	function feed_end_element($p, $el)
+	{
+		$el = strtolower($el);
+
+		if ($el == 'item' or $el == 'entry')
+		{
+			$this->items[] = $this->current_item;
+			$this->current_item = array();
+			$this->initem = false;
+		}
+		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' )
+		{
+			$this->inimage = false;
+		}
+		elseif ($this->_format == 'atom' and in_array($el, $this->_CONTENT_CONSTRUCTS) )
+		{
+			$this->incontent = false;
+		}
+		elseif ($el == 'channel' or $el == 'feed' )
+		{
+			$this->inchannel = false;
+		}
+		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 {
+				$this->append_content("<$el />");
+			}
+
+			array_shift($this->stack);
+		}
+		else {
+			array_shift($this->stack);
+		}
+
+		$this->current_namespace = false;
+	}
+
+
+	/**
+	 * 	To concat 2 string with no warning if an operand is not defined
+	 *
+	 * 	@param	string	$str1		Str1
+	 *  @param	string	$str2		Str2
+	 *  @return	string				String cancatenated
+	 */
+	function concat(&$str1, $str2="")
+	{
+		if (!isset($str1) ) {
+			$str1="";
+		}
+		$str1 .= $str2;
+	}
+
+	/**
+	 * Enter description here ...
+	 *
+	 * @param	string	$text		Text
+	 * @return	void
+	 */
+	function append_content($text)
+	{
+		if ( $this->initem ) {
+			$this->concat($this->current_item[ $this->incontent ], $text);
+		}
+		elseif ( $this->inchannel ) {
+			$this->concat($this->channel[ $this->incontent ], $text);
+		}
+	}
+
+	/**
+	 * 	smart append - field and namespace aware
+	 *
+	 * 	@param	string	$el		El
+	 * 	@param	string	$text	Text
+	 * 	@return	void
+	 */
+	function append($el, $text)
+	{
+		if (!$el) {
+			return;
+		}
+		if ( $this->current_namespace )
+		{
+			if ( $this->initem ) {
+				$this->concat($this->current_item[ $this->current_namespace ][ $el ], $text);
+			}
+			elseif ($this->inchannel) {
+				$this->concat($this->channel[ $this->current_namespace][ $el ], $text);
+			}
+			elseif ($this->intextinput) {
+				$this->concat($this->textinput[ $this->current_namespace][ $el ], $text);
+			}
+			elseif ($this->inimage) {
+				$this->concat($this->image[ $this->current_namespace ][ $el ], $text);
+			}
+		}
+		else {
+			if ( $this->initem ) {
+				$this->concat($this->current_item[ $el ], $text);
+			}
+			elseif ($this->intextinput) {
+				$this->concat($this->textinput[ $el ], $text);
+			}
+			elseif ($this->inimage) {
+				$this->concat($this->image[ $el ], $text);
+			}
+			elseif ($this->inchannel) {
+				$this->concat($this->channel[ $el ], $text);
+			}
+
+		}
+	}
 
 }
 
@@ -734,51 +734,51 @@ 
  */
 function xml2php($xml)
 {
-    $fils = 0;
-    $tab = false;
-    $array = array();
-    foreach($xml->children() as $key => $value)
-    {
-        $child = xml2php($value);
-
-        //To deal with the attributes
-        foreach($value->attributes() as $ak=>$av)
-        {
-            $child[$ak] = (string) $av;
-
-        }
-
-        //Let see if the new child is not in the array
-        if($tab==false && in_array($key,array_keys($array)))
-        {
-            //If this element is already in the array we will create an indexed array
-            $tmp = $array[$key];
-            $array[$key] = NULL;
-            $array[$key][] = $tmp;
-            $array[$key][] = $child;
-            $tab = true;
-        }
-        elseif($tab == true)
-        {
-            //Add an element in an existing array
-            $array[$key][] = $child;
-        }
-        else
-        {
-            //Add a simple element
-            $array[$key] = $child;
-        }
-
-        $fils++;
-    }
-
-
-    if($fils==0)
-    {
-        return (string) $xml;
-    }
-
-    return $array;
+	$fils = 0;
+	$tab = false;
+	$array = array();
+	foreach($xml->children() as $key => $value)
+	{
+		$child = xml2php($value);
+
+		//To deal with the attributes
+		foreach($value->attributes() as $ak=>$av)
+		{
+			$child[$ak] = (string) $av;
+
+		}
+
+		//Let see if the new child is not in the array
+		if($tab==false && in_array($key,array_keys($array)))
+		{
+			//If this element is already in the array we will create an indexed array
+			$tmp = $array[$key];
+			$array[$key] = NULL;
+			$array[$key][] = $tmp;
+			$array[$key][] = $child;
+			$tab = true;
+		}
+		elseif($tab == true)
+		{
+			//Add an element in an existing array
+			$array[$key][] = $child;
+		}
+		else
+		{
+			//Add a simple element
+			$array[$key] = $child;
+		}
+
+		$fils++;
+	}
+
+
+	if($fils==0)
+	{
+		return (string) $xml;
+	}
+
+	return $array;
 
 }
 

Spacing +86 added lines, -86 removed lines

@@ -29,7 +29,7 @@ 
     var $db;
     var $error;
 
-    private $_format='';
+    private $_format = '';
     private $_urlRSS;
     private $_language;
     private $_generator;
@@ -39,8 +39,8 @@ 
     private $_link;
     private $_title;
     private $_description;
-    private $_lastfetchdate;    // Last successful fetch
-    private $_rssarray=array();
+    private $_lastfetchdate; // Last successful fetch
+    private $_rssarray = array();
 
     // For parsing with xmlparser
     var $stack               = array(); // parser stack
@@ -54,7 +54,7 @@ 
      */
     public function __construct($db)
     {
-    	$this->db=$db;
+    	$this->db = $db;
     }
 
     /**
@@ -177,40 +177,40 @@ 
      * 	@param	string	$cachedir	Directory where to save cache file
      *	@return	int					<0 if KO, >0 if OK
      */
-    public function parser($urlRSS, $maxNb=0, $cachedelay=60, $cachedir='')
+    public function parser($urlRSS, $maxNb = 0, $cachedelay = 60, $cachedir = '')
     {
         global $conf;
 
         include_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
 
-        $rss='';
-        $str='';    // This will contain content of feed
+        $rss = '';
+        $str = ''; // This will contain content of feed
 
         // Check parameters
-        if (! dol_is_url($urlRSS))
+        if (!dol_is_url($urlRSS))
         {
-            $this->error="ErrorBadUrl";
+            $this->error = "ErrorBadUrl";
             return -1;
         }
 
         $this->_urlRSS = $urlRSS;
-        $newpathofdestfile=$cachedir.'/'.dol_hash($this->_urlRSS,3);	// Force md5 hash (does not contains special chars)
-        $newmask='0644';
+        $newpathofdestfile = $cachedir.'/'.dol_hash($this->_urlRSS, 3); // Force md5 hash (does not contains special chars)
+        $newmask = '0644';
 
         //dol_syslog("RssPArser::parser parse url=".$urlRSS." => cache file=".$newpathofdestfile);
         $nowgmt = dol_now();
 
         // Search into cache
-        $foundintocache=0;
+        $foundintocache = 0;
         if ($cachedelay > 0 && $cachedir)
         {
-            $filedate=dol_filemtime($newpathofdestfile);
+            $filedate = dol_filemtime($newpathofdestfile);
             if ($filedate >= ($nowgmt - $cachedelay))
             {
                 //dol_syslog("RssParser::parser cache file ".$newpathofdestfile." is not older than now - cachedelay (".$nowgmt." - ".$cachedelay.") so we use it.");
-                $foundintocache=1;
+                $foundintocache = 1;
 
-                $this->_lastfetchdate=$filedate;
+                $this->_lastfetchdate = $filedate;
             }
             else
             {
@@ -226,13 +226,13 @@ 
         else
         {
             try {
-                ini_set("user_agent","Dolibarr ERP-CRM RSS reader");
+                ini_set("user_agent", "Dolibarr ERP-CRM RSS reader");
                 ini_set("max_execution_time", $conf->global->MAIN_USE_RESPONSE_TIMEOUT);
                 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);
 
@@ -246,7 +246,7 @@ 
         if ($str !== false)
         {
 	        // Convert $str into xml
-	        if (! empty($conf->global->EXTERNALRSS_USE_SIMPLEXML))
+	        if (!empty($conf->global->EXTERNALRSS_USE_SIMPLEXML))
 	        {
 	            //print 'xx'.LIBXML_NOCDATA;
 	            libxml_use_internal_errors(false);
@@ -254,9 +254,9 @@ 
 	        }
 	        else
 	        {
-	            $xmlparser=xml_parser_create('');
+	            $xmlparser = xml_parser_create('');
 	            if (!is_resource($xmlparser)) {
-	                $this->error="ErrorFailedToCreateParser"; return -1;
+	                $this->error = "ErrorFailedToCreateParser"; return -1;
 	            }
 
 	            xml_set_object($xmlparser, $this);
@@ -264,7 +264,7 @@ 
 	            xml_set_character_data_handler($xmlparser, 'feed_cdata');
 	            $status = xml_parse($xmlparser, $str);
 	            xml_parser_free($xmlparser);
-	            $rss=$this;
+	            $rss = $this;
 	            //var_dump($rss->_format);exit;
 	        }
         }
@@ -276,16 +276,16 @@ 
             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;
+	                $this->_lastfetchdate = $nowgmt;
                 }
                 else
                 {
@@ -293,21 +293,21 @@ 
                 }
             }
 
-            unset($str);    // Free memory
+            unset($str); // Free memory
 
             if (empty($rss->_format))    // If format not detected automatically
             {
-                $rss->_format='rss';
-                if (empty($rss->channel)) $rss->_format='atom';
+                $rss->_format = 'rss';
+                if (empty($rss->channel)) $rss->_format = 'atom';
             }
 
-            $items=array();
+            $items = array();
 
             // Save description entries
             if ($rss->_format == 'rss')
             {
                 //var_dump($rss);
-                if (! empty($conf->global->EXTERNALRSS_USE_SIMPLEXML))
+                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;
@@ -331,14 +331,14 @@ 
                     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')
             {
                 //var_dump($rss);
-                if (! empty($conf->global->EXTERNALRSS_USE_SIMPLEXML))
+                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;
@@ -357,10 +357,10 @@ 
                     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'];
+                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;
             }
 
@@ -369,12 +369,12 @@ 
             // Loop on each record
             if (is_array($items))
             {
-                foreach($items as $item)
+                foreach ($items as $item)
                 {
                     //var_dump($item);exit;
                     if ($rss->_format == 'rss')
                     {
-                        if (! empty($conf->global->EXTERNALRSS_USE_SIMPLEXML))
+                        if (!empty($conf->global->EXTERNALRSS_USE_SIMPLEXML))
                         {
                             $itemLink = (string) $item->link;
                             $itemTitle = (string) $item->title;
@@ -394,7 +394,7 @@ 
                         }
 
                         // Loop on each category
-                        $itemCategory=array();
+                        $itemCategory = array();
                         if (is_array($item->category))
                         {
                             foreach ($item->category as $cat)
@@ -405,14 +405,14 @@ 
                     }
                     else if ($rss->_format == 'atom')
                     {
-                        if (! empty($conf->global->EXTERNALRSS_USE_SIMPLEXML))
+                        if (!empty($conf->global->EXTERNALRSS_USE_SIMPLEXML))
                         {
                             $itemLink = (isset($item['link']['href']) ? (string) $item['link']['href'] : '');
                             $itemTitle = (string) $item['title'];
                             $itemDescription = (string) $item['summary'];
                             $itemPubDate = (string) $item['created'];
                             $itemId = (string) $item['id'];
-                            $itemAuthor = (string) ($item['author']?$item['author']:$item['author_name']);
+                            $itemAuthor = (string) ($item['author'] ? $item['author'] : $item['author_name']);
                         }
                         else
                         {
@@ -421,7 +421,7 @@ 
                             $itemDescription = (string) $item['summary'];
                             $itemPubDate = (string) $item['created'];
                             $itemId = (string) $item['id'];
-                            $itemAuthor = (string) ($item['author']?$item['author']:$item['author_name']);
+                            $itemAuthor = (string) ($item['author'] ? $item['author'] : $item['author_name']);
                         }
                     }
                     else print 'ErrorBadFeedFormat';
@@ -439,7 +439,7 @@ 
 
                     $i++;
 
-                    if ($i > $maxNb)    break;    // We get all records we want
+                    if ($i > $maxNb)    break; // We get all records we want
                 }
             }
 
@@ -447,7 +447,7 @@ 
         }
         else
         {
-            $this->error='ErrorFailedToLoadRSSFile';
+            $this->error = 'ErrorFailedToLoadRSSFile';
             return -1;
         }
     }
@@ -473,7 +473,7 @@ 
         {
             list($ns, $el) = explode(':', $element, 2);
         }
-        if ( $ns and $ns != 'rdf' )
+        if ($ns and $ns != 'rdf')
         {
             $this->current_namespace = $ns;
         }
@@ -481,15 +481,15 @@ 
         // if feed type isn't set, then this is first element of feed identify feed from root element
         if (empty($this->_format))
         {
-            if ( $el == 'rdf' ) {
+            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;
@@ -497,14 +497,14 @@ 
             return;
         }
 
-        if ( $el == 'channel' )
+        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']) ) {
+            if (isset($attrs['rdf:about'])) {
                 $this->current_item['about'] = $attrs['rdf:about'];
             }
         }
@@ -528,10 +528,10 @@ 
         }
 
         // handle atom content constructs
-        elseif ( $this->_format == 'atom' and in_array($el, $this->_CONTENT_CONSTRUCTS) )
+        elseif ($this->_format == 'atom' and in_array($el, $this->_CONTENT_CONSTRUCTS))
         {
             // avoid clashing w/ RSS mod_content
-            if ($el == 'content' ) {
+            if ($el == 'content') {
                 $el = 'atom_content';
             }
 
@@ -541,7 +541,7 @@ 
         }
 
         // if inside an Atom content construct (e.g. content or summary) field treat tags as text
-        elseif ($this->_format == 'atom' and $this->incontent )
+        elseif ($this->_format == 'atom' and $this->incontent)
         {
             // if tags are inlined, then flatten
             $attrs_str = join(' ', array_map('map_attrs', array_keys($attrs), array_values($attrs)));
@@ -555,14 +555,14 @@ 
         // Magpie treats link elements of type rel='alternate'
         // as being equivalent to RSS's simple link element.
         //
-        elseif ($this->_format == 'atom' and $el == 'link' )
+        elseif ($this->_format == 'atom' and $el == 'link')
         {
-            if ( isset($attrs['rel']) && $attrs['rel'] == 'alternate' )
+            if (isset($attrs['rel']) && $attrs['rel'] == 'alternate')
             {
                 $link_el = 'link';
             }
             else {
-                $link_el = 'link_' . $attrs['rel'];
+                $link_el = 'link_'.$attrs['rel'];
             }
 
             $this->append($link_el, $attrs['href']);
@@ -611,26 +611,26 @@ 
             $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 )
+            if ($this->stack[0] == $el)
             {
                 $this->append_content("</$el>");
             }
@@ -655,10 +655,10 @@ 
      *  @param	string	$str2		Str2
      *  @return	string				String cancatenated
      */
-    function concat(&$str1, $str2="")
+    function concat(&$str1, $str2 = "")
     {
-        if (!isset($str1) ) {
-            $str1="";
+        if (!isset($str1)) {
+            $str1 = "";
         }
         $str1 .= $str2;
     }
@@ -671,11 +671,11 @@ 
      */
     function append_content($text)
     {
-        if ( $this->initem ) {
-            $this->concat($this->current_item[ $this->incontent ], $text);
+        if ($this->initem) {
+            $this->concat($this->current_item[$this->incontent], $text);
         }
-        elseif ( $this->inchannel ) {
-            $this->concat($this->channel[ $this->incontent ], $text);
+        elseif ($this->inchannel) {
+            $this->concat($this->channel[$this->incontent], $text);
         }
     }
 
@@ -691,33 +691,33 @@ 
         if (!$el) {
             return;
         }
-        if ( $this->current_namespace )
+        if ($this->current_namespace)
         {
-            if ( $this->initem ) {
-                $this->concat($this->current_item[ $this->current_namespace ][ $el ], $text);
+            if ($this->initem) {
+                $this->concat($this->current_item[$this->current_namespace][$el], $text);
             }
             elseif ($this->inchannel) {
-                $this->concat($this->channel[ $this->current_namespace][ $el ], $text);
+                $this->concat($this->channel[$this->current_namespace][$el], $text);
             }
             elseif ($this->intextinput) {
-                $this->concat($this->textinput[ $this->current_namespace][ $el ], $text);
+                $this->concat($this->textinput[$this->current_namespace][$el], $text);
             }
             elseif ($this->inimage) {
-                $this->concat($this->image[ $this->current_namespace ][ $el ], $text);
+                $this->concat($this->image[$this->current_namespace][$el], $text);
             }
         }
         else {
-            if ( $this->initem ) {
-                $this->concat($this->current_item[ $el ], $text);
+            if ($this->initem) {
+                $this->concat($this->current_item[$el], $text);
             }
             elseif ($this->intextinput) {
-                $this->concat($this->textinput[ $el ], $text);
+                $this->concat($this->textinput[$el], $text);
             }
             elseif ($this->inimage) {
-                $this->concat($this->image[ $el ], $text);
+                $this->concat($this->image[$el], $text);
             }
             elseif ($this->inchannel) {
-                $this->concat($this->channel[ $el ], $text);
+                $this->concat($this->channel[$el], $text);
             }
 
         }
@@ -737,19 +737,19 @@ 
     $fils = 0;
     $tab = false;
     $array = array();
-    foreach($xml->children() as $key => $value)
+    foreach ($xml->children() as $key => $value)
     {
         $child = xml2php($value);
 
         //To deal with the attributes
-        foreach($value->attributes() as $ak=>$av)
+        foreach ($value->attributes() as $ak=>$av)
         {
             $child[$ak] = (string) $av;
 
         }
 
         //Let see if the new child is not in the array
-        if($tab==false && in_array($key,array_keys($array)))
+        if ($tab == false && in_array($key, array_keys($array)))
         {
             //If this element is already in the array we will create an indexed array
             $tmp = $array[$key];
@@ -758,7 +758,7 @@ 
             $array[$key][] = $child;
             $tab = true;
         }
-        elseif($tab == true)
+        elseif ($tab == true)
         {
             //Add an element in an existing array
             $array[$key][] = $child;
@@ -773,7 +773,7 @@ 
     }
 
 
-    if($fils==0)
+    if ($fils == 0)
     {
         return (string) $xml;
     }

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()
 	{

Indentation +229 added lines, -229 removed lines

@@ -44,7 +44,7 @@ 
 	/** @var resource Resultset of last query */
 	private $_results;
 
-    /**
+	/**
 	 *	Constructor.
 	 *	This create an opened connexion to a database server and eventually to a database
 	 *
@@ -54,14 +54,14 @@ 
 	 *	@param	    string	$pass		Mot de passe
 	 *	@param	    string	$name		Nom de la database
 	 *	@param	    int		$port		Port of database server
-     */
+	 */
 	function __construct($type, $host, $user, $pass, $name='', $port=0)
 	{
 		global $langs;
 
 		$this->database_user=$user;
-        $this->database_host=$host;
-        $this->database_port=$port;
+		$this->database_host=$host;
+		$this->database_port=$port;
 		$this->transaction_opened=0;
 
 		if (! function_exists("mssql_connect"))
@@ -127,13 +127,13 @@ 
 		return $this->ok;
 	}
 
-    /**
-     *  Convert a SQL request in Mysql syntax to native syntax
-     *
-     *  @param     string	$line   SQL request line to convert
-     *  @param     string	$type	Type of SQL order ('ddl' for insert, update, select, delete or 'dml' for create, alter...)
-     *  @return    string   		SQL request line converted
-     */
+	/**
+	 *  Convert a SQL request in Mysql syntax to native syntax
+	 *
+	 *  @param     string	$line   SQL request line to convert
+	 *  @param     string	$type	Type of SQL order ('ddl' for insert, update, select, delete or 'dml' for create, alter...)
+	 *  @return    string   		SQL request line converted
+	 */
 	static function convertSQLFromMysql($line,$type='ddl')
 	{
 		return $line;
@@ -173,11 +173,11 @@ 
 		//$this->query('SET NAMES '.$this->forcecharset);
 		//print "Resultat fonction connect: ".$this->db;
 		$set_options=array('SET ANSI_PADDING ON;',
-		    "SET ANSI_NULLS ON;",
-		    "SET ANSI_WARNINGS ON;",
-		    "SET ARITHABORT ON;",
-		    "SET CONCAT_NULL_YIELDS_NULL ON;",
-		    "SET QUOTED_IDENTIFIER ON;"
+			"SET ANSI_NULLS ON;",
+			"SET ANSI_WARNINGS ON;",
+			"SET ARITHABORT ON;",
+			"SET CONCAT_NULL_YIELDS_NULL ON;",
+			"SET QUOTED_IDENTIFIER ON;"
 		);
 		mssql_query(implode(' ',$set_options),$this->db);
 
@@ -194,8 +194,8 @@ 
 		$resql=$this->query("SELECT @@VERSION");
 		if ($resql)
 		{
-            $version=$this->fetch_array($resql);
-            return $version['computed'];
+			$version=$this->fetch_array($resql);
+			return $version['computed'];
 		}
 		else return '';
 	}
@@ -210,22 +210,22 @@ 
 		return 'php mssql driver';
 	}
 
-    /**
-     *  Close database connexion
-     *
-     *  @return     bool     True if disconnect successfull, false otherwise
-     *  @see        connect
-     */
-    function close()
-    {
-        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);
-          $this->connected=false;
-          return mssql_close($this->db);
-        }
-        return false;
-    }
+	/**
+	 *  Close database connexion
+	 *
+	 *  @return     bool     True if disconnect successfull, false otherwise
+	 *  @see        connect
+	 */
+	function close()
+	{
+		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);
+		  $this->connected=false;
+		  return mssql_close($this->db);
+		}
+		return false;
+	}
 
 
 	/**
@@ -236,12 +236,12 @@ 
 	function begin()
 	{
 
-	    $res=mssql_query('select @@TRANCOUNT');
-	    $this->transaction_opened=mssql_result($res, 0, 0);
+		$res=mssql_query('select @@TRANCOUNT');
+		$this->transaction_opened=mssql_result($res, 0, 0);
 
-	    if ($this->transaction_opened == 0)
+		if ($this->transaction_opened == 0)
 		{
-		    //return 1; //There is a mess with auto_commit and 'SET IMPLICIT_TRANSACTIONS ON' generate also a mess
+			//return 1; //There is a mess with auto_commit and 'SET IMPLICIT_TRANSACTIONS ON' generate also a mess
 			$ret=mssql_query("SET IMPLICIT_TRANSACTIONS OFF;BEGIN TRANSACTION;",$this->db);
 			if ($ret)
 			{
@@ -256,19 +256,19 @@ 
 	}
 
 	/**
-     * Validate a database transaction
-     *
-     * @param	string	$log        Add more log to default log line
-     * @return  bool         		true if validation is OK or transaction level no started, false if ERROR
+	 * Validate a database transaction
+	 *
+	 * @param	string	$log        Add more log to default log line
+	 * @return  bool         		true if validation is OK or transaction level no started, false if ERROR
 	 */
 	function commit($log='')
 	{
-	    $res=mssql_query('select @@TRANCOUNT');
-	    $this->transaction_opened=mssql_result($res, 0, 0);
+		$res=mssql_query('select @@TRANCOUNT');
+		$this->transaction_opened=mssql_result($res, 0, 0);
 
 		if ($this->transaction_opened == 1)
 		{
-		    //return 1; //There is a mess with auto_commit and 'SET IMPLICIT_TRANSACTION ON' generate also a mess
+			//return 1; //There is a mess with auto_commit and 'SET IMPLICIT_TRANSACTION ON' generate also a mess
 			$ret=mssql_query("COMMIT TRANSACTION",$this->db);
 			if ($ret)
 			{
@@ -296,8 +296,8 @@ 
 	 */
 	function rollback($log='')
 	{
-	    $res=mssql_query('select @@TRANCOUNT');
-	    $this->transaction_opened=mssql_result($res, 0, 0);
+		$res=mssql_query('select @@TRANCOUNT');
+		$this->transaction_opened=mssql_result($res, 0, 0);
 
 		if ($this->transaction_opened == 1)
 		{
@@ -314,13 +314,13 @@ 
 	}
 
 	/**
-     *  Execute a SQL request and return the resultset
-     *
-     *  @param	string	$query          SQL query string
-     *  @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
+	 *  Execute a SQL request and return the resultset
+	 *
+	 *  @param	string	$query          SQL query string
+	 *  @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
 	 */
 	function query($query,$usesavepoint=0,$type='auto')
 	{
@@ -337,85 +337,85 @@ 
 
 		if ($type=="auto" || $type='dml')
 		{
-    		$query=preg_replace('/AUTO_INCREMENT/i','IDENTITY',$query);
-    		$query=preg_replace('/double/i','float',$query);
-    		$query=preg_replace('/float\((.*)\)/','numeric($1)',$query);
-    		$query=preg_replace('/([ \t])unsigned|IF NOT EXISTS[ \t]/i','$1',$query);
-    		$query=preg_replace('/([ \t])(MEDIUM|TINY|LONG){0,1}TEXT([ \t,])/i',"$1VARCHAR(MAX)$3",$query);
-
-    		$matches=array();
-    		$original_query='';
-    		if (preg_match('/ALTER TABLE\h+(\w+?)\h+ADD\h+(?:(UNIQUE)|INDEX)\h+(?:INDEX)?\h*(\w+?)\h*\((.+)\)/is', $query,$matches))
-    		{
-                $original_query=$query;
-                $query="CREATE ".trim($matches[2])." INDEX [".trim($matches[3])."] ON [".trim($matches[1])."] (".trim($matches[4]).")";
-                if ($matches[2]) {
-                    //check if columun is nullable cause Sql server only allow 1 null value if unique index.
-                    $fields=explode(",",trim($matches[4]));
-                    $fields_clear=array_map('trim',$fields);
-                    $infos=$this->GetFieldInformation(trim($matches[1]), $fields_clear);
-                    $query_comp=array();
-                    foreach($infos as $fld) {
-                        if ($fld->IS_NULLABLE == 'YES') {
-                            $query_comp[]=$fld->COLUMN_NAME." IS NOT NULL";
-                        }
-                    }
-                    if (! empty($query_comp))
-                        $query.=" WHERE ".implode(" AND ",$query_comp);
-                }
-    		}
-    		else
-    		{
-    		    if (preg_match('/ALTER TABLE\h+(\w+?)\h+ADD\h+PRIMARY\h+KEY\h+(\w+?)\h*\((.+)\)/is', $query, $matches))
-    		    {
-                    $original_query=$query;
-                    $query="ALTER TABLE [".$matches[1]."] ADD CONSTRAINT [".$matches[2]."] PRIMARY KEY CLUSTERED (".$matches[3].")";
-    		    }
-    		}
+			$query=preg_replace('/AUTO_INCREMENT/i','IDENTITY',$query);
+			$query=preg_replace('/double/i','float',$query);
+			$query=preg_replace('/float\((.*)\)/','numeric($1)',$query);
+			$query=preg_replace('/([ \t])unsigned|IF NOT EXISTS[ \t]/i','$1',$query);
+			$query=preg_replace('/([ \t])(MEDIUM|TINY|LONG){0,1}TEXT([ \t,])/i',"$1VARCHAR(MAX)$3",$query);
+
+			$matches=array();
+			$original_query='';
+			if (preg_match('/ALTER TABLE\h+(\w+?)\h+ADD\h+(?:(UNIQUE)|INDEX)\h+(?:INDEX)?\h*(\w+?)\h*\((.+)\)/is', $query,$matches))
+			{
+				$original_query=$query;
+				$query="CREATE ".trim($matches[2])." INDEX [".trim($matches[3])."] ON [".trim($matches[1])."] (".trim($matches[4]).")";
+				if ($matches[2]) {
+					//check if columun is nullable cause Sql server only allow 1 null value if unique index.
+					$fields=explode(",",trim($matches[4]));
+					$fields_clear=array_map('trim',$fields);
+					$infos=$this->GetFieldInformation(trim($matches[1]), $fields_clear);
+					$query_comp=array();
+					foreach($infos as $fld) {
+						if ($fld->IS_NULLABLE == 'YES') {
+							$query_comp[]=$fld->COLUMN_NAME." IS NOT NULL";
+						}
+					}
+					if (! empty($query_comp))
+						$query.=" WHERE ".implode(" AND ",$query_comp);
+				}
+			}
+			else
+			{
+				if (preg_match('/ALTER TABLE\h+(\w+?)\h+ADD\h+PRIMARY\h+KEY\h+(\w+?)\h*\((.+)\)/is', $query, $matches))
+				{
+					$original_query=$query;
+					$query="ALTER TABLE [".$matches[1]."] ADD CONSTRAINT [".$matches[2]."] PRIMARY KEY CLUSTERED (".$matches[3].")";
+				}
+			}
 
 		}
 
 		if ($type=="auto" || $type='ddl')
 		{
-    		$itemfound = stripos($query, " limit ");
-    		if ($itemfound !== false) {
-    			// Extraire le nombre limite
-    			$number = stristr($query, " limit ");
-    			$number = substr($number, 7);
-    			// Inserer l'instruction TOP et le nombre limite
-    			$query = str_ireplace("select ", "select top ".$number." ", $query);
-    			// Supprimer l'instruction MySql
-    			$query = str_ireplace(" limit ".$number, "", $query);
-    		}
-
-    		$itemfound = stripos($query, " week(");
-    		if ($itemfound !== false) {
-    			// Recreer une requete sans instruction Mysql
-    			$positionMySql = stripos($query, " week(");
-    			$newquery = substr($query, 0, $positionMySql);
-
-    			// Recuperer la date passee en parametre
-    			$extractvalue = stristr($query, " week(");
-    			$extractvalue = substr($extractvalue, 6);
-    			$positionMySql = stripos($extractvalue, ")");
-    			// Conserver la fin de la requete
-    			$endofquery = substr($extractvalue, $positionMySql);
-    			$extractvalue = substr($extractvalue, 0, $positionMySql);
-
-    			// Remplacer l'instruction MySql en Sql Server
-    			// Inserer la date en parametre et le reste de la requete
-    			$query = $newquery." DATEPART(week, ".$extractvalue.$endofquery;
-    		}
-    	   if (preg_match('/^insert\h+(?:INTO)?\h*(\w+?)\h*\(.*\b(?:row)?id\b.*\)\h+VALUES/i',$query,$matches))
-    	   {
-    	       //var_dump($query);
-    	       //var_dump($matches);
-    	       //if (stripos($query,'llx_c_departements') !== false) var_dump($query);
-    	       $sql='SET IDENTITY_INSERT ['.trim($matches[1]).'] ON;';
-    	       @mssql_query($sql, $this->db);
-    	       $post_query='SET IDENTITY_INSERT ['.trim($matches[1]).'] OFF;';
-
-    	   }
+			$itemfound = stripos($query, " limit ");
+			if ($itemfound !== false) {
+				// Extraire le nombre limite
+				$number = stristr($query, " limit ");
+				$number = substr($number, 7);
+				// Inserer l'instruction TOP et le nombre limite
+				$query = str_ireplace("select ", "select top ".$number." ", $query);
+				// Supprimer l'instruction MySql
+				$query = str_ireplace(" limit ".$number, "", $query);
+			}
+
+			$itemfound = stripos($query, " week(");
+			if ($itemfound !== false) {
+				// Recreer une requete sans instruction Mysql
+				$positionMySql = stripos($query, " week(");
+				$newquery = substr($query, 0, $positionMySql);
+
+				// Recuperer la date passee en parametre
+				$extractvalue = stristr($query, " week(");
+				$extractvalue = substr($extractvalue, 6);
+				$positionMySql = stripos($extractvalue, ")");
+				// Conserver la fin de la requete
+				$endofquery = substr($extractvalue, $positionMySql);
+				$extractvalue = substr($extractvalue, 0, $positionMySql);
+
+				// Remplacer l'instruction MySql en Sql Server
+				// Inserer la date en parametre et le reste de la requete
+				$query = $newquery." DATEPART(week, ".$extractvalue.$endofquery;
+			}
+		   if (preg_match('/^insert\h+(?:INTO)?\h*(\w+?)\h*\(.*\b(?:row)?id\b.*\)\h+VALUES/i',$query,$matches))
+		   {
+			   //var_dump($query);
+			   //var_dump($matches);
+			   //if (stripos($query,'llx_c_departements') !== false) var_dump($query);
+			   $sql='SET IDENTITY_INSERT ['.trim($matches[1]).'] ON;';
+			   @mssql_query($sql, $this->db);
+			   $post_query='SET IDENTITY_INSERT ['.trim($matches[1]).'] OFF;';
+
+		   }
 		}
 		//print "<!--".$query."-->";
 
@@ -433,7 +433,7 @@ 
 
 		if (!empty($post_query))
 		{
-		    @mssql_query($post_query, $this->db);
+			@mssql_query($post_query, $this->db);
 		}
 
 		if (! preg_match("/^COMMIT/i",$query) && ! preg_match("/^ROLLBACK/i",$query))
@@ -444,7 +444,7 @@ 
 				$result = mssql_query("SELECT @@ERROR as code", $this->db);
 				$row = mssql_fetch_array($result);
 
-                $this->lastqueryerror = $query;
+				$this->lastqueryerror = $query;
 				$this->lasterror = $this->error();
 				$this->lasterrno = $row["code"];
 
@@ -473,10 +473,10 @@ 
 	}
 
 	/**
-     *	Return datas as an array
-     *
-     *	@param	resource	$resultset  Resultset of request
-     *	@return	array|false				Array or false if KO or end of cursor
+	 *	Return datas as an array
+	 *
+	 *	@param	resource	$resultset  Resultset of request
+	 *	@return	array|false				Array or false if KO or end of cursor
 	 */
 	function fetch_array($resultset)
 	{
@@ -487,10 +487,10 @@ 
 
 
 	/**
-     *	Return datas as an array
-     *
-     *	@param	resource	$resultset  Resultset of request
-     *	@return	array|false				Array or false if KO or end of cursor
+	 *	Return datas as an array
+	 *
+	 *	@param	resource	$resultset  Resultset of request
+	 *	@return	array|false				Array or false if KO or end of cursor
 	 */
 	function fetch_row($resultset)
 	{
@@ -500,11 +500,11 @@ 
 	}
 
 	/**
-     *	Return number of lines for result of a SELECT
-     *
-     *	@param	resource	$resultset  Resulset of requests
-     *	@return int		    			Nb of lines
-     *	@see    affected_rows
+	 *	Return number of lines for result of a SELECT
+	 *
+	 *	@param	resource	$resultset  Resulset of requests
+	 *	@return int		    			Nb of lines
+	 *	@see    affected_rows
 	 */
 	function num_rows($resultset)
 	{
@@ -571,9 +571,9 @@ 
 	}
 
 	/**
-     *	Return generic error code of last operation.
-     *
-     *	@return	string		Error code (Exemples: DB_ERROR_TABLE_ALREADY_EXISTS, DB_ERROR_RECORD_ALREADY_EXISTS...)
+	 *	Return generic error code of last operation.
+	 *
+	 *	@return	string		Error code (Exemples: DB_ERROR_TABLE_ALREADY_EXISTS, DB_ERROR_RECORD_ALREADY_EXISTS...)
 	 */
 	function errno()
 	{
@@ -660,12 +660,12 @@ 
 	}
 
 	/**
-     *  Encrypt sensitive data in database
-     *  Warning: This function includes the escape, so it must use direct value
-     *
-     *  @param  string  $fieldorvalue   Field name or value to encrypt
-     *  @param	int		$withQuotes     Return string with quotes
-     *  @return string          		XXX(field) or XXX('value') or field or 'value'
+	 *  Encrypt sensitive data in database
+	 *  Warning: This function includes the escape, so it must use direct value
+	 *
+	 *  @param  string  $fieldorvalue   Field name or value to encrypt
+	 *  @param	int		$withQuotes     Return string with quotes
+	 *  @return string          		XXX(field) or XXX('value') or field or 'value'
 	 */
 	function encrypt($fieldorvalue, $withQuotes=0)
 	{
@@ -682,10 +682,10 @@ 
 	}
 
 	/**
-     *	Decrypt sensitive data in database
-     *
-     *	@param	string	$value			Value to decrypt
-     * 	@return	string					Decrypted value if used
+	 *	Decrypt sensitive data in database
+	 *
+	 *	@param	string	$value			Value to decrypt
+	 * 	@return	string					Decrypted value if used
 	 */
 	function decrypt($value)
 	{
@@ -712,8 +712,8 @@ 
 		$resql=$this->query('SELECT CONNECTION_ID()');
 		if ($resql)
 		{
-            $row=$this->fetch_row($resql);
-            return $row[0];
+			$row=$this->fetch_row($resql);
+			return $row[0];
 		}
 		else return '?';
 	}
@@ -731,12 +731,12 @@ 
 	 */
 	function DDLCreateDb($database,$charset='',$collation='',$owner='')
 	{
-        /*if (empty($charset))   $charset=$this->forcecharset;
+		/*if (empty($charset))   $charset=$this->forcecharset;
         if (empty($collation)) $collation=$this->forcecollate;
         */
 
 		$sql = 'CREATE DATABASE '.$this->EscapeFieldName($database);
-        //TODO: Check if we need to force a charset
+		//TODO: Check if we need to force a charset
 		//$sql.= ' DEFAULT CHARACTER SET '.$charset.' DEFAULT COLLATE '.$collation;
 		$ret=$this->query($sql);
 
@@ -747,11 +747,11 @@ 
 		mssql_query($sql,$this->db);
 
 		$sql="ALTER DATABASE [$database] SET ANSI_NULL_DEFAULT ON;";
-	    @mssql_query($sql,$this->db);
-	    $sql="ALTER DATABASE [$database] SET ANSI_NULL ON;";
-	    @mssql_query($sql,$this->db);
+		@mssql_query($sql,$this->db);
+		$sql="ALTER DATABASE [$database] SET ANSI_NULL ON;";
+		@mssql_query($sql,$this->db);
 
-	    return $ret;
+		return $ret;
 	}
 
 	/**
@@ -759,7 +759,7 @@ 
 	 *
 	 *  @param	string		$database	Name of database
 	 *  @param	string		$table		Nmae of table filter ('xxx%')
-     *  @return	array					List of tables in an array
+	 *  @return	array					List of tables in an array
 	 */
 	function DDLListTables($database,$table='')
 	{
@@ -968,48 +968,48 @@ 
 	 */
 	function DDLCreateUser($dolibarr_main_db_host,$dolibarr_main_db_user,$dolibarr_main_db_pass,$dolibarr_main_db_name)
 	{
-	    $sql = "CREATE LOGIN ".$this->EscapeFieldName($dolibarr_main_db_user)." WITH PASSWORD='$dolibarr_main_db_pass'";
-        dol_syslog(get_class($this)."::DDLCreateUser", LOG_DEBUG);	// No sql to avoid password in log
-        $resql=$this->query($sql);
-        if (! $resql)
-        {
-            if ($this->lasterrno != '15025')
-            {
-	            return -1;
-            }
-            else
+		$sql = "CREATE LOGIN ".$this->EscapeFieldName($dolibarr_main_db_user)." WITH PASSWORD='$dolibarr_main_db_pass'";
+		dol_syslog(get_class($this)."::DDLCreateUser", LOG_DEBUG);	// No sql to avoid password in log
+		$resql=$this->query($sql);
+		if (! $resql)
+		{
+			if ($this->lasterrno != '15025')
 			{
-            	// If user already exists, we continue to set permissions
-            	dol_syslog(get_class($this)."::DDLCreateUser sql=".$sql, LOG_WARNING);
-            }
-        }
-        $sql="SELECT name from sys.databases where name='".$dolibarr_main_db_name."'";
-        $ressql=$this->query($sql);
-        if (! $ressql)
-        {
-            dol_syslog(get_class($this)."::DDLCreateUser sql=".$sql, LOG_WARNING);
-            return -1;
-        }
-        else
-        {
-            if ($num)
-            {
-                $this->select_db($dolibarr_main_db_name);
-                $sql="CREATE USER [$dolibarr_main_db_user] FOR LOGIN [$dolibarr_main_db_user]";
-                $this->query($sql);
-                $sql="ALTER ROLE [db_owner] ADD MEMBER [$dolibarr_main_db_user]";
-                $this->query($sql);
-            }
-        }
-	    return 1;
+				return -1;
+			}
+			else
+			{
+				// If user already exists, we continue to set permissions
+				dol_syslog(get_class($this)."::DDLCreateUser sql=".$sql, LOG_WARNING);
+			}
+		}
+		$sql="SELECT name from sys.databases where name='".$dolibarr_main_db_name."'";
+		$ressql=$this->query($sql);
+		if (! $ressql)
+		{
+			dol_syslog(get_class($this)."::DDLCreateUser sql=".$sql, LOG_WARNING);
+			return -1;
+		}
+		else
+		{
+			if ($num)
+			{
+				$this->select_db($dolibarr_main_db_name);
+				$sql="CREATE USER [$dolibarr_main_db_user] FOR LOGIN [$dolibarr_main_db_user]";
+				$this->query($sql);
+				$sql="ALTER ROLE [db_owner] ADD MEMBER [$dolibarr_main_db_user]";
+				$this->query($sql);
+			}
+		}
+		return 1;
 	}
 
-    /**
-     *	Return charset used to store data in database
-     *
-     *	@return		string		Charset
-     */
-    function getDefaultCharacterSetDatabase()
+	/**
+	 *	Return charset used to store data in database
+	 *
+	 *	@return		string		Charset
+	 */
+	function getDefaultCharacterSetDatabase()
 	{
 		// FIXME: Dummy method
 		// TODO: Implement
@@ -1069,7 +1069,7 @@ 
 		// FIXME: Dummy method
 		// TODO: Implement
 
-	    return '';
+		return '';
 	}
 
 	/**
@@ -1082,7 +1082,7 @@ 
 		// FIXME: Dummy method
 		// TODO: Implement
 
-	    return '';
+		return '';
 	}
 
 	/**
@@ -1123,7 +1123,7 @@ 
 	 * @return     string              field's name escaped
 	 */
 	function EscapeFieldName($fieldname) {
-	    return "[".$fieldname."]";
+		return "[".$fieldname."]";
 	}
 
 
@@ -1135,28 +1135,28 @@ 
 	 * @return false|object
 	 */
 	function GetFieldInformation($table,$fields) {
-	    $sql="SELECT * from INFORMATION_SCHEMA.COLUMNS WHERE TABLE_NAME='".$this->escape($table)."' AND COLUMN_NAME";
-	    if (is_array($fields))
-	    {
-	        $where=" IN ('".implode("','",$fields)."')";
-	    }
-	    else
-	    {
-	        $where="='".$this->escape($fields)."'";
-	    }
-	    $result=array();
-	    $ret=mssql_query($sql.$where,$this->db);
-	    if ($ret)
-	    {
-	        while($obj=mssql_fetch_object($ret))
-	        {
-	            $result[]=$obj;
-	        }
-	    }
-	    else
-	        return false;
-
-	    return $result;
+		$sql="SELECT * from INFORMATION_SCHEMA.COLUMNS WHERE TABLE_NAME='".$this->escape($table)."' AND COLUMN_NAME";
+		if (is_array($fields))
+		{
+			$where=" IN ('".implode("','",$fields)."')";
+		}
+		else
+		{
+			$where="='".$this->escape($fields)."'";
+		}
+		$result=array();
+		$ret=mssql_query($sql.$where,$this->db);
+		if ($ret)
+		{
+			while($obj=mssql_fetch_object($ret))
+			{
+				$result[]=$obj;
+			}
+		}
+		else
+			return false;
+
+		return $result;
 	}
 
 }

Spacing +178 added lines, -178 removed lines

@@ -24,7 +24,7 @@ 
  *	\brief			Fichier de la classe permettant de gerer une base MSSQL
  */
 
-require_once DOL_DOCUMENT_ROOT .'/core/db/DoliDB.class.php';
+require_once DOL_DOCUMENT_ROOT.'/core/db/DoliDB.class.php';
 
 /**
  *	Classe de gestion de la database de dolibarr
@@ -32,15 +32,15 @@ 
 class DoliDBMssql extends DoliDB
 {
 	//! Database type
-	public $type='mssql';
+	public $type = 'mssql';
 	//! Database label
-	const LABEL='MSSQL';
+	const LABEL = 'MSSQL';
 	//! Charset used to force charset when creating database
-	var $forcecharset='latin1';      // Can't be static as it may be forced with a dynamic value
+	var $forcecharset = 'latin1'; // Can't be static as it may be forced with a dynamic value
 	//! Collate used to force collate when creating database
-	var $forcecollate='latin1_swedish_ci';      // Can't be static as it may be forced with a dynamic value
+	var $forcecollate = 'latin1_swedish_ci'; // Can't be static as it may be forced with a dynamic value
 	//! Version min database
-	const VERSIONMIN='2000';
+	const VERSIONMIN = '2000';
 	/** @var resource Resultset of last query */
 	private $_results;
 
@@ -55,30 +55,30 @@ 
 	 *	@param	    string	$name		Nom de la database
 	 *	@param	    int		$port		Port of database server
      */
-	function __construct($type, $host, $user, $pass, $name='', $port=0)
+	function __construct($type, $host, $user, $pass, $name = '', $port = 0)
 	{
 		global $langs;
 
-		$this->database_user=$user;
-        $this->database_host=$host;
-        $this->database_port=$port;
-		$this->transaction_opened=0;
+		$this->database_user = $user;
+        $this->database_host = $host;
+        $this->database_port = $port;
+		$this->transaction_opened = 0;
 
-		if (! function_exists("mssql_connect"))
+		if (!function_exists("mssql_connect"))
 		{
 			$this->connected = false;
 			$this->ok = false;
-			$this->error="Mssql PHP functions for using MSSql driver are not available in this version of PHP";
-			dol_syslog(get_class($this)."::DoliDBMssql : MSsql PHP functions for using MSsql driver are not available in this version of PHP",LOG_ERR);
+			$this->error = "Mssql PHP functions for using MSSql driver are not available in this version of PHP";
+			dol_syslog(get_class($this)."::DoliDBMssql : MSsql PHP functions for using MSsql driver are not available in this version of PHP", LOG_ERR);
 			return $this->ok;
 		}
 
-		if (! $host)
+		if (!$host)
 		{
 			$this->connected = false;
 			$this->ok = false;
-			$this->error=$langs->trans("ErrorWrongHostParameter");
-			dol_syslog(get_class($this)."::DoliDBMssql : Erreur Connect, wrong host parameters",LOG_ERR);
+			$this->error = $langs->trans("ErrorWrongHostParameter");
+			dol_syslog(get_class($this)."::DoliDBMssql : Erreur Connect, wrong host parameters", LOG_ERR);
 			return $this->ok;
 		}
 
@@ -96,8 +96,8 @@ 
 			// host, login ou password incorrect
 			$this->connected = false;
 			$this->ok = false;
-			$this->error=mssql_get_last_message();
-			dol_syslog(get_class($this)."::DoliDBMssql : Erreur Connect mssql_get_last_message=".$this->error,LOG_ERR);
+			$this->error = mssql_get_last_message();
+			dol_syslog(get_class($this)."::DoliDBMssql : Erreur Connect mssql_get_last_message=".$this->error, LOG_ERR);
 		}
 
 		// Si connexion serveur ok et si connexion base demandee, on essaie connexion base
@@ -114,8 +114,8 @@ 
 				$this->database_selected = false;
 				$this->database_name = '';
 				$this->ok = false;
-				$this->error=$this->error();
-				dol_syslog(get_class($this)."::DoliDBMssql : Erreur Select_db ".$this->error,LOG_ERR);
+				$this->error = $this->error();
+				dol_syslog(get_class($this)."::DoliDBMssql : Erreur Select_db ".$this->error, LOG_ERR);
 			}
 		}
 		else
@@ -134,7 +134,7 @@ 
      *  @param     string	$type	Type of SQL order ('ddl' for insert, update, select, delete or 'dml' for create, alter...)
      *  @return    string   		SQL request line converted
      */
-	static function convertSQLFromMysql($line,$type='ddl')
+	static function convertSQLFromMysql($line, $type = 'ddl')
 	{
 		return $line;
 	}
@@ -161,25 +161,25 @@ 
 	 *	@return		false|resource|true	Database access handler
 	 *	@see		close
 	 */
-	function connect($host, $login, $passwd, $name, $port=0)
+	function connect($host, $login, $passwd, $name, $port = 0)
 	{
 		dol_syslog(get_class($this)."::connect host=$host, port=$port, login=$login, passwd=--hidden--, name=$name");
-		$newhost=$host;
-		if ($port) $newhost.=':'.$port;
-		$this->db  = @mssql_connect($newhost, $login, $passwd);
+		$newhost = $host;
+		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
 		// les nouvelles version de Dolibarr car force par l'install Dolibarr.
 		//$this->query('SET NAMES '.$this->forcecharset);
 		//print "Resultat fonction connect: ".$this->db;
-		$set_options=array('SET ANSI_PADDING ON;',
+		$set_options = array('SET ANSI_PADDING ON;',
 		    "SET ANSI_NULLS ON;",
 		    "SET ANSI_WARNINGS ON;",
 		    "SET ARITHABORT ON;",
 		    "SET CONCAT_NULL_YIELDS_NULL ON;",
 		    "SET QUOTED_IDENTIFIER ON;"
 		);
-		mssql_query(implode(' ',$set_options),$this->db);
+		mssql_query(implode(' ', $set_options), $this->db);
 
 		return $this->db;
 	}
@@ -191,10 +191,10 @@ 
 	 */
 	function getVersion()
 	{
-		$resql=$this->query("SELECT @@VERSION");
+		$resql = $this->query("SELECT @@VERSION");
 		if ($resql)
 		{
-            $version=$this->fetch_array($resql);
+            $version = $this->fetch_array($resql);
             return $version['computed'];
 		}
 		else return '';
@@ -220,8 +220,8 @@ 
     {
         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);
-          $this->connected=false;
+          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);
         }
         return false;
@@ -236,16 +236,16 @@ 
 	function begin()
 	{
 
-	    $res=mssql_query('select @@TRANCOUNT');
-	    $this->transaction_opened=mssql_result($res, 0, 0);
+	    $res = mssql_query('select @@TRANCOUNT');
+	    $this->transaction_opened = mssql_result($res, 0, 0);
 
 	    if ($this->transaction_opened == 0)
 		{
 		    //return 1; //There is a mess with auto_commit and 'SET IMPLICIT_TRANSACTIONS ON' generate also a mess
-			$ret=mssql_query("SET IMPLICIT_TRANSACTIONS OFF;BEGIN TRANSACTION;",$this->db);
+			$ret = mssql_query("SET IMPLICIT_TRANSACTIONS OFF;BEGIN TRANSACTION;", $this->db);
 			if ($ret)
 			{
-				dol_syslog("BEGIN Transaction",LOG_DEBUG);
+				dol_syslog("BEGIN Transaction", LOG_DEBUG);
 			}
 			return $ret;
 		}
@@ -261,18 +261,18 @@ 
      * @param	string	$log        Add more log to default log line
      * @return  bool         		true if validation is OK or transaction level no started, false if ERROR
 	 */
-	function commit($log='')
+	function commit($log = '')
 	{
-	    $res=mssql_query('select @@TRANCOUNT');
-	    $this->transaction_opened=mssql_result($res, 0, 0);
+	    $res = mssql_query('select @@TRANCOUNT');
+	    $this->transaction_opened = mssql_result($res, 0, 0);
 
 		if ($this->transaction_opened == 1)
 		{
 		    //return 1; //There is a mess with auto_commit and 'SET IMPLICIT_TRANSACTION ON' generate also a mess
-			$ret=mssql_query("COMMIT TRANSACTION",$this->db);
+			$ret = mssql_query("COMMIT TRANSACTION", $this->db);
 			if ($ret)
 			{
-				dol_syslog("COMMIT Transaction",LOG_DEBUG);
+				dol_syslog("COMMIT Transaction", LOG_DEBUG);
 				return true;
 			}
 			else
@@ -294,15 +294,15 @@ 
 	 * @param	string	$log	Add more log to default log line
 	 * @return	bool             true si annulation ok ou transaction non ouverte, false en cas d'erreur
 	 */
-	function rollback($log='')
+	function rollback($log = '')
 	{
-	    $res=mssql_query('select @@TRANCOUNT');
-	    $this->transaction_opened=mssql_result($res, 0, 0);
+	    $res = mssql_query('select @@TRANCOUNT');
+	    $this->transaction_opened = mssql_result($res, 0, 0);
 
 		if ($this->transaction_opened == 1)
 		{
-			$ret=mssql_query("ROLLBACK TRANSACTION",$this->db);
-			dol_syslog("ROLLBACK Transaction".($log?' '.$log:''),LOG_DEBUG);
+			$ret = mssql_query("ROLLBACK TRANSACTION", $this->db);
+			dol_syslog("ROLLBACK Transaction".($log ? ' '.$log : ''), LOG_DEBUG);
 			return $ret;
 		}
 		elseif ($this->transaction_opened > 1)
@@ -322,60 +322,60 @@ 
      *  @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
 	 */
-	function query($query,$usesavepoint=0,$type='auto')
+	function query($query, $usesavepoint = 0, $type = 'auto')
 	{
 		$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);
 		// Erreur SQL: cannot update timestamp field
 		$query = str_ireplace(", tms = tms", "", $query);
 
-		$query=preg_replace("/([. ,\t(])(percent|file|public)([. ,=\t)])/","$1[$2]$3",$query);
+		$query = preg_replace("/([. ,\t(])(percent|file|public)([. ,=\t)])/", "$1[$2]$3", $query);
 
-		if ($type=="auto" || $type='dml')
+		if ($type == "auto" || $type = 'dml')
 		{
-    		$query=preg_replace('/AUTO_INCREMENT/i','IDENTITY',$query);
-    		$query=preg_replace('/double/i','float',$query);
-    		$query=preg_replace('/float\((.*)\)/','numeric($1)',$query);
-    		$query=preg_replace('/([ \t])unsigned|IF NOT EXISTS[ \t]/i','$1',$query);
-    		$query=preg_replace('/([ \t])(MEDIUM|TINY|LONG){0,1}TEXT([ \t,])/i',"$1VARCHAR(MAX)$3",$query);
-
-    		$matches=array();
-    		$original_query='';
-    		if (preg_match('/ALTER TABLE\h+(\w+?)\h+ADD\h+(?:(UNIQUE)|INDEX)\h+(?:INDEX)?\h*(\w+?)\h*\((.+)\)/is', $query,$matches))
+    		$query = preg_replace('/AUTO_INCREMENT/i', 'IDENTITY', $query);
+    		$query = preg_replace('/double/i', 'float', $query);
+    		$query = preg_replace('/float\((.*)\)/', 'numeric($1)', $query);
+    		$query = preg_replace('/([ \t])unsigned|IF NOT EXISTS[ \t]/i', '$1', $query);
+    		$query = preg_replace('/([ \t])(MEDIUM|TINY|LONG){0,1}TEXT([ \t,])/i', "$1VARCHAR(MAX)$3", $query);
+
+    		$matches = array();
+    		$original_query = '';
+    		if (preg_match('/ALTER TABLE\h+(\w+?)\h+ADD\h+(?:(UNIQUE)|INDEX)\h+(?:INDEX)?\h*(\w+?)\h*\((.+)\)/is', $query, $matches))
     		{
-                $original_query=$query;
-                $query="CREATE ".trim($matches[2])." INDEX [".trim($matches[3])."] ON [".trim($matches[1])."] (".trim($matches[4]).")";
+                $original_query = $query;
+                $query = "CREATE ".trim($matches[2])." INDEX [".trim($matches[3])."] ON [".trim($matches[1])."] (".trim($matches[4]).")";
                 if ($matches[2]) {
                     //check if columun is nullable cause Sql server only allow 1 null value if unique index.
-                    $fields=explode(",",trim($matches[4]));
-                    $fields_clear=array_map('trim',$fields);
-                    $infos=$this->GetFieldInformation(trim($matches[1]), $fields_clear);
-                    $query_comp=array();
-                    foreach($infos as $fld) {
+                    $fields = explode(",", trim($matches[4]));
+                    $fields_clear = array_map('trim', $fields);
+                    $infos = $this->GetFieldInformation(trim($matches[1]), $fields_clear);
+                    $query_comp = array();
+                    foreach ($infos as $fld) {
                         if ($fld->IS_NULLABLE == 'YES') {
-                            $query_comp[]=$fld->COLUMN_NAME." IS NOT NULL";
+                            $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
     		{
     		    if (preg_match('/ALTER TABLE\h+(\w+?)\h+ADD\h+PRIMARY\h+KEY\h+(\w+?)\h*\((.+)\)/is', $query, $matches))
     		    {
-                    $original_query=$query;
-                    $query="ALTER TABLE [".$matches[1]."] ADD CONSTRAINT [".$matches[2]."] PRIMARY KEY CLUSTERED (".$matches[3].")";
+                    $original_query = $query;
+                    $query = "ALTER TABLE [".$matches[1]."] ADD CONSTRAINT [".$matches[2]."] PRIMARY KEY CLUSTERED (".$matches[3].")";
     		    }
     		}
 
 		}
 
-		if ($type=="auto" || $type='ddl')
+		if ($type == "auto" || $type = 'ddl')
 		{
     		$itemfound = stripos($query, " limit ");
     		if ($itemfound !== false) {
@@ -406,22 +406,22 @@ 
     			// Inserer la date en parametre et le reste de la requete
     			$query = $newquery." DATEPART(week, ".$extractvalue.$endofquery;
     		}
-    	   if (preg_match('/^insert\h+(?:INTO)?\h*(\w+?)\h*\(.*\b(?:row)?id\b.*\)\h+VALUES/i',$query,$matches))
+    	   if (preg_match('/^insert\h+(?:INTO)?\h*(\w+?)\h*\(.*\b(?:row)?id\b.*\)\h+VALUES/i', $query, $matches))
     	   {
     	       //var_dump($query);
     	       //var_dump($matches);
     	       //if (stripos($query,'llx_c_departements') !== false) var_dump($query);
-    	       $sql='SET IDENTITY_INSERT ['.trim($matches[1]).'] ON;';
+    	       $sql = 'SET IDENTITY_INSERT ['.trim($matches[1]).'] ON;';
     	       @mssql_query($sql, $this->db);
-    	       $post_query='SET IDENTITY_INSERT ['.trim($matches[1]).'] OFF;';
+    	       $post_query = 'SET IDENTITY_INSERT ['.trim($matches[1]).'] OFF;';
 
     	   }
 		}
 		//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)
+		if (!$this->database_name)
 		{
 			// Ordre SQL ne necessitant pas de connexion a une base (exemple: CREATE DATABASE)
 			$ret = mssql_query($query, $this->db);
@@ -436,10 +436,10 @@ 
 		    @mssql_query($post_query, $this->db);
 		}
 
-		if (! preg_match("/^COMMIT/i",$query) && ! preg_match("/^ROLLBACK/i",$query))
+		if (!preg_match("/^COMMIT/i", $query) && !preg_match("/^ROLLBACK/i", $query))
 		{
 			// Si requete utilisateur, on la sauvegarde ainsi que son resultset
-			if (! $ret)
+			if (!$ret)
 			{
 				$result = mssql_query("SELECT @@ERROR as code", $this->db);
 				$row = mssql_fetch_array($result);
@@ -452,7 +452,7 @@ 
 				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;
+			$this->lastquery = $query;
 			$this->_results = $ret;
 		}
 
@@ -468,7 +468,7 @@ 
 	function fetch_object($resultset)
 	{
 		// Si le resultset n'est pas fourni, on prend le dernier utilise sur cette connexion
-		if (! is_resource($resultset)) { $resultset=$this->_results; }
+		if (!is_resource($resultset)) { $resultset = $this->_results; }
 		return mssql_fetch_object($resultset);
 	}
 
@@ -481,7 +481,7 @@ 
 	function fetch_array($resultset)
 	{
 		// Si le resultset n'est pas fourni, on prend le dernier utilise sur cette connexion
-		if (! is_resource($resultset)) { $resultset=$this->_results; }
+		if (!is_resource($resultset)) { $resultset = $this->_results; }
 		return mssql_fetch_array($resultset);
 	}
 
@@ -495,7 +495,7 @@ 
 	function fetch_row($resultset)
 	{
 		// Si le resultset n'est pas fourni, on prend le dernier utilise sur cette connexion
-		if (! is_resource($resultset)) { $resultset=$this->_results; }
+		if (!is_resource($resultset)) { $resultset = $this->_results; }
 		return @mssql_fetch_row($resultset);
 	}
 
@@ -509,7 +509,7 @@ 
 	function num_rows($resultset)
 	{
 		// Si le resultset n'est pas fourni, on prend le dernier utilise sur cette connexion
-		if (! is_resource($resultset)) { $resultset=$this->_results; }
+		if (!is_resource($resultset)) { $resultset = $this->_results; }
 		return mssql_num_rows($resultset);
 	}
 
@@ -523,7 +523,7 @@ 
 	function affected_rows($resultset)
 	{
 		// Si le resultset n'est pas fourni, on prend le dernier utilise sur cette connexion
-		if (! is_resource($resultset)) { $resultset=$this->_results; }
+		if (!is_resource($resultset)) { $resultset = $this->_results; }
 		// mssql necessite un link de base pour cette fonction contrairement
 		// a pqsql qui prend un resultset
 		$rsRows = mssql_query("select @@rowcount as rows", $this->db);
@@ -538,10 +538,10 @@ 
 	 *	@param  resource	$resultset   Curseur de la requete voulue
 	 *	@return	bool
 	 */
-	function free($resultset=null)
+	function free($resultset = null)
 	{
 		// Si le resultset n'est pas fourni, on prend le dernier utilise sur cette connexion
-		if (! is_resource($resultset)) { $resultset=$this->_results; }
+		if (!is_resource($resultset)) { $resultset = $this->_results; }
 		// Si resultset en est un, on libere la memoire
 		if (is_resource($resultset)) mssql_free_result($resultset);
 	}
@@ -567,7 +567,7 @@ 
 	 */
 	function idate($param)
 	{
-		return dol_print_date($param,"%Y-%m-%d %H:%M:%S");
+		return dol_print_date($param, "%Y-%m-%d %H:%M:%S");
 	}
 
 	/**
@@ -577,7 +577,7 @@ 
 	 */
 	function errno()
 	{
-		if (! $this->connected)
+		if (!$this->connected)
 		{
 			// Si il y a eu echec de connexion, $this->db n'est pas valide.
 			return 'DB_ERROR_FAILED_TO_CONNECT';
@@ -618,8 +618,8 @@ 
 			{
 				return $errorcode_map[$this->lasterrno];
 			}
-			$errno=$this->lasterrno;
-			return ($errno?'DB_ERROR_'.$errno:'0');
+			$errno = $this->lasterrno;
+			return ($errno ? 'DB_ERROR_'.$errno : '0');
 		}
 	}
 
@@ -630,7 +630,7 @@ 
 	 */
 	function error()
 	{
-		if (! $this->connected) {
+		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';
 		}
@@ -646,7 +646,7 @@ 
 	 * @param	string	$fieldid	Field name
 	 * @return  int     			Id of row or -1 on error
 	 */
-	function last_insert_id($tab,$fieldid='rowid')
+	function last_insert_id($tab, $fieldid = 'rowid')
 	{
 		$res = $this->query("SELECT @@IDENTITY as id");
 		if ($res && $data = $this->fetch_array($res))
@@ -667,18 +667,18 @@ 
      *  @param	int		$withQuotes     Return string with quotes
      *  @return string          		XXX(field) or XXX('value') or field or 'value'
 	 */
-	function encrypt($fieldorvalue, $withQuotes=0)
+	function encrypt($fieldorvalue, $withQuotes = 0)
 	{
 		global $conf;
 
 		// Type of encryption (2: AES (recommended), 1: DES , 0: no encryption)
-		$cryptType = ($conf->db->dolibarr_main_db_encryption?$conf->db->dolibarr_main_db_encryption:0);
+		$cryptType = ($conf->db->dolibarr_main_db_encryption ? $conf->db->dolibarr_main_db_encryption : 0);
 
 		//Encryption key
-		$cryptKey = (!empty($conf->db->dolibarr_main_db_cryptkey)?$conf->db->dolibarr_main_db_cryptkey:'');
+		$cryptKey = (!empty($conf->db->dolibarr_main_db_cryptkey) ? $conf->db->dolibarr_main_db_cryptkey : '');
 
 		$return = $fieldorvalue;
-		return ($withQuotes?"'":"").$this->escape($return).($withQuotes?"'":"");
+		return ($withQuotes ? "'" : "").$this->escape($return).($withQuotes ? "'" : "");
 	}
 
 	/**
@@ -692,10 +692,10 @@ 
 		global $conf;
 
 		// Type of encryption (2: AES (recommended), 1: DES , 0: no encryption)
-		$cryptType = ($conf->db->dolibarr_main_db_encryption?$conf->db->dolibarr_main_db_encryption:0);
+		$cryptType = ($conf->db->dolibarr_main_db_encryption ? $conf->db->dolibarr_main_db_encryption : 0);
 
 		//Encryption key
-		$cryptKey = (!empty($conf->db->dolibarr_main_db_cryptkey)?$conf->db->dolibarr_main_db_cryptkey:'');
+		$cryptKey = (!empty($conf->db->dolibarr_main_db_cryptkey) ? $conf->db->dolibarr_main_db_cryptkey : '');
 
 		$return = $value;
 		return $return;
@@ -709,10 +709,10 @@ 
 	 */
 	function DDLGetConnectId()
 	{
-		$resql=$this->query('SELECT CONNECTION_ID()');
+		$resql = $this->query('SELECT CONNECTION_ID()');
 		if ($resql)
 		{
-            $row=$this->fetch_row($resql);
+            $row = $this->fetch_row($resql);
             return $row[0];
 		}
 		else return '?';
@@ -729,7 +729,7 @@ 
 	 * 	@param	string	$owner			Username of database owner
 	 * 	@return	false|resource|true		resource defined if OK, false if KO
 	 */
-	function DDLCreateDb($database,$charset='',$collation='',$owner='')
+	function DDLCreateDb($database, $charset = '', $collation = '', $owner = '')
 	{
         /*if (empty($charset))   $charset=$this->forcecharset;
         if (empty($collation)) $collation=$this->forcecollate;
@@ -738,18 +738,18 @@ 
 		$sql = 'CREATE DATABASE '.$this->EscapeFieldName($database);
         //TODO: Check if we need to force a charset
 		//$sql.= ' DEFAULT CHARACTER SET '.$charset.' DEFAULT COLLATE '.$collation;
-		$ret=$this->query($sql);
+		$ret = $this->query($sql);
 
 		$this->select_db($database);
-		$sql="CREATE USER [$owner] FOR LOGIN [$owner]";
-		mssql_query($sql,$this->db);
-		$sql="ALTER ROLE [db_owner] ADD MEMBER [$owner]";
-		mssql_query($sql,$this->db);
+		$sql = "CREATE USER [$owner] FOR LOGIN [$owner]";
+		mssql_query($sql, $this->db);
+		$sql = "ALTER ROLE [db_owner] ADD MEMBER [$owner]";
+		mssql_query($sql, $this->db);
 
-		$sql="ALTER DATABASE [$database] SET ANSI_NULL_DEFAULT ON;";
-	    @mssql_query($sql,$this->db);
-	    $sql="ALTER DATABASE [$database] SET ANSI_NULL ON;";
-	    @mssql_query($sql,$this->db);
+		$sql = "ALTER DATABASE [$database] SET ANSI_NULL_DEFAULT ON;";
+	    @mssql_query($sql, $this->db);
+	    $sql = "ALTER DATABASE [$database] SET ANSI_NULL ON;";
+	    @mssql_query($sql, $this->db);
 
 	    return $ret;
 	}
@@ -761,7 +761,7 @@ 
 	 *  @param	string		$table		Nmae of table filter ('xxx%')
      *  @return	array					List of tables in an array
 	 */
-	function DDLListTables($database,$table='')
+	function DDLListTables($database, $table = '')
 	{
 		$this->_results = mssql_list_tables($database, $this->db);
 		return $this->_results;
@@ -780,7 +780,7 @@ 
 		// TODO: Implement
 		// May help: https://stackoverflow.com/questions/600446/sql-server-how-do-you-return-the-column-names-from-a-table
 
-		$infotables=array();
+		$infotables = array();
 		return $infotables;
 	}
 
@@ -796,68 +796,68 @@ 
 	 *	@param	    array	$keys 			Tableau des champs cles noms => valeur
 	 *	@return	    int						<0 if KO, >=0 if OK
 	 */
-	function DDLCreateTable($table,$fields,$primary_key,$type,$unique_keys=null,$fulltext_keys=null,$keys=null)
+	function DDLCreateTable($table, $fields, $primary_key, $type, $unique_keys = null, $fulltext_keys = null, $keys = null)
 	{
 		// FIXME: $fulltext_keys parameter is unused
 
 		// cles recherchees dans le tableau des descriptions (fields) : type,value,attribute,null,default,extra
 		// ex. : $fields['rowid'] = array('type'=>'int','value'=>'11','null'=>'not null','extra'=> 'auto_increment');
 		$sql = "create table ".$table."(";
-		$i=0;
-		foreach($fields as $field_name => $field_desc)
+		$i = 0;
+		foreach ($fields as $field_name => $field_desc)
 		{
 			$sqlfields[$i] = $field_name." ";
 			$sqlfields[$i]  .= $field_desc['type'];
-			if( preg_match("/^[^\s]/i",$field_desc['value']))
+			if (preg_match("/^[^\s]/i", $field_desc['value']))
 			$sqlfields[$i]  .= "(".$field_desc['value'].")";
-			else if( preg_match("/^[^\s]/i",$field_desc['attribute']))
+			else if (preg_match("/^[^\s]/i", $field_desc['attribute']))
 			$sqlfields[$i]  .= " ".$field_desc['attribute'];
-			else if( preg_match("/^[^\s]/i",$field_desc['default']))
+			else if (preg_match("/^[^\s]/i", $field_desc['default']))
 			{
-				if(preg_match("/null/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']."'";
 			}
-			else if( preg_match("/^[^\s]/i",$field_desc['null']))
+			else if (preg_match("/^[^\s]/i", $field_desc['null']))
 			$sqlfields[$i]  .= " ".$field_desc['null'];
 
-			else if( preg_match("/^[^\s]/i",$field_desc['extra']))
+			else if (preg_match("/^[^\s]/i", $field_desc['extra']))
 			$sqlfields[$i]  .= " ".$field_desc['extra'];
 			$i++;
 		}
-		if($primary_key != "")
+		if ($primary_key != "")
 		$pk = "primary key(".$primary_key.")";
 
-		if(is_array($unique_keys))
+		if (is_array($unique_keys))
 		{
 			$i = 0;
-			foreach($unique_keys as $key => $value)
+			foreach ($unique_keys as $key => $value)
 			{
 				$sqluq[$i] = "UNIQUE KEY '".$key."' ('".$value."')";
 				$i++;
 			}
 		}
-		if(is_array($keys))
+		if (is_array($keys))
 		{
 			$i = 0;
-			foreach($keys as $key => $value)
+			foreach ($keys as $key => $value)
 			{
 				$sqlk[$i] = "KEY ".$key." (".$value.")";
 				$i++;
 			}
 		}
-		$sql .= implode(',',$sqlfields);
-		if($primary_key != "")
+		$sql .= implode(',', $sqlfields);
+		if ($primary_key != "")
 		$sql .= ",".$pk;
-		if(is_array($unique_keys))
-		$sql .= ",".implode(',',$sqluq);
-		if(is_array($keys))
-		$sql .= ",".implode(',',$sqlk);
-		$sql .=") type=".$type;
+		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))
+		if (!$this -> query($sql))
 		return -1;
 		else
 		return 1;
@@ -873,7 +873,7 @@ 
 	{
 		$sql = "DROP TABLE ".$table;
 
-		if (! $this->query($sql))
+		if (!$this->query($sql))
 			return -1;
 		else
 			return 1;
@@ -886,9 +886,9 @@ 
 	 *	@param	string		$field	Optionnel : Name of field if we want description of field
 	 *	@return	false|resource|true	Resource
 	 */
-	function DDLDescTable($table,$field="")
+	function DDLDescTable($table, $field = "")
 	{
-		$sql="DESC ".$table." ".$field;
+		$sql = "DESC ".$table." ".$field;
 
 		dol_syslog($sql);
 		$this->_results = $this->query($sql);
@@ -904,28 +904,28 @@ 
 	 *	@param	string	$field_position 	Optionnel ex.: "after champtruc"
 	 *	@return	int							<0 if KO, >0 if OK
 	 */
-	function DDLAddField($table,$field_name,$field_desc,$field_position="")
+	function DDLAddField($table, $field_name, $field_desc, $field_position = "")
 	{
 		// cles recherchees dans le tableau des descriptions (field_desc) : type,value,attribute,null,default,extra
 		// ex. : $field_desc = array('type'=>'int','value'=>'11','null'=>'not null','extra'=> 'auto_increment');
-		$sql= "ALTER TABLE ".$table." ADD ".$field_name." ";
+		$sql = "ALTER TABLE ".$table." ADD ".$field_name." ";
 		$sql .= $field_desc['type'];
-		if( preg_match("/^[^\s]/i",$field_desc['value']))
+		if (preg_match("/^[^\s]/i", $field_desc['value']))
 		$sql  .= "(".$field_desc['value'].")";
-		if( preg_match("/^[^\s]/i",$field_desc['attribute']))
+		if (preg_match("/^[^\s]/i", $field_desc['attribute']))
 		$sql  .= " ".$field_desc['attribute'];
-		if( preg_match("/^[^\s]/i",$field_desc['null']))
+		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['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']))
+		if (preg_match("/^[^\s]/i", $field_desc['extra']))
 		$sql  .= " ".$field_desc['extra'];
 		$sql .= " ".$field_position;
 
-		if(! $this -> query($sql))
+		if (!$this -> query($sql))
 		return -1;
 		else
 		return 1;
@@ -939,16 +939,16 @@ 
 	 *	@param	string	$field_desc 		Array with description of field format
 	 *	@return	int							<0 if KO, >0 if OK
 	 */
-	function DDLUpdateField($table,$field_name,$field_desc)
+	function DDLUpdateField($table, $field_name, $field_desc)
 	{
 		$sql = "ALTER TABLE ".$table;
 		$sql .= " MODIFY COLUMN ".$field_name." ".$field_desc['type'];
 		if ($field_desc['type'] == 'tinyint' || $field_desc['type'] == 'int' || $field_desc['type'] == 'varchar') {
-			$sql.="(".$field_desc['value'].")";
+			$sql .= "(".$field_desc['value'].")";
 		}
 
-		dol_syslog($sql,LOG_DEBUG);
-		if (! $this->query($sql))
+		dol_syslog($sql, LOG_DEBUG);
+		if (!$this->query($sql))
 		return -1;
 		else
 		return 1;
@@ -961,13 +961,13 @@ 
 	 *	@param	string	$field_name 	Name of field to drop
 	 *	@return	int						<0 if KO, >0 if OK
 	 */
-	function DDLDropField($table,$field_name)
+	function DDLDropField($table, $field_name)
 	{
-		$sql= "ALTER TABLE ".$table." DROP COLUMN `".$field_name."`";
-		dol_syslog($sql,LOG_DEBUG);
-		if (! $this->query($sql))
+		$sql = "ALTER TABLE ".$table." DROP COLUMN `".$field_name."`";
+		dol_syslog($sql, LOG_DEBUG);
+		if (!$this->query($sql))
 		{
-			$this->error=$this->lasterror();
+			$this->error = $this->lasterror();
 			return -1;
 		}
 		else return 1;
@@ -982,12 +982,12 @@ 
 	 *	@param	string	$dolibarr_main_db_name		Database name where user must be granted
 	 *	@return	int									<0 if KO, >=0 if OK
 	 */
-	function DDLCreateUser($dolibarr_main_db_host,$dolibarr_main_db_user,$dolibarr_main_db_pass,$dolibarr_main_db_name)
+	function DDLCreateUser($dolibarr_main_db_host, $dolibarr_main_db_user, $dolibarr_main_db_pass, $dolibarr_main_db_name)
 	{
 	    $sql = "CREATE LOGIN ".$this->EscapeFieldName($dolibarr_main_db_user)." WITH PASSWORD='$dolibarr_main_db_pass'";
-        dol_syslog(get_class($this)."::DDLCreateUser", LOG_DEBUG);	// No sql to avoid password in log
-        $resql=$this->query($sql);
-        if (! $resql)
+        dol_syslog(get_class($this)."::DDLCreateUser", LOG_DEBUG); // No sql to avoid password in log
+        $resql = $this->query($sql);
+        if (!$resql)
         {
             if ($this->lasterrno != '15025')
             {
@@ -999,9 +999,9 @@ 
             	dol_syslog(get_class($this)."::DDLCreateUser sql=".$sql, LOG_WARNING);
             }
         }
-        $sql="SELECT name from sys.databases where name='".$dolibarr_main_db_name."'";
-        $ressql=$this->query($sql);
-        if (! $ressql)
+        $sql = "SELECT name from sys.databases where name='".$dolibarr_main_db_name."'";
+        $ressql = $this->query($sql);
+        if (!$ressql)
         {
             dol_syslog(get_class($this)."::DDLCreateUser sql=".$sql, LOG_WARNING);
             return -1;
@@ -1011,9 +1011,9 @@ 
             if ($num)
             {
                 $this->select_db($dolibarr_main_db_name);
-                $sql="CREATE USER [$dolibarr_main_db_user] FOR LOGIN [$dolibarr_main_db_user]";
+                $sql = "CREATE USER [$dolibarr_main_db_user] FOR LOGIN [$dolibarr_main_db_user]";
                 $this->query($sql);
-                $sql="ALTER ROLE [db_owner] ADD MEMBER [$dolibarr_main_db_user]";
+                $sql = "ALTER ROLE [db_owner] ADD MEMBER [$dolibarr_main_db_user]";
                 $this->query($sql);
             }
         }
@@ -1053,12 +1053,12 @@ 
 	 */
 	function getDefaultCollationDatabase()
 	{
-		$resql=$this->query("SELECT SERVERPROPERTY('collation')");
+		$resql = $this->query("SELECT SERVERPROPERTY('collation')");
 		if (!$resql)
 		{
 			return $this->forcecollate;
 		}
-		$liste=$this->fetch_array($resql);
+		$liste = $this->fetch_array($resql);
 		return $liste['computed'];
 	}
 
@@ -1107,13 +1107,13 @@ 
 	 * @param	string	$filter		Filter list on a particular value
 	 * @return	array				Array of key-values (key=>value)
 	 */
-	function getServerParametersValues($filter='')
+	function getServerParametersValues($filter = '')
 	{
 		// FIXME: Dummy method
 		// TODO: Implement
 		// May help: SELECT SERVERPROPERTY
 
-		$result=array();
+		$result = array();
 		return $result;
 	}
 
@@ -1123,7 +1123,7 @@ 
 	 * @param	string	$filter		Filter list on a particular value
 	 * @return  array				Array of key-values (key=>value)
 	 */
-	function getServerStatusValues($filter='')
+	function getServerStatusValues($filter = '')
 	{
 		// FIXME: Dummy method
 		// TODO: Implement
@@ -1150,23 +1150,23 @@ 
 	 * @param      mixed   $fields     String for one field or array of string for multiple field
 	 * @return false|object
 	 */
-	function GetFieldInformation($table,$fields) {
-	    $sql="SELECT * from INFORMATION_SCHEMA.COLUMNS WHERE TABLE_NAME='".$this->escape($table)."' AND COLUMN_NAME";
+	function GetFieldInformation($table, $fields) {
+	    $sql = "SELECT * from INFORMATION_SCHEMA.COLUMNS WHERE TABLE_NAME='".$this->escape($table)."' AND COLUMN_NAME";
 	    if (is_array($fields))
 	    {
-	        $where=" IN ('".implode("','",$fields)."')";
+	        $where = " IN ('".implode("','", $fields)."')";
 	    }
 	    else
 	    {
-	        $where="='".$this->escape($fields)."'";
+	        $where = "='".$this->escape($fields)."'";
 	    }
-	    $result=array();
-	    $ret=mssql_query($sql.$where,$this->db);
+	    $result = array();
+	    $ret = mssql_query($sql.$where, $this->db);
 	    if ($ret)
 	    {
-	        while($obj=mssql_fetch_object($ret))
+	        while ($obj = mssql_fetch_object($ret))
 	        {
-	            $result[]=$obj;
+	            $result[] = $obj;
 	        }
 	    }
 	    else

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')
     {

Spacing +180 added lines, -180 removed lines

@@ -25,7 +25,7 @@ 
  *	\brief      Class file to manage Dolibarr database access for a MySQL database
  */
 
-require_once DOL_DOCUMENT_ROOT .'/core/db/DoliDB.class.php';
+require_once DOL_DOCUMENT_ROOT.'/core/db/DoliDB.class.php';
 
 /**
  *	Class to manage Dolibarr database access for a MySQL database using the MySQLi extension
@@ -35,11 +35,11 @@ 
 	/** @var mysqli Database object */
 	public $db;
     //! Database type
-    public $type='mysqli';
+    public $type = 'mysqli';
     //! Database label
-    const LABEL='MySQL or MariaDB';
+    const LABEL = 'MySQL or MariaDB';
     //! Version min database
-    const VERSIONMIN='5.0.3';
+    const VERSIONMIN = '5.0.3';
 	/** @var mysqli_result Resultset of last query */
 	private $_results;
 
@@ -54,36 +54,36 @@ 
 	 *	@param	    string	$name		Nom de la database
 	 *	@param	    int		$port		Port of database server
      */
-    function __construct($type, $host, $user, $pass, $name='', $port=0)
+    function __construct($type, $host, $user, $pass, $name = '', $port = 0)
     {
-        global $conf,$langs;
+        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;
-        $this->database_port=$port;
+        $this->database_user = $user;
+        $this->database_host = $host;
+        $this->database_port = $port;
 
-        $this->transaction_opened=0;
+        $this->transaction_opened = 0;
 
         //print "Name DB: $host,$user,$pass,$name<br>";
 
-        if (! class_exists('mysqli'))
+        if (!class_exists('mysqli'))
         {
             $this->connected = false;
             $this->ok = false;
-            $this->error="Mysqli PHP functions for using Mysqli driver are not available in this version of PHP. Try to use another driver.";
-            dol_syslog(get_class($this)."::DoliDBMysqli : Mysqli PHP functions for using Mysqli driver are not available in this version of PHP. Try to use another driver.",LOG_ERR);
+            $this->error = "Mysqli PHP functions for using Mysqli driver are not available in this version of PHP. Try to use another driver.";
+            dol_syslog(get_class($this)."::DoliDBMysqli : Mysqli PHP functions for using Mysqli driver are not available in this version of PHP. Try to use another driver.", LOG_ERR);
         }
 
-        if (! $host)
+        if (!$host)
         {
             $this->connected = false;
             $this->ok = false;
-            $this->error=$langs->trans("ErrorWrongHostParameter");
-            dol_syslog(get_class($this)."::DoliDBMysqli : Connect error, wrong host parameters",LOG_ERR);
+            $this->error = $langs->trans("ErrorWrongHostParameter");
+            dol_syslog(get_class($this)."::DoliDBMysqli : Connect error, wrong host parameters", LOG_ERR);
         }
 
 		// Try server connection
@@ -94,7 +94,7 @@ 
 			$this->connected = false;
 			$this->ok = false;
 			$this->error = $this->db->connect_error;
-			dol_syslog(get_class($this) . "::DoliDBMysqli Connect error: " . $this->error, LOG_ERR);
+			dol_syslog(get_class($this)."::DoliDBMysqli Connect error: ".$this->error, LOG_ERR);
 		} else {
 			$this->connected = true;
 			$this->ok = true;
@@ -110,16 +110,16 @@ 
                 $this->ok = true;
 
                 // 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';
+                $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 ($this->db->character_set_name() != $clientmustbe) {
-					$this->db->set_charset($clientmustbe);	// This set charset, but with a bad collation
+					$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
@@ -127,8 +127,8 @@ 
                 $this->database_selected = false;
                 $this->database_name = '';
                 $this->ok = false;
-                $this->error=$this->error();
-                dol_syslog(get_class($this)."::DoliDBMysqli : Select_db error ".$this->error,LOG_ERR);
+                $this->error = $this->error();
+                dol_syslog(get_class($this)."::DoliDBMysqli : Select_db error ".$this->error, LOG_ERR);
             }
         }
         else
@@ -139,16 +139,16 @@ 
             if ($this->connected)
             {
             	// 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';
+            	$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 ($this->db->character_set_name() != $clientmustbe) {
-					$this->db->set_charset($clientmustbe);	// This set utf8_general_ci
+					$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);
 				}
 			}
         }
@@ -162,7 +162,7 @@ 
      *  @param     string	$type	Type of SQL order ('ddl' for insert, update, select, delete or 'dml' for create, alter...)
      *  @return    string   		SQL request line converted
      */
-    static function convertSQLFromMysql($line,$type='ddl')
+    static function convertSQLFromMysql($line, $type = 'ddl')
     {
         return $line;
     }
@@ -193,7 +193,7 @@ 
 	 */
 	function connect($host, $login, $passwd, $name, $port = 0)
 	{
-		dol_syslog(get_class($this) . "::connect host=$host, port=$port, login=$login, passwd=--hidden--, name=$name", LOG_DEBUG);
+		dol_syslog(get_class($this)."::connect host=$host, port=$port, login=$login, passwd=--hidden--, name=$name", LOG_DEBUG);
 
 		// Can also be
 		// mysqli::init(); mysql::options(MYSQLI_INIT_COMMAND, 'SET AUTOCOMMIT = 0'); mysqli::options(MYSQLI_OPT_CONNECT_TIMEOUT, 5);
@@ -232,8 +232,8 @@ 
     {
         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);
-            $this->connected=false;
+	        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();
         }
         return false;
@@ -248,15 +248,15 @@ 
      *  @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
      */
-    function query($query,$usesavepoint=0,$type='auto')
+    function query($query, $usesavepoint = 0, $type = 'auto')
     {
     	global $conf;
 
         $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)
+        if (!$this->database_name)
         {
             // Ordre SQL ne necessitant pas de connexion a une base (exemple: CREATE DATABASE)
             $ret = $this->db->query($query);
@@ -266,19 +266,19 @@ 
             $ret = $this->db->query($query);
         }
 
-        if (! preg_match("/^COMMIT/i",$query) && ! preg_match("/^ROLLBACK/i",$query))
+        if (!preg_match("/^COMMIT/i", $query) && !preg_match("/^ROLLBACK/i", $query))
         {
             // Si requete utilisateur, on la sauvegarde ainsi que son resultset
-            if (! $ret)
+            if (!$ret)
             {
                 $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->lasterrno." ".$this->lasterror, LOG_ERR);
             }
-            $this->lastquery=$query;
+            $this->lastquery = $query;
             $this->_results = $ret;
         }
 
@@ -294,7 +294,7 @@ 
     function fetch_object($resultset)
     {
         // Si le resultset n'est pas fourni, on prend le dernier utilise sur cette connexion
-        if (! is_object($resultset)) { $resultset=$this->_results; }
+        if (!is_object($resultset)) { $resultset = $this->_results; }
 		return $resultset->fetch_object();
     }
 
@@ -308,7 +308,7 @@ 
     function fetch_array($resultset)
     {
         // If resultset not provided, we take the last used by connexion
-        if (! is_object($resultset)) { $resultset=$this->_results; }
+        if (!is_object($resultset)) { $resultset = $this->_results; }
         return $resultset->fetch_array();
     }
 
@@ -321,9 +321,9 @@ 
     function fetch_row($resultset)
     {
         // If resultset not provided, we take the last used by connexion
-        if (! is_bool($resultset))
+        if (!is_bool($resultset))
         {
-            if (! is_object($resultset)) { $resultset=$this->_results; }
+            if (!is_object($resultset)) { $resultset = $this->_results; }
             return $resultset->fetch_row();
         }
         else
@@ -343,7 +343,7 @@ 
     function num_rows($resultset)
     {
         // If resultset not provided, we take the last used by connexion
-        if (! is_object($resultset)) { $resultset=$this->_results; }
+        if (!is_object($resultset)) { $resultset = $this->_results; }
         return $resultset->num_rows;
     }
 
@@ -357,7 +357,7 @@ 
     function affected_rows($resultset)
     {
         // If resultset not provided, we take the last used by connexion
-        if (! is_object($resultset)) { $resultset=$this->_results; }
+        if (!is_object($resultset)) { $resultset = $this->_results; }
         // mysql necessite un link de base pour cette fonction contrairement
         // a pqsql qui prend un resultset
         return $this->db->affected_rows;
@@ -370,10 +370,10 @@ 
      *	@param  mysqli_result	$resultset	Curseur de la requete voulue
      *	@return	void
      */
-    function free($resultset=null)
+    function free($resultset = null)
     {
         // If resultset not provided, we take the last used by connexion
-        if (! is_object($resultset)) { $resultset=$this->_results; }
+        if (!is_object($resultset)) { $resultset = $this->_results; }
         // Si resultset en est un, on libere la memoire
         if (is_object($resultset)) $resultset->free_result();
     }
@@ -396,7 +396,7 @@ 
      */
     function errno()
     {
-        if (! $this->connected) {
+        if (!$this->connected) {
             // Si il y a eu echec de connexion, $this->db n'est pas valide.
             return 'DB_ERROR_FAILED_TO_CONNECT';
         } else {
@@ -428,15 +428,15 @@ 
             1215 => 'DB_ERROR_CANNOT_ADD_FOREIGN_KEY_CONSTRAINT',
             1216 => 'DB_ERROR_NO_PARENT',
             1217 => 'DB_ERROR_CHILD_EXISTS',
-            1396 => 'DB_ERROR_USER_ALREADY_EXISTS',    // When creating user already existing
+            1396 => 'DB_ERROR_USER_ALREADY_EXISTS', // When creating user already existing
             1451 => 'DB_ERROR_CHILD_EXISTS'
             );
 
             if (isset($errorcode_map[$this->db->errno])) {
                 return $errorcode_map[$this->db->errno];
             }
-            $errno=$this->db->errno;
-            return ($errno?'DB_ERROR_'.$errno:'0');
+            $errno = $this->db->errno;
+            return ($errno ? 'DB_ERROR_'.$errno : '0');
         }
     }
 
@@ -447,7 +447,7 @@ 
      */
     function error()
     {
-        if (! $this->connected) {
+        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';
         }
@@ -463,7 +463,7 @@ 
 	 * @param	string	$fieldid	Field name
 	 * @return  int|string			Id of row
      */
-    function last_insert_id($tab,$fieldid='rowid')
+    function last_insert_id($tab, $fieldid = 'rowid')
     {
         return $this->db->insert_id;
     }
@@ -477,17 +477,17 @@ 
      * 	@return	string					XXX(field) or XXX('value') or field or 'value'
      *
      */
-    function encrypt($fieldorvalue, $withQuotes=0)
+    function encrypt($fieldorvalue, $withQuotes = 0)
     {
         global $conf;
 
         // Type of encryption (2: AES (recommended), 1: DES , 0: no encryption)
-        $cryptType = (!empty($conf->db->dolibarr_main_db_encryption)?$conf->db->dolibarr_main_db_encryption:0);
+        $cryptType = (!empty($conf->db->dolibarr_main_db_encryption) ? $conf->db->dolibarr_main_db_encryption : 0);
 
         //Encryption key
-        $cryptKey = (!empty($conf->db->dolibarr_main_db_cryptkey)?$conf->db->dolibarr_main_db_cryptkey:'');
+        $cryptKey = (!empty($conf->db->dolibarr_main_db_cryptkey) ? $conf->db->dolibarr_main_db_cryptkey : '');
 
-        $return = ($withQuotes?"'":"").$this->escape($fieldorvalue).($withQuotes?"'":"");
+        $return = ($withQuotes ? "'" : "").$this->escape($fieldorvalue).($withQuotes ? "'" : "");
 
         if ($cryptType && !empty($cryptKey))
         {
@@ -515,10 +515,10 @@ 
         global $conf;
 
         // Type of encryption (2: AES (recommended), 1: DES , 0: no encryption)
-        $cryptType = (!empty($conf->db->dolibarr_main_db_encryption)?$conf->db->dolibarr_main_db_encryption:0);
+        $cryptType = (!empty($conf->db->dolibarr_main_db_encryption) ? $conf->db->dolibarr_main_db_encryption : 0);
 
         //Encryption key
-        $cryptKey = (!empty($conf->db->dolibarr_main_db_cryptkey)?$conf->db->dolibarr_main_db_cryptkey:'');
+        $cryptKey = (!empty($conf->db->dolibarr_main_db_cryptkey) ? $conf->db->dolibarr_main_db_cryptkey : '');
 
         $return = $value;
 
@@ -545,10 +545,10 @@ 
      */
     function DDLGetConnectId()
     {
-        $resql=$this->query('SELECT CONNECTION_ID()');
+        $resql = $this->query('SELECT CONNECTION_ID()');
         if ($resql)
         {
-            $row=$this->fetch_row($resql);
+            $row = $this->fetch_row($resql);
             return $row[0];
         }
         else return '?';
@@ -565,23 +565,23 @@ 
 	 * 	@param	string	$owner			Username of database owner
 	 * 	@return	bool|mysqli_result		resource defined if OK, null if KO
      */
-    function DDLCreateDb($database,$charset='',$collation='',$owner='')
+    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)."`";
-		$sql.= " DEFAULT CHARACTER SET `".$this->escape($charset)."` DEFAULT COLLATE `".$this->escape($collation)."`";
+		$sql .= " DEFAULT CHARACTER SET `".$this->escape($charset)."` DEFAULT COLLATE `".$this->escape($collation)."`";
 
-        dol_syslog($sql,LOG_DEBUG);
-        $ret=$this->query($sql);
-        if (! $ret)
+        dol_syslog($sql, LOG_DEBUG);
+        $ret = $this->query($sql);
+        if (!$ret)
         {
             // We try again for compatibility with Mysql < 4.1.1
             $sql = "CREATE DATABASE `".$this->escape($database)."`";
-            dol_syslog($sql,LOG_DEBUG);
-            $ret=$this->query($sql);
+            dol_syslog($sql, LOG_DEBUG);
+            $ret = $this->query($sql);
         }
         return $ret;
     }
@@ -593,18 +593,18 @@ 
 	 *  @param	string		$table		Nmae of table filter ('xxx%')
 	 *  @return	array					List of tables in an array
      */
-    function DDLListTables($database, $table='')
+    function DDLListTables($database, $table = '')
     {
-        $listtables=array();
+        $listtables = array();
 
         $like = '';
         if ($table) $like = "LIKE '".$table."'";
-        $sql="SHOW TABLES FROM ".$database." ".$like.";";
+        $sql = "SHOW TABLES FROM ".$database." ".$like.";";
         //print $sql;
         $result = $this->query($sql);
         if ($result)
         {
-            while($row = $this->fetch_row($result))
+            while ($row = $this->fetch_row($result))
             {
                 $listtables[] = $row[0];
             }
@@ -620,15 +620,15 @@ 
      */
     function DDLInfoTable($table)
     {
-        $infotables=array();
+        $infotables = array();
 
-        $sql="SHOW FULL COLUMNS FROM ".$table.";";
+        $sql = "SHOW FULL COLUMNS FROM ".$table.";";
 
-        dol_syslog($sql,LOG_DEBUG);
+        dol_syslog($sql, LOG_DEBUG);
         $result = $this->query($sql);
         if ($result)
         {
-            while($row = $this->fetch_row($result))
+            while ($row = $this->fetch_row($result))
             {
                 $infotables[] = $row;
             }
@@ -648,71 +648,71 @@ 
 	 *	@param	    array	$keys 			Tableau des champs cles noms => valeur
 	 *	@return	    int						<0 if KO, >=0 if OK
      */
-    function DDLCreateTable($table,$fields,$primary_key,$type,$unique_keys=null,$fulltext_keys=null,$keys=null)
+    function DDLCreateTable($table, $fields, $primary_key, $type, $unique_keys = null, $fulltext_keys = null, $keys = null)
     {
 	    // FIXME: $fulltext_keys parameter is unused
 
         // cles recherchees dans le tableau des descriptions (fields) : type,value,attribute,null,default,extra
         // ex. : $fields['rowid'] = array('type'=>'int','value'=>'11','null'=>'not null','extra'=> 'auto_increment');
         $sql = "CREATE TABLE ".$table."(";
-        $i=0;
-        foreach($fields as $field_name => $field_desc)
+        $i = 0;
+        foreach ($fields as $field_name => $field_desc)
         {
         	$sqlfields[$i] = $field_name." ";
-			$sqlfields[$i]  .= $field_desc['type'];
-			if( preg_match("/^[^\s]/i",$field_desc['value'])) {
+			$sqlfields[$i] .= $field_desc['type'];
+			if (preg_match("/^[^\s]/i", $field_desc['value'])) {
 				$sqlfields[$i]  .= "(".$field_desc['value'].")";
 			}
-			if( preg_match("/^[^\s]/i",$field_desc['attribute'])) {
+			if (preg_match("/^[^\s]/i", $field_desc['attribute'])) {
 				$sqlfields[$i]  .= " ".$field_desc['attribute'];
 			}
-			if( preg_match("/^[^\s]/i",$field_desc['default']))
+			if (preg_match("/^[^\s]/i", $field_desc['default']))
 			{
-				if ((preg_match("/null/i",$field_desc['default'])) || (preg_match("/CURRENT_TIMESTAMP/i",$field_desc['default']))) {
+				if ((preg_match("/null/i", $field_desc['default'])) || (preg_match("/CURRENT_TIMESTAMP/i", $field_desc['default']))) {
 					$sqlfields[$i]  .= " default ".$field_desc['default'];
 				}
 				else {
 					$sqlfields[$i]  .= " default '".$field_desc['default']."'";
 				}
 			}
-			if( preg_match("/^[^\s]/i",$field_desc['null'])) {
+			if (preg_match("/^[^\s]/i", $field_desc['null'])) {
 				$sqlfields[$i]  .= " ".$field_desc['null'];
 			}
-			if( preg_match("/^[^\s]/i",$field_desc['extra'])) {
+			if (preg_match("/^[^\s]/i", $field_desc['extra'])) {
 				$sqlfields[$i]  .= " ".$field_desc['extra'];
 			}
             $i++;
         }
-        if($primary_key != "")
+        if ($primary_key != "")
         $pk = "primary key(".$primary_key.")";
 
-        if(is_array($unique_keys)) {
+        if (is_array($unique_keys)) {
             $i = 0;
-            foreach($unique_keys as $key => $value)
+            foreach ($unique_keys as $key => $value)
             {
                 $sqluq[$i] = "UNIQUE KEY '".$key."' ('".$value."')";
                 $i++;
             }
         }
-        if(is_array($keys))
+        if (is_array($keys))
         {
             $i = 0;
-            foreach($keys as $key => $value)
+            foreach ($keys as $key => $value)
             {
                 $sqlk[$i] = "KEY ".$key." (".$value.")";
                 $i++;
             }
         }
-        $sql .= implode(',',$sqlfields);
-        if($primary_key != "")
+        $sql .= implode(',', $sqlfields);
+        if ($primary_key != "")
         $sql .= ",".$pk;
-        if($unique_keys != "")
-        $sql .= ",".implode(',',$sqluq);
-        if(is_array($keys))
-        $sql .= ",".implode(',',$sqlk);
-        $sql .=") engine=".$type;
+        if ($unique_keys != "")
+        $sql .= ",".implode(',', $sqluq);
+        if (is_array($keys))
+        $sql .= ",".implode(',', $sqlk);
+        $sql .= ") engine=".$type;
 
-        if(! $this->query($sql))
+        if (!$this->query($sql))
         return -1;
         else
         return 1;
@@ -728,7 +728,7 @@ 
     {
     	$sql = "DROP TABLE ".$table;
 
-		if (! $this->query($sql))
+		if (!$this->query($sql))
  			return -1;
     	else
     		return 1;
@@ -741,11 +741,11 @@ 
 	 *	@param	string		$field	Optionnel : Name of field if we want description of field
 	 *	@return	bool|mysqli_result	Resultset x (x->Field, x->Type, ...)
      */
-    function DDLDescTable($table,$field="")
+    function DDLDescTable($table, $field = "")
     {
-        $sql="DESC ".$table." ".$field;
+        $sql = "DESC ".$table." ".$field;
 
-        dol_syslog(get_class($this)."::DDLDescTable ".$sql,LOG_DEBUG);
+        dol_syslog(get_class($this)."::DDLDescTable ".$sql, LOG_DEBUG);
         $this->_results = $this->query($sql);
         return $this->_results;
     }
@@ -759,34 +759,34 @@ 
 	 *	@param	string	$field_position 	Optionnel ex.: "after champtruc"
 	 *	@return	int							<0 if KO, >0 if OK
      */
-    function DDLAddField($table,$field_name,$field_desc,$field_position="")
+    function DDLAddField($table, $field_name, $field_desc, $field_position = "")
     {
         // cles recherchees dans le tableau des descriptions (field_desc) : type,value,attribute,null,default,extra
         // 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')))
+        $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')))
             {
-                $sql.= "(".$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("/^[^\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'];
+            if (preg_match("/null/i", $field_desc['default']))
+            $sql .= " default ".$field_desc['default'];
             else
-            $sql.= " default '".$field_desc['default']."'";
+            $sql .= " default '".$field_desc['default']."'";
         }
-        if(preg_match("/^[^\s]/i",$field_desc['extra']))
-        $sql.= " ".$field_desc['extra'];
-        $sql.= " ".$field_position;
+        if (preg_match("/^[^\s]/i", $field_desc['extra']))
+        $sql .= " ".$field_desc['extra'];
+        $sql .= " ".$field_position;
 
-        dol_syslog(get_class($this)."::DDLAddField ".$sql,LOG_DEBUG);
-        if($this->query($sql)) {
+        dol_syslog(get_class($this)."::DDLAddField ".$sql, LOG_DEBUG);
+        if ($this->query($sql)) {
             return 1;
         }
         return -1;
@@ -800,38 +800,38 @@ 
 	 *	@param	string	$field_desc 		Array with description of field format
 	 *	@return	int							<0 if KO, >0 if OK
      */
-    function DDLUpdateField($table,$field_name,$field_desc)
+    function DDLUpdateField($table, $field_name, $field_desc)
     {
         $sql = "ALTER TABLE ".$table;
         $sql .= " MODIFY COLUMN ".$field_name." ".$field_desc['type'];
         if ($field_desc['type'] == 'double' || $field_desc['type'] == 'tinyint' || $field_desc['type'] == 'int' || $field_desc['type'] == 'varchar') {
-        	$sql.="(".$field_desc['value'].")";
+        	$sql .= "(".$field_desc['value'].")";
         }
         if ($field_desc['null'] == 'not null' || $field_desc['null'] == 'NOT NULL')
         {
         	// We will try to change format of column to NOT NULL. To be sure the ALTER works, we try to update fields that are NULL
         	if ($field_desc['type'] == 'varchar' || $field_desc['type'] == 'text')
         	{
-        		$sqlbis="UPDATE ".$table." SET ".$field_name." = '".$this->escape($field_desc['default'] ? $field_desc['default'] : '')."' WHERE ".$field_name." IS NULL";
+        		$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')
         	{
-        		$sqlbis="UPDATE ".$table." SET ".$field_name." = ".((int) $this->escape($field_desc['default'] ? $field_desc['default'] : 0))." WHERE ".$field_name." IS NULL";
+        		$sqlbis = "UPDATE ".$table." SET ".$field_name." = ".((int) $this->escape($field_desc['default'] ? $field_desc['default'] : 0))." WHERE ".$field_name." IS NULL";
         		$this->query($sqlbis);
         	}
 
-        	$sql.=" NOT NULL";
+        	$sql .= " NOT NULL";
         }
 
         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))
+        dol_syslog(get_class($this)."::DDLUpdateField ".$sql, LOG_DEBUG);
+        if (!$this->query($sql))
         return -1;
         else
         return 1;
@@ -844,14 +844,14 @@ 
 	 *	@param	string	$field_name 	Name of field to drop
 	 *	@return	int						<0 if KO, >0 if OK
      */
-    function DDLDropField($table,$field_name)
+    function DDLDropField($table, $field_name)
     {
-        $sql= "ALTER TABLE ".$table." DROP COLUMN `".$field_name."`";
-        dol_syslog(get_class($this)."::DDLDropField ".$sql,LOG_DEBUG);
+        $sql = "ALTER TABLE ".$table." DROP COLUMN `".$field_name."`";
+        dol_syslog(get_class($this)."::DDLDropField ".$sql, LOG_DEBUG);
         if ($this->query($sql)) {
             return 1;
         }
-	    $this->error=$this->lasterror();
+	    $this->error = $this->lasterror();
 	    return -1;
     }
 
@@ -865,12 +865,12 @@ 
 	 *	@param	string	$dolibarr_main_db_name		Database name where user must be granted
 	 *	@return	int									<0 if KO, >=0 if OK
      */
-    function DDLCreateUser($dolibarr_main_db_host,$dolibarr_main_db_user,$dolibarr_main_db_pass,$dolibarr_main_db_name)
+    function DDLCreateUser($dolibarr_main_db_host, $dolibarr_main_db_user, $dolibarr_main_db_pass, $dolibarr_main_db_name)
     {
         $sql = "CREATE USER '".$this->escape($dolibarr_main_db_user)."'";
-        dol_syslog(get_class($this)."::DDLCreateUser", LOG_DEBUG);	// No sql to avoid password in log
-        $resql=$this->query($sql);
-        if (! $resql)
+        dol_syslog(get_class($this)."::DDLCreateUser", LOG_DEBUG); // No sql to avoid password in log
+        $resql = $this->query($sql);
+        if (!$resql)
         {
             if ($this->lasterrno != 'DB_ERROR_USER_ALREADY_EXISTS')
             {
@@ -883,18 +883,18 @@ 
             }
         }
         $sql = "GRANT ALL PRIVILEGES ON ".$this->escape($dolibarr_main_db_name).".* TO '".$this->escape($dolibarr_main_db_user)."'@'".$this->escape($dolibarr_main_db_host)."' IDENTIFIED BY '".$this->escape($dolibarr_main_db_pass)."'";
-        dol_syslog(get_class($this)."::DDLCreateUser", LOG_DEBUG);	// No sql to avoid password in log
-        $resql=$this->query($sql);
-        if (! $resql)
+        dol_syslog(get_class($this)."::DDLCreateUser", LOG_DEBUG); // No sql to avoid password in log
+        $resql = $this->query($sql);
+        if (!$resql)
         {
             return -1;
         }
 
-        $sql="FLUSH Privileges";
+        $sql = "FLUSH Privileges";
 
         dol_syslog(get_class($this)."::DDLCreateUser", LOG_DEBUG);
-        $resql=$this->query($sql);
-        if (! $resql)
+        $resql = $this->query($sql);
+        if (!$resql)
         {
             return -1;
         }
@@ -910,13 +910,13 @@ 
      */
     function getDefaultCharacterSetDatabase()
     {
-        $resql=$this->query('SHOW VARIABLES LIKE \'character_set_database\'');
+        $resql = $this->query('SHOW VARIABLES LIKE \'character_set_database\'');
         if (!$resql)
         {
             // version Mysql < 4.1.1
             return $this->forcecharset;
         }
-        $liste=$this->fetch_array($resql);
+        $liste = $this->fetch_array($resql);
         $tmpval = $liste['Value'];
 
         return $tmpval;
@@ -929,12 +929,12 @@ 
      */
     function getListOfCharacterSet()
     {
-        $resql=$this->query('SHOW CHARSET');
+        $resql = $this->query('SHOW CHARSET');
         $liste = array();
         if ($resql)
         {
             $i = 0;
-            while ($obj = $this->fetch_object($resql) )
+            while ($obj = $this->fetch_object($resql))
             {
                 $liste[$i]['charset'] = $obj->Charset;
                 $liste[$i]['description'] = $obj->Description;
@@ -956,13 +956,13 @@ 
      */
     function getDefaultCollationDatabase()
     {
-        $resql=$this->query('SHOW VARIABLES LIKE \'collation_database\'');
+        $resql = $this->query('SHOW VARIABLES LIKE \'collation_database\'');
         if (!$resql)
         {
             // version Mysql < 4.1.1
             return $this->forcecollate;
         }
-        $liste=$this->fetch_array($resql);
+        $liste = $this->fetch_array($resql);
         $tmpval = $liste['Value'];
 
         return $tmpval;
@@ -975,12 +975,12 @@ 
      */
     function getListOfCollation()
     {
-        $resql=$this->query('SHOW COLLATION');
+        $resql = $this->query('SHOW COLLATION');
         $liste = array();
         if ($resql)
         {
             $i = 0;
-            while ($obj = $this->fetch_object($resql) )
+            while ($obj = $this->fetch_object($resql))
             {
                 $liste[$i]['collation'] = $obj->Collation;
                 $i++;
@@ -1000,14 +1000,14 @@ 
      */
     function getPathOfDump()
     {
-        $fullpathofdump='/pathtomysqldump/mysqldump';
+        $fullpathofdump = '/pathtomysqldump/mysqldump';
 
-        $resql=$this->query('SHOW VARIABLES LIKE \'basedir\'');
+        $resql = $this->query('SHOW VARIABLES LIKE \'basedir\'');
         if ($resql)
         {
-            $liste=$this->fetch_array($resql);
-            $basedir=$liste['Value'];
-            $fullpathofdump=$basedir.(preg_match('/\/$/',$basedir)?'':'/').'bin/mysqldump';
+            $liste = $this->fetch_array($resql);
+            $basedir = $liste['Value'];
+            $fullpathofdump = $basedir.(preg_match('/\/$/', $basedir) ? '' : '/').'bin/mysqldump';
         }
         return $fullpathofdump;
     }
@@ -1019,14 +1019,14 @@ 
      */
     function getPathOfRestore()
     {
-        $fullpathofimport='/pathtomysql/mysql';
+        $fullpathofimport = '/pathtomysql/mysql';
 
-        $resql=$this->query('SHOW VARIABLES LIKE \'basedir\'');
+        $resql = $this->query('SHOW VARIABLES LIKE \'basedir\'');
         if ($resql)
         {
-            $liste=$this->fetch_array($resql);
-            $basedir=$liste['Value'];
-            $fullpathofimport=$basedir.(preg_match('/\/$/',$basedir)?'':'/').'bin/mysql';
+            $liste = $this->fetch_array($resql);
+            $basedir = $liste['Value'];
+            $fullpathofimport = $basedir.(preg_match('/\/$/', $basedir) ? '' : '/').'bin/mysql';
         }
         return $fullpathofimport;
     }
@@ -1037,16 +1037,16 @@ 
      * @param	string	$filter		Filter list on a particular value
 	 * @return	array				Array of key-values (key=>value)
      */
-    function getServerParametersValues($filter='')
+    function getServerParametersValues($filter = '')
     {
-        $result=array();
+        $result = array();
 
-        $sql='SHOW VARIABLES';
-        if ($filter) $sql.=" LIKE '".$this->escape($filter)."'";
-        $resql=$this->query($sql);
+        $sql = 'SHOW VARIABLES';
+        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;
@@ -1058,16 +1058,16 @@ 
      * @param	string	$filter		Filter list on a particular value
 	 * @return  array				Array of key-values (key=>value)
      */
-    function getServerStatusValues($filter='')
+    function getServerStatusValues($filter = '')
     {
-        $result=array();
+        $result = array();
 
-        $sql='SHOW STATUS';
-        if ($filter) $sql.=" LIKE '".$this->escape($filter)."'";
-        $resql=$this->query($sql);
+        $sql = 'SHOW STATUS';
+        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;

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;

Indentation +840 added lines, -840 removed lines

@@ -34,16 +34,16 @@ 
 {
 	/** @var mysqli Database object */
 	public $db;
-    //! Database type
-    public $type='mysqli';
-    //! Database label
-    const LABEL='MySQL or MariaDB';
-    //! Version min database
-    const VERSIONMIN='5.0.3';
+	//! Database type
+	public $type='mysqli';
+	//! Database label
+	const LABEL='MySQL or MariaDB';
+	//! Version min database
+	const VERSIONMIN='5.0.3';
 	/** @var mysqli_result Resultset of last query */
 	private $_results;
 
-    /**
+	/**
 	 *	Constructor.
 	 *	This create an opened connexion to a database server and eventually to a database
 	 *
@@ -53,38 +53,38 @@ 
 	 *	@param	    string	$pass		Mot de passe
 	 *	@param	    string	$name		Nom de la database
 	 *	@param	    int		$port		Port of database server
-     */
-    function __construct($type, $host, $user, $pass, $name='', $port=0)
-    {
-        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;
-
-        $this->database_user=$user;
-        $this->database_host=$host;
-        $this->database_port=$port;
-
-        $this->transaction_opened=0;
-
-        //print "Name DB: $host,$user,$pass,$name<br>";
-
-        if (! class_exists('mysqli'))
-        {
-            $this->connected = false;
-            $this->ok = false;
-            $this->error="Mysqli PHP functions for using Mysqli driver are not available in this version of PHP. Try to use another driver.";
-            dol_syslog(get_class($this)."::DoliDBMysqli : Mysqli PHP functions for using Mysqli driver are not available in this version of PHP. Try to use another driver.",LOG_ERR);
-        }
-
-        if (! $host)
-        {
-            $this->connected = false;
-            $this->ok = false;
-            $this->error=$langs->trans("ErrorWrongHostParameter");
-            dol_syslog(get_class($this)."::DoliDBMysqli : Connect error, wrong host parameters",LOG_ERR);
-        }
+	 */
+	function __construct($type, $host, $user, $pass, $name='', $port=0)
+	{
+		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;
+
+		$this->database_user=$user;
+		$this->database_host=$host;
+		$this->database_port=$port;
+
+		$this->transaction_opened=0;
+
+		//print "Name DB: $host,$user,$pass,$name<br>";
+
+		if (! class_exists('mysqli'))
+		{
+			$this->connected = false;
+			$this->ok = false;
+			$this->error="Mysqli PHP functions for using Mysqli driver are not available in this version of PHP. Try to use another driver.";
+			dol_syslog(get_class($this)."::DoliDBMysqli : Mysqli PHP functions for using Mysqli driver are not available in this version of PHP. Try to use another driver.",LOG_ERR);
+		}
+
+		if (! $host)
+		{
+			$this->connected = false;
+			$this->ok = false;
+			$this->error=$langs->trans("ErrorWrongHostParameter");
+			dol_syslog(get_class($this)."::DoliDBMysqli : Connect error, wrong host parameters",LOG_ERR);
+		}
 
 		// Try server connection
 		// We do not try to connect to database, only to server. Connect to database is done later in constrcutor
@@ -101,17 +101,17 @@ 
 		}
 
 		// If server connection is ok, we try to connect to the database
-        if ($this->connected && $name)
-        {
-            if ($this->select_db($name))
-            {
-                $this->database_selected = true;
-                $this->database_name = $name;
-                $this->ok = true;
-
-                // 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 ($this->connected && $name)
+		{
+			if ($this->select_db($name))
+			{
+				$this->database_selected = true;
+				$this->database_name = $name;
+				$this->ok = true;
+
+				// 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 ($this->db->character_set_name() != $clientmustbe) {
 					$this->db->set_charset($clientmustbe);	// This set charset, but with a bad collation
@@ -121,26 +121,26 @@ 
 
 					if (! preg_match('/general/', $collation)) $this->db->query("SET collation_connection = ".$collation);
 				}
-            }
-            else
-            {
-                $this->database_selected = false;
-                $this->database_name = '';
-                $this->ok = false;
-                $this->error=$this->error();
-                dol_syslog(get_class($this)."::DoliDBMysqli : Select_db error ".$this->error,LOG_ERR);
-            }
-        }
-        else
-        {
-            // Pas de selection de base demandee, ok ou ko
-            $this->database_selected = false;
-
-            if ($this->connected)
-            {
-            	// 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';
+			}
+			else
+			{
+				$this->database_selected = false;
+				$this->database_name = '';
+				$this->ok = false;
+				$this->error=$this->error();
+				dol_syslog(get_class($this)."::DoliDBMysqli : Select_db error ".$this->error,LOG_ERR);
+			}
+		}
+		else
+		{
+			// Pas de selection de base demandee, ok ou ko
+			$this->database_selected = false;
+
+			if ($this->connected)
+			{
+				// 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 ($this->db->character_set_name() != $clientmustbe) {
 					$this->db->set_charset($clientmustbe);	// This set utf8_general_ci
@@ -151,21 +151,21 @@ 
 					if (! preg_match('/general/', $collation)) $this->db->query("SET collation_connection = ".$collation);
 				}
 			}
-        }
-    }
-
-
-    /**
-     *  Convert a SQL request in Mysql syntax to native syntax
-     *
-     *  @param     string	$line   SQL request line to convert
-     *  @param     string	$type	Type of SQL order ('ddl' for insert, update, select, delete or 'dml' for create, alter...)
-     *  @return    string   		SQL request line converted
-     */
-    static function convertSQLFromMysql($line,$type='ddl')
-    {
-        return $line;
-    }
+		}
+	}
+
+
+	/**
+	 *  Convert a SQL request in Mysql syntax to native syntax
+	 *
+	 *  @param     string	$line   SQL request line to convert
+	 *  @param     string	$type	Type of SQL order ('ddl' for insert, update, select, delete or 'dml' for create, alter...)
+	 *  @return    string   		SQL request line converted
+	 */
+	static function convertSQLFromMysql($line,$type='ddl')
+	{
+		return $line;
+	}
 
 	/**
 	 *	Select a database
@@ -173,11 +173,11 @@ 
 	 *	@param	    string	$database	Name of database
 	 *	@return	    boolean  		    true if OK, false if KO
 	 */
-    function select_db($database)
-    {
-        dol_syslog(get_class($this)."::select_db database=".$database, LOG_DEBUG);
-	    return $this->db->select_db($database);
-    }
+	function select_db($database)
+	{
+		dol_syslog(get_class($this)."::select_db database=".$database, LOG_DEBUG);
+		return $this->db->select_db($database);
+	}
 
 
 	/**
@@ -201,360 +201,360 @@ 
 		return new mysqli($host, $login, $passwd, $name, $port);
 	}
 
-    /**
+	/**
 	 *	Return version of database server
 	 *
 	 *	@return	        string      Version string
-     */
-    function getVersion()
-    {
-        return $this->db->server_info;
-    }
-
-    /**
-     *	Return version of database client driver
-     *
-     *	@return	        string      Version string
-     */
+	 */
+	function getVersion()
+	{
+		return $this->db->server_info;
+	}
+
+	/**
+	 *	Return version of database client driver
+	 *
+	 *	@return	        string      Version string
+	 */
 	function getDriverInfo()
 	{
 		return $this->db->client_info;
 	}
 
 
-    /**
-     *  Close database connexion
-     *
-     *  @return     bool     True if disconnect successfull, false otherwise
-     *  @see        connect
-     */
-    function close()
-    {
-        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);
-            $this->connected=false;
-            return $this->db->close();
-        }
-        return false;
-    }
-
-    /**
-     * 	Execute a SQL request and return the resultset
-     *
-     * 	@param	string	$query			SQL query string
-     * 	@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
-     */
-    function query($query,$usesavepoint=0,$type='auto')
-    {
-    	global $conf;
-
-        $query = trim($query);
-
-	    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
-        {
-            $ret = $this->db->query($query);
-        }
-
-        if (! preg_match("/^COMMIT/i",$query) && ! preg_match("/^ROLLBACK/i",$query))
-        {
-            // Si requete utilisateur, on la sauvegarde ainsi que son resultset
-            if (! $ret)
-            {
-                $this->lastqueryerror = $query;
-                $this->lasterror = $this->error();
-                $this->lasterrno = $this->errno();
+	/**
+	 *  Close database connexion
+	 *
+	 *  @return     bool     True if disconnect successfull, false otherwise
+	 *  @see        connect
+	 */
+	function close()
+	{
+		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);
+			$this->connected=false;
+			return $this->db->close();
+		}
+		return false;
+	}
+
+	/**
+	 * 	Execute a SQL request and return the resultset
+	 *
+	 * 	@param	string	$query			SQL query string
+	 * 	@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
+	 */
+	function query($query,$usesavepoint=0,$type='auto')
+	{
+		global $conf;
+
+		$query = trim($query);
+
+		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
+		{
+			$ret = $this->db->query($query);
+		}
+
+		if (! preg_match("/^COMMIT/i",$query) && ! preg_match("/^ROLLBACK/i",$query))
+		{
+			// Si requete utilisateur, on la sauvegarde ainsi que son resultset
+			if (! $ret)
+			{
+				$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
-                dol_syslog(get_class($this)."::query SQL Error message: ".$this->lasterrno." ".$this->lasterror, LOG_ERR);
-            }
-            $this->lastquery=$query;
-            $this->_results = $ret;
-        }
-
-        return $ret;
-    }
-
-    /**
-     *	Renvoie la ligne courante (comme un objet) pour le curseur resultset
-     *
-     *	@param	mysqli_result	$resultset	Curseur de la requete voulue
-     *	@return	object|null					Object result line or null if KO or end of cursor
-     */
-    function fetch_object($resultset)
-    {
-        // Si le resultset n'est pas fourni, on prend le dernier utilise sur cette connexion
-        if (! is_object($resultset)) { $resultset=$this->_results; }
+				dol_syslog(get_class($this)."::query SQL Error message: ".$this->lasterrno." ".$this->lasterror, LOG_ERR);
+			}
+			$this->lastquery=$query;
+			$this->_results = $ret;
+		}
+
+		return $ret;
+	}
+
+	/**
+	 *	Renvoie la ligne courante (comme un objet) pour le curseur resultset
+	 *
+	 *	@param	mysqli_result	$resultset	Curseur de la requete voulue
+	 *	@return	object|null					Object result line or null if KO or end of cursor
+	 */
+	function fetch_object($resultset)
+	{
+		// Si le resultset n'est pas fourni, on prend le dernier utilise sur cette connexion
+		if (! is_object($resultset)) { $resultset=$this->_results; }
 		return $resultset->fetch_object();
-    }
-
-
-    /**
-     *	Return datas as an array
-     *
-     *	@param	mysqli_result	$resultset	Resultset of request
-     *	@return	array|null					Array or null if KO or end of cursor
-     */
-    function fetch_array($resultset)
-    {
-        // If resultset not provided, we take the last used by connexion
-        if (! is_object($resultset)) { $resultset=$this->_results; }
-        return $resultset->fetch_array();
-    }
-
-    /**
-     *	Return datas as an array
-     *
-     *	@param	mysqli_result	$resultset	Resultset of request
-     *	@return	array|null|0				Array or null if KO or end of cursor or 0 if resultset is bool
-     */
-    function fetch_row($resultset)
-    {
-        // If resultset not provided, we take the last used by connexion
-        if (! is_bool($resultset))
-        {
-            if (! is_object($resultset)) { $resultset=$this->_results; }
-            return $resultset->fetch_row();
-        }
-        else
-        {
-            // si le curseur est un booleen on retourne la valeur 0
-            return 0;
-        }
-    }
-
-    /**
-     *	Return number of lines for result of a SELECT
-     *
-     *	@param	mysqli_result	$resultset  Resulset of requests
-     *	@return	int				Nb of lines
-     *	@see    affected_rows
-     */
-    function num_rows($resultset)
-    {
-        // If resultset not provided, we take the last used by connexion
-        if (! is_object($resultset)) { $resultset=$this->_results; }
-        return $resultset->num_rows;
-    }
-
-    /**
-     *	Renvoie le nombre de lignes dans le resultat d'une requete INSERT, DELETE ou UPDATE
-     *
-     *	@param	mysqli_result	$resultset	Curseur de la requete voulue
-     *	@return int							Nombre de lignes
-     *	@see    num_rows
-     */
-    function affected_rows($resultset)
-    {
-        // If resultset not provided, we take the last used by connexion
-        if (! is_object($resultset)) { $resultset=$this->_results; }
-        // mysql necessite un link de base pour cette fonction contrairement
-        // a pqsql qui prend un resultset
-        return $this->db->affected_rows;
-    }
-
-
-    /**
-     *	Libere le dernier resultset utilise sur cette connexion
-     *
-     *	@param  mysqli_result	$resultset	Curseur de la requete voulue
-     *	@return	void
-     */
-    function free($resultset=null)
-    {
-        // 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();
-    }
-
-    /**
-     *	Escape a string to insert data
-     *
-     *	@param	string	$stringtoencode		String to escape
-     *	@return	string						String escaped
-     */
-    function escape($stringtoencode)
-    {
-        return $this->db->real_escape_string($stringtoencode);
-    }
-
-    /**
-     *	Return generic error code of last operation.
-     *
-     *	@return	string		Error code (Exemples: DB_ERROR_TABLE_ALREADY_EXISTS, DB_ERROR_RECORD_ALREADY_EXISTS...)
-     */
-    function errno()
-    {
-        if (! $this->connected) {
-            // Si il y a eu echec de connexion, $this->db n'est pas valide.
-            return 'DB_ERROR_FAILED_TO_CONNECT';
-        } else {
-            // Constants to convert a MySql error code to a generic Dolibarr error code
-            $errorcode_map = array(
-            1004 => 'DB_ERROR_CANNOT_CREATE',
-            1005 => 'DB_ERROR_CANNOT_CREATE',
-            1006 => 'DB_ERROR_CANNOT_CREATE',
-            1007 => 'DB_ERROR_ALREADY_EXISTS',
-            1008 => 'DB_ERROR_CANNOT_DROP',
-            1022 => 'DB_ERROR_KEY_NAME_ALREADY_EXISTS',
-            1025 => 'DB_ERROR_NO_FOREIGN_KEY_TO_DROP',
-            1044 => 'DB_ERROR_ACCESSDENIED',
-            1046 => 'DB_ERROR_NODBSELECTED',
-            1048 => 'DB_ERROR_CONSTRAINT',
-            1050 => 'DB_ERROR_TABLE_ALREADY_EXISTS',
-            1051 => 'DB_ERROR_NOSUCHTABLE',
-            1054 => 'DB_ERROR_NOSUCHFIELD',
-            1060 => 'DB_ERROR_COLUMN_ALREADY_EXISTS',
-            1061 => 'DB_ERROR_KEY_NAME_ALREADY_EXISTS',
-            1062 => 'DB_ERROR_RECORD_ALREADY_EXISTS',
-            1064 => 'DB_ERROR_SYNTAX',
-            1068 => 'DB_ERROR_PRIMARY_KEY_ALREADY_EXISTS',
-            1075 => 'DB_ERROR_CANT_DROP_PRIMARY_KEY',
-            1091 => 'DB_ERROR_NOSUCHFIELD',
-            1100 => 'DB_ERROR_NOT_LOCKED',
-            1136 => 'DB_ERROR_VALUE_COUNT_ON_ROW',
-            1146 => 'DB_ERROR_NOSUCHTABLE',
-            1215 => 'DB_ERROR_CANNOT_ADD_FOREIGN_KEY_CONSTRAINT',
-            1216 => 'DB_ERROR_NO_PARENT',
-            1217 => 'DB_ERROR_CHILD_EXISTS',
-            1396 => 'DB_ERROR_USER_ALREADY_EXISTS',    // When creating user already existing
-            1451 => 'DB_ERROR_CHILD_EXISTS'
-            );
-
-            if (isset($errorcode_map[$this->db->errno])) {
-                return $errorcode_map[$this->db->errno];
-            }
-            $errno=$this->db->errno;
-            return ($errno?'DB_ERROR_'.$errno:'0');
-        }
-    }
-
-    /**
+	}
+
+
+	/**
+	 *	Return datas as an array
+	 *
+	 *	@param	mysqli_result	$resultset	Resultset of request
+	 *	@return	array|null					Array or null if KO or end of cursor
+	 */
+	function fetch_array($resultset)
+	{
+		// If resultset not provided, we take the last used by connexion
+		if (! is_object($resultset)) { $resultset=$this->_results; }
+		return $resultset->fetch_array();
+	}
+
+	/**
+	 *	Return datas as an array
+	 *
+	 *	@param	mysqli_result	$resultset	Resultset of request
+	 *	@return	array|null|0				Array or null if KO or end of cursor or 0 if resultset is bool
+	 */
+	function fetch_row($resultset)
+	{
+		// If resultset not provided, we take the last used by connexion
+		if (! is_bool($resultset))
+		{
+			if (! is_object($resultset)) { $resultset=$this->_results; }
+			return $resultset->fetch_row();
+		}
+		else
+		{
+			// si le curseur est un booleen on retourne la valeur 0
+			return 0;
+		}
+	}
+
+	/**
+	 *	Return number of lines for result of a SELECT
+	 *
+	 *	@param	mysqli_result	$resultset  Resulset of requests
+	 *	@return	int				Nb of lines
+	 *	@see    affected_rows
+	 */
+	function num_rows($resultset)
+	{
+		// If resultset not provided, we take the last used by connexion
+		if (! is_object($resultset)) { $resultset=$this->_results; }
+		return $resultset->num_rows;
+	}
+
+	/**
+	 *	Renvoie le nombre de lignes dans le resultat d'une requete INSERT, DELETE ou UPDATE
+	 *
+	 *	@param	mysqli_result	$resultset	Curseur de la requete voulue
+	 *	@return int							Nombre de lignes
+	 *	@see    num_rows
+	 */
+	function affected_rows($resultset)
+	{
+		// If resultset not provided, we take the last used by connexion
+		if (! is_object($resultset)) { $resultset=$this->_results; }
+		// mysql necessite un link de base pour cette fonction contrairement
+		// a pqsql qui prend un resultset
+		return $this->db->affected_rows;
+	}
+
+
+	/**
+	 *	Libere le dernier resultset utilise sur cette connexion
+	 *
+	 *	@param  mysqli_result	$resultset	Curseur de la requete voulue
+	 *	@return	void
+	 */
+	function free($resultset=null)
+	{
+		// 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();
+	}
+
+	/**
+	 *	Escape a string to insert data
+	 *
+	 *	@param	string	$stringtoencode		String to escape
+	 *	@return	string						String escaped
+	 */
+	function escape($stringtoencode)
+	{
+		return $this->db->real_escape_string($stringtoencode);
+	}
+
+	/**
+	 *	Return generic error code of last operation.
+	 *
+	 *	@return	string		Error code (Exemples: DB_ERROR_TABLE_ALREADY_EXISTS, DB_ERROR_RECORD_ALREADY_EXISTS...)
+	 */
+	function errno()
+	{
+		if (! $this->connected) {
+			// Si il y a eu echec de connexion, $this->db n'est pas valide.
+			return 'DB_ERROR_FAILED_TO_CONNECT';
+		} else {
+			// Constants to convert a MySql error code to a generic Dolibarr error code
+			$errorcode_map = array(
+			1004 => 'DB_ERROR_CANNOT_CREATE',
+			1005 => 'DB_ERROR_CANNOT_CREATE',
+			1006 => 'DB_ERROR_CANNOT_CREATE',
+			1007 => 'DB_ERROR_ALREADY_EXISTS',
+			1008 => 'DB_ERROR_CANNOT_DROP',
+			1022 => 'DB_ERROR_KEY_NAME_ALREADY_EXISTS',
+			1025 => 'DB_ERROR_NO_FOREIGN_KEY_TO_DROP',
+			1044 => 'DB_ERROR_ACCESSDENIED',
+			1046 => 'DB_ERROR_NODBSELECTED',
+			1048 => 'DB_ERROR_CONSTRAINT',
+			1050 => 'DB_ERROR_TABLE_ALREADY_EXISTS',
+			1051 => 'DB_ERROR_NOSUCHTABLE',
+			1054 => 'DB_ERROR_NOSUCHFIELD',
+			1060 => 'DB_ERROR_COLUMN_ALREADY_EXISTS',
+			1061 => 'DB_ERROR_KEY_NAME_ALREADY_EXISTS',
+			1062 => 'DB_ERROR_RECORD_ALREADY_EXISTS',
+			1064 => 'DB_ERROR_SYNTAX',
+			1068 => 'DB_ERROR_PRIMARY_KEY_ALREADY_EXISTS',
+			1075 => 'DB_ERROR_CANT_DROP_PRIMARY_KEY',
+			1091 => 'DB_ERROR_NOSUCHFIELD',
+			1100 => 'DB_ERROR_NOT_LOCKED',
+			1136 => 'DB_ERROR_VALUE_COUNT_ON_ROW',
+			1146 => 'DB_ERROR_NOSUCHTABLE',
+			1215 => 'DB_ERROR_CANNOT_ADD_FOREIGN_KEY_CONSTRAINT',
+			1216 => 'DB_ERROR_NO_PARENT',
+			1217 => 'DB_ERROR_CHILD_EXISTS',
+			1396 => 'DB_ERROR_USER_ALREADY_EXISTS',    // When creating user already existing
+			1451 => 'DB_ERROR_CHILD_EXISTS'
+			);
+
+			if (isset($errorcode_map[$this->db->errno])) {
+				return $errorcode_map[$this->db->errno];
+			}
+			$errno=$this->db->errno;
+			return ($errno?'DB_ERROR_'.$errno:'0');
+		}
+	}
+
+	/**
 	 *	Return description of last error
 	 *
 	 *	@return	string		Error text
-     */
-    function error()
-    {
-        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 {
-            return $this->db->error;
-        }
-    }
-
-    /**
+	 */
+	function error()
+	{
+		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 {
+			return $this->db->error;
+		}
+	}
+
+	/**
 	 * Get last ID after an insert INSERT
 	 *
 	 * @param   string	$tab    	Table name concerned by insert. Ne sert pas sous MySql mais requis pour compatibilite avec Postgresql
 	 * @param	string	$fieldid	Field name
 	 * @return  int|string			Id of row
-     */
-    function last_insert_id($tab,$fieldid='rowid')
-    {
-        return $this->db->insert_id;
-    }
-
-    /**
-     *	Encrypt sensitive data in database
-     *  Warning: This function includes the escape, so it must use direct value
-     *
-     *	@param	string	$fieldorvalue	Field name or value to encrypt
-     * 	@param	int		$withQuotes		Return string with quotes
-     * 	@return	string					XXX(field) or XXX('value') or field or 'value'
-     *
-     */
-    function encrypt($fieldorvalue, $withQuotes=0)
-    {
-        global $conf;
-
-        // Type of encryption (2: AES (recommended), 1: DES , 0: no encryption)
-        $cryptType = (!empty($conf->db->dolibarr_main_db_encryption)?$conf->db->dolibarr_main_db_encryption:0);
-
-        //Encryption key
-        $cryptKey = (!empty($conf->db->dolibarr_main_db_cryptkey)?$conf->db->dolibarr_main_db_cryptkey:'');
-
-        $return = ($withQuotes?"'":"").$this->escape($fieldorvalue).($withQuotes?"'":"");
-
-        if ($cryptType && !empty($cryptKey))
-        {
-            if ($cryptType == 2)
-            {
-                $return = 'AES_ENCRYPT('.$return.',\''.$cryptKey.'\')';
-            }
-            else if ($cryptType == 1)
-            {
-                $return = 'DES_ENCRYPT('.$return.',\''.$cryptKey.'\')';
-            }
-        }
-
-        return $return;
-    }
-
-    /**
-     *	Decrypt sensitive data in database
-     *
-     *	@param	string	$value			Value to decrypt
-     * 	@return	string					Decrypted value if used
-     */
-    function decrypt($value)
-    {
-        global $conf;
-
-        // Type of encryption (2: AES (recommended), 1: DES , 0: no encryption)
-        $cryptType = (!empty($conf->db->dolibarr_main_db_encryption)?$conf->db->dolibarr_main_db_encryption:0);
-
-        //Encryption key
-        $cryptKey = (!empty($conf->db->dolibarr_main_db_cryptkey)?$conf->db->dolibarr_main_db_cryptkey:'');
-
-        $return = $value;
-
-        if ($cryptType && !empty($cryptKey))
-        {
-            if ($cryptType == 2)
-            {
-                $return = 'AES_DECRYPT('.$value.',\''.$cryptKey.'\')';
-            }
-            else if ($cryptType == 1)
-            {
-                $return = 'DES_DECRYPT('.$value.',\''.$cryptKey.'\')';
-            }
-        }
-
-        return $return;
-    }
-
-
-    /**
+	 */
+	function last_insert_id($tab,$fieldid='rowid')
+	{
+		return $this->db->insert_id;
+	}
+
+	/**
+	 *	Encrypt sensitive data in database
+	 *  Warning: This function includes the escape, so it must use direct value
+	 *
+	 *	@param	string	$fieldorvalue	Field name or value to encrypt
+	 * 	@param	int		$withQuotes		Return string with quotes
+	 * 	@return	string					XXX(field) or XXX('value') or field or 'value'
+	 *
+	 */
+	function encrypt($fieldorvalue, $withQuotes=0)
+	{
+		global $conf;
+
+		// Type of encryption (2: AES (recommended), 1: DES , 0: no encryption)
+		$cryptType = (!empty($conf->db->dolibarr_main_db_encryption)?$conf->db->dolibarr_main_db_encryption:0);
+
+		//Encryption key
+		$cryptKey = (!empty($conf->db->dolibarr_main_db_cryptkey)?$conf->db->dolibarr_main_db_cryptkey:'');
+
+		$return = ($withQuotes?"'":"").$this->escape($fieldorvalue).($withQuotes?"'":"");
+
+		if ($cryptType && !empty($cryptKey))
+		{
+			if ($cryptType == 2)
+			{
+				$return = 'AES_ENCRYPT('.$return.',\''.$cryptKey.'\')';
+			}
+			else if ($cryptType == 1)
+			{
+				$return = 'DES_ENCRYPT('.$return.',\''.$cryptKey.'\')';
+			}
+		}
+
+		return $return;
+	}
+
+	/**
+	 *	Decrypt sensitive data in database
+	 *
+	 *	@param	string	$value			Value to decrypt
+	 * 	@return	string					Decrypted value if used
+	 */
+	function decrypt($value)
+	{
+		global $conf;
+
+		// Type of encryption (2: AES (recommended), 1: DES , 0: no encryption)
+		$cryptType = (!empty($conf->db->dolibarr_main_db_encryption)?$conf->db->dolibarr_main_db_encryption:0);
+
+		//Encryption key
+		$cryptKey = (!empty($conf->db->dolibarr_main_db_cryptkey)?$conf->db->dolibarr_main_db_cryptkey:'');
+
+		$return = $value;
+
+		if ($cryptType && !empty($cryptKey))
+		{
+			if ($cryptType == 2)
+			{
+				$return = 'AES_DECRYPT('.$value.',\''.$cryptKey.'\')';
+			}
+			else if ($cryptType == 1)
+			{
+				$return = 'DES_DECRYPT('.$value.',\''.$cryptKey.'\')';
+			}
+		}
+
+		return $return;
+	}
+
+
+	/**
 	 * Return connexion ID
 	 *
 	 * @return	        string      Id connexion
-     */
-    function DDLGetConnectId()
-    {
-        $resql=$this->query('SELECT CONNECTION_ID()');
-        if ($resql)
-        {
-            $row=$this->fetch_row($resql);
-            return $row[0];
-        }
-        else return '?';
-    }
-
-    /**
+	 */
+	function DDLGetConnectId()
+	{
+		$resql=$this->query('SELECT CONNECTION_ID()');
+		if ($resql)
+		{
+			$row=$this->fetch_row($resql);
+			return $row[0];
+		}
+		else return '?';
+	}
+
+	/**
 	 *	Create a new database
 	 *	Do not use function xxx_create_db (xxx=mysql, ...) as they are deprecated
 	 *	We force to create database with charset this->forcecharset and collate this->forcecollate
@@ -564,79 +564,79 @@ 
 	 * 	@param	string	$collation		Charset used to sort data
 	 * 	@param	string	$owner			Username of database owner
 	 * 	@return	bool|mysqli_result		resource defined if OK, null if KO
-     */
-    function DDLCreateDb($database,$charset='',$collation='',$owner='')
-    {
-        if (empty($charset))   $charset=$this->forcecharset;
-        if (empty($collation)) $collation=$this->forcecollate;
+	 */
+	function DDLCreateDb($database,$charset='',$collation='',$owner='')
+	{
+		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
+		// ALTER DATABASE dolibarr_db DEFAULT CHARACTER SET latin DEFAULT COLLATE latin1_swedish_ci
 		$sql = "CREATE DATABASE `".$this->escape($database)."`";
 		$sql.= " DEFAULT CHARACTER SET `".$this->escape($charset)."` DEFAULT COLLATE `".$this->escape($collation)."`";
 
-        dol_syslog($sql,LOG_DEBUG);
-        $ret=$this->query($sql);
-        if (! $ret)
-        {
-            // We try again for compatibility with Mysql < 4.1.1
-            $sql = "CREATE DATABASE `".$this->escape($database)."`";
-            dol_syslog($sql,LOG_DEBUG);
-            $ret=$this->query($sql);
-        }
-        return $ret;
-    }
-
-    /**
+		dol_syslog($sql,LOG_DEBUG);
+		$ret=$this->query($sql);
+		if (! $ret)
+		{
+			// We try again for compatibility with Mysql < 4.1.1
+			$sql = "CREATE DATABASE `".$this->escape($database)."`";
+			dol_syslog($sql,LOG_DEBUG);
+			$ret=$this->query($sql);
+		}
+		return $ret;
+	}
+
+	/**
 	 *  List tables into a database
 	 *
 	 *  @param	string		$database	Name of database
 	 *  @param	string		$table		Nmae of table filter ('xxx%')
 	 *  @return	array					List of tables in an array
-     */
-    function DDLListTables($database, $table='')
-    {
-        $listtables=array();
-
-        $like = '';
-        if ($table) $like = "LIKE '".$table."'";
-        $sql="SHOW TABLES FROM ".$database." ".$like.";";
-        //print $sql;
-        $result = $this->query($sql);
-        if ($result)
-        {
-            while($row = $this->fetch_row($result))
-            {
-                $listtables[] = $row[0];
-            }
-        }
-        return $listtables;
-    }
-
-    /**
+	 */
+	function DDLListTables($database, $table='')
+	{
+		$listtables=array();
+
+		$like = '';
+		if ($table) $like = "LIKE '".$table."'";
+		$sql="SHOW TABLES FROM ".$database." ".$like.";";
+		//print $sql;
+		$result = $this->query($sql);
+		if ($result)
+		{
+			while($row = $this->fetch_row($result))
+			{
+				$listtables[] = $row[0];
+			}
+		}
+		return $listtables;
+	}
+
+	/**
 	 *	List information of columns into a table.
 	 *
 	 *	@param	string	$table		Name of table
 	 *	@return	array				Tableau des informations des champs de la table
-     */
-    function DDLInfoTable($table)
-    {
-        $infotables=array();
-
-        $sql="SHOW FULL COLUMNS FROM ".$table.";";
-
-        dol_syslog($sql,LOG_DEBUG);
-        $result = $this->query($sql);
-        if ($result)
-        {
-            while($row = $this->fetch_row($result))
-            {
-                $infotables[] = $row;
-            }
-        }
-        return $infotables;
-    }
-
-    /**
+	 */
+	function DDLInfoTable($table)
+	{
+		$infotables=array();
+
+		$sql="SHOW FULL COLUMNS FROM ".$table.";";
+
+		dol_syslog($sql,LOG_DEBUG);
+		$result = $this->query($sql);
+		if ($result)
+		{
+			while($row = $this->fetch_row($result))
+			{
+				$infotables[] = $row;
+			}
+		}
+		return $infotables;
+	}
+
+	/**
 	 *	Create a table into database
 	 *
 	 *	@param	    string	$table 			Name of table
@@ -647,18 +647,18 @@ 
 	 *	@param	    array	$fulltext_keys	Tableau des Nom de champs qui seront indexes en fulltext
 	 *	@param	    array	$keys 			Tableau des champs cles noms => valeur
 	 *	@return	    int						<0 if KO, >=0 if OK
-     */
-    function DDLCreateTable($table,$fields,$primary_key,$type,$unique_keys=null,$fulltext_keys=null,$keys=null)
-    {
-	    // FIXME: $fulltext_keys parameter is unused
-
-        // cles recherchees dans le tableau des descriptions (fields) : type,value,attribute,null,default,extra
-        // ex. : $fields['rowid'] = array('type'=>'int','value'=>'11','null'=>'not null','extra'=> 'auto_increment');
-        $sql = "CREATE TABLE ".$table."(";
-        $i=0;
-        foreach($fields as $field_name => $field_desc)
-        {
-        	$sqlfields[$i] = $field_name." ";
+	 */
+	function DDLCreateTable($table,$fields,$primary_key,$type,$unique_keys=null,$fulltext_keys=null,$keys=null)
+	{
+		// FIXME: $fulltext_keys parameter is unused
+
+		// cles recherchees dans le tableau des descriptions (fields) : type,value,attribute,null,default,extra
+		// ex. : $fields['rowid'] = array('type'=>'int','value'=>'11','null'=>'not null','extra'=> 'auto_increment');
+		$sql = "CREATE TABLE ".$table."(";
+		$i=0;
+		foreach($fields as $field_name => $field_desc)
+		{
+			$sqlfields[$i] = $field_name." ";
 			$sqlfields[$i]  .= $field_desc['type'];
 			if( preg_match("/^[^\s]/i",$field_desc['value'])) {
 				$sqlfields[$i]  .= "(".$field_desc['value'].")";
@@ -681,76 +681,76 @@ 
 			if( preg_match("/^[^\s]/i",$field_desc['extra'])) {
 				$sqlfields[$i]  .= " ".$field_desc['extra'];
 			}
-            $i++;
-        }
-        if($primary_key != "")
-        $pk = "primary key(".$primary_key.")";
-
-        if(is_array($unique_keys)) {
-            $i = 0;
-            foreach($unique_keys as $key => $value)
-            {
-                $sqluq[$i] = "UNIQUE KEY '".$key."' ('".$value."')";
-                $i++;
-            }
-        }
-        if(is_array($keys))
-        {
-            $i = 0;
-            foreach($keys as $key => $value)
-            {
-                $sqlk[$i] = "KEY ".$key." (".$value.")";
-                $i++;
-            }
-        }
-        $sql .= implode(',',$sqlfields);
-        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;
-    }
-
-    /**
-     *	Drop a table into database
-     *
-     *	@param	    string	$table 			Name of table
-     *	@return	    int						<0 if KO, >=0 if OK
-     */
-    function DDLDropTable($table)
-    {
-    	$sql = "DROP TABLE ".$table;
+			$i++;
+		}
+		if($primary_key != "")
+		$pk = "primary key(".$primary_key.")";
+
+		if(is_array($unique_keys)) {
+			$i = 0;
+			foreach($unique_keys as $key => $value)
+			{
+				$sqluq[$i] = "UNIQUE KEY '".$key."' ('".$value."')";
+				$i++;
+			}
+		}
+		if(is_array($keys))
+		{
+			$i = 0;
+			foreach($keys as $key => $value)
+			{
+				$sqlk[$i] = "KEY ".$key." (".$value.")";
+				$i++;
+			}
+		}
+		$sql .= implode(',',$sqlfields);
+		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;
+	}
+
+	/**
+	 *	Drop a table into database
+	 *
+	 *	@param	    string	$table 			Name of table
+	 *	@return	    int						<0 if KO, >=0 if OK
+	 */
+	function DDLDropTable($table)
+	{
+		$sql = "DROP TABLE ".$table;
 
 		if (! $this->query($sql))
  			return -1;
-    	else
-    		return 1;
-    }
+		else
+			return 1;
+	}
 
-    /**
+	/**
 	 *	Return a pointer of line with description of a table or field
 	 *
 	 *	@param	string		$table	Name of table
 	 *	@param	string		$field	Optionnel : Name of field if we want description of field
 	 *	@return	bool|mysqli_result	Resultset x (x->Field, x->Type, ...)
-     */
-    function DDLDescTable($table,$field="")
-    {
-        $sql="DESC ".$table." ".$field;
+	 */
+	function DDLDescTable($table,$field="")
+	{
+		$sql="DESC ".$table." ".$field;
 
-        dol_syslog(get_class($this)."::DDLDescTable ".$sql,LOG_DEBUG);
-        $this->_results = $this->query($sql);
-        return $this->_results;
-    }
+		dol_syslog(get_class($this)."::DDLDescTable ".$sql,LOG_DEBUG);
+		$this->_results = $this->query($sql);
+		return $this->_results;
+	}
 
-    /**
+	/**
 	 *	Create a new field into table
 	 *
 	 *	@param	string	$table 				Name of table
@@ -758,105 +758,105 @@ 
 	 *	@param	string	$field_desc 		Tableau associatif de description du champ a inserer[nom du parametre][valeur du parametre]
 	 *	@param	string	$field_position 	Optionnel ex.: "after champtruc"
 	 *	@return	int							<0 if KO, >0 if OK
-     */
-    function DDLAddField($table,$field_name,$field_desc,$field_position="")
-    {
-        // cles recherchees dans le tableau des descriptions (field_desc) : type,value,attribute,null,default,extra
-        // 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')))
-            {
-                $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'];
-        $sql.= " ".$field_position;
-
-        dol_syslog(get_class($this)."::DDLAddField ".$sql,LOG_DEBUG);
-        if($this->query($sql)) {
-            return 1;
-        }
-        return -1;
-    }
-
-    /**
+	 */
+	function DDLAddField($table,$field_name,$field_desc,$field_position="")
+	{
+		// cles recherchees dans le tableau des descriptions (field_desc) : type,value,attribute,null,default,extra
+		// 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')))
+			{
+				$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'];
+		$sql.= " ".$field_position;
+
+		dol_syslog(get_class($this)."::DDLAddField ".$sql,LOG_DEBUG);
+		if($this->query($sql)) {
+			return 1;
+		}
+		return -1;
+	}
+
+	/**
 	 *	Update format of a field into a table
 	 *
 	 *	@param	string	$table 				Name of table
 	 *	@param	string	$field_name 		Name of field to modify
 	 *	@param	string	$field_desc 		Array with description of field format
 	 *	@return	int							<0 if KO, >0 if OK
-     */
-    function DDLUpdateField($table,$field_name,$field_desc)
-    {
-        $sql = "ALTER TABLE ".$table;
-        $sql .= " MODIFY COLUMN ".$field_name." ".$field_desc['type'];
-        if ($field_desc['type'] == 'double' || $field_desc['type'] == 'tinyint' || $field_desc['type'] == 'int' || $field_desc['type'] == 'varchar') {
-        	$sql.="(".$field_desc['value'].")";
-        }
-        if ($field_desc['null'] == 'not null' || $field_desc['null'] == 'NOT NULL')
-        {
-        	// We will try to change format of column to NOT NULL. To be sure the ALTER works, we try to update fields that are NULL
-        	if ($field_desc['type'] == 'varchar' || $field_desc['type'] == 'text')
-        	{
-        		$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')
-        	{
-        		$sqlbis="UPDATE ".$table." SET ".$field_name." = ".((int) $this->escape($field_desc['default'] ? $field_desc['default'] : 0))." WHERE ".$field_name." IS NULL";
-        		$this->query($sqlbis);
-        	}
-
-        	$sql.=" NOT NULL";
-        }
-
-        if ($field_desc['default'] != '')
-        {
+	 */
+	function DDLUpdateField($table,$field_name,$field_desc)
+	{
+		$sql = "ALTER TABLE ".$table;
+		$sql .= " MODIFY COLUMN ".$field_name." ".$field_desc['type'];
+		if ($field_desc['type'] == 'double' || $field_desc['type'] == 'tinyint' || $field_desc['type'] == 'int' || $field_desc['type'] == 'varchar') {
+			$sql.="(".$field_desc['value'].")";
+		}
+		if ($field_desc['null'] == 'not null' || $field_desc['null'] == 'NOT NULL')
+		{
+			// We will try to change format of column to NOT NULL. To be sure the ALTER works, we try to update fields that are NULL
+			if ($field_desc['type'] == 'varchar' || $field_desc['type'] == 'text')
+			{
+				$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')
+			{
+				$sqlbis="UPDATE ".$table." SET ".$field_name." = ".((int) $this->escape($field_desc['default'] ? $field_desc['default'] : 0))." WHERE ".$field_name." IS NULL";
+				$this->query($sqlbis);
+			}
+
+			$sql.=" NOT NULL";
+		}
+
+		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
-        }
+			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;
-    }
+		dol_syslog(get_class($this)."::DDLUpdateField ".$sql,LOG_DEBUG);
+		if (! $this->query($sql))
+		return -1;
+		else
+		return 1;
+	}
 
-    /**
+	/**
 	 *	Drop a field from table
 	 *
 	 *	@param	string	$table 			Name of table
 	 *	@param	string	$field_name 	Name of field to drop
 	 *	@return	int						<0 if KO, >0 if OK
-     */
-    function DDLDropField($table,$field_name)
-    {
-        $sql= "ALTER TABLE ".$table." DROP COLUMN `".$field_name."`";
-        dol_syslog(get_class($this)."::DDLDropField ".$sql,LOG_DEBUG);
-        if ($this->query($sql)) {
-            return 1;
-        }
-	    $this->error=$this->lasterror();
-	    return -1;
-    }
-
-
-    /**
+	 */
+	function DDLDropField($table,$field_name)
+	{
+		$sql= "ALTER TABLE ".$table." DROP COLUMN `".$field_name."`";
+		dol_syslog(get_class($this)."::DDLDropField ".$sql,LOG_DEBUG);
+		if ($this->query($sql)) {
+			return 1;
+		}
+		$this->error=$this->lasterror();
+		return -1;
+	}
+
+
+	/**
 	 * 	Create a user and privileges to connect to database (even if database does not exists yet)
 	 *
 	 *	@param	string	$dolibarr_main_db_host 		Ip server or '%'
@@ -864,214 +864,214 @@ 
 	 *	@param	string	$dolibarr_main_db_pass 		Mot de passe user a creer
 	 *	@param	string	$dolibarr_main_db_name		Database name where user must be granted
 	 *	@return	int									<0 if KO, >=0 if OK
-     */
-    function DDLCreateUser($dolibarr_main_db_host,$dolibarr_main_db_user,$dolibarr_main_db_pass,$dolibarr_main_db_name)
-    {
-        $sql = "CREATE USER '".$this->escape($dolibarr_main_db_user)."'";
-        dol_syslog(get_class($this)."::DDLCreateUser", LOG_DEBUG);	// No sql to avoid password in log
-        $resql=$this->query($sql);
-        if (! $resql)
-        {
-            if ($this->lasterrno != 'DB_ERROR_USER_ALREADY_EXISTS')
-            {
-            	return -1;
-            }
-            else
+	 */
+	function DDLCreateUser($dolibarr_main_db_host,$dolibarr_main_db_user,$dolibarr_main_db_pass,$dolibarr_main_db_name)
+	{
+		$sql = "CREATE USER '".$this->escape($dolibarr_main_db_user)."'";
+		dol_syslog(get_class($this)."::DDLCreateUser", LOG_DEBUG);	// No sql to avoid password in log
+		$resql=$this->query($sql);
+		if (! $resql)
+		{
+			if ($this->lasterrno != 'DB_ERROR_USER_ALREADY_EXISTS')
+			{
+				return -1;
+			}
+			else
+			{
+				// If user already exists, we continue to set permissions
+				dol_syslog(get_class($this)."::DDLCreateUser sql=".$sql, LOG_WARNING);
+			}
+		}
+		$sql = "GRANT ALL PRIVILEGES ON ".$this->escape($dolibarr_main_db_name).".* TO '".$this->escape($dolibarr_main_db_user)."'@'".$this->escape($dolibarr_main_db_host)."' IDENTIFIED BY '".$this->escape($dolibarr_main_db_pass)."'";
+		dol_syslog(get_class($this)."::DDLCreateUser", LOG_DEBUG);	// No sql to avoid password in log
+		$resql=$this->query($sql);
+		if (! $resql)
+		{
+			return -1;
+		}
+
+		$sql="FLUSH Privileges";
+
+		dol_syslog(get_class($this)."::DDLCreateUser", LOG_DEBUG);
+		$resql=$this->query($sql);
+		if (! $resql)
+		{
+			return -1;
+		}
+
+		return 1;
+	}
+
+	/**
+	 *	Return charset used to store data in current database
+	 *  Note: if we are connected to databasename, it is same result than using SELECT default_character_set_name FROM information_schema.SCHEMATA WHERE schema_name = "databasename";)
+	 *
+	 *	@return		string		Charset
+	 *  @see getDefaultCollationDatabase
+	 */
+	function getDefaultCharacterSetDatabase()
+	{
+		$resql=$this->query('SHOW VARIABLES LIKE \'character_set_database\'');
+		if (!$resql)
+		{
+			// version Mysql < 4.1.1
+			return $this->forcecharset;
+		}
+		$liste=$this->fetch_array($resql);
+		$tmpval = $liste['Value'];
+
+		return $tmpval;
+	}
+
+	/**
+	 *	Return list of available charset that can be used to store data in database
+	 *
+	 *	@return		array|null		List of Charset
+	 */
+	function getListOfCharacterSet()
+	{
+		$resql=$this->query('SHOW CHARSET');
+		$liste = array();
+		if ($resql)
+		{
+			$i = 0;
+			while ($obj = $this->fetch_object($resql) )
+			{
+				$liste[$i]['charset'] = $obj->Charset;
+				$liste[$i]['description'] = $obj->Description;
+				$i++;
+			}
+			$this->free($resql);
+		} else {
+			// version Mysql < 4.1.1
+			return null;
+		}
+		return $liste;
+	}
+
+	/**
+	 *	Return collation used in current database
+	 *
+	 *	@return		string		Collation value
+	 *  @see getDefaultCharacterSetDatabase
+	 */
+	function getDefaultCollationDatabase()
+	{
+		$resql=$this->query('SHOW VARIABLES LIKE \'collation_database\'');
+		if (!$resql)
+		{
+			// version Mysql < 4.1.1
+			return $this->forcecollate;
+		}
+		$liste=$this->fetch_array($resql);
+		$tmpval = $liste['Value'];
+
+		return $tmpval;
+	}
+
+	/**
+	 *	Return list of available collation that can be used for database
+	 *
+	 *	@return		array|null		Liste of Collation
+	 */
+	function getListOfCollation()
+	{
+		$resql=$this->query('SHOW COLLATION');
+		$liste = array();
+		if ($resql)
+		{
+			$i = 0;
+			while ($obj = $this->fetch_object($resql) )
 			{
-            	// If user already exists, we continue to set permissions
-            	dol_syslog(get_class($this)."::DDLCreateUser sql=".$sql, LOG_WARNING);
-            }
-        }
-        $sql = "GRANT ALL PRIVILEGES ON ".$this->escape($dolibarr_main_db_name).".* TO '".$this->escape($dolibarr_main_db_user)."'@'".$this->escape($dolibarr_main_db_host)."' IDENTIFIED BY '".$this->escape($dolibarr_main_db_pass)."'";
-        dol_syslog(get_class($this)."::DDLCreateUser", LOG_DEBUG);	// No sql to avoid password in log
-        $resql=$this->query($sql);
-        if (! $resql)
-        {
-            return -1;
-        }
-
-        $sql="FLUSH Privileges";
-
-        dol_syslog(get_class($this)."::DDLCreateUser", LOG_DEBUG);
-        $resql=$this->query($sql);
-        if (! $resql)
-        {
-            return -1;
-        }
-
-        return 1;
-    }
-
-    /**
-     *	Return charset used to store data in current database
-     *  Note: if we are connected to databasename, it is same result than using SELECT default_character_set_name FROM information_schema.SCHEMATA WHERE schema_name = "databasename";)
-     *
-     *	@return		string		Charset
-     *  @see getDefaultCollationDatabase
-     */
-    function getDefaultCharacterSetDatabase()
-    {
-        $resql=$this->query('SHOW VARIABLES LIKE \'character_set_database\'');
-        if (!$resql)
-        {
-            // version Mysql < 4.1.1
-            return $this->forcecharset;
-        }
-        $liste=$this->fetch_array($resql);
-        $tmpval = $liste['Value'];
-
-        return $tmpval;
-    }
-
-    /**
-     *	Return list of available charset that can be used to store data in database
-     *
-     *	@return		array|null		List of Charset
-     */
-    function getListOfCharacterSet()
-    {
-        $resql=$this->query('SHOW CHARSET');
-        $liste = array();
-        if ($resql)
-        {
-            $i = 0;
-            while ($obj = $this->fetch_object($resql) )
-            {
-                $liste[$i]['charset'] = $obj->Charset;
-                $liste[$i]['description'] = $obj->Description;
-                $i++;
-            }
-            $this->free($resql);
-        } else {
-            // version Mysql < 4.1.1
-            return null;
-        }
-        return $liste;
-    }
-
-    /**
-     *	Return collation used in current database
-     *
-     *	@return		string		Collation value
-     *  @see getDefaultCharacterSetDatabase
-     */
-    function getDefaultCollationDatabase()
-    {
-        $resql=$this->query('SHOW VARIABLES LIKE \'collation_database\'');
-        if (!$resql)
-        {
-            // version Mysql < 4.1.1
-            return $this->forcecollate;
-        }
-        $liste=$this->fetch_array($resql);
-        $tmpval = $liste['Value'];
-
-        return $tmpval;
-    }
-
-    /**
-     *	Return list of available collation that can be used for database
-     *
-     *	@return		array|null		Liste of Collation
-     */
-    function getListOfCollation()
-    {
-        $resql=$this->query('SHOW COLLATION');
-        $liste = array();
-        if ($resql)
-        {
-            $i = 0;
-            while ($obj = $this->fetch_object($resql) )
-            {
-                $liste[$i]['collation'] = $obj->Collation;
-                $i++;
-            }
-            $this->free($resql);
-        } else {
-            // version Mysql < 4.1.1
-            return null;
-        }
-        return $liste;
-    }
-
-    /**
+				$liste[$i]['collation'] = $obj->Collation;
+				$i++;
+			}
+			$this->free($resql);
+		} else {
+			// version Mysql < 4.1.1
+			return null;
+		}
+		return $liste;
+	}
+
+	/**
 	 *	Return full path of dump program
 	 *
 	 *	@return		string		Full path of dump program
-     */
-    function getPathOfDump()
-    {
-        $fullpathofdump='/pathtomysqldump/mysqldump';
-
-        $resql=$this->query('SHOW VARIABLES LIKE \'basedir\'');
-        if ($resql)
-        {
-            $liste=$this->fetch_array($resql);
-            $basedir=$liste['Value'];
-            $fullpathofdump=$basedir.(preg_match('/\/$/',$basedir)?'':'/').'bin/mysqldump';
-        }
-        return $fullpathofdump;
-    }
-
-    /**
-     *	Return full path of restore program
-     *
-     *	@return		string		Full path of restore program
-     */
-    function getPathOfRestore()
-    {
-        $fullpathofimport='/pathtomysql/mysql';
-
-        $resql=$this->query('SHOW VARIABLES LIKE \'basedir\'');
-        if ($resql)
-        {
-            $liste=$this->fetch_array($resql);
-            $basedir=$liste['Value'];
-            $fullpathofimport=$basedir.(preg_match('/\/$/',$basedir)?'':'/').'bin/mysql';
-        }
-        return $fullpathofimport;
-    }
-
-    /**
-     * Return value of server parameters
-     *
-     * @param	string	$filter		Filter list on a particular value
+	 */
+	function getPathOfDump()
+	{
+		$fullpathofdump='/pathtomysqldump/mysqldump';
+
+		$resql=$this->query('SHOW VARIABLES LIKE \'basedir\'');
+		if ($resql)
+		{
+			$liste=$this->fetch_array($resql);
+			$basedir=$liste['Value'];
+			$fullpathofdump=$basedir.(preg_match('/\/$/',$basedir)?'':'/').'bin/mysqldump';
+		}
+		return $fullpathofdump;
+	}
+
+	/**
+	 *	Return full path of restore program
+	 *
+	 *	@return		string		Full path of restore program
+	 */
+	function getPathOfRestore()
+	{
+		$fullpathofimport='/pathtomysql/mysql';
+
+		$resql=$this->query('SHOW VARIABLES LIKE \'basedir\'');
+		if ($resql)
+		{
+			$liste=$this->fetch_array($resql);
+			$basedir=$liste['Value'];
+			$fullpathofimport=$basedir.(preg_match('/\/$/',$basedir)?'':'/').'bin/mysql';
+		}
+		return $fullpathofimport;
+	}
+
+	/**
+	 * Return value of server parameters
+	 *
+	 * @param	string	$filter		Filter list on a particular value
 	 * @return	array				Array of key-values (key=>value)
-     */
-    function getServerParametersValues($filter='')
-    {
-        $result=array();
-
-        $sql='SHOW VARIABLES';
-        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;
-        }
-
-        return $result;
-    }
-
-    /**
-     * Return value of server status (current indicators on memory, cache...)
-     *
-     * @param	string	$filter		Filter list on a particular value
+	 */
+	function getServerParametersValues($filter='')
+	{
+		$result=array();
+
+		$sql='SHOW VARIABLES';
+		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;
+		}
+
+		return $result;
+	}
+
+	/**
+	 * Return value of server status (current indicators on memory, cache...)
+	 *
+	 * @param	string	$filter		Filter list on a particular value
 	 * @return  array				Array of key-values (key=>value)
-     */
-    function getServerStatusValues($filter='')
-    {
-        $result=array();
-
-        $sql='SHOW STATUS';
-        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;
-        }
-
-        return $result;
-    }
+	 */
+	function getServerStatusValues($filter='')
+	{
+		$result=array();
+
+		$sql='SHOW STATUS';
+		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;
+		}
+
+		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)
 	{

Indentation +283 added lines, -283 removed lines

@@ -35,14 +35,14 @@ 
  */
 class DoliDBPgsql extends DoliDB
 {
-    //! Database type
+	//! Database type
 	public $type='pgsql';            // Name of manager
-    //! Database label
+	//! Database label
 	const LABEL='PostgreSQL';      // Label of manager
 	//! Charset
 	var $forcecharset='UTF8';       // Can't be static as it may be forced with a dynamic value
-    //! Collate used to force collate when creating database
-    var $forcecollate='';			// Can't be static as it may be forced with a dynamic value
+	//! Collate used to force collate when creating database
+	var $forcecollate='';			// Can't be static as it may be forced with a dynamic value
 	//! Version min database
 	const VERSIONMIN='9.0.0';	// Version min database
 	/** @var resource Resultset of last query */
@@ -66,13 +66,13 @@ 
 	{
 		global $conf,$langs;
 
-        // Note that having "static" property for "$forcecharset" and "$forcecollate" will make error here in strict mode, so they are not static
+		// 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;
 
 		$this->database_user=$user;
-        $this->database_host=$host;
-        $this->database_port=$port;
+		$this->database_host=$host;
+		$this->database_port=$port;
 
 		$this->transaction_opened=0;
 
@@ -142,14 +142,14 @@ 
 	}
 
 
-    /**
-     *  Convert a SQL request in Mysql syntax to native syntax
-     *
-     *  @param  string	$line   			SQL request line to convert
-     *  @param  string	$type				Type of SQL order ('ddl' for insert, update, select, delete or 'dml' for create, alter...)
-     *  @param	bool	$unescapeslashquot	Unescape slash quote with quote quote
-     *  @return string   					SQL request line converted
-     */
+	/**
+	 *  Convert a SQL request in Mysql syntax to native syntax
+	 *
+	 *  @param  string	$line   			SQL request line to convert
+	 *  @param  string	$type				Type of SQL order ('ddl' for insert, update, select, delete or 'dml' for create, alter...)
+	 *  @param	bool	$unescapeslashquot	Unescape slash quote with quote quote
+	 *  @return string   					SQL request line converted
+	 */
 	static function convertSQLFromMysql($line,$type='auto',$unescapeslashquot=false)
 	{
 		// Removed empty line if this is a comment line for SVN tagging
@@ -165,157 +165,157 @@ 
 		{
 			// group_concat support (PgSQL >= 9.0)
 			// Replace group_concat(x) or group_concat(x SEPARATOR ',') with string_agg(x, ',')
-		    $line = preg_replace('/GROUP_CONCAT/i', 'STRING_AGG', $line);
+			$line = preg_replace('/GROUP_CONCAT/i', 'STRING_AGG', $line);
 			$line = preg_replace('/ SEPARATOR/i', ',', $line);
 			$line = preg_replace('/STRING_AGG\(([^,\)]+)\)/i', 'STRING_AGG(\\1, \',\')', $line);
 			//print $line."\n";
 
-		    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';
-		    }
-
-    		$line=preg_replace('/ as signed\)/i',' as integer)',$line);
-
-		    if ($type == 'dml')
-		    {
-                $line=preg_replace('/\s/',' ',$line);   // Replace tabulation with space
-
-		        // we are inside create table statement so lets process datatypes
-    			if (preg_match('/(ISAM|innodb)/i',$line)) { // end of create table sequence
-    				$line=preg_replace('/\)[\s\t]*type[\s\t]*=[\s\t]*(MyISAM|innodb).*;/i',');',$line);
-    				$line=preg_replace('/\)[\s\t]*engine[\s\t]*=[\s\t]*(MyISAM|innodb).*;/i',');',$line);
-    				$line=preg_replace('/,$/','',$line);
-    			}
-
-    			// Process case: "CREATE TABLE llx_mytable(rowid integer NOT NULL AUTO_INCREMENT PRIMARY KEY,code..."
-    			if (preg_match('/[\s\t\(]*(\w*)[\s\t]+int.*auto_increment/i',$line,$reg)) {
-    				$newline=preg_replace('/([\s\t\(]*)([a-zA-Z_0-9]*)[\s\t]+int.*auto_increment[^,]*/i','\\1 \\2 SERIAL PRIMARY KEY',$line);
-                    //$line = "-- ".$line." replaced by --\n".$newline;
-                    $line=$newline;
-    			}
-
-    			// tinyint type conversion
-    			$line=preg_replace('/tinyint\(?[0-9]*\)?/','smallint',$line);
-    			$line=preg_replace('/tinyint/i','smallint',$line);
-
-    			// nuke unsigned
-    			$line=preg_replace('/(int\w+|smallint)\s+unsigned/i','\\1',$line);
-
-    			// blob -> text
-    			$line=preg_replace('/\w*blob/i','text',$line);
-
-    			// tinytext/mediumtext -> text
-    			$line=preg_replace('/tinytext/i','text',$line);
-    			$line=preg_replace('/mediumtext/i','text',$line);
-    			$line=preg_replace('/longtext/i','text',$line);
-
-    			$line=preg_replace('/text\([0-9]+\)/i','text',$line);
-
-    			// change not null datetime field to null valid ones
-    			// (to support remapping of "zero time" to null
-    			$line=preg_replace('/datetime not null/i','datetime',$line);
-    			$line=preg_replace('/datetime/i','timestamp',$line);
-
-    			// double -> numeric
-    			$line=preg_replace('/^double/i','numeric',$line);
-    			$line=preg_replace('/(\s*)double/i','\\1numeric',$line);
-    			// float -> numeric
-    			$line=preg_replace('/^float/i','numeric',$line);
-    			$line=preg_replace('/(\s*)float/i','\\1numeric',$line);
-
-    			//Check tms timestamp field case (in Mysql this field is defautled to now and
-    			// on update defaulted by now
-    			$line=preg_replace('/(\s*)tms(\s*)timestamp/i','\\1tms timestamp without time zone DEFAULT now() NOT NULL',$line);
-
-    			// nuke ON UPDATE CURRENT_TIMESTAMP
-    			$line=preg_replace('/(\s*)on(\s*)update(\s*)CURRENT_TIMESTAMP/i','\\1',$line);
-
-    			// unique index(field1,field2)
-    			if (preg_match('/unique index\s*\((\w+\s*,\s*\w+)\)/i',$line))
-    			{
-    				$line=preg_replace('/unique index\s*\((\w+\s*,\s*\w+)\)/i','UNIQUE\(\\1\)',$line);
-    			}
-
-    			// We remove end of requests "AFTER fieldxxx"
-    			$line=preg_replace('/\sAFTER [a-z0-9_]+/i','',$line);
-
-    			// We remove start of requests "ALTER TABLE tablexxx" if this is a DROP INDEX
-    			$line=preg_replace('/ALTER TABLE [a-z0-9_]+\s+DROP INDEX/i','DROP INDEX',$line);
-
-                // Translate order to rename fields
-                if (preg_match('/ALTER TABLE ([a-z0-9_]+)\s+CHANGE(?: COLUMN)? ([a-z0-9_]+) ([a-z0-9_]+)(.*)$/i',$line,$reg))
-                {
-                	$line = "-- ".$line." replaced by --\n";
-                    $line.= "ALTER TABLE ".$reg[1]." RENAME COLUMN ".$reg[2]." TO ".$reg[3];
-                }
-
-                // Translate order to modify field format
-                if (preg_match('/ALTER TABLE ([a-z0-9_]+)\s+MODIFY(?: COLUMN)? ([a-z0-9_]+) (.*)$/i',$line,$reg))
-                {
-                    $line = "-- ".$line." replaced by --\n";
-                    $newreg3=$reg[3];
-                    $newreg3=preg_replace('/ DEFAULT NULL/i','',$newreg3);
-                    $newreg3=preg_replace('/ NOT NULL/i','',$newreg3);
-                    $newreg3=preg_replace('/ NULL/i','',$newreg3);
-                    $newreg3=preg_replace('/ DEFAULT 0/i','',$newreg3);
-                    $newreg3=preg_replace('/ DEFAULT \'?[0-9a-zA-Z_@]*\'?/i','',$newreg3);
-                    $line.= "ALTER TABLE ".$reg[1]." ALTER COLUMN ".$reg[2]." TYPE ".$newreg3;
-                    // TODO Add alter to set default value or null/not null if there is this in $reg[3]
-                }
-
-                // alter table add primary key (field1, field2 ...) -> We remove the primary key name not accepted by PostGreSQL
-    			// ALTER TABLE llx_dolibarr_modules ADD PRIMARY KEY pk_dolibarr_modules (numero, entity)
-    			if (preg_match('/ALTER\s+TABLE\s*(.*)\s*ADD\s+PRIMARY\s+KEY\s*(.*)\s*\((.*)$/i',$line,$reg))
-    			{
-    				$line = "-- ".$line." replaced by --\n";
-    				$line.= "ALTER TABLE ".$reg[1]." ADD PRIMARY KEY (".$reg[3];
-    			}
-
-                // Translate order to drop primary keys
-                // ALTER TABLE llx_dolibarr_modules DROP PRIMARY KEY pk_xxx
-                if (preg_match('/ALTER\s+TABLE\s*(.*)\s*DROP\s+PRIMARY\s+KEY\s*([^;]+)$/i',$line,$reg))
-                {
-                    $line = "-- ".$line." replaced by --\n";
-                    $line.= "ALTER TABLE ".$reg[1]." DROP CONSTRAINT ".$reg[2];
-                }
-
-		        // Translate order to drop foreign keys
-                // ALTER TABLE llx_dolibarr_modules DROP FOREIGN KEY fk_xxx
-                if (preg_match('/ALTER\s+TABLE\s*(.*)\s*DROP\s+FOREIGN\s+KEY\s*(.*)$/i',$line,$reg))
-                {
-                    $line = "-- ".$line." replaced by --\n";
-                    $line.= "ALTER TABLE ".$reg[1]." DROP CONSTRAINT ".$reg[2];
-                }
-
-                // Translate order to add foreign keys
-                // ALTER TABLE llx_tablechild ADD CONSTRAINT fk_tablechild_fk_fieldparent FOREIGN KEY (fk_fieldparent) REFERENCES llx_tableparent (rowid)
-                if (preg_match('/ALTER\s+TABLE\s+(.*)\s*ADD CONSTRAINT\s+(.*)\s*FOREIGN\s+KEY\s*(.*)$/i',$line,$reg))
-                {
-                    $line=preg_replace('/;$/','',$line);
-                    $line.=" DEFERRABLE INITIALLY IMMEDIATE;";
-                }
-
-                // alter table add [unique] [index] (field1, field2 ...)
-    			// ALTER TABLE llx_accountingaccount ADD INDEX idx_accountingaccount_fk_pcg_version (fk_pcg_version)
-    			if (preg_match('/ALTER\s+TABLE\s*(.*)\s*ADD\s+(UNIQUE INDEX|INDEX|UNIQUE)\s+(.*)\s*\(([\w,\s]+)\)/i',$line,$reg))
-    			{
-    				$fieldlist=$reg[4];
-    				$idxname=$reg[3];
-    				$tablename=$reg[1];
-    				$line = "-- ".$line." replaced by --\n";
-    				$line.= "CREATE ".(preg_match('/UNIQUE/',$reg[2])?'UNIQUE ':'')."INDEX ".$idxname." ON ".$tablename." (".$fieldlist.")";
-    			}
-            }
-
-            // To have postgresql case sensitive
-            $line=str_replace(' LIKE \'',' ILIKE \'',$line);
-            $line=str_replace(' LIKE BINARY \'',' LIKE \'',$line);
-
-            // Replace INSERT IGNORE into INSERT
-            $line=preg_replace('/^INSERT IGNORE/','INSERT',$line);
+			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';
+			}
+
+			$line=preg_replace('/ as signed\)/i',' as integer)',$line);
+
+			if ($type == 'dml')
+			{
+				$line=preg_replace('/\s/',' ',$line);   // Replace tabulation with space
+
+				// we are inside create table statement so lets process datatypes
+				if (preg_match('/(ISAM|innodb)/i',$line)) { // end of create table sequence
+					$line=preg_replace('/\)[\s\t]*type[\s\t]*=[\s\t]*(MyISAM|innodb).*;/i',');',$line);
+					$line=preg_replace('/\)[\s\t]*engine[\s\t]*=[\s\t]*(MyISAM|innodb).*;/i',');',$line);
+					$line=preg_replace('/,$/','',$line);
+				}
+
+				// Process case: "CREATE TABLE llx_mytable(rowid integer NOT NULL AUTO_INCREMENT PRIMARY KEY,code..."
+				if (preg_match('/[\s\t\(]*(\w*)[\s\t]+int.*auto_increment/i',$line,$reg)) {
+					$newline=preg_replace('/([\s\t\(]*)([a-zA-Z_0-9]*)[\s\t]+int.*auto_increment[^,]*/i','\\1 \\2 SERIAL PRIMARY KEY',$line);
+					//$line = "-- ".$line." replaced by --\n".$newline;
+					$line=$newline;
+				}
+
+				// tinyint type conversion
+				$line=preg_replace('/tinyint\(?[0-9]*\)?/','smallint',$line);
+				$line=preg_replace('/tinyint/i','smallint',$line);
+
+				// nuke unsigned
+				$line=preg_replace('/(int\w+|smallint)\s+unsigned/i','\\1',$line);
+
+				// blob -> text
+				$line=preg_replace('/\w*blob/i','text',$line);
+
+				// tinytext/mediumtext -> text
+				$line=preg_replace('/tinytext/i','text',$line);
+				$line=preg_replace('/mediumtext/i','text',$line);
+				$line=preg_replace('/longtext/i','text',$line);
+
+				$line=preg_replace('/text\([0-9]+\)/i','text',$line);
+
+				// change not null datetime field to null valid ones
+				// (to support remapping of "zero time" to null
+				$line=preg_replace('/datetime not null/i','datetime',$line);
+				$line=preg_replace('/datetime/i','timestamp',$line);
+
+				// double -> numeric
+				$line=preg_replace('/^double/i','numeric',$line);
+				$line=preg_replace('/(\s*)double/i','\\1numeric',$line);
+				// float -> numeric
+				$line=preg_replace('/^float/i','numeric',$line);
+				$line=preg_replace('/(\s*)float/i','\\1numeric',$line);
+
+				//Check tms timestamp field case (in Mysql this field is defautled to now and
+				// on update defaulted by now
+				$line=preg_replace('/(\s*)tms(\s*)timestamp/i','\\1tms timestamp without time zone DEFAULT now() NOT NULL',$line);
+
+				// nuke ON UPDATE CURRENT_TIMESTAMP
+				$line=preg_replace('/(\s*)on(\s*)update(\s*)CURRENT_TIMESTAMP/i','\\1',$line);
+
+				// unique index(field1,field2)
+				if (preg_match('/unique index\s*\((\w+\s*,\s*\w+)\)/i',$line))
+				{
+					$line=preg_replace('/unique index\s*\((\w+\s*,\s*\w+)\)/i','UNIQUE\(\\1\)',$line);
+				}
+
+				// We remove end of requests "AFTER fieldxxx"
+				$line=preg_replace('/\sAFTER [a-z0-9_]+/i','',$line);
+
+				// We remove start of requests "ALTER TABLE tablexxx" if this is a DROP INDEX
+				$line=preg_replace('/ALTER TABLE [a-z0-9_]+\s+DROP INDEX/i','DROP INDEX',$line);
+
+				// Translate order to rename fields
+				if (preg_match('/ALTER TABLE ([a-z0-9_]+)\s+CHANGE(?: COLUMN)? ([a-z0-9_]+) ([a-z0-9_]+)(.*)$/i',$line,$reg))
+				{
+					$line = "-- ".$line." replaced by --\n";
+					$line.= "ALTER TABLE ".$reg[1]." RENAME COLUMN ".$reg[2]." TO ".$reg[3];
+				}
+
+				// Translate order to modify field format
+				if (preg_match('/ALTER TABLE ([a-z0-9_]+)\s+MODIFY(?: COLUMN)? ([a-z0-9_]+) (.*)$/i',$line,$reg))
+				{
+					$line = "-- ".$line." replaced by --\n";
+					$newreg3=$reg[3];
+					$newreg3=preg_replace('/ DEFAULT NULL/i','',$newreg3);
+					$newreg3=preg_replace('/ NOT NULL/i','',$newreg3);
+					$newreg3=preg_replace('/ NULL/i','',$newreg3);
+					$newreg3=preg_replace('/ DEFAULT 0/i','',$newreg3);
+					$newreg3=preg_replace('/ DEFAULT \'?[0-9a-zA-Z_@]*\'?/i','',$newreg3);
+					$line.= "ALTER TABLE ".$reg[1]." ALTER COLUMN ".$reg[2]." TYPE ".$newreg3;
+					// TODO Add alter to set default value or null/not null if there is this in $reg[3]
+				}
+
+				// alter table add primary key (field1, field2 ...) -> We remove the primary key name not accepted by PostGreSQL
+				// ALTER TABLE llx_dolibarr_modules ADD PRIMARY KEY pk_dolibarr_modules (numero, entity)
+				if (preg_match('/ALTER\s+TABLE\s*(.*)\s*ADD\s+PRIMARY\s+KEY\s*(.*)\s*\((.*)$/i',$line,$reg))
+				{
+					$line = "-- ".$line." replaced by --\n";
+					$line.= "ALTER TABLE ".$reg[1]." ADD PRIMARY KEY (".$reg[3];
+				}
+
+				// Translate order to drop primary keys
+				// ALTER TABLE llx_dolibarr_modules DROP PRIMARY KEY pk_xxx
+				if (preg_match('/ALTER\s+TABLE\s*(.*)\s*DROP\s+PRIMARY\s+KEY\s*([^;]+)$/i',$line,$reg))
+				{
+					$line = "-- ".$line." replaced by --\n";
+					$line.= "ALTER TABLE ".$reg[1]." DROP CONSTRAINT ".$reg[2];
+				}
+
+				// Translate order to drop foreign keys
+				// ALTER TABLE llx_dolibarr_modules DROP FOREIGN KEY fk_xxx
+				if (preg_match('/ALTER\s+TABLE\s*(.*)\s*DROP\s+FOREIGN\s+KEY\s*(.*)$/i',$line,$reg))
+				{
+					$line = "-- ".$line." replaced by --\n";
+					$line.= "ALTER TABLE ".$reg[1]." DROP CONSTRAINT ".$reg[2];
+				}
+
+				// Translate order to add foreign keys
+				// ALTER TABLE llx_tablechild ADD CONSTRAINT fk_tablechild_fk_fieldparent FOREIGN KEY (fk_fieldparent) REFERENCES llx_tableparent (rowid)
+				if (preg_match('/ALTER\s+TABLE\s+(.*)\s*ADD CONSTRAINT\s+(.*)\s*FOREIGN\s+KEY\s*(.*)$/i',$line,$reg))
+				{
+					$line=preg_replace('/;$/','',$line);
+					$line.=" DEFERRABLE INITIALLY IMMEDIATE;";
+				}
+
+				// alter table add [unique] [index] (field1, field2 ...)
+				// ALTER TABLE llx_accountingaccount ADD INDEX idx_accountingaccount_fk_pcg_version (fk_pcg_version)
+				if (preg_match('/ALTER\s+TABLE\s*(.*)\s*ADD\s+(UNIQUE INDEX|INDEX|UNIQUE)\s+(.*)\s*\(([\w,\s]+)\)/i',$line,$reg))
+				{
+					$fieldlist=$reg[4];
+					$idxname=$reg[3];
+					$tablename=$reg[1];
+					$line = "-- ".$line." replaced by --\n";
+					$line.= "CREATE ".(preg_match('/UNIQUE/',$reg[2])?'UNIQUE ':'')."INDEX ".$idxname." ON ".$tablename." (".$fieldlist.")";
+				}
+			}
+
+			// To have postgresql case sensitive
+			$line=str_replace(' LIKE \'',' ILIKE \'',$line);
+			$line=str_replace(' LIKE BINARY \'',' LIKE \'',$line);
+
+			// Replace INSERT IGNORE into INSERT
+			$line=preg_replace('/^INSERT IGNORE/','INSERT',$line);
 
 			// Delete using criteria on other table must not declare twice the deleted table
 			// DELETE FROM tabletodelete USING tabletodelete, othertable -> DELETE FROM tabletodelete USING othertable
@@ -361,8 +361,8 @@ 
 
 	/**
 	 *	Select a database
-     *  Ici postgresql n'a aucune fonction equivalente de mysql_select_db
-     *  On compare juste manuellement si la database choisie est bien celle activee par la connexion
+	 *  Ici postgresql n'a aucune fonction equivalente de mysql_select_db
+	 *  On compare juste manuellement si la database choisie est bien celle activee par la connexion
 	 *
 	 *	@param	    string	$database	Name of database
 	 *	@return	    bool				true if OK, false if KO
@@ -409,7 +409,7 @@ 
 		// if local connection failed or not requested, use TCP/IP
 		if (! $this->db)
 		{
-		    if (! $host) $host = "localhost";
+			if (! $host) $host = "localhost";
 			if (! $port) $port = 5432;
 
 			$con_string = "host='".$host."' port='".$port."' dbname='".$name."' user='".$login."' password='".$passwd."'";
@@ -453,29 +453,29 @@ 
 		return 'pgsql php driver';
 	}
 
-    /**
-     *  Close database connexion
-     *
-     *  @return     boolean     True if disconnect successfull, false otherwise
-     *  @see        connect
-     */
-    function close()
-    {
-        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);
-          $this->connected=false;
-          return pg_close($this->db);
-        }
-        return false;
-    }
+	/**
+	 *  Close database connexion
+	 *
+	 *  @return     boolean     True if disconnect successfull, false otherwise
+	 *  @see        connect
+	 */
+	function close()
+	{
+		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);
+		  $this->connected=false;
+		  return pg_close($this->db);
+		}
+		return false;
+	}
 
 	/**
 	 * Convert request to PostgreSQL syntax, execute it and return the resultset
 	 *
 	 * @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...)
+	 * @param   string	$type           Type of SQL order ('ddl' for insert, update, select, delete or 'dml' for create, alter...)
 	 * @return	false|resource			Resultset of answer
 	 */
 	function query($query,$usesavepoint=0,$type='auto')
@@ -517,16 +517,16 @@ 
 		{
 			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 ($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
 				{
@@ -548,29 +548,29 @@ 
 	 */
 	function fetch_object($resultset)
 	{
-        // If resultset not provided, we take the last used by connexion
+		// If resultset not provided, we take the last used by connexion
 		if (! is_resource($resultset)) { $resultset=$this->_results; }
 		return pg_fetch_object($resultset);
 	}
 
 	/**
-     *	Return datas as an array
-     *
-     *	@param	resource	$resultset  Resultset of request
-     *	@return	false|array				Array
+	 *	Return datas as an array
+	 *
+	 *	@param	resource	$resultset  Resultset of request
+	 *	@return	false|array				Array
 	 */
 	function fetch_array($resultset)
 	{
-        // If resultset not provided, we take the last used by connexion
+		// If resultset not provided, we take the last used by connexion
 		if (! is_resource($resultset)) { $resultset=$this->_results; }
 		return pg_fetch_array($resultset);
 	}
 
 	/**
-     *	Return datas as an array
-     *
-     *	@param	resource	$resultset  Resultset of request
-     *	@return	false|array				Array
+	 *	Return datas as an array
+	 *
+	 *	@param	resource	$resultset  Resultset of request
+	 *	@return	false|array				Array
 	 */
 	function fetch_row($resultset)
 	{
@@ -580,15 +580,15 @@ 
 	}
 
 	/**
-     *	Return number of lines for result of a SELECT
-     *
-     *	@param	resourse	$resultset  Resulset of requests
-     *	@return int		    			Nb of lines, -1 on error
-     *	@see    affected_rows
+	 *	Return number of lines for result of a SELECT
+	 *
+	 *	@param	resourse	$resultset  Resulset of requests
+	 *	@return int		    			Nb of lines, -1 on error
+	 *	@see    affected_rows
 	 */
 	function num_rows($resultset)
 	{
-        // If resultset not provided, we take the last used by connexion
+		// If resultset not provided, we take the last used by connexion
 		if (! is_resource($resultset)) { $resultset=$this->_results; }
 		return pg_num_rows($resultset);
 	}
@@ -602,7 +602,7 @@ 
 	 */
 	function affected_rows($resultset)
 	{
-        // If resultset not provided, we take the last used by connexion
+		// If resultset not provided, we take the last used by connexion
 		if (! is_resource($resultset)) { $resultset=$this->_results; }
 		// pgsql necessite un resultset pour cette fonction contrairement
 		// a mysql qui prend un link de base
@@ -618,7 +618,7 @@ 
 	 */
 	function free($resultset=null)
 	{
-        // If resultset not provided, we take the last used by connexion
+		// 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);
@@ -626,16 +626,16 @@ 
 
 
 	/**
-     *	Define limits and offset of request
-     *
-     *	@param	int		$limit      Maximum number of lines returned (-1=conf->liste_limit, 0=no limit)
-     *	@param	int		$offset     Numero of line from where starting fetch
-     *	@return	string      		String with SQL syntax to add a limit and offset
+	 *	Define limits and offset of request
+	 *
+	 *	@param	int		$limit      Maximum number of lines returned (-1=conf->liste_limit, 0=no limit)
+	 *	@param	int		$offset     Numero of line from where starting fetch
+	 *	@return	string      		String with SQL syntax to add a limit and offset
 	 */
 	function plimit($limit=0,$offset=0)
 	{
 		global $conf;
-        if (empty($limit)) return "";
+		if (empty($limit)) return "";
 		if ($limit < 0) $limit=$conf->liste_limit;
 		if ($offset > 0) return " LIMIT ".$limit." OFFSET ".$offset." ";
 		else return " LIMIT $limit ";
@@ -653,7 +653,7 @@ 
 		return pg_escape_string($stringtoencode);
 	}
 
-    /**
+	/**
 	 *   Convert (by PHP) a GM Timestamp date into a GM string date to insert into a date field.
 	 *   Function to use to build INSERT, UPDATE or WHERE predica
 	 *
@@ -666,8 +666,8 @@ 
 	}
 
 	/**
-     *  Format a SQL IF
-     *
+	 *  Format a SQL IF
+	 *
 	 *  @param	string	$test           Test string (example: 'cd.statut=0', 'field IS NULL')
 	 *  @param	string	$resok          resultat si test egal
 	 *  @param	string	$resko          resultat si test non egal
@@ -776,12 +776,12 @@ 
 	}
 
 	/**
-     *  Encrypt sensitive data in database
-     *  Warning: This function includes the escape, so it must use direct value
-     *
-     *  @param  string  $fieldorvalue   Field name or value to encrypt
-     *  @param	int		$withQuotes     Return string with quotes
-     *  @return string          		XXX(field) or XXX('value') or field or 'value'
+	 *  Encrypt sensitive data in database
+	 *  Warning: This function includes the escape, so it must use direct value
+	 *
+	 *  @param  string  $fieldorvalue   Field name or value to encrypt
+	 *  @param	int		$withQuotes     Return string with quotes
+	 *  @return string          		XXX(field) or XXX('value') or field or 'value'
 	 */
 	function encrypt($fieldorvalue, $withQuotes=0)
 	{
@@ -844,7 +844,7 @@ 
 	 */
 	function DDLCreateDb($database,$charset='',$collation='',$owner='')
 	{
-	    if (empty($charset))   $charset=$this->forcecharset;
+		if (empty($charset))   $charset=$this->forcecharset;
 		if (empty($collation)) $collation=$this->forcecollate;
 
 		// Test charset match LC_TYPE (pgsql error otherwise)
@@ -870,13 +870,13 @@ 
 		$like = '';
 		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)
-        {
-    		while($row = $this->fetch_row($result))
-    		{
-    			$listtables[] = $row[0];
-    		}
-        }
+		if ($result)
+		{
+			while($row = $this->fetch_row($result))
+			{
+				$listtables[] = $row[0];
+			}
+		}
 		return $listtables;
 	}
 
@@ -911,12 +911,12 @@ 
 		$result = $this->query($sql);
 		if ($result)
 		{
-    		 while($row = $this->fetch_row($result))
-    		 {
-    			$infotables[] = $row;
-    		 }
+			 while($row = $this->fetch_row($result))
+			 {
+				$infotables[] = $row;
+			 }
 		}
-        return $infotables;
+		return $infotables;
 	}
 
 
@@ -1057,10 +1057,10 @@ 
 		$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')))
-		    {
-		        $sql.= "(".$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']))
@@ -1098,23 +1098,23 @@ 
 
 		if ($field_desc['null'] == 'not null' || $field_desc['null'] == 'NOT NULL')
 		{
-        	// We will try to change format of column to NOT NULL. To be sure the ALTER works, we try to update fields that are NULL
-        	if ($field_desc['type'] == 'varchar' || $field_desc['type'] == 'text')
-        	{
-        		$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')
-        	{
-        		$sqlbis="UPDATE ".$table." SET ".$field_name." = ".((int) $this->escape($field_desc['default'] ? $field_desc['default'] : 0))." WHERE ".$field_name." IS NULL";
-        		$this->query($sqlbis);
-        	}
+			// We will try to change format of column to NOT NULL. To be sure the ALTER works, we try to update fields that are NULL
+			if ($field_desc['type'] == 'varchar' || $field_desc['type'] == 'text')
+			{
+				$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')
+			{
+				$sqlbis="UPDATE ".$table." SET ".$field_name." = ".((int) $this->escape($field_desc['default'] ? $field_desc['default'] : 0))." WHERE ".$field_name." IS NULL";
+				$this->query($sqlbis);
+			}
 		}
 
 		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
+			elseif ($field_desc['type'] == 'text') $sql.=" DEFAULT '".$this->escape($field_desc['default'])."'";							// Default not supported on text fields
 		}
 
 		dol_syslog($sql,LOG_DEBUG);
@@ -1152,8 +1152,8 @@ 
 		$resql=$this->query('SHOW SERVER_ENCODING');
 		if ($resql)
 		{
-            $liste=$this->fetch_array($resql);
-		    return $liste['server_encoding'];
+			$liste=$this->fetch_array($resql);
+			return $liste['server_encoding'];
 		}
 		else return '';
 	}
@@ -1193,7 +1193,7 @@ 
 		$resql=$this->query('SHOW LC_COLLATE');
 		if ($resql)
 		{
-		    $liste=$this->fetch_array($resql);
+			$liste=$this->fetch_array($resql);
 			return $liste['lc_collate'];
 		}
 		else return '';
@@ -1234,28 +1234,28 @@ 
 
 		if (file_exists('/usr/bin/pg_dump'))
 		{
-		    $fullpathofdump='/usr/bin/pg_dump';
+			$fullpathofdump='/usr/bin/pg_dump';
 		}
 		else
 		{
-            // TODO L'utilisateur de la base doit etre un superadmin pour lancer cette commande
-		    $resql=$this->query('SHOW data_directory');
-    		if ($resql)
-    		{
-    			$liste=$this->fetch_array($resql);
-    			$basedir=$liste['data_directory'];
-    			$fullpathofdump=preg_replace('/data$/','bin',$basedir).'/pg_dump';
-    		}
+			// TODO L'utilisateur de la base doit etre un superadmin pour lancer cette commande
+			$resql=$this->query('SHOW data_directory');
+			if ($resql)
+			{
+				$liste=$this->fetch_array($resql);
+				$basedir=$liste['data_directory'];
+				$fullpathofdump=preg_replace('/data$/','bin',$basedir).'/pg_dump';
+			}
 		}
 
 		return $fullpathofdump;
 	}
 
-    /**
-     *	Return full path of restore program
-     *
-     *	@return		string		Full path of restore program
-     */
+	/**
+	 *	Return full path of restore program
+	 *
+	 *	@return		string		Full path of restore program
+	 */
 	function getPathOfRestore()
 	{
 		//$tool='pg_restore';
@@ -1263,21 +1263,21 @@ 
 
 		$fullpathofdump='/pathtopgrestore/'.$tool;
 
-        if (file_exists('/usr/bin/'.$tool))
-        {
-            $fullpathofdump='/usr/bin/'.$tool;
-        }
-        else
-        {
-            // TODO L'utilisateur de la base doit etre un superadmin pour lancer cette commande
-            $resql=$this->query('SHOW data_directory');
-            if ($resql)
-            {
-                $liste=$this->fetch_array($resql);
-                $basedir=$liste['data_directory'];
-                $fullpathofdump=preg_replace('/data$/','bin',$basedir).'/'.$tool;
-            }
-        }
+		if (file_exists('/usr/bin/'.$tool))
+		{
+			$fullpathofdump='/usr/bin/'.$tool;
+		}
+		else
+		{
+			// TODO L'utilisateur de la base doit etre un superadmin pour lancer cette commande
+			$resql=$this->query('SHOW data_directory');
+			if ($resql)
+			{
+				$liste=$this->fetch_array($resql);
+				$basedir=$liste['data_directory'];
+				$fullpathofdump=preg_replace('/data$/','bin',$basedir).'/'.$tool;
+			}
+		}
 
 		return $fullpathofdump;
 	}

Spacing +263 added lines, -263 removed lines

@@ -28,7 +28,7 @@ 
  *	\brief      Fichier de la classe permettant de gerer une base pgsql
  */
 
-require_once DOL_DOCUMENT_ROOT .'/core/db/DoliDB.class.php';
+require_once DOL_DOCUMENT_ROOT.'/core/db/DoliDB.class.php';
 
 /**
  *	Class to drive a Postgresql database for Dolibarr
@@ -36,15 +36,15 @@ 
 class DoliDBPgsql extends DoliDB
 {
     //! Database type
-	public $type='pgsql';            // Name of manager
+	public $type = 'pgsql'; // Name of manager
     //! Database label
-	const LABEL='PostgreSQL';      // Label of manager
+	const LABEL = 'PostgreSQL'; // Label of manager
 	//! Charset
-	var $forcecharset='UTF8';       // Can't be static as it may be forced with a dynamic value
+	var $forcecharset = 'UTF8'; // Can't be static as it may be forced with a dynamic value
     //! Collate used to force collate when creating database
-    var $forcecollate='';			// Can't be static as it may be forced with a dynamic value
+    var $forcecollate = ''; // Can't be static as it may be forced with a dynamic value
 	//! Version min database
-	const VERSIONMIN='9.0.0';	// Version min database
+	const VERSIONMIN = '9.0.0'; // Version min database
 	/** @var resource Resultset of last query */
 	private $_results;
 
@@ -62,37 +62,37 @@ 
 	 *	@param	    string	$name		Nom de la database
 	 *	@param	    int		$port		Port of database server
 	 */
-	function __construct($type, $host, $user, $pass, $name='', $port=0)
+	function __construct($type, $host, $user, $pass, $name = '', $port = 0)
 	{
-		global $conf,$langs;
+		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;
-        $this->database_port=$port;
+		$this->database_user = $user;
+        $this->database_host = $host;
+        $this->database_port = $port;
 
-		$this->transaction_opened=0;
+		$this->transaction_opened = 0;
 
 		//print "Name DB: $host,$user,$pass,$name<br>";
 
-		if (! function_exists("pg_connect"))
+		if (!function_exists("pg_connect"))
 		{
 			$this->connected = false;
 			$this->ok = false;
-			$this->error="Pgsql PHP functions are not available in this version of PHP";
-			dol_syslog(get_class($this)."::DoliDBPgsql : Pgsql PHP functions are not available in this version of PHP",LOG_ERR);
+			$this->error = "Pgsql PHP functions are not available in this version of PHP";
+			dol_syslog(get_class($this)."::DoliDBPgsql : Pgsql PHP functions are not available in this version of PHP", LOG_ERR);
 			return $this->ok;
 		}
 
-		if (! $host)
+		if (!$host)
 		{
 			$this->connected = false;
 			$this->ok = false;
-			$this->error=$langs->trans("ErrorWrongHostParameter");
-			dol_syslog(get_class($this)."::DoliDBPgsql : Erreur Connect, wrong host parameters",LOG_ERR);
+			$this->error = $langs->trans("ErrorWrongHostParameter");
+			dol_syslog(get_class($this)."::DoliDBPgsql : Erreur Connect, wrong host parameters", LOG_ERR);
 			return $this->ok;
 		}
 
@@ -110,8 +110,8 @@ 
 			// host, login ou password incorrect
 			$this->connected = false;
 			$this->ok = false;
-			$this->error='Host, login or password incorrect';
-			dol_syslog(get_class($this)."::DoliDBPgsql : Erreur Connect ".$this->error,LOG_ERR);
+			$this->error = 'Host, login or password incorrect';
+			dol_syslog(get_class($this)."::DoliDBPgsql : Erreur Connect ".$this->error, LOG_ERR);
 		}
 
 		// Si connexion serveur ok et si connexion base demandee, on essaie connexion base
@@ -128,8 +128,8 @@ 
 				$this->database_selected = false;
 				$this->database_name = '';
 				$this->ok = false;
-				$this->error=$this->error();
-				dol_syslog(get_class($this)."::DoliDBPgsql : Erreur Select_db ".$this->error,LOG_ERR);
+				$this->error = $this->error();
+				dol_syslog(get_class($this)."::DoliDBPgsql : Erreur Select_db ".$this->error, LOG_ERR);
 			}
 		}
 		else
@@ -150,14 +150,14 @@ 
      *  @param	bool	$unescapeslashquot	Unescape slash quote with quote quote
      *  @return string   					SQL request line converted
      */
-	static function convertSQLFromMysql($line,$type='auto',$unescapeslashquot=false)
+	static function convertSQLFromMysql($line, $type = 'auto', $unescapeslashquot = false)
 	{
 		// Removed empty line if this is a comment line for SVN tagging
-		if (preg_match('/^--\s\$Id/i',$line)) {
+		if (preg_match('/^--\s\$Id/i', $line)) {
 			return '';
 		}
 		// Return line if this is a comment
-		if (preg_match('/^#/i',$line) || preg_match('/^$/i',$line) || preg_match('/^--/i',$line))
+		if (preg_match('/^#/i', $line) || preg_match('/^$/i', $line) || preg_match('/^--/i', $line))
 		{
 			return $line;
 		}
@@ -172,186 +172,186 @@ 
 
 		    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);
+    		$line = preg_replace('/ as signed\)/i', ' as integer)', $line);
 
 		    if ($type == 'dml')
 		    {
-                $line=preg_replace('/\s/',' ',$line);   // Replace tabulation with space
+                $line = preg_replace('/\s/', ' ', $line); // Replace tabulation with space
 
 		        // we are inside create table statement so lets process datatypes
-    			if (preg_match('/(ISAM|innodb)/i',$line)) { // end of create table sequence
-    				$line=preg_replace('/\)[\s\t]*type[\s\t]*=[\s\t]*(MyISAM|innodb).*;/i',');',$line);
-    				$line=preg_replace('/\)[\s\t]*engine[\s\t]*=[\s\t]*(MyISAM|innodb).*;/i',');',$line);
-    				$line=preg_replace('/,$/','',$line);
+    			if (preg_match('/(ISAM|innodb)/i', $line)) { // end of create table sequence
+    				$line = preg_replace('/\)[\s\t]*type[\s\t]*=[\s\t]*(MyISAM|innodb).*;/i', ');', $line);
+    				$line = preg_replace('/\)[\s\t]*engine[\s\t]*=[\s\t]*(MyISAM|innodb).*;/i', ');', $line);
+    				$line = preg_replace('/,$/', '', $line);
     			}
 
     			// Process case: "CREATE TABLE llx_mytable(rowid integer NOT NULL AUTO_INCREMENT PRIMARY KEY,code..."
-    			if (preg_match('/[\s\t\(]*(\w*)[\s\t]+int.*auto_increment/i',$line,$reg)) {
-    				$newline=preg_replace('/([\s\t\(]*)([a-zA-Z_0-9]*)[\s\t]+int.*auto_increment[^,]*/i','\\1 \\2 SERIAL PRIMARY KEY',$line);
+    			if (preg_match('/[\s\t\(]*(\w*)[\s\t]+int.*auto_increment/i', $line, $reg)) {
+    				$newline = preg_replace('/([\s\t\(]*)([a-zA-Z_0-9]*)[\s\t]+int.*auto_increment[^,]*/i', '\\1 \\2 SERIAL PRIMARY KEY', $line);
                     //$line = "-- ".$line." replaced by --\n".$newline;
-                    $line=$newline;
+                    $line = $newline;
     			}
 
     			// tinyint type conversion
-    			$line=preg_replace('/tinyint\(?[0-9]*\)?/','smallint',$line);
-    			$line=preg_replace('/tinyint/i','smallint',$line);
+    			$line = preg_replace('/tinyint\(?[0-9]*\)?/', 'smallint', $line);
+    			$line = preg_replace('/tinyint/i', 'smallint', $line);
 
     			// nuke unsigned
-    			$line=preg_replace('/(int\w+|smallint)\s+unsigned/i','\\1',$line);
+    			$line = preg_replace('/(int\w+|smallint)\s+unsigned/i', '\\1', $line);
 
     			// blob -> text
-    			$line=preg_replace('/\w*blob/i','text',$line);
+    			$line = preg_replace('/\w*blob/i', 'text', $line);
 
     			// tinytext/mediumtext -> text
-    			$line=preg_replace('/tinytext/i','text',$line);
-    			$line=preg_replace('/mediumtext/i','text',$line);
-    			$line=preg_replace('/longtext/i','text',$line);
+    			$line = preg_replace('/tinytext/i', 'text', $line);
+    			$line = preg_replace('/mediumtext/i', 'text', $line);
+    			$line = preg_replace('/longtext/i', 'text', $line);
 
-    			$line=preg_replace('/text\([0-9]+\)/i','text',$line);
+    			$line = preg_replace('/text\([0-9]+\)/i', 'text', $line);
 
     			// change not null datetime field to null valid ones
     			// (to support remapping of "zero time" to null
-    			$line=preg_replace('/datetime not null/i','datetime',$line);
-    			$line=preg_replace('/datetime/i','timestamp',$line);
+    			$line = preg_replace('/datetime not null/i', 'datetime', $line);
+    			$line = preg_replace('/datetime/i', 'timestamp', $line);
 
     			// double -> numeric
-    			$line=preg_replace('/^double/i','numeric',$line);
-    			$line=preg_replace('/(\s*)double/i','\\1numeric',$line);
+    			$line = preg_replace('/^double/i', 'numeric', $line);
+    			$line = preg_replace('/(\s*)double/i', '\\1numeric', $line);
     			// float -> numeric
-    			$line=preg_replace('/^float/i','numeric',$line);
-    			$line=preg_replace('/(\s*)float/i','\\1numeric',$line);
+    			$line = preg_replace('/^float/i', 'numeric', $line);
+    			$line = preg_replace('/(\s*)float/i', '\\1numeric', $line);
 
     			//Check tms timestamp field case (in Mysql this field is defautled to now and
     			// on update defaulted by now
-    			$line=preg_replace('/(\s*)tms(\s*)timestamp/i','\\1tms timestamp without time zone DEFAULT now() NOT NULL',$line);
+    			$line = preg_replace('/(\s*)tms(\s*)timestamp/i', '\\1tms timestamp without time zone DEFAULT now() NOT NULL', $line);
 
     			// nuke ON UPDATE CURRENT_TIMESTAMP
-    			$line=preg_replace('/(\s*)on(\s*)update(\s*)CURRENT_TIMESTAMP/i','\\1',$line);
+    			$line = preg_replace('/(\s*)on(\s*)update(\s*)CURRENT_TIMESTAMP/i', '\\1', $line);
 
     			// unique index(field1,field2)
-    			if (preg_match('/unique index\s*\((\w+\s*,\s*\w+)\)/i',$line))
+    			if (preg_match('/unique index\s*\((\w+\s*,\s*\w+)\)/i', $line))
     			{
-    				$line=preg_replace('/unique index\s*\((\w+\s*,\s*\w+)\)/i','UNIQUE\(\\1\)',$line);
+    				$line = preg_replace('/unique index\s*\((\w+\s*,\s*\w+)\)/i', 'UNIQUE\(\\1\)', $line);
     			}
 
     			// We remove end of requests "AFTER fieldxxx"
-    			$line=preg_replace('/\sAFTER [a-z0-9_]+/i','',$line);
+    			$line = preg_replace('/\sAFTER [a-z0-9_]+/i', '', $line);
 
     			// We remove start of requests "ALTER TABLE tablexxx" if this is a DROP INDEX
-    			$line=preg_replace('/ALTER TABLE [a-z0-9_]+\s+DROP INDEX/i','DROP INDEX',$line);
+    			$line = preg_replace('/ALTER TABLE [a-z0-9_]+\s+DROP INDEX/i', 'DROP INDEX', $line);
 
                 // Translate order to rename fields
-                if (preg_match('/ALTER TABLE ([a-z0-9_]+)\s+CHANGE(?: COLUMN)? ([a-z0-9_]+) ([a-z0-9_]+)(.*)$/i',$line,$reg))
+                if (preg_match('/ALTER TABLE ([a-z0-9_]+)\s+CHANGE(?: COLUMN)? ([a-z0-9_]+) ([a-z0-9_]+)(.*)$/i', $line, $reg))
                 {
                 	$line = "-- ".$line." replaced by --\n";
-                    $line.= "ALTER TABLE ".$reg[1]." RENAME COLUMN ".$reg[2]." TO ".$reg[3];
+                    $line .= "ALTER TABLE ".$reg[1]." RENAME COLUMN ".$reg[2]." TO ".$reg[3];
                 }
 
                 // Translate order to modify field format
-                if (preg_match('/ALTER TABLE ([a-z0-9_]+)\s+MODIFY(?: COLUMN)? ([a-z0-9_]+) (.*)$/i',$line,$reg))
+                if (preg_match('/ALTER TABLE ([a-z0-9_]+)\s+MODIFY(?: COLUMN)? ([a-z0-9_]+) (.*)$/i', $line, $reg))
                 {
                     $line = "-- ".$line." replaced by --\n";
-                    $newreg3=$reg[3];
-                    $newreg3=preg_replace('/ DEFAULT NULL/i','',$newreg3);
-                    $newreg3=preg_replace('/ NOT NULL/i','',$newreg3);
-                    $newreg3=preg_replace('/ NULL/i','',$newreg3);
-                    $newreg3=preg_replace('/ DEFAULT 0/i','',$newreg3);
-                    $newreg3=preg_replace('/ DEFAULT \'?[0-9a-zA-Z_@]*\'?/i','',$newreg3);
-                    $line.= "ALTER TABLE ".$reg[1]." ALTER COLUMN ".$reg[2]." TYPE ".$newreg3;
+                    $newreg3 = $reg[3];
+                    $newreg3 = preg_replace('/ DEFAULT NULL/i', '', $newreg3);
+                    $newreg3 = preg_replace('/ NOT NULL/i', '', $newreg3);
+                    $newreg3 = preg_replace('/ NULL/i', '', $newreg3);
+                    $newreg3 = preg_replace('/ DEFAULT 0/i', '', $newreg3);
+                    $newreg3 = preg_replace('/ DEFAULT \'?[0-9a-zA-Z_@]*\'?/i', '', $newreg3);
+                    $line .= "ALTER TABLE ".$reg[1]." ALTER COLUMN ".$reg[2]." TYPE ".$newreg3;
                     // TODO Add alter to set default value or null/not null if there is this in $reg[3]
                 }
 
                 // alter table add primary key (field1, field2 ...) -> We remove the primary key name not accepted by PostGreSQL
     			// ALTER TABLE llx_dolibarr_modules ADD PRIMARY KEY pk_dolibarr_modules (numero, entity)
-    			if (preg_match('/ALTER\s+TABLE\s*(.*)\s*ADD\s+PRIMARY\s+KEY\s*(.*)\s*\((.*)$/i',$line,$reg))
+    			if (preg_match('/ALTER\s+TABLE\s*(.*)\s*ADD\s+PRIMARY\s+KEY\s*(.*)\s*\((.*)$/i', $line, $reg))
     			{
     				$line = "-- ".$line." replaced by --\n";
-    				$line.= "ALTER TABLE ".$reg[1]." ADD PRIMARY KEY (".$reg[3];
+    				$line .= "ALTER TABLE ".$reg[1]." ADD PRIMARY KEY (".$reg[3];
     			}
 
                 // Translate order to drop primary keys
                 // ALTER TABLE llx_dolibarr_modules DROP PRIMARY KEY pk_xxx
-                if (preg_match('/ALTER\s+TABLE\s*(.*)\s*DROP\s+PRIMARY\s+KEY\s*([^;]+)$/i',$line,$reg))
+                if (preg_match('/ALTER\s+TABLE\s*(.*)\s*DROP\s+PRIMARY\s+KEY\s*([^;]+)$/i', $line, $reg))
                 {
                     $line = "-- ".$line." replaced by --\n";
-                    $line.= "ALTER TABLE ".$reg[1]." DROP CONSTRAINT ".$reg[2];
+                    $line .= "ALTER TABLE ".$reg[1]." DROP CONSTRAINT ".$reg[2];
                 }
 
 		        // Translate order to drop foreign keys
                 // ALTER TABLE llx_dolibarr_modules DROP FOREIGN KEY fk_xxx
-                if (preg_match('/ALTER\s+TABLE\s*(.*)\s*DROP\s+FOREIGN\s+KEY\s*(.*)$/i',$line,$reg))
+                if (preg_match('/ALTER\s+TABLE\s*(.*)\s*DROP\s+FOREIGN\s+KEY\s*(.*)$/i', $line, $reg))
                 {
                     $line = "-- ".$line." replaced by --\n";
-                    $line.= "ALTER TABLE ".$reg[1]." DROP CONSTRAINT ".$reg[2];
+                    $line .= "ALTER TABLE ".$reg[1]." DROP CONSTRAINT ".$reg[2];
                 }
 
                 // Translate order to add foreign keys
                 // ALTER TABLE llx_tablechild ADD CONSTRAINT fk_tablechild_fk_fieldparent FOREIGN KEY (fk_fieldparent) REFERENCES llx_tableparent (rowid)
-                if (preg_match('/ALTER\s+TABLE\s+(.*)\s*ADD CONSTRAINT\s+(.*)\s*FOREIGN\s+KEY\s*(.*)$/i',$line,$reg))
+                if (preg_match('/ALTER\s+TABLE\s+(.*)\s*ADD CONSTRAINT\s+(.*)\s*FOREIGN\s+KEY\s*(.*)$/i', $line, $reg))
                 {
-                    $line=preg_replace('/;$/','',$line);
-                    $line.=" DEFERRABLE INITIALLY IMMEDIATE;";
+                    $line = preg_replace('/;$/', '', $line);
+                    $line .= " DEFERRABLE INITIALLY IMMEDIATE;";
                 }
 
                 // alter table add [unique] [index] (field1, field2 ...)
     			// ALTER TABLE llx_accountingaccount ADD INDEX idx_accountingaccount_fk_pcg_version (fk_pcg_version)
-    			if (preg_match('/ALTER\s+TABLE\s*(.*)\s*ADD\s+(UNIQUE INDEX|INDEX|UNIQUE)\s+(.*)\s*\(([\w,\s]+)\)/i',$line,$reg))
+    			if (preg_match('/ALTER\s+TABLE\s*(.*)\s*ADD\s+(UNIQUE INDEX|INDEX|UNIQUE)\s+(.*)\s*\(([\w,\s]+)\)/i', $line, $reg))
     			{
-    				$fieldlist=$reg[4];
-    				$idxname=$reg[3];
-    				$tablename=$reg[1];
+    				$fieldlist = $reg[4];
+    				$idxname = $reg[3];
+    				$tablename = $reg[1];
     				$line = "-- ".$line." replaced by --\n";
-    				$line.= "CREATE ".(preg_match('/UNIQUE/',$reg[2])?'UNIQUE ':'')."INDEX ".$idxname." ON ".$tablename." (".$fieldlist.")";
+    				$line .= "CREATE ".(preg_match('/UNIQUE/', $reg[2]) ? 'UNIQUE ' : '')."INDEX ".$idxname." ON ".$tablename." (".$fieldlist.")";
     			}
             }
 
             // To have postgresql case sensitive
-            $line=str_replace(' LIKE \'',' ILIKE \'',$line);
-            $line=str_replace(' LIKE BINARY \'',' LIKE \'',$line);
+            $line = str_replace(' LIKE \'', ' ILIKE \'', $line);
+            $line = str_replace(' LIKE BINARY \'', ' LIKE \'', $line);
 
             // Replace INSERT IGNORE into INSERT
-            $line=preg_replace('/^INSERT IGNORE/','INSERT',$line);
+            $line = preg_replace('/^INSERT IGNORE/', 'INSERT', $line);
 
 			// Delete using criteria on other table must not declare twice the deleted table
 			// 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 (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
 				{
-					$line=preg_replace('/DELETE FROM ([a-z_]+) USING ([a-z_]+), ([a-z_]+)/i','DELETE FROM \\1 USING \\3', $line);
+					$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
-			$line=preg_replace('/FROM\s*\((([a-z_]+)\s+as\s+([a-z_]+)\s*)\)/i','FROM \\1',$line);
+			$line = preg_replace('/FROM\s*\((([a-z_]+)\s+as\s+([a-z_]+)\s*)\)/i', 'FROM \\1', $line);
 			//print $line."\n";
 
 			// Remove () in the tables in FROM if 2 table
-			$line=preg_replace('/FROM\s*\(([a-z_]+\s+as\s+[a-z_]+)\s*,\s*([a-z_]+\s+as\s+[a-z_]+\s*)\)/i','FROM \\1, \\2',$line);
+			$line = preg_replace('/FROM\s*\(([a-z_]+\s+as\s+[a-z_]+)\s*,\s*([a-z_]+\s+as\s+[a-z_]+\s*)\)/i', 'FROM \\1, \\2', $line);
 			//print $line."\n";
 
 			// Remove () in the tables in FROM if 3 table
-			$line=preg_replace('/FROM\s*\(([a-z_]+\s+as\s+[a-z_]+)\s*,\s*([a-z_]+\s+as\s+[a-z_]+\s*),\s*([a-z_]+\s+as\s+[a-z_]+\s*)\)/i','FROM \\1, \\2, \\3',$line);
+			$line = preg_replace('/FROM\s*\(([a-z_]+\s+as\s+[a-z_]+)\s*,\s*([a-z_]+\s+as\s+[a-z_]+\s*),\s*([a-z_]+\s+as\s+[a-z_]+\s*)\)/i', 'FROM \\1, \\2, \\3', $line);
 			//print $line."\n";
 
 			// Remove () in the tables in FROM if 4 table
-			$line=preg_replace('/FROM\s*\(([a-z_]+\s+as\s+[a-z_]+)\s*,\s*([a-z_]+\s+as\s+[a-z_]+\s*),\s*([a-z_]+\s+as\s+[a-z_]+\s*),\s*([a-z_]+\s+as\s+[a-z_]+\s*)\)/i','FROM \\1, \\2, \\3, \\4',$line);
+			$line = preg_replace('/FROM\s*\(([a-z_]+\s+as\s+[a-z_]+)\s*,\s*([a-z_]+\s+as\s+[a-z_]+\s*),\s*([a-z_]+\s+as\s+[a-z_]+\s*),\s*([a-z_]+\s+as\s+[a-z_]+\s*)\)/i', 'FROM \\1, \\2, \\3, \\4', $line);
 			//print $line."\n";
 
 			// Remove () in the tables in FROM if 5 table
-			$line=preg_replace('/FROM\s*\(([a-z_]+\s+as\s+[a-z_]+)\s*,\s*([a-z_]+\s+as\s+[a-z_]+\s*),\s*([a-z_]+\s+as\s+[a-z_]+\s*),\s*([a-z_]+\s+as\s+[a-z_]+\s*),\s*([a-z_]+\s+as\s+[a-z_]+\s*)\)/i','FROM \\1, \\2, \\3, \\4, \\5',$line);
+			$line = preg_replace('/FROM\s*\(([a-z_]+\s+as\s+[a-z_]+)\s*,\s*([a-z_]+\s+as\s+[a-z_]+\s*),\s*([a-z_]+\s+as\s+[a-z_]+\s*),\s*([a-z_]+\s+as\s+[a-z_]+\s*),\s*([a-z_]+\s+as\s+[a-z_]+\s*)\)/i', 'FROM \\1, \\2, \\3, \\4, \\5', $line);
 			//print $line."\n";
 
 			// Replace espacing \' by ''.
 			// 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";
 		}
@@ -384,7 +384,7 @@ 
 	 *	@return		false|resource			Database access handler
 	 *	@see		close
 	 */
-	function connect($host, $login, $passwd, $name, $port=0)
+	function connect($host, $login, $passwd, $name, $port = 0)
 	{
 		// use pg_pconnect() instead of pg_connect() if you want to use persistent connection costing 1ms, instead of 30ms for non persistent
 
@@ -397,20 +397,20 @@ 
 		$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'))
+		if ((!empty($host) && $host == "socket") && !defined('NOLOCALSOCKETPGCONNECT'))
 		{
-			$con_string = "dbname='".$name."' user='".$login."' password='".$passwd."'";    // $name may be empty
+			$con_string = "dbname='".$name."' user='".$login."' password='".$passwd."'"; // $name may be empty
 			$this->db = @pg_connect($con_string);
 		}
 
 		// if local connection failed or not requested, use TCP/IP
-		if (! $this->db)
+		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);
@@ -420,7 +420,7 @@ 
 		if ($this->db)
 		{
 			$this->database_name = $name;
-			pg_set_error_verbosity($this->db, PGSQL_ERRORS_VERBOSE);	// Set verbosity to max
+			pg_set_error_verbosity($this->db, PGSQL_ERRORS_VERBOSE); // Set verbosity to max
 			pg_query($this->db, "set datestyle = 'ISO, YMD';");
 		}
 
@@ -434,10 +434,10 @@ 
 	 */
 	function getVersion()
 	{
-		$resql=$this->query('SHOW server_version');
+		$resql = $this->query('SHOW server_version');
 		if ($resql)
 		{
-		  $liste=$this->fetch_array($resql);
+		  $liste = $this->fetch_array($resql);
 		  return $liste['server_version'];
 		}
 		return '';
@@ -463,8 +463,8 @@ 
     {
         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);
-          $this->connected=false;
+          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);
         }
         return false;
@@ -478,28 +478,28 @@ 
      * @param   string	$type           Type of SQL order ('ddl' for insert, update, select, delete or 'dml' for create, alter...)
 	 * @return	false|resource			Resultset of answer
 	 */
-	function query($query,$usesavepoint=0,$type='auto')
+	function query($query, $usesavepoint = 0, $type = 'auto')
 	{
 		global $conf;
 
 		$query = trim($query);
 
 		// Convert MySQL syntax to PostgresSQL syntax
-		$query=$this->convertSQLFromMysql($query,$type,($this->unescapeslashquot && $this->standard_conforming_strings));
+		$query = $this->convertSQLFromMysql($query, $type, ($this->unescapeslashquot && $this->standard_conforming_strings));
 		//print "After convertSQLFromMysql:\n".$query."<br>\n";
 
-		if (! empty($conf->global->MAIN_DB_AUTOFIX_BAD_SQL_REQUEST))
+		if (!empty($conf->global->MAIN_DB_AUTOFIX_BAD_SQL_REQUEST))
 		{
 			// Fix bad formed requests. If request contains a date without quotes, we fix this but this should not occurs.
-			$loop=true;
+			$loop = true;
 			while ($loop)
 			{
-				if (preg_match('/([^\'])([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])/',$query))
+				if (preg_match('/([^\'])([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])/', $query))
 				{
-					$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);
+					$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,14 +508,14 @@ 
 			@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 (!$ret)
 			{
 			    if ($this->errno() != 'DB_ERROR_25P02')	// Do not overwrite errors if this is a consecutive error
 			    {
@@ -523,7 +523,7 @@ 
     				$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);
 			    }
@@ -533,7 +533,7 @@ 
 					@pg_query($this->db, 'ROLLBACK TO SAVEPOINT mysavepoint');
 				}
 			}
-			$this->lastquery=$query;
+			$this->lastquery = $query;
 			$this->_results = $ret;
 		}
 
@@ -549,7 +549,7 @@ 
 	function fetch_object($resultset)
 	{
         // If resultset not provided, we take the last used by connexion
-		if (! is_resource($resultset)) { $resultset=$this->_results; }
+		if (!is_resource($resultset)) { $resultset = $this->_results; }
 		return pg_fetch_object($resultset);
 	}
 
@@ -562,7 +562,7 @@ 
 	function fetch_array($resultset)
 	{
         // If resultset not provided, we take the last used by connexion
-		if (! is_resource($resultset)) { $resultset=$this->_results; }
+		if (!is_resource($resultset)) { $resultset = $this->_results; }
 		return pg_fetch_array($resultset);
 	}
 
@@ -575,7 +575,7 @@ 
 	function fetch_row($resultset)
 	{
 		// Si le resultset n'est pas fourni, on prend le dernier utilise sur cette connexion
-		if (! is_resource($resultset)) { $resultset=$this->_results; }
+		if (!is_resource($resultset)) { $resultset = $this->_results; }
 		return pg_fetch_row($resultset);
 	}
 
@@ -589,7 +589,7 @@ 
 	function num_rows($resultset)
 	{
         // If resultset not provided, we take the last used by connexion
-		if (! is_resource($resultset)) { $resultset=$this->_results; }
+		if (!is_resource($resultset)) { $resultset = $this->_results; }
 		return pg_num_rows($resultset);
 	}
 
@@ -603,7 +603,7 @@ 
 	function affected_rows($resultset)
 	{
         // If resultset not provided, we take the last used by connexion
-		if (! is_resource($resultset)) { $resultset=$this->_results; }
+		if (!is_resource($resultset)) { $resultset = $this->_results; }
 		// pgsql necessite un resultset pour cette fonction contrairement
 		// a mysql qui prend un link de base
 		return pg_affected_rows($resultset);
@@ -616,10 +616,10 @@ 
 	 * @param	resource	$resultset  Result set of request
 	 * @return	void
 	 */
-	function free($resultset=null)
+	function free($resultset = null)
 	{
         // If resultset not provided, we take the last used by connexion
-		if (! is_resource($resultset)) { $resultset=$this->_results; }
+		if (!is_resource($resultset)) { $resultset = $this->_results; }
 		// Si resultset en est un, on libere la memoire
 		if (is_resource($resultset)) pg_free_result($resultset);
 	}
@@ -632,11 +632,11 @@ 
      *	@param	int		$offset     Numero of line from where starting fetch
      *	@return	string      		String with SQL syntax to add a limit and offset
 	 */
-	function plimit($limit=0,$offset=0)
+	function plimit($limit = 0, $offset = 0)
 	{
 		global $conf;
         if (empty($limit)) return "";
-		if ($limit < 0) $limit=$conf->liste_limit;
+		if ($limit < 0) $limit = $conf->liste_limit;
 		if ($offset > 0) return " LIMIT ".$limit." OFFSET ".$offset." ";
 		else return " LIMIT $limit ";
 	}
@@ -662,7 +662,7 @@ 
 	 */
 	function idate($param)
 	{
-		return dol_print_date($param,"%Y-%m-%d %H:%M:%S");
+		return dol_print_date($param, "%Y-%m-%d %H:%M:%S");
 	}
 
 	/**
@@ -673,7 +673,7 @@ 
 	 *  @param	string	$resko          resultat si test non egal
 	 *  @return	string          		chaine formate SQL
 	 */
-	function ifsql($test,$resok,$resko)
+	function ifsql($test, $resok, $resko)
 	{
 		return '(CASE WHEN '.$test.' THEN '.$resok.' ELSE '.$resko.' END)';
 	}
@@ -685,7 +685,7 @@ 
 	 */
 	function errno()
 	{
-		if (! $this->connected) {
+		if (!$this->connected) {
 			// Si il y a eu echec de connexion, $this->db n'est pas valide.
 			return 'DB_ERROR_FAILED_TO_CONNECT';
 		}
@@ -707,7 +707,7 @@ 
 			42701=> 'DB_ERROR_COLUMN_ALREADY_EXISTS',
 			'42710' => 'DB_ERROR_KEY_NAME_ALREADY_EXISTS',
 			'23505' => 'DB_ERROR_RECORD_ALREADY_EXISTS',
-			'42704' => 'DB_ERROR_NO_INDEX_TO_DROP',		// May also be Type xxx does not exists
+			'42704' => 'DB_ERROR_NO_INDEX_TO_DROP', // May also be Type xxx does not exists
 			'42601' => 'DB_ERROR_SYNTAX',
 			'42P16' => 'DB_ERROR_PRIMARY_KEY_ALREADY_EXISTS',
 			1075 => 'DB_ERROR_CANT_DROP_PRIMARY_KEY',
@@ -721,18 +721,18 @@ 
 			'42P04' => 'DB_DATABASE_ALREADY_EXISTS'
 			);
 
-			$errorlabel=pg_last_error($this->db);
-			$errorcode='';
-			if (preg_match('/: *([0-9P]+):/',$errorlabel,$reg))
+			$errorlabel = pg_last_error($this->db);
+			$errorcode = '';
+			if (preg_match('/: *([0-9P]+):/', $errorlabel, $reg))
 			{
-				$errorcode=$reg[1];
+				$errorcode = $reg[1];
 				if (isset($errorcode_map[$errorcode]))
 				{
 					return $errorcode_map[$errorcode];
 				}
 			}
-			$errno=$errorcode?$errorcode:$errorlabel;
-			return ($errno?'DB_ERROR_'.$errno:'0');
+			$errno = $errorcode ? $errorcode : $errorlabel;
+			return ($errno ? 'DB_ERROR_'.$errno : '0');
 		}
 		//                '/(Table does not exist\.|Relation [\"\'].*[\"\'] does not exist|sequence does not exist|class ".+" not found)$/' => 'DB_ERROR_NOSUCHTABLE',
 		//                '/table [\"\'].*[\"\'] does not exist/' => 'DB_ERROR_NOSUCHTABLE',
@@ -761,17 +761,17 @@ 
 	 * @param	string	$fieldid	Field name
 	 * @return  string     			Id of row
 	 */
-	function last_insert_id($tab,$fieldid='rowid')
+	function last_insert_id($tab, $fieldid = 'rowid')
 	{
 		//$result = pg_query($this->db,"SELECT MAX(".$fieldid.") FROM ".$tab);
-		$result = pg_query($this->db,"SELECT currval('".$tab."_".$fieldid."_seq')");
-		if (! $result)
+		$result = pg_query($this->db, "SELECT currval('".$tab."_".$fieldid."_seq')");
+		if (!$result)
 		{
 			print pg_last_error($this->db);
 			exit;
 		}
 		//$nbre = pg_num_rows($result);
-		$row = pg_fetch_result($result,0,0);
+		$row = pg_fetch_result($result, 0, 0);
 		return $row;
 	}
 
@@ -783,18 +783,18 @@ 
      *  @param	int		$withQuotes     Return string with quotes
      *  @return string          		XXX(field) or XXX('value') or field or 'value'
 	 */
-	function encrypt($fieldorvalue, $withQuotes=0)
+	function encrypt($fieldorvalue, $withQuotes = 0)
 	{
 		global $conf;
 
 		// Type of encryption (2: AES (recommended), 1: DES , 0: no encryption)
-		$cryptType = ($conf->db->dolibarr_main_db_encryption?$conf->db->dolibarr_main_db_encryption:0);
+		$cryptType = ($conf->db->dolibarr_main_db_encryption ? $conf->db->dolibarr_main_db_encryption : 0);
 
 		//Encryption key
-		$cryptKey = (!empty($conf->db->dolibarr_main_db_cryptkey)?$conf->db->dolibarr_main_db_cryptkey:'');
+		$cryptKey = (!empty($conf->db->dolibarr_main_db_cryptkey) ? $conf->db->dolibarr_main_db_cryptkey : '');
 
 		$return = $fieldorvalue;
-		return ($withQuotes?"'":"").$this->escape($return).($withQuotes?"'":"");
+		return ($withQuotes ? "'" : "").$this->escape($return).($withQuotes ? "'" : "");
 	}
 
 
@@ -809,10 +809,10 @@ 
 		global $conf;
 
 		// Type of encryption (2: AES (recommended), 1: DES , 0: no encryption)
-		$cryptType = ($conf->db->dolibarr_main_db_encryption?$conf->db->dolibarr_main_db_encryption:0);
+		$cryptType = ($conf->db->dolibarr_main_db_encryption ? $conf->db->dolibarr_main_db_encryption : 0);
 
 		//Encryption key
-		$cryptKey = (!empty($conf->db->dolibarr_main_db_cryptkey)?$conf->db->dolibarr_main_db_cryptkey:'');
+		$cryptKey = (!empty($conf->db->dolibarr_main_db_cryptkey) ? $conf->db->dolibarr_main_db_cryptkey : '');
 
 		$return = $value;
 		return $return;
@@ -842,17 +842,17 @@ 
 	 * 	@param	string	$owner			Username of database owner
 	 * 	@return	false|resource				resource defined if OK, null if KO
 	 */
-	function DDLCreateDb($database,$charset='',$collation='',$owner='')
+	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;
 
-		$sql='CREATE DATABASE "'.$database.'" OWNER "'.$owner.'" ENCODING \''.$charset.'\'';
-		dol_syslog($sql,LOG_DEBUG);
-		$ret=$this->query($sql);
+		$sql = 'CREATE DATABASE "'.$database.'" OWNER "'.$owner.'" ENCODING \''.$charset.'\'';
+		dol_syslog($sql, LOG_DEBUG);
+		$ret = $this->query($sql);
 		return $ret;
 	}
 
@@ -863,16 +863,16 @@ 
 	 *  @param	string		$table		Name of table filter ('xxx%')
 	 *  @return	array					List of tables in an array
 	 */
-	function DDLListTables($database, $table='')
+	function DDLListTables($database, $table = '')
 	{
-		$listtables=array();
+		$listtables = array();
 
 		$like = '';
 		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)
         {
-    		while($row = $this->fetch_row($result))
+    		while ($row = $this->fetch_row($result))
     		{
     			$listtables[] = $row[0];
     		}
@@ -889,29 +889,29 @@ 
 	 */
 	function DDLInfoTable($table)
 	{
-		$infotables=array();
-
-		$sql="SELECT ";
-		$sql.="	infcol.column_name as \"Column\",";
-		$sql.="	CASE WHEN infcol.character_maximum_length IS NOT NULL THEN infcol.udt_name || '('||infcol.character_maximum_length||')'";
-		$sql.="		ELSE infcol.udt_name";
-		$sql.="	END as \"Type\",";
-		$sql.="	infcol.collation_name as \"Collation\",";
-		$sql.="	infcol.is_nullable as \"Null\",";
-		$sql.="	'' as \"Key\",";
-		$sql.="	infcol.column_default as \"Default\",";
-		$sql.="	'' as \"Extra\",";
-		$sql.="	'' as \"Privileges\"";
-		$sql.="	FROM information_schema.columns infcol";
-		$sql.="	WHERE table_schema='public' ";
-		$sql.="	AND table_name='".$table."'";
-		$sql.="	ORDER BY ordinal_position;";
-
-		dol_syslog($sql,LOG_DEBUG);
+		$infotables = array();
+
+		$sql = "SELECT ";
+		$sql .= "	infcol.column_name as \"Column\",";
+		$sql .= "	CASE WHEN infcol.character_maximum_length IS NOT NULL THEN infcol.udt_name || '('||infcol.character_maximum_length||')'";
+		$sql .= "		ELSE infcol.udt_name";
+		$sql .= "	END as \"Type\",";
+		$sql .= "	infcol.collation_name as \"Collation\",";
+		$sql .= "	infcol.is_nullable as \"Null\",";
+		$sql .= "	'' as \"Key\",";
+		$sql .= "	infcol.column_default as \"Default\",";
+		$sql .= "	'' as \"Extra\",";
+		$sql .= "	'' as \"Privileges\"";
+		$sql .= "	FROM information_schema.columns infcol";
+		$sql .= "	WHERE table_schema='public' ";
+		$sql .= "	AND table_name='".$table."'";
+		$sql .= "	ORDER BY ordinal_position;";
+
+		dol_syslog($sql, LOG_DEBUG);
 		$result = $this->query($sql);
 		if ($result)
 		{
-    		 while($row = $this->fetch_row($result))
+    		 while ($row = $this->fetch_row($result))
     		 {
     			$infotables[] = $row;
     		 }
@@ -932,68 +932,68 @@ 
 	 *	@param	    array	$keys 			Tableau des champs cles noms => valeur
 	 *	@return	    int						<0 if KO, >=0 if OK
 	 */
-	function DDLCreateTable($table,$fields,$primary_key,$type,$unique_keys=null,$fulltext_keys=null,$keys=null)
+	function DDLCreateTable($table, $fields, $primary_key, $type, $unique_keys = null, $fulltext_keys = null, $keys = null)
 	{
 		// FIXME: $fulltext_keys parameter is unused
 
 		// cles recherchees dans le tableau des descriptions (fields) : type,value,attribute,null,default,extra
 		// ex. : $fields['rowid'] = array('type'=>'int','value'=>'11','null'=>'not null','extra'=> 'auto_increment');
 		$sql = "create table ".$table."(";
-		$i=0;
-		foreach($fields as $field_name => $field_desc)
+		$i = 0;
+		foreach ($fields as $field_name => $field_desc)
 		{
 			$sqlfields[$i] = $field_name." ";
 			$sqlfields[$i]  .= $field_desc['type'];
-			if( preg_match("/^[^\s]/i",$field_desc['value']))
+			if (preg_match("/^[^\s]/i", $field_desc['value']))
 			$sqlfields[$i]  .= "(".$field_desc['value'].")";
-			else if( preg_match("/^[^\s]/i",$field_desc['attribute']))
+			else if (preg_match("/^[^\s]/i", $field_desc['attribute']))
 			$sqlfields[$i]  .= " ".$field_desc['attribute'];
-			else if( preg_match("/^[^\s]/i",$field_desc['default']))
+			else if (preg_match("/^[^\s]/i", $field_desc['default']))
 			{
-				if(preg_match("/null/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']."'";
 			}
-			else if( preg_match("/^[^\s]/i",$field_desc['null']))
+			else if (preg_match("/^[^\s]/i", $field_desc['null']))
 			$sqlfields[$i]  .= " ".$field_desc['null'];
 
-			else if( preg_match("/^[^\s]/i",$field_desc['extra']))
+			else if (preg_match("/^[^\s]/i", $field_desc['extra']))
 			$sqlfields[$i]  .= " ".$field_desc['extra'];
 			$i++;
 		}
-		if($primary_key != "")
+		if ($primary_key != "")
 		$pk = "primary key(".$primary_key.")";
 
-		if(is_array($unique_keys))
+		if (is_array($unique_keys))
 		{
 			$i = 0;
-			foreach($unique_keys as $key => $value)
+			foreach ($unique_keys as $key => $value)
 			{
 				$sqluq[$i] = "UNIQUE KEY '".$key."' ('".$value."')";
 				$i++;
 			}
 		}
-		if(is_array($keys))
+		if (is_array($keys))
 		{
 			$i = 0;
-			foreach($keys as $key => $value)
+			foreach ($keys as $key => $value)
 			{
 				$sqlk[$i] = "KEY ".$key." (".$value.")";
 				$i++;
 			}
 		}
-		$sql .= implode(',',$sqlfields);
-		if($primary_key != "")
+		$sql .= implode(',', $sqlfields);
+		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))
+		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;
@@ -1009,7 +1009,7 @@ 
 	{
 		$sql = "DROP TABLE ".$table;
 
-		if (! $this->query($sql))
+		if (!$this->query($sql))
 			return -1;
 		else
 			return 1;
@@ -1024,14 +1024,14 @@ 
 	 *	@param	string	$dolibarr_main_db_name		Database name where user must be granted
 	 *	@return	int									<0 if KO, >=0 if OK
 	 */
-	function DDLCreateUser($dolibarr_main_db_host,$dolibarr_main_db_user,$dolibarr_main_db_pass,$dolibarr_main_db_name)
+	function DDLCreateUser($dolibarr_main_db_host, $dolibarr_main_db_user, $dolibarr_main_db_pass, $dolibarr_main_db_name)
 	{
 		// Note: using ' on user does not works with pgsql
 		$sql = "CREATE USER ".$this->escape($dolibarr_main_db_user)." with password '".$this->escape($dolibarr_main_db_pass)."'";
 
-		dol_syslog(get_class($this)."::DDLCreateUser", LOG_DEBUG);	// No sql to avoid password in log
-		$resql=$this->query($sql);
-		if (! $resql)
+		dol_syslog(get_class($this)."::DDLCreateUser", LOG_DEBUG); // No sql to avoid password in log
+		$resql = $this->query($sql);
+		if (!$resql)
 		{
 			return -1;
 		}
@@ -1046,13 +1046,13 @@ 
 	 *	@param	string		$field	Optionnel : Name of field if we want description of field
 	 *	@return	false|resource		Resultset x (x->attname)
 	 */
-	function DDLDescTable($table,$field="")
+	function DDLDescTable($table, $field = "")
 	{
-		$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."'";
+		$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."'";
 
-		dol_syslog($sql,LOG_DEBUG);
+		dol_syslog($sql, LOG_DEBUG);
 		$this->_results = $this->query($sql);
 		return $this->_results;
 	}
@@ -1066,32 +1066,32 @@ 
 	 *	@param	string	$field_position 	Optionnel ex.: "after champtruc"
 	 *	@return	int							<0 if KO, >0 if OK
 	 */
-	function DDLAddField($table,$field_name,$field_desc,$field_position="")
+	function DDLAddField($table, $field_name, $field_desc, $field_position = "")
 	{
 		// cles recherchees dans le tableau des descriptions (field_desc) : type,value,attribute,null,default,extra
 		// ex. : $field_desc = array('type'=>'int','value'=>'11','null'=>'not null','extra'=> 'auto_increment');
-		$sql= "ALTER TABLE ".$table." ADD ".$field_name." ";
+		$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'].")";
+		        $sql .= "(".$field_desc['value'].")";
 		    }
-		if (preg_match("/^[^\s]/i",$field_desc['attribute']))
+		if (preg_match("/^[^\s]/i", $field_desc['attribute']))
 		$sql .= " ".$field_desc['attribute'];
-		if (preg_match("/^[^\s]/i",$field_desc['null']))
+		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['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']))
+		if (preg_match("/^[^\s]/i", $field_desc['extra']))
 		$sql .= " ".$field_desc['extra'];
 		$sql .= " ".$field_position;
 
-		dol_syslog($sql,LOG_DEBUG);
-		if(! $this -> query($sql))
+		dol_syslog($sql, LOG_DEBUG);
+		if (!$this -> query($sql))
 			return -1;
 		return 1;
 	}
@@ -1104,12 +1104,12 @@ 
 	 *	@param	string	$field_desc 		Array with description of field format
 	 *	@return	int							<0 if KO, >0 if OK
 	 */
-	function DDLUpdateField($table,$field_name,$field_desc)
+	function DDLUpdateField($table, $field_name, $field_desc)
 	{
 		$sql = "ALTER TABLE ".$table;
 		$sql .= " MODIFY COLUMN ".$field_name." ".$field_desc['type'];
 		if ($field_desc['type'] == 'double' || $field_desc['type'] == 'tinyint' || $field_desc['type'] == 'int' || $field_desc['type'] == 'varchar') {
-			$sql.="(".$field_desc['value'].")";
+			$sql .= "(".$field_desc['value'].")";
 		}
 
 		if ($field_desc['null'] == 'not null' || $field_desc['null'] == 'NOT NULL')
@@ -1117,24 +1117,24 @@ 
         	// We will try to change format of column to NOT NULL. To be sure the ALTER works, we try to update fields that are NULL
         	if ($field_desc['type'] == 'varchar' || $field_desc['type'] == 'text')
         	{
-        		$sqlbis="UPDATE ".$table." SET ".$field_name." = '".$this->escape($field_desc['default'] ? $field_desc['default'] : '')."' WHERE ".$field_name." IS NULL";
+        		$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')
         	{
-        		$sqlbis="UPDATE ".$table." SET ".$field_name." = ".((int) $this->escape($field_desc['default'] ? $field_desc['default'] : 0))." WHERE ".$field_name." IS NULL";
+        		$sqlbis = "UPDATE ".$table." SET ".$field_name." = ".((int) $this->escape($field_desc['default'] ? $field_desc['default'] : 0))." WHERE ".$field_name." IS NULL";
         		$this->query($sqlbis);
         	}
 		}
 
 		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))
+		dol_syslog($sql, LOG_DEBUG);
+		if (!$this->query($sql))
 			return -1;
 		return 1;
 	}
@@ -1146,13 +1146,13 @@ 
 	 *	@param	string	$field_name 	Name of field to drop
 	 *	@return	int						<0 if KO, >0 if OK
 	 */
-	function DDLDropField($table,$field_name)
+	function DDLDropField($table, $field_name)
 	{
-		$sql= "ALTER TABLE ".$table." DROP COLUMN ".$field_name;
-		dol_syslog($sql,LOG_DEBUG);
-		if (! $this->query($sql))
+		$sql = "ALTER TABLE ".$table." DROP COLUMN ".$field_name;
+		dol_syslog($sql, LOG_DEBUG);
+		if (!$this->query($sql))
 		{
-			$this->error=$this->lasterror();
+			$this->error = $this->lasterror();
 			return -1;
 		}
 		return 1;
@@ -1165,10 +1165,10 @@ 
 	 */
 	function getDefaultCharacterSetDatabase()
 	{
-		$resql=$this->query('SHOW SERVER_ENCODING');
+		$resql = $this->query('SHOW SERVER_ENCODING');
 		if ($resql)
 		{
-            $liste=$this->fetch_array($resql);
+            $liste = $this->fetch_array($resql);
 		    return $liste['server_encoding'];
 		}
 		else return '';
@@ -1181,7 +1181,7 @@ 
 	 */
 	function getListOfCharacterSet()
 	{
-		$resql=$this->query('SHOW SERVER_ENCODING');
+		$resql = $this->query('SHOW SERVER_ENCODING');
 		$liste = array();
 		if ($resql)
 		{
@@ -1206,10 +1206,10 @@ 
 	 */
 	function getDefaultCollationDatabase()
 	{
-		$resql=$this->query('SHOW LC_COLLATE');
+		$resql = $this->query('SHOW LC_COLLATE');
 		if ($resql)
 		{
-		    $liste=$this->fetch_array($resql);
+		    $liste = $this->fetch_array($resql);
 			return $liste['lc_collate'];
 		}
 		else return '';
@@ -1222,12 +1222,12 @@ 
 	 */
 	function getListOfCollation()
 	{
-		$resql=$this->query('SHOW LC_COLLATE');
+		$resql = $this->query('SHOW LC_COLLATE');
 		$liste = array();
 		if ($resql)
 		{
 			$i = 0;
-			while ($obj = $this->fetch_object($resql) )
+			while ($obj = $this->fetch_object($resql))
 			{
 				$liste[$i]['collation'] = $obj->lc_collate;
 				$i++;
@@ -1246,21 +1246,21 @@ 
 	 */
 	function getPathOfDump()
 	{
-		$fullpathofdump='/pathtopgdump/pg_dump';
+		$fullpathofdump = '/pathtopgdump/pg_dump';
 
 		if (file_exists('/usr/bin/pg_dump'))
 		{
-		    $fullpathofdump='/usr/bin/pg_dump';
+		    $fullpathofdump = '/usr/bin/pg_dump';
 		}
 		else
 		{
             // TODO L'utilisateur de la base doit etre un superadmin pour lancer cette commande
-		    $resql=$this->query('SHOW data_directory');
+		    $resql = $this->query('SHOW data_directory');
     		if ($resql)
     		{
-    			$liste=$this->fetch_array($resql);
-    			$basedir=$liste['data_directory'];
-    			$fullpathofdump=preg_replace('/data$/','bin',$basedir).'/pg_dump';
+    			$liste = $this->fetch_array($resql);
+    			$basedir = $liste['data_directory'];
+    			$fullpathofdump = preg_replace('/data$/', 'bin', $basedir).'/pg_dump';
     		}
 		}
 
@@ -1275,23 +1275,23 @@ 
 	function getPathOfRestore()
 	{
 		//$tool='pg_restore';
-		$tool='psql';
+		$tool = 'psql';
 
-		$fullpathofdump='/pathtopgrestore/'.$tool;
+		$fullpathofdump = '/pathtopgrestore/'.$tool;
 
         if (file_exists('/usr/bin/'.$tool))
         {
-            $fullpathofdump='/usr/bin/'.$tool;
+            $fullpathofdump = '/usr/bin/'.$tool;
         }
         else
         {
             // TODO L'utilisateur de la base doit etre un superadmin pour lancer cette commande
-            $resql=$this->query('SHOW data_directory');
+            $resql = $this->query('SHOW data_directory');
             if ($resql)
             {
-                $liste=$this->fetch_array($resql);
-                $basedir=$liste['data_directory'];
-                $fullpathofdump=preg_replace('/data$/','bin',$basedir).'/'.$tool;
+                $liste = $this->fetch_array($resql);
+                $basedir = $liste['data_directory'];
+                $fullpathofdump = preg_replace('/data$/', 'bin', $basedir).'/'.$tool;
             }
         }
 
@@ -1304,16 +1304,16 @@ 
 	 * @param	string	$filter		Filter list on a particular value
 	 * @return	array				Array of key-values (key=>value)
 	 */
-	function getServerParametersValues($filter='')
+	function getServerParametersValues($filter = '')
 	{
-		$result=array();
+		$result = array();
 
-		$resql='select name,setting from pg_settings';
-		if ($filter) $resql.=" WHERE name = '".$this->escape($filter)."'";
-		$resql=$this->query($resql);
+		$resql = 'select name,setting from pg_settings';
+		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;
@@ -1325,7 +1325,7 @@ 
 	 * @param	string	$filter		Filter list on a particular value
 	 * @return  array				Array of key-values (key=>value)
 	 */
-	function getServerStatusValues($filter='')
+	function getServerStatusValues($filter = '')
 	{
 		/* This is to return current running requests.
 		$sql='SELECT datname,procpid,current_query FROM pg_stat_activity ORDER BY procpid';

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);

Upper-Lower-Casing +1 added lines, -1 removed lines

@@ -1213,7 +1213,7 @@
 
         // TODO prendre en compte le filtre
         foreach($pragmas as $var) {
-            $sql = "PRAGMA $var";
+            $sql = "pragma $var";
             $resql=$this->query($sql);
             if ($resql)
             {

Indentation +1126 added lines, -1126 removed lines

@@ -32,48 +32,48 @@ 
  */
 class DoliDBSqlite3 extends DoliDB
 {
-    //! Database type
-    public $type='sqlite3';
-    //! Database label
-    const LABEL='Sqlite3';
-    //! Version min database
-    const VERSIONMIN='3.0.0';
+	//! Database type
+	public $type='sqlite3';
+	//! Database label
+	const LABEL='Sqlite3';
+	//! Version min database
+	const VERSIONMIN='3.0.0';
 	/** @var SQLite3Result Resultset of last query */
 	private $_results;
 
-    const WEEK_MONDAY_FIRST=1;
-    const WEEK_YEAR = 2;
-    const WEEK_FIRST_WEEKDAY=4;
+	const WEEK_MONDAY_FIRST=1;
+	const WEEK_YEAR = 2;
+	const WEEK_FIRST_WEEKDAY=4;
 
 
-    /**
+	/**
 	 *	Constructor.
 	 *	This create an opened connexion to a database server and eventually to a database
-     *
+	 *
 	 *	@param      string	$type		Type of database (mysql, pgsql...)
 	 *	@param	    string	$host		Address of database server
 	 *	@param	    string	$user		Nom de l'utilisateur autorise
 	 *	@param	    string	$pass		Mot de passe
 	 *	@param	    string	$name		Nom de la database
 	 *	@param	    int		$port		Port of database server
-     */
-    function __construct($type, $host, $user, $pass, $name='', $port=0)
-    {
-        global $conf;
+	 */
+	function __construct($type, $host, $user, $pass, $name='', $port=0)
+	{
+		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;
+		// 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;
 
-        $this->database_user=$user;
-        $this->database_host=$host;
-        $this->database_port=$port;
+		$this->database_user=$user;
+		$this->database_host=$host;
+		$this->database_port=$port;
 
-        $this->transaction_opened=0;
+		$this->transaction_opened=0;
 
-        //print "Name DB: $host,$user,$pass,$name<br>";
+		//print "Name DB: $host,$user,$pass,$name<br>";
 
-        /*if (! function_exists("sqlite_query"))
+		/*if (! function_exists("sqlite_query"))
         {
             $this->connected = false;
             $this->ok = false;
@@ -82,7 +82,7 @@ 
             return $this->ok;
         }*/
 
-        /*if (! $host)
+		/*if (! $host)
         {
             $this->connected = false;
             $this->ok = false;
@@ -91,229 +91,229 @@ 
             return $this->ok;
         }*/
 
-        // Essai connexion serveur
-        // We do not try to connect to database, only to server. Connect to database is done later in constrcutor
-        $this->db = $this->connect($host, $user, $pass, $name, $port);
+		// Essai connexion serveur
+		// We do not try to connect to database, only to server. Connect to database is done later in constrcutor
+		$this->db = $this->connect($host, $user, $pass, $name, $port);
+
+		if ($this->db)
+		{
+			$this->connected = true;
+			$this->ok = true;
+			$this->database_selected = true;
+			$this->database_name = $name;
+
+			$this->addCustomFunction('IF');
+			$this->addCustomFunction('MONTH');
+			$this->addCustomFunction('CURTIME');
+			$this->addCustomFunction('CURDATE');
+			$this->addCustomFunction('WEEK', 1);
+			$this->addCustomFunction('WEEK', 2);
+			$this->addCustomFunction('WEEKDAY');
+			$this->addCustomFunction('date_format');
+			//$this->db->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_EXCEPTION);
+		}
+		else
+		{
+			// host, login ou password incorrect
+			$this->connected = false;
+			$this->ok = false;
+			$this->database_selected = false;
+			$this->database_name = '';
+			//$this->error=sqlite_connect_error();
+			dol_syslog(get_class($this)."::DoliDBSqlite3 : Error Connect ".$this->error,LOG_ERR);
+		}
+
+		return $this->ok;
+	}
 
-        if ($this->db)
-        {
-            $this->connected = true;
-            $this->ok = true;
-            $this->database_selected = true;
-            $this->database_name = $name;
-
-            $this->addCustomFunction('IF');
-            $this->addCustomFunction('MONTH');
-            $this->addCustomFunction('CURTIME');
-            $this->addCustomFunction('CURDATE');
-            $this->addCustomFunction('WEEK', 1);
-            $this->addCustomFunction('WEEK', 2);
-            $this->addCustomFunction('WEEKDAY');
-            $this->addCustomFunction('date_format');
-            //$this->db->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_EXCEPTION);
-        }
-        else
-        {
-            // host, login ou password incorrect
-            $this->connected = false;
-            $this->ok = false;
-            $this->database_selected = false;
-            $this->database_name = '';
-            //$this->error=sqlite_connect_error();
-            dol_syslog(get_class($this)."::DoliDBSqlite3 : Error Connect ".$this->error,LOG_ERR);
-        }
 
-        return $this->ok;
-    }
-
-
-    /**
-     *  Convert a SQL request in Mysql syntax to native syntax
-     *
-     *  @param     string	$line   SQL request line to convert
-     *  @param     string	$type	Type of SQL order ('ddl' for insert, update, select, delete or 'dml' for create, alter...)
-     *  @return    string   		SQL request line converted
-     */
-    static function convertSQLFromMysql($line,$type='ddl')
-    {
-        // Removed empty line if this is a comment line for SVN tagging
-        if (preg_match('/^--\s\$Id/i',$line)) {
-            return '';
-        }
-        // Return line if this is a comment
-        if (preg_match('/^#/i',$line) || preg_match('/^$/i',$line) || preg_match('/^--/i',$line))
-        {
-            return $line;
-        }
-        if ($line != "")
-        {
-            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 ($type == 'dml')
-            {
-                $line=preg_replace('/\s/',' ',$line);   // Replace tabulation with space
-
-                // we are inside create table statement so lets process datatypes
-                if (preg_match('/(ISAM|innodb)/i',$line)) { // end of create table sequence
-                    $line=preg_replace('/\)[\s\t]*type[\s\t]*=[\s\t]*(MyISAM|innodb);/i',');',$line);
-                    $line=preg_replace('/\)[\s\t]*engine[\s\t]*=[\s\t]*(MyISAM|innodb);/i',');',$line);
-                    $line=preg_replace('/,$/','',$line);
-                }
-
-                // Process case: "CREATE TABLE llx_mytable(rowid integer NOT NULL AUTO_INCREMENT PRIMARY KEY,code..."
-                if (preg_match('/[\s\t\(]*(\w*)[\s\t]+int.*auto_increment/i',$line,$reg)) {
-                    $newline=preg_replace('/([\s\t\(]*)([a-zA-Z_0-9]*)[\s\t]+int.*auto_increment[^,]*/i','\\1 \\2 integer PRIMARY KEY AUTOINCREMENT',$line);
-                    //$line = "-- ".$line." replaced by --\n".$newline;
-                    $line=$newline;
-                }
-
-                // tinyint type conversion
-                $line=str_replace('tinyint','smallint',$line);
-
-                // nuke unsigned
-                $line=preg_replace('/(int\w+|smallint)\s+unsigned/i','\\1',$line);
-
-                // blob -> text
-                $line=preg_replace('/\w*blob/i','text',$line);
-
-                // tinytext/mediumtext -> text
-                $line=preg_replace('/tinytext/i','text',$line);
-                $line=preg_replace('/mediumtext/i','text',$line);
-
-                // change not null datetime field to null valid ones
-                // (to support remapping of "zero time" to null
-                $line=preg_replace('/datetime not null/i','datetime',$line);
-                $line=preg_replace('/datetime/i','timestamp',$line);
-
-                // double -> numeric
-                $line=preg_replace('/^double/i','numeric',$line);
-                $line=preg_replace('/(\s*)double/i','\\1numeric',$line);
-                // float -> numeric
-                $line=preg_replace('/^float/i','numeric',$line);
-                $line=preg_replace('/(\s*)float/i','\\1numeric',$line);
-
-                // unique index(field1,field2)
-                if (preg_match('/unique index\s*\((\w+\s*,\s*\w+)\)/i',$line))
-                {
-                    $line=preg_replace('/unique index\s*\((\w+\s*,\s*\w+)\)/i','UNIQUE\(\\1\)',$line);
-                }
-
-                // We remove end of requests "AFTER fieldxxx"
-                $line=preg_replace('/AFTER [a-z0-9_]+/i','',$line);
-
-                // We remove start of requests "ALTER TABLE tablexxx" if this is a DROP INDEX
-                $line=preg_replace('/ALTER TABLE [a-z0-9_]+ DROP INDEX/i','DROP INDEX',$line);
-
-                // Translate order to rename fields
-                if (preg_match('/ALTER TABLE ([a-z0-9_]+) CHANGE(?: COLUMN)? ([a-z0-9_]+) ([a-z0-9_]+)(.*)$/i',$line,$reg))
-                {
-                    $line = "-- ".$line." replaced by --\n";
-                    $line.= "ALTER TABLE ".$reg[1]." RENAME COLUMN ".$reg[2]." TO ".$reg[3];
-                }
-
-                // Translate order to modify field format
-                if (preg_match('/ALTER TABLE ([a-z0-9_]+) MODIFY(?: COLUMN)? ([a-z0-9_]+) (.*)$/i',$line,$reg))
-                {
-                    $line = "-- ".$line." replaced by --\n";
-                    $newreg3=$reg[3];
-                    $newreg3=preg_replace('/ DEFAULT NULL/i','',$newreg3);
-                    $newreg3=preg_replace('/ NOT NULL/i','',$newreg3);
-                    $newreg3=preg_replace('/ NULL/i','',$newreg3);
-                    $newreg3=preg_replace('/ DEFAULT 0/i','',$newreg3);
-                    $newreg3=preg_replace('/ DEFAULT \'[0-9a-zA-Z_@]*\'/i','',$newreg3);
-                    $line.= "ALTER TABLE ".$reg[1]." ALTER COLUMN ".$reg[2]." TYPE ".$newreg3;
-                    // TODO Add alter to set default value or null/not null if there is this in $reg[3]
-                }
-
-                // alter table add primary key (field1, field2 ...) -> We create a unique index instead as dynamic creation of primary key is not supported
-                // ALTER TABLE llx_dolibarr_modules ADD PRIMARY KEY pk_dolibarr_modules (numero, entity);
-                if (preg_match('/ALTER\s+TABLE\s*(.*)\s*ADD\s+PRIMARY\s+KEY\s*(.*)\s*\((.*)$/i',$line,$reg))
-                {
-                    $line = "-- ".$line." replaced by --\n";
-                    $line.= "CREATE UNIQUE INDEX ".$reg[2]." ON ".$reg[1]."(".$reg[3];
-                }
-
-                // Translate order to drop foreign keys
-                // ALTER TABLE llx_dolibarr_modules DROP FOREIGN KEY fk_xxx;
-                if (preg_match('/ALTER\s+TABLE\s*(.*)\s*DROP\s+FOREIGN\s+KEY\s*(.*)$/i',$line,$reg))
-                {
-                    $line = "-- ".$line." replaced by --\n";
-                    $line.= "ALTER TABLE ".$reg[1]." DROP CONSTRAINT ".$reg[2];
-                }
-
-                // alter table add [unique] [index] (field1, field2 ...)
-                // ALTER TABLE llx_accountingaccount ADD INDEX idx_accountingaccount_fk_pcg_version (fk_pcg_version)
-                if (preg_match('/ALTER\s+TABLE\s*(.*)\s*ADD\s+(UNIQUE INDEX|INDEX|UNIQUE)\s+(.*)\s*\(([\w,\s]+)\)/i',$line,$reg))
-                {
-                    $fieldlist=$reg[4];
-                    $idxname=$reg[3];
-                    $tablename=$reg[1];
-                    $line = "-- ".$line." replaced by --\n";
-                    $line.= "CREATE ".(preg_match('/UNIQUE/',$reg[2])?'UNIQUE ':'')."INDEX ".$idxname." ON ".$tablename." (".$fieldlist.")";
-                }
-                if (preg_match('/ALTER\s+TABLE\s*(.*)\s*ADD\s+CONSTRAINT\s+(.*)\s*FOREIGN\s+KEY\s*\(([\w,\s]+)\)\s*REFERENCES\s+(\w+)\s*\(([\w,\s]+)\)/i',$line, $reg)) {
-                    // Pour l'instant les contraintes ne sont pas créées
-                    dol_syslog(get_class().'::query line emptied');
-                    $line = 'SELECT 0;';
-
-                }
-
-                //if (preg_match('/rowid\s+.*\s+PRIMARY\s+KEY,/i', $line)) {
-                    //preg_replace('/(rowid\s+.*\s+PRIMARY\s+KEY\s*,)/i', '/* \\1 */', $line);
-                //}
-            }
-
-            // Delete using criteria on other table must not declare twice the deleted table
-            // 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))
-            {
+	/**
+	 *  Convert a SQL request in Mysql syntax to native syntax
+	 *
+	 *  @param     string	$line   SQL request line to convert
+	 *  @param     string	$type	Type of SQL order ('ddl' for insert, update, select, delete or 'dml' for create, alter...)
+	 *  @return    string   		SQL request line converted
+	 */
+	static function convertSQLFromMysql($line,$type='ddl')
+	{
+		// Removed empty line if this is a comment line for SVN tagging
+		if (preg_match('/^--\s\$Id/i',$line)) {
+			return '';
+		}
+		// Return line if this is a comment
+		if (preg_match('/^#/i',$line) || preg_match('/^$/i',$line) || preg_match('/^--/i',$line))
+		{
+			return $line;
+		}
+		if ($line != "")
+		{
+			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 ($type == 'dml')
+			{
+				$line=preg_replace('/\s/',' ',$line);   // Replace tabulation with space
+
+				// we are inside create table statement so lets process datatypes
+				if (preg_match('/(ISAM|innodb)/i',$line)) { // end of create table sequence
+					$line=preg_replace('/\)[\s\t]*type[\s\t]*=[\s\t]*(MyISAM|innodb);/i',');',$line);
+					$line=preg_replace('/\)[\s\t]*engine[\s\t]*=[\s\t]*(MyISAM|innodb);/i',');',$line);
+					$line=preg_replace('/,$/','',$line);
+				}
+
+				// Process case: "CREATE TABLE llx_mytable(rowid integer NOT NULL AUTO_INCREMENT PRIMARY KEY,code..."
+				if (preg_match('/[\s\t\(]*(\w*)[\s\t]+int.*auto_increment/i',$line,$reg)) {
+					$newline=preg_replace('/([\s\t\(]*)([a-zA-Z_0-9]*)[\s\t]+int.*auto_increment[^,]*/i','\\1 \\2 integer PRIMARY KEY AUTOINCREMENT',$line);
+					//$line = "-- ".$line." replaced by --\n".$newline;
+					$line=$newline;
+				}
+
+				// tinyint type conversion
+				$line=str_replace('tinyint','smallint',$line);
+
+				// nuke unsigned
+				$line=preg_replace('/(int\w+|smallint)\s+unsigned/i','\\1',$line);
+
+				// blob -> text
+				$line=preg_replace('/\w*blob/i','text',$line);
+
+				// tinytext/mediumtext -> text
+				$line=preg_replace('/tinytext/i','text',$line);
+				$line=preg_replace('/mediumtext/i','text',$line);
+
+				// change not null datetime field to null valid ones
+				// (to support remapping of "zero time" to null
+				$line=preg_replace('/datetime not null/i','datetime',$line);
+				$line=preg_replace('/datetime/i','timestamp',$line);
+
+				// double -> numeric
+				$line=preg_replace('/^double/i','numeric',$line);
+				$line=preg_replace('/(\s*)double/i','\\1numeric',$line);
+				// float -> numeric
+				$line=preg_replace('/^float/i','numeric',$line);
+				$line=preg_replace('/(\s*)float/i','\\1numeric',$line);
+
+				// unique index(field1,field2)
+				if (preg_match('/unique index\s*\((\w+\s*,\s*\w+)\)/i',$line))
+				{
+					$line=preg_replace('/unique index\s*\((\w+\s*,\s*\w+)\)/i','UNIQUE\(\\1\)',$line);
+				}
+
+				// We remove end of requests "AFTER fieldxxx"
+				$line=preg_replace('/AFTER [a-z0-9_]+/i','',$line);
+
+				// We remove start of requests "ALTER TABLE tablexxx" if this is a DROP INDEX
+				$line=preg_replace('/ALTER TABLE [a-z0-9_]+ DROP INDEX/i','DROP INDEX',$line);
+
+				// Translate order to rename fields
+				if (preg_match('/ALTER TABLE ([a-z0-9_]+) CHANGE(?: COLUMN)? ([a-z0-9_]+) ([a-z0-9_]+)(.*)$/i',$line,$reg))
+				{
+					$line = "-- ".$line." replaced by --\n";
+					$line.= "ALTER TABLE ".$reg[1]." RENAME COLUMN ".$reg[2]." TO ".$reg[3];
+				}
+
+				// Translate order to modify field format
+				if (preg_match('/ALTER TABLE ([a-z0-9_]+) MODIFY(?: COLUMN)? ([a-z0-9_]+) (.*)$/i',$line,$reg))
+				{
+					$line = "-- ".$line." replaced by --\n";
+					$newreg3=$reg[3];
+					$newreg3=preg_replace('/ DEFAULT NULL/i','',$newreg3);
+					$newreg3=preg_replace('/ NOT NULL/i','',$newreg3);
+					$newreg3=preg_replace('/ NULL/i','',$newreg3);
+					$newreg3=preg_replace('/ DEFAULT 0/i','',$newreg3);
+					$newreg3=preg_replace('/ DEFAULT \'[0-9a-zA-Z_@]*\'/i','',$newreg3);
+					$line.= "ALTER TABLE ".$reg[1]." ALTER COLUMN ".$reg[2]." TYPE ".$newreg3;
+					// TODO Add alter to set default value or null/not null if there is this in $reg[3]
+				}
+
+				// alter table add primary key (field1, field2 ...) -> We create a unique index instead as dynamic creation of primary key is not supported
+				// ALTER TABLE llx_dolibarr_modules ADD PRIMARY KEY pk_dolibarr_modules (numero, entity);
+				if (preg_match('/ALTER\s+TABLE\s*(.*)\s*ADD\s+PRIMARY\s+KEY\s*(.*)\s*\((.*)$/i',$line,$reg))
+				{
+					$line = "-- ".$line." replaced by --\n";
+					$line.= "CREATE UNIQUE INDEX ".$reg[2]." ON ".$reg[1]."(".$reg[3];
+				}
+
+				// Translate order to drop foreign keys
+				// ALTER TABLE llx_dolibarr_modules DROP FOREIGN KEY fk_xxx;
+				if (preg_match('/ALTER\s+TABLE\s*(.*)\s*DROP\s+FOREIGN\s+KEY\s*(.*)$/i',$line,$reg))
+				{
+					$line = "-- ".$line." replaced by --\n";
+					$line.= "ALTER TABLE ".$reg[1]." DROP CONSTRAINT ".$reg[2];
+				}
+
+				// alter table add [unique] [index] (field1, field2 ...)
+				// ALTER TABLE llx_accountingaccount ADD INDEX idx_accountingaccount_fk_pcg_version (fk_pcg_version)
+				if (preg_match('/ALTER\s+TABLE\s*(.*)\s*ADD\s+(UNIQUE INDEX|INDEX|UNIQUE)\s+(.*)\s*\(([\w,\s]+)\)/i',$line,$reg))
+				{
+					$fieldlist=$reg[4];
+					$idxname=$reg[3];
+					$tablename=$reg[1];
+					$line = "-- ".$line." replaced by --\n";
+					$line.= "CREATE ".(preg_match('/UNIQUE/',$reg[2])?'UNIQUE ':'')."INDEX ".$idxname." ON ".$tablename." (".$fieldlist.")";
+				}
+				if (preg_match('/ALTER\s+TABLE\s*(.*)\s*ADD\s+CONSTRAINT\s+(.*)\s*FOREIGN\s+KEY\s*\(([\w,\s]+)\)\s*REFERENCES\s+(\w+)\s*\(([\w,\s]+)\)/i',$line, $reg)) {
+					// Pour l'instant les contraintes ne sont pas créées
+					dol_syslog(get_class().'::query line emptied');
+					$line = 'SELECT 0;';
+
+				}
+
+				//if (preg_match('/rowid\s+.*\s+PRIMARY\s+KEY,/i', $line)) {
+					//preg_replace('/(rowid\s+.*\s+PRIMARY\s+KEY\s*,)/i', '/* \\1 */', $line);
+				//}
+			}
+
+			// Delete using criteria on other table must not declare twice the deleted table
+			// 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
-                {
-                    $line=preg_replace('/DELETE FROM ([a-z_]+) USING ([a-z_]+), ([a-z_]+)/i','DELETE FROM \\1 USING \\3', $line);
-                }
-            }
+				{
+					$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 one table
-            $line=preg_replace('/FROM\s*\((([a-z_]+)\s+as\s+([a-z_]+)\s*)\)/i','FROM \\1',$line);
-            //print $line."\n";
+			// Remove () in the tables in FROM if one table
+			$line=preg_replace('/FROM\s*\((([a-z_]+)\s+as\s+([a-z_]+)\s*)\)/i','FROM \\1',$line);
+			//print $line."\n";
 
-            // Remove () in the tables in FROM if two table
-            $line=preg_replace('/FROM\s*\(([a-z_]+\s+as\s+[a-z_]+)\s*,\s*([a-z_]+\s+as\s+[a-z_]+\s*)\)/i','FROM \\1, \\2',$line);
-            //print $line."\n";
+			// Remove () in the tables in FROM if two table
+			$line=preg_replace('/FROM\s*\(([a-z_]+\s+as\s+[a-z_]+)\s*,\s*([a-z_]+\s+as\s+[a-z_]+\s*)\)/i','FROM \\1, \\2',$line);
+			//print $line."\n";
 
-            // Remove () in the tables in FROM if two table
-            $line=preg_replace('/FROM\s*\(([a-z_]+\s+as\s+[a-z_]+)\s*,\s*([a-z_]+\s+as\s+[a-z_]+\s*),\s*([a-z_]+\s+as\s+[a-z_]+\s*)\)/i','FROM \\1, \\2, \\3',$line);
-            //print $line."\n";
+			// Remove () in the tables in FROM if two table
+			$line=preg_replace('/FROM\s*\(([a-z_]+\s+as\s+[a-z_]+)\s*,\s*([a-z_]+\s+as\s+[a-z_]+\s*),\s*([a-z_]+\s+as\s+[a-z_]+\s*)\)/i','FROM \\1, \\2, \\3',$line);
+			//print $line."\n";
 
-            //print "type=".$type." newline=".$line."<br>\n";
-        }
+			//print "type=".$type." newline=".$line."<br>\n";
+		}
 
-        return $line;
-    }
+		return $line;
+	}
 
-    /**
+	/**
 	 *	Select a database
-     *
+	 *
 	 *	@param	    string	$database	Name of database
 	 *	@return	    boolean  		    true if OK, false if KO
-     */
-    function select_db($database)
-    {
-        dol_syslog(get_class($this)."::select_db database=".$database, LOG_DEBUG);
-	    // sqlite_select_db() does not exist
-        //return sqlite_select_db($this->db,$database);
-        return true;
-    }
+	 */
+	function select_db($database)
+	{
+		dol_syslog(get_class($this)."::select_db database=".$database, LOG_DEBUG);
+		// sqlite_select_db() does not exist
+		//return sqlite_select_db($this->db,$database);
+		return true;
+	}
 
 
-    /**
+	/**
 	 *	Connexion to server
-     *
+	 *
 	 *	@param	    string	$host		database server host
 	 *	@param	    string	$login		login
 	 *	@param	    string	$passwd		password
@@ -321,310 +321,310 @@ 
 	 *	@param		integer	$port		Port of database server
 	 *	@return		SQLite3				Database access handler
 	 *	@see		close
-     */
-    function connect($host, $login, $passwd, $name, $port=0)
-    {
-        global $main_data_dir;
-
-        dol_syslog(get_class($this)."::connect name=".$name,LOG_DEBUG);
-
-        $dir=$main_data_dir;
-        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';
-        try {
-            /*** connect to SQLite database ***/
-            //$this->db = new PDO("sqlite:".$dir.'/database_'.$name.'.sdb');
+	 */
+	function connect($host, $login, $passwd, $name, $port=0)
+	{
+		global $main_data_dir;
+
+		dol_syslog(get_class($this)."::connect name=".$name,LOG_DEBUG);
+
+		$dir=$main_data_dir;
+		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';
+		try {
+			/*** connect to SQLite database ***/
+			//$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)
-        {
-            $this->error=  self::LABEL.' '.$e->getMessage().' current dir='.$database_name;
-            return '';
-        }
+			//$this->db->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_EXCEPTION);
+		}
+		catch(Exception $e)
+		{
+			$this->error=  self::LABEL.' '.$e->getMessage().' current dir='.$database_name;
+			return '';
+		}
 
-        //print "Resultat fonction connect: ".$this->db;
-        return $this->db;
-    }
+		//print "Resultat fonction connect: ".$this->db;
+		return $this->db;
+	}
 
 
-    /**
+	/**
 	 *	Return version of database server
-     *
+	 *
 	 *	@return	        string      Version string
-     */
-    function getVersion()
-    {
-    	$tmp=$this->db->version();
-        return $tmp['versionString'];
-    }
-
-    /**
-     *	Return version of database client driver
-     *
-     *	@return	        string      Version string
-     */
-    function getDriverInfo()
-    {
-        return 'sqlite3 php driver';
-    }
-
-
-    /**
-     *  Close database connexion
-     *
-     *  @return     bool     True if disconnect successfull, false otherwise
-     *  @see        connect
-     */
-    function close()
-    {
-        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);
-            $this->connected=false;
-            $this->db->close();
-            unset($this->db);    // Clean this->db
-            return true;
-        }
-        return false;
-    }
-
-    /**
-     *  Execute a SQL request and return the resultset
-     *
-     * 	@param	string	$query			SQL query string
-     * 	@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	SQLite3Result			Resultset of answer
-     */
-    function query($query,$usesavepoint=0,$type='auto')
-    {
-        $ret=null;
-        $query = trim($query);
-        $this->error = 0;
-
-        // Convert MySQL syntax to SQLite syntax
-        if (preg_match('/ALTER\s+TABLE\s*(.*)\s*ADD\s+CONSTRAINT\s+(.*)\s*FOREIGN\s+KEY\s*\(([\w,\s]+)\)\s*REFERENCES\s+(\w+)\s*\(([\w,\s]+)\)/i',$query, $reg)) {
-            // Ajout d'une clef étrangère à la table
-            // procédure de remplacement de la table pour ajouter la contrainte
-            // Exemple : ALTER TABLE llx_adherent ADD CONSTRAINT adherent_fk_soc FOREIGN KEY (fk_soc) REFERENCES llx_societe (rowid)
-            // -> CREATE TABLE ( ... ,CONSTRAINT adherent_fk_soc FOREIGN KEY (fk_soc) REFERENCES llx_societe (rowid))
-            $foreignFields = $reg[5];
-            $foreignTable = $reg[4];
-            $localfields = $reg[3];
-            $constraintname=trim($reg[2]);
-            $tablename=trim($reg[1]);
-
-            $descTable = $this->db->querySingle("SELECT sql FROM sqlite_master WHERE name='" . $tablename . "'");
-
-            // 1- Renommer la table avec un nom temporaire
-            $this->query('ALTER TABLE ' . $tablename . ' RENAME TO tmp_' . $tablename);
-
-            // 2- Recréer la table avec la contrainte ajoutée
-
-            // on bricole la requete pour ajouter la contrainte
-            $descTable = substr($descTable, 0, strlen($descTable) - 1);
-            $descTable .= ", CONSTRAINT " . $constraintname . " FOREIGN KEY (" . $localfields . ") REFERENCES " .$foreignTable . "(" . $foreignFields . ")";
-
-            // fermeture de l'instruction
-            $descTable .= ')';
-
-            // Création proprement dite de la table
-            $this->query($descTable);
-
-            // 3- Transférer les données
-            $this->query('INSERT INTO ' . $tablename . ' SELECT * FROM tmp_' . $tablename);
-
-            // 4- Supprimer la table temporaire
-            $this->query('DROP TABLE tmp_' . $tablename);
-
-            // dummy statement
-            $query="SELECT 0";
-
-        } else {
-            $query=$this->convertSQLFromMysql($query,$type);
-        }
-        //print "After convertSQLFromMysql:\n".$query."<br>\n";
+	 */
+	function getVersion()
+	{
+		$tmp=$this->db->version();
+		return $tmp['versionString'];
+	}
 
-        dol_syslog('sql='.$query, LOG_DEBUG);
+	/**
+	 *	Return version of database client driver
+	 *
+	 *	@return	        string      Version string
+	 */
+	function getDriverInfo()
+	{
+		return 'sqlite3 php driver';
+	}
 
-        // Ordre SQL ne necessitant pas de connexion a une base (exemple: CREATE DATABASE)
-        try {
-            //$ret = $this->db->exec($query);
-            $ret = $this->db->query($query);        // $ret is a Sqlite3Result
-            if ($ret) {
-                $ret->queryString = $query;
-            }
-        }
-        catch(Exception $e)
-        {
-            $this->error=$this->db->lastErrorMsg();
-        }
 
-        if (! preg_match("/^COMMIT/i",$query) && ! preg_match("/^ROLLBACK/i",$query))
-        {
-            // Si requete utilisateur, on la sauvegarde ainsi que son resultset
-            if (! is_object($ret) || $this->error)
-            {
-                $this->lastqueryerror = $query;
-                $this->lasterror = $this->error();
-                $this->lasterrno = $this->errno();
+	/**
+	 *  Close database connexion
+	 *
+	 *  @return     bool     True if disconnect successfull, false otherwise
+	 *  @see        connect
+	 */
+	function close()
+	{
+		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);
+			$this->connected=false;
+			$this->db->close();
+			unset($this->db);    // Clean this->db
+			return true;
+		}
+		return false;
+	}
 
-                dol_syslog(get_class($this)."::query SQL Error query: ".$query, LOG_ERR);
+	/**
+	 *  Execute a SQL request and return the resultset
+	 *
+	 * 	@param	string	$query			SQL query string
+	 * 	@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	SQLite3Result			Resultset of answer
+	 */
+	function query($query,$usesavepoint=0,$type='auto')
+	{
+		$ret=null;
+		$query = trim($query);
+		$this->error = 0;
+
+		// Convert MySQL syntax to SQLite syntax
+		if (preg_match('/ALTER\s+TABLE\s*(.*)\s*ADD\s+CONSTRAINT\s+(.*)\s*FOREIGN\s+KEY\s*\(([\w,\s]+)\)\s*REFERENCES\s+(\w+)\s*\(([\w,\s]+)\)/i',$query, $reg)) {
+			// Ajout d'une clef étrangère à la table
+			// procédure de remplacement de la table pour ajouter la contrainte
+			// Exemple : ALTER TABLE llx_adherent ADD CONSTRAINT adherent_fk_soc FOREIGN KEY (fk_soc) REFERENCES llx_societe (rowid)
+			// -> CREATE TABLE ( ... ,CONSTRAINT adherent_fk_soc FOREIGN KEY (fk_soc) REFERENCES llx_societe (rowid))
+			$foreignFields = $reg[5];
+			$foreignTable = $reg[4];
+			$localfields = $reg[3];
+			$constraintname=trim($reg[2]);
+			$tablename=trim($reg[1]);
+
+			$descTable = $this->db->querySingle("SELECT sql FROM sqlite_master WHERE name='" . $tablename . "'");
+
+			// 1- Renommer la table avec un nom temporaire
+			$this->query('ALTER TABLE ' . $tablename . ' RENAME TO tmp_' . $tablename);
+
+			// 2- Recréer la table avec la contrainte ajoutée
+
+			// on bricole la requete pour ajouter la contrainte
+			$descTable = substr($descTable, 0, strlen($descTable) - 1);
+			$descTable .= ", CONSTRAINT " . $constraintname . " FOREIGN KEY (" . $localfields . ") REFERENCES " .$foreignTable . "(" . $foreignFields . ")";
+
+			// fermeture de l'instruction
+			$descTable .= ')';
+
+			// Création proprement dite de la table
+			$this->query($descTable);
+
+			// 3- Transférer les données
+			$this->query('INSERT INTO ' . $tablename . ' SELECT * FROM tmp_' . $tablename);
+
+			// 4- Supprimer la table temporaire
+			$this->query('DROP TABLE tmp_' . $tablename);
+
+			// dummy statement
+			$query="SELECT 0";
+
+		} else {
+			$query=$this->convertSQLFromMysql($query,$type);
+		}
+		//print "After convertSQLFromMysql:\n".$query."<br>\n";
+
+		dol_syslog('sql='.$query, LOG_DEBUG);
+
+		// Ordre SQL ne necessitant pas de connexion a une base (exemple: CREATE DATABASE)
+		try {
+			//$ret = $this->db->exec($query);
+			$ret = $this->db->query($query);        // $ret is a Sqlite3Result
+			if ($ret) {
+				$ret->queryString = $query;
+			}
+		}
+		catch(Exception $e)
+		{
+			$this->error=$this->db->lastErrorMsg();
+		}
+
+		if (! preg_match("/^COMMIT/i",$query) && ! preg_match("/^ROLLBACK/i",$query))
+		{
+			// Si requete utilisateur, on la sauvegarde ainsi que son resultset
+			if (! is_object($ret) || $this->error)
+			{
+				$this->lastqueryerror = $query;
+				$this->lasterror = $this->error();
+				$this->lasterrno = $this->errno();
+
+				dol_syslog(get_class($this)."::query SQL Error query: ".$query, LOG_ERR);
+
+				$errormsg = get_class($this)."::query SQL Error message: ".$this->lasterror;
+
+				if (preg_match('/[0-9]/',$this->lasterrno)) {
+					$errormsg .= ' ('.$this->lasterrno.')';
+				}
+
+				dol_syslog($errormsg, LOG_ERR);
+			}
+			$this->lastquery=$query;
+			$this->_results = $ret;
+		}
+
+		return $ret;
+	}
 
-                $errormsg = get_class($this)."::query SQL Error message: ".$this->lasterror;
+	/**
+	 *	Renvoie la ligne courante (comme un objet) pour le curseur resultset
+	 *
+	 *	@param	SQLite3Result	$resultset  Curseur de la requete voulue
+	 *	@return	false|object				Object result line or false if KO or end of cursor
+	 */
+	function fetch_object($resultset)
+	{
+		// Si le resultset n'est pas fourni, on prend le dernier utilise sur cette connexion
+		if (! is_object($resultset)) { $resultset=$this->_results; }
+		//return $resultset->fetch(PDO::FETCH_OBJ);
+		$ret = $resultset->fetchArray(SQLITE3_ASSOC);
+		if ($ret) {
+			return (object) $ret;
+		}
+		return false;
+	}
 
-                if (preg_match('/[0-9]/',$this->lasterrno)) {
-                    $errormsg .= ' ('.$this->lasterrno.')';
-                }
 
-                dol_syslog($errormsg, LOG_ERR);
-            }
-            $this->lastquery=$query;
-            $this->_results = $ret;
-        }
+	/**
+	 *	Return datas as an array
+	 *
+	 *	@param	SQLite3Result	$resultset  Resultset of request
+	 *	@return	false|array					Array or false if KO or end of cursor
+	 */
+	function fetch_array($resultset)
+	{
+		// If resultset not provided, we take the last used by connexion
+		if (! is_object($resultset)) { $resultset=$this->_results; }
+		//return $resultset->fetch(PDO::FETCH_ASSOC);
+		$ret = $resultset->fetchArray(SQLITE3_ASSOC);
+		return $ret;
+	}
 
-        return $ret;
-    }
-
-    /**
-     *	Renvoie la ligne courante (comme un objet) pour le curseur resultset
-     *
-     *	@param	SQLite3Result	$resultset  Curseur de la requete voulue
-     *	@return	false|object				Object result line or false if KO or end of cursor
-     */
-    function fetch_object($resultset)
-    {
-        // Si le resultset n'est pas fourni, on prend le dernier utilise sur cette connexion
-        if (! is_object($resultset)) { $resultset=$this->_results; }
-        //return $resultset->fetch(PDO::FETCH_OBJ);
-        $ret = $resultset->fetchArray(SQLITE3_ASSOC);
-        if ($ret) {
-            return (object) $ret;
-        }
-		return false;
-    }
-
-
-    /**
-     *	Return datas as an array
-     *
-     *	@param	SQLite3Result	$resultset  Resultset of request
-     *	@return	false|array					Array or false if KO or end of cursor
-     */
-    function fetch_array($resultset)
-    {
-        // If resultset not provided, we take the last used by connexion
-        if (! is_object($resultset)) { $resultset=$this->_results; }
-        //return $resultset->fetch(PDO::FETCH_ASSOC);
-        $ret = $resultset->fetchArray(SQLITE3_ASSOC);
-	    return $ret;
-    }
-
-    /**
-     *	Return datas as an array
-     *
-     *	@param	SQLite3Result	$resultset  Resultset of request
-     *	@return	false|array					Array or false if KO or end of cursor
-     */
-    function fetch_row($resultset)
-    {
-        // If resultset not provided, we take the last used by connexion
-        if (! is_bool($resultset))
-        {
-            if (! is_object($resultset)) { $resultset=$this->_results; }
-            return $resultset->fetchArray(SQLITE3_NUM);
-        }
-        else
-        {
-            // si le curseur est un booleen on retourne la valeur 0
-            return false;
-        }
-    }
-
-    /**
-     *	Return number of lines for result of a SELECT
-     *
-     *	@param	SQLite3Result	$resultset  Resulset of requests
-     *	@return int		    			Nb of lines
-     *	@see    affected_rows
-     */
-    function num_rows($resultset)
-    {
-	    // FIXME: SQLite3Result does not have a queryString member
-
-        // If resultset not provided, we take the last used by connexion
-        if (! is_object($resultset)) { $resultset=$this->_results; }
-        if (preg_match("/^SELECT/i", $resultset->queryString)) {
-            return $this->db->querySingle("SELECT count(*) FROM (" . $resultset->queryString . ") q");
-        }
-        return 0;
-    }
-
-    /**
-     *	Return number of lines for result of a SELECT
-     *
-     *	@param	SQLite3Result	$resultset  Resulset of requests
-     *	@return int		    			Nb of lines
-     *	@see    affected_rows
-     */
-    function affected_rows($resultset)
-    {
-	    // FIXME: SQLite3Result does not have a queryString member
-
-        // If resultset not provided, we take the last used by connexion
-        if (! is_object($resultset)) { $resultset=$this->_results; }
-        if (preg_match("/^SELECT/i", $resultset->queryString)) {
-            return $this->num_rows($resultset);
-        }
-        // mysql necessite un link de base pour cette fonction contrairement
-        // a pqsql qui prend un resultset
-        return $this->db->changes();
-    }
+	/**
+	 *	Return datas as an array
+	 *
+	 *	@param	SQLite3Result	$resultset  Resultset of request
+	 *	@return	false|array					Array or false if KO or end of cursor
+	 */
+	function fetch_row($resultset)
+	{
+		// If resultset not provided, we take the last used by connexion
+		if (! is_bool($resultset))
+		{
+			if (! is_object($resultset)) { $resultset=$this->_results; }
+			return $resultset->fetchArray(SQLITE3_NUM);
+		}
+		else
+		{
+			// si le curseur est un booleen on retourne la valeur 0
+			return false;
+		}
+	}
 
+	/**
+	 *	Return number of lines for result of a SELECT
+	 *
+	 *	@param	SQLite3Result	$resultset  Resulset of requests
+	 *	@return int		    			Nb of lines
+	 *	@see    affected_rows
+	 */
+	function num_rows($resultset)
+	{
+		// FIXME: SQLite3Result does not have a queryString member
+
+		// If resultset not provided, we take the last used by connexion
+		if (! is_object($resultset)) { $resultset=$this->_results; }
+		if (preg_match("/^SELECT/i", $resultset->queryString)) {
+			return $this->db->querySingle("SELECT count(*) FROM (" . $resultset->queryString . ") q");
+		}
+		return 0;
+	}
 
-    /**
+	/**
+	 *	Return number of lines for result of a SELECT
+	 *
+	 *	@param	SQLite3Result	$resultset  Resulset of requests
+	 *	@return int		    			Nb of lines
+	 *	@see    affected_rows
+	 */
+	function affected_rows($resultset)
+	{
+		// FIXME: SQLite3Result does not have a queryString member
+
+		// If resultset not provided, we take the last used by connexion
+		if (! is_object($resultset)) { $resultset=$this->_results; }
+		if (preg_match("/^SELECT/i", $resultset->queryString)) {
+			return $this->num_rows($resultset);
+		}
+		// mysql necessite un link de base pour cette fonction contrairement
+		// a pqsql qui prend un resultset
+		return $this->db->changes();
+	}
+
+
+	/**
 	 *	Free last resultset used.
-     *
+	 *
 	 *	@param  SQLite3Result	$resultset   Curseur de la requete voulue
 	 *	@return	void
-     */
-    function free($resultset=null)
-    {
-        // 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();
-    }
-
-    /**
+	 */
+	function free($resultset=null)
+	{
+		// 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();
+	}
+
+	/**
 	 *	Escape a string to insert data
-     *
+	 *
 	 *  @param	string	$stringtoencode		String to escape
 	 *  @return	string						String escaped
-     */
-    function escape($stringtoencode)
-    {
-        return Sqlite3::escapeString($stringtoencode);
-    }
-
-    /**
-     *	Renvoie le code erreur generique de l'operation precedente.
-     *
-     *	@return	string		Error code (Exemples: DB_ERROR_TABLE_ALREADY_EXISTS, DB_ERROR_RECORD_ALREADY_EXISTS...)
-     */
-    function errno()
-    {
-        if (! $this->connected) {
-            // Si il y a eu echec de connexion, $this->db n'est pas valide.
-            return 'DB_ERROR_FAILED_TO_CONNECT';
-        }
-        else {
-            // Constants to convert error code to a generic Dolibarr error code
-            /*$errorcode_map = array(
+	 */
+	function escape($stringtoencode)
+	{
+		return Sqlite3::escapeString($stringtoencode);
+	}
+
+	/**
+	 *	Renvoie le code erreur generique de l'operation precedente.
+	 *
+	 *	@return	string		Error code (Exemples: DB_ERROR_TABLE_ALREADY_EXISTS, DB_ERROR_RECORD_ALREADY_EXISTS...)
+	 */
+	function errno()
+	{
+		if (! $this->connected) {
+			// Si il y a eu echec de connexion, $this->db n'est pas valide.
+			return 'DB_ERROR_FAILED_TO_CONNECT';
+		}
+		else {
+			// Constants to convert error code to a generic Dolibarr error code
+			/*$errorcode_map = array(
             1004 => 'DB_ERROR_CANNOT_CREATE',
             1005 => 'DB_ERROR_CANNOT_CREATE',
             1006 => 'DB_ERROR_CANNOT_CREATE',
@@ -656,220 +656,220 @@ 
             {
                 return $errorcode_map[$this->db->errorCode()];
             }*/
-            $errno=$this->db->lastErrorCode();
+			$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 ($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 ($errno > 1) {
-                // TODO Voir la liste des messages d'erreur
-            }
-
-            return ($errno?'DB_ERROR_'.$errno:'0');
-        }
-    }
-
-    /**
-     *	Renvoie le texte de l'erreur mysql de l'operation precedente.
-     *
-     *	@return	string	Error text
-     */
-    function error()
-    {
-        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 {
-            return $this->error;
-        }
-    }
+			{
+				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 ($errno > 1) {
+				// TODO Voir la liste des messages d'erreur
+			}
+
+			return ($errno?'DB_ERROR_'.$errno:'0');
+		}
+	}
+
+	/**
+	 *	Renvoie le texte de l'erreur mysql de l'operation precedente.
+	 *
+	 *	@return	string	Error text
+	 */
+	function error()
+	{
+		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 {
+			return $this->error;
+		}
+	}
 
-    /**
-     * Get last ID after an insert INSERT
-     *
+	/**
+	 * Get last ID after an insert INSERT
+	 *
 	 * @param   string	$tab    	Table name concerned by insert. Ne sert pas sous MySql mais requis pour compatibilite avec Postgresql
 	 * @param	string	$fieldid	Field name
 	 * @return  int     			Id of row
-     */
-    function last_insert_id($tab,$fieldid='rowid')
-    {
-        return $this->db->lastInsertRowId();
-    }
-
-    /**
-     *  Encrypt sensitive data in database
-     *  Warning: This function includes the escape, so it must use direct value
-     *
-     *  @param  string  $fieldorvalue   Field name or value to encrypt
-     *  @param	int		$withQuotes     Return string with quotes
-     *  @return string          		XXX(field) or XXX('value') or field or 'value'
-     */
-    function encrypt($fieldorvalue, $withQuotes=0)
-    {
-        global $conf;
-
-        // Type of encryption (2: AES (recommended), 1: DES , 0: no encryption)
-        $cryptType = ($conf->db->dolibarr_main_db_encryption?$conf->db->dolibarr_main_db_encryption:0);
-
-        //Encryption key
-        $cryptKey = (!empty($conf->db->dolibarr_main_db_cryptkey)?$conf->db->dolibarr_main_db_cryptkey:'');
-
-        $return = ($withQuotes?"'":"").$this->escape($fieldorvalue).($withQuotes?"'":"");
-
-        if ($cryptType && !empty($cryptKey))
-        {
-            if ($cryptType == 2)
-            {
-                $return = 'AES_ENCRYPT('.$return.',\''.$cryptKey.'\')';
-            }
-            else if ($cryptType == 1)
-            {
-                $return = 'DES_ENCRYPT('.$return.',\''.$cryptKey.'\')';
-            }
-        }
+	 */
+	function last_insert_id($tab,$fieldid='rowid')
+	{
+		return $this->db->lastInsertRowId();
+	}
 
-        return $return;
-    }
+	/**
+	 *  Encrypt sensitive data in database
+	 *  Warning: This function includes the escape, so it must use direct value
+	 *
+	 *  @param  string  $fieldorvalue   Field name or value to encrypt
+	 *  @param	int		$withQuotes     Return string with quotes
+	 *  @return string          		XXX(field) or XXX('value') or field or 'value'
+	 */
+	function encrypt($fieldorvalue, $withQuotes=0)
+	{
+		global $conf;
 
-    /**
-     *	Decrypt sensitive data in database
-     *
-     *	@param	string	$value			Value to decrypt
-     * 	@return	string					Decrypted value if used
-     */
-    function decrypt($value)
-    {
-        global $conf;
+		// Type of encryption (2: AES (recommended), 1: DES , 0: no encryption)
+		$cryptType = ($conf->db->dolibarr_main_db_encryption?$conf->db->dolibarr_main_db_encryption:0);
 
-        // Type of encryption (2: AES (recommended), 1: DES , 0: no encryption)
-        $cryptType = ($conf->db->dolibarr_main_db_encryption?$conf->db->dolibarr_main_db_encryption:0);
+		//Encryption key
+		$cryptKey = (!empty($conf->db->dolibarr_main_db_cryptkey)?$conf->db->dolibarr_main_db_cryptkey:'');
 
-        //Encryption key
-        $cryptKey = (!empty($conf->db->dolibarr_main_db_cryptkey)?$conf->db->dolibarr_main_db_cryptkey:'');
+		$return = ($withQuotes?"'":"").$this->escape($fieldorvalue).($withQuotes?"'":"");
 
-        $return = $value;
+		if ($cryptType && !empty($cryptKey))
+		{
+			if ($cryptType == 2)
+			{
+				$return = 'AES_ENCRYPT('.$return.',\''.$cryptKey.'\')';
+			}
+			else if ($cryptType == 1)
+			{
+				$return = 'DES_ENCRYPT('.$return.',\''.$cryptKey.'\')';
+			}
+		}
 
-        if ($cryptType && !empty($cryptKey))
-        {
-            if ($cryptType == 2)
-            {
-                $return = 'AES_DECRYPT('.$value.',\''.$cryptKey.'\')';
-            }
-            else if ($cryptType == 1)
-            {
-                $return = 'DES_DECRYPT('.$value.',\''.$cryptKey.'\')';
-            }
-        }
+		return $return;
+	}
 
-        return $return;
-    }
+	/**
+	 *	Decrypt sensitive data in database
+	 *
+	 *	@param	string	$value			Value to decrypt
+	 * 	@return	string					Decrypted value if used
+	 */
+	function decrypt($value)
+	{
+		global $conf;
+
+		// Type of encryption (2: AES (recommended), 1: DES , 0: no encryption)
+		$cryptType = ($conf->db->dolibarr_main_db_encryption?$conf->db->dolibarr_main_db_encryption:0);
+
+		//Encryption key
+		$cryptKey = (!empty($conf->db->dolibarr_main_db_cryptkey)?$conf->db->dolibarr_main_db_cryptkey:'');
+
+		$return = $value;
 
+		if ($cryptType && !empty($cryptKey))
+		{
+			if ($cryptType == 2)
+			{
+				$return = 'AES_DECRYPT('.$value.',\''.$cryptKey.'\')';
+			}
+			else if ($cryptType == 1)
+			{
+				$return = 'DES_DECRYPT('.$value.',\''.$cryptKey.'\')';
+			}
+		}
 
-    /**
-     * Return connexion ID
-     *
+		return $return;
+	}
+
+
+	/**
+	 * Return connexion ID
+	 *
 	 * @return	        string      Id connexion
-     */
-    function DDLGetConnectId()
-    {
-        return '?';
-    }
+	 */
+	function DDLGetConnectId()
+	{
+		return '?';
+	}
 
 
-    /**
+	/**
 	 *	Create a new database
 	 *	Do not use function xxx_create_db (xxx=mysql, ...) as they are deprecated
 	 *	We force to create database with charset this->forcecharset and collate this->forcecollate
-     *
+	 *
 	 *	@param	string	$database		Database name to create
 	 * 	@param	string	$charset		Charset used to store data
 	 * 	@param	string	$collation		Charset used to sort data
 	 * 	@param	string	$owner			Username of database owner
 	 * 	@return	SQLite3Result   		resource defined if OK, null if KO
-     */
-    function DDLCreateDb($database,$charset='',$collation='',$owner='')
-    {
-        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;
-        $sql.= ' DEFAULT CHARACTER SET '.$charset.' DEFAULT COLLATE '.$collation;
-
-        dol_syslog($sql,LOG_DEBUG);
-        $ret=$this->query($sql);
-        if (! $ret)
-        {
-            // We try again for compatibility with Mysql < 4.1.1
-            $sql = 'CREATE DATABASE '.$database;
-            $ret=$this->query($sql);
-            dol_syslog($sql,LOG_DEBUG);
-        }
-        return $ret;
-    }
+	 */
+	function DDLCreateDb($database,$charset='',$collation='',$owner='')
+	{
+		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;
+		$sql.= ' DEFAULT CHARACTER SET '.$charset.' DEFAULT COLLATE '.$collation;
+
+		dol_syslog($sql,LOG_DEBUG);
+		$ret=$this->query($sql);
+		if (! $ret)
+		{
+			// We try again for compatibility with Mysql < 4.1.1
+			$sql = 'CREATE DATABASE '.$database;
+			$ret=$this->query($sql);
+			dol_syslog($sql,LOG_DEBUG);
+		}
+		return $ret;
+	}
 
-    /**
-     *  List tables into a database
-     *
+	/**
+	 *  List tables into a database
+	 *
 	 *  @param	string		$database	Name of database
 	 *  @param	string		$table		Name of table filter ('xxx%')
 	 *  @return	array					List of tables in an array
-     */
-    function DDLListTables($database, $table='')
-    {
-        $listtables=array();
-
-        $like = '';
-        if ($table) $like = "LIKE '".$table."'";
-        $sql="SHOW TABLES FROM ".$database." ".$like.";";
-        //print $sql;
-        $result = $this->query($sql);
-        if ($result)
-        {
-            while($row = $this->fetch_row($result))
-            {
-                $listtables[] = $row[0];
-            }
-        }
-        return $listtables;
-    }
+	 */
+	function DDLListTables($database, $table='')
+	{
+		$listtables=array();
+
+		$like = '';
+		if ($table) $like = "LIKE '".$table."'";
+		$sql="SHOW TABLES FROM ".$database." ".$like.";";
+		//print $sql;
+		$result = $this->query($sql);
+		if ($result)
+		{
+			while($row = $this->fetch_row($result))
+			{
+				$listtables[] = $row[0];
+			}
+		}
+		return $listtables;
+	}
 
-    /**
+	/**
 	 *	List information of columns into a table.
-     *
+	 *
 	 *	@param	string	$table		Name of table
 	 *	@return	array				Tableau des informations des champs de la table
 	 *	TODO modify for sqlite
-     */
-    function DDLInfoTable($table)
-    {
-        $infotables=array();
-
-        $sql="SHOW FULL COLUMNS FROM ".$table.";";
-
-        dol_syslog($sql,LOG_DEBUG);
-        $result = $this->query($sql);
-        if ($result)
-        {
-            while($row = $this->fetch_row($result))
-            {
-                $infotables[] = $row;
-            }
-        }
-        return $infotables;
-    }
+	 */
+	function DDLInfoTable($table)
+	{
+		$infotables=array();
+
+		$sql="SHOW FULL COLUMNS FROM ".$table.";";
+
+		dol_syslog($sql,LOG_DEBUG);
+		$result = $this->query($sql);
+		if ($result)
+		{
+			while($row = $this->fetch_row($result))
+			{
+				$infotables[] = $row;
+			}
+		}
+		return $infotables;
+	}
 
-    /**
+	/**
 	 *	Create a table into database
-     *
+	 *
 	 *	@param	    string	$table 			Nom de la table
 	 *	@param	    array	$fields 		Tableau associatif [nom champ][tableau des descriptions]
 	 *	@param	    string	$primary_key 	Nom du champ qui sera la clef primaire
@@ -878,383 +878,383 @@ 
 	 *	@param	    array	$fulltext_keys	Tableau des Nom de champs qui seront indexes en fulltext
 	 *	@param	    array	$keys 			Tableau des champs cles noms => valeur
 	 *	@return	    int						<0 if KO, >=0 if OK
-     */
-    function DDLCreateTable($table,$fields,$primary_key,$type,$unique_keys=null,$fulltext_keys=null,$keys=null)
-    {
-	    // FIXME: $fulltext_keys parameter is unused
-
-        // cles recherchees dans le tableau des descriptions (fields) : type,value,attribute,null,default,extra
-        // ex. : $fields['rowid'] = array('type'=>'int','value'=>'11','null'=>'not null','extra'=> 'auto_increment');
-        $sql = "create table ".$table."(";
-        $i=0;
-        foreach($fields as $field_name => $field_desc)
-        {
-            $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("/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'];
-            $i++;
-        }
-        if($primary_key != "")
-        $pk = "primary key(".$primary_key.")";
+	 */
+	function DDLCreateTable($table,$fields,$primary_key,$type,$unique_keys=null,$fulltext_keys=null,$keys=null)
+	{
+		// FIXME: $fulltext_keys parameter is unused
+
+		// cles recherchees dans le tableau des descriptions (fields) : type,value,attribute,null,default,extra
+		// ex. : $fields['rowid'] = array('type'=>'int','value'=>'11','null'=>'not null','extra'=> 'auto_increment');
+		$sql = "create table ".$table."(";
+		$i=0;
+		foreach($fields as $field_name => $field_desc)
+		{
+			$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("/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'];
+			$i++;
+		}
+		if($primary_key != "")
+		$pk = "primary key(".$primary_key.")";
+
+		if(is_array($unique_keys))
+		{
+			$i = 0;
+			foreach($unique_keys as $key => $value)
+			{
+				$sqluq[$i] = "UNIQUE KEY '".$key."' ('".$value."')";
+				$i++;
+			}
+		}
+		if(is_array($keys))
+		{
+			$i = 0;
+			foreach($keys as $key => $value)
+			{
+				$sqlk[$i] = "KEY ".$key." (".$value.")";
+				$i++;
+			}
+		}
+		$sql .= implode(',',$sqlfields);
+		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;
+		return 1;
+	}
 
-        if(is_array($unique_keys))
-        {
-            $i = 0;
-            foreach($unique_keys as $key => $value)
-            {
-                $sqluq[$i] = "UNIQUE KEY '".$key."' ('".$value."')";
-                $i++;
-            }
-        }
-        if(is_array($keys))
-        {
-            $i = 0;
-            foreach($keys as $key => $value)
-            {
-                $sqlk[$i] = "KEY ".$key." (".$value.")";
-                $i++;
-            }
-        }
-        $sql .= implode(',',$sqlfields);
-        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;
-        return 1;
-    }
-
-    /**
-     *	Drop a table into database
-     *
-     *	@param	    string	$table 			Name of table
-     *	@return	    int						<0 if KO, >=0 if OK
-     */
-    function DDLDropTable($table)
-    {
-    	$sql = "DROP TABLE ".$table;
-
-    	if (! $this->query($sql))
-    		return -1;
-    	else
-    		return 1;
-    }
-
-    /**
+	/**
+	 *	Drop a table into database
+	 *
+	 *	@param	    string	$table 			Name of table
+	 *	@return	    int						<0 if KO, >=0 if OK
+	 */
+	function DDLDropTable($table)
+	{
+		$sql = "DROP TABLE ".$table;
+
+		if (! $this->query($sql))
+			return -1;
+		else
+			return 1;
+	}
+
+	/**
 	 *	Return a pointer of line with description of a table or field
-     *
+	 *
 	 *	@param	string		$table	Name of table
 	 *	@param	string		$field	Optionnel : Name of field if we want description of field
 	 *	@return	SQLite3Result		Resource
-     */
-    function DDLDescTable($table,$field="")
-    {
-        $sql="DESC ".$table." ".$field;
+	 */
+	function DDLDescTable($table,$field="")
+	{
+		$sql="DESC ".$table." ".$field;
 
-        dol_syslog(get_class($this)."::DDLDescTable ".$sql,LOG_DEBUG);
-        $this->_results = $this->query($sql);
-        return $this->_results;
-    }
+		dol_syslog(get_class($this)."::DDLDescTable ".$sql,LOG_DEBUG);
+		$this->_results = $this->query($sql);
+		return $this->_results;
+	}
 
-    /**
+	/**
 	 *	Create a new field into table
-     *
+	 *
 	 *	@param	string	$table 				Name of table
 	 *	@param	string	$field_name 		Name of field to add
 	 *	@param	string	$field_desc 		Tableau associatif de description du champ a inserer[nom du parametre][valeur du parametre]
 	 *	@param	string	$field_position 	Optionnel ex.: "after champtruc"
 	 *	@return	int							<0 if KO, >0 if OK
-     */
-    function DDLAddField($table,$field_name,$field_desc,$field_position="")
-    {
-        // cles recherchees dans le tableau des descriptions (field_desc) : type,value,attribute,null,default,extra
-        // 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')))
-        {
-            $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'];
-        $sql.= " ".$field_position;
-
-        dol_syslog(get_class($this)."::DDLAddField ".$sql,LOG_DEBUG);
-        if(! $this->query($sql))
-        {
-            return -1;
-        }
-        return 1;
-    }
+	 */
+	function DDLAddField($table,$field_name,$field_desc,$field_position="")
+	{
+		// cles recherchees dans le tableau des descriptions (field_desc) : type,value,attribute,null,default,extra
+		// 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')))
+		{
+			$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'];
+		$sql.= " ".$field_position;
+
+		dol_syslog(get_class($this)."::DDLAddField ".$sql,LOG_DEBUG);
+		if(! $this->query($sql))
+		{
+			return -1;
+		}
+		return 1;
+	}
 
-    /**
+	/**
 	 *	Update format of a field into a table
-     *
+	 *
 	 *	@param	string	$table 				Name of table
 	 *	@param	string	$field_name 		Name of field to modify
 	 *	@param	string	$field_desc 		Array with description of field format
 	 *	@return	int							<0 if KO, >0 if OK
-     */
-    function DDLUpdateField($table,$field_name,$field_desc)
-    {
-        $sql = "ALTER TABLE ".$table;
-        $sql .= " MODIFY COLUMN ".$field_name." ".$field_desc['type'];
-        if ($field_desc['type'] == 'tinyint' || $field_desc['type'] == 'int' || $field_desc['type'] == 'varchar') {
-            $sql.="(".$field_desc['value'].")";
-        }
-
-        dol_syslog(get_class($this)."::DDLUpdateField ".$sql,LOG_DEBUG);
-        if (! $this->query($sql))
-            return -1;
-        return 1;
-    }
+	 */
+	function DDLUpdateField($table,$field_name,$field_desc)
+	{
+		$sql = "ALTER TABLE ".$table;
+		$sql .= " MODIFY COLUMN ".$field_name." ".$field_desc['type'];
+		if ($field_desc['type'] == 'tinyint' || $field_desc['type'] == 'int' || $field_desc['type'] == 'varchar') {
+			$sql.="(".$field_desc['value'].")";
+		}
+
+		dol_syslog(get_class($this)."::DDLUpdateField ".$sql,LOG_DEBUG);
+		if (! $this->query($sql))
+			return -1;
+		return 1;
+	}
 
-    /**
+	/**
 	 *	Drop a field from table
-     *
+	 *
 	 *	@param	string	$table 			Name of table
 	 *	@param	string	$field_name 	Name of field to drop
 	 *	@return	int						<0 if KO, >0 if OK
-     */
-    function DDLDropField($table,$field_name)
-    {
-        $sql= "ALTER TABLE ".$table." DROP COLUMN `".$field_name."`";
-        dol_syslog(get_class($this)."::DDLDropField ".$sql,LOG_DEBUG);
-        if (! $this->query($sql))
-        {
-            $this->error=$this->lasterror();
-            return -1;
-        }
-        return 1;
-    }
+	 */
+	function DDLDropField($table,$field_name)
+	{
+		$sql= "ALTER TABLE ".$table." DROP COLUMN `".$field_name."`";
+		dol_syslog(get_class($this)."::DDLDropField ".$sql,LOG_DEBUG);
+		if (! $this->query($sql))
+		{
+			$this->error=$this->lasterror();
+			return -1;
+		}
+		return 1;
+	}
 
 
-    /**
+	/**
 	 * 	Create a user and privileges to connect to database (even if database does not exists yet)
-     *
+	 *
 	 *	@param	string	$dolibarr_main_db_host 		Ip serveur
 	 *	@param	string	$dolibarr_main_db_user 		Nom user a creer
 	 *	@param	string	$dolibarr_main_db_pass 		Mot de passe user a creer
 	 *	@param	string	$dolibarr_main_db_name		Database name where user must be granted
 	 *	@return	int									<0 if KO, >=0 if OK
-     */
-    function DDLCreateUser($dolibarr_main_db_host,$dolibarr_main_db_user,$dolibarr_main_db_pass,$dolibarr_main_db_name)
-    {
-        $sql = "INSERT INTO user ";
-        $sql.= "(Host,User,password,Select_priv,Insert_priv,Update_priv,Delete_priv,Create_priv,Drop_priv,Index_Priv,Alter_priv,Lock_tables_priv)";
-        $sql.= " VALUES ('".$this->escape($dolibarr_main_db_host)."','".$this->escape($dolibarr_main_db_user)."',password('".addslashes($dolibarr_main_db_pass)."')";
-        $sql.= ",'Y','Y','Y','Y','Y','Y','Y','Y','Y')";
-
-        dol_syslog(get_class($this)."::DDLCreateUser", LOG_DEBUG);	// No sql to avoid password in log
-        $resql=$this->query($sql);
-        if (! $resql)
-        {
-            return -1;
-        }
-
-        $sql = "INSERT INTO db ";
-        $sql.= "(Host,Db,User,Select_priv,Insert_priv,Update_priv,Delete_priv,Create_priv,Drop_priv,Index_Priv,Alter_priv,Lock_tables_priv)";
-        $sql.= " VALUES ('".$this->escape($dolibarr_main_db_host)."','".$this->escape($dolibarr_main_db_name)."','".addslashes($dolibarr_main_db_user)."'";
-        $sql.= ",'Y','Y','Y','Y','Y','Y','Y','Y','Y')";
-
-        dol_syslog(get_class($this)."::DDLCreateUser", LOG_DEBUG);
-        $resql=$this->query($sql);
-        if (! $resql)
-        {
-            return -1;
-        }
-
-        $sql="FLUSH Privileges";
-
-        dol_syslog(get_class($this)."::DDLCreateUser", LOG_DEBUG);
-        $resql=$this->query($sql);
-        if (! $resql)
-        {
-            return -1;
-        }
-        return 1;
-    }
+	 */
+	function DDLCreateUser($dolibarr_main_db_host,$dolibarr_main_db_user,$dolibarr_main_db_pass,$dolibarr_main_db_name)
+	{
+		$sql = "INSERT INTO user ";
+		$sql.= "(Host,User,password,Select_priv,Insert_priv,Update_priv,Delete_priv,Create_priv,Drop_priv,Index_Priv,Alter_priv,Lock_tables_priv)";
+		$sql.= " VALUES ('".$this->escape($dolibarr_main_db_host)."','".$this->escape($dolibarr_main_db_user)."',password('".addslashes($dolibarr_main_db_pass)."')";
+		$sql.= ",'Y','Y','Y','Y','Y','Y','Y','Y','Y')";
+
+		dol_syslog(get_class($this)."::DDLCreateUser", LOG_DEBUG);	// No sql to avoid password in log
+		$resql=$this->query($sql);
+		if (! $resql)
+		{
+			return -1;
+		}
+
+		$sql = "INSERT INTO db ";
+		$sql.= "(Host,Db,User,Select_priv,Insert_priv,Update_priv,Delete_priv,Create_priv,Drop_priv,Index_Priv,Alter_priv,Lock_tables_priv)";
+		$sql.= " VALUES ('".$this->escape($dolibarr_main_db_host)."','".$this->escape($dolibarr_main_db_name)."','".addslashes($dolibarr_main_db_user)."'";
+		$sql.= ",'Y','Y','Y','Y','Y','Y','Y','Y','Y')";
+
+		dol_syslog(get_class($this)."::DDLCreateUser", LOG_DEBUG);
+		$resql=$this->query($sql);
+		if (! $resql)
+		{
+			return -1;
+		}
+
+		$sql="FLUSH Privileges";
+
+		dol_syslog(get_class($this)."::DDLCreateUser", LOG_DEBUG);
+		$resql=$this->query($sql);
+		if (! $resql)
+		{
+			return -1;
+		}
+		return 1;
+	}
 
-    /**
+	/**
 	 *	Return charset used to store data in database
-     *
+	 *
 	 *	@return		string		Charset
-     */
-    function getDefaultCharacterSetDatabase()
-    {
-        return 'UTF-8';
-    }
+	 */
+	function getDefaultCharacterSetDatabase()
+	{
+		return 'UTF-8';
+	}
 
-    /**
+	/**
 	 *	Return list of available charset that can be used to store data in database
-     *
+	 *
 	 *	@return		array		List of Charset
-     */
-    function getListOfCharacterSet()
-    {
-        $liste = array();
-        $i=0;
-        $liste[$i]['charset'] = 'UTF-8';
-        $liste[$i]['description'] = 'UTF-8';
-        return $liste;
-    }
-
-    /**
+	 */
+	function getListOfCharacterSet()
+	{
+		$liste = array();
+		$i=0;
+		$liste[$i]['charset'] = 'UTF-8';
+		$liste[$i]['description'] = 'UTF-8';
+		return $liste;
+	}
+
+	/**
 	 *	Return collation used in database
-     *
+	 *
 	 *	@return		string		Collation value
-     */
-    function getDefaultCollationDatabase()
-    {
-        return 'UTF-8';
-    }
+	 */
+	function getDefaultCollationDatabase()
+	{
+		return 'UTF-8';
+	}
 
-    /**
+	/**
 	 *	Return list of available collation that can be used for database
-     *
+	 *
 	 *	@return		array		List of Collation
-     */
-    function getListOfCollation()
-    {
-        $liste = array();
-        $i=0;
-        $liste[$i]['charset'] = 'UTF-8';
-        $liste[$i]['description'] = 'UTF-8';
-        return $liste;
-    }
-
-    /**
+	 */
+	function getListOfCollation()
+	{
+		$liste = array();
+		$i=0;
+		$liste[$i]['charset'] = 'UTF-8';
+		$liste[$i]['description'] = 'UTF-8';
+		return $liste;
+	}
+
+	/**
 	 *	Return full path of dump program
-     *
+	 *
 	 *	@return		string		Full path of dump program
-     */
-    function getPathOfDump()
-    {
-	    // FIXME: not for SQLite
-        $fullpathofdump='/pathtomysqldump/mysqldump';
-
-        $resql=$this->query('SHOW VARIABLES LIKE \'basedir\'');
-        if ($resql)
-        {
-            $liste=$this->fetch_array($resql);
-            $basedir=$liste['Value'];
-            $fullpathofdump=$basedir.(preg_match('/\/$/',$basedir)?'':'/').'bin/mysqldump';
-        }
-        return $fullpathofdump;
-    }
+	 */
+	function getPathOfDump()
+	{
+		// FIXME: not for SQLite
+		$fullpathofdump='/pathtomysqldump/mysqldump';
+
+		$resql=$this->query('SHOW VARIABLES LIKE \'basedir\'');
+		if ($resql)
+		{
+			$liste=$this->fetch_array($resql);
+			$basedir=$liste['Value'];
+			$fullpathofdump=$basedir.(preg_match('/\/$/',$basedir)?'':'/').'bin/mysqldump';
+		}
+		return $fullpathofdump;
+	}
 
-    /**
+	/**
 	 *	Return full path of restore program
-     *
+	 *
 	 *	@return		string		Full path of restore program
-     */
-    function getPathOfRestore()
-    {
-	    // FIXME: not for SQLite
-        $fullpathofimport='/pathtomysql/mysql';
-
-        $resql=$this->query('SHOW VARIABLES LIKE \'basedir\'');
-        if ($resql)
-        {
-            $liste=$this->fetch_array($resql);
-            $basedir=$liste['Value'];
-            $fullpathofimport=$basedir.(preg_match('/\/$/',$basedir)?'':'/').'bin/mysql';
-        }
-        return $fullpathofimport;
-    }
+	 */
+	function getPathOfRestore()
+	{
+		// FIXME: not for SQLite
+		$fullpathofimport='/pathtomysql/mysql';
+
+		$resql=$this->query('SHOW VARIABLES LIKE \'basedir\'');
+		if ($resql)
+		{
+			$liste=$this->fetch_array($resql);
+			$basedir=$liste['Value'];
+			$fullpathofimport=$basedir.(preg_match('/\/$/',$basedir)?'':'/').'bin/mysql';
+		}
+		return $fullpathofimport;
+	}
 
-    /**
-     * Return value of server parameters
-     *
+	/**
+	 * Return value of server parameters
+	 *
 	 * @param	string	$filter		Filter list on a particular value
 	 * @return	array				Array of key-values (key=>value)
-     */
-    function getServerParametersValues($filter='')
-    {
-        $result=array();
-        static $pragmas;
-        if (! isset($pragmas)) {
-            // Définition de la liste des pragmas utilisés qui ne retournent qu'une seule valeur
-            // indépendante de la base de données.
-            // cf. http://www.sqlite.org/pragma.html
-            $pragmas = array(
-                'application_id', 'auto_vacuum', 'automatic_index', 'busy_timeout', 'cache_size',
-                'cache_spill', 'case_sensitive_like', 'checkpoint_fullsync', 'collation_list',
+	 */
+	function getServerParametersValues($filter='')
+	{
+		$result=array();
+		static $pragmas;
+		if (! isset($pragmas)) {
+			// Définition de la liste des pragmas utilisés qui ne retournent qu'une seule valeur
+			// indépendante de la base de données.
+			// cf. http://www.sqlite.org/pragma.html
+			$pragmas = array(
+				'application_id', 'auto_vacuum', 'automatic_index', 'busy_timeout', 'cache_size',
+				'cache_spill', 'case_sensitive_like', 'checkpoint_fullsync', 'collation_list',
 				'compile_options', 'data_version',	/*'database_list',*/
-                'defer_foreign_keys', 'encoding', 'foreign_key_check', 'freelist_count',
-                'full_column_names', 'fullsync', 'ingore_check_constraints', 'integrity_check',
-                'journal_mode', 'journal_size_limit', 'legacy_file_format', 'locking_mode',
-                'max_page_count', 'page_count', 'page_size', 'parser_trace',
-                'query_only', 'quick_check', 'read_uncommitted', 'recursive_triggers',
-                'reverse_unordered_selects', 'schema_version', 'user_version',
-                'secure_delete', 'short_column_names', 'shrink_memory', 'soft_heap_limit',
-                'synchronous', 'temp_store', /*'temp_store_directory',*/ 'threads',
-                'vdbe_addoptrace', 'vdbe_debug', 'vdbe_listing', 'vdbe_trace',
-                'wal_autocheckpoint',
-            );
-        }
-
-        // TODO prendre en compte le filtre
-        foreach($pragmas as $var) {
-            $sql = "PRAGMA $var";
-            $resql=$this->query($sql);
-            if ($resql)
-            {
-                $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 {
-                // TODO Récupérer le message
-                $result[$var] = 'FAIL';
-            }
-        }
-        return $result;
-    }
+				'defer_foreign_keys', 'encoding', 'foreign_key_check', 'freelist_count',
+				'full_column_names', 'fullsync', 'ingore_check_constraints', 'integrity_check',
+				'journal_mode', 'journal_size_limit', 'legacy_file_format', 'locking_mode',
+				'max_page_count', 'page_count', 'page_size', 'parser_trace',
+				'query_only', 'quick_check', 'read_uncommitted', 'recursive_triggers',
+				'reverse_unordered_selects', 'schema_version', 'user_version',
+				'secure_delete', 'short_column_names', 'shrink_memory', 'soft_heap_limit',
+				'synchronous', 'temp_store', /*'temp_store_directory',*/ 'threads',
+				'vdbe_addoptrace', 'vdbe_debug', 'vdbe_listing', 'vdbe_trace',
+				'wal_autocheckpoint',
+			);
+		}
+
+		// TODO prendre en compte le filtre
+		foreach($pragmas as $var) {
+			$sql = "PRAGMA $var";
+			$resql=$this->query($sql);
+			if ($resql)
+			{
+				$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 {
+				// TODO Récupérer le message
+				$result[$var] = 'FAIL';
+			}
+		}
+		return $result;
+	}
 
-    /**
-     * Return value of server status
-     *
+	/**
+	 * Return value of server status
+	 *
 	 * @param	string	$filter		Filter list on a particular value
 	 * @return  array				Array of key-values (key=>value)
-     */
-    function getServerStatusValues($filter='')
-    {
-        $result=array();
-        /*
+	 */
+	function getServerStatusValues($filter='')
+	{
+		$result=array();
+		/*
         $sql='SHOW STATUS';
         if ($filter) $sql.=" LIKE '".$this->escape($filter)."'";
         $resql=$this->query($sql);
@@ -1264,79 +1264,79 @@ 
         }
          */
 
-        return $result;
-    }
-
-    /**
-     * Permet le chargement d'une fonction personnalisee dans le moteur de base de donnees.
-     * Note: le nom de la fonction personnalisee est prefixee par 'db'. La fonction doit être
-     * statique et publique. Le nombre de parametres est determine automatiquement.
-     *
-     * @param 	string 	$name 			Le nom de la fonction a definir dans Sqlite
-     * @param	int		$arg_count		Arg count
-     * @return	void
-     */
-    private function addCustomFunction($name, $arg_count = -1)
-    {
-        if ($this->db)
-        {
-        	$newname=preg_replace('/_/','',$name);
-            $localname = __CLASS__ . '::' . 'db' . $newname;
-            $reflectClass = new ReflectionClass(__CLASS__);
-            $reflectFunction = $reflectClass->getMethod('db' . $newname);
-            if ($arg_count < 0) {
-                $arg_count = $reflectFunction->getNumberOfParameters();
-            }
-            if (!$this->db->createFunction($name, $localname, $arg_count))
-            {
-                $this->error = "unable to create custom function '$name'";
-            }
-        }
-    }
-
-    /**
-     * calc_daynr
-     *
-     * @param 	int 	$year		Year
-     * @param 	int 	$month		Month
-     * @param	int     $day 		Day
-     * @return int Formatted date
-     */
-    private static function calc_daynr($year, $month, $day) {
-        $y = $year;
-        if ($y == 0 && $month == 0) return 0;
-        $num = (365* $y + 31 * ($month - 1) + $day);
-        if ($month <= 2) {
-            $y--; }
-        else {
-            $num -= floor(($month * 4 + 23) / 10);
-        }
-        $temp = floor(($y / 100 + 1) * 3 / 4);
-        return $num + floor($y / 4) - $temp;
-    }
-
-    /**
-     * calc_weekday
-     *
-     * @param int	$daynr							???
-     * @param bool	$sunday_first_day_of_week		???
-     * @return int
-     */
-    private static function calc_weekday($daynr, $sunday_first_day_of_week) {
-      $ret = floor(($daynr + 5 + ($sunday_first_day_of_week ? 1 : 0)) % 7);
-      return $ret;
-    }
-
-    /**
-     * calc_days_in_year
-     *
-     * @param 	string	$year		Year
-     * @return	int					Nb of days in year
-     */
-    private static function calc_days_in_year($year)
-    {
-      return (($year & 3) == 0 && ($year%100 || ($year%400 == 0 && $year)) ? 366 : 365);
-    }
+		return $result;
+	}
+
+	/**
+	 * Permet le chargement d'une fonction personnalisee dans le moteur de base de donnees.
+	 * Note: le nom de la fonction personnalisee est prefixee par 'db'. La fonction doit être
+	 * statique et publique. Le nombre de parametres est determine automatiquement.
+	 *
+	 * @param 	string 	$name 			Le nom de la fonction a definir dans Sqlite
+	 * @param	int		$arg_count		Arg count
+	 * @return	void
+	 */
+	private function addCustomFunction($name, $arg_count = -1)
+	{
+		if ($this->db)
+		{
+			$newname=preg_replace('/_/','',$name);
+			$localname = __CLASS__ . '::' . 'db' . $newname;
+			$reflectClass = new ReflectionClass(__CLASS__);
+			$reflectFunction = $reflectClass->getMethod('db' . $newname);
+			if ($arg_count < 0) {
+				$arg_count = $reflectFunction->getNumberOfParameters();
+			}
+			if (!$this->db->createFunction($name, $localname, $arg_count))
+			{
+				$this->error = "unable to create custom function '$name'";
+			}
+		}
+	}
+
+	/**
+	 * calc_daynr
+	 *
+	 * @param 	int 	$year		Year
+	 * @param 	int 	$month		Month
+	 * @param	int     $day 		Day
+	 * @return int Formatted date
+	 */
+	private static function calc_daynr($year, $month, $day) {
+		$y = $year;
+		if ($y == 0 && $month == 0) return 0;
+		$num = (365* $y + 31 * ($month - 1) + $day);
+		if ($month <= 2) {
+			$y--; }
+		else {
+			$num -= floor(($month * 4 + 23) / 10);
+		}
+		$temp = floor(($y / 100 + 1) * 3 / 4);
+		return $num + floor($y / 4) - $temp;
+	}
+
+	/**
+	 * calc_weekday
+	 *
+	 * @param int	$daynr							???
+	 * @param bool	$sunday_first_day_of_week		???
+	 * @return int
+	 */
+	private static function calc_weekday($daynr, $sunday_first_day_of_week) {
+	  $ret = floor(($daynr + 5 + ($sunday_first_day_of_week ? 1 : 0)) % 7);
+	  return $ret;
+	}
+
+	/**
+	 * calc_days_in_year
+	 *
+	 * @param 	string	$year		Year
+	 * @return	int					Nb of days in year
+	 */
+	private static function calc_days_in_year($year)
+	{
+	  return (($year & 3) == 0 && ($year%100 || ($year%400 == 0 && $year)) ? 366 : 365);
+	}
 
 	/**
 	 * calc_week
@@ -1348,44 +1348,44 @@ 
 	 * @param 	string	$calc_year			???
 	 * @return	string						???
 	 */
-    private static function calc_week($year, $month, $day, $week_behaviour, &$calc_year) {
-        $daynr=self::calc_daynr($year,$month,$day);
-        $first_daynr=self::calc_daynr($year,1,1);
-        $monday_first= ($week_behaviour & self::WEEK_MONDAY_FIRST) ? 1 : 0;
-        $week_year= ($week_behaviour & self::WEEK_YEAR) ? 1 : 0;
-        $first_weekday= ($week_behaviour & self::WEEK_FIRST_WEEKDAY) ? 1 : 0;
-
-        $weekday=self::calc_weekday($first_daynr, !$monday_first);
-        $calc_year=$year;
-
-        if ($month == 1 && $day <= 7-$weekday)
-        {
-            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));
-            $weekday= ($weekday + 53*7- $days) % 7;
-      }
-
-      if (($first_weekday && $weekday != 0) || (!$first_weekday && $weekday >= 4)) {
-        $days= $daynr - ($first_daynr+ (7-$weekday));
-      }
-      else {
-        $days= $daynr - ($first_daynr - $weekday);
-      }
-
-      if ($week_year && $days >= 52*7)
-      {
-        $weekday= ($weekday + self::calc_days_in_year($calc_year)) % 7;
-        if ((!$first_weekday && $weekday < 4) || ($first_weekday && $weekday == 0))
-        {
-          $calc_year++;
-          return 1;
-        }
-      }
-      return floor($days/7+1);
-    }
+	private static function calc_week($year, $month, $day, $week_behaviour, &$calc_year) {
+		$daynr=self::calc_daynr($year,$month,$day);
+		$first_daynr=self::calc_daynr($year,1,1);
+		$monday_first= ($week_behaviour & self::WEEK_MONDAY_FIRST) ? 1 : 0;
+		$week_year= ($week_behaviour & self::WEEK_YEAR) ? 1 : 0;
+		$first_weekday= ($week_behaviour & self::WEEK_FIRST_WEEKDAY) ? 1 : 0;
+
+		$weekday=self::calc_weekday($first_daynr, !$monday_first);
+		$calc_year=$year;
+
+		if ($month == 1 && $day <= 7-$weekday)
+		{
+			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));
+			$weekday= ($weekday + 53*7- $days) % 7;
+	  }
+
+	  if (($first_weekday && $weekday != 0) || (!$first_weekday && $weekday >= 4)) {
+		$days= $daynr - ($first_daynr+ (7-$weekday));
+	  }
+	  else {
+		$days= $daynr - ($first_daynr - $weekday);
+	  }
+
+	  if ($week_year && $days >= 52*7)
+	  {
+		$weekday= ($weekday + self::calc_days_in_year($calc_year)) % 7;
+		if ((!$first_weekday && $weekday < 4) || ($first_weekday && $weekday == 0))
+		{
+		  $calc_year++;
+		  return 1;
+		}
+	  }
+	  return floor($days/7+1);
+	}
 
 }
 

Spacing +253 added lines, -253 removed lines

@@ -25,7 +25,7 @@ 
  *	\brief      Class file to manage Dolibarr database access for a SQLite database
  */
 
-require_once DOL_DOCUMENT_ROOT .'/core/db/DoliDB.class.php';
+require_once DOL_DOCUMENT_ROOT.'/core/db/DoliDB.class.php';
 
 /**
  *	Class to manage Dolibarr database access for a SQLite database
@@ -33,17 +33,17 @@ 
 class DoliDBSqlite3 extends DoliDB
 {
     //! Database type
-    public $type='sqlite3';
+    public $type = 'sqlite3';
     //! Database label
-    const LABEL='Sqlite3';
+    const LABEL = 'Sqlite3';
     //! Version min database
-    const VERSIONMIN='3.0.0';
+    const VERSIONMIN = '3.0.0';
 	/** @var SQLite3Result Resultset of last query */
 	private $_results;
 
-    const WEEK_MONDAY_FIRST=1;
+    const WEEK_MONDAY_FIRST = 1;
     const WEEK_YEAR = 2;
-    const WEEK_FIRST_WEEKDAY=4;
+    const WEEK_FIRST_WEEKDAY = 4;
 
 
     /**
@@ -57,19 +57,19 @@ 
 	 *	@param	    string	$name		Nom de la database
 	 *	@param	    int		$port		Port of database server
      */
-    function __construct($type, $host, $user, $pass, $name='', $port=0)
+    function __construct($type, $host, $user, $pass, $name = '', $port = 0)
     {
         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;
-        $this->database_port=$port;
+        $this->database_user = $user;
+        $this->database_host = $host;
+        $this->database_port = $port;
 
-        $this->transaction_opened=0;
+        $this->transaction_opened = 0;
 
         //print "Name DB: $host,$user,$pass,$name<br>";
 
@@ -120,7 +120,7 @@ 
             $this->database_selected = false;
             $this->database_name = '';
             //$this->error=sqlite_connect_error();
-            dol_syslog(get_class($this)."::DoliDBSqlite3 : Error Connect ".$this->error,LOG_ERR);
+            dol_syslog(get_class($this)."::DoliDBSqlite3 : Error Connect ".$this->error, LOG_ERR);
         }
 
         return $this->ok;
@@ -134,14 +134,14 @@ 
      *  @param     string	$type	Type of SQL order ('ddl' for insert, update, select, delete or 'dml' for create, alter...)
      *  @return    string   		SQL request line converted
      */
-    static function convertSQLFromMysql($line,$type='ddl')
+    static function convertSQLFromMysql($line, $type = 'ddl')
     {
         // Removed empty line if this is a comment line for SVN tagging
-        if (preg_match('/^--\s\$Id/i',$line)) {
+        if (preg_match('/^--\s\$Id/i', $line)) {
             return '';
         }
         // Return line if this is a comment
-        if (preg_match('/^#/i',$line) || preg_match('/^$/i',$line) || preg_match('/^--/i',$line))
+        if (preg_match('/^#/i', $line) || preg_match('/^$/i', $line) || preg_match('/^--/i', $line))
         {
             return $line;
         }
@@ -149,114 +149,114 @@ 
         {
             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')
             {
-                $line=preg_replace('/\s/',' ',$line);   // Replace tabulation with space
+                $line = preg_replace('/\s/', ' ', $line); // Replace tabulation with space
 
                 // we are inside create table statement so lets process datatypes
-                if (preg_match('/(ISAM|innodb)/i',$line)) { // end of create table sequence
-                    $line=preg_replace('/\)[\s\t]*type[\s\t]*=[\s\t]*(MyISAM|innodb);/i',');',$line);
-                    $line=preg_replace('/\)[\s\t]*engine[\s\t]*=[\s\t]*(MyISAM|innodb);/i',');',$line);
-                    $line=preg_replace('/,$/','',$line);
+                if (preg_match('/(ISAM|innodb)/i', $line)) { // end of create table sequence
+                    $line = preg_replace('/\)[\s\t]*type[\s\t]*=[\s\t]*(MyISAM|innodb);/i', ');', $line);
+                    $line = preg_replace('/\)[\s\t]*engine[\s\t]*=[\s\t]*(MyISAM|innodb);/i', ');', $line);
+                    $line = preg_replace('/,$/', '', $line);
                 }
 
                 // Process case: "CREATE TABLE llx_mytable(rowid integer NOT NULL AUTO_INCREMENT PRIMARY KEY,code..."
-                if (preg_match('/[\s\t\(]*(\w*)[\s\t]+int.*auto_increment/i',$line,$reg)) {
-                    $newline=preg_replace('/([\s\t\(]*)([a-zA-Z_0-9]*)[\s\t]+int.*auto_increment[^,]*/i','\\1 \\2 integer PRIMARY KEY AUTOINCREMENT',$line);
+                if (preg_match('/[\s\t\(]*(\w*)[\s\t]+int.*auto_increment/i', $line, $reg)) {
+                    $newline = preg_replace('/([\s\t\(]*)([a-zA-Z_0-9]*)[\s\t]+int.*auto_increment[^,]*/i', '\\1 \\2 integer PRIMARY KEY AUTOINCREMENT', $line);
                     //$line = "-- ".$line." replaced by --\n".$newline;
-                    $line=$newline;
+                    $line = $newline;
                 }
 
                 // tinyint type conversion
-                $line=str_replace('tinyint','smallint',$line);
+                $line = str_replace('tinyint', 'smallint', $line);
 
                 // nuke unsigned
-                $line=preg_replace('/(int\w+|smallint)\s+unsigned/i','\\1',$line);
+                $line = preg_replace('/(int\w+|smallint)\s+unsigned/i', '\\1', $line);
 
                 // blob -> text
-                $line=preg_replace('/\w*blob/i','text',$line);
+                $line = preg_replace('/\w*blob/i', 'text', $line);
 
                 // tinytext/mediumtext -> text
-                $line=preg_replace('/tinytext/i','text',$line);
-                $line=preg_replace('/mediumtext/i','text',$line);
+                $line = preg_replace('/tinytext/i', 'text', $line);
+                $line = preg_replace('/mediumtext/i', 'text', $line);
 
                 // change not null datetime field to null valid ones
                 // (to support remapping of "zero time" to null
-                $line=preg_replace('/datetime not null/i','datetime',$line);
-                $line=preg_replace('/datetime/i','timestamp',$line);
+                $line = preg_replace('/datetime not null/i', 'datetime', $line);
+                $line = preg_replace('/datetime/i', 'timestamp', $line);
 
                 // double -> numeric
-                $line=preg_replace('/^double/i','numeric',$line);
-                $line=preg_replace('/(\s*)double/i','\\1numeric',$line);
+                $line = preg_replace('/^double/i', 'numeric', $line);
+                $line = preg_replace('/(\s*)double/i', '\\1numeric', $line);
                 // float -> numeric
-                $line=preg_replace('/^float/i','numeric',$line);
-                $line=preg_replace('/(\s*)float/i','\\1numeric',$line);
+                $line = preg_replace('/^float/i', 'numeric', $line);
+                $line = preg_replace('/(\s*)float/i', '\\1numeric', $line);
 
                 // unique index(field1,field2)
-                if (preg_match('/unique index\s*\((\w+\s*,\s*\w+)\)/i',$line))
+                if (preg_match('/unique index\s*\((\w+\s*,\s*\w+)\)/i', $line))
                 {
-                    $line=preg_replace('/unique index\s*\((\w+\s*,\s*\w+)\)/i','UNIQUE\(\\1\)',$line);
+                    $line = preg_replace('/unique index\s*\((\w+\s*,\s*\w+)\)/i', 'UNIQUE\(\\1\)', $line);
                 }
 
                 // We remove end of requests "AFTER fieldxxx"
-                $line=preg_replace('/AFTER [a-z0-9_]+/i','',$line);
+                $line = preg_replace('/AFTER [a-z0-9_]+/i', '', $line);
 
                 // We remove start of requests "ALTER TABLE tablexxx" if this is a DROP INDEX
-                $line=preg_replace('/ALTER TABLE [a-z0-9_]+ DROP INDEX/i','DROP INDEX',$line);
+                $line = preg_replace('/ALTER TABLE [a-z0-9_]+ DROP INDEX/i', 'DROP INDEX', $line);
 
                 // Translate order to rename fields
-                if (preg_match('/ALTER TABLE ([a-z0-9_]+) CHANGE(?: COLUMN)? ([a-z0-9_]+) ([a-z0-9_]+)(.*)$/i',$line,$reg))
+                if (preg_match('/ALTER TABLE ([a-z0-9_]+) CHANGE(?: COLUMN)? ([a-z0-9_]+) ([a-z0-9_]+)(.*)$/i', $line, $reg))
                 {
                     $line = "-- ".$line." replaced by --\n";
-                    $line.= "ALTER TABLE ".$reg[1]." RENAME COLUMN ".$reg[2]." TO ".$reg[3];
+                    $line .= "ALTER TABLE ".$reg[1]." RENAME COLUMN ".$reg[2]." TO ".$reg[3];
                 }
 
                 // Translate order to modify field format
-                if (preg_match('/ALTER TABLE ([a-z0-9_]+) MODIFY(?: COLUMN)? ([a-z0-9_]+) (.*)$/i',$line,$reg))
+                if (preg_match('/ALTER TABLE ([a-z0-9_]+) MODIFY(?: COLUMN)? ([a-z0-9_]+) (.*)$/i', $line, $reg))
                 {
                     $line = "-- ".$line." replaced by --\n";
-                    $newreg3=$reg[3];
-                    $newreg3=preg_replace('/ DEFAULT NULL/i','',$newreg3);
-                    $newreg3=preg_replace('/ NOT NULL/i','',$newreg3);
-                    $newreg3=preg_replace('/ NULL/i','',$newreg3);
-                    $newreg3=preg_replace('/ DEFAULT 0/i','',$newreg3);
-                    $newreg3=preg_replace('/ DEFAULT \'[0-9a-zA-Z_@]*\'/i','',$newreg3);
-                    $line.= "ALTER TABLE ".$reg[1]." ALTER COLUMN ".$reg[2]." TYPE ".$newreg3;
+                    $newreg3 = $reg[3];
+                    $newreg3 = preg_replace('/ DEFAULT NULL/i', '', $newreg3);
+                    $newreg3 = preg_replace('/ NOT NULL/i', '', $newreg3);
+                    $newreg3 = preg_replace('/ NULL/i', '', $newreg3);
+                    $newreg3 = preg_replace('/ DEFAULT 0/i', '', $newreg3);
+                    $newreg3 = preg_replace('/ DEFAULT \'[0-9a-zA-Z_@]*\'/i', '', $newreg3);
+                    $line .= "ALTER TABLE ".$reg[1]." ALTER COLUMN ".$reg[2]." TYPE ".$newreg3;
                     // TODO Add alter to set default value or null/not null if there is this in $reg[3]
                 }
 
                 // alter table add primary key (field1, field2 ...) -> We create a unique index instead as dynamic creation of primary key is not supported
                 // ALTER TABLE llx_dolibarr_modules ADD PRIMARY KEY pk_dolibarr_modules (numero, entity);
-                if (preg_match('/ALTER\s+TABLE\s*(.*)\s*ADD\s+PRIMARY\s+KEY\s*(.*)\s*\((.*)$/i',$line,$reg))
+                if (preg_match('/ALTER\s+TABLE\s*(.*)\s*ADD\s+PRIMARY\s+KEY\s*(.*)\s*\((.*)$/i', $line, $reg))
                 {
                     $line = "-- ".$line." replaced by --\n";
-                    $line.= "CREATE UNIQUE INDEX ".$reg[2]." ON ".$reg[1]."(".$reg[3];
+                    $line .= "CREATE UNIQUE INDEX ".$reg[2]." ON ".$reg[1]."(".$reg[3];
                 }
 
                 // Translate order to drop foreign keys
                 // ALTER TABLE llx_dolibarr_modules DROP FOREIGN KEY fk_xxx;
-                if (preg_match('/ALTER\s+TABLE\s*(.*)\s*DROP\s+FOREIGN\s+KEY\s*(.*)$/i',$line,$reg))
+                if (preg_match('/ALTER\s+TABLE\s*(.*)\s*DROP\s+FOREIGN\s+KEY\s*(.*)$/i', $line, $reg))
                 {
                     $line = "-- ".$line." replaced by --\n";
-                    $line.= "ALTER TABLE ".$reg[1]." DROP CONSTRAINT ".$reg[2];
+                    $line .= "ALTER TABLE ".$reg[1]." DROP CONSTRAINT ".$reg[2];
                 }
 
                 // alter table add [unique] [index] (field1, field2 ...)
                 // ALTER TABLE llx_accountingaccount ADD INDEX idx_accountingaccount_fk_pcg_version (fk_pcg_version)
-                if (preg_match('/ALTER\s+TABLE\s*(.*)\s*ADD\s+(UNIQUE INDEX|INDEX|UNIQUE)\s+(.*)\s*\(([\w,\s]+)\)/i',$line,$reg))
+                if (preg_match('/ALTER\s+TABLE\s*(.*)\s*ADD\s+(UNIQUE INDEX|INDEX|UNIQUE)\s+(.*)\s*\(([\w,\s]+)\)/i', $line, $reg))
                 {
-                    $fieldlist=$reg[4];
-                    $idxname=$reg[3];
-                    $tablename=$reg[1];
+                    $fieldlist = $reg[4];
+                    $idxname = $reg[3];
+                    $tablename = $reg[1];
                     $line = "-- ".$line." replaced by --\n";
-                    $line.= "CREATE ".(preg_match('/UNIQUE/',$reg[2])?'UNIQUE ':'')."INDEX ".$idxname." ON ".$tablename." (".$fieldlist.")";
+                    $line .= "CREATE ".(preg_match('/UNIQUE/', $reg[2]) ? 'UNIQUE ' : '')."INDEX ".$idxname." ON ".$tablename." (".$fieldlist.")";
                 }
-                if (preg_match('/ALTER\s+TABLE\s*(.*)\s*ADD\s+CONSTRAINT\s+(.*)\s*FOREIGN\s+KEY\s*\(([\w,\s]+)\)\s*REFERENCES\s+(\w+)\s*\(([\w,\s]+)\)/i',$line, $reg)) {
+                if (preg_match('/ALTER\s+TABLE\s*(.*)\s*ADD\s+CONSTRAINT\s+(.*)\s*FOREIGN\s+KEY\s*\(([\w,\s]+)\)\s*REFERENCES\s+(\w+)\s*\(([\w,\s]+)\)/i', $line, $reg)) {
                     // Pour l'instant les contraintes ne sont pas créées
                     dol_syslog(get_class().'::query line emptied');
                     $line = 'SELECT 0;';
@@ -270,24 +270,24 @@ 
 
             // Delete using criteria on other table must not declare twice the deleted table
             // 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 (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
                 {
-                    $line=preg_replace('/DELETE FROM ([a-z_]+) USING ([a-z_]+), ([a-z_]+)/i','DELETE FROM \\1 USING \\3', $line);
+                    $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 one table
-            $line=preg_replace('/FROM\s*\((([a-z_]+)\s+as\s+([a-z_]+)\s*)\)/i','FROM \\1',$line);
+            $line = preg_replace('/FROM\s*\((([a-z_]+)\s+as\s+([a-z_]+)\s*)\)/i', 'FROM \\1', $line);
             //print $line."\n";
 
             // Remove () in the tables in FROM if two table
-            $line=preg_replace('/FROM\s*\(([a-z_]+\s+as\s+[a-z_]+)\s*,\s*([a-z_]+\s+as\s+[a-z_]+\s*)\)/i','FROM \\1, \\2',$line);
+            $line = preg_replace('/FROM\s*\(([a-z_]+\s+as\s+[a-z_]+)\s*,\s*([a-z_]+\s+as\s+[a-z_]+\s*)\)/i', 'FROM \\1, \\2', $line);
             //print $line."\n";
 
             // Remove () in the tables in FROM if two table
-            $line=preg_replace('/FROM\s*\(([a-z_]+\s+as\s+[a-z_]+)\s*,\s*([a-z_]+\s+as\s+[a-z_]+\s*),\s*([a-z_]+\s+as\s+[a-z_]+\s*)\)/i','FROM \\1, \\2, \\3',$line);
+            $line = preg_replace('/FROM\s*\(([a-z_]+\s+as\s+[a-z_]+)\s*,\s*([a-z_]+\s+as\s+[a-z_]+\s*),\s*([a-z_]+\s+as\s+[a-z_]+\s*)\)/i', 'FROM \\1, \\2, \\3', $line);
             //print $line."\n";
 
             //print "type=".$type." newline=".$line."<br>\n";
@@ -322,14 +322,14 @@ 
 	 *	@return		SQLite3				Database access handler
 	 *	@see		close
      */
-    function connect($host, $login, $passwd, $name, $port=0)
+    function connect($host, $login, $passwd, $name, $port = 0)
     {
         global $main_data_dir;
 
-        dol_syslog(get_class($this)."::connect name=".$name,LOG_DEBUG);
+        dol_syslog(get_class($this)."::connect name=".$name, LOG_DEBUG);
 
-        $dir=$main_data_dir;
-        if (empty($dir)) $dir=DOL_DATA_ROOT;
+        $dir = $main_data_dir;
+        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';
@@ -339,9 +339,9 @@ 
 			$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;
+            $this->error = self::LABEL.' '.$e->getMessage().' current dir='.$database_name;
             return '';
         }
 
@@ -357,7 +357,7 @@ 
      */
     function getVersion()
     {
-    	$tmp=$this->db->version();
+    	$tmp = $this->db->version();
         return $tmp['versionString'];
     }
 
@@ -382,10 +382,10 @@ 
     {
         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);
-            $this->connected=false;
+            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
+            unset($this->db); // Clean this->db
             return true;
         }
         return false;
@@ -400,14 +400,14 @@ 
      *  @param  string	$type           Type of SQL order ('ddl' for insert, update, select, delete or 'dml' for create, alter...)
      *	@return	SQLite3Result			Resultset of answer
      */
-    function query($query,$usesavepoint=0,$type='auto')
+    function query($query, $usesavepoint = 0, $type = 'auto')
     {
-        $ret=null;
+        $ret = null;
         $query = trim($query);
         $this->error = 0;
 
         // Convert MySQL syntax to SQLite syntax
-        if (preg_match('/ALTER\s+TABLE\s*(.*)\s*ADD\s+CONSTRAINT\s+(.*)\s*FOREIGN\s+KEY\s*\(([\w,\s]+)\)\s*REFERENCES\s+(\w+)\s*\(([\w,\s]+)\)/i',$query, $reg)) {
+        if (preg_match('/ALTER\s+TABLE\s*(.*)\s*ADD\s+CONSTRAINT\s+(.*)\s*FOREIGN\s+KEY\s*\(([\w,\s]+)\)\s*REFERENCES\s+(\w+)\s*\(([\w,\s]+)\)/i', $query, $reg)) {
             // Ajout d'une clef étrangère à la table
             // procédure de remplacement de la table pour ajouter la contrainte
             // Exemple : ALTER TABLE llx_adherent ADD CONSTRAINT adherent_fk_soc FOREIGN KEY (fk_soc) REFERENCES llx_societe (rowid)
@@ -415,19 +415,19 @@ 
             $foreignFields = $reg[5];
             $foreignTable = $reg[4];
             $localfields = $reg[3];
-            $constraintname=trim($reg[2]);
-            $tablename=trim($reg[1]);
+            $constraintname = trim($reg[2]);
+            $tablename = trim($reg[1]);
 
-            $descTable = $this->db->querySingle("SELECT sql FROM sqlite_master WHERE name='" . $tablename . "'");
+            $descTable = $this->db->querySingle("SELECT sql FROM sqlite_master WHERE name='".$tablename."'");
 
             // 1- Renommer la table avec un nom temporaire
-            $this->query('ALTER TABLE ' . $tablename . ' RENAME TO tmp_' . $tablename);
+            $this->query('ALTER TABLE '.$tablename.' RENAME TO tmp_'.$tablename);
 
             // 2- Recréer la table avec la contrainte ajoutée
 
             // on bricole la requete pour ajouter la contrainte
             $descTable = substr($descTable, 0, strlen($descTable) - 1);
-            $descTable .= ", CONSTRAINT " . $constraintname . " FOREIGN KEY (" . $localfields . ") REFERENCES " .$foreignTable . "(" . $foreignFields . ")";
+            $descTable .= ", CONSTRAINT ".$constraintname." FOREIGN KEY (".$localfields.") REFERENCES ".$foreignTable."(".$foreignFields.")";
 
             // fermeture de l'instruction
             $descTable .= ')';
@@ -436,16 +436,16 @@ 
             $this->query($descTable);
 
             // 3- Transférer les données
-            $this->query('INSERT INTO ' . $tablename . ' SELECT * FROM tmp_' . $tablename);
+            $this->query('INSERT INTO '.$tablename.' SELECT * FROM tmp_'.$tablename);
 
             // 4- Supprimer la table temporaire
-            $this->query('DROP TABLE tmp_' . $tablename);
+            $this->query('DROP TABLE tmp_'.$tablename);
 
             // dummy statement
-            $query="SELECT 0";
+            $query = "SELECT 0";
 
         } else {
-            $query=$this->convertSQLFromMysql($query,$type);
+            $query = $this->convertSQLFromMysql($query, $type);
         }
         //print "After convertSQLFromMysql:\n".$query."<br>\n";
 
@@ -454,20 +454,20 @@ 
         // Ordre SQL ne necessitant pas de connexion a une base (exemple: CREATE DATABASE)
         try {
             //$ret = $this->db->exec($query);
-            $ret = $this->db->query($query);        // $ret is a Sqlite3Result
+            $ret = $this->db->query($query); // $ret is a Sqlite3Result
             if ($ret) {
                 $ret->queryString = $query;
             }
         }
-        catch(Exception $e)
+        catch (Exception $e)
         {
-            $this->error=$this->db->lastErrorMsg();
+            $this->error = $this->db->lastErrorMsg();
         }
 
-        if (! preg_match("/^COMMIT/i",$query) && ! preg_match("/^ROLLBACK/i",$query))
+        if (!preg_match("/^COMMIT/i", $query) && !preg_match("/^ROLLBACK/i", $query))
         {
             // Si requete utilisateur, on la sauvegarde ainsi que son resultset
-            if (! is_object($ret) || $this->error)
+            if (!is_object($ret) || $this->error)
             {
                 $this->lastqueryerror = $query;
                 $this->lasterror = $this->error();
@@ -477,13 +477,13 @@ 
 
                 $errormsg = get_class($this)."::query SQL Error message: ".$this->lasterror;
 
-                if (preg_match('/[0-9]/',$this->lasterrno)) {
+                if (preg_match('/[0-9]/', $this->lasterrno)) {
                     $errormsg .= ' ('.$this->lasterrno.')';
                 }
 
                 dol_syslog($errormsg, LOG_ERR);
             }
-            $this->lastquery=$query;
+            $this->lastquery = $query;
             $this->_results = $ret;
         }
 
@@ -499,7 +499,7 @@ 
     function fetch_object($resultset)
     {
         // Si le resultset n'est pas fourni, on prend le dernier utilise sur cette connexion
-        if (! is_object($resultset)) { $resultset=$this->_results; }
+        if (!is_object($resultset)) { $resultset = $this->_results; }
         //return $resultset->fetch(PDO::FETCH_OBJ);
         $ret = $resultset->fetchArray(SQLITE3_ASSOC);
         if ($ret) {
@@ -518,7 +518,7 @@ 
     function fetch_array($resultset)
     {
         // If resultset not provided, we take the last used by connexion
-        if (! is_object($resultset)) { $resultset=$this->_results; }
+        if (!is_object($resultset)) { $resultset = $this->_results; }
         //return $resultset->fetch(PDO::FETCH_ASSOC);
         $ret = $resultset->fetchArray(SQLITE3_ASSOC);
 	    return $ret;
@@ -533,9 +533,9 @@ 
     function fetch_row($resultset)
     {
         // If resultset not provided, we take the last used by connexion
-        if (! is_bool($resultset))
+        if (!is_bool($resultset))
         {
-            if (! is_object($resultset)) { $resultset=$this->_results; }
+            if (!is_object($resultset)) { $resultset = $this->_results; }
             return $resultset->fetchArray(SQLITE3_NUM);
         }
         else
@@ -557,9 +557,9 @@ 
 	    // FIXME: SQLite3Result does not have a queryString member
 
         // If resultset not provided, we take the last used by connexion
-        if (! is_object($resultset)) { $resultset=$this->_results; }
+        if (!is_object($resultset)) { $resultset = $this->_results; }
         if (preg_match("/^SELECT/i", $resultset->queryString)) {
-            return $this->db->querySingle("SELECT count(*) FROM (" . $resultset->queryString . ") q");
+            return $this->db->querySingle("SELECT count(*) FROM (".$resultset->queryString.") q");
         }
         return 0;
     }
@@ -576,7 +576,7 @@ 
 	    // FIXME: SQLite3Result does not have a queryString member
 
         // If resultset not provided, we take the last used by connexion
-        if (! is_object($resultset)) { $resultset=$this->_results; }
+        if (!is_object($resultset)) { $resultset = $this->_results; }
         if (preg_match("/^SELECT/i", $resultset->queryString)) {
             return $this->num_rows($resultset);
         }
@@ -592,10 +592,10 @@ 
 	 *	@param  SQLite3Result	$resultset   Curseur de la requete voulue
 	 *	@return	void
      */
-    function free($resultset=null)
+    function free($resultset = null)
     {
         // If resultset not provided, we take the last used by connexion
-        if (! is_object($resultset)) { $resultset=$this->_results; }
+        if (!is_object($resultset)) { $resultset = $this->_results; }
         // Si resultset en est un, on libere la memoire
         if ($resultset && is_object($resultset)) $resultset->finalize();
     }
@@ -618,7 +618,7 @@ 
      */
     function errno()
     {
-        if (! $this->connected) {
+        if (!$this->connected) {
             // Si il y a eu echec de connexion, $this->db n'est pas valide.
             return 'DB_ERROR_FAILED_TO_CONNECT';
         }
@@ -656,23 +656,23 @@ 
             {
                 return $errorcode_map[$this->db->errorCode()];
             }*/
-            $errno=$this->db->lastErrorCode();
-			if ($errno=='HY000' || $errno == 0)
+            $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 ($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
             }
 
-            return ($errno?'DB_ERROR_'.$errno:'0');
+            return ($errno ? 'DB_ERROR_'.$errno : '0');
         }
     }
 
@@ -683,7 +683,7 @@ 
      */
     function error()
     {
-        if (! $this->connected) {
+        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';
         }
@@ -699,7 +699,7 @@ 
 	 * @param	string	$fieldid	Field name
 	 * @return  int     			Id of row
      */
-    function last_insert_id($tab,$fieldid='rowid')
+    function last_insert_id($tab, $fieldid = 'rowid')
     {
         return $this->db->lastInsertRowId();
     }
@@ -712,17 +712,17 @@ 
      *  @param	int		$withQuotes     Return string with quotes
      *  @return string          		XXX(field) or XXX('value') or field or 'value'
      */
-    function encrypt($fieldorvalue, $withQuotes=0)
+    function encrypt($fieldorvalue, $withQuotes = 0)
     {
         global $conf;
 
         // Type of encryption (2: AES (recommended), 1: DES , 0: no encryption)
-        $cryptType = ($conf->db->dolibarr_main_db_encryption?$conf->db->dolibarr_main_db_encryption:0);
+        $cryptType = ($conf->db->dolibarr_main_db_encryption ? $conf->db->dolibarr_main_db_encryption : 0);
 
         //Encryption key
-        $cryptKey = (!empty($conf->db->dolibarr_main_db_cryptkey)?$conf->db->dolibarr_main_db_cryptkey:'');
+        $cryptKey = (!empty($conf->db->dolibarr_main_db_cryptkey) ? $conf->db->dolibarr_main_db_cryptkey : '');
 
-        $return = ($withQuotes?"'":"").$this->escape($fieldorvalue).($withQuotes?"'":"");
+        $return = ($withQuotes ? "'" : "").$this->escape($fieldorvalue).($withQuotes ? "'" : "");
 
         if ($cryptType && !empty($cryptKey))
         {
@@ -750,10 +750,10 @@ 
         global $conf;
 
         // Type of encryption (2: AES (recommended), 1: DES , 0: no encryption)
-        $cryptType = ($conf->db->dolibarr_main_db_encryption?$conf->db->dolibarr_main_db_encryption:0);
+        $cryptType = ($conf->db->dolibarr_main_db_encryption ? $conf->db->dolibarr_main_db_encryption : 0);
 
         //Encryption key
-        $cryptKey = (!empty($conf->db->dolibarr_main_db_cryptkey)?$conf->db->dolibarr_main_db_cryptkey:'');
+        $cryptKey = (!empty($conf->db->dolibarr_main_db_cryptkey) ? $conf->db->dolibarr_main_db_cryptkey : '');
 
         $return = $value;
 
@@ -795,23 +795,23 @@ 
 	 * 	@param	string	$owner			Username of database owner
 	 * 	@return	SQLite3Result   		resource defined if OK, null if KO
      */
-    function DDLCreateDb($database,$charset='',$collation='',$owner='')
+    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;
-        $sql.= ' DEFAULT CHARACTER SET '.$charset.' DEFAULT COLLATE '.$collation;
+        $sql .= ' DEFAULT CHARACTER SET '.$charset.' DEFAULT COLLATE '.$collation;
 
-        dol_syslog($sql,LOG_DEBUG);
-        $ret=$this->query($sql);
-        if (! $ret)
+        dol_syslog($sql, LOG_DEBUG);
+        $ret = $this->query($sql);
+        if (!$ret)
         {
             // We try again for compatibility with Mysql < 4.1.1
             $sql = 'CREATE DATABASE '.$database;
-            $ret=$this->query($sql);
-            dol_syslog($sql,LOG_DEBUG);
+            $ret = $this->query($sql);
+            dol_syslog($sql, LOG_DEBUG);
         }
         return $ret;
     }
@@ -823,18 +823,18 @@ 
 	 *  @param	string		$table		Name of table filter ('xxx%')
 	 *  @return	array					List of tables in an array
      */
-    function DDLListTables($database, $table='')
+    function DDLListTables($database, $table = '')
     {
-        $listtables=array();
+        $listtables = array();
 
         $like = '';
         if ($table) $like = "LIKE '".$table."'";
-        $sql="SHOW TABLES FROM ".$database." ".$like.";";
+        $sql = "SHOW TABLES FROM ".$database." ".$like.";";
         //print $sql;
         $result = $this->query($sql);
         if ($result)
         {
-            while($row = $this->fetch_row($result))
+            while ($row = $this->fetch_row($result))
             {
                 $listtables[] = $row[0];
             }
@@ -851,15 +851,15 @@ 
      */
     function DDLInfoTable($table)
     {
-        $infotables=array();
+        $infotables = array();
 
-        $sql="SHOW FULL COLUMNS FROM ".$table.";";
+        $sql = "SHOW FULL COLUMNS FROM ".$table.";";
 
-        dol_syslog($sql,LOG_DEBUG);
+        dol_syslog($sql, LOG_DEBUG);
         $result = $this->query($sql);
         if ($result)
         {
-            while($row = $this->fetch_row($result))
+            while ($row = $this->fetch_row($result))
             {
                 $infotables[] = $row;
             }
@@ -879,68 +879,68 @@ 
 	 *	@param	    array	$keys 			Tableau des champs cles noms => valeur
 	 *	@return	    int						<0 if KO, >=0 if OK
      */
-    function DDLCreateTable($table,$fields,$primary_key,$type,$unique_keys=null,$fulltext_keys=null,$keys=null)
+    function DDLCreateTable($table, $fields, $primary_key, $type, $unique_keys = null, $fulltext_keys = null, $keys = null)
     {
 	    // FIXME: $fulltext_keys parameter is unused
 
         // cles recherchees dans le tableau des descriptions (fields) : type,value,attribute,null,default,extra
         // ex. : $fields['rowid'] = array('type'=>'int','value'=>'11','null'=>'not null','extra'=> 'auto_increment');
         $sql = "create table ".$table."(";
-        $i=0;
-        foreach($fields as $field_name => $field_desc)
+        $i = 0;
+        foreach ($fields as $field_name => $field_desc)
         {
             $sqlfields[$i] = $field_name." ";
             $sqlfields[$i]  .= $field_desc['type'];
-            if( preg_match("/^[^\s]/i",$field_desc['value']))
+            if (preg_match("/^[^\s]/i", $field_desc['value']))
             $sqlfields[$i]  .= "(".$field_desc['value'].")";
-            else if( preg_match("/^[^\s]/i",$field_desc['attribute']))
+            else if (preg_match("/^[^\s]/i", $field_desc['attribute']))
             $sqlfields[$i]  .= " ".$field_desc['attribute'];
-            else if( preg_match("/^[^\s]/i",$field_desc['default']))
+            else if (preg_match("/^[^\s]/i", $field_desc['default']))
             {
-                if(preg_match("/null/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']."'";
             }
-            else if( preg_match("/^[^\s]/i",$field_desc['null']))
+            else if (preg_match("/^[^\s]/i", $field_desc['null']))
             $sqlfields[$i]  .= " ".$field_desc['null'];
 
-            else if( preg_match("/^[^\s]/i",$field_desc['extra']))
+            else if (preg_match("/^[^\s]/i", $field_desc['extra']))
             $sqlfields[$i]  .= " ".$field_desc['extra'];
             $i++;
         }
-        if($primary_key != "")
+        if ($primary_key != "")
         $pk = "primary key(".$primary_key.")";
 
-        if(is_array($unique_keys))
+        if (is_array($unique_keys))
         {
             $i = 0;
-            foreach($unique_keys as $key => $value)
+            foreach ($unique_keys as $key => $value)
             {
                 $sqluq[$i] = "UNIQUE KEY '".$key."' ('".$value."')";
                 $i++;
             }
         }
-        if(is_array($keys))
+        if (is_array($keys))
         {
             $i = 0;
-            foreach($keys as $key => $value)
+            foreach ($keys as $key => $value)
             {
                 $sqlk[$i] = "KEY ".$key." (".$value.")";
                 $i++;
             }
         }
-        $sql .= implode(',',$sqlfields);
-        if($primary_key != "")
+        $sql .= implode(',', $sqlfields);
+        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))
+        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;
         return 1;
     }
@@ -955,7 +955,7 @@ 
     {
     	$sql = "DROP TABLE ".$table;
 
-    	if (! $this->query($sql))
+    	if (!$this->query($sql))
     		return -1;
     	else
     		return 1;
@@ -968,11 +968,11 @@ 
 	 *	@param	string		$field	Optionnel : Name of field if we want description of field
 	 *	@return	SQLite3Result		Resource
      */
-    function DDLDescTable($table,$field="")
+    function DDLDescTable($table, $field = "")
     {
-        $sql="DESC ".$table." ".$field;
+        $sql = "DESC ".$table." ".$field;
 
-        dol_syslog(get_class($this)."::DDLDescTable ".$sql,LOG_DEBUG);
+        dol_syslog(get_class($this)."::DDLDescTable ".$sql, LOG_DEBUG);
         $this->_results = $this->query($sql);
         return $this->_results;
     }
@@ -986,34 +986,34 @@ 
 	 *	@param	string	$field_position 	Optionnel ex.: "after champtruc"
 	 *	@return	int							<0 if KO, >0 if OK
      */
-    function DDLAddField($table,$field_name,$field_desc,$field_position="")
+    function DDLAddField($table, $field_name, $field_desc, $field_position = "")
     {
         // cles recherchees dans le tableau des descriptions (field_desc) : type,value,attribute,null,default,extra
         // 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')))
+        $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')))
         {
-            $sql.= "(".$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("/^[^\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'];
+            if (preg_match("/null/i", $field_desc['default']))
+            $sql .= " default ".$field_desc['default'];
             else
-            $sql.= " default '".$field_desc['default']."'";
+            $sql .= " default '".$field_desc['default']."'";
         }
-        if(preg_match("/^[^\s]/i",$field_desc['extra']))
-        $sql.= " ".$field_desc['extra'];
-        $sql.= " ".$field_position;
+        if (preg_match("/^[^\s]/i", $field_desc['extra']))
+        $sql .= " ".$field_desc['extra'];
+        $sql .= " ".$field_position;
 
-        dol_syslog(get_class($this)."::DDLAddField ".$sql,LOG_DEBUG);
-        if(! $this->query($sql))
+        dol_syslog(get_class($this)."::DDLAddField ".$sql, LOG_DEBUG);
+        if (!$this->query($sql))
         {
             return -1;
         }
@@ -1028,16 +1028,16 @@ 
 	 *	@param	string	$field_desc 		Array with description of field format
 	 *	@return	int							<0 if KO, >0 if OK
      */
-    function DDLUpdateField($table,$field_name,$field_desc)
+    function DDLUpdateField($table, $field_name, $field_desc)
     {
         $sql = "ALTER TABLE ".$table;
         $sql .= " MODIFY COLUMN ".$field_name." ".$field_desc['type'];
         if ($field_desc['type'] == 'tinyint' || $field_desc['type'] == 'int' || $field_desc['type'] == 'varchar') {
-            $sql.="(".$field_desc['value'].")";
+            $sql .= "(".$field_desc['value'].")";
         }
 
-        dol_syslog(get_class($this)."::DDLUpdateField ".$sql,LOG_DEBUG);
-        if (! $this->query($sql))
+        dol_syslog(get_class($this)."::DDLUpdateField ".$sql, LOG_DEBUG);
+        if (!$this->query($sql))
             return -1;
         return 1;
     }
@@ -1049,13 +1049,13 @@ 
 	 *	@param	string	$field_name 	Name of field to drop
 	 *	@return	int						<0 if KO, >0 if OK
      */
-    function DDLDropField($table,$field_name)
+    function DDLDropField($table, $field_name)
     {
-        $sql= "ALTER TABLE ".$table." DROP COLUMN `".$field_name."`";
-        dol_syslog(get_class($this)."::DDLDropField ".$sql,LOG_DEBUG);
-        if (! $this->query($sql))
+        $sql = "ALTER TABLE ".$table." DROP COLUMN `".$field_name."`";
+        dol_syslog(get_class($this)."::DDLDropField ".$sql, LOG_DEBUG);
+        if (!$this->query($sql))
         {
-            $this->error=$this->lasterror();
+            $this->error = $this->lasterror();
             return -1;
         }
         return 1;
@@ -1071,37 +1071,37 @@ 
 	 *	@param	string	$dolibarr_main_db_name		Database name where user must be granted
 	 *	@return	int									<0 if KO, >=0 if OK
      */
-    function DDLCreateUser($dolibarr_main_db_host,$dolibarr_main_db_user,$dolibarr_main_db_pass,$dolibarr_main_db_name)
+    function DDLCreateUser($dolibarr_main_db_host, $dolibarr_main_db_user, $dolibarr_main_db_pass, $dolibarr_main_db_name)
     {
         $sql = "INSERT INTO user ";
-        $sql.= "(Host,User,password,Select_priv,Insert_priv,Update_priv,Delete_priv,Create_priv,Drop_priv,Index_Priv,Alter_priv,Lock_tables_priv)";
-        $sql.= " VALUES ('".$this->escape($dolibarr_main_db_host)."','".$this->escape($dolibarr_main_db_user)."',password('".addslashes($dolibarr_main_db_pass)."')";
-        $sql.= ",'Y','Y','Y','Y','Y','Y','Y','Y','Y')";
+        $sql .= "(Host,User,password,Select_priv,Insert_priv,Update_priv,Delete_priv,Create_priv,Drop_priv,Index_Priv,Alter_priv,Lock_tables_priv)";
+        $sql .= " VALUES ('".$this->escape($dolibarr_main_db_host)."','".$this->escape($dolibarr_main_db_user)."',password('".addslashes($dolibarr_main_db_pass)."')";
+        $sql .= ",'Y','Y','Y','Y','Y','Y','Y','Y','Y')";
 
-        dol_syslog(get_class($this)."::DDLCreateUser", LOG_DEBUG);	// No sql to avoid password in log
-        $resql=$this->query($sql);
-        if (! $resql)
+        dol_syslog(get_class($this)."::DDLCreateUser", LOG_DEBUG); // No sql to avoid password in log
+        $resql = $this->query($sql);
+        if (!$resql)
         {
             return -1;
         }
 
         $sql = "INSERT INTO db ";
-        $sql.= "(Host,Db,User,Select_priv,Insert_priv,Update_priv,Delete_priv,Create_priv,Drop_priv,Index_Priv,Alter_priv,Lock_tables_priv)";
-        $sql.= " VALUES ('".$this->escape($dolibarr_main_db_host)."','".$this->escape($dolibarr_main_db_name)."','".addslashes($dolibarr_main_db_user)."'";
-        $sql.= ",'Y','Y','Y','Y','Y','Y','Y','Y','Y')";
+        $sql .= "(Host,Db,User,Select_priv,Insert_priv,Update_priv,Delete_priv,Create_priv,Drop_priv,Index_Priv,Alter_priv,Lock_tables_priv)";
+        $sql .= " VALUES ('".$this->escape($dolibarr_main_db_host)."','".$this->escape($dolibarr_main_db_name)."','".addslashes($dolibarr_main_db_user)."'";
+        $sql .= ",'Y','Y','Y','Y','Y','Y','Y','Y','Y')";
 
         dol_syslog(get_class($this)."::DDLCreateUser", LOG_DEBUG);
-        $resql=$this->query($sql);
-        if (! $resql)
+        $resql = $this->query($sql);
+        if (!$resql)
         {
             return -1;
         }
 
-        $sql="FLUSH Privileges";
+        $sql = "FLUSH Privileges";
 
         dol_syslog(get_class($this)."::DDLCreateUser", LOG_DEBUG);
-        $resql=$this->query($sql);
-        if (! $resql)
+        $resql = $this->query($sql);
+        if (!$resql)
         {
             return -1;
         }
@@ -1126,7 +1126,7 @@ 
     function getListOfCharacterSet()
     {
         $liste = array();
-        $i=0;
+        $i = 0;
         $liste[$i]['charset'] = 'UTF-8';
         $liste[$i]['description'] = 'UTF-8';
         return $liste;
@@ -1150,7 +1150,7 @@ 
     function getListOfCollation()
     {
         $liste = array();
-        $i=0;
+        $i = 0;
         $liste[$i]['charset'] = 'UTF-8';
         $liste[$i]['description'] = 'UTF-8';
         return $liste;
@@ -1164,14 +1164,14 @@ 
     function getPathOfDump()
     {
 	    // FIXME: not for SQLite
-        $fullpathofdump='/pathtomysqldump/mysqldump';
+        $fullpathofdump = '/pathtomysqldump/mysqldump';
 
-        $resql=$this->query('SHOW VARIABLES LIKE \'basedir\'');
+        $resql = $this->query('SHOW VARIABLES LIKE \'basedir\'');
         if ($resql)
         {
-            $liste=$this->fetch_array($resql);
-            $basedir=$liste['Value'];
-            $fullpathofdump=$basedir.(preg_match('/\/$/',$basedir)?'':'/').'bin/mysqldump';
+            $liste = $this->fetch_array($resql);
+            $basedir = $liste['Value'];
+            $fullpathofdump = $basedir.(preg_match('/\/$/', $basedir) ? '' : '/').'bin/mysqldump';
         }
         return $fullpathofdump;
     }
@@ -1184,14 +1184,14 @@ 
     function getPathOfRestore()
     {
 	    // FIXME: not for SQLite
-        $fullpathofimport='/pathtomysql/mysql';
+        $fullpathofimport = '/pathtomysql/mysql';
 
-        $resql=$this->query('SHOW VARIABLES LIKE \'basedir\'');
+        $resql = $this->query('SHOW VARIABLES LIKE \'basedir\'');
         if ($resql)
         {
-            $liste=$this->fetch_array($resql);
-            $basedir=$liste['Value'];
-            $fullpathofimport=$basedir.(preg_match('/\/$/',$basedir)?'':'/').'bin/mysql';
+            $liste = $this->fetch_array($resql);
+            $basedir = $liste['Value'];
+            $fullpathofimport = $basedir.(preg_match('/\/$/', $basedir) ? '' : '/').'bin/mysql';
         }
         return $fullpathofimport;
     }
@@ -1202,18 +1202,18 @@ 
 	 * @param	string	$filter		Filter list on a particular value
 	 * @return	array				Array of key-values (key=>value)
      */
-    function getServerParametersValues($filter='')
+    function getServerParametersValues($filter = '')
     {
-        $result=array();
+        $result = array();
         static $pragmas;
-        if (! isset($pragmas)) {
+        if (!isset($pragmas)) {
             // Définition de la liste des pragmas utilisés qui ne retournent qu'une seule valeur
             // indépendante de la base de données.
             // cf. http://www.sqlite.org/pragma.html
             $pragmas = array(
                 'application_id', 'auto_vacuum', 'automatic_index', 'busy_timeout', 'cache_size',
                 'cache_spill', 'case_sensitive_like', 'checkpoint_fullsync', 'collation_list',
-				'compile_options', 'data_version',	/*'database_list',*/
+				'compile_options', 'data_version', /*'database_list',*/
                 'defer_foreign_keys', 'encoding', 'foreign_key_check', 'freelist_count',
                 'full_column_names', 'fullsync', 'ingore_check_constraints', 'integrity_check',
                 'journal_mode', 'journal_size_limit', 'legacy_file_format', 'locking_mode',
@@ -1228,9 +1228,9 @@ 
         }
 
         // TODO prendre en compte le filtre
-        foreach($pragmas as $var) {
+        foreach ($pragmas as $var) {
             $sql = "PRAGMA $var";
-            $resql=$this->query($sql);
+            $resql = $this->query($sql);
             if ($resql)
             {
                 $obj = $this->fetch_row($resql);
@@ -1251,9 +1251,9 @@ 
 	 * @param	string	$filter		Filter list on a particular value
 	 * @return  array				Array of key-values (key=>value)
      */
-    function getServerStatusValues($filter='')
+    function getServerStatusValues($filter = '')
     {
-        $result=array();
+        $result = array();
         /*
         $sql='SHOW STATUS';
         if ($filter) $sql.=" LIKE '".$this->escape($filter)."'";
@@ -1280,10 +1280,10 @@ 
     {
         if ($this->db)
         {
-        	$newname=preg_replace('/_/','',$name);
-            $localname = __CLASS__ . '::' . 'db' . $newname;
+        	$newname = preg_replace('/_/', '', $name);
+            $localname = __CLASS__.'::'.'db'.$newname;
             $reflectClass = new ReflectionClass(__CLASS__);
-            $reflectFunction = $reflectClass->getMethod('db' . $newname);
+            $reflectFunction = $reflectClass->getMethod('db'.$newname);
             if ($arg_count < 0) {
                 $arg_count = $reflectFunction->getNumberOfParameters();
             }
@@ -1305,7 +1305,7 @@ 
     private static function calc_daynr($year, $month, $day) {
         $y = $year;
         if ($y == 0 && $month == 0) return 0;
-        $num = (365* $y + 31 * ($month - 1) + $day);
+        $num = (365 * $y + 31 * ($month - 1) + $day);
         if ($month <= 2) {
             $y--; }
         else {
@@ -1335,7 +1335,7 @@ 
      */
     private static function calc_days_in_year($year)
     {
-      return (($year & 3) == 0 && ($year%100 || ($year%400 == 0 && $year)) ? 366 : 365);
+      return (($year & 3) == 0 && ($year % 100 || ($year % 400 == 0 && $year)) ? 366 : 365);
     }
 
 	/**
@@ -1349,42 +1349,42 @@ 
 	 * @return	string						???
 	 */
     private static function calc_week($year, $month, $day, $week_behaviour, &$calc_year) {
-        $daynr=self::calc_daynr($year,$month,$day);
-        $first_daynr=self::calc_daynr($year,1,1);
-        $monday_first= ($week_behaviour & self::WEEK_MONDAY_FIRST) ? 1 : 0;
-        $week_year= ($week_behaviour & self::WEEK_YEAR) ? 1 : 0;
-        $first_weekday= ($week_behaviour & self::WEEK_FIRST_WEEKDAY) ? 1 : 0;
+        $daynr = self::calc_daynr($year, $month, $day);
+        $first_daynr = self::calc_daynr($year, 1, 1);
+        $monday_first = ($week_behaviour & self::WEEK_MONDAY_FIRST) ? 1 : 0;
+        $week_year = ($week_behaviour & self::WEEK_YEAR) ? 1 : 0;
+        $first_weekday = ($week_behaviour & self::WEEK_FIRST_WEEKDAY) ? 1 : 0;
 
-        $weekday=self::calc_weekday($first_daynr, !$monday_first);
-        $calc_year=$year;
+        $weekday = self::calc_weekday($first_daynr, !$monday_first);
+        $calc_year = $year;
 
-        if ($month == 1 && $day <= 7-$weekday)
+        if ($month == 1 && $day <= 7 - $weekday)
         {
             if (!$week_year && (($first_weekday && $weekday != 0) || (!$first_weekday && $weekday >= 4)))
                 return 0;
-            $week_year= 1;
+            $week_year = 1;
             $calc_year--;
-            $first_daynr-= ($days=self::calc_days_in_year($calc_year));
-            $weekday= ($weekday + 53*7- $days) % 7;
+            $first_daynr -= ($days = self::calc_days_in_year($calc_year));
+            $weekday = ($weekday + 53 * 7 - $days) % 7;
       }
 
       if (($first_weekday && $weekday != 0) || (!$first_weekday && $weekday >= 4)) {
-        $days= $daynr - ($first_daynr+ (7-$weekday));
+        $days = $daynr - ($first_daynr + (7 - $weekday));
       }
       else {
-        $days= $daynr - ($first_daynr - $weekday);
+        $days = $daynr - ($first_daynr - $weekday);
       }
 
-      if ($week_year && $days >= 52*7)
+      if ($week_year && $days >= 52 * 7)
       {
-        $weekday= ($weekday + self::calc_days_in_year($calc_year)) % 7;
+        $weekday = ($weekday + self::calc_days_in_year($calc_year)) % 7;
         if ((!$first_weekday && $weekday < 4) || ($first_weekday && $weekday == 0))
         {
           $calc_year++;
           return 1;
         }
       }
-      return floor($days/7+1);
+      return floor($days / 7 + 1);
     }
 
 }

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 )
 {

Indentation +18 added lines, -18 removed lines

@@ -209,24 +209,24 @@
 	}
 
 	$imageCheckExtensions = array(
-        'gif',
-        'jpeg',
-        'jpg',
-        'png',
-        'swf',
-        'psd',
-        'bmp',
-        'iff',
-        'tiff',
-        'tif',
-        'swc',
-        'jpc',
-        'jp2',
-        'jpx',
-        'jb2',
-        'xbm',
-        'wbmp'
-    );
+		'gif',
+		'jpeg',
+		'jpg',
+		'png',
+		'swf',
+		'psd',
+		'bmp',
+		'iff',
+		'tiff',
+		'tif',
+		'swc',
+		'jpc',
+		'jp2',
+		'jpx',
+		'jb2',
+		'xbm',
+		'wbmp'
+	);
 
 	if (!in_array($extension, $imageCheckExtensions) ) {
 		return true;

Spacing +29 added lines, -29 removed lines

@@ -31,7 +31,7 @@ 
  */
 function RemoveFromStart($sourceString, $charToRemove)
 {
-	$sPattern = '|^' . $charToRemove . '+|' ;
+	$sPattern = '|^'.$charToRemove.'+|';
 	return preg_replace($sPattern, '', $sourceString);
 }
 
@@ -44,7 +44,7 @@ 
  */
 function RemoveFromEnd($sourceString, $charToRemove)
 {
-	$sPattern = '|' . $charToRemove . '+$|' ;
+	$sPattern = '|'.$charToRemove.'+$|';
 	return preg_replace($sPattern, '', $sourceString);
 }
 
@@ -67,7 +67,7 @@ 
 	'|(.{1}))';
 
 	while (preg_match('/'.$regex.'/S', $string, $matches)) {
-		if ( isset($matches[2])) {
+		if (isset($matches[2])) {
 			return true;
 		}
 		$string = substr($string, strlen($matches[0]));
@@ -82,11 +82,11 @@ 
  * @param 	string		$value		Value
  * @return	string
  */
-function ConvertToXmlAttribute( $value )
+function ConvertToXmlAttribute($value)
 {
-	if ( defined('PHP_OS') )
+	if (defined('PHP_OS'))
 	{
-		$os = PHP_OS ;
+		$os = PHP_OS;
 	}
 	else
 	{
@@ -110,14 +110,14 @@ 
  * @param 	array 		$formExtensions		Array of extensions
  * @return 	boolean
  */
-function IsHtmlExtension( $ext, $formExtensions )
+function IsHtmlExtension($ext, $formExtensions)
 {
-	if (!$formExtensions || !is_array($formExtensions) )
+	if (!$formExtensions || !is_array($formExtensions))
 	{
-		return false ;
+		return false;
 	}
 	$lcaseHtmlExtensions = array();
-	foreach ( $formExtensions as $key => $val )
+	foreach ($formExtensions as $key => $val)
 	{
 		$lcaseHtmlExtensions[$key] = strtolower($val);
 	}
@@ -132,14 +132,14 @@ 
  * @param string $filePath absolute path to file
  * @return boolean
  */
-function DetectHtml( $filePath )
+function DetectHtml($filePath)
 {
 	$fp = @fopen($filePath, 'rb');
 
 	//open_basedir restriction, see #1906
-	if ( $fp === false || !flock($fp, LOCK_SH) )
+	if ($fp === false || !flock($fp, LOCK_SH))
 	{
-		return -1 ;
+		return -1;
 	}
 
 	$chunk = fread($fp, 1024);
@@ -150,47 +150,47 @@ 
 
 	if (!$chunk)
 	{
-		return false ;
+		return false;
 	}
 
 	$chunk = trim($chunk);
 
-	if ( preg_match("/<!DOCTYPE\W*X?HTML/sim", $chunk) )
+	if (preg_match("/<!DOCTYPE\W*X?HTML/sim", $chunk))
 	{
 		return true;
 	}
 
-	$tags = array( '<body', '<head', '<html', '<img', '<pre', '<script', '<table', '<title' );
+	$tags = array('<body', '<head', '<html', '<img', '<pre', '<script', '<table', '<title');
 
-	foreach( $tags as $tag )
+	foreach ($tags as $tag)
 	{
-		if( false !== strpos($chunk, $tag) )
+		if (false !== strpos($chunk, $tag))
 		{
-			return true ;
+			return true;
 		}
 	}
 
 	//type = javascript
-	if ( preg_match('!type\s*=\s*[\'"]?\s*(?:\w*/)?(?:ecma|java)!sim', $chunk) )
+	if (preg_match('!type\s*=\s*[\'"]?\s*(?:\w*/)?(?:ecma|java)!sim', $chunk))
 	{
-		return true ;
+		return true;
 	}
 
 	//href = javascript
 	//src = javascript
 	//data = javascript
-	if ( preg_match('!(?:href|src|data)\s*=\s*[\'"]?\s*(?:ecma|java)script:!sim', $chunk) )
+	if (preg_match('!(?:href|src|data)\s*=\s*[\'"]?\s*(?:ecma|java)script:!sim', $chunk))
 	{
-		return true ;
+		return true;
 	}
 
 	//url(javascript
-	if ( preg_match('!url\s*\(\s*[\'"]?\s*(?:ecma|java)script:!sim', $chunk) )
+	if (preg_match('!url\s*\(\s*[\'"]?\s*(?:ecma|java)script:!sim', $chunk))
 	{
-		return true ;
+		return true;
 	}
 
-	return false ;
+	return false;
 }
 
 /**
@@ -202,7 +202,7 @@ 
  * @param 	string 	$extension 		File extension
  * @return 	boolean					True or false
  */
-function IsImageValid( $filePath, $extension )
+function IsImageValid($filePath, $extension)
 {
 	if (!@is_readable($filePath)) {
 		return -1;
@@ -228,12 +228,12 @@ 
         'wbmp'
     );
 
-	if (!in_array($extension, $imageCheckExtensions) ) {
+	if (!in_array($extension, $imageCheckExtensions)) {
 		return true;
 	}
 
 	if (@getimagesize($filePath) === false) {
-		return false ;
+		return false;
 	}
 
 	return true;

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));
 	}