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)

Indentation +13 added lines, -13 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;
 	}
 
 
@@ -100,7 +100,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);
 		//var_dump($res);print '<br>';
@@ -141,7 +141,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);
 	}
@@ -157,7 +157,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);
 	}

htdocs/contrat/class/contrat.class.php

Doc Comments +2 added lines, -2 removed lines

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

Indentation +232 added lines, -232 removed lines

@@ -45,7 +45,7 @@ 
 	public $table_element_line='contratdet';
 	public $fk_element='fk_contrat';
 	protected $ismultientitymanaged = 1;	// 0=No test on entity, 1=Test with field entity, 2=Test with link by societe
-    public $picto='contract';
+	public $picto='contract';
 
 	/**
 	 * {@inheritdoc}
@@ -314,8 +314,8 @@ 
 		foreach($this->lines as $contratline)
 		{
 			// Close lines not already closed
-	        if ($contratline->statut != 5)
-	        {
+			if ($contratline->statut != 5)
+			{
 				$contratline->date_cloture=dol_now();
 				$contratline->fk_user_cloture=$user->id;
 				$contratline->statut='5';
@@ -325,7 +325,7 @@ 
 					$ok=false;
 					break;
 				}
-	        }
+			}
 		}
 
 		if ($this->statut == 0)
@@ -334,17 +334,17 @@ 
 			if ($result < 0) $ok=false;
 		}
 
-        if ($ok)
-        {
-            $this->db->commit();
-            return 1;
-        }
-        else
-        {
-            dol_print_error($this->db,'Error in closeAll function');
-            $this->db->rollback();
-            return -1;
-        }
+		if ($ok)
+		{
+			$this->db->commit();
+			return 1;
+		}
+		else
+		{
+			dol_print_error($this->db,'Error in closeAll function');
+			$this->db->rollback();
+			return -1;
+		}
 	}
 
 	/**
@@ -352,7 +352,7 @@ 
 	 *
 	 * @param	User	$user      		Objet User
 	 * @param   string	$force_number	Reference to force on contract (not implemented yet)
-     * @param	int		$notrigger		1=Does not execute triggers, 0= execute triggers
+	 * @param	int		$notrigger		1=Does not execute triggers, 0= execute triggers
 	 * @return	int						<0 if KO, >0 if OK
 	 */
 	function validate($user, $force_number='', $notrigger=0)
@@ -382,7 +382,7 @@ 
 		{
 			$num = $this->ref;
 		}
-        $this->newref = $num;
+		$this->newref = $num;
 
 		if ($num)
 		{
@@ -402,15 +402,15 @@ 
 			// Trigger calls
 			if (! $error && ! $notrigger)
 			{
-                // Call trigger
-                $result=$this->call_trigger('CONTRACT_VALIDATE',$user);
-                if ($result < 0) { $error++; }
-                // End call triggers
+				// Call trigger
+				$result=$this->call_trigger('CONTRACT_VALIDATE',$user);
+				if ($result < 0) { $error++; }
+				// End call triggers
 			}
 
 			if (! $error)
 			{
-            	$this->oldref = $this->ref;
+				$this->oldref = $this->ref;
 
 				// Rename directory if dir was a temporary ref
 				if (preg_match('/^[\(]?PROV/i', $this->ref))
@@ -428,16 +428,16 @@ 
 						if (@rename($dirsource, $dirdest))
 						{
 							dol_syslog("Rename ok");
-						    // Rename docs starting with $oldref with $newref
-            				$listoffiles=dol_dir_list($conf->contract->dir_output.'/'.$newref, 'files', 1, '^'.preg_quote($oldref,'/'));
-            				foreach($listoffiles as $fileentry)
-            				{
-            					$dirsource=$fileentry['name'];
-            					$dirdest=preg_replace('/^'.preg_quote($oldref,'/').'/',$newref, $dirsource);
-            					$dirsource=$fileentry['path'].'/'.$dirsource;
-            					$dirdest=$fileentry['path'].'/'.$dirdest;
-            					@rename($dirsource, $dirdest);
-            				}
+							// Rename docs starting with $oldref with $newref
+							$listoffiles=dol_dir_list($conf->contract->dir_output.'/'.$newref, 'files', 1, '^'.preg_quote($oldref,'/'));
+							foreach($listoffiles as $fileentry)
+							{
+								$dirsource=$fileentry['name'];
+								$dirdest=preg_replace('/^'.preg_quote($oldref,'/').'/',$newref, $dirsource);
+								$dirsource=$fileentry['path'].'/'.$dirsource;
+								$dirdest=$fileentry['path'].'/'.$dirdest;
+								@rename($dirsource, $dirdest);
+							}
 						}
 					}
 				}
@@ -474,7 +474,7 @@ 
 	 * Unvalidate a contract
 	 *
 	 * @param	User	$user      		Objet User
-     * @param	int		$notrigger		1=Does not execute triggers, 0=execute triggers
+	 * @param	int		$notrigger		1=Does not execute triggers, 0=execute triggers
 	 * @return	int						<0 if KO, >0 if OK
 	 */
 	function reopen($user, $notrigger=0)
@@ -674,7 +674,7 @@ 
 		$extralabelsline=$extrafieldsline->fetch_name_optionals_label($line->table_element,true);
 
 		$this->lines=array();
-        $pos = 0;
+		$pos = 0;
 
 		// Selectionne les lignes contrats liees a un produit
 		$sql = "SELECT p.label as product_label, p.description as product_desc, p.ref as product_ref,";
@@ -775,8 +775,8 @@ 
 				if ($line->statut == 5) $this->nbofservicesclosed++;
 
 				$total_ttc+=$objp->total_ttc;   // TODO Not saved into database
-                $total_vat+=$objp->total_tva;
-                $total_ht+=$objp->total_ht;
+				$total_vat+=$objp->total_tva;
+				$total_ht+=$objp->total_ht;
 
 				$i++;
 				$pos++;
@@ -875,11 +875,11 @@ 
 				$this->lines_id_index_mapper[$line->id] = $pos;
 
 				$total_ttc+=$objp->total_ttc;
-                $total_vat+=$objp->total_tva;
-                $total_ht+=$objp->total_ht;
+				$total_vat+=$objp->total_tva;
+				$total_ht+=$objp->total_ht;
 
-                $i++;
-                $pos++;
+				$i++;
+				$pos++;
 			}
 
 			$this->db->free($result);
@@ -892,9 +892,9 @@ 
 		}
 
 		$this->nbofservices=count($this->lines);
-        $this->total_ttc = price2num($total_ttc);   // TODO For the moment value is false as value is not stored in database for line linked to products
-        $this->total_vat = price2num($total_vat);   // TODO For the moment value is false as value is not stored in database for line linked to products
-        $this->total_ht = price2num($total_ht);     // TODO For the moment value is false as value is not stored in database for line linked to products
+		$this->total_ttc = price2num($total_ttc);   // TODO For the moment value is false as value is not stored in database for line linked to products
+		$this->total_vat = price2num($total_vat);   // TODO For the moment value is false as value is not stored in database for line linked to products
+		$this->total_ht = price2num($total_ht);     // TODO For the moment value is false as value is not stored in database for line linked to products
 
 		return $this->lines;
 	}
@@ -982,107 +982,107 @@ 
 
 			if (! $error)
 			{
-			    if (empty($conf->global->MAIN_EXTRAFIELDS_DISABLED)) // For avoid conflicts if trigger used
-			    {
-			    	$result=$this->insertExtraFields();
-			    	if ($result < 0)
-			        {
-			            $error++;
-			        }
-			    }
+				if (empty($conf->global->MAIN_EXTRAFIELDS_DISABLED)) // For avoid conflicts if trigger used
+				{
+					$result=$this->insertExtraFields();
+					if ($result < 0)
+					{
+						$error++;
+					}
+				}
 			}
 
 			// Insert contacts commerciaux ('SALESREPSIGN','contrat')
 			if (! $error)
 			{
-    			$result=$this->add_contact($this->commercial_signature_id,'SALESREPSIGN','internal');
-    			if ($result < 0) $error++;
+				$result=$this->add_contact($this->commercial_signature_id,'SALESREPSIGN','internal');
+				if ($result < 0) $error++;
 			}
 
 			// Insert contacts commerciaux ('SALESREPFOLL','contrat')
 			if (! $error)
 			{
-                $result=$this->add_contact($this->commercial_suivi_id,'SALESREPFOLL','internal');
-			    if ($result < 0) $error++;
+				$result=$this->add_contact($this->commercial_suivi_id,'SALESREPFOLL','internal');
+				if ($result < 0) $error++;
 			}
 
 			if (! $error)
 			{
-    			// Add object linked
-    			if (! $error && $this->id && is_array($this->linked_objects) && ! empty($this->linked_objects))
-    			{
-    			    foreach($this->linked_objects as $origin => $tmp_origin_id)
-    			    {
-    			        if (is_array($tmp_origin_id))       // New behaviour, if linked_object can have several links per type, so is something like array('contract'=>array(id1, id2, ...))
-    			        {
-    			            foreach($tmp_origin_id as $origin_id)
-    			            {
-    			                $ret = $this->add_object_linked($origin, $origin_id);
-    			                if (! $ret)
-    			                {
-    			                    dol_print_error($this->db);
-    			                    $error++;
-    			                }
-    			            }
-    			        }
-    			        else                                // Old behaviour, if linked_object has only one link per type, so is something like array('contract'=>id1))
-    			        {
-    			            $origin_id = $tmp_origin_id;
-    			            $ret = $this->add_object_linked($origin, $origin_id);
-    			            if (! $ret)
-    			            {
-    			                dol_print_error($this->db);
-    			                $error++;
-    			            }
-    			        }
-    			    }
-    			}
-
-    			if (! $error && $this->id && ! empty($conf->global->MAIN_PROPAGATE_CONTACTS_FROM_ORIGIN) && ! empty($this->origin) && ! empty($this->origin_id))   // Get contact from origin object
-    			{
-    			    $originforcontact = $this->origin;
-    			    $originidforcontact = $this->origin_id;
-    			    if ($originforcontact == 'shipping')     // shipment and order share the same contacts. If creating from shipment we take data of order
-    			    {
-    			        require_once DOL_DOCUMENT_ROOT . '/expedition/class/expedition.class.php';
-    			        $exp = new Expedition($db);
-    			        $exp->fetch($this->origin_id);
-    			        $exp->fetchObjectLinked();
-    			        if (count($exp->linkedObjectsIds['commande']) > 0)
-    			        {
-    			            foreach ($exp->linkedObjectsIds['commande'] as $key => $value)
-    			            {
-    			                $originforcontact = 'commande';
-    			                $originidforcontact = $value->id;
-    			                break; // We take first one
-    			            }
-    			        }
-    			    }
-
-    			    $sqlcontact = "SELECT ctc.code, ctc.source, ec.fk_socpeople FROM ".MAIN_DB_PREFIX."element_contact as ec, ".MAIN_DB_PREFIX."c_type_contact as ctc";
-    			    $sqlcontact.= " WHERE element_id = ".$originidforcontact." AND ec.fk_c_type_contact = ctc.rowid AND ctc.element = '".$originforcontact."'";
-
-    			    $resqlcontact = $this->db->query($sqlcontact);
-    			    if ($resqlcontact)
-    			    {
-    			        while($objcontact = $this->db->fetch_object($resqlcontact))
-    			        {
-    			            if ($objcontact->source == 'internal' && in_array($objcontact->code, array('SALESREPSIGN', 'SALESREPFOLL'))) continue;    // ignore this, already forced previously
-
-    			            //print $objcontact->code.'-'.$objcontact->source.'-'.$objcontact->fk_socpeople."\n";
-    			            $this->add_contact($objcontact->fk_socpeople, $objcontact->code, $objcontact->source);    // May failed because of duplicate key or because code of contact type does not exists for new object
-    			        }
-    			    }
-    			    else dol_print_error($resqlcontact);
-    			}
+				// Add object linked
+				if (! $error && $this->id && is_array($this->linked_objects) && ! empty($this->linked_objects))
+				{
+					foreach($this->linked_objects as $origin => $tmp_origin_id)
+					{
+						if (is_array($tmp_origin_id))       // New behaviour, if linked_object can have several links per type, so is something like array('contract'=>array(id1, id2, ...))
+						{
+							foreach($tmp_origin_id as $origin_id)
+							{
+								$ret = $this->add_object_linked($origin, $origin_id);
+								if (! $ret)
+								{
+									dol_print_error($this->db);
+									$error++;
+								}
+							}
+						}
+						else                                // Old behaviour, if linked_object has only one link per type, so is something like array('contract'=>id1))
+						{
+							$origin_id = $tmp_origin_id;
+							$ret = $this->add_object_linked($origin, $origin_id);
+							if (! $ret)
+							{
+								dol_print_error($this->db);
+								$error++;
+							}
+						}
+					}
+				}
+
+				if (! $error && $this->id && ! empty($conf->global->MAIN_PROPAGATE_CONTACTS_FROM_ORIGIN) && ! empty($this->origin) && ! empty($this->origin_id))   // Get contact from origin object
+				{
+					$originforcontact = $this->origin;
+					$originidforcontact = $this->origin_id;
+					if ($originforcontact == 'shipping')     // shipment and order share the same contacts. If creating from shipment we take data of order
+					{
+						require_once DOL_DOCUMENT_ROOT . '/expedition/class/expedition.class.php';
+						$exp = new Expedition($db);
+						$exp->fetch($this->origin_id);
+						$exp->fetchObjectLinked();
+						if (count($exp->linkedObjectsIds['commande']) > 0)
+						{
+							foreach ($exp->linkedObjectsIds['commande'] as $key => $value)
+							{
+								$originforcontact = 'commande';
+								$originidforcontact = $value->id;
+								break; // We take first one
+							}
+						}
+					}
+
+					$sqlcontact = "SELECT ctc.code, ctc.source, ec.fk_socpeople FROM ".MAIN_DB_PREFIX."element_contact as ec, ".MAIN_DB_PREFIX."c_type_contact as ctc";
+					$sqlcontact.= " WHERE element_id = ".$originidforcontact." AND ec.fk_c_type_contact = ctc.rowid AND ctc.element = '".$originforcontact."'";
+
+					$resqlcontact = $this->db->query($sqlcontact);
+					if ($resqlcontact)
+					{
+						while($objcontact = $this->db->fetch_object($resqlcontact))
+						{
+							if ($objcontact->source == 'internal' && in_array($objcontact->code, array('SALESREPSIGN', 'SALESREPFOLL'))) continue;    // ignore this, already forced previously
+
+							//print $objcontact->code.'-'.$objcontact->source.'-'.$objcontact->fk_socpeople."\n";
+							$this->add_contact($objcontact->fk_socpeople, $objcontact->code, $objcontact->source);    // May failed because of duplicate key or because code of contact type does not exists for new object
+						}
+					}
+					else dol_print_error($resqlcontact);
+				}
 			}
 
 			if (! $error)
 			{
-                // Call trigger
-                $result=$this->call_trigger('CONTRACT_CREATE',$user);
-                if ($result < 0) { $error++; }
-                // End call triggers
+				// Call trigger
+				$result=$this->call_trigger('CONTRACT_CREATE',$user);
+				if ($result < 0) { $error++; }
+				// End call triggers
 
 				if (! $error)
 				{
@@ -1129,10 +1129,10 @@ 
 
 		$this->db->begin();
 
-	    // Call trigger
-	    $result=$this->call_trigger('CONTRACT_DELETE',$user);
-	    if ($result < 0) { $error++; }
-	    // End call triggers
+		// Call trigger
+		$result=$this->call_trigger('CONTRACT_DELETE',$user);
+		if ($result < 0) { $error++; }
+		// End call triggers
 
 		if (! $error)
 		{
@@ -1301,7 +1301,7 @@ 
 		// Put here code to add a control on parameters values
 
 		// Update request
-    	$sql = "UPDATE ".MAIN_DB_PREFIX."contrat SET";
+		$sql = "UPDATE ".MAIN_DB_PREFIX."contrat SET";
 		$sql.= " ref=".(isset($this->ref)?"'".$this->db->escape($this->ref)."'":"null").",";
 		$sql.= " ref_customer=".(isset($this->ref_customer)?"'".$this->db->escape($this->ref_customer)."'":"null").",";
 		$sql.= " ref_supplier=".(isset($this->ref_supplier)?"'".$this->db->escape($this->ref_supplier)."'":"null").",";
@@ -1427,7 +1427,7 @@ 
 			if (empty($pu_ttc)) $pu_ttc=0;
 			if (empty($txtva) || ! is_numeric($txtva)) $txtva=0;
 			if (empty($txlocaltax1) || ! is_numeric($txlocaltax1)) $txlocaltax1=0;
-            if (empty($txlocaltax2) || ! is_numeric($txlocaltax2)) $txlocaltax2=0;
+			if (empty($txlocaltax2) || ! is_numeric($txlocaltax2)) $txlocaltax2=0;
 
 			if ($price_base_type=='HT')
 			{
@@ -1448,13 +1448,13 @@ 
 
 			$localtaxes_type=getLocalTaxesFromRate($txtva, 0, $this->societe, $mysoc);
 
-		    // Clean vat code
-    		$vat_src_code='';
-    		if (preg_match('/\((.*)\)/', $txtva, $reg))
-    		{
-    		    $vat_src_code = $reg[1];
-    		    $txtva = preg_replace('/\s*\(.*\)/', '', $txtva);    // Remove code into vatrate.
-    		}
+			// Clean vat code
+			$vat_src_code='';
+			if (preg_match('/\((.*)\)/', $txtva, $reg))
+			{
+				$vat_src_code = $reg[1];
+				$txtva = preg_replace('/\s*\(.*\)/', '', $txtva);    // Remove code into vatrate.
+			}
 
 			$tabprice=calcul_price_total($qty, $pu, $remise_percent, $txtva, $txlocaltax1, $txlocaltax2, 0, $price_base_type, $info_bits, 1,$mysoc, $localtaxes_type);
 			$total_ht  = $tabprice[0];
@@ -1476,7 +1476,7 @@ 
 				$price = $pu_ht - $remise;
 			}
 
-		    if (empty($pa_ht)) $pa_ht=0;
+			if (empty($pa_ht)) $pa_ht=0;
 
 
 			// if buy price not defined, define buyprice as configured in margin admin
@@ -1549,13 +1549,13 @@ 
 					}
 
 					if (empty($error)) {
-					    // Call trigger
-					    $result=$this->call_trigger('LINECONTRACT_INSERT',$user);
-					    if ($result < 0)
-					    {
-					    	$error++;
-					    }
-					    // End call triggers
+						// Call trigger
+						$result=$this->call_trigger('LINECONTRACT_INSERT',$user);
+						if ($result < 0)
+						{
+							$error++;
+						}
+						// End call triggers
 					}
 
 					if ($error)
@@ -1666,11 +1666,11 @@ 
 		$price = price2num(round($pu, 2));
 		if (dol_strlen($remise_percent) > 0)
 		{
-		    $remise = round(($pu * $remise_percent / 100), 2);
-		    $price = $pu - $remise;
+			$remise = round(($pu * $remise_percent / 100), 2);
+			$price = $pu - $remise;
 		}
 
-	    if (empty($pa_ht)) $pa_ht=0;
+		if (empty($pa_ht)) $pa_ht=0;
 
 		// if buy price not defined, define buyprice as configured in margin admin
 		if ($this->pa_ht == 0)
@@ -1736,14 +1736,14 @@ 
 				}
 
 				if (empty($error)) {
-			        // Call trigger
-			        $result=$this->call_trigger('LINECONTRACT_UPDATE',$user);
-			        if ($result < 0)
-			        {
-			            $this->db->rollback();
-			            return -3;
-			        }
-			        // End call triggers
+					// Call trigger
+					$result=$this->call_trigger('LINECONTRACT_UPDATE',$user);
+					if ($result < 0)
+					{
+						$this->db->rollback();
+						return -3;
+					}
+					// End call triggers
 
 					$this->db->commit();
 					return 1;
@@ -1781,12 +1781,12 @@ 
 		if ($this->statut >= 0)
 		{
 
-		    // Call trigger
-		    $result=$this->call_trigger('LINECONTRACT_DELETE',$user);
-		    if ($result < 0) return -1;
-		    // End call triggers
+			// Call trigger
+			$result=$this->call_trigger('LINECONTRACT_DELETE',$user);
+			if ($result < 0) return -1;
+			// End call triggers
 
-		    $this->db->begin();
+			$this->db->begin();
 
 			$sql = "DELETE FROM ".MAIN_DB_PREFIX."contratdet";
 			$sql.= " WHERE rowid=".$idline;
@@ -1940,8 +1940,8 @@ 
 	 *
 	 *	@param	int		$withpicto					0=No picto, 1=Include picto into link, 2=Only picto
 	 *	@param	int		$maxlength					Max length of ref
-     *  @param	int     $notooltip					1=Disable tooltip
-     *  @param  int     $save_lastsearch_value		-1=Auto, 0=No save of lastsearch_values when clicking, 1=Save lastsearch_values whenclicking
+	 *  @param	int     $notooltip					1=Disable tooltip
+	 *  @param  int     $save_lastsearch_value		-1=Auto, 0=No save of lastsearch_values when clicking, 1=Save lastsearch_values whenclicking
 	 *	@return	string								Chaine avec URL
 	 */
 	function getNomUrl($withpicto=0, $maxlength=0, $notooltip=0, $save_lastsearch_value=-1)
@@ -1961,35 +1961,35 @@ 
 		//}
 
 		$picto = 'contract';
-        $label = '';
-
-        if ($user->rights->contrat->lire) {
-            $label = '<u>'.$langs->trans("ShowContract").'</u>';
-            $label .= '<br><b>'.$langs->trans('Ref').':</b> '.$this->ref;
-            $label .= '<br><b>'.$langs->trans('RefCustomer').':</b> '.($this->ref_customer ? $this->ref_customer : $this->ref_client);
-            $label .= '<br><b>'.$langs->trans('RefSupplier').':</b> '.$this->ref_supplier;
-            if (!empty($this->total_ht)) {
-                $label .= '<br><b>'.$langs->trans('AmountHT').':</b> '.price($this->total_ht, 0, $langs, 0, -1, -1, $conf->currency);
-            }
-            if (!empty($this->total_tva)) {
-                $label .= '<br><b>'.$langs->trans('VAT').':</b> '.price($this->total_tva, 0, $langs, 0, -1, -1,	$conf->currency);
-            }
-            if (!empty($this->total_ttc)) {
-                $label .= '<br><b>'.$langs->trans('AmountTTC').':</b> '.price($this->total_ttc, 0, $langs, 0, -1, -1, $conf->currency);
-            }
-        }
-
-        $linkclose='';
-        if (empty($notooltip) && $user->rights->contrat->lire)
-        {
-            if (! empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER))
-            {
-                $label=$langs->trans("ShowOrder");
-                $linkclose.=' alt="'.dol_escape_htmltag($label, 1).'"';
-            }
-            $linkclose.= ' title="'.dol_escape_htmltag($label, 1).'"';
-            $linkclose.=' class="classfortooltip"';
-        }
+		$label = '';
+
+		if ($user->rights->contrat->lire) {
+			$label = '<u>'.$langs->trans("ShowContract").'</u>';
+			$label .= '<br><b>'.$langs->trans('Ref').':</b> '.$this->ref;
+			$label .= '<br><b>'.$langs->trans('RefCustomer').':</b> '.($this->ref_customer ? $this->ref_customer : $this->ref_client);
+			$label .= '<br><b>'.$langs->trans('RefSupplier').':</b> '.$this->ref_supplier;
+			if (!empty($this->total_ht)) {
+				$label .= '<br><b>'.$langs->trans('AmountHT').':</b> '.price($this->total_ht, 0, $langs, 0, -1, -1, $conf->currency);
+			}
+			if (!empty($this->total_tva)) {
+				$label .= '<br><b>'.$langs->trans('VAT').':</b> '.price($this->total_tva, 0, $langs, 0, -1, -1,	$conf->currency);
+			}
+			if (!empty($this->total_ttc)) {
+				$label .= '<br><b>'.$langs->trans('AmountTTC').':</b> '.price($this->total_ttc, 0, $langs, 0, -1, -1, $conf->currency);
+			}
+		}
+
+		$linkclose='';
+		if (empty($notooltip) && $user->rights->contrat->lire)
+		{
+			if (! empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER))
+			{
+				$label=$langs->trans("ShowOrder");
+				$linkclose.=' alt="'.dol_escape_htmltag($label, 1).'"';
+			}
+			$linkclose.= ' title="'.dol_escape_htmltag($label, 1).'"';
+			$linkclose.=' class="classfortooltip"';
+		}
 
 		$linkstart = '<a href="'.$url.'"';
 		$linkstart.=$linkclose.'>';
@@ -2126,11 +2126,11 @@ 
 
 
 	/**
-     *      Load indicators for dashboard (this->nbtodo and this->nbtodolate)
-     *
-     *      @param	User	$user           Objet user
-     *      @param  string	$mode           "inactive" pour services a activer, "expired" pour services expires
-     *      @return WorkboardResponse|int <0 if KO, WorkboardResponse if OK
+	 *      Load indicators for dashboard (this->nbtodo and this->nbtodolate)
+	 *
+	 *      @param	User	$user           Objet user
+	 *      @param  string	$mode           "inactive" pour services a activer, "expired" pour services expires
+	 *      @return WorkboardResponse|int <0 if KO, WorkboardResponse if OK
 	 */
 	function load_board($user,$mode)
 	{
@@ -2233,7 +2233,7 @@ 
 			{
 				$this->nb["Contracts"]=$obj->nb;
 			}
-            $this->db->free($resql);
+			$this->db->free($resql);
 			return 1;
 		}
 		else
@@ -2269,17 +2269,17 @@ 
 
 
 	/**
-     *  Initialise an instance with random values.
-     *  Used to build previews or test instances.
-     *	id must be 0 if object instance is a specimen.
-     *
-     *  @return	void
+	 *  Initialise an instance with random values.
+	 *  Used to build previews or test instances.
+	 *	id must be 0 if object instance is a specimen.
+	 *
+	 *  @return	void
 	 */
 	function initAsSpecimen()
 	{
 		global $user,$langs,$conf;
 
-        // Load array of products prodids
+		// Load array of products prodids
 		$num_prods = 0;
 		$prodids = array();
 		$sql = "SELECT rowid";
@@ -2334,10 +2334,10 @@ 
 			$line->date_fin_validite = dol_now() + 500000;
 			$line->date_cloture = dol_now() - 100000;
 			if ($num_prods > 0)
-            {
+			{
 				$prodid = mt_rand(1, $num_prods);
 				$line->fk_product=$prodids[$prodid];
-            }
+			}
 			$this->lines[$xnbp]=$line;
 			$xnbp++;
 		}
@@ -2411,7 +2411,7 @@ 
 		$this->fetch($this->id);
 		// Load dest object
 		$clonedObj = clone $this;
-        $clonedObj->socid = $socid;
+		$clonedObj->socid = $socid;
 
 		$this->db->begin();
 
@@ -2446,13 +2446,13 @@ 
 			$this->error = $clonedObj->error;
 			$this->errors[] = $clonedObj->error;
 		} else {
-            // copy external contacts if same company
-            if ($this->socid == $clonedObj->socid) {
-                if ($clonedObj->copy_linked_contact($this, 'external') < 0) {
-                    $error++;
-                }
-            }
-        }
+			// copy external contacts if same company
+			if ($this->socid == $clonedObj->socid) {
+				if ($clonedObj->copy_linked_contact($this, 'external') < 0) {
+					$error++;
+				}
+			}
+		}
 
 		if (! $error) {
 			foreach ( $this->lines as $line ) {
@@ -2510,8 +2510,8 @@ 
  */
 class ContratLigne extends CommonObjectLine
 {
-    public $element='contratdet';
-    public $table_element='contratdet';
+	public $element='contratdet';
+	public $table_element='contratdet';
 
 	var $id;
 	var $ref;
@@ -2577,9 +2577,9 @@ 
 
 
 	/**
-     *  Constructor
-     *
-     *  @param      DoliDb		$db      Database handler
+	 *  Constructor
+	 *
+	 *  @param      DoliDb		$db      Database handler
 	 */
 	function __construct($db)
 	{
@@ -2667,22 +2667,22 @@ 
 	 *  @param	int		$withpicto		0=No picto, 1=Include picto into link, 2=Only picto
 	 *  @param	int		$maxlength		Max length
 	 *  @return	string					Chaine avec URL
- 	 */
+	 */
 	function getNomUrl($withpicto=0,$maxlength=0)
 	{
 		global $langs;
 
 		$result='';
-        $label=$langs->trans("ShowContractOfService").': '.$this->label;
-        if (empty($label)) $label=$this->description;
+		$label=$langs->trans("ShowContractOfService").': '.$this->label;
+		if (empty($label)) $label=$this->description;
 
-        $link = '<a href="'.DOL_URL_ROOT.'/contrat/card.php?id='.$this->fk_contrat.'" title="'.dol_escape_htmltag($label, 1).'" class="classfortooltip">';
+		$link = '<a href="'.DOL_URL_ROOT.'/contrat/card.php?id='.$this->fk_contrat.'" title="'.dol_escape_htmltag($label, 1).'" class="classfortooltip">';
 		$linkend='</a>';
 
 		$picto='service';
 		if ($this->type == 0) $picto='product';
 
-        if ($withpicto) $result.=($link.img_object($label, $picto, 'class="classfortooltip"').$linkend);
+		if ($withpicto) $result.=($link.img_object($label, $picto, 'class="classfortooltip"').$linkend);
 		if ($withpicto && $withpicto != 2) $result.=' ';
 		if ($withpicto != 2) $result.=$link.($this->product_ref?$this->product_ref.' ':'').($this->label?$this->label:$this->description).$linkend;
 		return $result;
@@ -2878,7 +2878,7 @@ 
 		$this->total_localtax1= $tabprice[9];
 		$this->total_localtax2= $tabprice[10];
 
-	    if (empty($this->pa_ht)) $this->pa_ht=0;
+		if (empty($this->pa_ht)) $this->pa_ht=0;
 
 		// if buy price not defined, define buyprice as configured in margin admin
 		if ($this->pa_ht == 0)
@@ -2961,15 +2961,15 @@ 
 		if (empty($error)) {
 		if (! $notrigger)
 		{
-            // Call trigger
-            $result=$this->call_trigger('LINECONTRACT_UPDATE',$user);
-            if ($result < 0) { $error++; $this->db->rollback(); return -1; }
-            // End call triggers
+			// Call trigger
+			$result=$this->call_trigger('LINECONTRACT_UPDATE',$user);
+			if ($result < 0) { $error++; $this->db->rollback(); return -1; }
+			// End call triggers
 		}
 		}
 
 		if (empty($error)) {
-        $this->db->commit();
+		$this->db->commit();
 		return 1;
 		} else {
 			$this->db->rollback();

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

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

htdocs/core/db/DoliDB.class.php

Doc Comments +1 added lines, -1 removed lines

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

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

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

Indentation +831 added lines, -831 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,61 +101,61 @@ 
 		}
 
 		// 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 connected with different charset than Dolibarr HTML output
-                $clientmustbe='';
-                if (preg_match('/UTF-8/i',$conf->file->character_set_client))      $clientmustbe='utf8';
-                if (preg_match('/ISO-8859-1/i',$conf->file->character_set_client)) $clientmustbe='latin1';
+		if ($this->connected && $name)
+		{
+			if ($this->select_db($name))
+			{
+				$this->database_selected = true;
+				$this->database_name = $name;
+				$this->ok = true;
+
+				// If client connected with different charset than Dolibarr HTML output
+				$clientmustbe='';
+				if (preg_match('/UTF-8/i',$conf->file->character_set_client))      $clientmustbe='utf8';
+				if (preg_match('/ISO-8859-1/i',$conf->file->character_set_client)) $clientmustbe='latin1';
 				if ($this->db->character_set_name() != $clientmustbe) {
 					$this->db->set_charset($clientmustbe);
 				}
-            }
-            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 connected with different charset than Dolibarr HTML output
-                $clientmustbe='';
-                if (preg_match('/UTF-8/i',$conf->file->character_set_client))      $clientmustbe='utf8';
-                if (preg_match('/ISO-8859-1/i',$conf->file->character_set_client)) $clientmustbe='latin1';
+			}
+			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 connected with different charset than Dolibarr HTML output
+				$clientmustbe='';
+				if (preg_match('/UTF-8/i',$conf->file->character_set_client))      $clientmustbe='utf8';
+				if (preg_match('/ISO-8859-1/i',$conf->file->character_set_client)) $clientmustbe='latin1';
 				if ($this->db->character_set_name() != $clientmustbe) {
 					$this->db->set_charset($clientmustbe);
 				}
-            }
-        }
-    }
-
-
-    /**
-     *  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
@@ -163,11 +163,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);
+	}
 
 
 	/**
@@ -188,360 +188,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
@@ -551,79 +551,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 			Nom de la table
@@ -634,18 +634,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'].")";
@@ -668,61 +668,61 @@ 
 			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;
-
-        dol_syslog($sql,LOG_DEBUG);
-        if(! $this -> query($sql))
-        return -1;
-        else
-        return 1;
-    }
-
-    /**
+			$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;
+
+		dol_syslog($sql,LOG_DEBUG);
+		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	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
@@ -730,105 +730,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 '%'
@@ -836,213 +836,213 @@ 
 	 *	@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 (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 (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 +275 added lines, -275 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,149 +165,149 @@ 
 		{
 			// 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 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 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
@@ -353,8 +353,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
@@ -401,7 +401,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."'";
@@ -445,29 +445,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')
@@ -509,16 +509,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
 				{
@@ -540,29 +540,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)
 	{
@@ -572,15 +572,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);
 	}
@@ -594,7 +594,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
@@ -610,7 +610,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);
@@ -618,16 +618,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 ";
@@ -645,7 +645,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
 	 *
@@ -658,8 +658,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
@@ -768,12 +768,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)
 	{
@@ -836,7 +836,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)
@@ -862,13 +862,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;
 	}
 
@@ -903,12 +903,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;
 	}
 
 
@@ -1049,10 +1049,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']))
@@ -1090,23 +1090,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);
@@ -1144,8 +1144,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 '';
 	}
@@ -1185,7 +1185,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 '';
@@ -1226,28 +1226,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';
@@ -1255,21 +1255,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;
 	}

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

Indentation +1110 added lines, -1110 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');
+		}
+	}
 
-    /**
-     * Get last ID after an insert INSERT
-     *
+	/**
+	 *	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
+	 *
 	 * @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;
+	}
+
+	/**
+	 *	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;
 
-        return $return;
-    }
+		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 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,367 +878,367 @@ 
 	 *	@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;
-    }
-
-    /**
+	/**
 	 *	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);
@@ -1248,79 +1248,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
@@ -1332,44 +1332,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);
+	}
 
 }