alxarafe / alixar

dolibarr/htdocs/core/triggers/interface_50_modBlockedlog_ActionsBlockedLog.class.php

Indentation +111 added lines, -111 removed lines

@@ -30,121 +30,121 @@
  */
 class InterfaceActionsBlockedLog extends DolibarrTriggers
 {
-	public $family = 'system';
-	public $description = "Triggers of this module add action for BlockedLog module.";
-
-	/**
-	 * Version of the trigger
-	 * @var string
-	 */
-	public $version = self::VERSION_DOLIBARR;
-
-	/**
-	 * @var string Image of the trigger
-	 */
-	public $picto = 'technic';
-
-	/**
-	 * Function called on Dolibarrr payment or invoice event.
-	 *
-	 * @param string		$action		Event action code
-	 * @param Object		$object     Object
-	 * @param User		    $user       Object user
-	 * @param Translate 	$langs      Object langs
-	 * @param conf		    $conf       Object conf
-	 * @return int         				<0 if KO, 0 if no triggered ran, >0 if OK
-	 */
-	public function runTrigger($action, $object, User $user, Translate $langs, Conf $conf)
-	{
-		if (empty($conf->blockedlog->enabled)) return 0;     // Module not active, we do nothing
-
-		// Test if event/record is qualified
-		$listofqualifiedelement = array('facture', 'don', 'payment', 'payment_donation', 'subscription', 'payment_various', 'cashcontrol');
-		if (! in_array($object->element, $listofqualifiedelement)) return 1;
-
-		dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
-
-		require_once DOL_DOCUMENT_ROOT.'/blockedlog/class/blockedlog.class.php';
-		$b=new BlockedLog($this->db);
-
-		// Tracked events
-		if (! in_array($action, array_keys($b->trackedevents)))
-		{
-			return 0;
-		}
-
-		// Event/record is qualified
-		$qualified = 0;
-		$amounts = 0;
-		if ($action==='BILL_VALIDATE' || $action==='BILL_DELETE' || $action === 'BILL_SENTBYMAIL'
-			|| $action==='BILL_SUPPLIER_VALIDATE' || $action==='BILL_SUPPLIER_DELETE' || $action === 'BILL_SUPPLIER_SENTBYMAIL'
-			|| $action==='MEMBER_SUBSCRIPTION_CREATE' || $action==='MEMBER_SUBSCRIPTION_MODIFY' || $action==='MEMBER_SUBSCRIPTION_DELETE'
-			|| $action==='DON_VALIDATE' || $action==='DON_MODIFY' || $action==='DON_DELETE'
-			|| $action==='CASHCONTROL_VALIDATE'
-			|| (in_array($object->element, array('facture','suplier_invoice')) && $action === 'DOC_DOWNLOAD') || (in_array($object->element, array('facture','suplier_invoice')) && $action === 'DOC_PREVIEW')
-		)
-		{
-			$qualified++;
-
-			if (in_array($action, array(
-				'MEMBER_SUBSCRIPTION_CREATE','MEMBER_SUBSCRIPTION_MODIFY','MEMBER_SUBSCRIPTION_DELETE',
-				'DON_VALIDATE','DON_MODIFY','DON_DELETE'))) $amounts = (double) $object->amount;
-			elseif ($action == 'CASHCONTROL_VALIDATE')
-			{
-				$amounts = (double) $object->cash + (double) $object->cheque + (double) $object->card;
-			}
-			else $amounts = (double) $object->total_ttc;
-		}
-		/*if ($action === 'BILL_PAYED' || $action==='BILL_UNPAYED'
+    public $family = 'system';
+    public $description = "Triggers of this module add action for BlockedLog module.";
+
+    /**
+     * Version of the trigger
+     * @var string
+     */
+    public $version = self::VERSION_DOLIBARR;
+
+    /**
+     * @var string Image of the trigger
+     */
+    public $picto = 'technic';
+
+    /**
+     * Function called on Dolibarrr payment or invoice event.
+     *
+     * @param string		$action		Event action code
+     * @param Object		$object     Object
+     * @param User		    $user       Object user
+     * @param Translate 	$langs      Object langs
+     * @param conf		    $conf       Object conf
+     * @return int         				<0 if KO, 0 if no triggered ran, >0 if OK
+     */
+    public function runTrigger($action, $object, User $user, Translate $langs, Conf $conf)
+    {
+        if (empty($conf->blockedlog->enabled)) return 0;     // Module not active, we do nothing
+
+        // Test if event/record is qualified
+        $listofqualifiedelement = array('facture', 'don', 'payment', 'payment_donation', 'subscription', 'payment_various', 'cashcontrol');
+        if (! in_array($object->element, $listofqualifiedelement)) return 1;
+
+        dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
+
+        require_once DOL_DOCUMENT_ROOT.'/blockedlog/class/blockedlog.class.php';
+        $b=new BlockedLog($this->db);
+
+        // Tracked events
+        if (! in_array($action, array_keys($b->trackedevents)))
+        {
+            return 0;
+        }
+
+        // Event/record is qualified
+        $qualified = 0;
+        $amounts = 0;
+        if ($action==='BILL_VALIDATE' || $action==='BILL_DELETE' || $action === 'BILL_SENTBYMAIL'
+            || $action==='BILL_SUPPLIER_VALIDATE' || $action==='BILL_SUPPLIER_DELETE' || $action === 'BILL_SUPPLIER_SENTBYMAIL'
+            || $action==='MEMBER_SUBSCRIPTION_CREATE' || $action==='MEMBER_SUBSCRIPTION_MODIFY' || $action==='MEMBER_SUBSCRIPTION_DELETE'
+            || $action==='DON_VALIDATE' || $action==='DON_MODIFY' || $action==='DON_DELETE'
+            || $action==='CASHCONTROL_VALIDATE'
+            || (in_array($object->element, array('facture','suplier_invoice')) && $action === 'DOC_DOWNLOAD') || (in_array($object->element, array('facture','suplier_invoice')) && $action === 'DOC_PREVIEW')
+        )
+        {
+            $qualified++;
+
+            if (in_array($action, array(
+                'MEMBER_SUBSCRIPTION_CREATE','MEMBER_SUBSCRIPTION_MODIFY','MEMBER_SUBSCRIPTION_DELETE',
+                'DON_VALIDATE','DON_MODIFY','DON_DELETE'))) $amounts = (double) $object->amount;
+            elseif ($action == 'CASHCONTROL_VALIDATE')
+            {
+                $amounts = (double) $object->cash + (double) $object->cheque + (double) $object->card;
+            }
+            else $amounts = (double) $object->total_ttc;
+        }
+        /*if ($action === 'BILL_PAYED' || $action==='BILL_UNPAYED'
 		 || $action === 'BILL_SUPPLIER_PAYED' || $action === 'BILL_SUPPLIER_UNPAYED')
 		{
 			$qualified++;
 			$amounts=  (double) $object->total_ttc;
 		}*/
-		if ($action === 'PAYMENT_CUSTOMER_CREATE' || $action === 'PAYMENT_SUPPLIER_CREATE' || $action === 'DONATION_PAYMENT_CREATE'
-			|| $action === 'PAYMENT_CUSTOMER_DELETE' || $action === 'PAYMENT_SUPPLIER_DELETE' || $action === 'DONATION_PAYMENT_DELETE')
-		{
-			$qualified++;
-			$amounts = 0;
-			if(!empty($object->amounts)) {
-				foreach($object->amounts as $amount) {
-					$amounts += price2num($amount);
-				}
-			}
-		}
-		elseif (strpos($action,'PAYMENT')!==false && ! in_array($action, array('PAYMENT_ADD_TO_BANK')))
-		{
-			$qualified++;
-			$amounts = (double) $object->amount;
-		}
-
-		// Another protection.
-		// May be used when event is DOC_DOWNLOAD or DOC_PREVIEW and element is not an invoice
-		if (! $qualified)
-		{
-			return 0; // not implemented action log
-		}
-
-		$result = $b->setObjectData($object, $action, $amounts, $user);		// Set field date_object, ref_object, fk_object, element, object_data
-
-		if ($result < 0)
-		{
-			$this->error = $b->error;
-			$this->errors = $b->errors;
-			return -1;
-		}
-
-		$res = $b->create($user);
-
-		if ($res < 0)
-		{
-			$this->error = $b->error;
-			$this->errors = $b->errors;
-			return -1;
-		}
-		else
-		{
-			return 1;
-		}
+        if ($action === 'PAYMENT_CUSTOMER_CREATE' || $action === 'PAYMENT_SUPPLIER_CREATE' || $action === 'DONATION_PAYMENT_CREATE'
+            || $action === 'PAYMENT_CUSTOMER_DELETE' || $action === 'PAYMENT_SUPPLIER_DELETE' || $action === 'DONATION_PAYMENT_DELETE')
+        {
+            $qualified++;
+            $amounts = 0;
+            if(!empty($object->amounts)) {
+                foreach($object->amounts as $amount) {
+                    $amounts += price2num($amount);
+                }
+            }
+        }
+        elseif (strpos($action,'PAYMENT')!==false && ! in_array($action, array('PAYMENT_ADD_TO_BANK')))
+        {
+            $qualified++;
+            $amounts = (double) $object->amount;
+        }
+
+        // Another protection.
+        // May be used when event is DOC_DOWNLOAD or DOC_PREVIEW and element is not an invoice
+        if (! $qualified)
+        {
+            return 0; // not implemented action log
+        }
+
+        $result = $b->setObjectData($object, $action, $amounts, $user);		// Set field date_object, ref_object, fk_object, element, object_data
+
+        if ($result < 0)
+        {
+            $this->error = $b->error;
+            $this->errors = $b->errors;
+            return -1;
+        }
+
+        $res = $b->create($user);
+
+        if ($res < 0)
+        {
+            $this->error = $b->error;
+            $this->errors = $b->errors;
+            return -1;
+        }
+        else
+        {
+            return 1;
+        }
     }
 }

Spacing +17 added lines, -17 removed lines

@@ -56,19 +56,19 @@ 
 	 */
 	public function runTrigger($action, $object, User $user, Translate $langs, Conf $conf)
 	{
-		if (empty($conf->blockedlog->enabled)) return 0;     // Module not active, we do nothing
+		if (empty($conf->blockedlog->enabled)) return 0; // Module not active, we do nothing
 
 		// Test if event/record is qualified
 		$listofqualifiedelement = array('facture', 'don', 'payment', 'payment_donation', 'subscription', 'payment_various', 'cashcontrol');
-		if (! in_array($object->element, $listofqualifiedelement)) return 1;
+		if (!in_array($object->element, $listofqualifiedelement)) return 1;
 
 		dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
 
 		require_once DOL_DOCUMENT_ROOT.'/blockedlog/class/blockedlog.class.php';
-		$b=new BlockedLog($this->db);
+		$b = new BlockedLog($this->db);
 
 		// Tracked events
-		if (! in_array($action, array_keys($b->trackedevents)))
+		if (!in_array($action, array_keys($b->trackedevents)))
 		{
 			return 0;
 		}
@@ -76,19 +76,19 @@ 
 		// Event/record is qualified
 		$qualified = 0;
 		$amounts = 0;
-		if ($action==='BILL_VALIDATE' || $action==='BILL_DELETE' || $action === 'BILL_SENTBYMAIL'
-			|| $action==='BILL_SUPPLIER_VALIDATE' || $action==='BILL_SUPPLIER_DELETE' || $action === 'BILL_SUPPLIER_SENTBYMAIL'
-			|| $action==='MEMBER_SUBSCRIPTION_CREATE' || $action==='MEMBER_SUBSCRIPTION_MODIFY' || $action==='MEMBER_SUBSCRIPTION_DELETE'
-			|| $action==='DON_VALIDATE' || $action==='DON_MODIFY' || $action==='DON_DELETE'
-			|| $action==='CASHCONTROL_VALIDATE'
-			|| (in_array($object->element, array('facture','suplier_invoice')) && $action === 'DOC_DOWNLOAD') || (in_array($object->element, array('facture','suplier_invoice')) && $action === 'DOC_PREVIEW')
+		if ($action === 'BILL_VALIDATE' || $action === 'BILL_DELETE' || $action === 'BILL_SENTBYMAIL'
+			|| $action === 'BILL_SUPPLIER_VALIDATE' || $action === 'BILL_SUPPLIER_DELETE' || $action === 'BILL_SUPPLIER_SENTBYMAIL'
+			|| $action === 'MEMBER_SUBSCRIPTION_CREATE' || $action === 'MEMBER_SUBSCRIPTION_MODIFY' || $action === 'MEMBER_SUBSCRIPTION_DELETE'
+			|| $action === 'DON_VALIDATE' || $action === 'DON_MODIFY' || $action === 'DON_DELETE'
+			|| $action === 'CASHCONTROL_VALIDATE'
+			|| (in_array($object->element, array('facture', 'suplier_invoice')) && $action === 'DOC_DOWNLOAD') || (in_array($object->element, array('facture', 'suplier_invoice')) && $action === 'DOC_PREVIEW')
 		)
 		{
 			$qualified++;
 
 			if (in_array($action, array(
-				'MEMBER_SUBSCRIPTION_CREATE','MEMBER_SUBSCRIPTION_MODIFY','MEMBER_SUBSCRIPTION_DELETE',
-				'DON_VALIDATE','DON_MODIFY','DON_DELETE'))) $amounts = (double) $object->amount;
+				'MEMBER_SUBSCRIPTION_CREATE', 'MEMBER_SUBSCRIPTION_MODIFY', 'MEMBER_SUBSCRIPTION_DELETE',
+				'DON_VALIDATE', 'DON_MODIFY', 'DON_DELETE'))) $amounts = (double) $object->amount;
 			elseif ($action == 'CASHCONTROL_VALIDATE')
 			{
 				$amounts = (double) $object->cash + (double) $object->cheque + (double) $object->card;
@@ -106,13 +106,13 @@ 
 		{
 			$qualified++;
 			$amounts = 0;
-			if(!empty($object->amounts)) {
-				foreach($object->amounts as $amount) {
+			if (!empty($object->amounts)) {
+				foreach ($object->amounts as $amount) {
 					$amounts += price2num($amount);
 				}
 			}
 		}
-		elseif (strpos($action,'PAYMENT')!==false && ! in_array($action, array('PAYMENT_ADD_TO_BANK')))
+		elseif (strpos($action, 'PAYMENT') !== false && !in_array($action, array('PAYMENT_ADD_TO_BANK')))
 		{
 			$qualified++;
 			$amounts = (double) $object->amount;
@@ -120,12 +120,12 @@ 
 
 		// Another protection.
 		// May be used when event is DOC_DOWNLOAD or DOC_PREVIEW and element is not an invoice
-		if (! $qualified)
+		if (!$qualified)
 		{
 			return 0; // not implemented action log
 		}
 
-		$result = $b->setObjectData($object, $action, $amounts, $user);		// Set field date_object, ref_object, fk_object, element, object_data
+		$result = $b->setObjectData($object, $action, $amounts, $user); // Set field date_object, ref_object, fk_object, element, object_data
 
 		if ($result < 0)
 		{

Braces +14 added lines, -9 removed lines

@@ -56,11 +56,16 @@ 
 	 */
 	public function runTrigger($action, $object, User $user, Translate $langs, Conf $conf)
 	{
-		if (empty($conf->blockedlog->enabled)) return 0;     // Module not active, we do nothing
+		if (empty($conf->blockedlog->enabled)) {
+		    return 0;
+		}
+		// Module not active, we do nothing
 
 		// Test if event/record is qualified
 		$listofqualifiedelement = array('facture', 'don', 'payment', 'payment_donation', 'subscription', 'payment_various', 'cashcontrol');
-		if (! in_array($object->element, $listofqualifiedelement)) return 1;
+		if (! in_array($object->element, $listofqualifiedelement)) {
+		    return 1;
+		}
 
 		dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
 
@@ -88,12 +93,14 @@ 
 
 			if (in_array($action, array(
 				'MEMBER_SUBSCRIPTION_CREATE','MEMBER_SUBSCRIPTION_MODIFY','MEMBER_SUBSCRIPTION_DELETE',
-				'DON_VALIDATE','DON_MODIFY','DON_DELETE'))) $amounts = (double) $object->amount;
-			elseif ($action == 'CASHCONTROL_VALIDATE')
+				'DON_VALIDATE','DON_MODIFY','DON_DELETE'))) {
+			    $amounts = (double) $object->amount;
+			} elseif ($action == 'CASHCONTROL_VALIDATE')
 			{
 				$amounts = (double) $object->cash + (double) $object->cheque + (double) $object->card;
+			} else {
+			    $amounts = (double) $object->total_ttc;
 			}
-			else $amounts = (double) $object->total_ttc;
 		}
 		/*if ($action === 'BILL_PAYED' || $action==='BILL_UNPAYED'
 		 || $action === 'BILL_SUPPLIER_PAYED' || $action === 'BILL_SUPPLIER_UNPAYED')
@@ -111,8 +118,7 @@ 
 					$amounts += price2num($amount);
 				}
 			}
-		}
-		elseif (strpos($action,'PAYMENT')!==false && ! in_array($action, array('PAYMENT_ADD_TO_BANK')))
+		} elseif (strpos($action,'PAYMENT')!==false && ! in_array($action, array('PAYMENT_ADD_TO_BANK')))
 		{
 			$qualified++;
 			$amounts = (double) $object->amount;
@@ -141,8 +147,7 @@ 
 			$this->error = $b->error;
 			$this->errors = $b->errors;
 			return -1;
-		}
-		else
+		} else
 		{
 			return 1;
 		}

dolibarr/htdocs/core/db/mssql.class.php

Indentation +967 added lines, -967 removed lines

@@ -31,101 +31,101 @@ 
  */
 class DoliDBMssql extends DoliDB
 {
-	//! Database type
-	public $type='mssql';
-	//! Database label
-	const LABEL='MSSQL';
-	//! Charset used to force charset when creating database
-	var $forcecharset='latin1';      // Can't be static as it may be forced with a dynamic value
-	//! Collate used to force collate when creating database
-	var $forcecollate='latin1_swedish_ci';      // Can't be static as it may be forced with a dynamic value
-	//! Version min database
-	const VERSIONMIN='2000';
-	/** @var resource Resultset of last query */
-	private $_results;
+    //! Database type
+    public $type='mssql';
+    //! Database label
+    const LABEL='MSSQL';
+    //! Charset used to force charset when creating database
+    var $forcecharset='latin1';      // Can't be static as it may be forced with a dynamic value
+    //! Collate used to force collate when creating database
+    var $forcecollate='latin1_swedish_ci';      // Can't be static as it may be forced with a dynamic value
+    //! Version min database
+    const VERSIONMIN='2000';
+    /** @var resource Resultset of last query */
+    private $_results;
 
     /**
-	 *	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
+     *	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 $langs;
+    function __construct($type, $host, $user, $pass, $name='', $port=0)
+    {
+        global $langs;
 
-		$this->database_user=$user;
+        $this->database_user=$user;
         $this->database_host=$host;
         $this->database_port=$port;
-		$this->transaction_opened=0;
-
-		if (! function_exists("mssql_connect"))
-		{
-			$this->connected = false;
-			$this->ok = false;
-			$this->error="Mssql PHP functions for using MSSql driver are not available in this version of PHP";
-			dol_syslog(get_class($this)."::DoliDBMssql : MSsql PHP functions for using MSsql driver are not available in this version of PHP",LOG_ERR);
-			return $this->ok;
-		}
-
-		if (! $host)
-		{
-			$this->connected = false;
-			$this->ok = false;
-			$this->error=$langs->trans("ErrorWrongHostParameter");
-			dol_syslog(get_class($this)."::DoliDBMssql : Erreur Connect, wrong host parameters",LOG_ERR);
-			return $this->ok;
-		}
-
-		// Essai connexion serveur
-		$this->db = $this->connect($host, $user, $pass, $name, $port);
-		if ($this->db)
-		{
-			// Si client connecte avec charset different de celui de la base Dolibarr
-			// (La base Dolibarr a ete forcee en this->forcecharset a l'install)
-			$this->connected = true;
-			$this->ok = true;
-		}
-		else
-		{
-			// host, login ou password incorrect
-			$this->connected = false;
-			$this->ok = false;
-			$this->error=mssql_get_last_message();
-			dol_syslog(get_class($this)."::DoliDBMssql : Erreur Connect mssql_get_last_message=".$this->error,LOG_ERR);
-		}
-
-		// Si connexion serveur ok et si connexion base demandee, on essaie connexion base
-		if ($this->connected && $name)
-		{
-			if ($this->select_db($name))
-			{
-				$this->database_selected = true;
-				$this->database_name = $name;
-				$this->ok = true;
-			}
-			else
-			{
-				$this->database_selected = false;
-				$this->database_name = '';
-				$this->ok = false;
-				$this->error=$this->error();
-				dol_syslog(get_class($this)."::DoliDBMssql : Erreur Select_db ".$this->error,LOG_ERR);
-			}
-		}
-		else
-		{
-			// Pas de selection de base demandee, ok ou ko
-			$this->database_selected = false;
-		}
-
-		return $this->ok;
-	}
+        $this->transaction_opened=0;
+
+        if (! function_exists("mssql_connect"))
+        {
+            $this->connected = false;
+            $this->ok = false;
+            $this->error="Mssql PHP functions for using MSSql driver are not available in this version of PHP";
+            dol_syslog(get_class($this)."::DoliDBMssql : MSsql PHP functions for using MSsql driver are not available in this version of PHP",LOG_ERR);
+            return $this->ok;
+        }
+
+        if (! $host)
+        {
+            $this->connected = false;
+            $this->ok = false;
+            $this->error=$langs->trans("ErrorWrongHostParameter");
+            dol_syslog(get_class($this)."::DoliDBMssql : Erreur Connect, wrong host parameters",LOG_ERR);
+            return $this->ok;
+        }
+
+        // Essai connexion serveur
+        $this->db = $this->connect($host, $user, $pass, $name, $port);
+        if ($this->db)
+        {
+            // Si client connecte avec charset different de celui de la base Dolibarr
+            // (La base Dolibarr a ete forcee en this->forcecharset a l'install)
+            $this->connected = true;
+            $this->ok = true;
+        }
+        else
+        {
+            // host, login ou password incorrect
+            $this->connected = false;
+            $this->ok = false;
+            $this->error=mssql_get_last_message();
+            dol_syslog(get_class($this)."::DoliDBMssql : Erreur Connect mssql_get_last_message=".$this->error,LOG_ERR);
+        }
+
+        // Si connexion serveur ok et si connexion base demandee, on essaie connexion base
+        if ($this->connected && $name)
+        {
+            if ($this->select_db($name))
+            {
+                $this->database_selected = true;
+                $this->database_name = $name;
+                $this->ok = true;
+            }
+            else
+            {
+                $this->database_selected = false;
+                $this->database_name = '';
+                $this->ok = false;
+                $this->error=$this->error();
+                dol_syslog(get_class($this)."::DoliDBMssql : Erreur Select_db ".$this->error,LOG_ERR);
+            }
+        }
+        else
+        {
+            // Pas de selection de base demandee, ok ou ko
+            $this->database_selected = false;
+        }
+
+        return $this->ok;
+    }
 
     /**
      *  Convert a SQL request in Mysql syntax to native syntax
@@ -134,83 +134,83 @@ 
      *  @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;
-	}
+    static function convertSQLFromMysql($line,$type='ddl')
+    {
+        return $line;
+    }
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
-	/**
-	 *	Select a database
-	 *
-	 *	@param	    string	$database	Name of database
-	 *	@return	    boolean  		    true if OK, false if KO
-	 */
-	function select_db($database)
-	{
+    /**
+     *	Select a database
+     *
+     *	@param	    string	$database	Name of database
+     *	@return	    boolean  		    true if OK, false if KO
+     */
+    function select_db($database)
+    {
         // phpcs:enable
-		return @mssql_select_db($database, $this->db);
-	}
-
-	/**
-	 *	Connexion to server
-	 *
-	 *	@param	    string	$host		database server host
-	 *	@param	    string	$login		login
-	 *	@param	    string	$passwd		password
-	 *	@param		string	$name		name of database (not used for mysql, used for pgsql)
-	 *	@param		int		$port		Port of database server
-	 *	@return		false|resource|true	Database access handler
-	 *	@see		close
-	 */
-	function connect($host, $login, $passwd, $name, $port=0)
-	{
-		dol_syslog(get_class($this)."::connect host=$host, port=$port, login=$login, passwd=--hidden--, name=$name");
-		$newhost=$host;
-		if ($port) $newhost.=':'.$port;
-		$this->db  = @mssql_connect($newhost, $login, $passwd);
-		//force les enregistrement en latin1 si la base est en utf8 par defaut
-		// Supprime car plante sur mon PHP-Mysql. De plus, la base est forcement en latin1 avec
-		// les nouvelles version de Dolibarr car force par l'install Dolibarr.
-		//$this->query('SET NAMES '.$this->forcecharset);
-		//print "Resultat fonction connect: ".$this->db;
-		$set_options=array('SET ANSI_PADDING ON;',
-		    "SET 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);
-
-		return $this->db;
-	}
-
-	/**
-	 *	Return version of database server
-	 *
-	 *	@return	        string      Version string
-	 */
-	function getVersion()
-	{
-		$resql=$this->query("SELECT @@VERSION");
-		if ($resql)
-		{
+        return @mssql_select_db($database, $this->db);
+    }
+
+    /**
+     *	Connexion to server
+     *
+     *	@param	    string	$host		database server host
+     *	@param	    string	$login		login
+     *	@param	    string	$passwd		password
+     *	@param		string	$name		name of database (not used for mysql, used for pgsql)
+     *	@param		int		$port		Port of database server
+     *	@return		false|resource|true	Database access handler
+     *	@see		close
+     */
+    function connect($host, $login, $passwd, $name, $port=0)
+    {
+        dol_syslog(get_class($this)."::connect host=$host, port=$port, login=$login, passwd=--hidden--, name=$name");
+        $newhost=$host;
+        if ($port) $newhost.=':'.$port;
+        $this->db  = @mssql_connect($newhost, $login, $passwd);
+        //force les enregistrement en latin1 si la base est en utf8 par defaut
+        // Supprime car plante sur mon PHP-Mysql. De plus, la base est forcement en latin1 avec
+        // les nouvelles version de Dolibarr car force par l'install Dolibarr.
+        //$this->query('SET NAMES '.$this->forcecharset);
+        //print "Resultat fonction connect: ".$this->db;
+        $set_options=array('SET ANSI_PADDING ON;',
+            "SET 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);
+
+        return $this->db;
+    }
+
+    /**
+     *	Return version of database server
+     *
+     *	@return	        string      Version string
+     */
+    function getVersion()
+    {
+        $resql=$this->query("SELECT @@VERSION");
+        if ($resql)
+        {
             $version=$this->fetch_array($resql);
             return $version['computed'];
-		}
-		else return '';
-	}
-
-	/**
-	 *	Return version of database client driver
-	 *
-	 *	@return	        string      Version string
-	 */
-	function getDriverInfo()
-	{
-		return 'php mssql driver';
-	}
+        }
+        else return '';
+    }
+
+    /**
+     *	Return version of database client driver
+     *
+     *	@return	        string      Version string
+     */
+    function getDriverInfo()
+    {
+        return 'php mssql driver';
+    }
 
     /**
      *  Close database connexion
@@ -222,100 +222,100 @@ 
     {
         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);
+            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;
     }
 
 
-	/**
-	 * Start transaction
-	 *
-	 * @return	    bool         true if transaction successfuly opened or already opened, false if error
-	 */
-	function begin()
-	{
-
-	    $res=mssql_query('select @@TRANCOUNT');
-	    $this->transaction_opened=mssql_result($res, 0, 0);
-
-	    if ($this->transaction_opened == 0)
-		{
-		    //return 1; //There is a mess with auto_commit and 'SET IMPLICIT_TRANSACTIONS ON' generate also a mess
-			$ret=mssql_query("SET IMPLICIT_TRANSACTIONS OFF;BEGIN TRANSACTION;",$this->db);
-			if ($ret)
-			{
-				dol_syslog("BEGIN Transaction",LOG_DEBUG);
-			}
-			return $ret;
-		}
-		else
-		{
-			return true;
-		}
-	}
-
-	/**
+    /**
+     * Start transaction
+     *
+     * @return	    bool         true if transaction successfuly opened or already opened, false if error
+     */
+    function begin()
+    {
+
+        $res=mssql_query('select @@TRANCOUNT');
+        $this->transaction_opened=mssql_result($res, 0, 0);
+
+        if ($this->transaction_opened == 0)
+        {
+            //return 1; //There is a mess with auto_commit and 'SET IMPLICIT_TRANSACTIONS ON' generate also a mess
+            $ret=mssql_query("SET IMPLICIT_TRANSACTIONS OFF;BEGIN TRANSACTION;",$this->db);
+            if ($ret)
+            {
+                dol_syslog("BEGIN Transaction",LOG_DEBUG);
+            }
+            return $ret;
+        }
+        else
+        {
+            return true;
+        }
+    }
+
+    /**
      * 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);
-
-		if ($this->transaction_opened == 1)
-		{
-		    //return 1; //There is a mess with auto_commit and 'SET IMPLICIT_TRANSACTION ON' generate also a mess
-			$ret=mssql_query("COMMIT TRANSACTION",$this->db);
-			if ($ret)
-			{
-				dol_syslog("COMMIT Transaction",LOG_DEBUG);
-				return true;
-			}
-			else
-			{
-				return false;
-			}
-		}
-		elseif ($this->transaction_opened > 1)
-		{
-			return true;
-		}
-		trigger_error("Commit requested but no transaction remain");
-		return false;
-	}
-
-	/**
-	 * Annulation d'une transaction et retour aux anciennes valeurs
-	 *
-	 * @param	string	$log	Add more log to default log line
-	 * @return	bool             true si annulation ok ou transaction non ouverte, false en cas d'erreur
-	 */
-	function rollback($log='')
-	{
-	    $res=mssql_query('select @@TRANCOUNT');
-	    $this->transaction_opened=mssql_result($res, 0, 0);
-
-		if ($this->transaction_opened == 1)
-		{
-			$ret=mssql_query("ROLLBACK TRANSACTION",$this->db);
-			dol_syslog("ROLLBACK Transaction".($log?' '.$log:''),LOG_DEBUG);
-			return $ret;
-		}
-		elseif ($this->transaction_opened > 1)
-		{
-			return true;
-		}
-		trigger_error("Rollback requested but no transaction remain");
-		return false;
-	}
-
-	/**
+     */
+    function commit($log='')
+    {
+        $res=mssql_query('select @@TRANCOUNT');
+        $this->transaction_opened=mssql_result($res, 0, 0);
+
+        if ($this->transaction_opened == 1)
+        {
+            //return 1; //There is a mess with auto_commit and 'SET IMPLICIT_TRANSACTION ON' generate also a mess
+            $ret=mssql_query("COMMIT TRANSACTION",$this->db);
+            if ($ret)
+            {
+                dol_syslog("COMMIT Transaction",LOG_DEBUG);
+                return true;
+            }
+            else
+            {
+                return false;
+            }
+        }
+        elseif ($this->transaction_opened > 1)
+        {
+            return true;
+        }
+        trigger_error("Commit requested but no transaction remain");
+        return false;
+    }
+
+    /**
+     * Annulation d'une transaction et retour aux anciennes valeurs
+     *
+     * @param	string	$log	Add more log to default log line
+     * @return	bool             true si annulation ok ou transaction non ouverte, false en cas d'erreur
+     */
+    function rollback($log='')
+    {
+        $res=mssql_query('select @@TRANCOUNT');
+        $this->transaction_opened=mssql_result($res, 0, 0);
+
+        if ($this->transaction_opened == 1)
+        {
+            $ret=mssql_query("ROLLBACK TRANSACTION",$this->db);
+            dol_syslog("ROLLBACK Transaction".($log?' '.$log:''),LOG_DEBUG);
+            return $ret;
+        }
+        elseif ($this->transaction_opened > 1)
+        {
+            return true;
+        }
+        trigger_error("Rollback requested but no transaction remain");
+        return false;
+    }
+
+    /**
      *  Execute a SQL request and return the resultset
      *
      *  @param	string	$query          SQL query string
@@ -323,32 +323,32 @@ 
      *                   		 		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')
-	{
-		$query = trim($query);
-
-		if (preg_match('/^--/',$query)) return true;
-
-		// Conversion syntaxe MySql vers MSDE.
-		$query = str_ireplace("now()", "getdate()", $query);
-		// Erreur SQL: cannot update timestamp field
-		$query = str_ireplace(", tms = tms", "", $query);
-
-		$query=preg_replace("/([. ,\t(])(percent|file|public)([. ,=\t)])/","$1[$2]$3",$query);
-
-		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))
-    		{
+     */
+    function query($query,$usesavepoint=0,$type='auto')
+    {
+        $query = trim($query);
+
+        if (preg_match('/^--/',$query)) return true;
+
+        // Conversion syntaxe MySql vers MSDE.
+        $query = str_ireplace("now()", "getdate()", $query);
+        // Erreur SQL: cannot update timestamp field
+        $query = str_ireplace(", tms = tms", "", $query);
+
+        $query=preg_replace("/([. ,\t(])(percent|file|public)([. ,=\t)])/","$1[$2]$3",$query);
+
+        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]) {
@@ -365,658 +365,658 @@ 
                     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))
-    		    {
+            }
+            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;';
-    	   }
-		}
-		//print "<!--".$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 = mssql_query($query, $this->db);
-		}
-		else
-		{
-			$ret = mssql_query($query, $this->db);
-		}
-
-		if (!empty($post_query))
-		{
-		    @mssql_query($post_query, $this->db);
-		}
-
-		if (! preg_match("/^COMMIT/i",$query) && ! preg_match("/^ROLLBACK/i",$query))
-		{
-			// Si requete utilisateur, on la sauvegarde ainsi que son resultset
-			if (! $ret)
-			{
-				$result = mssql_query("SELECT @@ERROR as code", $this->db);
-				$row = mssql_fetch_array($result);
+                }
+            }
+        }
+
+        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;';
+            }
+        }
+        //print "<!--".$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 = mssql_query($query, $this->db);
+        }
+        else
+        {
+            $ret = mssql_query($query, $this->db);
+        }
+
+        if (!empty($post_query))
+        {
+            @mssql_query($post_query, $this->db);
+        }
+
+        if (! preg_match("/^COMMIT/i",$query) && ! preg_match("/^ROLLBACK/i",$query))
+        {
+            // Si requete utilisateur, on la sauvegarde ainsi que son resultset
+            if (! $ret)
+            {
+                $result = mssql_query("SELECT @@ERROR as code", $this->db);
+                $row = mssql_fetch_array($result);
 
                 $this->lastqueryerror = $query;
-				$this->lasterror = $this->error();
-				$this->lasterrno = $row["code"];
+                $this->lasterror = $this->error();
+                $this->lasterrno = $row["code"];
 
-				dol_syslog(get_class($this)."::query SQL Error query: ".$query, LOG_ERR);
-				if ($original_query) dol_syslog(get_class($this)."::query SQL Original query: ".$original_query, LOG_ERR);
-				dol_syslog(get_class($this)."::query SQL Error message: ".$this->lasterror." (".$this->lasterrno.")", LOG_ERR);
-			}
-			$this->lastquery=$query;
-			$this->_results = $ret;
-		}
+                dol_syslog(get_class($this)."::query SQL Error query: ".$query, LOG_ERR);
+                if ($original_query) dol_syslog(get_class($this)."::query SQL Original query: ".$original_query, LOG_ERR);
+                dol_syslog(get_class($this)."::query SQL Error message: ".$this->lasterror." (".$this->lasterrno.")", LOG_ERR);
+            }
+            $this->lastquery=$query;
+            $this->_results = $ret;
+        }
 
-		return $ret;
-	}
+        return $ret;
+    }
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
-	/**
-	 *	Renvoie la ligne courante (comme un objet) pour le curseur resultset
-	 *
-	 *	@param	resource	$resultset  Curseur de la requete voulue
-	 *	@return	object|false			Object result line or false if KO or end of cursor
-	 */
-	function fetch_object($resultset)
-	{
+    /**
+     *	Renvoie la ligne courante (comme un objet) pour le curseur resultset
+     *
+     *	@param	resource	$resultset  Curseur de la requete voulue
+     *	@return	object|false			Object result line or false if KO or end of cursor
+     */
+    function fetch_object($resultset)
+    {
         // phpcs:enable
-		// Si le resultset n'est pas fourni, on prend le dernier utilise sur cette connexion
-		if (! is_resource($resultset)) { $resultset=$this->_results; }
-		return mssql_fetch_object($resultset);
-	}
+        // Si le resultset n'est pas fourni, on prend le dernier utilise sur cette connexion
+        if (! is_resource($resultset)) { $resultset=$this->_results; }
+        return mssql_fetch_object($resultset);
+    }
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
-	/**
+    /**
      *	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)
-	{
+     */
+    function fetch_array($resultset)
+    {
         // phpcs:enable
-		// Si le resultset n'est pas fourni, on prend le dernier utilise sur cette connexion
-		if (! is_resource($resultset)) { $resultset=$this->_results; }
-		return mssql_fetch_array($resultset);
-	}
+        // Si le resultset n'est pas fourni, on prend le dernier utilise sur cette connexion
+        if (! is_resource($resultset)) { $resultset=$this->_results; }
+        return mssql_fetch_array($resultset);
+    }
 
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
-	/**
+    /**
      *	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)
-	{
+     */
+    function fetch_row($resultset)
+    {
         // phpcs:enable
-		// Si le resultset n'est pas fourni, on prend le dernier utilise sur cette connexion
-		if (! is_resource($resultset)) { $resultset=$this->_results; }
-		return @mssql_fetch_row($resultset);
-	}
+        // Si le resultset n'est pas fourni, on prend le dernier utilise sur cette connexion
+        if (! is_resource($resultset)) { $resultset=$this->_results; }
+        return @mssql_fetch_row($resultset);
+    }
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
-	/**
+    /**
      *	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)
-	{
+     */
+    function num_rows($resultset)
+    {
         // phpcs:enable
-		// Si le resultset n'est pas fourni, on prend le dernier utilise sur cette connexion
-		if (! is_resource($resultset)) { $resultset=$this->_results; }
-		return mssql_num_rows($resultset);
-	}
+        // Si le resultset n'est pas fourni, on prend le dernier utilise sur cette connexion
+        if (! is_resource($resultset)) { $resultset=$this->_results; }
+        return mssql_num_rows($resultset);
+    }
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
-	/**
-	 *	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
-	 *	@see    num_rows
-	 */
-	function affected_rows($resultset)
-	{
+    /**
+     *	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
+     *	@see    num_rows
+     */
+    function affected_rows($resultset)
+    {
         // phpcs:enable
-		// Si le resultset n'est pas fourni, on prend le dernier utilise sur cette connexion
-		if (! is_resource($resultset)) { $resultset=$this->_results; }
-		// mssql necessite un link de base pour cette fonction contrairement
-		// a pqsql qui prend un resultset
-		$rsRows = mssql_query("select @@rowcount as rows", $this->db);
-		return mssql_result($rsRows, 0, "rows");
-		//return mssql_affected_rows($this->db);
-	}
-
-
-	/**
-	 *	Free last resultset used.
-	 *
-	 *	@param  resource	$resultset   Curseur de la requete voulue
-	 *	@return	bool
-	 */
-	function free($resultset=null)
-	{
-		// Si le resultset n'est pas fourni, on prend le dernier utilise sur cette connexion
-		if (! is_resource($resultset)) { $resultset=$this->_results; }
-		// Si resultset en est un, on libere la memoire
-		if (is_resource($resultset)) mssql_free_result($resultset);
-	}
-
-	/**
-	 *	Escape a string to insert data
-	 *
-	 *  @param	string	$stringtoencode		String to escape
-	 *  @return	string						String escaped
-	 */
-	function escape($stringtoencode)
-	{
-		return addslashes($stringtoencode);
-	}
-
-
-	/**
-	 *   Convert (by PHP) a GM Timestamp date into a PHP server TZ to insert into a date field.
-	 *   Function to use to build INSERT, UPDATE or WHERE predica
-	 *
-	 *   @param	    string	$param      Date TMS to convert
-	 *   @return	string      		Date in a string YYYY-MM-DD HH:MM:SS
-	 */
-	function idate($param)
-	{
-		return dol_print_date($param,"%Y-%m-%d %H:%M:%S");
-	}
-
-	/**
+        // Si le resultset n'est pas fourni, on prend le dernier utilise sur cette connexion
+        if (! is_resource($resultset)) { $resultset=$this->_results; }
+        // mssql necessite un link de base pour cette fonction contrairement
+        // a pqsql qui prend un resultset
+        $rsRows = mssql_query("select @@rowcount as rows", $this->db);
+        return mssql_result($rsRows, 0, "rows");
+        //return mssql_affected_rows($this->db);
+    }
+
+
+    /**
+     *	Free last resultset used.
+     *
+     *	@param  resource	$resultset   Curseur de la requete voulue
+     *	@return	bool
+     */
+    function free($resultset=null)
+    {
+        // Si le resultset n'est pas fourni, on prend le dernier utilise sur cette connexion
+        if (! is_resource($resultset)) { $resultset=$this->_results; }
+        // Si resultset en est un, on libere la memoire
+        if (is_resource($resultset)) mssql_free_result($resultset);
+    }
+
+    /**
+     *	Escape a string to insert data
+     *
+     *  @param	string	$stringtoencode		String to escape
+     *  @return	string						String escaped
+     */
+    function escape($stringtoencode)
+    {
+        return addslashes($stringtoencode);
+    }
+
+
+    /**
+     *   Convert (by PHP) a GM Timestamp date into a PHP server TZ to insert into a date field.
+     *   Function to use to build INSERT, UPDATE or WHERE predica
+     *
+     *   @param	    string	$param      Date TMS to convert
+     *   @return	string      		Date in a string YYYY-MM-DD HH:MM:SS
+     */
+    function idate($param)
+    {
+        return dol_print_date($param,"%Y-%m-%d %H:%M:%S");
+    }
+
+    /**
      *	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 MSSql 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',
-			1025 => 'DB_ERROR_NO_FOREIGN_KEY_TO_DROP',
-			1046 => 'DB_ERROR_NODBSELECTED',
-			1048 => 'DB_ERROR_CONSTRAINT',
-			2714 => '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',
-			2627 => 'DB_ERROR_RECORD_ALREADY_EXISTS',
-			102  => 'DB_ERROR_SYNTAX',
-			8120 => 'DB_ERROR_GROUP_BY_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',
-			1216 => 'DB_ERROR_NO_PARENT',
-			1217 => 'DB_ERROR_CHILD_EXISTS',
-			1451 => 'DB_ERROR_CHILD_EXISTS',
-			1913 => 'DB_ERROR_KEY_NAME_ALREADY_EXISTS'
-			);
-
-			if (isset($errorcode_map[$this->lasterrno]))
-			{
-				return $errorcode_map[$this->lasterrno];
-			}
-			$errno=$this->lasterrno;
-			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 mssql_get_last_message.
-			return 'Not connected. Check setup parameters in conf/conf.php file and your mssql client and server versions';
-		}
-		else {
-			return mssql_get_last_message();
-		}
-	}
+     */
+    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 MSSql 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',
+            1025 => 'DB_ERROR_NO_FOREIGN_KEY_TO_DROP',
+            1046 => 'DB_ERROR_NODBSELECTED',
+            1048 => 'DB_ERROR_CONSTRAINT',
+            2714 => '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',
+            2627 => 'DB_ERROR_RECORD_ALREADY_EXISTS',
+            102  => 'DB_ERROR_SYNTAX',
+            8120 => 'DB_ERROR_GROUP_BY_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',
+            1216 => 'DB_ERROR_NO_PARENT',
+            1217 => 'DB_ERROR_CHILD_EXISTS',
+            1451 => 'DB_ERROR_CHILD_EXISTS',
+            1913 => 'DB_ERROR_KEY_NAME_ALREADY_EXISTS'
+            );
+
+            if (isset($errorcode_map[$this->lasterrno]))
+            {
+                return $errorcode_map[$this->lasterrno];
+            }
+            $errno=$this->lasterrno;
+            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 mssql_get_last_message.
+            return 'Not connected. Check setup parameters in conf/conf.php file and your mssql client and server versions';
+        }
+        else {
+            return mssql_get_last_message();
+        }
+    }
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
-	/**
-	 * 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 or -1 on error
-	 */
-	function last_insert_id($tab,$fieldid='rowid')
-	{
+    /**
+     * 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 or -1 on error
+     */
+    function last_insert_id($tab,$fieldid='rowid')
+    {
         // phpcs:enable
-		$res = $this->query("SELECT @@IDENTITY as id");
-		if ($res && $data = $this->fetch_array($res))
-		{
-			return $data["id"];
-		}
-		else
-		{
-			return -1;
-		}
-	}
-
-	/**
+        $res = $this->query("SELECT @@IDENTITY as id");
+        if ($res && $data = $this->fetch_array($res))
+        {
+            return $data["id"];
+        }
+        else
+        {
+            return -1;
+        }
+    }
+
+    /**
      *  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;
+     */
+    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);
+        // 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 = $fieldorvalue;
-		return ($withQuotes?"'":"").$this->escape($return).($withQuotes?"'":"");
-	}
+        $return = $fieldorvalue;
+        return ($withQuotes?"'":"").$this->escape($return).($withQuotes?"'":"");
+    }
 
-	/**
+    /**
      *	Decrypt sensitive data in database
      *
      *	@param	string	$value			Value to decrypt
      * 	@return	string					Decrypted value if used
-	 */
-	function decrypt($value)
-	{
-		global $conf;
+     */
+    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 = $value;
-		return $return;
-	}
+        $return = $value;
+        return $return;
+    }
 
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
-	/**
-	 * Return connexion ID
-	 *
-	 * @return	        string      Id connexion
-	 */
-	function DDLGetConnectId()
-	{
+    /**
+     * Return connexion ID
+     *
+     * @return	        string      Id connexion
+     */
+    function DDLGetConnectId()
+    {
         // phpcs:enable
-		$resql=$this->query('SELECT CONNECTION_ID()');
-		if ($resql)
-		{
+        $resql=$this->query('SELECT CONNECTION_ID()');
+        if ($resql)
+        {
             $row=$this->fetch_row($resql);
             return $row[0];
-		}
-		else return '?';
-	}
+        }
+        else return '?';
+    }
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
-	/**
-	 *	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	false|resource|true		resource defined if OK, false if KO
-	 */
-	function DDLCreateDb($database,$charset='',$collation='',$owner='')
-	{
+    /**
+     *	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	false|resource|true		resource defined if OK, false if KO
+     */
+    function DDLCreateDb($database,$charset='',$collation='',$owner='')
+    {
         // phpcs:enable
         /*if (empty($charset))   $charset=$this->forcecharset;
         if (empty($collation)) $collation=$this->forcecollate;
         */
 
-		$sql = 'CREATE DATABASE '.$this->EscapeFieldName($database);
+        $sql = 'CREATE DATABASE '.$this->EscapeFieldName($database);
         //TODO: Check if we need to force a charset
-		//$sql.= ' DEFAULT CHARACTER SET '.$charset.' DEFAULT COLLATE '.$collation;
-		$ret=$this->query($sql);
+        //$sql.= ' DEFAULT CHARACTER SET '.$charset.' DEFAULT COLLATE '.$collation;
+        $ret=$this->query($sql);
 
-		$this->select_db($database);
-		$sql="CREATE USER [$owner] FOR LOGIN [$owner]";
-		mssql_query($sql,$this->db);
-		$sql="ALTER ROLE [db_owner] ADD MEMBER [$owner]";
-		mssql_query($sql,$this->db);
+        $this->select_db($database);
+        $sql="CREATE USER [$owner] FOR LOGIN [$owner]";
+        mssql_query($sql,$this->db);
+        $sql="ALTER ROLE [db_owner] ADD MEMBER [$owner]";
+        mssql_query($sql,$this->db);
 
-		$sql="ALTER DATABASE [$database] SET ANSI_NULL_DEFAULT ON;";
-	    @mssql_query($sql,$this->db);
-	    $sql="ALTER DATABASE [$database] SET ANSI_NULL ON;";
-	    @mssql_query($sql,$this->db);
+        $sql="ALTER DATABASE [$database] SET ANSI_NULL_DEFAULT ON;";
+        @mssql_query($sql,$this->db);
+        $sql="ALTER DATABASE [$database] SET ANSI_NULL ON;";
+        @mssql_query($sql,$this->db);
 
-	    return $ret;
-	}
+        return $ret;
+    }
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
-	/**
-	 *  List tables into a database
-	 *
-	 *  @param	string		$database	Name of database
-	 *  @param	string		$table		Nmae of table filter ('xxx%')
+    /**
+     *  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='')
-	{
+     */
+    function DDLListTables($database,$table='')
+    {
         // phpcs:enable
-		$this->_results = mssql_list_tables($database, $this->db);
-		return $this->_results;
-	}
+        $this->_results = mssql_list_tables($database, $this->db);
+        return $this->_results;
+    }
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
-	/**
-	 *	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)
-	{
+    /**
+     *	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)
+    {
         // phpcs:enable
 
-		// FIXME: Dummy method
-		// TODO: Implement
-		// May help: https://stackoverflow.com/questions/600446/sql-server-how-do-you-return-the-column-names-from-a-table
+        // FIXME: Dummy method
+        // TODO: Implement
+        // May help: https://stackoverflow.com/questions/600446/sql-server-how-do-you-return-the-column-names-from-a-table
 
-		$infotables=array();
-		return $infotables;
-	}
+        $infotables=array();
+        return $infotables;
+    }
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
-	/**
-	 *	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
-	 *	@param	    string	$type 			Type de la table
-	 *	@param	    array	$unique_keys 	Tableau associatifs Nom de champs qui seront clef unique => valeur
-	 *	@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)
-	{
+    /**
+     *	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
+     *	@param	    string	$type 			Type de la table
+     *	@param	    array	$unique_keys 	Tableau associatifs Nom de champs qui seront clef unique => valeur
+     *	@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)
+    {
         // phpcs:enable
-		// 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);
-		if(! $this -> query($sql))
-		return -1;
-		else
-		return 1;
-	}
+        // 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);
+        if(! $this -> query($sql))
+        return -1;
+        else
+        return 1;
+    }
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
-	/**
-	 *	Drop a table into database
-	 *
-	 *	@param	    string	$table 			Name of table
-	 *	@return	    int						<0 if KO, >=0 if OK
-	 */
-	function DDLDropTable($table)
-	{
+    /**
+     *	Drop a table into database
+     *
+     *	@param	    string	$table 			Name of table
+     *	@return	    int						<0 if KO, >=0 if OK
+     */
+    function DDLDropTable($table)
+    {
         // phpcs:enable
-		$sql = "DROP TABLE ".$table;
+        $sql = "DROP TABLE ".$table;
 
-		if (! $this->query($sql))
-			return -1;
-		else
-			return 1;
-	}
+        if (! $this->query($sql))
+            return -1;
+        else
+            return 1;
+    }
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
-	/**
-	 *	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	false|resource|true	Resource
-	 */
-	function DDLDescTable($table,$field="")
-	{
+    /**
+     *	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	false|resource|true	Resource
+     */
+    function DDLDescTable($table,$field="")
+    {
         // phpcs:enable
-		$sql="DESC ".$table." ".$field;
+        $sql="DESC ".$table." ".$field;
 
-		dol_syslog($sql);
-		$this->_results = $this->query($sql);
-		return $this->_results;
-	}
+        dol_syslog($sql);
+        $this->_results = $this->query($sql);
+        return $this->_results;
+    }
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
-	/**
-	 *	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="")
-	{
+    /**
+     *	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="")
+    {
         // phpcs:enable
-		// 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']))
-		$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;
-
-		if(! $this -> query($sql))
-		return -1;
-		else
-		return 1;
-	}
+        // 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']))
+        $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;
+
+        if(! $this -> query($sql))
+        return -1;
+        else
+        return 1;
+    }
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
-	/**
-	 *	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)
-	{
+    /**
+     *	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)
+    {
         // phpcs:enable
-		$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($sql,LOG_DEBUG);
-		if (! $this->query($sql))
-		return -1;
-		else
-		return 1;
-	}
+        $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($sql,LOG_DEBUG);
+        if (! $this->query($sql))
+        return -1;
+        else
+        return 1;
+    }
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
-	/**
-	 *	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)
-	{
+    /**
+     *	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)
+    {
         // phpcs:enable
-		$sql= "ALTER TABLE ".$table." DROP COLUMN `".$field_name."`";
-		dol_syslog($sql,LOG_DEBUG);
-		if (! $this->query($sql))
-		{
-			$this->error=$this->lasterror();
-			return -1;
-		}
-		else return 1;
-	}
+        $sql= "ALTER TABLE ".$table." DROP COLUMN `".$field_name."`";
+        dol_syslog($sql,LOG_DEBUG);
+        if (! $this->query($sql))
+        {
+            $this->error=$this->lasterror();
+            return -1;
+        }
+        else return 1;
+    }
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
-	/**
-	 * 	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)
-	{
+    /**
+     * 	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)
+    {
         // phpcs:enable
         $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
@@ -1025,12 +1025,12 @@ 
         {
             if ($this->lasterrno != '15025')
             {
-	            return -1;
+                return -1;
             }
             else
-			{
-            	// If user already exists, we continue to set permissions
-            	dol_syslog(get_class($this)."::DDLCreateUser sql=".$sql, LOG_WARNING);
+            {
+                // 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."'";
@@ -1051,8 +1051,8 @@ 
                 $this->query($sql);
             }
         }
-	    return 1;
-	}
+        return 1;
+    }
 
     /**
      *	Return charset used to store data in database
@@ -1060,158 +1060,158 @@ 
      *	@return		string		Charset
      */
     function getDefaultCharacterSetDatabase()
-	{
-		// FIXME: Dummy method
-		// TODO: Implement
-
-		return '';
-	}
-
-	/**
-	 *	Return list of available charset that can be used to store data in database
-	 *
-	 *	@return		array		List of Charset
-	 */
-	function getListOfCharacterSet()
-	{
-		// FIXME: Dummy method
-		// TODO: Implement
-
-		return '';
-	}
-
-	/**
-	 *	Return collation used in database
-	 *
-	 *	@return		string		Collation value
-	 */
-	function getDefaultCollationDatabase()
-	{
-		$resql=$this->query("SELECT SERVERPROPERTY('collation')");
-		if (!$resql)
-		{
-			return $this->forcecollate;
-		}
-		$liste=$this->fetch_array($resql);
-		return $liste['computed'];
-	}
-
-	/**
-	 *	Return list of available collation that can be used for database
-	 *
-	 *	@return		array		Liste of Collation
-	 */
-	function getListOfCollation()
-	{
-		// FIXME: Dummy method
-		// TODO: Implement
-
-		return array();
-	}
-
-	/**
-	 *	Return full path of dump program
-	 *
-	 *	@return		string		Full path of dump program
-	 */
-	function getPathOfDump()
-	{
-		// FIXME: Dummy method
-		// TODO: Implement
-
-	    return '';
-	}
-
-	/**
-	 *	Return full path of restore program
-	 *
-	 *	@return		string		Full path of restore program
-	 */
-	function getPathOfRestore()
-	{
-		// FIXME: Dummy method
-		// TODO: Implement
-
-	    return '';
-	}
-
-	/**
-	 * 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='')
-	{
-		// FIXME: Dummy method
-		// TODO: Implement
-		// May help: SELECT SERVERPROPERTY
-
-		$result=array();
-		return $result;
-	}
-
-	/**
-	 * 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='')
-	{
-		// FIXME: Dummy method
-		// TODO: Implement
-		// May help: http://www.experts-exchange.com/Database/MS-SQL-Server/Q_20971756.html
-
-		return array();
-	}
+    {
+        // FIXME: Dummy method
+        // TODO: Implement
+
+        return '';
+    }
+
+    /**
+     *	Return list of available charset that can be used to store data in database
+     *
+     *	@return		array		List of Charset
+     */
+    function getListOfCharacterSet()
+    {
+        // FIXME: Dummy method
+        // TODO: Implement
+
+        return '';
+    }
+
+    /**
+     *	Return collation used in database
+     *
+     *	@return		string		Collation value
+     */
+    function getDefaultCollationDatabase()
+    {
+        $resql=$this->query("SELECT SERVERPROPERTY('collation')");
+        if (!$resql)
+        {
+            return $this->forcecollate;
+        }
+        $liste=$this->fetch_array($resql);
+        return $liste['computed'];
+    }
+
+    /**
+     *	Return list of available collation that can be used for database
+     *
+     *	@return		array		Liste of Collation
+     */
+    function getListOfCollation()
+    {
+        // FIXME: Dummy method
+        // TODO: Implement
+
+        return array();
+    }
+
+    /**
+     *	Return full path of dump program
+     *
+     *	@return		string		Full path of dump program
+     */
+    function getPathOfDump()
+    {
+        // FIXME: Dummy method
+        // TODO: Implement
+
+        return '';
+    }
+
+    /**
+     *	Return full path of restore program
+     *
+     *	@return		string		Full path of restore program
+     */
+    function getPathOfRestore()
+    {
+        // FIXME: Dummy method
+        // TODO: Implement
+
+        return '';
+    }
+
+    /**
+     * 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='')
+    {
+        // FIXME: Dummy method
+        // TODO: Implement
+        // May help: SELECT SERVERPROPERTY
+
+        $result=array();
+        return $result;
+    }
+
+    /**
+     * 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='')
+    {
+        // FIXME: Dummy method
+        // TODO: Implement
+        // May help: http://www.experts-exchange.com/Database/MS-SQL-Server/Q_20971756.html
+
+        return array();
+    }
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
-	/**
-	 *    Escape a field name according to escape's syntax
-	 *
-	 * @param      string $fieldname   Field's name to escape
-	 * @return     string              field's name escaped
-	 */
+    /**
+     *    Escape a field name according to escape's syntax
+     *
+     * @param      string $fieldname   Field's name to escape
+     * @return     string              field's name escaped
+     */
     function EscapeFieldName($fieldname)
     {
         // phpcs:enable
-	    return "[".$fieldname."]";
-	}
+        return "[".$fieldname."]";
+    }
 
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
-	/**
-	 * Get information on field
-	 *
-	 * @param      string  $table      Table name which contains fields
-	 * @param      mixed   $fields     String for one field or array of string for multiple field
-	 * @return false|object
-	 */
+    /**
+     * Get information on field
+     *
+     * @param      string  $table      Table name which contains fields
+     * @param      mixed   $fields     String for one field or array of string for multiple field
+     * @return false|object
+     */
     function GetFieldInformation($table,$fields)
     {
         // phpcs:enable
-	    $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;
+    }
 }

Braces +107 added lines, -93 removed lines

@@ -90,8 +90,7 @@ 
 			// (La base Dolibarr a ete forcee en this->forcecharset a l'install)
 			$this->connected = true;
 			$this->ok = true;
-		}
-		else
+		} else
 		{
 			// host, login ou password incorrect
 			$this->connected = false;
@@ -108,8 +107,7 @@ 
 				$this->database_selected = true;
 				$this->database_name = $name;
 				$this->ok = true;
-			}
-			else
+			} else
 			{
 				$this->database_selected = false;
 				$this->database_name = '';
@@ -117,8 +115,7 @@ 
 				$this->error=$this->error();
 				dol_syslog(get_class($this)."::DoliDBMssql : Erreur Select_db ".$this->error,LOG_ERR);
 			}
-		}
-		else
+		} else
 		{
 			// Pas de selection de base demandee, ok ou ko
 			$this->database_selected = false;
@@ -167,7 +164,9 @@ 
 	{
 		dol_syslog(get_class($this)."::connect host=$host, port=$port, login=$login, passwd=--hidden--, name=$name");
 		$newhost=$host;
-		if ($port) $newhost.=':'.$port;
+		if ($port) {
+		    $newhost.=':'.$port;
+		}
 		$this->db  = @mssql_connect($newhost, $login, $passwd);
 		//force les enregistrement en latin1 si la base est en utf8 par defaut
 		// Supprime car plante sur mon PHP-Mysql. De plus, la base est forcement en latin1 avec
@@ -198,8 +197,9 @@ 
 		{
             $version=$this->fetch_array($resql);
             return $version['computed'];
+		} else {
+		    return '';
 		}
-		else return '';
 	}
 
 	/**
@@ -222,7 +222,9 @@ 
     {
         if ($this->db)
         {
-          if ($this->transaction_opened > 0) dol_syslog(get_class($this)."::close Closing a connection with an opened transaction depth=".$this->transaction_opened,LOG_ERR);
+          if ($this->transaction_opened > 0) {
+              dol_syslog(get_class($this)."::close Closing a connection with an opened transaction depth=".$this->transaction_opened,LOG_ERR);
+          }
           $this->connected=false;
           return mssql_close($this->db);
         }
@@ -250,8 +252,7 @@ 
 				dol_syslog("BEGIN Transaction",LOG_DEBUG);
 			}
 			return $ret;
-		}
-		else
+		} else
 		{
 			return true;
 		}
@@ -276,13 +277,11 @@ 
 			{
 				dol_syslog("COMMIT Transaction",LOG_DEBUG);
 				return true;
-			}
-			else
+			} else
 			{
 				return false;
 			}
-		}
-		elseif ($this->transaction_opened > 1)
+		} elseif ($this->transaction_opened > 1)
 		{
 			return true;
 		}
@@ -306,8 +305,7 @@ 
 			$ret=mssql_query("ROLLBACK TRANSACTION",$this->db);
 			dol_syslog("ROLLBACK Transaction".($log?' '.$log:''),LOG_DEBUG);
 			return $ret;
-		}
-		elseif ($this->transaction_opened > 1)
+		} elseif ($this->transaction_opened > 1)
 		{
 			return true;
 		}
@@ -328,7 +326,9 @@ 
 	{
 		$query = trim($query);
 
-		if (preg_match('/^--/',$query)) return true;
+		if (preg_match('/^--/',$query)) {
+		    return true;
+		}
 
 		// Conversion syntaxe MySql vers MSDE.
 		$query = str_ireplace("now()", "getdate()", $query);
@@ -362,11 +362,11 @@ 
                             $query_comp[]=$fld->COLUMN_NAME." IS NOT NULL";
                         }
                     }
-                    if (! empty($query_comp))
-                        $query.=" WHERE ".implode(" AND ",$query_comp);
+                    if (! empty($query_comp)) {
+                                            $query.=" WHERE ".implode(" AND ",$query_comp);
+                    }
                 }
-    		}
-    		else
+    		} else
     		{
     		    if (preg_match('/ALTER TABLE\h+(\w+?)\h+ADD\h+PRIMARY\h+KEY\h+(\w+?)\h*\((.+)\)/is', $query, $matches))
     		    {
@@ -419,14 +419,15 @@ 
 		}
 		//print "<!--".$query."-->";
 
-		if (! in_array($query,array('BEGIN','COMMIT','ROLLBACK'))) dol_syslog('sql='.$query, LOG_DEBUG);
+		if (! in_array($query,array('BEGIN','COMMIT','ROLLBACK'))) {
+		    dol_syslog('sql='.$query, LOG_DEBUG);
+		}
 
 		if (! $this->database_name)
 		{
 			// Ordre SQL ne necessitant pas de connexion a une base (exemple: CREATE DATABASE)
 			$ret = mssql_query($query, $this->db);
-		}
-		else
+		} else
 		{
 			$ret = mssql_query($query, $this->db);
 		}
@@ -449,7 +450,9 @@ 
 				$this->lasterrno = $row["code"];
 
 				dol_syslog(get_class($this)."::query SQL Error query: ".$query, LOG_ERR);
-				if ($original_query) dol_syslog(get_class($this)."::query SQL Original query: ".$original_query, LOG_ERR);
+				if ($original_query) {
+				    dol_syslog(get_class($this)."::query SQL Original query: ".$original_query, LOG_ERR);
+				}
 				dol_syslog(get_class($this)."::query SQL Error message: ".$this->lasterror." (".$this->lasterrno.")", LOG_ERR);
 			}
 			$this->lastquery=$query;
@@ -553,7 +556,9 @@ 
 		// Si le resultset n'est pas fourni, on prend le dernier utilise sur cette connexion
 		if (! is_resource($resultset)) { $resultset=$this->_results; }
 		// Si resultset en est un, on libere la memoire
-		if (is_resource($resultset)) mssql_free_result($resultset);
+		if (is_resource($resultset)) {
+		    mssql_free_result($resultset);
+		}
 	}
 
 	/**
@@ -591,8 +596,7 @@ 
 		{
 			// Si il y a eu echec de connexion, $this->db n'est pas valide.
 			return 'DB_ERROR_FAILED_TO_CONNECT';
-		}
-		else
+		} else
 		{
 			// Constants to convert a MSSql error code to a generic Dolibarr error code
 			$errorcode_map = array(
@@ -643,8 +647,7 @@ 
 		if (! $this->connected) {
 			// Si il y a eu echec de connexion, $this->db n'est pas valide pour mssql_get_last_message.
 			return 'Not connected. Check setup parameters in conf/conf.php file and your mssql client and server versions';
-		}
-		else {
+		} else {
 			return mssql_get_last_message();
 		}
 	}
@@ -664,8 +667,7 @@ 
 		if ($res && $data = $this->fetch_array($res))
 		{
 			return $data["id"];
-		}
-		else
+		} else
 		{
 			return -1;
 		}
@@ -728,8 +730,9 @@ 
 		{
             $row=$this->fetch_row($resql);
             return $row[0];
+		} else {
+		    return '?';
 		}
-		else return '?';
 	}
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
@@ -830,26 +833,27 @@ 
 		{
 			$sqlfields[$i] = $field_name." ";
 			$sqlfields[$i]  .= $field_desc['type'];
-			if( preg_match("/^[^\s]/i",$field_desc['value']))
-			$sqlfields[$i]  .= "(".$field_desc['value'].")";
-			else if( preg_match("/^[^\s]/i",$field_desc['attribute']))
-			$sqlfields[$i]  .= " ".$field_desc['attribute'];
-			else if( preg_match("/^[^\s]/i",$field_desc['default']))
+			if( preg_match("/^[^\s]/i",$field_desc['value'])) {
+						$sqlfields[$i]  .= "(".$field_desc['value'].")";
+			} else if( preg_match("/^[^\s]/i",$field_desc['attribute'])) {
+						$sqlfields[$i]  .= " ".$field_desc['attribute'];
+			} else if( preg_match("/^[^\s]/i",$field_desc['default']))
 			{
-				if(preg_match("/null/i",$field_desc['default']))
-				$sqlfields[$i]  .= " default ".$field_desc['default'];
-				else
-				$sqlfields[$i]  .= " default '".$field_desc['default']."'";
+				if(preg_match("/null/i",$field_desc['default'])) {
+								$sqlfields[$i]  .= " default ".$field_desc['default'];
+				} else {
+								$sqlfields[$i]  .= " default '".$field_desc['default']."'";
+				}
+			} else if( preg_match("/^[^\s]/i",$field_desc['null'])) {
+						$sqlfields[$i]  .= " ".$field_desc['null'];
+			} else if( preg_match("/^[^\s]/i",$field_desc['extra'])) {
+						$sqlfields[$i]  .= " ".$field_desc['extra'];
 			}
-			else if( preg_match("/^[^\s]/i",$field_desc['null']))
-			$sqlfields[$i]  .= " ".$field_desc['null'];
-
-			else if( preg_match("/^[^\s]/i",$field_desc['extra']))
-			$sqlfields[$i]  .= " ".$field_desc['extra'];
 			$i++;
 		}
-		if($primary_key != "")
-		$pk = "primary key(".$primary_key.")";
+		if($primary_key != "") {
+				$pk = "primary key(".$primary_key.")";
+		}
 
 		if(is_array($unique_keys))
 		{
@@ -870,19 +874,23 @@ 
 			}
 		}
 		$sql .= implode(',',$sqlfields);
-		if($primary_key != "")
-		$sql .= ",".$pk;
-		if(is_array($unique_keys))
-		$sql .= ",".implode(',',$sqluq);
-		if(is_array($keys))
-		$sql .= ",".implode(',',$sqlk);
+		if($primary_key != "") {
+				$sql .= ",".$pk;
+		}
+		if(is_array($unique_keys)) {
+				$sql .= ",".implode(',',$sqluq);
+		}
+		if(is_array($keys)) {
+				$sql .= ",".implode(',',$sqlk);
+		}
 		$sql .=") type=".$type;
 
 		dol_syslog($sql);
-		if(! $this -> query($sql))
-		return -1;
-		else
-		return 1;
+		if(! $this -> query($sql)) {
+				return -1;
+		} else {
+				return 1;
+		}
 	}
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
@@ -897,10 +905,11 @@ 
         // phpcs:enable
 		$sql = "DROP TABLE ".$table;
 
-		if (! $this->query($sql))
-			return -1;
-		else
-			return 1;
+		if (! $this->query($sql)) {
+					return -1;
+		} else {
+					return 1;
+		}
 	}
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
@@ -938,25 +947,31 @@ 
 		// ex. : $field_desc = array('type'=>'int','value'=>'11','null'=>'not null','extra'=> 'auto_increment');
 		$sql= "ALTER TABLE ".$table." ADD ".$field_name." ";
 		$sql .= $field_desc['type'];
-		if( preg_match("/^[^\s]/i",$field_desc['value']))
-		$sql  .= "(".$field_desc['value'].")";
-		if( preg_match("/^[^\s]/i",$field_desc['attribute']))
-		$sql  .= " ".$field_desc['attribute'];
-		if( preg_match("/^[^\s]/i",$field_desc['null']))
-		$sql  .= " ".$field_desc['null'];
-		if( preg_match("/^[^\s]/i",$field_desc['default']))
-		if(preg_match("/null/i",$field_desc['default']))
+		if( preg_match("/^[^\s]/i",$field_desc['value'])) {
+				$sql  .= "(".$field_desc['value'].")";
+		}
+		if( preg_match("/^[^\s]/i",$field_desc['attribute'])) {
+				$sql  .= " ".$field_desc['attribute'];
+		}
+		if( preg_match("/^[^\s]/i",$field_desc['null'])) {
+				$sql  .= " ".$field_desc['null'];
+		}
+		if( preg_match("/^[^\s]/i",$field_desc['default'])) {
+				if(preg_match("/null/i",$field_desc['default']))
 		$sql  .= " default ".$field_desc['default'];
-		else
-		$sql  .= " default '".$field_desc['default']."'";
-		if( preg_match("/^[^\s]/i",$field_desc['extra']))
-		$sql  .= " ".$field_desc['extra'];
+		} else {
+				$sql  .= " default '".$field_desc['default']."'";
+		}
+		if( preg_match("/^[^\s]/i",$field_desc['extra'])) {
+				$sql  .= " ".$field_desc['extra'];
+		}
 		$sql .= " ".$field_position;
 
-		if(! $this -> query($sql))
-		return -1;
-		else
-		return 1;
+		if(! $this -> query($sql)) {
+				return -1;
+		} else {
+				return 1;
+		}
 	}
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
@@ -978,10 +993,11 @@ 
 		}
 
 		dol_syslog($sql,LOG_DEBUG);
-		if (! $this->query($sql))
-		return -1;
-		else
-		return 1;
+		if (! $this->query($sql)) {
+				return -1;
+		} else {
+				return 1;
+		}
 	}
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
@@ -1001,8 +1017,9 @@ 
 		{
 			$this->error=$this->lasterror();
 			return -1;
+		} else {
+		    return 1;
 		}
-		else return 1;
 	}
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
@@ -1026,8 +1043,7 @@ 
             if ($this->lasterrno != '15025')
             {
 	            return -1;
-            }
-            else
+            } else
 			{
             	// If user already exists, we continue to set permissions
             	dol_syslog(get_class($this)."::DDLCreateUser sql=".$sql, LOG_WARNING);
@@ -1039,8 +1055,7 @@ 
         {
             dol_syslog(get_class($this)."::DDLCreateUser sql=".$sql, LOG_WARNING);
             return -1;
-        }
-        else
+        } else
         {
             if ($num)
             {
@@ -1195,8 +1210,7 @@ 
 	    if (is_array($fields))
 	    {
 	        $where=" IN ('".implode("','",$fields)."')";
-	    }
-	    else
+	    } else
 	    {
 	        $where="='".$this->escape($fields)."'";
 	    }
@@ -1208,9 +1222,9 @@ 
 	        {
 	            $result[]=$obj;
 	        }
+	    } else {
+	    	        return false;
 	    }
-	    else
-	        return false;
 
 	    return $result;
 	}

Spacing +178 added lines, -178 removed lines

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

dolibarr/htdocs/core/db/mysqli.class.php

Indentation +209 added lines, -209 removed lines

@@ -32,27 +32,27 @@ 
  */
 class DoliDBMysqli extends DoliDB
 {
-	/** @var mysqli Database object */
-	public $db;
+    /** @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';
-	/** @var mysqli_result Resultset of last query */
-	private $_results;
+    /** @var mysqli_result Resultset of last query */
+    private $_results;
 
     /**
-	 *	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
+     *	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)
     {
@@ -86,21 +86,21 @@ 
             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
-		$this->db = $this->connect($host, $user, $pass, '', $port);
-
-		if ($this->db->connect_errno) {
-			$this->connected = false;
-			$this->ok = false;
-			$this->error = $this->db->connect_error;
-			dol_syslog(get_class($this) . "::DoliDBMysqli Connect error: " . $this->error, LOG_ERR);
-		} else {
-			$this->connected = true;
-			$this->ok = true;
-		}
-
-		// If server connection is ok, we try to connect to the database
+        // Try server connection
+        // 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, '', $port);
+
+        if ($this->db->connect_errno) {
+            $this->connected = false;
+            $this->ok = false;
+            $this->error = $this->db->connect_error;
+            dol_syslog(get_class($this) . "::DoliDBMysqli Connect error: " . $this->error, LOG_ERR);
+        } else {
+            $this->connected = true;
+            $this->ok = true;
+        }
+
+        // If server connection is ok, we try to connect to the database
         if ($this->connected && $name)
         {
             if ($this->select_db($name))
@@ -113,14 +113,14 @@ 
                 $clientmustbe=empty($conf->db->dolibarr_main_db_character_set)?'utf8':$conf->db->dolibarr_main_db_character_set;
                 if (preg_match('/latin1/', $clientmustbe)) $clientmustbe='utf8';
 
-				if ($this->db->character_set_name() != $clientmustbe) {
-					$this->db->set_charset($clientmustbe);	// This set charset, but with a bad collation
+                if ($this->db->character_set_name() != $clientmustbe) {
+                    $this->db->set_charset($clientmustbe);	// This set charset, but with a bad collation
 
-					$collation = $conf->db->dolibarr_main_db_collation;
-					if (preg_match('/latin1/', $collation)) $collation='utf8_unicode_ci';
+                    $collation = $conf->db->dolibarr_main_db_collation;
+                    if (preg_match('/latin1/', $collation)) $collation='utf8_unicode_ci';
 
-					if (! preg_match('/general/', $collation)) $this->db->query("SET collation_connection = ".$collation);
-				}
+                    if (! preg_match('/general/', $collation)) $this->db->query("SET collation_connection = ".$collation);
+                }
             }
             else
             {
@@ -138,19 +138,19 @@ 
 
             if ($this->connected)
             {
-            	// If client is old latin, we force utf8
-            	$clientmustbe=empty($conf->db->dolibarr_main_db_character_set)?'utf8':$conf->db->dolibarr_main_db_character_set;
-            	if (preg_match('/latin1/', $clientmustbe)) $clientmustbe='utf8';
+                // If client is old latin, we force utf8
+                $clientmustbe=empty($conf->db->dolibarr_main_db_character_set)?'utf8':$conf->db->dolibarr_main_db_character_set;
+                if (preg_match('/latin1/', $clientmustbe)) $clientmustbe='utf8';
 
-				if ($this->db->character_set_name() != $clientmustbe) {
-					$this->db->set_charset($clientmustbe);	// This set utf8_general_ci
+                if ($this->db->character_set_name() != $clientmustbe) {
+                    $this->db->set_charset($clientmustbe);	// This set utf8_general_ci
 
-					$collation = $conf->db->dolibarr_main_db_collation;
-					if (preg_match('/latin1/', $collation)) $collation='utf8_unicode_ci';
+                    $collation = $conf->db->dolibarr_main_db_collation;
+                    if (preg_match('/latin1/', $collation)) $collation='utf8_unicode_ci';
 
-					if (! preg_match('/general/', $collation)) $this->db->query("SET collation_connection = ".$collation);
-				}
-			}
+                    if (! preg_match('/general/', $collation)) $this->db->query("SET collation_connection = ".$collation);
+                }
+            }
         }
     }
 
@@ -168,12 +168,12 @@ 
     }
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
-	/**
-	 *  Select a database
-	 *
-	 *  @param	    string	$database	Name of database
-	 *  @return	    boolean  		    true if OK, false if KO
-	 */
+    /**
+     *  Select a database
+     *
+     *  @param	    string	$database	Name of database
+     *  @return	    boolean  		    true if OK, false if KO
+     */
     function select_db($database)
     {
         // phpcs:enable
@@ -182,31 +182,31 @@ 
     }
 
 
-	/**
-	 * Connect to server
-	 *
-	 * @param   string $host database server host
-	 * @param   string $login login
-	 * @param   string $passwd password
-	 * @param   string $name name of database (not used for mysql, used for pgsql)
-	 * @param   integer $port Port of database server
-	 * @return  mysqli  Database access object
-	 * @see close
-	 */
-	function connect($host, $login, $passwd, $name, $port = 0)
-	{
-		dol_syslog(get_class($this) . "::connect host=$host, port=$port, login=$login, passwd=--hidden--, name=$name", LOG_DEBUG);
-
-		// Can also be
-		// mysqli::init(); mysql::options(MYSQLI_INIT_COMMAND, 'SET AUTOCOMMIT = 0'); mysqli::options(MYSQLI_OPT_CONNECT_TIMEOUT, 5);
-		// return mysqli::real_connect($host, $user, $pass, $db, $port);
-		return new mysqli($host, $login, $passwd, $name, $port);
-	}
+    /**
+     * Connect to server
+     *
+     * @param   string $host database server host
+     * @param   string $login login
+     * @param   string $passwd password
+     * @param   string $name name of database (not used for mysql, used for pgsql)
+     * @param   integer $port Port of database server
+     * @return  mysqli  Database access object
+     * @see close
+     */
+    function connect($host, $login, $passwd, $name, $port = 0)
+    {
+        dol_syslog(get_class($this) . "::connect host=$host, port=$port, login=$login, passwd=--hidden--, name=$name", LOG_DEBUG);
+
+        // Can also be
+        // mysqli::init(); mysql::options(MYSQLI_INIT_COMMAND, 'SET AUTOCOMMIT = 0'); mysqli::options(MYSQLI_OPT_CONNECT_TIMEOUT, 5);
+        // return mysqli::real_connect($host, $user, $pass, $db, $port);
+        return new mysqli($host, $login, $passwd, $name, $port);
+    }
 
     /**
-	 *	Return version of database server
-	 *
-	 *	@return	        string      Version string
+     *	Return version of database server
+     *
+     *	@return	        string      Version string
      */
     function getVersion()
     {
@@ -218,10 +218,10 @@ 
      *
      *	@return	        string      Version string
      */
-	function getDriverInfo()
-	{
-		return $this->db->client_info;
-	}
+    function getDriverInfo()
+    {
+        return $this->db->client_info;
+    }
 
 
     /**
@@ -234,7 +234,7 @@ 
     {
         if ($this->db)
         {
-	        if ($this->transaction_opened > 0) dol_syslog(get_class($this)."::close Closing a connection with an opened transaction depth=".$this->transaction_opened,LOG_ERR);
+            if ($this->transaction_opened > 0) dol_syslog(get_class($this)."::close Closing a connection with an opened transaction depth=".$this->transaction_opened,LOG_ERR);
             $this->connected=false;
             return $this->db->close();
         }
@@ -252,11 +252,11 @@ 
      */
     function query($query,$usesavepoint=0,$type='auto')
     {
-    	global $conf;
+        global $conf;
 
         $query = trim($query);
 
-	    if (! in_array($query,array('BEGIN','COMMIT','ROLLBACK'))) dol_syslog('sql='.$query, LOG_DEBUG);
+        if (! in_array($query,array('BEGIN','COMMIT','ROLLBACK'))) dol_syslog('sql='.$query, LOG_DEBUG);
 
         if (! $this->database_name)
         {
@@ -277,7 +277,7 @@ 
                 $this->lasterror = $this->error();
                 $this->lasterrno = $this->errno();
 
-				if ($conf->global->SYSLOG_LEVEL < LOG_DEBUG) dol_syslog(get_class($this)."::query SQL Error query: ".$query, LOG_ERR);	// Log of request was not yet done previously
+                if ($conf->global->SYSLOG_LEVEL < LOG_DEBUG) dol_syslog(get_class($this)."::query SQL Error query: ".$query, LOG_ERR);	// Log of request was not yet done previously
                 dol_syslog(get_class($this)."::query SQL Error message: ".$this->lasterrno." ".$this->lasterror, LOG_ERR);
             }
             $this->lastquery=$query;
@@ -299,7 +299,7 @@ 
         // phpcs:enable
         // 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 $resultset->fetch_object();
     }
 
 
@@ -453,9 +453,9 @@ 
     }
 
     /**
-	 *	Return description of last error
-	 *
-	 *	@return	string		Error text
+     *	Return description of last error
+     *
+     *	@return	string		Error text
      */
     function error()
     {
@@ -470,11 +470,11 @@ 
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
     /**
-	 * 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
+     * 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')
     {
@@ -554,9 +554,9 @@ 
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
     /**
-	 * Return connexion ID
-	 *
-	 * @return	        string      Id connexion
+     * Return connexion ID
+     *
+     * @return	        string      Id connexion
      */
     function DDLGetConnectId()
     {
@@ -573,14 +573,14 @@ 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
     /**
      *  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	bool|mysqli_result		resource defined if OK, null if KO
+     *	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	bool|mysqli_result		resource defined if OK, null if KO
      */
     function DDLCreateDb($database,$charset='',$collation='',$owner='')
     {
@@ -589,8 +589,8 @@ 
         if (empty($collation)) $collation=$this->forcecollate;
 
         // ALTER DATABASE dolibarr_db DEFAULT CHARACTER SET latin DEFAULT COLLATE latin1_swedish_ci
-		$sql = "CREATE DATABASE `".$this->escape($database)."`";
-		$sql.= " DEFAULT CHARACTER SET `".$this->escape($charset)."` DEFAULT COLLATE `".$this->escape($collation)."`";
+        $sql = "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);
@@ -606,11 +606,11 @@ 
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
     /**
-	 *  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
+     *  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='')
     {
@@ -634,10 +634,10 @@ 
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
     /**
-	 *	List information of columns into a table.
-	 *
-	 *	@param	string	$table		Name of table
-	 *	@return	array				Tableau des informations des champs de la table
+     *	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)
     {
@@ -660,21 +660,21 @@ 
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
     /**
-	 *	Create a table into database
-	 *
-	 *	@param	    string	$table 			Name of table
-	 *	@param	    array	$fields 		Tableau associatif [nom champ][tableau des descriptions]
-	 *	@param	    string	$primary_key 	Nom du champ qui sera la clef primaire
-	 *	@param	    string	$type 			Type de la table
-	 *	@param	    array	$unique_keys 	Tableau associatifs Nom de champs qui seront clef unique => valeur
-	 *	@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
+     *	Create a table into database
+     *
+     *	@param	    string	$table 			Name of table
+     *	@param	    array	$fields 		Tableau associatif [nom champ][tableau des descriptions]
+     *	@param	    string	$primary_key 	Nom du champ qui sera la clef primaire
+     *	@param	    string	$type 			Type de la table
+     *	@param	    array	$unique_keys 	Tableau associatifs Nom de champs qui seront clef unique => valeur
+     *	@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)
     {
         // phpcs:enable
-	    // FIXME: $fulltext_keys parameter is unused
+        // 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');
@@ -682,29 +682,29 @@ 
         $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'].")";
-			}
-			if( preg_match("/^[^\s]/i",$field_desc['attribute'])) {
-				$sqlfields[$i]  .= " ".$field_desc['attribute'];
-			}
-			if( preg_match("/^[^\s]/i",$field_desc['default']))
-			{
-				if ((preg_match("/null/i",$field_desc['default'])) || (preg_match("/CURRENT_TIMESTAMP/i",$field_desc['default']))) {
-					$sqlfields[$i]  .= " default ".$field_desc['default'];
-				}
-				else {
-					$sqlfields[$i]  .= " default '".$field_desc['default']."'";
-				}
-			}
-			if( preg_match("/^[^\s]/i",$field_desc['null'])) {
-				$sqlfields[$i]  .= " ".$field_desc['null'];
-			}
-			if( preg_match("/^[^\s]/i",$field_desc['extra'])) {
-				$sqlfields[$i]  .= " ".$field_desc['extra'];
-			}
+            $sqlfields[$i] = $field_name." ";
+            $sqlfields[$i]  .= $field_desc['type'];
+            if( preg_match("/^[^\s]/i",$field_desc['value'])) {
+                $sqlfields[$i]  .= "(".$field_desc['value'].")";
+            }
+            if( preg_match("/^[^\s]/i",$field_desc['attribute'])) {
+                $sqlfields[$i]  .= " ".$field_desc['attribute'];
+            }
+            if( preg_match("/^[^\s]/i",$field_desc['default']))
+            {
+                if ((preg_match("/null/i",$field_desc['default'])) || (preg_match("/CURRENT_TIMESTAMP/i",$field_desc['default']))) {
+                    $sqlfields[$i]  .= " default ".$field_desc['default'];
+                }
+                else {
+                    $sqlfields[$i]  .= " default '".$field_desc['default']."'";
+                }
+            }
+            if( preg_match("/^[^\s]/i",$field_desc['null'])) {
+                $sqlfields[$i]  .= " ".$field_desc['null'];
+            }
+            if( preg_match("/^[^\s]/i",$field_desc['extra'])) {
+                $sqlfields[$i]  .= " ".$field_desc['extra'];
+            }
             $i++;
         }
         if($primary_key != "")
@@ -754,19 +754,19 @@ 
         // phpcs:enable
         $sql = "DROP TABLE ".$table;
 
-		if (! $this->query($sql))
- 			return -1;
-    	else
-    		return 1;
+        if (! $this->query($sql))
+                return -1;
+        else
+            return 1;
     }
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
     /**
-	 *	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, ...)
+     *	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="")
     {
@@ -780,13 +780,13 @@ 
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
     /**
-	 *	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
+     *	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="")
     {
@@ -804,11 +804,11 @@ 
         }
         if (isset($field_desc['attribute']) && preg_match("/^[^\s]/i",$field_desc['attribute']))
         {
-        	$sql.= " ".$field_desc['attribute'];
+            $sql.= " ".$field_desc['attribute'];
         }
         if (isset($field_desc['null']) && preg_match("/^[^\s]/i",$field_desc['null']))
         {
-        	$sql.= " ".$field_desc['null'];
+            $sql.= " ".$field_desc['null'];
         }
         if (isset($field_desc['default']) && preg_match("/^[^\s]/i",$field_desc['default']))
         {
@@ -819,7 +819,7 @@ 
         }
         if (isset($field_desc['extra']) && preg_match("/^[^\s]/i",$field_desc['extra']))
         {
-        	$sql.= " ".$field_desc['extra'];
+            $sql.= " ".$field_desc['extra'];
         }
         $sql.= " ".$field_position;
 
@@ -832,12 +832,12 @@ 
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
     /**
-	 *	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
+     *	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)
     {
@@ -845,29 +845,29 @@ 
         $sql = "ALTER TABLE ".$table;
         $sql .= " MODIFY COLUMN ".$field_name." ".$field_desc['type'];
         if ($field_desc['type'] == 'double' || $field_desc['type'] == 'tinyint' || $field_desc['type'] == 'int' || $field_desc['type'] == 'varchar') {
-        	$sql.="(".$field_desc['value'].")";
+            $sql.="(".$field_desc['value'].")";
         }
         if ($field_desc['null'] == 'not null' || $field_desc['null'] == 'NOT NULL')
         {
-        	// We will try to change format of column to NOT NULL. To be sure the ALTER works, we try to update fields that are NULL
-        	if ($field_desc['type'] == 'varchar' || $field_desc['type'] == 'text')
-        	{
-        		$sqlbis="UPDATE ".$table." SET ".$field_name." = '".$this->escape($field_desc['default'] ? $field_desc['default'] : '')."' WHERE ".$field_name." IS NULL";
-        		$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";
+            // 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
+            if ($field_desc['type'] == 'double' || $field_desc['type'] == 'tinyint' || $field_desc['type'] == 'int') $sql.=" DEFAULT ".$this->escape($field_desc['default']);
+            elseif ($field_desc['type'] == 'text') $sql.=" DEFAULT '".$this->escape($field_desc['default'])."'";							// Default not supported on text fields
         }
 
         dol_syslog(get_class($this)."::DDLUpdateField ".$sql,LOG_DEBUG);
@@ -879,11 +879,11 @@ 
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
     /**
-	 *	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
+     *	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)
     {
@@ -900,13 +900,13 @@ 
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
     /**
-	 * 	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 '%'
-	 *	@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
+     * 	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 '%'
+     *	@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)
     {
@@ -918,12 +918,12 @@ 
         {
             if ($this->lasterrno != 'DB_ERROR_USER_ALREADY_EXISTS')
             {
-            	return -1;
+                return -1;
             }
             else
-			{
-            	// If user already exists, we continue to set permissions
-            	dol_syslog(get_class($this)."::DDLCreateUser sql=".$sql, LOG_WARNING);
+            {
+                // 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)."'";
@@ -1039,9 +1039,9 @@ 
     }
 
     /**
-	 *	Return full path of dump program
-	 *
-	 *	@return		string		Full path of dump program
+     *	Return full path of dump program
+     *
+     *	@return		string		Full path of dump program
      */
     function getPathOfDump()
     {
@@ -1080,7 +1080,7 @@ 
      * Return value of server parameters
      *
      * @param	string	$filter		Filter list on a particular value
-	 * @return	array				Array of key-values (key=>value)
+     * @return	array				Array of key-values (key=>value)
      */
     function getServerParametersValues($filter='')
     {
@@ -1091,7 +1091,7 @@ 
         $resql=$this->query($sql);
         if ($resql)
         {
-        	while($obj=$this->fetch_object($resql)) $result[$obj->Variable_name]=$obj->Value;
+            while($obj=$this->fetch_object($resql)) $result[$obj->Variable_name]=$obj->Value;
         }
 
         return $result;
@@ -1101,7 +1101,7 @@ 
      * 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)
+     * @return  array				Array of key-values (key=>value)
      */
     function getServerStatusValues($filter='')
     {

Braces +108 added lines, -66 removed lines

@@ -59,8 +59,12 @@ 
         global $conf,$langs;
 
         // Note that having "static" property for "$forcecharset" and "$forcecollate" will make error here in strict mode, so they are not static
-        if (! empty($conf->db->character_set)) $this->forcecharset=$conf->db->character_set;
-        if (! empty($conf->db->dolibarr_main_db_collation)) $this->forcecollate=$conf->db->dolibarr_main_db_collation;
+        if (! empty($conf->db->character_set)) {
+            $this->forcecharset=$conf->db->character_set;
+        }
+        if (! empty($conf->db->dolibarr_main_db_collation)) {
+            $this->forcecollate=$conf->db->dolibarr_main_db_collation;
+        }
 
         $this->database_user=$user;
         $this->database_host=$host;
@@ -111,18 +115,23 @@ 
 
                 // If client is old latin, we force utf8
                 $clientmustbe=empty($conf->db->dolibarr_main_db_character_set)?'utf8':$conf->db->dolibarr_main_db_character_set;
-                if (preg_match('/latin1/', $clientmustbe)) $clientmustbe='utf8';
+                if (preg_match('/latin1/', $clientmustbe)) {
+                    $clientmustbe='utf8';
+                }
 
 				if ($this->db->character_set_name() != $clientmustbe) {
 					$this->db->set_charset($clientmustbe);	// This set charset, but with a bad collation
 
 					$collation = $conf->db->dolibarr_main_db_collation;
-					if (preg_match('/latin1/', $collation)) $collation='utf8_unicode_ci';
+					if (preg_match('/latin1/', $collation)) {
+					    $collation='utf8_unicode_ci';
+					}
 
-					if (! preg_match('/general/', $collation)) $this->db->query("SET collation_connection = ".$collation);
+					if (! preg_match('/general/', $collation)) {
+					    $this->db->query("SET collation_connection = ".$collation);
+					}
 				}
-            }
-            else
+            } else
             {
                 $this->database_selected = false;
                 $this->database_name = '';
@@ -130,8 +139,7 @@ 
                 $this->error=$this->error();
                 dol_syslog(get_class($this)."::DoliDBMysqli : Select_db error ".$this->error,LOG_ERR);
             }
-        }
-        else
+        } else
         {
             // Pas de selection de base demandee, ok ou ko
             $this->database_selected = false;
@@ -140,15 +148,21 @@ 
             {
             	// If client is old latin, we force utf8
             	$clientmustbe=empty($conf->db->dolibarr_main_db_character_set)?'utf8':$conf->db->dolibarr_main_db_character_set;
-            	if (preg_match('/latin1/', $clientmustbe)) $clientmustbe='utf8';
+            	if (preg_match('/latin1/', $clientmustbe)) {
+            	    $clientmustbe='utf8';
+            	}
 
 				if ($this->db->character_set_name() != $clientmustbe) {
 					$this->db->set_charset($clientmustbe);	// This set utf8_general_ci
 
 					$collation = $conf->db->dolibarr_main_db_collation;
-					if (preg_match('/latin1/', $collation)) $collation='utf8_unicode_ci';
+					if (preg_match('/latin1/', $collation)) {
+					    $collation='utf8_unicode_ci';
+					}
 
-					if (! preg_match('/general/', $collation)) $this->db->query("SET collation_connection = ".$collation);
+					if (! preg_match('/general/', $collation)) {
+					    $this->db->query("SET collation_connection = ".$collation);
+					}
 				}
 			}
         }
@@ -234,7 +248,9 @@ 
     {
         if ($this->db)
         {
-	        if ($this->transaction_opened > 0) dol_syslog(get_class($this)."::close Closing a connection with an opened transaction depth=".$this->transaction_opened,LOG_ERR);
+	        if ($this->transaction_opened > 0) {
+	            dol_syslog(get_class($this)."::close Closing a connection with an opened transaction depth=".$this->transaction_opened,LOG_ERR);
+	        }
             $this->connected=false;
             return $this->db->close();
         }
@@ -256,14 +272,15 @@ 
 
         $query = trim($query);
 
-	    if (! in_array($query,array('BEGIN','COMMIT','ROLLBACK'))) dol_syslog('sql='.$query, LOG_DEBUG);
+	    if (! in_array($query,array('BEGIN','COMMIT','ROLLBACK'))) {
+	        dol_syslog('sql='.$query, LOG_DEBUG);
+	    }
 
         if (! $this->database_name)
         {
             // Ordre SQL ne necessitant pas de connexion a une base (exemple: CREATE DATABASE)
             $ret = $this->db->query($query);
-        }
-        else
+        } else
         {
             $ret = $this->db->query($query);
         }
@@ -277,7 +294,10 @@ 
                 $this->lasterror = $this->error();
                 $this->lasterrno = $this->errno();
 
-				if ($conf->global->SYSLOG_LEVEL < LOG_DEBUG) dol_syslog(get_class($this)."::query SQL Error query: ".$query, LOG_ERR);	// Log of request was not yet done previously
+				if ($conf->global->SYSLOG_LEVEL < LOG_DEBUG) {
+				    dol_syslog(get_class($this)."::query SQL Error query: ".$query, LOG_ERR);
+				}
+				// Log of request was not yet done previously
                 dol_syslog(get_class($this)."::query SQL Error message: ".$this->lasterrno." ".$this->lasterror, LOG_ERR);
             }
             $this->lastquery=$query;
@@ -333,8 +353,7 @@ 
         {
             if (! is_object($resultset)) { $resultset=$this->_results; }
             return $resultset->fetch_row();
-        }
-        else
+        } else
         {
             // si le curseur est un booleen on retourne la valeur 0
             return 0;
@@ -387,7 +406,9 @@ 
         // If resultset not provided, we take the last used by connexion
         if (! is_object($resultset)) { $resultset=$this->_results; }
         // Si resultset en est un, on libere la memoire
-        if (is_object($resultset)) $resultset->free_result();
+        if (is_object($resultset)) {
+            $resultset->free_result();
+        }
     }
 
     /**
@@ -462,8 +483,7 @@ 
         if (! $this->connected) {
             // Si il y a eu echec de connexion, $this->db n'est pas valide pour mysqli_error.
             return 'Not connected. Check setup parameters in conf/conf.php file and your mysql client and server versions';
-        }
-        else {
+        } else {
             return $this->db->error;
         }
     }
@@ -508,8 +528,7 @@ 
             if ($cryptType == 2)
             {
                 $return = 'AES_ENCRYPT('.$return.',\''.$cryptKey.'\')';
-            }
-            else if ($cryptType == 1)
+            } else if ($cryptType == 1)
             {
                 $return = 'DES_ENCRYPT('.$return.',\''.$cryptKey.'\')';
             }
@@ -541,8 +560,7 @@ 
             if ($cryptType == 2)
             {
                 $return = 'AES_DECRYPT('.$value.',\''.$cryptKey.'\')';
-            }
-            else if ($cryptType == 1)
+            } else if ($cryptType == 1)
             {
                 $return = 'DES_DECRYPT('.$value.',\''.$cryptKey.'\')';
             }
@@ -566,8 +584,9 @@ 
         {
             $row=$this->fetch_row($resql);
             return $row[0];
+        } else {
+            return '?';
         }
-        else return '?';
     }
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
@@ -585,8 +604,12 @@ 
     function DDLCreateDb($database,$charset='',$collation='',$owner='')
     {
         // phpcs:enable
-        if (empty($charset))   $charset=$this->forcecharset;
-        if (empty($collation)) $collation=$this->forcecollate;
+        if (empty($charset)) {
+            $charset=$this->forcecharset;
+        }
+        if (empty($collation)) {
+            $collation=$this->forcecollate;
+        }
 
         // ALTER DATABASE dolibarr_db DEFAULT CHARACTER SET latin DEFAULT COLLATE latin1_swedish_ci
 		$sql = "CREATE DATABASE `".$this->escape($database)."`";
@@ -618,7 +641,9 @@ 
         $listtables=array();
 
         $like = '';
-        if ($table) $like = "LIKE '".$table."'";
+        if ($table) {
+            $like = "LIKE '".$table."'";
+        }
         $sql="SHOW TABLES FROM ".$database." ".$like.";";
         //print $sql;
         $result = $this->query($sql);
@@ -694,8 +719,7 @@ 
 			{
 				if ((preg_match("/null/i",$field_desc['default'])) || (preg_match("/CURRENT_TIMESTAMP/i",$field_desc['default']))) {
 					$sqlfields[$i]  .= " default ".$field_desc['default'];
-				}
-				else {
+				} else {
 					$sqlfields[$i]  .= " default '".$field_desc['default']."'";
 				}
 			}
@@ -707,8 +731,9 @@ 
 			}
             $i++;
         }
-        if($primary_key != "")
-        $pk = "primary key(".$primary_key.")";
+        if($primary_key != "") {
+                $pk = "primary key(".$primary_key.")";
+        }
 
         if(is_array($unique_keys)) {
             $i = 0;
@@ -728,18 +753,22 @@ 
             }
         }
         $sql .= implode(',',$sqlfields);
-        if($primary_key != "")
-        $sql .= ",".$pk;
-        if($unique_keys != "")
-        $sql .= ",".implode(',',$sqluq);
-        if(is_array($keys))
-        $sql .= ",".implode(',',$sqlk);
+        if($primary_key != "") {
+                $sql .= ",".$pk;
+        }
+        if($unique_keys != "") {
+                $sql .= ",".implode(',',$sqluq);
+        }
+        if(is_array($keys)) {
+                $sql .= ",".implode(',',$sqlk);
+        }
         $sql .=") engine=".$type;
 
-        if(! $this->query($sql))
-        return -1;
-        else
-        return 1;
+        if(! $this->query($sql)) {
+                return -1;
+        } else {
+                return 1;
+        }
     }
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
@@ -754,10 +783,11 @@ 
         // phpcs:enable
         $sql = "DROP TABLE ".$table;
 
-		if (! $this->query($sql))
- 			return -1;
-    	else
-    		return 1;
+		if (! $this->query($sql)) {
+		 			return -1;
+		} else {
+    	    		return 1;
+    	}
     }
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
@@ -812,10 +842,11 @@ 
         }
         if (isset($field_desc['default']) && preg_match("/^[^\s]/i",$field_desc['default']))
         {
-            if(preg_match("/null/i",$field_desc['default']))
-            $sql.= " default ".$field_desc['default'];
-            else
-            $sql.= " default '".$field_desc['default']."'";
+            if(preg_match("/null/i",$field_desc['default'])) {
+                        $sql.= " default ".$field_desc['default'];
+            } else {
+                        $sql.= " default '".$field_desc['default']."'";
+            }
         }
         if (isset($field_desc['extra']) && preg_match("/^[^\s]/i",$field_desc['extra']))
         {
@@ -854,8 +885,7 @@ 
         	{
         		$sqlbis="UPDATE ".$table." SET ".$field_name." = '".$this->escape($field_desc['default'] ? $field_desc['default'] : '')."' WHERE ".$field_name." IS NULL";
         		$this->query($sqlbis);
-        	}
-        	elseif ($field_desc['type'] == 'tinyint' || $field_desc['type'] == 'int')
+        	} elseif ($field_desc['type'] == 'tinyint' || $field_desc['type'] == 'int')
         	{
         		$sqlbis="UPDATE ".$table." SET ".$field_name." = ".((int) $this->escape($field_desc['default'] ? $field_desc['default'] : 0))." WHERE ".$field_name." IS NULL";
         		$this->query($sqlbis);
@@ -866,15 +896,20 @@ 
 
         if ($field_desc['default'] != '')
         {
-			if ($field_desc['type'] == 'double' || $field_desc['type'] == 'tinyint' || $field_desc['type'] == 'int') $sql.=" DEFAULT ".$this->escape($field_desc['default']);
-        	elseif ($field_desc['type'] == 'text') $sql.=" DEFAULT '".$this->escape($field_desc['default'])."'";							// Default not supported on text fields
+			if ($field_desc['type'] == 'double' || $field_desc['type'] == 'tinyint' || $field_desc['type'] == 'int') {
+			    $sql.=" DEFAULT ".$this->escape($field_desc['default']);
+			} elseif ($field_desc['type'] == 'text') {
+        	    $sql.=" DEFAULT '".$this->escape($field_desc['default'])."'";
+        	}
+        	// Default not supported on text fields
         }
 
         dol_syslog(get_class($this)."::DDLUpdateField ".$sql,LOG_DEBUG);
-        if (! $this->query($sql))
-        return -1;
-        else
-        return 1;
+        if (! $this->query($sql)) {
+                return -1;
+        } else {
+                return 1;
+        }
     }
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
@@ -919,8 +954,7 @@ 
             if ($this->lasterrno != 'DB_ERROR_USER_ALREADY_EXISTS')
             {
             	return -1;
-            }
-            else
+            } else
 			{
             	// If user already exists, we continue to set permissions
             	dol_syslog(get_class($this)."::DDLCreateUser sql=".$sql, LOG_WARNING);
@@ -1087,11 +1121,15 @@ 
         $result=array();
 
         $sql='SHOW VARIABLES';
-        if ($filter) $sql.=" LIKE '".$this->escape($filter)."'";
+        if ($filter) {
+            $sql.=" LIKE '".$this->escape($filter)."'";
+        }
         $resql=$this->query($sql);
         if ($resql)
         {
-        	while($obj=$this->fetch_object($resql)) $result[$obj->Variable_name]=$obj->Value;
+        	while($obj=$this->fetch_object($resql)) {
+        	    $result[$obj->Variable_name]=$obj->Value;
+        	}
         }
 
         return $result;
@@ -1108,11 +1146,15 @@ 
         $result=array();
 
         $sql='SHOW STATUS';
-        if ($filter) $sql.=" LIKE '".$this->escape($filter)."'";
+        if ($filter) {
+            $sql.=" LIKE '".$this->escape($filter)."'";
+        }
         $resql=$this->query($sql);
         if ($resql)
         {
-            while($obj=$this->fetch_object($resql)) $result[$obj->Variable_name]=$obj->Value;
+            while($obj=$this->fetch_object($resql)) {
+                $result[$obj->Variable_name]=$obj->Value;
+            }
         }
 
         return $result;

Spacing +179 added lines, -179 removed lines

@@ -29,7 +29,7 @@ 
  * 	\brief      Class file to manage Dolibarr database access for a MySQL database
  */
 
-require_once DOL_BASE_PATH . '/core/db/DoliDB.class.php';
+require_once DOL_BASE_PATH.'/core/db/DoliDB.class.php';
 
 /**
  *	Class to manage Dolibarr database access for a MySQL database using the MySQLi extension
@@ -39,11 +39,11 @@ 
 	/** @var mysqli Database object */
 	public $db;
     //! Database type
-    public $type='mysqli';
+    public $type = 'mysqli';
     //! Database label
-    const LABEL='MySQL or MariaDB';
+    const LABEL = 'MySQL or MariaDB';
     //! Version min database
-    const VERSIONMIN='5.0.3';
+    const VERSIONMIN = '5.0.3';
 	/** @var mysqli_result Resultset of last query */
 	private $_results;
 
@@ -58,36 +58,36 @@ 
 	 *	@param	    string	$name		Nom de la database
 	 *	@param	    int		$port		Port of database server
      */
-    function __construct($type, $host, $user, $pass, $name='', $port=0)
+    function __construct($type, $host, $user, $pass, $name = '', $port = 0)
     {
-        global $conf,$langs;
+        global $conf, $langs;
 
         // Note that having "static" property for "$forcecharset" and "$forcecollate" will make error here in strict mode, so they are not static
-        if (! empty($conf->db->character_set)) $this->forcecharset=$conf->db->character_set;
-        if (! empty($conf->db->dolibarr_main_db_collation)) $this->forcecollate=$conf->db->dolibarr_main_db_collation;
+        if (!empty($conf->db->character_set)) $this->forcecharset = $conf->db->character_set;
+        if (!empty($conf->db->dolibarr_main_db_collation)) $this->forcecollate = $conf->db->dolibarr_main_db_collation;
 
-        $this->database_user=$user;
-        $this->database_host=$host;
-        $this->database_port=$port;
+        $this->database_user = $user;
+        $this->database_host = $host;
+        $this->database_port = $port;
 
-        $this->transaction_opened=0;
+        $this->transaction_opened = 0;
 
         //print "Name DB: $host,$user,$pass,$name<br>";
 
-        if (! class_exists('mysqli'))
+        if (!class_exists('mysqli'))
         {
             $this->connected = false;
             $this->ok = false;
-            $this->error="Mysqli PHP functions for using Mysqli driver are not available in this version of PHP. Try to use another driver.";
-            dol_syslog(get_class($this)."::DoliDBMysqli : Mysqli PHP functions for using Mysqli driver are not available in this version of PHP. Try to use another driver.",LOG_ERR);
+            $this->error = "Mysqli PHP functions for using Mysqli driver are not available in this version of PHP. Try to use another driver.";
+            dol_syslog(get_class($this)."::DoliDBMysqli : Mysqli PHP functions for using Mysqli driver are not available in this version of PHP. Try to use another driver.", LOG_ERR);
         }
 
-        if (! $host)
+        if (!$host)
         {
             $this->connected = false;
             $this->ok = false;
-            $this->error=$langs->trans("ErrorWrongHostParameter");
-            dol_syslog(get_class($this)."::DoliDBMysqli : Connect error, wrong host parameters",LOG_ERR);
+            $this->error = $langs->trans("ErrorWrongHostParameter");
+            dol_syslog(get_class($this)."::DoliDBMysqli : Connect error, wrong host parameters", LOG_ERR);
         }
 
 		// Try server connection
@@ -98,7 +98,7 @@ 
 			$this->connected = false;
 			$this->ok = false;
 			$this->error = $this->db->connect_error;
-			dol_syslog(get_class($this) . "::DoliDBMysqli Connect error: " . $this->error, LOG_ERR);
+			dol_syslog(get_class($this)."::DoliDBMysqli Connect error: ".$this->error, LOG_ERR);
 		} else {
 			$this->connected = true;
 			$this->ok = true;
@@ -114,16 +114,16 @@ 
                 $this->ok = true;
 
                 // If client is old latin, we force utf8
-                $clientmustbe=empty($conf->db->dolibarr_main_db_character_set)?'utf8':$conf->db->dolibarr_main_db_character_set;
-                if (preg_match('/latin1/', $clientmustbe)) $clientmustbe='utf8';
+                $clientmustbe = empty($conf->db->dolibarr_main_db_character_set) ? 'utf8' : $conf->db->dolibarr_main_db_character_set;
+                if (preg_match('/latin1/', $clientmustbe)) $clientmustbe = 'utf8';
 
 				if ($this->db->character_set_name() != $clientmustbe) {
-					$this->db->set_charset($clientmustbe);	// This set charset, but with a bad collation
+					$this->db->set_charset($clientmustbe); // This set charset, but with a bad collation
 
 					$collation = $conf->db->dolibarr_main_db_collation;
-					if (preg_match('/latin1/', $collation)) $collation='utf8_unicode_ci';
+					if (preg_match('/latin1/', $collation)) $collation = 'utf8_unicode_ci';
 
-					if (! preg_match('/general/', $collation)) $this->db->query("SET collation_connection = ".$collation);
+					if (!preg_match('/general/', $collation)) $this->db->query("SET collation_connection = ".$collation);
 				}
             }
             else
@@ -131,8 +131,8 @@ 
                 $this->database_selected = false;
                 $this->database_name = '';
                 $this->ok = false;
-                $this->error=$this->error();
-                dol_syslog(get_class($this)."::DoliDBMysqli : Select_db error ".$this->error,LOG_ERR);
+                $this->error = $this->error();
+                dol_syslog(get_class($this)."::DoliDBMysqli : Select_db error ".$this->error, LOG_ERR);
             }
         }
         else
@@ -143,16 +143,16 @@ 
             if ($this->connected)
             {
             	// If client is old latin, we force utf8
-            	$clientmustbe=empty($conf->db->dolibarr_main_db_character_set)?'utf8':$conf->db->dolibarr_main_db_character_set;
-            	if (preg_match('/latin1/', $clientmustbe)) $clientmustbe='utf8';
+            	$clientmustbe = empty($conf->db->dolibarr_main_db_character_set) ? 'utf8' : $conf->db->dolibarr_main_db_character_set;
+            	if (preg_match('/latin1/', $clientmustbe)) $clientmustbe = 'utf8';
 
 				if ($this->db->character_set_name() != $clientmustbe) {
-					$this->db->set_charset($clientmustbe);	// This set utf8_general_ci
+					$this->db->set_charset($clientmustbe); // This set utf8_general_ci
 
 					$collation = $conf->db->dolibarr_main_db_collation;
-					if (preg_match('/latin1/', $collation)) $collation='utf8_unicode_ci';
+					if (preg_match('/latin1/', $collation)) $collation = 'utf8_unicode_ci';
 
-					if (! preg_match('/general/', $collation)) $this->db->query("SET collation_connection = ".$collation);
+					if (!preg_match('/general/', $collation)) $this->db->query("SET collation_connection = ".$collation);
 				}
 			}
         }
@@ -166,7 +166,7 @@ 
      *  @param     string	$type	Type of SQL order ('ddl' for insert, update, select, delete or 'dml' for create, alter...)
      *  @return    string   		SQL request line converted
      */
-    static function convertSQLFromMysql($line,$type='ddl')
+    static function convertSQLFromMysql($line, $type = 'ddl')
     {
         return $line;
     }
@@ -199,7 +199,7 @@ 
 	 */
 	function connect($host, $login, $passwd, $name, $port = 0)
 	{
-		dol_syslog(get_class($this) . "::connect host=$host, port=$port, login=$login, passwd=--hidden--, name=$name", LOG_DEBUG);
+		dol_syslog(get_class($this)."::connect host=$host, port=$port, login=$login, passwd=--hidden--, name=$name", LOG_DEBUG);
 
 		// Can also be
 		// mysqli::init(); mysql::options(MYSQLI_INIT_COMMAND, 'SET AUTOCOMMIT = 0'); mysqli::options(MYSQLI_OPT_CONNECT_TIMEOUT, 5);
@@ -238,8 +238,8 @@ 
     {
         if ($this->db)
         {
-	        if ($this->transaction_opened > 0) dol_syslog(get_class($this)."::close Closing a connection with an opened transaction depth=".$this->transaction_opened,LOG_ERR);
-            $this->connected=false;
+	        if ($this->transaction_opened > 0) dol_syslog(get_class($this)."::close Closing a connection with an opened transaction depth=".$this->transaction_opened, LOG_ERR);
+            $this->connected = false;
             return $this->db->close();
         }
         return false;
@@ -254,15 +254,15 @@ 
      *  @param  string	$type           Type of SQL order ('ddl' for insert, update, select, delete or 'dml' for create, alter...)
      *	@return	bool|mysqli_result		Resultset of answer
      */
-    function query($query,$usesavepoint=0,$type='auto')
+    function query($query, $usesavepoint = 0, $type = 'auto')
     {
     	global $conf;
 
         $query = trim($query);
 
-	    if (! in_array($query,array('BEGIN','COMMIT','ROLLBACK'))) dol_syslog('sql='.$query, LOG_DEBUG);
+	    if (!in_array($query, array('BEGIN', 'COMMIT', 'ROLLBACK'))) dol_syslog('sql='.$query, LOG_DEBUG);
 
-        if (! $this->database_name)
+        if (!$this->database_name)
         {
             // Ordre SQL ne necessitant pas de connexion a une base (exemple: CREATE DATABASE)
             $ret = $this->db->query($query);
@@ -272,19 +272,19 @@ 
             $ret = $this->db->query($query);
         }
 
-        if (! preg_match("/^COMMIT/i",$query) && ! preg_match("/^ROLLBACK/i",$query))
+        if (!preg_match("/^COMMIT/i", $query) && !preg_match("/^ROLLBACK/i", $query))
         {
             // Si requete utilisateur, on la sauvegarde ainsi que son resultset
-            if (! $ret)
+            if (!$ret)
             {
                 $this->lastqueryerror = $query;
                 $this->lasterror = $this->error();
                 $this->lasterrno = $this->errno();
 
-				if ($conf->global->SYSLOG_LEVEL < LOG_DEBUG) dol_syslog(get_class($this)."::query SQL Error query: ".$query, LOG_ERR);	// Log of request was not yet done previously
+				if ($conf->global->SYSLOG_LEVEL < LOG_DEBUG) dol_syslog(get_class($this)."::query SQL Error query: ".$query, LOG_ERR); // Log of request was not yet done previously
                 dol_syslog(get_class($this)."::query SQL Error message: ".$this->lasterrno." ".$this->lasterror, LOG_ERR);
             }
-            $this->lastquery=$query;
+            $this->lastquery = $query;
             $this->_results = $ret;
         }
 
@@ -302,7 +302,7 @@ 
     {
         // phpcs:enable
         // Si le resultset n'est pas fourni, on prend le dernier utilise sur cette connexion
-        if (! is_object($resultset)) { $resultset=$this->_results; }
+        if (!is_object($resultset)) { $resultset = $this->_results; }
 		return $resultset->fetch_object();
     }
 
@@ -318,7 +318,7 @@ 
     {
         // phpcs:enable
         // If resultset not provided, we take the last used by connexion
-        if (! is_object($resultset)) { $resultset=$this->_results; }
+        if (!is_object($resultset)) { $resultset = $this->_results; }
         return $resultset->fetch_array();
     }
 
@@ -333,9 +333,9 @@ 
     {
         // phpcs:enable
         // If resultset not provided, we take the last used by connexion
-        if (! is_bool($resultset))
+        if (!is_bool($resultset))
         {
-            if (! is_object($resultset)) { $resultset=$this->_results; }
+            if (!is_object($resultset)) { $resultset = $this->_results; }
             return $resultset->fetch_row();
         }
         else
@@ -357,7 +357,7 @@ 
     {
         // phpcs:enable
         // If resultset not provided, we take the last used by connexion
-        if (! is_object($resultset)) { $resultset=$this->_results; }
+        if (!is_object($resultset)) { $resultset = $this->_results; }
         return $resultset->num_rows;
     }
 
@@ -373,7 +373,7 @@ 
     {
         // phpcs:enable
         // If resultset not provided, we take the last used by connexion
-        if (! is_object($resultset)) { $resultset=$this->_results; }
+        if (!is_object($resultset)) { $resultset = $this->_results; }
         // mysql necessite un link de base pour cette fonction contrairement
         // a pqsql qui prend un resultset
         return $this->db->affected_rows;
@@ -386,10 +386,10 @@ 
      *	@param  mysqli_result	$resultset	Curseur de la requete voulue
      *	@return	void
      */
-    function free($resultset=null)
+    function free($resultset = null)
     {
         // If resultset not provided, we take the last used by connexion
-        if (! is_object($resultset)) { $resultset=$this->_results; }
+        if (!is_object($resultset)) { $resultset = $this->_results; }
         // Si resultset en est un, on libere la memoire
         if (is_object($resultset)) $resultset->free_result();
     }
@@ -412,7 +412,7 @@ 
      */
     function errno()
     {
-        if (! $this->connected) {
+        if (!$this->connected) {
             // Si il y a eu echec de connexion, $this->db n'est pas valide.
             return 'DB_ERROR_FAILED_TO_CONNECT';
         } else {
@@ -444,15 +444,15 @@ 
             1215 => 'DB_ERROR_CANNOT_ADD_FOREIGN_KEY_CONSTRAINT',
             1216 => 'DB_ERROR_NO_PARENT',
             1217 => 'DB_ERROR_CHILD_EXISTS',
-            1396 => 'DB_ERROR_USER_ALREADY_EXISTS',    // When creating user already existing
+            1396 => 'DB_ERROR_USER_ALREADY_EXISTS', // When creating user already existing
             1451 => 'DB_ERROR_CHILD_EXISTS'
             );
 
             if (isset($errorcode_map[$this->db->errno])) {
                 return $errorcode_map[$this->db->errno];
             }
-            $errno=$this->db->errno;
-            return ($errno?'DB_ERROR_'.$errno:'0');
+            $errno = $this->db->errno;
+            return ($errno ? 'DB_ERROR_'.$errno : '0');
         }
     }
 
@@ -463,7 +463,7 @@ 
      */
     function error()
     {
-        if (! $this->connected) {
+        if (!$this->connected) {
             // Si il y a eu echec de connexion, $this->db n'est pas valide pour mysqli_error.
             return 'Not connected. Check setup parameters in conf/conf.php file and your mysql client and server versions';
         }
@@ -480,7 +480,7 @@ 
 	 * @param	string	$fieldid	Field name
 	 * @return  int|string			Id of row
      */
-    function last_insert_id($tab,$fieldid='rowid')
+    function last_insert_id($tab, $fieldid = 'rowid')
     {
         // phpcs:enable
         return $this->db->insert_id;
@@ -495,17 +495,17 @@ 
      * 	@return	string					XXX(field) or XXX('value') or field or 'value'
      *
      */
-    function encrypt($fieldorvalue, $withQuotes=0)
+    function encrypt($fieldorvalue, $withQuotes = 0)
     {
         global $conf;
 
         // Type of encryption (2: AES (recommended), 1: DES , 0: no encryption)
-        $cryptType = (!empty($conf->db->dolibarr_main_db_encryption)?$conf->db->dolibarr_main_db_encryption:0);
+        $cryptType = (!empty($conf->db->dolibarr_main_db_encryption) ? $conf->db->dolibarr_main_db_encryption : 0);
 
         //Encryption key
-        $cryptKey = (!empty($conf->db->dolibarr_main_db_cryptkey)?$conf->db->dolibarr_main_db_cryptkey:'');
+        $cryptKey = (!empty($conf->db->dolibarr_main_db_cryptkey) ? $conf->db->dolibarr_main_db_cryptkey : '');
 
-        $return = ($withQuotes?"'":"").$this->escape($fieldorvalue).($withQuotes?"'":"");
+        $return = ($withQuotes ? "'" : "").$this->escape($fieldorvalue).($withQuotes ? "'" : "");
 
         if ($cryptType && !empty($cryptKey))
         {
@@ -533,10 +533,10 @@ 
         global $conf;
 
         // Type of encryption (2: AES (recommended), 1: DES , 0: no encryption)
-        $cryptType = (!empty($conf->db->dolibarr_main_db_encryption)?$conf->db->dolibarr_main_db_encryption:0);
+        $cryptType = (!empty($conf->db->dolibarr_main_db_encryption) ? $conf->db->dolibarr_main_db_encryption : 0);
 
         //Encryption key
-        $cryptKey = (!empty($conf->db->dolibarr_main_db_cryptkey)?$conf->db->dolibarr_main_db_cryptkey:'');
+        $cryptKey = (!empty($conf->db->dolibarr_main_db_cryptkey) ? $conf->db->dolibarr_main_db_cryptkey : '');
 
         $return = $value;
 
@@ -565,10 +565,10 @@ 
     function DDLGetConnectId()
     {
         // phpcs:enable
-        $resql=$this->query('SELECT CONNECTION_ID()');
+        $resql = $this->query('SELECT CONNECTION_ID()');
         if ($resql)
         {
-            $row=$this->fetch_row($resql);
+            $row = $this->fetch_row($resql);
             return $row[0];
         }
         else return '?';
@@ -586,24 +586,24 @@ 
 	 * 	@param	string	$owner			Username of database owner
 	 * 	@return	bool|mysqli_result		resource defined if OK, null if KO
      */
-    function DDLCreateDb($database,$charset='',$collation='',$owner='')
+    function DDLCreateDb($database, $charset = '', $collation = '', $owner = '')
     {
         // phpcs:enable
-        if (empty($charset))   $charset=$this->forcecharset;
-        if (empty($collation)) $collation=$this->forcecollate;
+        if (empty($charset))   $charset = $this->forcecharset;
+        if (empty($collation)) $collation = $this->forcecollate;
 
         // ALTER DATABASE dolibarr_db DEFAULT CHARACTER SET latin DEFAULT COLLATE latin1_swedish_ci
 		$sql = "CREATE DATABASE `".$this->escape($database)."`";
-		$sql.= " DEFAULT CHARACTER SET `".$this->escape($charset)."` DEFAULT COLLATE `".$this->escape($collation)."`";
+		$sql .= " DEFAULT CHARACTER SET `".$this->escape($charset)."` DEFAULT COLLATE `".$this->escape($collation)."`";
 
-        dol_syslog($sql,LOG_DEBUG);
-        $ret=$this->query($sql);
-        if (! $ret)
+        dol_syslog($sql, LOG_DEBUG);
+        $ret = $this->query($sql);
+        if (!$ret)
         {
             // We try again for compatibility with Mysql < 4.1.1
             $sql = "CREATE DATABASE `".$this->escape($database)."`";
-            dol_syslog($sql,LOG_DEBUG);
-            $ret=$this->query($sql);
+            dol_syslog($sql, LOG_DEBUG);
+            $ret = $this->query($sql);
         }
         return $ret;
     }
@@ -616,19 +616,19 @@ 
 	 *  @param	string		$table		Nmae of table filter ('xxx%')
 	 *  @return	array					List of tables in an array
      */
-    function DDLListTables($database, $table='')
+    function DDLListTables($database, $table = '')
     {
         // phpcs:enable
-        $listtables=array();
+        $listtables = array();
 
         $like = '';
         if ($table) $like = "LIKE '".$table."'";
-        $sql="SHOW TABLES FROM ".$database." ".$like.";";
+        $sql = "SHOW TABLES FROM ".$database." ".$like.";";
         //print $sql;
         $result = $this->query($sql);
         if ($result)
         {
-            while($row = $this->fetch_row($result))
+            while ($row = $this->fetch_row($result))
             {
                 $listtables[] = $row[0];
             }
@@ -646,15 +646,15 @@ 
     function DDLInfoTable($table)
     {
         // phpcs:enable
-        $infotables=array();
+        $infotables = array();
 
-        $sql="SHOW FULL COLUMNS FROM ".$table.";";
+        $sql = "SHOW FULL COLUMNS FROM ".$table.";";
 
-        dol_syslog($sql,LOG_DEBUG);
+        dol_syslog($sql, LOG_DEBUG);
         $result = $this->query($sql);
         if ($result)
         {
-            while($row = $this->fetch_row($result))
+            while ($row = $this->fetch_row($result))
             {
                 $infotables[] = $row;
             }
@@ -675,7 +675,7 @@ 
 	 *	@param	    array	$keys 			Tableau des champs cles noms => valeur
 	 *	@return	    int						<0 if KO, >=0 if OK
      */
-    function DDLCreateTable($table,$fields,$primary_key,$type,$unique_keys=null,$fulltext_keys=null,$keys=null)
+    function DDLCreateTable($table, $fields, $primary_key, $type, $unique_keys = null, $fulltext_keys = null, $keys = null)
     {
         // phpcs:enable
 	    // FIXME: $fulltext_keys parameter is unused
@@ -683,64 +683,64 @@ 
         // cles recherchees dans le tableau des descriptions (fields) : type,value,attribute,null,default,extra
         // ex. : $fields['rowid'] = array('type'=>'int','value'=>'11','null'=>'not null','extra'=> 'auto_increment');
         $sql = "CREATE TABLE ".$table."(";
-        $i=0;
-        foreach($fields as $field_name => $field_desc)
+        $i = 0;
+        foreach ($fields as $field_name => $field_desc)
         {
         	$sqlfields[$i] = $field_name." ";
-			$sqlfields[$i]  .= $field_desc['type'];
-			if( preg_match("/^[^\s]/i",$field_desc['value'])) {
+			$sqlfields[$i] .= $field_desc['type'];
+			if (preg_match("/^[^\s]/i", $field_desc['value'])) {
 				$sqlfields[$i]  .= "(".$field_desc['value'].")";
 			}
-			if( preg_match("/^[^\s]/i",$field_desc['attribute'])) {
+			if (preg_match("/^[^\s]/i", $field_desc['attribute'])) {
 				$sqlfields[$i]  .= " ".$field_desc['attribute'];
 			}
-			if( preg_match("/^[^\s]/i",$field_desc['default']))
+			if (preg_match("/^[^\s]/i", $field_desc['default']))
 			{
-				if ((preg_match("/null/i",$field_desc['default'])) || (preg_match("/CURRENT_TIMESTAMP/i",$field_desc['default']))) {
+				if ((preg_match("/null/i", $field_desc['default'])) || (preg_match("/CURRENT_TIMESTAMP/i", $field_desc['default']))) {
 					$sqlfields[$i]  .= " default ".$field_desc['default'];
 				}
 				else {
 					$sqlfields[$i]  .= " default '".$field_desc['default']."'";
 				}
 			}
-			if( preg_match("/^[^\s]/i",$field_desc['null'])) {
+			if (preg_match("/^[^\s]/i", $field_desc['null'])) {
 				$sqlfields[$i]  .= " ".$field_desc['null'];
 			}
-			if( preg_match("/^[^\s]/i",$field_desc['extra'])) {
+			if (preg_match("/^[^\s]/i", $field_desc['extra'])) {
 				$sqlfields[$i]  .= " ".$field_desc['extra'];
 			}
             $i++;
         }
-        if($primary_key != "")
+        if ($primary_key != "")
         $pk = "primary key(".$primary_key.")";
 
-        if(is_array($unique_keys)) {
+        if (is_array($unique_keys)) {
             $i = 0;
-            foreach($unique_keys as $key => $value)
+            foreach ($unique_keys as $key => $value)
             {
                 $sqluq[$i] = "UNIQUE KEY '".$key."' ('".$value."')";
                 $i++;
             }
         }
-        if(is_array($keys))
+        if (is_array($keys))
         {
             $i = 0;
-            foreach($keys as $key => $value)
+            foreach ($keys as $key => $value)
             {
                 $sqlk[$i] = "KEY ".$key." (".$value.")";
                 $i++;
             }
         }
-        $sql .= implode(',',$sqlfields);
-        if($primary_key != "")
+        $sql .= implode(',', $sqlfields);
+        if ($primary_key != "")
         $sql .= ",".$pk;
-        if($unique_keys != "")
-        $sql .= ",".implode(',',$sqluq);
-        if(is_array($keys))
-        $sql .= ",".implode(',',$sqlk);
-        $sql .=") engine=".$type;
+        if ($unique_keys != "")
+        $sql .= ",".implode(',', $sqluq);
+        if (is_array($keys))
+        $sql .= ",".implode(',', $sqlk);
+        $sql .= ") engine=".$type;
 
-        if(! $this->query($sql))
+        if (!$this->query($sql))
         return -1;
         else
         return 1;
@@ -758,7 +758,7 @@ 
         // phpcs:enable
         $sql = "DROP TABLE ".$table;
 
-		if (! $this->query($sql))
+		if (!$this->query($sql))
  			return -1;
     	else
     		return 1;
@@ -772,12 +772,12 @@ 
 	 *	@param	string		$field	Optionnel : Name of field if we want description of field
 	 *	@return	bool|mysqli_result	Resultset x (x->Field, x->Type, ...)
      */
-    function DDLDescTable($table,$field="")
+    function DDLDescTable($table, $field = "")
     {
         // phpcs:enable
-        $sql="DESC ".$table." ".$field;
+        $sql = "DESC ".$table." ".$field;
 
-        dol_syslog(get_class($this)."::DDLDescTable ".$sql,LOG_DEBUG);
+        dol_syslog(get_class($this)."::DDLDescTable ".$sql, LOG_DEBUG);
         $this->_results = $this->query($sql);
         return $this->_results;
     }
@@ -792,42 +792,42 @@ 
 	 *	@param	string	$field_position 	Optionnel ex.: "after champtruc"
 	 *	@return	int							<0 if KO, >0 if OK
      */
-    function DDLAddField($table,$field_name,$field_desc,$field_position="")
+    function DDLAddField($table, $field_name, $field_desc, $field_position = "")
     {
         // phpcs:enable
         // 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']))
+        $sql = "ALTER TABLE ".$table." ADD ".$field_name." ";
+        $sql .= $field_desc['type'];
+        if (preg_match("/^[^\s]/i", $field_desc['value']))
         {
-            if (! in_array($field_desc['type'],array('date','datetime')))
+            if (!in_array($field_desc['type'], array('date', 'datetime')))
             {
-                $sql.= "(".$field_desc['value'].")";
+                $sql .= "(".$field_desc['value'].")";
             }
         }
-        if (isset($field_desc['attribute']) && preg_match("/^[^\s]/i",$field_desc['attribute']))
+        if (isset($field_desc['attribute']) && preg_match("/^[^\s]/i", $field_desc['attribute']))
         {
-        	$sql.= " ".$field_desc['attribute'];
+        	$sql .= " ".$field_desc['attribute'];
         }
-        if (isset($field_desc['null']) && preg_match("/^[^\s]/i",$field_desc['null']))
+        if (isset($field_desc['null']) && preg_match("/^[^\s]/i", $field_desc['null']))
         {
-        	$sql.= " ".$field_desc['null'];
+        	$sql .= " ".$field_desc['null'];
         }
-        if (isset($field_desc['default']) && preg_match("/^[^\s]/i",$field_desc['default']))
+        if (isset($field_desc['default']) && preg_match("/^[^\s]/i", $field_desc['default']))
         {
-            if(preg_match("/null/i",$field_desc['default']))
-            $sql.= " default ".$field_desc['default'];
+            if (preg_match("/null/i", $field_desc['default']))
+            $sql .= " default ".$field_desc['default'];
             else
-            $sql.= " default '".$field_desc['default']."'";
+            $sql .= " default '".$field_desc['default']."'";
         }
-        if (isset($field_desc['extra']) && preg_match("/^[^\s]/i",$field_desc['extra']))
+        if (isset($field_desc['extra']) && preg_match("/^[^\s]/i", $field_desc['extra']))
         {
-        	$sql.= " ".$field_desc['extra'];
+        	$sql .= " ".$field_desc['extra'];
         }
-        $sql.= " ".$field_position;
+        $sql .= " ".$field_position;
 
-        dol_syslog(get_class($this)."::DDLAddField ".$sql,LOG_DEBUG);
+        dol_syslog(get_class($this)."::DDLAddField ".$sql, LOG_DEBUG);
         if ($this->query($sql)) {
             return 1;
         }
@@ -843,39 +843,39 @@ 
 	 *	@param	string	$field_desc 		Array with description of field format
 	 *	@return	int							<0 if KO, >0 if OK
      */
-    function DDLUpdateField($table,$field_name,$field_desc)
+    function DDLUpdateField($table, $field_name, $field_desc)
     {
         // phpcs:enable
         $sql = "ALTER TABLE ".$table;
         $sql .= " MODIFY COLUMN ".$field_name." ".$field_desc['type'];
         if ($field_desc['type'] == 'double' || $field_desc['type'] == 'tinyint' || $field_desc['type'] == 'int' || $field_desc['type'] == 'varchar') {
-        	$sql.="(".$field_desc['value'].")";
+        	$sql .= "(".$field_desc['value'].")";
         }
         if ($field_desc['null'] == 'not null' || $field_desc['null'] == 'NOT NULL')
         {
         	// We will try to change format of column to NOT NULL. To be sure the ALTER works, we try to update fields that are NULL
         	if ($field_desc['type'] == 'varchar' || $field_desc['type'] == 'text')
         	{
-        		$sqlbis="UPDATE ".$table." SET ".$field_name." = '".$this->escape($field_desc['default'] ? $field_desc['default'] : '')."' WHERE ".$field_name." IS NULL";
+        		$sqlbis = "UPDATE ".$table." SET ".$field_name." = '".$this->escape($field_desc['default'] ? $field_desc['default'] : '')."' WHERE ".$field_name." IS NULL";
         		$this->query($sqlbis);
         	}
         	elseif ($field_desc['type'] == 'tinyint' || $field_desc['type'] == 'int')
         	{
-        		$sqlbis="UPDATE ".$table." SET ".$field_name." = ".((int) $this->escape($field_desc['default'] ? $field_desc['default'] : 0))." WHERE ".$field_name." IS NULL";
+        		$sqlbis = "UPDATE ".$table." SET ".$field_name." = ".((int) $this->escape($field_desc['default'] ? $field_desc['default'] : 0))." WHERE ".$field_name." IS NULL";
         		$this->query($sqlbis);
         	}
 
-        	$sql.=" NOT NULL";
+        	$sql .= " NOT NULL";
         }
 
         if ($field_desc['default'] != '')
         {
-			if ($field_desc['type'] == 'double' || $field_desc['type'] == 'tinyint' || $field_desc['type'] == 'int') $sql.=" DEFAULT ".$this->escape($field_desc['default']);
-        	elseif ($field_desc['type'] == 'text') $sql.=" DEFAULT '".$this->escape($field_desc['default'])."'";							// Default not supported on text fields
+			if ($field_desc['type'] == 'double' || $field_desc['type'] == 'tinyint' || $field_desc['type'] == 'int') $sql .= " DEFAULT ".$this->escape($field_desc['default']);
+        	elseif ($field_desc['type'] == 'text') $sql .= " DEFAULT '".$this->escape($field_desc['default'])."'"; // Default not supported on text fields
         }
 
-        dol_syslog(get_class($this)."::DDLUpdateField ".$sql,LOG_DEBUG);
-        if (! $this->query($sql))
+        dol_syslog(get_class($this)."::DDLUpdateField ".$sql, LOG_DEBUG);
+        if (!$this->query($sql))
         return -1;
         else
         return 1;
@@ -889,15 +889,15 @@ 
 	 *	@param	string	$field_name 	Name of field to drop
 	 *	@return	int						<0 if KO, >0 if OK
      */
-    function DDLDropField($table,$field_name)
+    function DDLDropField($table, $field_name)
     {
         // phpcs:enable
-        $sql= "ALTER TABLE ".$table." DROP COLUMN `".$field_name."`";
-        dol_syslog(get_class($this)."::DDLDropField ".$sql,LOG_DEBUG);
+        $sql = "ALTER TABLE ".$table." DROP COLUMN `".$field_name."`";
+        dol_syslog(get_class($this)."::DDLDropField ".$sql, LOG_DEBUG);
         if ($this->query($sql)) {
             return 1;
         }
-        $this->error=$this->lasterror();
+        $this->error = $this->lasterror();
         return -1;
     }
 
@@ -912,13 +912,13 @@ 
 	 *	@param	string	$dolibarr_main_db_name		Database name where user must be granted
 	 *	@return	int									<0 if KO, >=0 if OK
      */
-    function DDLCreateUser($dolibarr_main_db_host,$dolibarr_main_db_user,$dolibarr_main_db_pass,$dolibarr_main_db_name)
+    function DDLCreateUser($dolibarr_main_db_host, $dolibarr_main_db_user, $dolibarr_main_db_pass, $dolibarr_main_db_name)
     {
         // phpcs:enable
         $sql = "CREATE USER '".$this->escape($dolibarr_main_db_user)."'";
-        dol_syslog(get_class($this)."::DDLCreateUser", LOG_DEBUG);	// No sql to avoid password in log
-        $resql=$this->query($sql);
-        if (! $resql)
+        dol_syslog(get_class($this)."::DDLCreateUser", LOG_DEBUG); // No sql to avoid password in log
+        $resql = $this->query($sql);
+        if (!$resql)
         {
             if ($this->lasterrno != 'DB_ERROR_USER_ALREADY_EXISTS')
             {
@@ -931,18 +931,18 @@ 
             }
         }
         $sql = "GRANT ALL PRIVILEGES ON ".$this->escape($dolibarr_main_db_name).".* TO '".$this->escape($dolibarr_main_db_user)."'@'".$this->escape($dolibarr_main_db_host)."' IDENTIFIED BY '".$this->escape($dolibarr_main_db_pass)."'";
-        dol_syslog(get_class($this)."::DDLCreateUser", LOG_DEBUG);	// No sql to avoid password in log
-        $resql=$this->query($sql);
-        if (! $resql)
+        dol_syslog(get_class($this)."::DDLCreateUser", LOG_DEBUG); // No sql to avoid password in log
+        $resql = $this->query($sql);
+        if (!$resql)
         {
             return -1;
         }
 
-        $sql="FLUSH Privileges";
+        $sql = "FLUSH Privileges";
 
         dol_syslog(get_class($this)."::DDLCreateUser", LOG_DEBUG);
-        $resql=$this->query($sql);
-        if (! $resql)
+        $resql = $this->query($sql);
+        if (!$resql)
         {
             return -1;
         }
@@ -959,13 +959,13 @@ 
      */
     function getDefaultCharacterSetDatabase()
     {
-        $resql=$this->query('SHOW VARIABLES LIKE \'character_set_database\'');
+        $resql = $this->query('SHOW VARIABLES LIKE \'character_set_database\'');
         if (!$resql)
         {
             // version Mysql < 4.1.1
             return $this->forcecharset;
         }
-        $liste=$this->fetch_array($resql);
+        $liste = $this->fetch_array($resql);
         $tmpval = $liste['Value'];
 
         return $tmpval;
@@ -978,12 +978,12 @@ 
      */
     function getListOfCharacterSet()
     {
-        $resql=$this->query('SHOW CHARSET');
+        $resql = $this->query('SHOW CHARSET');
         $liste = array();
         if ($resql)
         {
             $i = 0;
-            while ($obj = $this->fetch_object($resql) )
+            while ($obj = $this->fetch_object($resql))
             {
                 $liste[$i]['charset'] = $obj->Charset;
                 $liste[$i]['description'] = $obj->Description;
@@ -1005,13 +1005,13 @@ 
      */
     function getDefaultCollationDatabase()
     {
-        $resql=$this->query('SHOW VARIABLES LIKE \'collation_database\'');
+        $resql = $this->query('SHOW VARIABLES LIKE \'collation_database\'');
         if (!$resql)
         {
             // version Mysql < 4.1.1
             return $this->forcecollate;
         }
-        $liste=$this->fetch_array($resql);
+        $liste = $this->fetch_array($resql);
         $tmpval = $liste['Value'];
 
         return $tmpval;
@@ -1024,12 +1024,12 @@ 
      */
     function getListOfCollation()
     {
-        $resql=$this->query('SHOW COLLATION');
+        $resql = $this->query('SHOW COLLATION');
         $liste = array();
         if ($resql)
         {
             $i = 0;
-            while ($obj = $this->fetch_object($resql) )
+            while ($obj = $this->fetch_object($resql))
             {
                 $liste[$i]['collation'] = $obj->Collation;
                 $i++;
@@ -1049,14 +1049,14 @@ 
      */
     function getPathOfDump()
     {
-        $fullpathofdump='/pathtomysqldump/mysqldump';
+        $fullpathofdump = '/pathtomysqldump/mysqldump';
 
-        $resql=$this->query('SHOW VARIABLES LIKE \'basedir\'');
+        $resql = $this->query('SHOW VARIABLES LIKE \'basedir\'');
         if ($resql)
         {
-            $liste=$this->fetch_array($resql);
-            $basedir=$liste['Value'];
-            $fullpathofdump=$basedir.(preg_match('/\/$/',$basedir)?'':'/').'bin/mysqldump';
+            $liste = $this->fetch_array($resql);
+            $basedir = $liste['Value'];
+            $fullpathofdump = $basedir.(preg_match('/\/$/', $basedir) ? '' : '/').'bin/mysqldump';
         }
         return $fullpathofdump;
     }
@@ -1068,14 +1068,14 @@ 
      */
     function getPathOfRestore()
     {
-        $fullpathofimport='/pathtomysql/mysql';
+        $fullpathofimport = '/pathtomysql/mysql';
 
-        $resql=$this->query('SHOW VARIABLES LIKE \'basedir\'');
+        $resql = $this->query('SHOW VARIABLES LIKE \'basedir\'');
         if ($resql)
         {
-            $liste=$this->fetch_array($resql);
-            $basedir=$liste['Value'];
-            $fullpathofimport=$basedir.(preg_match('/\/$/',$basedir)?'':'/').'bin/mysql';
+            $liste = $this->fetch_array($resql);
+            $basedir = $liste['Value'];
+            $fullpathofimport = $basedir.(preg_match('/\/$/', $basedir) ? '' : '/').'bin/mysql';
         }
         return $fullpathofimport;
     }
@@ -1086,16 +1086,16 @@ 
      * @param	string	$filter		Filter list on a particular value
 	 * @return	array				Array of key-values (key=>value)
      */
-    function getServerParametersValues($filter='')
+    function getServerParametersValues($filter = '')
     {
-        $result=array();
+        $result = array();
 
-        $sql='SHOW VARIABLES';
-        if ($filter) $sql.=" LIKE '".$this->escape($filter)."'";
-        $resql=$this->query($sql);
+        $sql = 'SHOW VARIABLES';
+        if ($filter) $sql .= " LIKE '".$this->escape($filter)."'";
+        $resql = $this->query($sql);
         if ($resql)
         {
-        	while($obj=$this->fetch_object($resql)) $result[$obj->Variable_name]=$obj->Value;
+        	while ($obj = $this->fetch_object($resql)) $result[$obj->Variable_name] = $obj->Value;
         }
 
         return $result;
@@ -1107,16 +1107,16 @@ 
      * @param	string	$filter		Filter list on a particular value
 	 * @return  array				Array of key-values (key=>value)
      */
-    function getServerStatusValues($filter='')
+    function getServerStatusValues($filter = '')
     {
-        $result=array();
+        $result = array();
 
-        $sql='SHOW STATUS';
-        if ($filter) $sql.=" LIKE '".$this->escape($filter)."'";
-        $resql=$this->query($sql);
+        $sql = 'SHOW STATUS';
+        if ($filter) $sql .= " LIKE '".$this->escape($filter)."'";
+        $resql = $this->query($sql);
         if ($resql)
         {
-            while($obj=$this->fetch_object($resql)) $result[$obj->Variable_name]=$obj->Value;
+            while ($obj = $this->fetch_object($resql)) $result[$obj->Variable_name] = $obj->Value;
         }
 
         return $result;

dolibarr/htdocs/core/db/Database.interface.php

Indentation +390 added lines, -390 removed lines

@@ -25,479 +25,479 @@
  */
 interface Database
 {
-	/**
-	 * 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
-	 * @return	string                SQL string
-	 */
-	function ifsql($test, $resok, $resko);
+    /**
+     * 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
+     * @return	string                SQL string
+     */
+    function ifsql($test, $resok, $resko);
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
-	/**
-	 * Return datas as an array
-	 *
-	 * @param   resource $resultset Resultset of request
-	 * @return  array                    Array
-	 */
+    /**
+     * Return datas as an array
+     *
+     * @param   resource $resultset Resultset of request
+     * @return  array                    Array
+     */
     function fetch_row($resultset);
     // phpcs:enable
 
-	/**
-	 * Convert (by PHP) a GM Timestamp date into a string date with PHP server TZ to insert into a date field.
-	 * Function to use to build INSERT, UPDATE or WHERE predica
-	 *
-	 * @param   int		$param 		Date TMS to convert
-	 * @return  string            	Date in a string YYYYMMDDHHMMSS
-	 */
-	function idate($param);
-
-	/**
-	 * Return last error code
-	 *
-	 * @return  string    lasterrno
-	 */
-	function lasterrno();
-
-	/**
-	 * Start transaction
-	 *
-	 * @return  int         1 if transaction successfuly opened or already opened, 0 if error
-	 */
-	function begin();
+    /**
+     * Convert (by PHP) a GM Timestamp date into a string date with PHP server TZ to insert into a date field.
+     * Function to use to build INSERT, UPDATE or WHERE predica
+     *
+     * @param   int		$param 		Date TMS to convert
+     * @return  string            	Date in a string YYYYMMDDHHMMSS
+     */
+    function idate($param);
+
+    /**
+     * Return last error code
+     *
+     * @return  string    lasterrno
+     */
+    function lasterrno();
+
+    /**
+     * Start transaction
+     *
+     * @return  int         1 if transaction successfuly opened or already opened, 0 if error
+     */
+    function begin();
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
-	/**
-	 * 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  resource                	resource defined if OK, null if KO
-	 */
+    /**
+     * 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  resource                	resource defined if OK, null if KO
+     */
     function DDLCreateDb($database, $charset = '', $collation = '', $owner = '');
     // phpcs:enable
 
-	/**
-	 * Return version of database server into an array
-	 *
-	 * @return	array        Version array
-	 */
-	function getVersionArray();
-
-	/**
-	 *  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 version of database server into an array
+     *
+     * @return	array        Version array
+     */
+    function getVersionArray();
+
+    /**
+     *  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');
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
-	/**
-	 * 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
-	 * @see    	num_rows
-	 */
+    /**
+     * 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
+     * @see    	num_rows
+     */
     function affected_rows($resultset);
     // phpcs:enable
 
-	/**
-	 * Return description of last error
-	 *
-	 * @return  string        Error text
-	 */
-	function error();
+    /**
+     * Return description of last error
+     *
+     * @return  string        Error text
+     */
+    function error();
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
-	/**
-	 *  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
-	 */
+    /**
+     *  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 = '');
     // phpcs:enable
 
-	/**
-	 * Return last request executed with query()
-	 *
-	 * @return	string                    Last query
-	 */
-	function lastquery();
-
-	/**
-	 * Define sort criteria of request
-	 *
-	 * @param   string $sortfield List of sort fields
-	 * @param   string $sortorder Sort order
-	 * @return  string            String to provide syntax of a sort sql string
-	 */
-	function order($sortfield = null, $sortorder = null);
-
-	/**
-	 * Decrypt sensitive data in database
-	 *
-	 * @param    string $value Value to decrypt
-	 * @return   string                    Decrypted value if used
-	 */
-	function decrypt($value);
+    /**
+     * Return last request executed with query()
+     *
+     * @return	string                    Last query
+     */
+    function lastquery();
+
+    /**
+     * Define sort criteria of request
+     *
+     * @param   string $sortfield List of sort fields
+     * @param   string $sortorder Sort order
+     * @return  string            String to provide syntax of a sort sql string
+     */
+    function order($sortfield = null, $sortorder = null);
+
+    /**
+     * Decrypt sensitive data in database
+     *
+     * @param    string $value Value to decrypt
+     * @return   string                    Decrypted value if used
+     */
+    function decrypt($value);
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
-	/**
-	 *    Return datas as an array
-	 *
-	 * @param   resource $resultset Resultset of request
-	 * @return  array                    Array
-	 */
+    /**
+     *    Return datas as an array
+     *
+     * @param   resource $resultset Resultset of request
+     * @return  array                    Array
+     */
     function fetch_array($resultset);
     // phpcs:enable
 
-	/**
-	 * Return last error label
-	 *
-	 * @return	string    lasterror
-	 */
-	function lasterror();
-
-	/**
-	 * Escape a string to insert data
-	 *
-	 * @param   string $stringtoencode String to escape
-	 * @return  string                        String escaped
-	 */
-	function escape($stringtoencode);
+    /**
+     * Return last error label
+     *
+     * @return	string    lasterror
+     */
+    function lasterror();
+
+    /**
+     * Escape a string to insert data
+     *
+     * @param   string $stringtoencode String to escape
+     * @return  string                        String escaped
+     */
+    function escape($stringtoencode);
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
-	/**
-	 * 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
-	 */
+    /**
+     * 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');
     // phpcs:enable
 
-	/**
-	 *    Return full path of restore program
-	 *
-	 * @return        string        Full path of restore program
-	 */
-	function getPathOfRestore();
-
-	/**
-	 *    Annulation d'une transaction et retour aux anciennes valeurs
-	 *
-	 * @param	string $log Add more log to default log line
-	 * @return  int                1 si annulation ok ou transaction non ouverte, 0 en cas d'erreur
-	 */
-	function rollback($log = '');
-
-	/**
-	 * 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 rollback 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  resource                Resultset of answer
-	 */
-	function query($query, $usesavepoint = 0, $type = 'auto');
-
-	/**
-	 *    Connexion to server
-	 *
-	 * @param   string $host database server host
-	 * @param   string $login login
-	 * @param   string $passwd password
-	 * @param   string $name name of database (not used for mysql, used for pgsql)
-	 * @param   int    $port Port of database server
-	 * @return  resource            Database access handler
-	 * @see     close
-	 */
-	function connect($host, $login, $passwd, $name, $port = 0);
-
-	/**
-	 *    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);
-
-	/**
-	 * 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 = '');
-
-	/**
-	 * 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 = '');
-
-	/**
-	 * Return collation used in database
-	 *
-	 * @return  string        Collation value
-	 */
-	function getDefaultCollationDatabase();
+    /**
+     *    Return full path of restore program
+     *
+     * @return        string        Full path of restore program
+     */
+    function getPathOfRestore();
+
+    /**
+     *    Annulation d'une transaction et retour aux anciennes valeurs
+     *
+     * @param	string $log Add more log to default log line
+     * @return  int                1 si annulation ok ou transaction non ouverte, 0 en cas d'erreur
+     */
+    function rollback($log = '');
+
+    /**
+     * 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 rollback 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  resource                Resultset of answer
+     */
+    function query($query, $usesavepoint = 0, $type = 'auto');
+
+    /**
+     *    Connexion to server
+     *
+     * @param   string $host database server host
+     * @param   string $login login
+     * @param   string $passwd password
+     * @param   string $name name of database (not used for mysql, used for pgsql)
+     * @param   int    $port Port of database server
+     * @return  resource            Database access handler
+     * @see     close
+     */
+    function connect($host, $login, $passwd, $name, $port = 0);
+
+    /**
+     *    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);
+
+    /**
+     * 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 = '');
+
+    /**
+     * 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 = '');
+
+    /**
+     * Return collation used in database
+     *
+     * @return  string        Collation value
+     */
+    function getDefaultCollationDatabase();
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
-	/**
-	 * 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);
     // phpcs:enable
 
-	/**
-	 * Return full path of dump program
-	 *
-	 * @return        string        Full path of dump program
-	 */
-	function getPathOfDump();
-
-	/**
-	 * Return version of database client driver
-	 *
-	 * @return            string      Version string
-	 */
-	function getDriverInfo();
-
-	/**
-	 * Return generic error code of last operation.
-	 *
-	 * @return    string        Error code (Exemples: DB_ERROR_TABLE_ALREADY_EXISTS, DB_ERROR_RECORD_ALREADY_EXISTS...)
-	 */
-	function errno();
+    /**
+     * Return full path of dump program
+     *
+     * @return        string        Full path of dump program
+     */
+    function getPathOfDump();
+
+    /**
+     * Return version of database client driver
+     *
+     * @return            string      Version string
+     */
+    function getDriverInfo();
+
+    /**
+     * Return generic error code of last operation.
+     *
+     * @return    string        Error code (Exemples: DB_ERROR_TABLE_ALREADY_EXISTS, DB_ERROR_RECORD_ALREADY_EXISTS...)
+     */
+    function errno();
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
-	/**
-	 * Create a table into database
-	 *
-	 * @param        string $table 			Name of table
-	 * @param        array 	$fields 		Tableau associatif [nom champ][tableau des descriptions]
-	 * @param        string $primary_key 	Nom du champ qui sera la clef primaire
-	 * @param        string $type 			Type de la table
-	 * @param        array 	$unique_keys 	Tableau associatifs Nom de champs qui seront clef unique => valeur
-	 * @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
-	 */
+    /**
+     * Create a table into database
+     *
+     * @param        string $table 			Name of table
+     * @param        array 	$fields 		Tableau associatif [nom champ][tableau des descriptions]
+     * @param        string $primary_key 	Nom du champ qui sera la clef primaire
+     * @param        string $type 			Type de la table
+     * @param        array 	$unique_keys 	Tableau associatifs Nom de champs qui seront clef unique => valeur
+     * @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);
     // phpcs:enable
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
-	/**
-	 * Drop a table into database
-	 *
-	 * @param        string $table 			Name of table
-	 * @return       int                    <0 if KO, >=0 if OK
-	 */
+    /**
+     * Drop a table into database
+     *
+     * @param        string $table 			Name of table
+     * @return       int                    <0 if KO, >=0 if OK
+     */
     function DDLDropTable($table);
     // phpcs:enable
 
-	/**
-	 * Return list of available charset that can be used to store data in database
-	 *
-	 * @return        array        List of Charset
-	 */
-	function getListOfCharacterSet();
+    /**
+     * Return list of available charset that can be used to store data in database
+     *
+     * @return        array        List of Charset
+     */
+    function getListOfCharacterSet();
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
-	/**
-	 * 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
-	 */
+    /**
+     * 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 = "");
     // phpcs:enable
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
-	/**
-	 * 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
-	 */
+    /**
+     * 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);
     // phpcs:enable
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
-	/**
-	 * 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
-	 */
+    /**
+     * 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);
     // phpcs:enable
 
-	/**
-	 * Return list of available collation that can be used for database
-	 *
-	 * @return        array        			List of Collation
-	 */
-	function getListOfCollation();
+    /**
+     * Return list of available collation that can be used for database
+     *
+     * @return        array        			List of Collation
+     */
+    function getListOfCollation();
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
-	/**
-	 * 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   resource            		Resource
-	 */
+    /**
+     * 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   resource            		Resource
+     */
     function DDLDescTable($table, $field = "");
     // phpcs:enable
 
-	/**
-	 * Return version of database server
-	 *
-	 * @return            string      		Version string
-	 */
-	function getVersion();
+    /**
+     * Return version of database server
+     *
+     * @return            string      		Version string
+     */
+    function getVersion();
 
-	/**
-	 * 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();
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
-	/**
-	 * 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
+    /**
+     * 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
     );
     // phpcs:enable
 
-	/**
-	 * Convert (by PHP) a PHP server TZ string date into a Timestamps date (GMT if gm=true)
-	 * 19700101020000 -> 3600 with TZ+1 and gmt=0
-	 * 19700101020000 -> 7200 whaterver is TZ if gmt=1
-	 *
-	 * @param	string			$string		Date in a string (YYYYMMDDHHMMSS, YYYYMMDD, YYYY-MM-DD HH:MM:SS)
-	 * @param	bool			$gm			1=Input informations are GMT values, otherwise local to server TZ
-	 * @return	int|string					Date TMS or ''
-	 */
-	function jdate($string, $gm=false);
-
-	/**
-	 * 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);
-
-	/**
-	 * Validate a database transaction
-	 *
-	 * @param   string 			$log 			Add more log to default log line
-	 * @return	int                				1 if validation is OK or transaction level no started, 0 if ERROR
-	 */
-	function commit($log = '');
+    /**
+     * Convert (by PHP) a PHP server TZ string date into a Timestamps date (GMT if gm=true)
+     * 19700101020000 -> 3600 with TZ+1 and gmt=0
+     * 19700101020000 -> 7200 whaterver is TZ if gmt=1
+     *
+     * @param	string			$string		Date in a string (YYYYMMDDHHMMSS, YYYYMMDD, YYYY-MM-DD HH:MM:SS)
+     * @param	bool			$gm			1=Input informations are GMT values, otherwise local to server TZ
+     * @return	int|string					Date TMS or ''
+     */
+    function jdate($string, $gm=false);
+
+    /**
+     * 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);
+
+    /**
+     * Validate a database transaction
+     *
+     * @param   string 			$log 			Add more log to default log line
+     * @return	int                				1 if validation is OK or transaction level no started, 0 if ERROR
+     */
+    function commit($log = '');
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
-	/**
-	 * List information of columns into a table.
-	 *
-	 * @param   string 			$table 			Name of table
-	 * @return  array                			Array with inforation on table
-	 */
+    /**
+     * List information of columns into a table.
+     *
+     * @param   string 			$table 			Name of table
+     * @return  array                			Array with inforation on table
+     */
     function DDLInfoTable($table);
     // phpcs:enable
 
-	/**
-	 * Free last resultset used.
-	 *
-	 * @param  	resource 		$resultset 		Fre cursor
-	 * @return  void
-	 */
-	function free($resultset = null);
-
-	/**
-	 * Close database connexion
-	 *
-	 * @return  boolean     					True if disconnect successfull, false otherwise
-	 * @see     connect
-	 */
-	function close();
-
-	/**
-	 * Return last query in error
-	 *
-	 * @return  string    lastqueryerror
-	 */
-	function lastqueryerror();
+    /**
+     * Free last resultset used.
+     *
+     * @param  	resource 		$resultset 		Fre cursor
+     * @return  void
+     */
+    function free($resultset = null);
+
+    /**
+     * Close database connexion
+     *
+     * @return  boolean     					True if disconnect successfull, false otherwise
+     * @see     connect
+     */
+    function close();
+
+    /**
+     * Return last query in error
+     *
+     * @return  string    lastqueryerror
+     */
+    function lastqueryerror();
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
-	/**
-	 * Return connexion ID
-	 *
-	 * @return  string      Id connexion
-	 */
+    /**
+     * Return connexion ID
+     *
+     * @return  string      Id connexion
+     */
     function DDLGetConnectId();
     // phpcs:enable
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
-	/**
-	 * Renvoie la ligne courante (comme un objet) pour le curseur resultset
-	 *
-	 * @param   resource $resultset Curseur de la requete voulue
-	 * @return  Object                    Object result line or false if KO or end of cursor
-	 */
+    /**
+     * Renvoie la ligne courante (comme un objet) pour le curseur resultset
+     *
+     * @param   resource $resultset Curseur de la requete voulue
+     * @return  Object                    Object result line or false if KO or end of cursor
+     */
     function fetch_object($resultset);
     // phpcs:enable
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
-	/**
-	 * Select a database
-	 *
-	 * @param	string $database Name of database
-	 * @return  boolean            true if OK, false if KO
-	 */
+    /**
+     * Select a database
+     *
+     * @param	string $database Name of database
+     * @return  boolean            true if OK, false if KO
+     */
     function select_db($database);
     // phpcs:enable
 }

Spacing +1 added lines, -1 removed lines

@@ -419,7 +419,7 @@
 	 * @param	bool			$gm			1=Input informations are GMT values, otherwise local to server TZ
 	 * @return	int|string					Date TMS or ''
 	 */
-	function jdate($string, $gm=false);
+	function jdate($string, $gm = false);
 
 	/**
 	 * Encrypt sensitive data in database

dolibarr/htdocs/core/db/DoliDB.class.php

Indentation +250 added lines, -250 removed lines

@@ -29,273 +29,273 @@
  */
 abstract class DoliDB implements Database
 {
-	/** @var resource Database handler */
-	public $db;
-	/** @var string Database type */
-	public $type;
-	/** @var string Charset used to force charset when creating database */
-	public $forcecharset='utf8';
-	/** @var string Collate used to force collate when creating database */
-	public $forcecollate='utf8_unicode_ci';
-	/** @var resource Resultset of last query */
-	private $_results;
-	/** @var bool true if connected, else false */
-	public $connected;
-	/** @var bool true if database selected, else false */
-	public $database_selected;
-	/** @var string Selected database name */
-	public $database_name;
-	/** @var string Database username */
-	public $database_user;
-	/** @var string Database host */
-	public $database_host;
-	/** @var int Database port */
-	public $database_port;
-	/** @var int >=1 if a transaction is opened, 0 otherwise */
-	public $transaction_opened;
-	/** @var string Last successful query */
-	public $lastquery;
-	/** @var string Last failed query */
-	public $lastqueryerror;
-	/** @var string Last error message */
-	public $lasterror;
-	/** @var string Last error number. For example: 'DB_ERROR_RECORD_ALREADY_EXISTS', '12345', ... */
-	public $lasterrno;
+    /** @var resource Database handler */
+    public $db;
+    /** @var string Database type */
+    public $type;
+    /** @var string Charset used to force charset when creating database */
+    public $forcecharset='utf8';
+    /** @var string Collate used to force collate when creating database */
+    public $forcecollate='utf8_unicode_ci';
+    /** @var resource Resultset of last query */
+    private $_results;
+    /** @var bool true if connected, else false */
+    public $connected;
+    /** @var bool true if database selected, else false */
+    public $database_selected;
+    /** @var string Selected database name */
+    public $database_name;
+    /** @var string Database username */
+    public $database_user;
+    /** @var string Database host */
+    public $database_host;
+    /** @var int Database port */
+    public $database_port;
+    /** @var int >=1 if a transaction is opened, 0 otherwise */
+    public $transaction_opened;
+    /** @var string Last successful query */
+    public $lastquery;
+    /** @var string Last failed query */
+    public $lastqueryerror;
+    /** @var string Last error message */
+    public $lasterror;
+    /** @var string Last error number. For example: 'DB_ERROR_RECORD_ALREADY_EXISTS', '12345', ... */
+    public $lasterrno;
 
-	/** @var bool Status */
-	public $ok;
-	/** @var string */
-	public $error;
+    /** @var bool Status */
+    public $ok;
+    /** @var string */
+    public $error;
 
-	/**
-	 *	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
-	 *	@return	string          		SQL string
-	 */
-	function ifsql($test,$resok,$resko)
-	{
-		return 'IF('.$test.','.$resok.','.$resko.')';
-	}
+    /**
+     *	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
+     *	@return	string          		SQL string
+     */
+    function ifsql($test,$resok,$resko)
+    {
+        return 'IF('.$test.','.$resok.','.$resko.')';
+    }
 
-	/**
-	 *   Convert (by PHP) a GM Timestamp date into a string date with PHP server TZ to insert into a date field.
-	 *   Function to use to build INSERT, UPDATE or WHERE predica
-	 *
-	 *   @param	    int		$param      	Date TMS to convert
-	 *   @return	string      			Date in a string YYYY-MM-DD HH:MM:SS
-	 */
-	function idate($param)
-	{
-		// TODO GMT $param should be gmt, so we should add tzouptut to 'gmt'
-		return dol_print_date($param,"%Y-%m-%d %H:%M:%S");
-	}
+    /**
+     *   Convert (by PHP) a GM Timestamp date into a string date with PHP server TZ to insert into a date field.
+     *   Function to use to build INSERT, UPDATE or WHERE predica
+     *
+     *   @param	    int		$param      	Date TMS to convert
+     *   @return	string      			Date in a string YYYY-MM-DD HH:MM:SS
+     */
+    function idate($param)
+    {
+        // TODO GMT $param should be gmt, so we should add tzouptut to 'gmt'
+        return dol_print_date($param,"%Y-%m-%d %H:%M:%S");
+    }
 
-	/**
-	 *	Return last error code
-	 *
-	 *	@return	    string	lasterrno
-	 */
-	function lasterrno()
-	{
-		return $this->lasterrno;
-	}
+    /**
+     *	Return last error code
+     *
+     *	@return	    string	lasterrno
+     */
+    function lasterrno()
+    {
+        return $this->lasterrno;
+    }
 
-	/**
-	 * Start transaction
-	 *
-	 * @return	    int         1 if transaction successfuly opened or already opened, 0 if error
-	 */
-	function begin()
-	{
-		if (! $this->transaction_opened)
-		{
-			$ret=$this->query("BEGIN");
-			if ($ret)
-			{
-				$this->transaction_opened++;
-				dol_syslog("BEGIN Transaction",LOG_DEBUG);
-				dol_syslog('',0,1);
-			}
-			return $ret;
-		}
-		else
-		{
-			$this->transaction_opened++;
-			dol_syslog('',0,1);
-			return 1;
-		}
-	}
+    /**
+     * Start transaction
+     *
+     * @return	    int         1 if transaction successfuly opened or already opened, 0 if error
+     */
+    function begin()
+    {
+        if (! $this->transaction_opened)
+        {
+            $ret=$this->query("BEGIN");
+            if ($ret)
+            {
+                $this->transaction_opened++;
+                dol_syslog("BEGIN Transaction",LOG_DEBUG);
+                dol_syslog('',0,1);
+            }
+            return $ret;
+        }
+        else
+        {
+            $this->transaction_opened++;
+            dol_syslog('',0,1);
+            return 1;
+        }
+    }
 
-	/**
-	 * Validate a database transaction
-	 *
-	 * @param	string	$log		Add more log to default log line
-	 * @return	int         		1 if validation is OK or transaction level no started, 0 if ERROR
-	 */
-	function commit($log='')
-	{
-		dol_syslog('',0,-1);
-		if ($this->transaction_opened<=1)
-		{
-			$ret=$this->query("COMMIT");
-			if ($ret)
-			{
-				$this->transaction_opened=0;
-				dol_syslog("COMMIT Transaction".($log?' '.$log:''),LOG_DEBUG);
-				return 1;
-			}
-			else
-			{
-				return 0;
-			}
-		}
-		else
-		{
-			$this->transaction_opened--;
-			return 1;
-		}
-	}
+    /**
+     * Validate a database transaction
+     *
+     * @param	string	$log		Add more log to default log line
+     * @return	int         		1 if validation is OK or transaction level no started, 0 if ERROR
+     */
+    function commit($log='')
+    {
+        dol_syslog('',0,-1);
+        if ($this->transaction_opened<=1)
+        {
+            $ret=$this->query("COMMIT");
+            if ($ret)
+            {
+                $this->transaction_opened=0;
+                dol_syslog("COMMIT Transaction".($log?' '.$log:''),LOG_DEBUG);
+                return 1;
+            }
+            else
+            {
+                return 0;
+            }
+        }
+        else
+        {
+            $this->transaction_opened--;
+            return 1;
+        }
+    }
 
-	/**
-	 *	Annulation d'une transaction et retour aux anciennes valeurs
-	 *
-	 * 	@param	string			$log		Add more log to default log line
-	 * 	@return	resource|int         		1 si annulation ok ou transaction non ouverte, 0 en cas d'erreur
-	 */
-	function rollback($log='')
-	{
-		dol_syslog('',0,-1);
-		if ($this->transaction_opened<=1)
-		{
-			$ret=$this->query("ROLLBACK");
-			$this->transaction_opened=0;
-			dol_syslog("ROLLBACK Transaction".($log?' '.$log:''),LOG_DEBUG);
-			return $ret;
-		}
-		else
-		{
-			$this->transaction_opened--;
-			return 1;
-		}
-	}
+    /**
+     *	Annulation d'une transaction et retour aux anciennes valeurs
+     *
+     * 	@param	string			$log		Add more log to default log line
+     * 	@return	resource|int         		1 si annulation ok ou transaction non ouverte, 0 en cas d'erreur
+     */
+    function rollback($log='')
+    {
+        dol_syslog('',0,-1);
+        if ($this->transaction_opened<=1)
+        {
+            $ret=$this->query("ROLLBACK");
+            $this->transaction_opened=0;
+            dol_syslog("ROLLBACK Transaction".($log?' '.$log:''),LOG_DEBUG);
+            return $ret;
+        }
+        else
+        {
+            $this->transaction_opened--;
+            return 1;
+        }
+    }
 
-	/**
-	 *	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 ($limit < 0) $limit=$conf->liste_limit;
-		if ($offset > 0) return " LIMIT $offset,$limit ";
-		else return " LIMIT $limit ";
-	}
+    /**
+     *	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 ($limit < 0) $limit=$conf->liste_limit;
+        if ($offset > 0) return " LIMIT $offset,$limit ";
+        else return " LIMIT $limit ";
+    }
 
-	/**
-	 *	Return version of database server into an array
-	 *
-	 *	@return	        array  		Version array
-	 */
-	function getVersionArray()
-	{
-		return preg_split("/[\.,-]/",$this->getVersion());
-	}
+    /**
+     *	Return version of database server into an array
+     *
+     *	@return	        array  		Version array
+     */
+    function getVersionArray()
+    {
+        return preg_split("/[\.,-]/",$this->getVersion());
+    }
 
-	/**
-	 *	Return last request executed with query()
-	 *
-	 *	@return	string					Last query
-	 */
-	function lastquery()
-	{
-		return $this->lastquery;
-	}
+    /**
+     *	Return last request executed with query()
+     *
+     *	@return	string					Last query
+     */
+    function lastquery()
+    {
+        return $this->lastquery;
+    }
 
-	/**
-	 * Define sort criteria of request
-	 *
-	 * @param	string		$sortfield		List of sort fields, separated by comma. Example: 't1.fielda,t2.fieldb'
-	 * @param	string		$sortorder		Sort order, separated by comma. Example: 'ASC,DESC';
-	 * @return	string						String to provide syntax of a sort sql string
-	 */
-	function order($sortfield=null,$sortorder=null)
-	{
-		if (! empty($sortfield))
-		{
-			$return='';
-			$fields=explode(',',$sortfield);
-			$orders=explode(',',$sortorder);
-			$i=0;
-			foreach($fields as $val)
-			{
-				if (! $return) $return.=' ORDER BY ';
-				else $return.=', ';
+    /**
+     * Define sort criteria of request
+     *
+     * @param	string		$sortfield		List of sort fields, separated by comma. Example: 't1.fielda,t2.fieldb'
+     * @param	string		$sortorder		Sort order, separated by comma. Example: 'ASC,DESC';
+     * @return	string						String to provide syntax of a sort sql string
+     */
+    function order($sortfield=null,$sortorder=null)
+    {
+        if (! empty($sortfield))
+        {
+            $return='';
+            $fields=explode(',',$sortfield);
+            $orders=explode(',',$sortorder);
+            $i=0;
+            foreach($fields as $val)
+            {
+                if (! $return) $return.=' ORDER BY ';
+                else $return.=', ';
 
-				$return.=preg_replace('/[^0-9a-z_\.]/i','',$val);
+                $return.=preg_replace('/[^0-9a-z_\.]/i','',$val);
 
-				$tmpsortorder = trim($orders[$i]);
+                $tmpsortorder = trim($orders[$i]);
 
-				// Only ASC and DESC values are valid SQL
-				if (strtoupper($tmpsortorder) === 'ASC') {
-					$return .= ' ASC';
-				} elseif (strtoupper($tmpsortorder) === 'DESC') {
-					$return .= ' DESC';
-				}
+                // Only ASC and DESC values are valid SQL
+                if (strtoupper($tmpsortorder) === 'ASC') {
+                    $return .= ' ASC';
+                } elseif (strtoupper($tmpsortorder) === 'DESC') {
+                    $return .= ' DESC';
+                }
 
-				$i++;
-			}
-			return $return;
-		}
-		else
-		{
-			return '';
-		}
-	}
+                $i++;
+            }
+            return $return;
+        }
+        else
+        {
+            return '';
+        }
+    }
 
-	/**
-	 *	Return last error label
-	 *
-	 *	@return	    string		Last error
-	 */
-	function lasterror()
-	{
-		return $this->lasterror;
-	}
+    /**
+     *	Return last error label
+     *
+     *	@return	    string		Last error
+     */
+    function lasterror()
+    {
+        return $this->lasterror;
+    }
 
-	/**
-	 *	Convert (by PHP) a PHP server TZ string date into a Timestamps date (GMT if gm=true)
-	 * 	19700101020000 -> 3600 with TZ+1 and gmt=0
-	 * 	19700101020000 -> 7200 whaterver is TZ if gmt=1
-	 *
-	 * 	@param	string				$string		Date in a string (YYYYMMDDHHMMSS, YYYYMMDD, YYYY-MM-DD HH:MM:SS)
-	 *	@param	bool				$gm			1=Input informations are GMT values, otherwise local to server TZ
-	 *	@return	int|string						Date TMS or ''
-	 */
-	function jdate($string, $gm=false)
-	{
-		// TODO GMT must set param gm to true by default
-		if ($string==0 || $string=="0000-00-00 00:00:00") return '';
-		$string=preg_replace('/([^0-9])/i','',$string);
-		$tmp=$string.'000000';
-		$date=dol_mktime(substr($tmp,8,2),substr($tmp,10,2),substr($tmp,12,2),substr($tmp,4,2),substr($tmp,6,2),substr($tmp,0,4),$gm);
-		return $date;
-	}
+    /**
+     *	Convert (by PHP) a PHP server TZ string date into a Timestamps date (GMT if gm=true)
+     * 	19700101020000 -> 3600 with TZ+1 and gmt=0
+     * 	19700101020000 -> 7200 whaterver is TZ if gmt=1
+     *
+     * 	@param	string				$string		Date in a string (YYYYMMDDHHMMSS, YYYYMMDD, YYYY-MM-DD HH:MM:SS)
+     *	@param	bool				$gm			1=Input informations are GMT values, otherwise local to server TZ
+     *	@return	int|string						Date TMS or ''
+     */
+    function jdate($string, $gm=false)
+    {
+        // TODO GMT must set param gm to true by default
+        if ($string==0 || $string=="0000-00-00 00:00:00") return '';
+        $string=preg_replace('/([^0-9])/i','',$string);
+        $tmp=$string.'000000';
+        $date=dol_mktime(substr($tmp,8,2),substr($tmp,10,2),substr($tmp,12,2),substr($tmp,4,2),substr($tmp,6,2),substr($tmp,0,4),$gm);
+        return $date;
+    }
 
-	/**
-	 *	Return last query in error
-	 *
-	 *	@return	    string	lastqueryerror
-	 */
-	function lastqueryerror()
-	{
-		return $this->lastqueryerror;
-	}
+    /**
+     *	Return last query in error
+     *
+     *	@return	    string	lastqueryerror
+     */
+    function lastqueryerror()
+    {
+        return $this->lastqueryerror;
+    }
 }
 

Braces +24 added lines, -17 removed lines

@@ -120,8 +120,7 @@ 
 				dol_syslog('',0,1);
 			}
 			return $ret;
-		}
-		else
+		} else
 		{
 			$this->transaction_opened++;
 			dol_syslog('',0,1);
@@ -146,13 +145,11 @@ 
 				$this->transaction_opened=0;
 				dol_syslog("COMMIT Transaction".($log?' '.$log:''),LOG_DEBUG);
 				return 1;
-			}
-			else
+			} else
 			{
 				return 0;
 			}
-		}
-		else
+		} else
 		{
 			$this->transaction_opened--;
 			return 1;
@@ -174,8 +171,7 @@ 
 			$this->transaction_opened=0;
 			dol_syslog("ROLLBACK Transaction".($log?' '.$log:''),LOG_DEBUG);
 			return $ret;
-		}
-		else
+		} else
 		{
 			$this->transaction_opened--;
 			return 1;
@@ -192,10 +188,17 @@ 
 	function plimit($limit=0,$offset=0)
 	{
 		global $conf;
-		if (empty($limit)) return "";
-		if ($limit < 0) $limit=$conf->liste_limit;
-		if ($offset > 0) return " LIMIT $offset,$limit ";
-		else return " LIMIT $limit ";
+		if (empty($limit)) {
+		    return "";
+		}
+		if ($limit < 0) {
+		    $limit=$conf->liste_limit;
+		}
+		if ($offset > 0) {
+		    return " LIMIT $offset,$limit ";
+		} else {
+		    return " LIMIT $limit ";
+		}
 	}
 
 	/**
@@ -235,8 +238,11 @@ 
 			$i=0;
 			foreach($fields as $val)
 			{
-				if (! $return) $return.=' ORDER BY ';
-				else $return.=', ';
+				if (! $return) {
+				    $return.=' ORDER BY ';
+				} else {
+				    $return.=', ';
+				}
 
 				$return.=preg_replace('/[^0-9a-z_\.]/i','',$val);
 
@@ -252,8 +258,7 @@ 
 				$i++;
 			}
 			return $return;
-		}
-		else
+		} else
 		{
 			return '';
 		}
@@ -281,7 +286,9 @@ 
 	function jdate($string, $gm=false)
 	{
 		// TODO GMT must set param gm to true by default
-		if ($string==0 || $string=="0000-00-00 00:00:00") return '';
+		if ($string==0 || $string=="0000-00-00 00:00:00") {
+		    return '';
+		}
 		$string=preg_replace('/([^0-9])/i','',$string);
 		$tmp=$string.'000000';
 		$date=dol_mktime(substr($tmp,8,2),substr($tmp,10,2),substr($tmp,12,2),substr($tmp,4,2),substr($tmp,6,2),substr($tmp,0,4),$gm);

Spacing +40 added lines, -40 removed lines

@@ -26,7 +26,7 @@ 
  * \brief 		Class file to manage Dolibarr database access
  */
 
-require_once DOL_BASE_PATH . '/core/db/Database.interface.php';
+require_once DOL_BASE_PATH.'/core/db/Database.interface.php';
 
 /**
  * Class to manage Dolibarr database access
@@ -38,9 +38,9 @@ 
 	/** @var string Database type */
 	public $type;
 	/** @var string Charset used to force charset when creating database */
-	public $forcecharset='utf8';
+	public $forcecharset = 'utf8';
 	/** @var string Collate used to force collate when creating database */
-	public $forcecollate='utf8_unicode_ci';
+	public $forcecollate = 'utf8_unicode_ci';
 	/** @var resource Resultset of last query */
 	private $_results;
 	/** @var bool true if connected, else false */
@@ -79,7 +79,7 @@ 
 	 *	@param	string	$resko          resultat si test non egal
 	 *	@return	string          		SQL string
 	 */
-	function ifsql($test,$resok,$resko)
+	function ifsql($test, $resok, $resko)
 	{
 		return 'IF('.$test.','.$resok.','.$resko.')';
 	}
@@ -94,7 +94,7 @@ 
 	function idate($param)
 	{
 		// TODO GMT $param should be gmt, so we should add tzouptut to 'gmt'
-		return dol_print_date($param,"%Y-%m-%d %H:%M:%S");
+		return dol_print_date($param, "%Y-%m-%d %H:%M:%S");
 	}
 
 	/**
@@ -114,21 +114,21 @@ 
 	 */
 	function begin()
 	{
-		if (! $this->transaction_opened)
+		if (!$this->transaction_opened)
 		{
-			$ret=$this->query("BEGIN");
+			$ret = $this->query("BEGIN");
 			if ($ret)
 			{
 				$this->transaction_opened++;
-				dol_syslog("BEGIN Transaction",LOG_DEBUG);
-				dol_syslog('',0,1);
+				dol_syslog("BEGIN Transaction", LOG_DEBUG);
+				dol_syslog('', 0, 1);
 			}
 			return $ret;
 		}
 		else
 		{
 			$this->transaction_opened++;
-			dol_syslog('',0,1);
+			dol_syslog('', 0, 1);
 			return 1;
 		}
 	}
@@ -139,16 +139,16 @@ 
 	 * @param	string	$log		Add more log to default log line
 	 * @return	int         		1 if validation is OK or transaction level no started, 0 if ERROR
 	 */
-	function commit($log='')
+	function commit($log = '')
 	{
-		dol_syslog('',0,-1);
-		if ($this->transaction_opened<=1)
+		dol_syslog('', 0, -1);
+		if ($this->transaction_opened <= 1)
 		{
-			$ret=$this->query("COMMIT");
+			$ret = $this->query("COMMIT");
 			if ($ret)
 			{
-				$this->transaction_opened=0;
-				dol_syslog("COMMIT Transaction".($log?' '.$log:''),LOG_DEBUG);
+				$this->transaction_opened = 0;
+				dol_syslog("COMMIT Transaction".($log ? ' '.$log : ''), LOG_DEBUG);
 				return 1;
 			}
 			else
@@ -169,14 +169,14 @@ 
 	 * 	@param	string			$log		Add more log to default log line
 	 * 	@return	resource|int         		1 si annulation ok ou transaction non ouverte, 0 en cas d'erreur
 	 */
-	function rollback($log='')
+	function rollback($log = '')
 	{
-		dol_syslog('',0,-1);
-		if ($this->transaction_opened<=1)
+		dol_syslog('', 0, -1);
+		if ($this->transaction_opened <= 1)
 		{
-			$ret=$this->query("ROLLBACK");
-			$this->transaction_opened=0;
-			dol_syslog("ROLLBACK Transaction".($log?' '.$log:''),LOG_DEBUG);
+			$ret = $this->query("ROLLBACK");
+			$this->transaction_opened = 0;
+			dol_syslog("ROLLBACK Transaction".($log ? ' '.$log : ''), LOG_DEBUG);
 			return $ret;
 		}
 		else
@@ -193,11 +193,11 @@ 
 	 *	@param	int		$offset     Numero of line from where starting fetch
 	 *	@return	string      		String with SQL syntax to add a limit and offset
 	 */
-	function plimit($limit=0,$offset=0)
+	function plimit($limit = 0, $offset = 0)
 	{
 		global $conf;
 		if (empty($limit)) return "";
-		if ($limit < 0) $limit=$conf->liste_limit;
+		if ($limit < 0) $limit = $conf->liste_limit;
 		if ($offset > 0) return " LIMIT $offset,$limit ";
 		else return " LIMIT $limit ";
 	}
@@ -209,7 +209,7 @@ 
 	 */
 	function getVersionArray()
 	{
-		return preg_split("/[\.,-]/",$this->getVersion());
+		return preg_split("/[\.,-]/", $this->getVersion());
 	}
 
 	/**
@@ -229,20 +229,20 @@ 
 	 * @param	string		$sortorder		Sort order, separated by comma. Example: 'ASC,DESC';
 	 * @return	string						String to provide syntax of a sort sql string
 	 */
-	function order($sortfield=null,$sortorder=null)
+	function order($sortfield = null, $sortorder = null)
 	{
-		if (! empty($sortfield))
+		if (!empty($sortfield))
 		{
-			$return='';
-			$fields=explode(',',$sortfield);
-			$orders=explode(',',$sortorder);
-			$i=0;
-			foreach($fields as $val)
+			$return = '';
+			$fields = explode(',', $sortfield);
+			$orders = explode(',', $sortorder);
+			$i = 0;
+			foreach ($fields as $val)
 			{
-				if (! $return) $return.=' ORDER BY ';
-				else $return.=', ';
+				if (!$return) $return .= ' ORDER BY ';
+				else $return .= ', ';
 
-				$return.=preg_replace('/[^0-9a-z_\.]/i','',$val);
+				$return .= preg_replace('/[^0-9a-z_\.]/i', '', $val);
 
 				$tmpsortorder = trim($orders[$i]);
 
@@ -282,13 +282,13 @@ 
 	 *	@param	bool				$gm			1=Input informations are GMT values, otherwise local to server TZ
 	 *	@return	int|string						Date TMS or ''
 	 */
-	function jdate($string, $gm=false)
+	function jdate($string, $gm = false)
 	{
 		// TODO GMT must set param gm to true by default
-		if ($string==0 || $string=="0000-00-00 00:00:00") return '';
-		$string=preg_replace('/([^0-9])/i','',$string);
-		$tmp=$string.'000000';
-		$date=dol_mktime(substr($tmp,8,2),substr($tmp,10,2),substr($tmp,12,2),substr($tmp,4,2),substr($tmp,6,2),substr($tmp,0,4),$gm);
+		if ($string == 0 || $string == "0000-00-00 00:00:00") return '';
+		$string = preg_replace('/([^0-9])/i', '', $string);
+		$tmp = $string.'000000';
+		$date = dol_mktime(substr($tmp, 8, 2), substr($tmp, 10, 2), substr($tmp, 12, 2), substr($tmp, 4, 2), substr($tmp, 6, 2), substr($tmp, 0, 4), $gm);
 		return $date;
 	}
 

dolibarr/htdocs/core/db/pgsql.class.php

Indentation +1056 added lines, -1056 removed lines

@@ -36,110 +36,110 @@ 
 class DoliDBPgsql extends DoliDB
 {
     //! Database type
-	public $type='pgsql';            // Name of manager
+    public $type='pgsql';            // Name of manager
     //! Database label
-	const LABEL='PostgreSQL';      // Label of manager
-	//! Charset
-	var $forcecharset='UTF8';       // Can't be static as it may be forced with a dynamic value
+    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
-	//! Version min database
-	const VERSIONMIN='9.0.0';	// Version min database
-	/** @var resource Resultset of last query */
-	private $_results;
-
-	public $unescapeslashquot;
-	public $standard_conforming_strings;
-
-	/**
-	 *	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,$langs;
+    //! Version min database
+    const VERSIONMIN='9.0.0';	// Version min database
+    /** @var resource Resultset of last query */
+    private $_results;
+
+    public $unescapeslashquot;
+    public $standard_conforming_strings;
+
+    /**
+     *	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,$langs;
 
         // Note that having "static" property for "$forcecharset" and "$forcecollate" will make error here in strict mode, so they are not static
-		if (! empty($conf->db->character_set)) $this->forcecharset=$conf->db->character_set;
-		if (! empty($conf->db->dolibarr_main_db_collation))	$this->forcecollate=$conf->db->dolibarr_main_db_collation;
+        if (! empty($conf->db->character_set)) $this->forcecharset=$conf->db->character_set;
+        if (! empty($conf->db->dolibarr_main_db_collation))	$this->forcecollate=$conf->db->dolibarr_main_db_collation;
 
-		$this->database_user=$user;
+        $this->database_user=$user;
         $this->database_host=$host;
         $this->database_port=$port;
 
-		$this->transaction_opened=0;
-
-		//print "Name DB: $host,$user,$pass,$name<br>";
-
-		if (! function_exists("pg_connect"))
-		{
-			$this->connected = false;
-			$this->ok = false;
-			$this->error="Pgsql PHP functions are not available in this version of PHP";
-			dol_syslog(get_class($this)."::DoliDBPgsql : Pgsql PHP functions are not available in this version of PHP",LOG_ERR);
-			return $this->ok;
-		}
-
-		if (! $host)
-		{
-			$this->connected = false;
-			$this->ok = false;
-			$this->error=$langs->trans("ErrorWrongHostParameter");
-			dol_syslog(get_class($this)."::DoliDBPgsql : Erreur Connect, wrong host parameters",LOG_ERR);
-			return $this->ok;
-		}
-
-		// Essai connexion serveur
-		//print "$host, $user, $pass, $name, $port";
-		$this->db = $this->connect($host, $user, $pass, $name, $port);
-
-		if ($this->db)
-		{
-			$this->connected = true;
-			$this->ok = true;
-		}
-		else
-		{
-			// host, login ou password incorrect
-			$this->connected = false;
-			$this->ok = false;
-			$this->error='Host, login or password incorrect';
-			dol_syslog(get_class($this)."::DoliDBPgsql : Erreur Connect ".$this->error,LOG_ERR);
-		}
-
-		// Si connexion serveur ok et si connexion base demandee, on essaie connexion base
-		if ($this->connected && $name)
-		{
-			if ($this->select_db($name))
-			{
-				$this->database_selected = true;
-				$this->database_name = $name;
-				$this->ok = true;
-			}
-			else
-			{
-				$this->database_selected = false;
-				$this->database_name = '';
-				$this->ok = false;
-				$this->error=$this->error();
-				dol_syslog(get_class($this)."::DoliDBPgsql : Erreur Select_db ".$this->error,LOG_ERR);
-			}
-		}
-		else
-		{
-			// Pas de selection de base demandee, ok ou ko
-			$this->database_selected = false;
-		}
-
-		return $this->ok;
-	}
+        $this->transaction_opened=0;
+
+        //print "Name DB: $host,$user,$pass,$name<br>";
+
+        if (! function_exists("pg_connect"))
+        {
+            $this->connected = false;
+            $this->ok = false;
+            $this->error="Pgsql PHP functions are not available in this version of PHP";
+            dol_syslog(get_class($this)."::DoliDBPgsql : Pgsql PHP functions are not available in this version of PHP",LOG_ERR);
+            return $this->ok;
+        }
+
+        if (! $host)
+        {
+            $this->connected = false;
+            $this->ok = false;
+            $this->error=$langs->trans("ErrorWrongHostParameter");
+            dol_syslog(get_class($this)."::DoliDBPgsql : Erreur Connect, wrong host parameters",LOG_ERR);
+            return $this->ok;
+        }
+
+        // Essai connexion serveur
+        //print "$host, $user, $pass, $name, $port";
+        $this->db = $this->connect($host, $user, $pass, $name, $port);
+
+        if ($this->db)
+        {
+            $this->connected = true;
+            $this->ok = true;
+        }
+        else
+        {
+            // host, login ou password incorrect
+            $this->connected = false;
+            $this->ok = false;
+            $this->error='Host, login or password incorrect';
+            dol_syslog(get_class($this)."::DoliDBPgsql : Erreur Connect ".$this->error,LOG_ERR);
+        }
+
+        // Si connexion serveur ok et si connexion base demandee, on essaie connexion base
+        if ($this->connected && $name)
+        {
+            if ($this->select_db($name))
+            {
+                $this->database_selected = true;
+                $this->database_name = $name;
+                $this->ok = true;
+            }
+            else
+            {
+                $this->database_selected = false;
+                $this->database_name = '';
+                $this->ok = false;
+                $this->error=$this->error();
+                dol_syslog(get_class($this)."::DoliDBPgsql : Erreur Select_db ".$this->error,LOG_ERR);
+            }
+        }
+        else
+        {
+            // Pas de selection de base demandee, ok ou ko
+            $this->database_selected = false;
+        }
+
+        return $this->ok;
+    }
 
 
     /**
@@ -150,105 +150,105 @@ 
      *  @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
-		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 != "")
-		{
-			// 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('/ 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')
-		    {
+    static function convertSQLFromMysql($line,$type='auto',$unescapeslashquot=false)
+    {
+        // Removed empty line if this is a comment line for SVN tagging
+        if (preg_match('/^--\s\$Id/i',$line)) {
+            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 != "")
+        {
+            // 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('/ 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);
-    			}
+                // 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);
+                // 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);
+                // 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);
+                // nuke unsigned
+                $line=preg_replace('/(int\w+|smallint)\s+unsigned/i','\\1',$line);
 
-    			// blob -> text
-    			$line=preg_replace('/\w*blob/i','text',$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);
+                // 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);
+                $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);
+                // 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);
+                // 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);
+                //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);
+                // 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);
-    			}
+                // 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 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);
+                // 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 = "-- ".$line." replaced by --\n";
                     $line.= "ALTER TABLE ".$reg[1]." RENAME COLUMN ".$reg[2]." TO ".$reg[3];
                 }
 
@@ -267,12 +267,12 @@ 
                 }
 
                 // 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];
-    			}
+                // ALTER TABLE llx_dolibarr_modules ADD PRIMARY KEY pk_dolibarr_modules (numero, entity)
+                if (preg_match('/ALTER\s+TABLE\s*(.*)\s*ADD\s+PRIMARY\s+KEY\s*(.*)\s*\((.*)$/i',$line,$reg))
+                {
+                    $line = "-- ".$line." replaced by --\n";
+                    $line.= "ALTER TABLE ".$reg[1]." ADD PRIMARY KEY (".$reg[3];
+                }
 
                 // Translate order to drop primary keys
                 // ALTER TABLE llx_dolibarr_modules DROP PRIMARY KEY pk_xxx
@@ -282,7 +282,7 @@ 
                     $line.= "ALTER TABLE ".$reg[1]." DROP CONSTRAINT ".$reg[2];
                 }
 
-		        // Translate order to drop foreign keys
+                // 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))
                 {
@@ -299,15 +299,15 @@ 
                 }
 
                 // 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.")";
-    			}
+                // 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
@@ -317,59 +317,59 @@ 
             // 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
-			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);
-				}
-			}
+            // 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);
+                }
+            }
 
-			// Remove () in the tables in FROM if 1 table
-			$line=preg_replace('/FROM\s*\((([a-z_]+)\s+as\s+([a-z_]+)\s*)\)/i','FROM \\1',$line);
-			//print $line."\n";
+            // Remove () in the tables in FROM if 1 table
+            $line=preg_replace('/FROM\s*\((([a-z_]+)\s+as\s+([a-z_]+)\s*)\)/i','FROM \\1',$line);
+            //print $line."\n";
 
-			// Remove () in the tables in FROM if 2 table
-			$line=preg_replace('/FROM\s*\(([a-z_]+\s+as\s+[a-z_]+)\s*,\s*([a-z_]+\s+as\s+[a-z_]+\s*)\)/i','FROM \\1, \\2',$line);
-			//print $line."\n";
+            // Remove () in the tables in FROM if 2 table
+            $line=preg_replace('/FROM\s*\(([a-z_]+\s+as\s+[a-z_]+)\s*,\s*([a-z_]+\s+as\s+[a-z_]+\s*)\)/i','FROM \\1, \\2',$line);
+            //print $line."\n";
 
-			// Remove () in the tables in FROM if 3 table
-			$line=preg_replace('/FROM\s*\(([a-z_]+\s+as\s+[a-z_]+)\s*,\s*([a-z_]+\s+as\s+[a-z_]+\s*),\s*([a-z_]+\s+as\s+[a-z_]+\s*)\)/i','FROM \\1, \\2, \\3',$line);
-			//print $line."\n";
+            // Remove () in the tables in FROM if 3 table
+            $line=preg_replace('/FROM\s*\(([a-z_]+\s+as\s+[a-z_]+)\s*,\s*([a-z_]+\s+as\s+[a-z_]+\s*),\s*([a-z_]+\s+as\s+[a-z_]+\s*)\)/i','FROM \\1, \\2, \\3',$line);
+            //print $line."\n";
 
-			// Remove () in the tables in FROM if 4 table
-			$line=preg_replace('/FROM\s*\(([a-z_]+\s+as\s+[a-z_]+)\s*,\s*([a-z_]+\s+as\s+[a-z_]+\s*),\s*([a-z_]+\s+as\s+[a-z_]+\s*),\s*([a-z_]+\s+as\s+[a-z_]+\s*)\)/i','FROM \\1, \\2, \\3, \\4',$line);
-			//print $line."\n";
+            // Remove () in the tables in FROM if 4 table
+            $line=preg_replace('/FROM\s*\(([a-z_]+\s+as\s+[a-z_]+)\s*,\s*([a-z_]+\s+as\s+[a-z_]+\s*),\s*([a-z_]+\s+as\s+[a-z_]+\s*),\s*([a-z_]+\s+as\s+[a-z_]+\s*)\)/i','FROM \\1, \\2, \\3, \\4',$line);
+            //print $line."\n";
 
-			// Remove () in the tables in FROM if 5 table
-			$line=preg_replace('/FROM\s*\(([a-z_]+\s+as\s+[a-z_]+)\s*,\s*([a-z_]+\s+as\s+[a-z_]+\s*),\s*([a-z_]+\s+as\s+[a-z_]+\s*),\s*([a-z_]+\s+as\s+[a-z_]+\s*),\s*([a-z_]+\s+as\s+[a-z_]+\s*)\)/i','FROM \\1, \\2, \\3, \\4, \\5',$line);
-			//print $line."\n";
+            // Remove () in the tables in FROM if 5 table
+            $line=preg_replace('/FROM\s*\(([a-z_]+\s+as\s+[a-z_]+)\s*,\s*([a-z_]+\s+as\s+[a-z_]+\s*),\s*([a-z_]+\s+as\s+[a-z_]+\s*),\s*([a-z_]+\s+as\s+[a-z_]+\s*),\s*([a-z_]+\s+as\s+[a-z_]+\s*)\)/i','FROM \\1, \\2, \\3, \\4, \\5',$line);
+            //print $line."\n";
 
-			// Replace espacing \' by ''.
-			// By default we do not (should be already done by db->escape function if required
-			// except for sql insert in data file that are mysql escaped so we removed them to
-			// be compatible with standard_conforming_strings=on that considers \ as ordinary character).
-			if ($unescapeslashquot) $line=preg_replace("/\\\'/","''",$line);
+            // Replace espacing \' by ''.
+            // By default we do not (should be already done by db->escape function if required
+            // except for sql insert in data file that are mysql escaped so we removed them to
+            // be compatible with standard_conforming_strings=on that considers \ as ordinary character).
+            if ($unescapeslashquot) $line=preg_replace("/\\\'/","''",$line);
 
-			//print "type=".$type." newline=".$line."<br>\n";
-		}
+            //print "type=".$type." newline=".$line."<br>\n";
+        }
 
-		return $line;
-	}
+        return $line;
+    }
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
     /**
      *  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
-	 *
-	 *	@param	    string	$database	Name of database
-	 *	@return	    bool				true if OK, false if KO
-	 */
-	function select_db($database)
-	{
+     *
+     *	@param	    string	$database	Name of database
+     *	@return	    bool				true if OK, false if KO
+     */
+    function select_db($database)
+    {
         // phpcs:enable
         if ($database == $this->database_name) {
             return true;
@@ -378,85 +378,85 @@ 
         }
     }
 
-	/**
-	 *	Connexion to server
-	 *
-	 *	@param	    string		$host		Database server host
-	 *	@param	    string		$login		Login
-	 *	@param	    string		$passwd		Password
-	 *	@param		string		$name		Name of database (not used for mysql, used for pgsql)
-	 *	@param		integer		$port		Port of database server
-	 *	@return		false|resource			Database access handler
-	 *	@see		close
-	 */
-	function connect($host, $login, $passwd, $name, $port=0)
-	{
-		// use pg_pconnect() instead of pg_connect() if you want to use persistent connection costing 1ms, instead of 30ms for non persistent
-
-		$this->db = false;
-
-		// connections parameters must be protected (only \ and ' according to pg_connect() manual)
-		$host = str_replace(array("\\", "'"), array("\\\\", "\\'"), $host);
-		$login = str_replace(array("\\", "'"), array("\\\\", "\\'"), $login);
-		$passwd = str_replace(array("\\", "'"), array("\\\\", "\\'"), $passwd);
-		$name = str_replace(array("\\", "'"), array("\\\\", "\\'"), $name);
-		$port = str_replace(array("\\", "'"), array("\\\\", "\\'"), $port);
-
-		if (! $name) $name="postgres";    // When try to connect using admin user
-
-		// try first Unix domain socket (local)
-		if ((! empty($host) && $host == "socket") && ! defined('NOLOCALSOCKETPGCONNECT'))
-		{
-			$con_string = "dbname='".$name."' user='".$login."' password='".$passwd."'";    // $name may be empty
-			$this->db = @pg_connect($con_string);
-		}
-
-		// if local connection failed or not requested, use TCP/IP
-		if (! $this->db)
-		{
-		    if (! $host) $host = "localhost";
-			if (! $port) $port = 5432;
-
-			$con_string = "host='".$host."' port='".$port."' dbname='".$name."' user='".$login."' password='".$passwd."'";
-			$this->db = @pg_connect($con_string);
-		}
-
-		// now we test if at least one connect method was a success
-		if ($this->db)
-		{
-			$this->database_name = $name;
-			pg_set_error_verbosity($this->db, PGSQL_ERRORS_VERBOSE);	// Set verbosity to max
-			pg_query($this->db, "set datestyle = 'ISO, YMD';");
-		}
-
-		return $this->db;
-	}
-
-	/**
-	 *	Return version of database server
-	 *
-	 *	@return	        string      Version string
-	 */
-	function getVersion()
-	{
-		$resql=$this->query('SHOW server_version');
-		if ($resql)
-		{
-		  $liste=$this->fetch_array($resql);
-		  return $liste['server_version'];
-		}
-		return '';
-	}
-
-	/**
-	 *	Return version of database client driver
-	 *
-	 *	@return	        string      Version string
-	 */
-	function getDriverInfo()
-	{
-		return 'pgsql php driver';
-	}
+    /**
+     *	Connexion to server
+     *
+     *	@param	    string		$host		Database server host
+     *	@param	    string		$login		Login
+     *	@param	    string		$passwd		Password
+     *	@param		string		$name		Name of database (not used for mysql, used for pgsql)
+     *	@param		integer		$port		Port of database server
+     *	@return		false|resource			Database access handler
+     *	@see		close
+     */
+    function connect($host, $login, $passwd, $name, $port=0)
+    {
+        // use pg_pconnect() instead of pg_connect() if you want to use persistent connection costing 1ms, instead of 30ms for non persistent
+
+        $this->db = false;
+
+        // connections parameters must be protected (only \ and ' according to pg_connect() manual)
+        $host = str_replace(array("\\", "'"), array("\\\\", "\\'"), $host);
+        $login = str_replace(array("\\", "'"), array("\\\\", "\\'"), $login);
+        $passwd = str_replace(array("\\", "'"), array("\\\\", "\\'"), $passwd);
+        $name = str_replace(array("\\", "'"), array("\\\\", "\\'"), $name);
+        $port = str_replace(array("\\", "'"), array("\\\\", "\\'"), $port);
+
+        if (! $name) $name="postgres";    // When try to connect using admin user
+
+        // try first Unix domain socket (local)
+        if ((! empty($host) && $host == "socket") && ! defined('NOLOCALSOCKETPGCONNECT'))
+        {
+            $con_string = "dbname='".$name."' user='".$login."' password='".$passwd."'";    // $name may be empty
+            $this->db = @pg_connect($con_string);
+        }
+
+        // if local connection failed or not requested, use TCP/IP
+        if (! $this->db)
+        {
+            if (! $host) $host = "localhost";
+            if (! $port) $port = 5432;
+
+            $con_string = "host='".$host."' port='".$port."' dbname='".$name."' user='".$login."' password='".$passwd."'";
+            $this->db = @pg_connect($con_string);
+        }
+
+        // now we test if at least one connect method was a success
+        if ($this->db)
+        {
+            $this->database_name = $name;
+            pg_set_error_verbosity($this->db, PGSQL_ERRORS_VERBOSE);	// Set verbosity to max
+            pg_query($this->db, "set datestyle = 'ISO, YMD';");
+        }
+
+        return $this->db;
+    }
+
+    /**
+     *	Return version of database server
+     *
+     *	@return	        string      Version string
+     */
+    function getVersion()
+    {
+        $resql=$this->query('SHOW server_version');
+        if ($resql)
+        {
+            $liste=$this->fetch_array($resql);
+            return $liste['server_version'];
+        }
+        return '';
+    }
+
+    /**
+     *	Return version of database client driver
+     *
+     *	@return	        string      Version string
+     */
+    function getDriverInfo()
+    {
+        return 'pgsql php driver';
+    }
 
     /**
      *  Close database connexion
@@ -468,97 +468,97 @@ 
     {
         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);
+            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).
+    /**
+     * 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...)
-	 * @return	false|resource			Resultset of answer
-	 */
-	function query($query,$usesavepoint=0,$type='auto')
-	{
-		global $conf;
-
-		$query = trim($query);
-
-		// Convert MySQL syntax to PostgresSQL syntax
-		$query=$this->convertSQLFromMysql($query,$type,($this->unescapeslashquot && $this->standard_conforming_strings));
-		//print "After convertSQLFromMysql:\n".$query."<br>\n";
-
-		if (! empty($conf->global->MAIN_DB_AUTOFIX_BAD_SQL_REQUEST))
-		{
-			// Fix bad formed requests. If request contains a date without quotes, we fix this but this should not occurs.
-			$loop=true;
-			while ($loop)
-			{
-				if (preg_match('/([^\'])([0-9][0-9][0-9][0-9]-[0-9][0-9]-[0-9][0-9] [0-9][0-9]:[0-9][0-9]:[0-9][0-9])/',$query))
-				{
-					$query=preg_replace('/([^\'])([0-9][0-9][0-9][0-9]-[0-9][0-9]-[0-9][0-9] [0-9][0-9]:[0-9][0-9]:[0-9][0-9])/','\\1\'\\2\'',$query);
-					dol_syslog("Warning: Bad formed request converted into ".$query,LOG_WARNING);
-				}
-				else $loop=false;
-			}
-		}
-
-		if ($usesavepoint && $this->transaction_opened)
-		{
-			@pg_query($this->db, 'SAVEPOINT mysavepoint');
-		}
-
-		if (! in_array($query,array('BEGIN','COMMIT','ROLLBACK'))) dol_syslog('sql='.$query, LOG_DEBUG);
-
-		$ret = @pg_query($this->db, $query);
-
-		//print $query;
-		if (! preg_match("/^COMMIT/i",$query) && ! preg_match("/^ROLLBACK/i",$query)) // Si requete utilisateur, on la sauvegarde ainsi que son resultset
-		{
-			if (! $ret)
-			{
-			    if ($this->errno() != 'DB_ERROR_25P02')	// Do not overwrite errors if this is a consecutive error
-			    {
-    				$this->lastqueryerror = $query;
-    				$this->lasterror = $this->error();
-    				$this->lasterrno = $this->errno();
-
-    				if ($conf->global->SYSLOG_LEVEL < LOG_DEBUG) dol_syslog(get_class($this)."::query SQL Error query: ".$query, LOG_ERR);	// Log of request was not yet done previously
-					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
-				{
-					@pg_query($this->db, 'ROLLBACK TO SAVEPOINT mysavepoint');
-				}
-			}
-			$this->lastquery=$query;
-			$this->_results = $ret;
-		}
-
-		return $ret;
-	}
+     * @return	false|resource			Resultset of answer
+     */
+    function query($query,$usesavepoint=0,$type='auto')
+    {
+        global $conf;
+
+        $query = trim($query);
+
+        // Convert MySQL syntax to PostgresSQL syntax
+        $query=$this->convertSQLFromMysql($query,$type,($this->unescapeslashquot && $this->standard_conforming_strings));
+        //print "After convertSQLFromMysql:\n".$query."<br>\n";
+
+        if (! empty($conf->global->MAIN_DB_AUTOFIX_BAD_SQL_REQUEST))
+        {
+            // Fix bad formed requests. If request contains a date without quotes, we fix this but this should not occurs.
+            $loop=true;
+            while ($loop)
+            {
+                if (preg_match('/([^\'])([0-9][0-9][0-9][0-9]-[0-9][0-9]-[0-9][0-9] [0-9][0-9]:[0-9][0-9]:[0-9][0-9])/',$query))
+                {
+                    $query=preg_replace('/([^\'])([0-9][0-9][0-9][0-9]-[0-9][0-9]-[0-9][0-9] [0-9][0-9]:[0-9][0-9]:[0-9][0-9])/','\\1\'\\2\'',$query);
+                    dol_syslog("Warning: Bad formed request converted into ".$query,LOG_WARNING);
+                }
+                else $loop=false;
+            }
+        }
+
+        if ($usesavepoint && $this->transaction_opened)
+        {
+            @pg_query($this->db, 'SAVEPOINT mysavepoint');
+        }
+
+        if (! in_array($query,array('BEGIN','COMMIT','ROLLBACK'))) dol_syslog('sql='.$query, LOG_DEBUG);
+
+        $ret = @pg_query($this->db, $query);
+
+        //print $query;
+        if (! preg_match("/^COMMIT/i",$query) && ! preg_match("/^ROLLBACK/i",$query)) // Si requete utilisateur, on la sauvegarde ainsi que son resultset
+        {
+            if (! $ret)
+            {
+                if ($this->errno() != 'DB_ERROR_25P02')	// Do not overwrite errors if this is a consecutive error
+                {
+                    $this->lastqueryerror = $query;
+                    $this->lasterror = $this->error();
+                    $this->lasterrno = $this->errno();
+
+                    if ($conf->global->SYSLOG_LEVEL < LOG_DEBUG) dol_syslog(get_class($this)."::query SQL Error query: ".$query, LOG_ERR);	// Log of request was not yet done previously
+                    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
+                {
+                    @pg_query($this->db, 'ROLLBACK TO SAVEPOINT mysavepoint');
+                }
+            }
+            $this->lastquery=$query;
+            $this->_results = $ret;
+        }
+
+        return $ret;
+    }
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
-	/**
-	 *	Renvoie la ligne courante (comme un objet) pour le curseur resultset
-	 *
-	 *	@param	resource	$resultset  Curseur de la requete voulue
-	 *	@return	false|object			Object result line or false if KO or end of cursor
-	 */
-	function fetch_object($resultset)
-	{
+    /**
+     *	Renvoie la ligne courante (comme un objet) pour le curseur resultset
+     *
+     *	@param	resource	$resultset  Curseur de la requete voulue
+     *	@return	false|object			Object result line or false if KO or end of cursor
+     */
+    function fetch_object($resultset)
+    {
         // phpcs:enable
         // If resultset not provided, we take the last used by connexion
-		if (! is_resource($resultset)) { $resultset=$this->_results; }
-		return pg_fetch_object($resultset);
-	}
+        if (! is_resource($resultset)) { $resultset=$this->_results; }
+        return pg_fetch_object($resultset);
+    }
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
     /**
@@ -566,29 +566,29 @@ 
      *
      *	@param	resource	$resultset  Resultset of request
      *	@return	false|array				Array
-	 */
-	function fetch_array($resultset)
-	{
+     */
+    function fetch_array($resultset)
+    {
         // phpcs:enable
         // If resultset not provided, we take the last used by connexion
-		if (! is_resource($resultset)) { $resultset=$this->_results; }
-		return pg_fetch_array($resultset);
-	}
+        if (! is_resource($resultset)) { $resultset=$this->_results; }
+        return pg_fetch_array($resultset);
+    }
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
-	/**
+    /**
      *	Return datas as an array
      *
      *	@param	resource	$resultset  Resultset of request
      *	@return	false|array				Array
-	 */
-	function fetch_row($resultset)
-	{
+     */
+    function fetch_row($resultset)
+    {
         // phpcs:enable
-		// Si le resultset n'est pas fourni, on prend le dernier utilise sur cette connexion
-		if (! is_resource($resultset)) { $resultset=$this->_results; }
-		return pg_fetch_row($resultset);
-	}
+        // Si le resultset n'est pas fourni, on prend le dernier utilise sur cette connexion
+        if (! is_resource($resultset)) { $resultset=$this->_results; }
+        return pg_fetch_row($resultset);
+    }
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
     /**
@@ -598,725 +598,725 @@ 
      *	@return int		    			Nb of lines, -1 on error
      *	@see    affected_rows
      */
-	function num_rows($resultset)
-	{
+    function num_rows($resultset)
+    {
         // phpcs:enable
         // If resultset not provided, we take the last used by connexion
-		if (! is_resource($resultset)) { $resultset=$this->_results; }
-		return pg_num_rows($resultset);
-	}
+        if (! is_resource($resultset)) { $resultset=$this->_results; }
+        return pg_num_rows($resultset);
+    }
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
-	/**
-	 * Renvoie le nombre de lignes dans le resultat d'une requete INSERT, DELETE ou UPDATE
-	 *
-	 * @param	resource	$resultset  Result set of request
-	 * @return  int		    			Nb of lines
-	 * @see 	num_rows
-	 */
-	function affected_rows($resultset)
-	{
+    /**
+     * Renvoie le nombre de lignes dans le resultat d'une requete INSERT, DELETE ou UPDATE
+     *
+     * @param	resource	$resultset  Result set of request
+     * @return  int		    			Nb of lines
+     * @see 	num_rows
+     */
+    function affected_rows($resultset)
+    {
         // phpcs:enable
         // 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
-		return pg_affected_rows($resultset);
-	}
-
-
-	/**
-	 * Libere le dernier resultset utilise sur cette connexion
-	 *
-	 * @param	resource	$resultset  Result set of request
-	 * @return	void
-	 */
-	function free($resultset=null)
-	{
+        if (! is_resource($resultset)) { $resultset=$this->_results; }
+        // pgsql necessite un resultset pour cette fonction contrairement
+        // a mysql qui prend un link de base
+        return pg_affected_rows($resultset);
+    }
+
+
+    /**
+     * Libere le dernier resultset utilise sur cette connexion
+     *
+     * @param	resource	$resultset  Result set of request
+     * @return	void
+     */
+    function free($resultset=null)
+    {
         // If resultset not provided, we take the last used by connexion
-		if (! is_resource($resultset)) { $resultset=$this->_results; }
-		// Si resultset en est un, on libere la memoire
-		if (is_resource($resultset)) pg_free_result($resultset);
-	}
+        if (! is_resource($resultset)) { $resultset=$this->_results; }
+        // Si resultset en est un, on libere la memoire
+        if (is_resource($resultset)) pg_free_result($resultset);
+    }
 
 
-	/**
+    /**
      *	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;
+     */
+    function plimit($limit=0,$offset=0)
+    {
+        global $conf;
         if (empty($limit)) return "";
-		if ($limit < 0) $limit=$conf->liste_limit;
-		if ($offset > 0) return " LIMIT ".$limit." OFFSET ".$offset." ";
-		else return " LIMIT $limit ";
-	}
-
-
-	/**
-	 *   Escape a string to insert data
-	 *
-	 *   @param		string	$stringtoencode		String to escape
-	 *   @return	string						String escaped
-	 */
-	function escape($stringtoencode)
-	{
-		return pg_escape_string($stringtoencode);
-	}
+        if ($limit < 0) $limit=$conf->liste_limit;
+        if ($offset > 0) return " LIMIT ".$limit." OFFSET ".$offset." ";
+        else return " LIMIT $limit ";
+    }
+
+
+    /**
+     *   Escape a string to insert data
+     *
+     *   @param		string	$stringtoencode		String to escape
+     *   @return	string						String escaped
+     */
+    function escape($stringtoencode)
+    {
+        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
+     *
+     *   @param	    string	$param      Date TMS to convert
+     *   @return	string   			Date in a string YYYY-MM-DD HH:MM:SS
+     */
+    function idate($param)
+    {
+        return dol_print_date($param,"%Y-%m-%d %H:%M:%S");
+    }
 
     /**
-	 *   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
-	 *
-	 *   @param	    string	$param      Date TMS to convert
-	 *   @return	string   			Date in a string YYYY-MM-DD HH:MM:SS
-	 */
-	function idate($param)
-	{
-		return dol_print_date($param,"%Y-%m-%d %H:%M:%S");
-	}
-
-	/**
      *  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
-	 *  @return	string          		chaine formate SQL
-	 */
-	function ifsql($test,$resok,$resko)
-	{
-		return '(CASE WHEN '.$test.' THEN '.$resok.' ELSE '.$resko.' END)';
-	}
-
-	/**
-	 * 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',
-			1007 => 'DB_ERROR_ALREADY_EXISTS',
-			1008 => 'DB_ERROR_CANNOT_DROP',
-			1025 => 'DB_ERROR_NO_FOREIGN_KEY_TO_DROP',
-			1044 => 'DB_ERROR_ACCESSDENIED',
-			1046 => 'DB_ERROR_NODBSELECTED',
-			1048 => 'DB_ERROR_CONSTRAINT',
-			'42P07' => 'DB_ERROR_TABLE_OR_KEY_ALREADY_EXISTS',
-			'42703' => 'DB_ERROR_NOSUCHFIELD',
-			1060 => 'DB_ERROR_COLUMN_ALREADY_EXISTS',
-			42701=> 'DB_ERROR_COLUMN_ALREADY_EXISTS',
-			'42710' => 'DB_ERROR_KEY_NAME_ALREADY_EXISTS',
-			'23505' => 'DB_ERROR_RECORD_ALREADY_EXISTS',
-			'42704' => 'DB_ERROR_NO_INDEX_TO_DROP',		// May also be Type xxx does not exists
-			'42601' => 'DB_ERROR_SYNTAX',
-			'42P16' => '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',
-			'42P01' => 'DB_ERROR_NOSUCHTABLE',
-			'23503' => 'DB_ERROR_NO_PARENT',
-			1217 => 'DB_ERROR_CHILD_EXISTS',
-			1451 => 'DB_ERROR_CHILD_EXISTS',
-			'42P04' => 'DB_DATABASE_ALREADY_EXISTS'
-			);
-
-			$errorlabel=pg_last_error($this->db);
-			$errorcode='';
-			if (preg_match('/: *([0-9P]+):/',$errorlabel,$reg))
-			{
-				$errorcode=$reg[1];
-				if (isset($errorcode_map[$errorcode]))
-				{
-					return $errorcode_map[$errorcode];
-				}
-			}
-			$errno=$errorcode?$errorcode:$errorlabel;
-			return ($errno?'DB_ERROR_'.$errno:'0');
-		}
-		//                '/(Table does not exist\.|Relation [\"\'].*[\"\'] does not exist|sequence does not exist|class ".+" not found)$/' => 'DB_ERROR_NOSUCHTABLE',
-		//                '/table [\"\'].*[\"\'] does not exist/' => 'DB_ERROR_NOSUCHTABLE',
-		//                '/Relation [\"\'].*[\"\'] already exists|Cannot insert a duplicate key into (a )?unique index.*/'      => 'DB_ERROR_RECORD_ALREADY_EXISTS',
-		//                '/divide by zero$/'                     => 'DB_ERROR_DIVZERO',
-		//                '/pg_atoi: error in .*: can\'t parse /' => 'DB_ERROR_INVALID_NUMBER',
-		//                '/ttribute [\"\'].*[\"\'] not found$|Relation [\"\'].*[\"\'] does not have attribute [\"\'].*[\"\']/' => 'DB_ERROR_NOSUCHFIELD',
-		//                '/parser: parse error at or near \"/'   => 'DB_ERROR_SYNTAX',
-		//                '/referential integrity violation/'     => 'DB_ERROR_CONSTRAINT'
-	}
-
-	/**
-	 * Renvoie le texte de l'erreur pgsql de l'operation precedente
-	 *
-	 * @return	string		Error text
-	 */
-	function error()
-	{
-		return pg_last_error($this->db);
-	}
+     *  @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
+     *  @return	string          		chaine formate SQL
+     */
+    function ifsql($test,$resok,$resko)
+    {
+        return '(CASE WHEN '.$test.' THEN '.$resok.' ELSE '.$resko.' END)';
+    }
+
+    /**
+     * 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',
+            1007 => 'DB_ERROR_ALREADY_EXISTS',
+            1008 => 'DB_ERROR_CANNOT_DROP',
+            1025 => 'DB_ERROR_NO_FOREIGN_KEY_TO_DROP',
+            1044 => 'DB_ERROR_ACCESSDENIED',
+            1046 => 'DB_ERROR_NODBSELECTED',
+            1048 => 'DB_ERROR_CONSTRAINT',
+            '42P07' => 'DB_ERROR_TABLE_OR_KEY_ALREADY_EXISTS',
+            '42703' => 'DB_ERROR_NOSUCHFIELD',
+            1060 => 'DB_ERROR_COLUMN_ALREADY_EXISTS',
+            42701=> 'DB_ERROR_COLUMN_ALREADY_EXISTS',
+            '42710' => 'DB_ERROR_KEY_NAME_ALREADY_EXISTS',
+            '23505' => 'DB_ERROR_RECORD_ALREADY_EXISTS',
+            '42704' => 'DB_ERROR_NO_INDEX_TO_DROP',		// May also be Type xxx does not exists
+            '42601' => 'DB_ERROR_SYNTAX',
+            '42P16' => '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',
+            '42P01' => 'DB_ERROR_NOSUCHTABLE',
+            '23503' => 'DB_ERROR_NO_PARENT',
+            1217 => 'DB_ERROR_CHILD_EXISTS',
+            1451 => 'DB_ERROR_CHILD_EXISTS',
+            '42P04' => 'DB_DATABASE_ALREADY_EXISTS'
+            );
+
+            $errorlabel=pg_last_error($this->db);
+            $errorcode='';
+            if (preg_match('/: *([0-9P]+):/',$errorlabel,$reg))
+            {
+                $errorcode=$reg[1];
+                if (isset($errorcode_map[$errorcode]))
+                {
+                    return $errorcode_map[$errorcode];
+                }
+            }
+            $errno=$errorcode?$errorcode:$errorlabel;
+            return ($errno?'DB_ERROR_'.$errno:'0');
+        }
+        //                '/(Table does not exist\.|Relation [\"\'].*[\"\'] does not exist|sequence does not exist|class ".+" not found)$/' => 'DB_ERROR_NOSUCHTABLE',
+        //                '/table [\"\'].*[\"\'] does not exist/' => 'DB_ERROR_NOSUCHTABLE',
+        //                '/Relation [\"\'].*[\"\'] already exists|Cannot insert a duplicate key into (a )?unique index.*/'      => 'DB_ERROR_RECORD_ALREADY_EXISTS',
+        //                '/divide by zero$/'                     => 'DB_ERROR_DIVZERO',
+        //                '/pg_atoi: error in .*: can\'t parse /' => 'DB_ERROR_INVALID_NUMBER',
+        //                '/ttribute [\"\'].*[\"\'] not found$|Relation [\"\'].*[\"\'] does not have attribute [\"\'].*[\"\']/' => 'DB_ERROR_NOSUCHFIELD',
+        //                '/parser: parse error at or near \"/'   => 'DB_ERROR_SYNTAX',
+        //                '/referential integrity violation/'     => 'DB_ERROR_CONSTRAINT'
+    }
+
+    /**
+     * Renvoie le texte de l'erreur pgsql de l'operation precedente
+     *
+     * @return	string		Error text
+     */
+    function error()
+    {
+        return pg_last_error($this->db);
+    }
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
-	/**
-	 * 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  string     			Id of row
-	 */
-	function last_insert_id($tab,$fieldid='rowid')
-	{
+    /**
+     * 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  string     			Id of row
+     */
+    function last_insert_id($tab,$fieldid='rowid')
+    {
         // phpcs:enable
-		//$result = pg_query($this->db,"SELECT MAX(".$fieldid.") FROM ".$tab);
-		$result = pg_query($this->db,"SELECT currval('".$tab."_".$fieldid."_seq')");
-		if (! $result)
-		{
-			print pg_last_error($this->db);
-			exit;
-		}
-		//$nbre = pg_num_rows($result);
-		$row = pg_fetch_result($result,0,0);
-		return $row;
-	}
-
-	/**
+        //$result = pg_query($this->db,"SELECT MAX(".$fieldid.") FROM ".$tab);
+        $result = pg_query($this->db,"SELECT currval('".$tab."_".$fieldid."_seq')");
+        if (! $result)
+        {
+            print pg_last_error($this->db);
+            exit;
+        }
+        //$nbre = pg_num_rows($result);
+        $row = pg_fetch_result($result,0,0);
+        return $row;
+    }
+
+    /**
      *  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;
+     */
+    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);
+        // 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 = $fieldorvalue;
-		return ($withQuotes?"'":"").$this->escape($return).($withQuotes?"'":"");
-	}
+        $return = $fieldorvalue;
+        return ($withQuotes?"'":"").$this->escape($return).($withQuotes?"'":"");
+    }
 
 
-	/**
-	 *	Decrypt sensitive data in database
-	 *
-	 *	@param	int		$value			Value to decrypt
-	 * 	@return	string					Decrypted value if used
-	 */
-	function decrypt($value)
-	{
-		global $conf;
+    /**
+     *	Decrypt sensitive data in database
+     *
+     *	@param	int		$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 = $value;
-		return $return;
-	}
+        $return = $value;
+        return $return;
+    }
 
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
-	/**
-	 * Return connexion ID
-	 *
-	 * @return	        string      Id connexion
-	 */
-	function DDLGetConnectId()
-	{
+    /**
+     * Return connexion ID
+     *
+     * @return	        string      Id connexion
+     */
+    function DDLGetConnectId()
+    {
         // phpcs:enable
-		return '?';
-	}
+        return '?';
+    }
 
 
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
-	/**
-	 *	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	false|resource				resource defined if OK, null if KO
-	 */
-	function DDLCreateDb($database,$charset='',$collation='',$owner='')
-	{
+    /**
+     *	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	false|resource				resource defined if OK, null if KO
+     */
+    function DDLCreateDb($database,$charset='',$collation='',$owner='')
+    {
         // phpcs:enable
-	    if (empty($charset))   $charset=$this->forcecharset;
-		if (empty($collation)) $collation=$this->forcecollate;
+        if (empty($charset))   $charset=$this->forcecharset;
+        if (empty($collation)) $collation=$this->forcecollate;
 
-		// Test charset match LC_TYPE (pgsql error otherwise)
-		//print $charset.' '.setlocale(LC_CTYPE,'0'); exit;
+        // Test charset match LC_TYPE (pgsql error otherwise)
+        //print $charset.' '.setlocale(LC_CTYPE,'0'); exit;
 
-		$sql='CREATE DATABASE "'.$database.'" OWNER "'.$owner.'" ENCODING \''.$charset.'\'';
-		dol_syslog($sql,LOG_DEBUG);
-		$ret=$this->query($sql);
-		return $ret;
-	}
+        $sql='CREATE DATABASE "'.$database.'" OWNER "'.$owner.'" ENCODING \''.$charset.'\'';
+        dol_syslog($sql,LOG_DEBUG);
+        $ret=$this->query($sql);
+        return $ret;
+    }
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
-	/**
-	 *  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='')
+    /**
+     *  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='')
     {
         // phpcs:enable
-		$listtables=array();
+        $listtables=array();
 
-		$like = '';
-		if ($table) $like = " AND table_name LIKE '".$table."'";
-		$result = pg_query($this->db, "SELECT table_name FROM information_schema.tables WHERE table_schema = 'public'".$like." ORDER BY table_name");
+        $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];
-    		}
+            while($row = $this->fetch_row($result))
+            {
+                $listtables[] = $row[0];
+            }
         }
-		return $listtables;
-	}
+        return $listtables;
+    }
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
-	/**
-	 *	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)
-	{
+    /**
+     *	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)
+    {
         // phpcs:enable
-		$infotables=array();
-
-		$sql="SELECT ";
-		$sql.="	infcol.column_name as \"Column\",";
-		$sql.="	CASE WHEN infcol.character_maximum_length IS NOT NULL THEN infcol.udt_name || '('||infcol.character_maximum_length||')'";
-		$sql.="		ELSE infcol.udt_name";
-		$sql.="	END as \"Type\",";
-		$sql.="	infcol.collation_name as \"Collation\",";
-		$sql.="	infcol.is_nullable as \"Null\",";
-		$sql.="	'' as \"Key\",";
-		$sql.="	infcol.column_default as \"Default\",";
-		$sql.="	'' as \"Extra\",";
-		$sql.="	'' as \"Privileges\"";
-		$sql.="	FROM information_schema.columns infcol";
-		$sql.="	WHERE table_schema='public' ";
-		$sql.="	AND table_name='".$table."'";
-		$sql.="	ORDER BY ordinal_position;";
-
-		dol_syslog($sql,LOG_DEBUG);
-		$result = $this->query($sql);
-		if ($result)
-		{
-    		 while($row = $this->fetch_row($result))
-    		 {
-    			$infotables[] = $row;
-    		 }
-		}
+        $infotables=array();
+
+        $sql="SELECT ";
+        $sql.="	infcol.column_name as \"Column\",";
+        $sql.="	CASE WHEN infcol.character_maximum_length IS NOT NULL THEN infcol.udt_name || '('||infcol.character_maximum_length||')'";
+        $sql.="		ELSE infcol.udt_name";
+        $sql.="	END as \"Type\",";
+        $sql.="	infcol.collation_name as \"Collation\",";
+        $sql.="	infcol.is_nullable as \"Null\",";
+        $sql.="	'' as \"Key\",";
+        $sql.="	infcol.column_default as \"Default\",";
+        $sql.="	'' as \"Extra\",";
+        $sql.="	'' as \"Privileges\"";
+        $sql.="	FROM information_schema.columns infcol";
+        $sql.="	WHERE table_schema='public' ";
+        $sql.="	AND table_name='".$table."'";
+        $sql.="	ORDER BY ordinal_position;";
+
+        dol_syslog($sql,LOG_DEBUG);
+        $result = $this->query($sql);
+        if ($result)
+        {
+                while($row = $this->fetch_row($result))
+                {
+                $infotables[] = $row;
+                }
+        }
         return $infotables;
-	}
+    }
 
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
-	/**
-	 *	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
-	 *	@param	    string	$type 			Type de la table
-	 *	@param	    array	$unique_keys 	Tableau associatifs Nom de champs qui seront clef unique => valeur
-	 *	@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)
-	{
+    /**
+     *	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
+     *	@param	    string	$type 			Type de la table
+     *	@param	    array	$unique_keys 	Tableau associatifs Nom de champs qui seront clef unique => valeur
+     *	@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)
+    {
         // phpcs:enable
-		// 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;
-		else
-		return 1;
-	}
+        // 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;
+        else
+        return 1;
+    }
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
-	/**
-	 *	Drop a table into database
-	 *
-	 *	@param	    string	$table 			Name of table
-	 *	@return	    int						<0 if KO, >=0 if OK
-	 */
-	function DDLDropTable($table)
-	{
+    /**
+     *	Drop a table into database
+     *
+     *	@param	    string	$table 			Name of table
+     *	@return	    int						<0 if KO, >=0 if OK
+     */
+    function DDLDropTable($table)
+    {
         // phpcs:enable
-		$sql = "DROP TABLE ".$table;
+        $sql = "DROP TABLE ".$table;
 
-		if (! $this->query($sql))
-			return -1;
-		else
-			return 1;
-	}
+        if (! $this->query($sql))
+            return -1;
+        else
+            return 1;
+    }
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
-	/**
-	 * 	Create a user to connect to database
-	 *
-	 *	@param	string	$dolibarr_main_db_host 		Ip server
-	 *	@param	string	$dolibarr_main_db_user 		Name of user to create
-	 *	@param	string	$dolibarr_main_db_pass 		Password of user to create
-	 *	@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)
-	{
+    /**
+     * 	Create a user to connect to database
+     *
+     *	@param	string	$dolibarr_main_db_host 		Ip server
+     *	@param	string	$dolibarr_main_db_user 		Name of user to create
+     *	@param	string	$dolibarr_main_db_pass 		Password of user to create
+     *	@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)
+    {
         // phpcs:enable
-		// Note: using ' on user does not works with pgsql
-		$sql = "CREATE USER ".$this->escape($dolibarr_main_db_user)." with password '".$this->escape($dolibarr_main_db_pass)."'";
+        // Note: using ' on user does not works with pgsql
+        $sql = "CREATE USER ".$this->escape($dolibarr_main_db_user)." with password '".$this->escape($dolibarr_main_db_pass)."'";
 
-		dol_syslog(get_class($this)."::DDLCreateUser", LOG_DEBUG);	// No sql to avoid password in log
-		$resql=$this->query($sql);
-		if (! $resql)
-		{
-			return -1;
-		}
+        dol_syslog(get_class($this)."::DDLCreateUser", LOG_DEBUG);	// No sql to avoid password in log
+        $resql=$this->query($sql);
+        if (! $resql)
+        {
+            return -1;
+        }
 
-		return 1;
-	}
+        return 1;
+    }
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
-	/**
-	 *	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	false|resource		Resultset x (x->attname)
-	 */
-	function DDLDescTable($table,$field="")
-	{
+    /**
+     *	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	false|resource		Resultset x (x->attname)
+     */
+    function DDLDescTable($table,$field="")
+    {
         // phpcs:enable
-		$sql ="SELECT attname FROM pg_attribute, pg_type WHERE typname = '".$table."' AND attrelid = typrelid";
-		$sql.=" AND attname NOT IN ('cmin', 'cmax', 'ctid', 'oid', 'tableoid', 'xmin', 'xmax')";
-		if ($field) $sql.= " AND attname = '".$field."'";
+        $sql ="SELECT attname FROM pg_attribute, pg_type WHERE typname = '".$table."' AND attrelid = typrelid";
+        $sql.=" AND attname NOT IN ('cmin', 'cmax', 'ctid', 'oid', 'tableoid', 'xmin', 'xmax')";
+        if ($field) $sql.= " AND attname = '".$field."'";
 
-		dol_syslog($sql,LOG_DEBUG);
-		$this->_results = $this->query($sql);
-		return $this->_results;
-	}
+        dol_syslog($sql,LOG_DEBUG);
+        $this->_results = $this->query($sql);
+        return $this->_results;
+    }
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
-	/**
-	 *	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="")
-	{
+    /**
+     *	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="")
+    {
         // phpcs:enable
-		// 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('int','date','datetime')))
-		    {
-		        $sql.= "(".$field_desc['value'].")";
-		    }
-		if (preg_match("/^[^\s]/i",$field_desc['attribute']))
+        // 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('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']))
+        if (preg_match("/^[^\s]/i",$field_desc['null']))
             $sql .= " ".$field_desc['null'];
-		if (preg_match("/^[^\s]/i",$field_desc['default']))
+        if (preg_match("/^[^\s]/i",$field_desc['default']))
             if (preg_match("/null/i",$field_desc['default']))
                 $sql .= " default ".$field_desc['default'];
-		    else
+            else
                 $sql .= " default '".$field_desc['default']."'";
-		if (preg_match("/^[^\s]/i",$field_desc['extra']))
+        if (preg_match("/^[^\s]/i",$field_desc['extra']))
             $sql .= " ".$field_desc['extra'];
-		$sql .= " ".$field_position;
+        $sql .= " ".$field_position;
 
-		dol_syslog($sql,LOG_DEBUG);
-		if (! $this -> query($sql))
-			return -1;
-		return 1;
-	}
+        dol_syslog($sql,LOG_DEBUG);
+        if (! $this -> query($sql))
+            return -1;
+        return 1;
+    }
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
-	/**
-	 *	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)
-	{
+    /**
+     *	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)
+    {
         // phpcs:enable
-		$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);
-        	}
-		}
-
-		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
-		}
-
-		dol_syslog($sql,LOG_DEBUG);
-		if (! $this->query($sql))
-			return -1;
-		return 1;
-	}
+        $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);
+            }
+        }
+
+        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
+        }
+
+        dol_syslog($sql,LOG_DEBUG);
+        if (! $this->query($sql))
+            return -1;
+        return 1;
+    }
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
-	/**
-	 *	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)
-	{
+    /**
+     *	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)
+    {
         // phpcs:enable
-		$sql= "ALTER TABLE ".$table." DROP COLUMN ".$field_name;
-		dol_syslog($sql,LOG_DEBUG);
-		if (! $this->query($sql))
-		{
-			$this->error=$this->lasterror();
-			return -1;
-		}
-		return 1;
-	}
-
-	/**
-	 *	Return charset used to store data in database
-	 *
-	 *	@return		string		Charset
-	 */
-	function getDefaultCharacterSetDatabase()
-	{
-		$resql=$this->query('SHOW SERVER_ENCODING');
-		if ($resql)
-		{
+        $sql= "ALTER TABLE ".$table." DROP COLUMN ".$field_name;
+        dol_syslog($sql,LOG_DEBUG);
+        if (! $this->query($sql))
+        {
+            $this->error=$this->lasterror();
+            return -1;
+        }
+        return 1;
+    }
+
+    /**
+     *	Return charset used to store data in database
+     *
+     *	@return		string		Charset
+     */
+    function getDefaultCharacterSetDatabase()
+    {
+        $resql=$this->query('SHOW SERVER_ENCODING');
+        if ($resql)
+        {
             $liste=$this->fetch_array($resql);
-		    return $liste['server_encoding'];
-		}
-		else return '';
-	}
-
-	/**
-	 *	Return list of available charset that can be used to store data in database
-	 *
-	 *	@return		array		List of Charset
-	 */
-	function getListOfCharacterSet()
-	{
-		$resql=$this->query('SHOW SERVER_ENCODING');
-		$liste = array();
-		if ($resql)
-		{
-			$i = 0;
-			while ($obj = $this->fetch_object($resql))
-			{
-				$liste[$i]['charset'] = $obj->server_encoding;
-				$liste[$i]['description'] = 'Default database charset';
-				$i++;
-			}
-			$this->free($resql);
-		} else {
-			return null;
-		}
-		return $liste;
-	}
-
-	/**
-	 *	Return collation used in database
-	 *
-	 *	@return		string		Collation value
-	 */
-	function getDefaultCollationDatabase()
-	{
-		$resql=$this->query('SHOW LC_COLLATE');
-		if ($resql)
-		{
-		    $liste=$this->fetch_array($resql);
-			return $liste['lc_collate'];
-		}
-		else return '';
-	}
-
-	/**
-	 *	Return list of available collation that can be used for database
-	 *
-	 *	@return		array		Liste of Collation
-	 */
-	function getListOfCollation()
-	{
-		$resql=$this->query('SHOW LC_COLLATE');
-		$liste = array();
-		if ($resql)
-		{
-			$i = 0;
-			while ($obj = $this->fetch_object($resql) )
-			{
-				$liste[$i]['collation'] = $obj->lc_collate;
-				$i++;
-			}
-			$this->free($resql);
-		} else {
-			return null;
-		}
-		return $liste;
-	}
-
-	/**
-	 *	Return full path of dump program
-	 *
-	 *	@return		string		Full path of dump program
-	 */
-	function getPathOfDump()
-	{
-		$fullpathofdump='/pathtopgdump/pg_dump';
-
-		if (file_exists('/usr/bin/pg_dump'))
-		{
-		    $fullpathofdump='/usr/bin/pg_dump';
-		}
-		else
-		{
+            return $liste['server_encoding'];
+        }
+        else return '';
+    }
+
+    /**
+     *	Return list of available charset that can be used to store data in database
+     *
+     *	@return		array		List of Charset
+     */
+    function getListOfCharacterSet()
+    {
+        $resql=$this->query('SHOW SERVER_ENCODING');
+        $liste = array();
+        if ($resql)
+        {
+            $i = 0;
+            while ($obj = $this->fetch_object($resql))
+            {
+                $liste[$i]['charset'] = $obj->server_encoding;
+                $liste[$i]['description'] = 'Default database charset';
+                $i++;
+            }
+            $this->free($resql);
+        } else {
+            return null;
+        }
+        return $liste;
+    }
+
+    /**
+     *	Return collation used in database
+     *
+     *	@return		string		Collation value
+     */
+    function getDefaultCollationDatabase()
+    {
+        $resql=$this->query('SHOW LC_COLLATE');
+        if ($resql)
+        {
+            $liste=$this->fetch_array($resql);
+            return $liste['lc_collate'];
+        }
+        else return '';
+    }
+
+    /**
+     *	Return list of available collation that can be used for database
+     *
+     *	@return		array		Liste of Collation
+     */
+    function getListOfCollation()
+    {
+        $resql=$this->query('SHOW LC_COLLATE');
+        $liste = array();
+        if ($resql)
+        {
+            $i = 0;
+            while ($obj = $this->fetch_object($resql) )
+            {
+                $liste[$i]['collation'] = $obj->lc_collate;
+                $i++;
+            }
+            $this->free($resql);
+        } else {
+            return null;
+        }
+        return $liste;
+    }
+
+    /**
+     *	Return full path of dump program
+     *
+     *	@return		string		Full path of dump program
+     */
+    function getPathOfDump()
+    {
+        $fullpathofdump='/pathtopgdump/pg_dump';
+
+        if (file_exists('/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';
-    		}
-		}
-
-		return $fullpathofdump;
-	}
+            $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
      */
-	function getPathOfRestore()
-	{
-		//$tool='pg_restore';
-		$tool='psql';
+    function getPathOfRestore()
+    {
+        //$tool='pg_restore';
+        $tool='psql';
 
-		$fullpathofdump='/pathtopgrestore/'.$tool;
+        $fullpathofdump='/pathtopgrestore/'.$tool;
 
         if (file_exists('/usr/bin/'.$tool))
         {
@@ -1334,39 +1334,39 @@ 
             }
         }
 
-		return $fullpathofdump;
-	}
-
-	/**
-	 * 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();
-
-		$resql='select name,setting from pg_settings';
-		if ($filter) $resql.=" WHERE name = '".$this->escape($filter)."'";
-		$resql=$this->query($resql);
-		if ($resql)
-		{
-			while ($obj=$this->fetch_object($resql)) $result[$obj->name]=$obj->setting;
-		}
-
-		return $result;
-	}
-
-	/**
-	 * 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='')
-	{
-		/* This is to return current running requests.
+        return $fullpathofdump;
+    }
+
+    /**
+     * 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();
+
+        $resql='select name,setting from pg_settings';
+        if ($filter) $resql.=" WHERE name = '".$this->escape($filter)."'";
+        $resql=$this->query($resql);
+        if ($resql)
+        {
+            while ($obj=$this->fetch_object($resql)) $result[$obj->name]=$obj->setting;
+        }
+
+        return $result;
+    }
+
+    /**
+     * 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='')
+    {
+        /* This is to return current running requests.
 		$sql='SELECT datname,procpid,current_query FROM pg_stat_activity ORDER BY procpid';
         if ($filter) $sql.=" LIKE '".$this->escape($filter)."'";
         $resql=$this->query($sql);
@@ -1377,6 +1377,6 @@ 
         }
 		*/
 
-		return array();
-	}
+        return array();
+    }
 }

Braces +155 added lines, -91 removed lines

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

Spacing +263 added lines, -263 removed lines

@@ -33,7 +33,7 @@ 
  *	\brief      Fichier de la classe permettant de gerer une base pgsql
  */
 
-require_once DOL_BASE_PATH . '/core/db/DoliDB.class.php';
+require_once DOL_BASE_PATH.'/core/db/DoliDB.class.php';
 
 /**
  *	Class to drive a Postgresql database for Dolibarr
@@ -41,15 +41,15 @@ 
 class DoliDBPgsql extends DoliDB
 {
     //! Database type
-	public $type='pgsql';            // Name of manager
+	public $type = 'pgsql'; // Name of manager
     //! Database label
-	const LABEL='PostgreSQL';      // Label of manager
+	const LABEL = 'PostgreSQL'; // Label of manager
 	//! Charset
-	var $forcecharset='UTF8';       // Can't be static as it may be forced with a dynamic value
+	var $forcecharset = 'UTF8'; // Can't be static as it may be forced with a dynamic value
     //! Collate used to force collate when creating database
-    var $forcecollate='';			// Can't be static as it may be forced with a dynamic value
+    var $forcecollate = ''; // Can't be static as it may be forced with a dynamic value
 	//! Version min database
-	const VERSIONMIN='9.0.0';	// Version min database
+	const VERSIONMIN = '9.0.0'; // Version min database
 	/** @var resource Resultset of last query */
 	private $_results;
 
@@ -67,37 +67,37 @@ 
 	 *	@param	    string	$name		Nom de la database
 	 *	@param	    int		$port		Port of database server
 	 */
-	function __construct($type, $host, $user, $pass, $name='', $port=0)
+	function __construct($type, $host, $user, $pass, $name = '', $port = 0)
 	{
-		global $conf,$langs;
+		global $conf, $langs;
 
         // Note that having "static" property for "$forcecharset" and "$forcecollate" will make error here in strict mode, so they are not static
-		if (! empty($conf->db->character_set)) $this->forcecharset=$conf->db->character_set;
-		if (! empty($conf->db->dolibarr_main_db_collation))	$this->forcecollate=$conf->db->dolibarr_main_db_collation;
+		if (!empty($conf->db->character_set)) $this->forcecharset = $conf->db->character_set;
+		if (!empty($conf->db->dolibarr_main_db_collation))	$this->forcecollate = $conf->db->dolibarr_main_db_collation;
 
-		$this->database_user=$user;
-        $this->database_host=$host;
-        $this->database_port=$port;
+		$this->database_user = $user;
+        $this->database_host = $host;
+        $this->database_port = $port;
 
-		$this->transaction_opened=0;
+		$this->transaction_opened = 0;
 
 		//print "Name DB: $host,$user,$pass,$name<br>";
 
-		if (! function_exists("pg_connect"))
+		if (!function_exists("pg_connect"))
 		{
 			$this->connected = false;
 			$this->ok = false;
-			$this->error="Pgsql PHP functions are not available in this version of PHP";
-			dol_syslog(get_class($this)."::DoliDBPgsql : Pgsql PHP functions are not available in this version of PHP",LOG_ERR);
+			$this->error = "Pgsql PHP functions are not available in this version of PHP";
+			dol_syslog(get_class($this)."::DoliDBPgsql : Pgsql PHP functions are not available in this version of PHP", LOG_ERR);
 			return $this->ok;
 		}
 
-		if (! $host)
+		if (!$host)
 		{
 			$this->connected = false;
 			$this->ok = false;
-			$this->error=$langs->trans("ErrorWrongHostParameter");
-			dol_syslog(get_class($this)."::DoliDBPgsql : Erreur Connect, wrong host parameters",LOG_ERR);
+			$this->error = $langs->trans("ErrorWrongHostParameter");
+			dol_syslog(get_class($this)."::DoliDBPgsql : Erreur Connect, wrong host parameters", LOG_ERR);
 			return $this->ok;
 		}
 
@@ -115,8 +115,8 @@ 
 			// host, login ou password incorrect
 			$this->connected = false;
 			$this->ok = false;
-			$this->error='Host, login or password incorrect';
-			dol_syslog(get_class($this)."::DoliDBPgsql : Erreur Connect ".$this->error,LOG_ERR);
+			$this->error = 'Host, login or password incorrect';
+			dol_syslog(get_class($this)."::DoliDBPgsql : Erreur Connect ".$this->error, LOG_ERR);
 		}
 
 		// Si connexion serveur ok et si connexion base demandee, on essaie connexion base
@@ -133,8 +133,8 @@ 
 				$this->database_selected = false;
 				$this->database_name = '';
 				$this->ok = false;
-				$this->error=$this->error();
-				dol_syslog(get_class($this)."::DoliDBPgsql : Erreur Select_db ".$this->error,LOG_ERR);
+				$this->error = $this->error();
+				dol_syslog(get_class($this)."::DoliDBPgsql : Erreur Select_db ".$this->error, LOG_ERR);
 			}
 		}
 		else
@@ -155,14 +155,14 @@ 
      *  @param	bool	$unescapeslashquot	Unescape slash quote with quote quote
      *  @return string   					SQL request line converted
      */
-	static function convertSQLFromMysql($line,$type='auto',$unescapeslashquot=false)
+	static function convertSQLFromMysql($line, $type = 'auto', $unescapeslashquot = false)
 	{
 		// Removed empty line if this is a comment line for SVN tagging
-		if (preg_match('/^--\s\$Id/i',$line)) {
+		if (preg_match('/^--\s\$Id/i', $line)) {
 			return '';
 		}
 		// Return line if this is a comment
-		if (preg_match('/^#/i',$line) || preg_match('/^$/i',$line) || preg_match('/^--/i',$line))
+		if (preg_match('/^#/i', $line) || preg_match('/^$/i', $line) || preg_match('/^--/i', $line))
 		{
 			return $line;
 		}
@@ -177,186 +177,186 @@ 
 
 		    if ($type == 'auto')
 		    {
-              if (preg_match('/ALTER TABLE/i',$line)) $type='dml';
-              else if (preg_match('/CREATE TABLE/i',$line)) $type='dml';
-              else if (preg_match('/DROP TABLE/i',$line)) $type='dml';
+              if (preg_match('/ALTER TABLE/i', $line)) $type = 'dml';
+              else if (preg_match('/CREATE TABLE/i', $line)) $type = 'dml';
+              else if (preg_match('/DROP TABLE/i', $line)) $type = 'dml';
 		    }
 
-    		$line=preg_replace('/ as signed\)/i',' as integer)',$line);
+    		$line = preg_replace('/ as signed\)/i', ' as integer)', $line);
 
 		    if ($type == 'dml')
 		    {
-                $line=preg_replace('/\s/',' ',$line);   // Replace tabulation with space
+                $line = preg_replace('/\s/', ' ', $line); // Replace tabulation with space
 
 		        // we are inside create table statement so lets process datatypes
-    			if (preg_match('/(ISAM|innodb)/i',$line)) { // end of create table sequence
-    				$line=preg_replace('/\)[\s\t]*type[\s\t]*=[\s\t]*(MyISAM|innodb).*;/i',');',$line);
-    				$line=preg_replace('/\)[\s\t]*engine[\s\t]*=[\s\t]*(MyISAM|innodb).*;/i',');',$line);
-    				$line=preg_replace('/,$/','',$line);
+    			if (preg_match('/(ISAM|innodb)/i', $line)) { // end of create table sequence
+    				$line = preg_replace('/\)[\s\t]*type[\s\t]*=[\s\t]*(MyISAM|innodb).*;/i', ');', $line);
+    				$line = preg_replace('/\)[\s\t]*engine[\s\t]*=[\s\t]*(MyISAM|innodb).*;/i', ');', $line);
+    				$line = preg_replace('/,$/', '', $line);
     			}
 
     			// Process case: "CREATE TABLE llx_mytable(rowid integer NOT NULL AUTO_INCREMENT PRIMARY KEY,code..."
-    			if (preg_match('/[\s\t\(]*(\w*)[\s\t]+int.*auto_increment/i',$line,$reg)) {
-    				$newline=preg_replace('/([\s\t\(]*)([a-zA-Z_0-9]*)[\s\t]+int.*auto_increment[^,]*/i','\\1 \\2 SERIAL PRIMARY KEY',$line);
+    			if (preg_match('/[\s\t\(]*(\w*)[\s\t]+int.*auto_increment/i', $line, $reg)) {
+    				$newline = preg_replace('/([\s\t\(]*)([a-zA-Z_0-9]*)[\s\t]+int.*auto_increment[^,]*/i', '\\1 \\2 SERIAL PRIMARY KEY', $line);
                     //$line = "-- ".$line." replaced by --\n".$newline;
-                    $line=$newline;
+                    $line = $newline;
     			}
 
     			// tinyint type conversion
-    			$line=preg_replace('/tinyint\(?[0-9]*\)?/','smallint',$line);
-    			$line=preg_replace('/tinyint/i','smallint',$line);
+    			$line = preg_replace('/tinyint\(?[0-9]*\)?/', 'smallint', $line);
+    			$line = preg_replace('/tinyint/i', 'smallint', $line);
 
     			// nuke unsigned
-    			$line=preg_replace('/(int\w+|smallint)\s+unsigned/i','\\1',$line);
+    			$line = preg_replace('/(int\w+|smallint)\s+unsigned/i', '\\1', $line);
 
     			// blob -> text
-    			$line=preg_replace('/\w*blob/i','text',$line);
+    			$line = preg_replace('/\w*blob/i', 'text', $line);
 
     			// tinytext/mediumtext -> text
-    			$line=preg_replace('/tinytext/i','text',$line);
-    			$line=preg_replace('/mediumtext/i','text',$line);
-    			$line=preg_replace('/longtext/i','text',$line);
+    			$line = preg_replace('/tinytext/i', 'text', $line);
+    			$line = preg_replace('/mediumtext/i', 'text', $line);
+    			$line = preg_replace('/longtext/i', 'text', $line);
 
-    			$line=preg_replace('/text\([0-9]+\)/i','text',$line);
+    			$line = preg_replace('/text\([0-9]+\)/i', 'text', $line);
 
     			// change not null datetime field to null valid ones
     			// (to support remapping of "zero time" to null
-    			$line=preg_replace('/datetime not null/i','datetime',$line);
-    			$line=preg_replace('/datetime/i','timestamp',$line);
+    			$line = preg_replace('/datetime not null/i', 'datetime', $line);
+    			$line = preg_replace('/datetime/i', 'timestamp', $line);
 
     			// double -> numeric
-    			$line=preg_replace('/^double/i','numeric',$line);
-    			$line=preg_replace('/(\s*)double/i','\\1numeric',$line);
+    			$line = preg_replace('/^double/i', 'numeric', $line);
+    			$line = preg_replace('/(\s*)double/i', '\\1numeric', $line);
     			// float -> numeric
-    			$line=preg_replace('/^float/i','numeric',$line);
-    			$line=preg_replace('/(\s*)float/i','\\1numeric',$line);
+    			$line = preg_replace('/^float/i', 'numeric', $line);
+    			$line = preg_replace('/(\s*)float/i', '\\1numeric', $line);
 
     			//Check tms timestamp field case (in Mysql this field is defautled to now and
     			// on update defaulted by now
-    			$line=preg_replace('/(\s*)tms(\s*)timestamp/i','\\1tms timestamp without time zone DEFAULT now() NOT NULL',$line);
+    			$line = preg_replace('/(\s*)tms(\s*)timestamp/i', '\\1tms timestamp without time zone DEFAULT now() NOT NULL', $line);
 
     			// nuke ON UPDATE CURRENT_TIMESTAMP
-    			$line=preg_replace('/(\s*)on(\s*)update(\s*)CURRENT_TIMESTAMP/i','\\1',$line);
+    			$line = preg_replace('/(\s*)on(\s*)update(\s*)CURRENT_TIMESTAMP/i', '\\1', $line);
 
     			// unique index(field1,field2)
-    			if (preg_match('/unique index\s*\((\w+\s*,\s*\w+)\)/i',$line))
+    			if (preg_match('/unique index\s*\((\w+\s*,\s*\w+)\)/i', $line))
     			{
-    				$line=preg_replace('/unique index\s*\((\w+\s*,\s*\w+)\)/i','UNIQUE\(\\1\)',$line);
+    				$line = preg_replace('/unique index\s*\((\w+\s*,\s*\w+)\)/i', 'UNIQUE\(\\1\)', $line);
     			}
 
     			// We remove end of requests "AFTER fieldxxx"
-    			$line=preg_replace('/\sAFTER [a-z0-9_]+/i','',$line);
+    			$line = preg_replace('/\sAFTER [a-z0-9_]+/i', '', $line);
 
     			// We remove start of requests "ALTER TABLE tablexxx" if this is a DROP INDEX
-    			$line=preg_replace('/ALTER TABLE [a-z0-9_]+\s+DROP INDEX/i','DROP INDEX',$line);
+    			$line = preg_replace('/ALTER TABLE [a-z0-9_]+\s+DROP INDEX/i', 'DROP INDEX', $line);
 
                 // Translate order to rename fields
-                if (preg_match('/ALTER TABLE ([a-z0-9_]+)\s+CHANGE(?: COLUMN)? ([a-z0-9_]+) ([a-z0-9_]+)(.*)$/i',$line,$reg))
+                if (preg_match('/ALTER TABLE ([a-z0-9_]+)\s+CHANGE(?: COLUMN)? ([a-z0-9_]+) ([a-z0-9_]+)(.*)$/i', $line, $reg))
                 {
                 	$line = "-- ".$line." replaced by --\n";
-                    $line.= "ALTER TABLE ".$reg[1]." RENAME COLUMN ".$reg[2]." TO ".$reg[3];
+                    $line .= "ALTER TABLE ".$reg[1]." RENAME COLUMN ".$reg[2]." TO ".$reg[3];
                 }
 
                 // Translate order to modify field format
-                if (preg_match('/ALTER TABLE ([a-z0-9_]+)\s+MODIFY(?: COLUMN)? ([a-z0-9_]+) (.*)$/i',$line,$reg))
+                if (preg_match('/ALTER TABLE ([a-z0-9_]+)\s+MODIFY(?: COLUMN)? ([a-z0-9_]+) (.*)$/i', $line, $reg))
                 {
                     $line = "-- ".$line." replaced by --\n";
-                    $newreg3=$reg[3];
-                    $newreg3=preg_replace('/ DEFAULT NULL/i','',$newreg3);
-                    $newreg3=preg_replace('/ NOT NULL/i','',$newreg3);
-                    $newreg3=preg_replace('/ NULL/i','',$newreg3);
-                    $newreg3=preg_replace('/ DEFAULT 0/i','',$newreg3);
-                    $newreg3=preg_replace('/ DEFAULT \'?[0-9a-zA-Z_@]*\'?/i','',$newreg3);
-                    $line.= "ALTER TABLE ".$reg[1]." ALTER COLUMN ".$reg[2]." TYPE ".$newreg3;
+                    $newreg3 = $reg[3];
+                    $newreg3 = preg_replace('/ DEFAULT NULL/i', '', $newreg3);
+                    $newreg3 = preg_replace('/ NOT NULL/i', '', $newreg3);
+                    $newreg3 = preg_replace('/ NULL/i', '', $newreg3);
+                    $newreg3 = preg_replace('/ DEFAULT 0/i', '', $newreg3);
+                    $newreg3 = preg_replace('/ DEFAULT \'?[0-9a-zA-Z_@]*\'?/i', '', $newreg3);
+                    $line .= "ALTER TABLE ".$reg[1]." ALTER COLUMN ".$reg[2]." TYPE ".$newreg3;
                     // TODO Add alter to set default value or null/not null if there is this in $reg[3]
                 }
 
                 // alter table add primary key (field1, field2 ...) -> We remove the primary key name not accepted by PostGreSQL
     			// ALTER TABLE llx_dolibarr_modules ADD PRIMARY KEY pk_dolibarr_modules (numero, entity)
-    			if (preg_match('/ALTER\s+TABLE\s*(.*)\s*ADD\s+PRIMARY\s+KEY\s*(.*)\s*\((.*)$/i',$line,$reg))
+    			if (preg_match('/ALTER\s+TABLE\s*(.*)\s*ADD\s+PRIMARY\s+KEY\s*(.*)\s*\((.*)$/i', $line, $reg))
     			{
     				$line = "-- ".$line." replaced by --\n";
-    				$line.= "ALTER TABLE ".$reg[1]." ADD PRIMARY KEY (".$reg[3];
+    				$line .= "ALTER TABLE ".$reg[1]." ADD PRIMARY KEY (".$reg[3];
     			}
 
                 // Translate order to drop primary keys
                 // ALTER TABLE llx_dolibarr_modules DROP PRIMARY KEY pk_xxx
-                if (preg_match('/ALTER\s+TABLE\s*(.*)\s*DROP\s+PRIMARY\s+KEY\s*([^;]+)$/i',$line,$reg))
+                if (preg_match('/ALTER\s+TABLE\s*(.*)\s*DROP\s+PRIMARY\s+KEY\s*([^;]+)$/i', $line, $reg))
                 {
                     $line = "-- ".$line." replaced by --\n";
-                    $line.= "ALTER TABLE ".$reg[1]." DROP CONSTRAINT ".$reg[2];
+                    $line .= "ALTER TABLE ".$reg[1]." DROP CONSTRAINT ".$reg[2];
                 }
 
 		        // Translate order to drop foreign keys
                 // ALTER TABLE llx_dolibarr_modules DROP FOREIGN KEY fk_xxx
-                if (preg_match('/ALTER\s+TABLE\s*(.*)\s*DROP\s+FOREIGN\s+KEY\s*(.*)$/i',$line,$reg))
+                if (preg_match('/ALTER\s+TABLE\s*(.*)\s*DROP\s+FOREIGN\s+KEY\s*(.*)$/i', $line, $reg))
                 {
                     $line = "-- ".$line." replaced by --\n";
-                    $line.= "ALTER TABLE ".$reg[1]." DROP CONSTRAINT ".$reg[2];
+                    $line .= "ALTER TABLE ".$reg[1]." DROP CONSTRAINT ".$reg[2];
                 }
 
                 // Translate order to add foreign keys
                 // ALTER TABLE llx_tablechild ADD CONSTRAINT fk_tablechild_fk_fieldparent FOREIGN KEY (fk_fieldparent) REFERENCES llx_tableparent (rowid)
-                if (preg_match('/ALTER\s+TABLE\s+(.*)\s*ADD CONSTRAINT\s+(.*)\s*FOREIGN\s+KEY\s*(.*)$/i',$line,$reg))
+                if (preg_match('/ALTER\s+TABLE\s+(.*)\s*ADD CONSTRAINT\s+(.*)\s*FOREIGN\s+KEY\s*(.*)$/i', $line, $reg))
                 {
-                    $line=preg_replace('/;$/','',$line);
-                    $line.=" DEFERRABLE INITIALLY IMMEDIATE;";
+                    $line = preg_replace('/;$/', '', $line);
+                    $line .= " DEFERRABLE INITIALLY IMMEDIATE;";
                 }
 
                 // alter table add [unique] [index] (field1, field2 ...)
     			// ALTER TABLE llx_accountingaccount ADD INDEX idx_accountingaccount_fk_pcg_version (fk_pcg_version)
-    			if (preg_match('/ALTER\s+TABLE\s*(.*)\s*ADD\s+(UNIQUE INDEX|INDEX|UNIQUE)\s+(.*)\s*\(([\w,\s]+)\)/i',$line,$reg))
+    			if (preg_match('/ALTER\s+TABLE\s*(.*)\s*ADD\s+(UNIQUE INDEX|INDEX|UNIQUE)\s+(.*)\s*\(([\w,\s]+)\)/i', $line, $reg))
     			{
-    				$fieldlist=$reg[4];
-    				$idxname=$reg[3];
-    				$tablename=$reg[1];
+    				$fieldlist = $reg[4];
+    				$idxname = $reg[3];
+    				$tablename = $reg[1];
     				$line = "-- ".$line." replaced by --\n";
-    				$line.= "CREATE ".(preg_match('/UNIQUE/',$reg[2])?'UNIQUE ':'')."INDEX ".$idxname." ON ".$tablename." (".$fieldlist.")";
+    				$line .= "CREATE ".(preg_match('/UNIQUE/', $reg[2]) ? 'UNIQUE ' : '')."INDEX ".$idxname." ON ".$tablename." (".$fieldlist.")";
     			}
             }
 
             // To have postgresql case sensitive
-            $line=str_replace(' LIKE \'',' ILIKE \'',$line);
-            $line=str_replace(' LIKE BINARY \'',' LIKE \'',$line);
+            $line = str_replace(' LIKE \'', ' ILIKE \'', $line);
+            $line = str_replace(' LIKE BINARY \'', ' LIKE \'', $line);
 
             // Replace INSERT IGNORE into INSERT
-            $line=preg_replace('/^INSERT IGNORE/','INSERT',$line);
+            $line = preg_replace('/^INSERT IGNORE/', 'INSERT', $line);
 
 			// Delete using criteria on other table must not declare twice the deleted table
 			// DELETE FROM tabletodelete USING tabletodelete, othertable -> DELETE FROM tabletodelete USING othertable
-			if (preg_match('/DELETE FROM ([a-z_]+) USING ([a-z_]+), ([a-z_]+)/i',$line,$reg))
+			if (preg_match('/DELETE FROM ([a-z_]+) USING ([a-z_]+), ([a-z_]+)/i', $line, $reg))
 			{
 				if ($reg[1] == $reg[2])	// If same table, we remove second one
 				{
-					$line=preg_replace('/DELETE FROM ([a-z_]+) USING ([a-z_]+), ([a-z_]+)/i','DELETE FROM \\1 USING \\3', $line);
+					$line = preg_replace('/DELETE FROM ([a-z_]+) USING ([a-z_]+), ([a-z_]+)/i', 'DELETE FROM \\1 USING \\3', $line);
 				}
 			}
 
 			// Remove () in the tables in FROM if 1 table
-			$line=preg_replace('/FROM\s*\((([a-z_]+)\s+as\s+([a-z_]+)\s*)\)/i','FROM \\1',$line);
+			$line = preg_replace('/FROM\s*\((([a-z_]+)\s+as\s+([a-z_]+)\s*)\)/i', 'FROM \\1', $line);
 			//print $line."\n";
 
 			// Remove () in the tables in FROM if 2 table
-			$line=preg_replace('/FROM\s*\(([a-z_]+\s+as\s+[a-z_]+)\s*,\s*([a-z_]+\s+as\s+[a-z_]+\s*)\)/i','FROM \\1, \\2',$line);
+			$line = preg_replace('/FROM\s*\(([a-z_]+\s+as\s+[a-z_]+)\s*,\s*([a-z_]+\s+as\s+[a-z_]+\s*)\)/i', 'FROM \\1, \\2', $line);
 			//print $line."\n";
 
 			// Remove () in the tables in FROM if 3 table
-			$line=preg_replace('/FROM\s*\(([a-z_]+\s+as\s+[a-z_]+)\s*,\s*([a-z_]+\s+as\s+[a-z_]+\s*),\s*([a-z_]+\s+as\s+[a-z_]+\s*)\)/i','FROM \\1, \\2, \\3',$line);
+			$line = preg_replace('/FROM\s*\(([a-z_]+\s+as\s+[a-z_]+)\s*,\s*([a-z_]+\s+as\s+[a-z_]+\s*),\s*([a-z_]+\s+as\s+[a-z_]+\s*)\)/i', 'FROM \\1, \\2, \\3', $line);
 			//print $line."\n";
 
 			// Remove () in the tables in FROM if 4 table
-			$line=preg_replace('/FROM\s*\(([a-z_]+\s+as\s+[a-z_]+)\s*,\s*([a-z_]+\s+as\s+[a-z_]+\s*),\s*([a-z_]+\s+as\s+[a-z_]+\s*),\s*([a-z_]+\s+as\s+[a-z_]+\s*)\)/i','FROM \\1, \\2, \\3, \\4',$line);
+			$line = preg_replace('/FROM\s*\(([a-z_]+\s+as\s+[a-z_]+)\s*,\s*([a-z_]+\s+as\s+[a-z_]+\s*),\s*([a-z_]+\s+as\s+[a-z_]+\s*),\s*([a-z_]+\s+as\s+[a-z_]+\s*)\)/i', 'FROM \\1, \\2, \\3, \\4', $line);
 			//print $line."\n";
 
 			// Remove () in the tables in FROM if 5 table
-			$line=preg_replace('/FROM\s*\(([a-z_]+\s+as\s+[a-z_]+)\s*,\s*([a-z_]+\s+as\s+[a-z_]+\s*),\s*([a-z_]+\s+as\s+[a-z_]+\s*),\s*([a-z_]+\s+as\s+[a-z_]+\s*),\s*([a-z_]+\s+as\s+[a-z_]+\s*)\)/i','FROM \\1, \\2, \\3, \\4, \\5',$line);
+			$line = preg_replace('/FROM\s*\(([a-z_]+\s+as\s+[a-z_]+)\s*,\s*([a-z_]+\s+as\s+[a-z_]+\s*),\s*([a-z_]+\s+as\s+[a-z_]+\s*),\s*([a-z_]+\s+as\s+[a-z_]+\s*),\s*([a-z_]+\s+as\s+[a-z_]+\s*)\)/i', 'FROM \\1, \\2, \\3, \\4, \\5', $line);
 			//print $line."\n";
 
 			// Replace espacing \' by ''.
 			// By default we do not (should be already done by db->escape function if required
 			// except for sql insert in data file that are mysql escaped so we removed them to
 			// be compatible with standard_conforming_strings=on that considers \ as ordinary character).
-			if ($unescapeslashquot) $line=preg_replace("/\\\'/","''",$line);
+			if ($unescapeslashquot) $line = preg_replace("/\\\'/", "''", $line);
 
 			//print "type=".$type." newline=".$line."<br>\n";
 		}
@@ -394,7 +394,7 @@ 
 	 *	@return		false|resource			Database access handler
 	 *	@see		close
 	 */
-	function connect($host, $login, $passwd, $name, $port=0)
+	function connect($host, $login, $passwd, $name, $port = 0)
 	{
 		// use pg_pconnect() instead of pg_connect() if you want to use persistent connection costing 1ms, instead of 30ms for non persistent
 
@@ -407,20 +407,20 @@ 
 		$name = str_replace(array("\\", "'"), array("\\\\", "\\'"), $name);
 		$port = str_replace(array("\\", "'"), array("\\\\", "\\'"), $port);
 
-		if (! $name) $name="postgres";    // When try to connect using admin user
+		if (!$name) $name = "postgres"; // When try to connect using admin user
 
 		// try first Unix domain socket (local)
-		if ((! empty($host) && $host == "socket") && ! defined('NOLOCALSOCKETPGCONNECT'))
+		if ((!empty($host) && $host == "socket") && !defined('NOLOCALSOCKETPGCONNECT'))
 		{
-			$con_string = "dbname='".$name."' user='".$login."' password='".$passwd."'";    // $name may be empty
+			$con_string = "dbname='".$name."' user='".$login."' password='".$passwd."'"; // $name may be empty
 			$this->db = @pg_connect($con_string);
 		}
 
 		// if local connection failed or not requested, use TCP/IP
-		if (! $this->db)
+		if (!$this->db)
 		{
-		    if (! $host) $host = "localhost";
-			if (! $port) $port = 5432;
+		    if (!$host) $host = "localhost";
+			if (!$port) $port = 5432;
 
 			$con_string = "host='".$host."' port='".$port."' dbname='".$name."' user='".$login."' password='".$passwd."'";
 			$this->db = @pg_connect($con_string);
@@ -430,7 +430,7 @@ 
 		if ($this->db)
 		{
 			$this->database_name = $name;
-			pg_set_error_verbosity($this->db, PGSQL_ERRORS_VERBOSE);	// Set verbosity to max
+			pg_set_error_verbosity($this->db, PGSQL_ERRORS_VERBOSE); // Set verbosity to max
 			pg_query($this->db, "set datestyle = 'ISO, YMD';");
 		}
 
@@ -444,10 +444,10 @@ 
 	 */
 	function getVersion()
 	{
-		$resql=$this->query('SHOW server_version');
+		$resql = $this->query('SHOW server_version');
 		if ($resql)
 		{
-		  $liste=$this->fetch_array($resql);
+		  $liste = $this->fetch_array($resql);
 		  return $liste['server_version'];
 		}
 		return '';
@@ -473,8 +473,8 @@ 
     {
         if ($this->db)
         {
-          if ($this->transaction_opened > 0) dol_syslog(get_class($this)."::close Closing a connection with an opened transaction depth=".$this->transaction_opened,LOG_ERR);
-          $this->connected=false;
+          if ($this->transaction_opened > 0) dol_syslog(get_class($this)."::close Closing a connection with an opened transaction depth=".$this->transaction_opened, LOG_ERR);
+          $this->connected = false;
           return pg_close($this->db);
         }
         return false;
@@ -488,28 +488,28 @@ 
      * @param   string	$type           Type of SQL order ('ddl' for insert, update, select, delete or 'dml' for create, alter...)
 	 * @return	false|resource			Resultset of answer
 	 */
-	function query($query,$usesavepoint=0,$type='auto')
+	function query($query, $usesavepoint = 0, $type = 'auto')
 	{
 		global $conf;
 
 		$query = trim($query);
 
 		// Convert MySQL syntax to PostgresSQL syntax
-		$query=$this->convertSQLFromMysql($query,$type,($this->unescapeslashquot && $this->standard_conforming_strings));
+		$query = $this->convertSQLFromMysql($query, $type, ($this->unescapeslashquot && $this->standard_conforming_strings));
 		//print "After convertSQLFromMysql:\n".$query."<br>\n";
 
-		if (! empty($conf->global->MAIN_DB_AUTOFIX_BAD_SQL_REQUEST))
+		if (!empty($conf->global->MAIN_DB_AUTOFIX_BAD_SQL_REQUEST))
 		{
 			// Fix bad formed requests. If request contains a date without quotes, we fix this but this should not occurs.
-			$loop=true;
+			$loop = true;
 			while ($loop)
 			{
-				if (preg_match('/([^\'])([0-9][0-9][0-9][0-9]-[0-9][0-9]-[0-9][0-9] [0-9][0-9]:[0-9][0-9]:[0-9][0-9])/',$query))
+				if (preg_match('/([^\'])([0-9][0-9][0-9][0-9]-[0-9][0-9]-[0-9][0-9] [0-9][0-9]:[0-9][0-9]:[0-9][0-9])/', $query))
 				{
-					$query=preg_replace('/([^\'])([0-9][0-9][0-9][0-9]-[0-9][0-9]-[0-9][0-9] [0-9][0-9]:[0-9][0-9]:[0-9][0-9])/','\\1\'\\2\'',$query);
-					dol_syslog("Warning: Bad formed request converted into ".$query,LOG_WARNING);
+					$query = preg_replace('/([^\'])([0-9][0-9][0-9][0-9]-[0-9][0-9]-[0-9][0-9] [0-9][0-9]:[0-9][0-9]:[0-9][0-9])/', '\\1\'\\2\'', $query);
+					dol_syslog("Warning: Bad formed request converted into ".$query, LOG_WARNING);
 				}
-				else $loop=false;
+				else $loop = false;
 			}
 		}
 
@@ -518,14 +518,14 @@ 
 			@pg_query($this->db, 'SAVEPOINT mysavepoint');
 		}
 
-		if (! in_array($query,array('BEGIN','COMMIT','ROLLBACK'))) dol_syslog('sql='.$query, LOG_DEBUG);
+		if (!in_array($query, array('BEGIN', 'COMMIT', 'ROLLBACK'))) dol_syslog('sql='.$query, LOG_DEBUG);
 
 		$ret = @pg_query($this->db, $query);
 
 		//print $query;
-		if (! preg_match("/^COMMIT/i",$query) && ! preg_match("/^ROLLBACK/i",$query)) // Si requete utilisateur, on la sauvegarde ainsi que son resultset
+		if (!preg_match("/^COMMIT/i", $query) && !preg_match("/^ROLLBACK/i", $query)) // Si requete utilisateur, on la sauvegarde ainsi que son resultset
 		{
-			if (! $ret)
+			if (!$ret)
 			{
 			    if ($this->errno() != 'DB_ERROR_25P02')	// Do not overwrite errors if this is a consecutive error
 			    {
@@ -533,7 +533,7 @@ 
     				$this->lasterror = $this->error();
     				$this->lasterrno = $this->errno();
 
-    				if ($conf->global->SYSLOG_LEVEL < LOG_DEBUG) dol_syslog(get_class($this)."::query SQL Error query: ".$query, LOG_ERR);	// Log of request was not yet done previously
+    				if ($conf->global->SYSLOG_LEVEL < LOG_DEBUG) dol_syslog(get_class($this)."::query SQL Error query: ".$query, LOG_ERR); // Log of request was not yet done previously
 					dol_syslog(get_class($this)."::query SQL Error message: ".$this->lasterror." (".$this->lasterrno.")", LOG_ERR);
 					dol_syslog(get_class($this)."::query SQL Error usesavepoint = ".$usesavepoint, LOG_ERR);
 			    }
@@ -543,7 +543,7 @@ 
 					@pg_query($this->db, 'ROLLBACK TO SAVEPOINT mysavepoint');
 				}
 			}
-			$this->lastquery=$query;
+			$this->lastquery = $query;
 			$this->_results = $ret;
 		}
 
@@ -561,7 +561,7 @@ 
 	{
         // phpcs:enable
         // If resultset not provided, we take the last used by connexion
-		if (! is_resource($resultset)) { $resultset=$this->_results; }
+		if (!is_resource($resultset)) { $resultset = $this->_results; }
 		return pg_fetch_object($resultset);
 	}
 
@@ -576,7 +576,7 @@ 
 	{
         // phpcs:enable
         // If resultset not provided, we take the last used by connexion
-		if (! is_resource($resultset)) { $resultset=$this->_results; }
+		if (!is_resource($resultset)) { $resultset = $this->_results; }
 		return pg_fetch_array($resultset);
 	}
 
@@ -591,7 +591,7 @@ 
 	{
         // phpcs:enable
 		// Si le resultset n'est pas fourni, on prend le dernier utilise sur cette connexion
-		if (! is_resource($resultset)) { $resultset=$this->_results; }
+		if (!is_resource($resultset)) { $resultset = $this->_results; }
 		return pg_fetch_row($resultset);
 	}
 
@@ -607,7 +607,7 @@ 
 	{
         // phpcs:enable
         // If resultset not provided, we take the last used by connexion
-		if (! is_resource($resultset)) { $resultset=$this->_results; }
+		if (!is_resource($resultset)) { $resultset = $this->_results; }
 		return pg_num_rows($resultset);
 	}
 
@@ -623,7 +623,7 @@ 
 	{
         // phpcs:enable
         // If resultset not provided, we take the last used by connexion
-		if (! is_resource($resultset)) { $resultset=$this->_results; }
+		if (!is_resource($resultset)) { $resultset = $this->_results; }
 		// pgsql necessite un resultset pour cette fonction contrairement
 		// a mysql qui prend un link de base
 		return pg_affected_rows($resultset);
@@ -636,10 +636,10 @@ 
 	 * @param	resource	$resultset  Result set of request
 	 * @return	void
 	 */
-	function free($resultset=null)
+	function free($resultset = null)
 	{
         // If resultset not provided, we take the last used by connexion
-		if (! is_resource($resultset)) { $resultset=$this->_results; }
+		if (!is_resource($resultset)) { $resultset = $this->_results; }
 		// Si resultset en est un, on libere la memoire
 		if (is_resource($resultset)) pg_free_result($resultset);
 	}
@@ -652,11 +652,11 @@ 
      *	@param	int		$offset     Numero of line from where starting fetch
      *	@return	string      		String with SQL syntax to add a limit and offset
 	 */
-	function plimit($limit=0,$offset=0)
+	function plimit($limit = 0, $offset = 0)
 	{
 		global $conf;
         if (empty($limit)) return "";
-		if ($limit < 0) $limit=$conf->liste_limit;
+		if ($limit < 0) $limit = $conf->liste_limit;
 		if ($offset > 0) return " LIMIT ".$limit." OFFSET ".$offset." ";
 		else return " LIMIT $limit ";
 	}
@@ -682,7 +682,7 @@ 
 	 */
 	function idate($param)
 	{
-		return dol_print_date($param,"%Y-%m-%d %H:%M:%S");
+		return dol_print_date($param, "%Y-%m-%d %H:%M:%S");
 	}
 
 	/**
@@ -693,7 +693,7 @@ 
 	 *  @param	string	$resko          resultat si test non egal
 	 *  @return	string          		chaine formate SQL
 	 */
-	function ifsql($test,$resok,$resko)
+	function ifsql($test, $resok, $resko)
 	{
 		return '(CASE WHEN '.$test.' THEN '.$resok.' ELSE '.$resko.' END)';
 	}
@@ -705,7 +705,7 @@ 
 	 */
 	function errno()
 	{
-		if (! $this->connected) {
+		if (!$this->connected) {
 			// Si il y a eu echec de connexion, $this->db n'est pas valide.
 			return 'DB_ERROR_FAILED_TO_CONNECT';
 		}
@@ -727,7 +727,7 @@ 
 			42701=> 'DB_ERROR_COLUMN_ALREADY_EXISTS',
 			'42710' => 'DB_ERROR_KEY_NAME_ALREADY_EXISTS',
 			'23505' => 'DB_ERROR_RECORD_ALREADY_EXISTS',
-			'42704' => 'DB_ERROR_NO_INDEX_TO_DROP',		// May also be Type xxx does not exists
+			'42704' => 'DB_ERROR_NO_INDEX_TO_DROP', // May also be Type xxx does not exists
 			'42601' => 'DB_ERROR_SYNTAX',
 			'42P16' => 'DB_ERROR_PRIMARY_KEY_ALREADY_EXISTS',
 			1075 => 'DB_ERROR_CANT_DROP_PRIMARY_KEY',
@@ -741,18 +741,18 @@ 
 			'42P04' => 'DB_DATABASE_ALREADY_EXISTS'
 			);
 
-			$errorlabel=pg_last_error($this->db);
-			$errorcode='';
-			if (preg_match('/: *([0-9P]+):/',$errorlabel,$reg))
+			$errorlabel = pg_last_error($this->db);
+			$errorcode = '';
+			if (preg_match('/: *([0-9P]+):/', $errorlabel, $reg))
 			{
-				$errorcode=$reg[1];
+				$errorcode = $reg[1];
 				if (isset($errorcode_map[$errorcode]))
 				{
 					return $errorcode_map[$errorcode];
 				}
 			}
-			$errno=$errorcode?$errorcode:$errorlabel;
-			return ($errno?'DB_ERROR_'.$errno:'0');
+			$errno = $errorcode ? $errorcode : $errorlabel;
+			return ($errno ? 'DB_ERROR_'.$errno : '0');
 		}
 		//                '/(Table does not exist\.|Relation [\"\'].*[\"\'] does not exist|sequence does not exist|class ".+" not found)$/' => 'DB_ERROR_NOSUCHTABLE',
 		//                '/table [\"\'].*[\"\'] does not exist/' => 'DB_ERROR_NOSUCHTABLE',
@@ -782,18 +782,18 @@ 
 	 * @param	string	$fieldid	Field name
 	 * @return  string     			Id of row
 	 */
-	function last_insert_id($tab,$fieldid='rowid')
+	function last_insert_id($tab, $fieldid = 'rowid')
 	{
         // phpcs:enable
 		//$result = pg_query($this->db,"SELECT MAX(".$fieldid.") FROM ".$tab);
-		$result = pg_query($this->db,"SELECT currval('".$tab."_".$fieldid."_seq')");
-		if (! $result)
+		$result = pg_query($this->db, "SELECT currval('".$tab."_".$fieldid."_seq')");
+		if (!$result)
 		{
 			print pg_last_error($this->db);
 			exit;
 		}
 		//$nbre = pg_num_rows($result);
-		$row = pg_fetch_result($result,0,0);
+		$row = pg_fetch_result($result, 0, 0);
 		return $row;
 	}
 
@@ -805,18 +805,18 @@ 
      *  @param	int		$withQuotes     Return string with quotes
      *  @return string          		XXX(field) or XXX('value') or field or 'value'
 	 */
-	function encrypt($fieldorvalue, $withQuotes=0)
+	function encrypt($fieldorvalue, $withQuotes = 0)
 	{
 		global $conf;
 
 		// Type of encryption (2: AES (recommended), 1: DES , 0: no encryption)
-		$cryptType = ($conf->db->dolibarr_main_db_encryption?$conf->db->dolibarr_main_db_encryption:0);
+		$cryptType = ($conf->db->dolibarr_main_db_encryption ? $conf->db->dolibarr_main_db_encryption : 0);
 
 		//Encryption key
-		$cryptKey = (!empty($conf->db->dolibarr_main_db_cryptkey)?$conf->db->dolibarr_main_db_cryptkey:'');
+		$cryptKey = (!empty($conf->db->dolibarr_main_db_cryptkey) ? $conf->db->dolibarr_main_db_cryptkey : '');
 
 		$return = $fieldorvalue;
-		return ($withQuotes?"'":"").$this->escape($return).($withQuotes?"'":"");
+		return ($withQuotes ? "'" : "").$this->escape($return).($withQuotes ? "'" : "");
 	}
 
 
@@ -831,10 +831,10 @@ 
 		global $conf;
 
 		// Type of encryption (2: AES (recommended), 1: DES , 0: no encryption)
-		$cryptType = ($conf->db->dolibarr_main_db_encryption?$conf->db->dolibarr_main_db_encryption:0);
+		$cryptType = ($conf->db->dolibarr_main_db_encryption ? $conf->db->dolibarr_main_db_encryption : 0);
 
 		//Encryption key
-		$cryptKey = (!empty($conf->db->dolibarr_main_db_cryptkey)?$conf->db->dolibarr_main_db_cryptkey:'');
+		$cryptKey = (!empty($conf->db->dolibarr_main_db_cryptkey) ? $conf->db->dolibarr_main_db_cryptkey : '');
 
 		$return = $value;
 		return $return;
@@ -867,18 +867,18 @@ 
 	 * 	@param	string	$owner			Username of database owner
 	 * 	@return	false|resource				resource defined if OK, null if KO
 	 */
-	function DDLCreateDb($database,$charset='',$collation='',$owner='')
+	function DDLCreateDb($database, $charset = '', $collation = '', $owner = '')
 	{
         // phpcs:enable
-	    if (empty($charset))   $charset=$this->forcecharset;
-		if (empty($collation)) $collation=$this->forcecollate;
+	    if (empty($charset))   $charset = $this->forcecharset;
+		if (empty($collation)) $collation = $this->forcecollate;
 
 		// Test charset match LC_TYPE (pgsql error otherwise)
 		//print $charset.' '.setlocale(LC_CTYPE,'0'); exit;
 
-		$sql='CREATE DATABASE "'.$database.'" OWNER "'.$owner.'" ENCODING \''.$charset.'\'';
-		dol_syslog($sql,LOG_DEBUG);
-		$ret=$this->query($sql);
+		$sql = 'CREATE DATABASE "'.$database.'" OWNER "'.$owner.'" ENCODING \''.$charset.'\'';
+		dol_syslog($sql, LOG_DEBUG);
+		$ret = $this->query($sql);
 		return $ret;
 	}
 
@@ -890,17 +890,17 @@ 
 	 *  @param	string		$table		Name of table filter ('xxx%')
 	 *  @return	array					List of tables in an array
 	 */
-	function DDLListTables($database, $table='')
+	function DDLListTables($database, $table = '')
     {
         // phpcs:enable
-		$listtables=array();
+		$listtables = array();
 
 		$like = '';
 		if ($table) $like = " AND table_name LIKE '".$table."'";
 		$result = pg_query($this->db, "SELECT table_name FROM information_schema.tables WHERE table_schema = 'public'".$like." ORDER BY table_name");
         if ($result)
         {
-    		while($row = $this->fetch_row($result))
+    		while ($row = $this->fetch_row($result))
     		{
     			$listtables[] = $row[0];
     		}
@@ -919,29 +919,29 @@ 
 	function DDLInfoTable($table)
 	{
         // phpcs:enable
-		$infotables=array();
-
-		$sql="SELECT ";
-		$sql.="	infcol.column_name as \"Column\",";
-		$sql.="	CASE WHEN infcol.character_maximum_length IS NOT NULL THEN infcol.udt_name || '('||infcol.character_maximum_length||')'";
-		$sql.="		ELSE infcol.udt_name";
-		$sql.="	END as \"Type\",";
-		$sql.="	infcol.collation_name as \"Collation\",";
-		$sql.="	infcol.is_nullable as \"Null\",";
-		$sql.="	'' as \"Key\",";
-		$sql.="	infcol.column_default as \"Default\",";
-		$sql.="	'' as \"Extra\",";
-		$sql.="	'' as \"Privileges\"";
-		$sql.="	FROM information_schema.columns infcol";
-		$sql.="	WHERE table_schema='public' ";
-		$sql.="	AND table_name='".$table."'";
-		$sql.="	ORDER BY ordinal_position;";
-
-		dol_syslog($sql,LOG_DEBUG);
+		$infotables = array();
+
+		$sql = "SELECT ";
+		$sql .= "	infcol.column_name as \"Column\",";
+		$sql .= "	CASE WHEN infcol.character_maximum_length IS NOT NULL THEN infcol.udt_name || '('||infcol.character_maximum_length||')'";
+		$sql .= "		ELSE infcol.udt_name";
+		$sql .= "	END as \"Type\",";
+		$sql .= "	infcol.collation_name as \"Collation\",";
+		$sql .= "	infcol.is_nullable as \"Null\",";
+		$sql .= "	'' as \"Key\",";
+		$sql .= "	infcol.column_default as \"Default\",";
+		$sql .= "	'' as \"Extra\",";
+		$sql .= "	'' as \"Privileges\"";
+		$sql .= "	FROM information_schema.columns infcol";
+		$sql .= "	WHERE table_schema='public' ";
+		$sql .= "	AND table_name='".$table."'";
+		$sql .= "	ORDER BY ordinal_position;";
+
+		dol_syslog($sql, LOG_DEBUG);
 		$result = $this->query($sql);
 		if ($result)
 		{
-    		 while($row = $this->fetch_row($result))
+    		 while ($row = $this->fetch_row($result))
     		 {
     			$infotables[] = $row;
     		 }
@@ -963,7 +963,7 @@ 
 	 *	@param	    array	$keys 			Tableau des champs cles noms => valeur
 	 *	@return	    int						<0 if KO, >=0 if OK
 	 */
-	function DDLCreateTable($table,$fields,$primary_key,$type,$unique_keys=null,$fulltext_keys=null,$keys=null)
+	function DDLCreateTable($table, $fields, $primary_key, $type, $unique_keys = null, $fulltext_keys = null, $keys = null)
 	{
         // phpcs:enable
 		// FIXME: $fulltext_keys parameter is unused
@@ -971,61 +971,61 @@ 
 		// cles recherchees dans le tableau des descriptions (fields) : type,value,attribute,null,default,extra
 		// ex. : $fields['rowid'] = array('type'=>'int','value'=>'11','null'=>'not null','extra'=> 'auto_increment');
 		$sql = "create table ".$table."(";
-		$i=0;
-		foreach($fields as $field_name => $field_desc)
+		$i = 0;
+		foreach ($fields as $field_name => $field_desc)
 		{
 			$sqlfields[$i] = $field_name." ";
 			$sqlfields[$i]  .= $field_desc['type'];
-			if( preg_match("/^[^\s]/i",$field_desc['value']))
+			if (preg_match("/^[^\s]/i", $field_desc['value']))
 			$sqlfields[$i]  .= "(".$field_desc['value'].")";
-			else if( preg_match("/^[^\s]/i",$field_desc['attribute']))
+			else if (preg_match("/^[^\s]/i", $field_desc['attribute']))
 			$sqlfields[$i]  .= " ".$field_desc['attribute'];
-			else if( preg_match("/^[^\s]/i",$field_desc['default']))
+			else if (preg_match("/^[^\s]/i", $field_desc['default']))
 			{
-				if(preg_match("/null/i",$field_desc['default']))
+				if (preg_match("/null/i", $field_desc['default']))
 				$sqlfields[$i]  .= " default ".$field_desc['default'];
 				else
 				$sqlfields[$i]  .= " default '".$field_desc['default']."'";
 			}
-			else if( preg_match("/^[^\s]/i",$field_desc['null']))
+			else if (preg_match("/^[^\s]/i", $field_desc['null']))
 			$sqlfields[$i]  .= " ".$field_desc['null'];
 
-			else if( preg_match("/^[^\s]/i",$field_desc['extra']))
+			else if (preg_match("/^[^\s]/i", $field_desc['extra']))
 			$sqlfields[$i]  .= " ".$field_desc['extra'];
 			$i++;
 		}
-		if($primary_key != "")
+		if ($primary_key != "")
 		$pk = "primary key(".$primary_key.")";
 
-		if(is_array($unique_keys))
+		if (is_array($unique_keys))
 		{
 			$i = 0;
-			foreach($unique_keys as $key => $value)
+			foreach ($unique_keys as $key => $value)
 			{
 				$sqluq[$i] = "UNIQUE KEY '".$key."' ('".$value."')";
 				$i++;
 			}
 		}
-		if(is_array($keys))
+		if (is_array($keys))
 		{
 			$i = 0;
-			foreach($keys as $key => $value)
+			foreach ($keys as $key => $value)
 			{
 				$sqlk[$i] = "KEY ".$key." (".$value.")";
 				$i++;
 			}
 		}
-		$sql .= implode(',',$sqlfields);
-		if($primary_key != "")
+		$sql .= implode(',', $sqlfields);
+		if ($primary_key != "")
 		$sql .= ",".$pk;
-		if(is_array($unique_keys))
-		$sql .= ",".implode(',',$sqluq);
-		if(is_array($keys))
-		$sql .= ",".implode(',',$sqlk);
-		$sql .=") type=".$type;
-
-		dol_syslog($sql,LOG_DEBUG);
-		if(! $this->query($sql))
+		if (is_array($unique_keys))
+		$sql .= ",".implode(',', $sqluq);
+		if (is_array($keys))
+		$sql .= ",".implode(',', $sqlk);
+		$sql .= ") type=".$type;
+
+		dol_syslog($sql, LOG_DEBUG);
+		if (!$this->query($sql))
 		return -1;
 		else
 		return 1;
@@ -1043,7 +1043,7 @@ 
         // phpcs:enable
 		$sql = "DROP TABLE ".$table;
 
-		if (! $this->query($sql))
+		if (!$this->query($sql))
 			return -1;
 		else
 			return 1;
@@ -1059,15 +1059,15 @@ 
 	 *	@param	string	$dolibarr_main_db_name		Database name where user must be granted
 	 *	@return	int									<0 if KO, >=0 if OK
 	 */
-	function DDLCreateUser($dolibarr_main_db_host,$dolibarr_main_db_user,$dolibarr_main_db_pass,$dolibarr_main_db_name)
+	function DDLCreateUser($dolibarr_main_db_host, $dolibarr_main_db_user, $dolibarr_main_db_pass, $dolibarr_main_db_name)
 	{
         // phpcs:enable
 		// Note: using ' on user does not works with pgsql
 		$sql = "CREATE USER ".$this->escape($dolibarr_main_db_user)." with password '".$this->escape($dolibarr_main_db_pass)."'";
 
-		dol_syslog(get_class($this)."::DDLCreateUser", LOG_DEBUG);	// No sql to avoid password in log
-		$resql=$this->query($sql);
-		if (! $resql)
+		dol_syslog(get_class($this)."::DDLCreateUser", LOG_DEBUG); // No sql to avoid password in log
+		$resql = $this->query($sql);
+		if (!$resql)
 		{
 			return -1;
 		}
@@ -1083,14 +1083,14 @@ 
 	 *	@param	string		$field	Optionnel : Name of field if we want description of field
 	 *	@return	false|resource		Resultset x (x->attname)
 	 */
-	function DDLDescTable($table,$field="")
+	function DDLDescTable($table, $field = "")
 	{
         // phpcs:enable
-		$sql ="SELECT attname FROM pg_attribute, pg_type WHERE typname = '".$table."' AND attrelid = typrelid";
-		$sql.=" AND attname NOT IN ('cmin', 'cmax', 'ctid', 'oid', 'tableoid', 'xmin', 'xmax')";
-		if ($field) $sql.= " AND attname = '".$field."'";
+		$sql = "SELECT attname FROM pg_attribute, pg_type WHERE typname = '".$table."' AND attrelid = typrelid";
+		$sql .= " AND attname NOT IN ('cmin', 'cmax', 'ctid', 'oid', 'tableoid', 'xmin', 'xmax')";
+		if ($field) $sql .= " AND attname = '".$field."'";
 
-		dol_syslog($sql,LOG_DEBUG);
+		dol_syslog($sql, LOG_DEBUG);
 		$this->_results = $this->query($sql);
 		return $this->_results;
 	}
@@ -1105,33 +1105,33 @@ 
 	 *	@param	string	$field_position 	Optionnel ex.: "after champtruc"
 	 *	@return	int							<0 if KO, >0 if OK
 	 */
-	function DDLAddField($table,$field_name,$field_desc,$field_position="")
+	function DDLAddField($table, $field_name, $field_desc, $field_position = "")
 	{
         // phpcs:enable
 		// cles recherchees dans le tableau des descriptions (field_desc) : type,value,attribute,null,default,extra
 		// ex. : $field_desc = array('type'=>'int','value'=>'11','null'=>'not null','extra'=> 'auto_increment');
-		$sql= "ALTER TABLE ".$table." ADD ".$field_name." ";
+		$sql = "ALTER TABLE ".$table." ADD ".$field_name." ";
 		$sql .= $field_desc['type'];
-		if (preg_match("/^[^\s]/i",$field_desc['value']))
-		    if (! in_array($field_desc['type'],array('int','date','datetime')))
+		if (preg_match("/^[^\s]/i", $field_desc['value']))
+		    if (!in_array($field_desc['type'], array('int', 'date', 'datetime')))
 		    {
-		        $sql.= "(".$field_desc['value'].")";
+		        $sql .= "(".$field_desc['value'].")";
 		    }
-		if (preg_match("/^[^\s]/i",$field_desc['attribute']))
+		if (preg_match("/^[^\s]/i", $field_desc['attribute']))
             $sql .= " ".$field_desc['attribute'];
-		if (preg_match("/^[^\s]/i",$field_desc['null']))
+		if (preg_match("/^[^\s]/i", $field_desc['null']))
             $sql .= " ".$field_desc['null'];
-		if (preg_match("/^[^\s]/i",$field_desc['default']))
-            if (preg_match("/null/i",$field_desc['default']))
+		if (preg_match("/^[^\s]/i", $field_desc['default']))
+            if (preg_match("/null/i", $field_desc['default']))
                 $sql .= " default ".$field_desc['default'];
 		    else
                 $sql .= " default '".$field_desc['default']."'";
-		if (preg_match("/^[^\s]/i",$field_desc['extra']))
+		if (preg_match("/^[^\s]/i", $field_desc['extra']))
             $sql .= " ".$field_desc['extra'];
 		$sql .= " ".$field_position;
 
-		dol_syslog($sql,LOG_DEBUG);
-		if (! $this -> query($sql))
+		dol_syslog($sql, LOG_DEBUG);
+		if (!$this -> query($sql))
 			return -1;
 		return 1;
 	}
@@ -1145,13 +1145,13 @@ 
 	 *	@param	string	$field_desc 		Array with description of field format
 	 *	@return	int							<0 if KO, >0 if OK
 	 */
-	function DDLUpdateField($table,$field_name,$field_desc)
+	function DDLUpdateField($table, $field_name, $field_desc)
 	{
         // phpcs:enable
 		$sql = "ALTER TABLE ".$table;
 		$sql .= " MODIFY COLUMN ".$field_name." ".$field_desc['type'];
 		if ($field_desc['type'] == 'double' || $field_desc['type'] == 'tinyint' || $field_desc['type'] == 'int' || $field_desc['type'] == 'varchar') {
-			$sql.="(".$field_desc['value'].")";
+			$sql .= "(".$field_desc['value'].")";
 		}
 
 		if ($field_desc['null'] == 'not null' || $field_desc['null'] == 'NOT NULL')
@@ -1159,24 +1159,24 @@ 
         	// We will try to change format of column to NOT NULL. To be sure the ALTER works, we try to update fields that are NULL
         	if ($field_desc['type'] == 'varchar' || $field_desc['type'] == 'text')
         	{
-        		$sqlbis="UPDATE ".$table." SET ".$field_name." = '".$this->escape($field_desc['default'] ? $field_desc['default'] : '')."' WHERE ".$field_name." IS NULL";
+        		$sqlbis = "UPDATE ".$table." SET ".$field_name." = '".$this->escape($field_desc['default'] ? $field_desc['default'] : '')."' WHERE ".$field_name." IS NULL";
         		$this->query($sqlbis);
         	}
         	elseif ($field_desc['type'] == 'tinyint' || $field_desc['type'] == 'int')
         	{
-        		$sqlbis="UPDATE ".$table." SET ".$field_name." = ".((int) $this->escape($field_desc['default'] ? $field_desc['default'] : 0))." WHERE ".$field_name." IS NULL";
+        		$sqlbis = "UPDATE ".$table." SET ".$field_name." = ".((int) $this->escape($field_desc['default'] ? $field_desc['default'] : 0))." WHERE ".$field_name." IS NULL";
         		$this->query($sqlbis);
         	}
 		}
 
 		if ($field_desc['default'] != '')
 		{
-			if ($field_desc['type'] == 'double' || $field_desc['type'] == 'tinyint' || $field_desc['type'] == 'int') $sql.=" DEFAULT ".$this->escape($field_desc['default']);
-        	elseif ($field_desc['type'] == 'text') $sql.=" DEFAULT '".$this->escape($field_desc['default'])."'";							// Default not supported on text fields
+			if ($field_desc['type'] == 'double' || $field_desc['type'] == 'tinyint' || $field_desc['type'] == 'int') $sql .= " DEFAULT ".$this->escape($field_desc['default']);
+        	elseif ($field_desc['type'] == 'text') $sql .= " DEFAULT '".$this->escape($field_desc['default'])."'"; // Default not supported on text fields
 		}
 
-		dol_syslog($sql,LOG_DEBUG);
-		if (! $this->query($sql))
+		dol_syslog($sql, LOG_DEBUG);
+		if (!$this->query($sql))
 			return -1;
 		return 1;
 	}
@@ -1189,14 +1189,14 @@ 
 	 *	@param	string	$field_name 	Name of field to drop
 	 *	@return	int						<0 if KO, >0 if OK
 	 */
-	function DDLDropField($table,$field_name)
+	function DDLDropField($table, $field_name)
 	{
         // phpcs:enable
-		$sql= "ALTER TABLE ".$table." DROP COLUMN ".$field_name;
-		dol_syslog($sql,LOG_DEBUG);
-		if (! $this->query($sql))
+		$sql = "ALTER TABLE ".$table." DROP COLUMN ".$field_name;
+		dol_syslog($sql, LOG_DEBUG);
+		if (!$this->query($sql))
 		{
-			$this->error=$this->lasterror();
+			$this->error = $this->lasterror();
 			return -1;
 		}
 		return 1;
@@ -1209,10 +1209,10 @@ 
 	 */
 	function getDefaultCharacterSetDatabase()
 	{
-		$resql=$this->query('SHOW SERVER_ENCODING');
+		$resql = $this->query('SHOW SERVER_ENCODING');
 		if ($resql)
 		{
-            $liste=$this->fetch_array($resql);
+            $liste = $this->fetch_array($resql);
 		    return $liste['server_encoding'];
 		}
 		else return '';
@@ -1225,7 +1225,7 @@ 
 	 */
 	function getListOfCharacterSet()
 	{
-		$resql=$this->query('SHOW SERVER_ENCODING');
+		$resql = $this->query('SHOW SERVER_ENCODING');
 		$liste = array();
 		if ($resql)
 		{
@@ -1250,10 +1250,10 @@ 
 	 */
 	function getDefaultCollationDatabase()
 	{
-		$resql=$this->query('SHOW LC_COLLATE');
+		$resql = $this->query('SHOW LC_COLLATE');
 		if ($resql)
 		{
-		    $liste=$this->fetch_array($resql);
+		    $liste = $this->fetch_array($resql);
 			return $liste['lc_collate'];
 		}
 		else return '';
@@ -1266,12 +1266,12 @@ 
 	 */
 	function getListOfCollation()
 	{
-		$resql=$this->query('SHOW LC_COLLATE');
+		$resql = $this->query('SHOW LC_COLLATE');
 		$liste = array();
 		if ($resql)
 		{
 			$i = 0;
-			while ($obj = $this->fetch_object($resql) )
+			while ($obj = $this->fetch_object($resql))
 			{
 				$liste[$i]['collation'] = $obj->lc_collate;
 				$i++;
@@ -1290,21 +1290,21 @@ 
 	 */
 	function getPathOfDump()
 	{
-		$fullpathofdump='/pathtopgdump/pg_dump';
+		$fullpathofdump = '/pathtopgdump/pg_dump';
 
 		if (file_exists('/usr/bin/pg_dump'))
 		{
-		    $fullpathofdump='/usr/bin/pg_dump';
+		    $fullpathofdump = '/usr/bin/pg_dump';
 		}
 		else
 		{
             // TODO L'utilisateur de la base doit etre un superadmin pour lancer cette commande
-		    $resql=$this->query('SHOW data_directory');
+		    $resql = $this->query('SHOW data_directory');
     		if ($resql)
     		{
-    			$liste=$this->fetch_array($resql);
-    			$basedir=$liste['data_directory'];
-    			$fullpathofdump=preg_replace('/data$/','bin',$basedir).'/pg_dump';
+    			$liste = $this->fetch_array($resql);
+    			$basedir = $liste['data_directory'];
+    			$fullpathofdump = preg_replace('/data$/', 'bin', $basedir).'/pg_dump';
     		}
 		}
 
@@ -1319,23 +1319,23 @@ 
 	function getPathOfRestore()
 	{
 		//$tool='pg_restore';
-		$tool='psql';
+		$tool = 'psql';
 
-		$fullpathofdump='/pathtopgrestore/'.$tool;
+		$fullpathofdump = '/pathtopgrestore/'.$tool;
 
         if (file_exists('/usr/bin/'.$tool))
         {
-            $fullpathofdump='/usr/bin/'.$tool;
+            $fullpathofdump = '/usr/bin/'.$tool;
         }
         else
         {
             // TODO L'utilisateur de la base doit etre un superadmin pour lancer cette commande
-            $resql=$this->query('SHOW data_directory');
+            $resql = $this->query('SHOW data_directory');
             if ($resql)
             {
-                $liste=$this->fetch_array($resql);
-                $basedir=$liste['data_directory'];
-                $fullpathofdump=preg_replace('/data$/','bin',$basedir).'/'.$tool;
+                $liste = $this->fetch_array($resql);
+                $basedir = $liste['data_directory'];
+                $fullpathofdump = preg_replace('/data$/', 'bin', $basedir).'/'.$tool;
             }
         }
 
@@ -1348,16 +1348,16 @@ 
 	 * @param	string	$filter		Filter list on a particular value
 	 * @return	array				Array of key-values (key=>value)
 	 */
-	function getServerParametersValues($filter='')
+	function getServerParametersValues($filter = '')
 	{
-		$result=array();
+		$result = array();
 
-		$resql='select name,setting from pg_settings';
-		if ($filter) $resql.=" WHERE name = '".$this->escape($filter)."'";
-		$resql=$this->query($resql);
+		$resql = 'select name,setting from pg_settings';
+		if ($filter) $resql .= " WHERE name = '".$this->escape($filter)."'";
+		$resql = $this->query($resql);
 		if ($resql)
 		{
-			while ($obj=$this->fetch_object($resql)) $result[$obj->name]=$obj->setting;
+			while ($obj = $this->fetch_object($resql)) $result[$obj->name] = $obj->setting;
 		}
 
 		return $result;
@@ -1369,7 +1369,7 @@ 
 	 * @param	string	$filter		Filter list on a particular value
 	 * @return  array				Array of key-values (key=>value)
 	 */
-	function getServerStatusValues($filter='')
+	function getServerStatusValues($filter = '')
 	{
 		/* This is to return current running requests.
 		$sql='SELECT datname,procpid,current_query FROM pg_stat_activity ORDER BY procpid';

dolibarr/htdocs/core/db/sqlite3.class.php

Indentation +135 added lines, -135 removed lines

@@ -38,8 +38,8 @@ 
     const LABEL='Sqlite3';
     //! Version min database
     const VERSIONMIN='3.0.0';
-	/** @var SQLite3Result Resultset of last query */
-	private $_results;
+    /** @var SQLite3Result Resultset of last query */
+    private $_results;
 
     const WEEK_MONDAY_FIRST=1;
     const WEEK_YEAR = 2;
@@ -47,15 +47,15 @@ 
 
 
     /**
-	 *	Constructor.
-	 *	This create an opened connexion to a database server and eventually to a database
+     *	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
+     *	@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)
     {
@@ -149,9 +149,9 @@ 
         {
             if ($type == 'auto')
             {
-              if (preg_match('/ALTER TABLE/i',$line)) $type='dml';
-              else if (preg_match('/CREATE TABLE/i',$line)) $type='dml';
-              else if (preg_match('/DROP TABLE/i',$line)) $type='dml';
+                if (preg_match('/ALTER TABLE/i',$line)) $type='dml';
+                else if (preg_match('/CREATE TABLE/i',$line)) $type='dml';
+                else if (preg_match('/DROP TABLE/i',$line)) $type='dml';
             }
 
             if ($type == 'dml')
@@ -271,7 +271,7 @@ 
             // DELETE FROM tabletodelete USING tabletodelete, othertable -> DELETE FROM tabletodelete USING othertable
             if (preg_match('/DELETE FROM ([a-z_]+) USING ([a-z_]+), ([a-z_]+)/i',$line,$reg))
             {
-				if ($reg[1] == $reg[2])	// If same table, we remove second one
+                if ($reg[1] == $reg[2])	// If same table, we remove second one
                 {
                     $line=preg_replace('/DELETE FROM ([a-z_]+) USING ([a-z_]+), ([a-z_]+)/i','DELETE FROM \\1 USING \\3', $line);
                 }
@@ -297,10 +297,10 @@ 
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
     /**
-	 *	Select a database
+     *	Select a database
      *
-	 *	@param	    string	$database	Name of database
-	 *	@return	    boolean  		    true if OK, false if KO
+     *	@param	    string	$database	Name of database
+     *	@return	    boolean  		    true if OK, false if KO
      */
     function select_db($database)
     {
@@ -313,15 +313,15 @@ 
 
 
     /**
-	 *	Connexion to server
+     *	Connexion to server
      *
-	 *	@param	    string	$host		database server host
-	 *	@param	    string	$login		login
-	 *	@param	    string	$passwd		password
-	 *	@param		string	$name		name of database (not used for mysql, used for pgsql)
-	 *	@param		integer	$port		Port of database server
-	 *	@return		SQLite3				Database access handler
-	 *	@see		close
+     *	@param	    string	$host		database server host
+     *	@param	    string	$login		login
+     *	@param	    string	$passwd		password
+     *	@param		string	$name		name of database (not used for mysql, used for pgsql)
+     *	@param		integer	$port		Port of database server
+     *	@return		SQLite3				Database access handler
+     *	@see		close
      */
     function connect($host, $login, $passwd, $name, $port=0)
     {
@@ -337,7 +337,7 @@ 
         try {
             /*** connect to SQLite database ***/
             //$this->db = new PDO("sqlite:".$dir.'/database_'.$name.'.sdb');
-			$this->db = new SQLite3($database_name);
+            $this->db = new SQLite3($database_name);
             //$this->db->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_EXCEPTION);
         }
         catch(Exception $e)
@@ -352,13 +352,13 @@ 
 
 
     /**
-	 *	Return version of database server
+     *	Return version of database server
      *
-	 *	@return	        string      Version string
+     *	@return	        string      Version string
      */
     function getVersion()
     {
-    	$tmp=$this->db->version();
+        $tmp=$this->db->version();
         return $tmp['versionString'];
     }
 
@@ -507,7 +507,7 @@ 
         if ($ret) {
             return (object) $ret;
         }
-		return false;
+        return false;
     }
 
 
@@ -525,7 +525,7 @@ 
         if (! is_object($resultset)) { $resultset=$this->_results; }
         //return $resultset->fetch(PDO::FETCH_ASSOC);
         $ret = $resultset->fetchArray(SQLITE3_ASSOC);
-	    return $ret;
+        return $ret;
     }
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
@@ -597,10 +597,10 @@ 
 
 
     /**
-	 *	Free last resultset used.
+     *	Free last resultset used.
      *
-	 *	@param  SQLite3Result	$resultset   Curseur de la requete voulue
-	 *	@return	void
+     *	@param  SQLite3Result	$resultset   Curseur de la requete voulue
+     *	@return	void
      */
     function free($resultset=null)
     {
@@ -611,10 +611,10 @@ 
     }
 
     /**
-	 *	Escape a string to insert data
+     *	Escape a string to insert data
      *
-	 *  @param	string	$stringtoencode		String to escape
-	 *  @return	string						String escaped
+     *  @param	string	$stringtoencode		String to escape
+     *  @return	string						String escaped
      */
     function escape($stringtoencode)
     {
@@ -667,7 +667,7 @@ 
                 return $errorcode_map[$this->db->errorCode()];
             }*/
             $errno=$this->db->lastErrorCode();
-			if ($errno=='HY000' || $errno == 0)
+            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';
@@ -706,9 +706,9 @@ 
     /**
      * 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
+     * @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')
     {
@@ -789,7 +789,7 @@ 
     /**
      * Return connexion ID
      *
-	 * @return	        string      Id connexion
+     * @return	        string      Id connexion
      */
     function DDLGetConnectId()
     {
@@ -800,15 +800,15 @@ 
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
     /**
-	 *	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
+     *	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
+     *	@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='')
     {
@@ -836,9 +836,9 @@ 
     /**
      *  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
+     *  @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='')
     {
@@ -864,9 +864,9 @@ 
     /**
      *  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
+     *	@param	string	$table		Name of table
+     *	@return	array				Tableau des informations des champs de la table
+     *	TODO modify for sqlite
      */
     function DDLInfoTable($table)
     {
@@ -889,16 +889,16 @@ 
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
     /**
-	 *	Create a table into database
+     *	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
-	 *	@param	    string	$type 			Type de la table
-	 *	@param	    array	$unique_keys 	Tableau associatifs Nom de champs qui seront clef unique => valeur
-	 *	@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
+     *	@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
+     *	@param	    string	$type 			Type de la table
+     *	@param	    array	$unique_keys 	Tableau associatifs Nom de champs qui seront clef unique => valeur
+     *	@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)
     {
@@ -977,21 +977,21 @@ 
     function DDLDropTable($table)
     {
         // phpcs:enable
-    	$sql = "DROP TABLE ".$table;
+        $sql = "DROP TABLE ".$table;
 
-    	if (! $this->query($sql))
-    		return -1;
-    	else
-    		return 1;
+        if (! $this->query($sql))
+            return -1;
+        else
+            return 1;
     }
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
     /**
-	 *	Return a pointer of line with description of a table or field
+     *	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
+     *	@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="")
     {
@@ -1005,13 +1005,13 @@ 
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
     /**
-	 *	Create a new field into table
+     *	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
+     *	@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="")
     {
@@ -1050,12 +1050,12 @@ 
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
     /**
-	 *	Update format of a field into a table
+     *	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
+     *	@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)
     {
@@ -1074,11 +1074,11 @@ 
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
     /**
-	 *	Drop a field from table
+     *	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
+     *	@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)
     {
@@ -1098,11 +1098,11 @@ 
     /**
      * 	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
+     *	@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)
     {
@@ -1143,9 +1143,9 @@ 
     }
 
     /**
-	 *	Return charset used to store data in database
+     *	Return charset used to store data in database
      *
-	 *	@return		string		Charset
+     *	@return		string		Charset
      */
     function getDefaultCharacterSetDatabase()
     {
@@ -1153,9 +1153,9 @@ 
     }
 
     /**
-	 *	Return list of available charset that can be used to store data in database
+     *	Return list of available charset that can be used to store data in database
      *
-	 *	@return		array		List of Charset
+     *	@return		array		List of Charset
      */
     function getListOfCharacterSet()
     {
@@ -1167,9 +1167,9 @@ 
     }
 
     /**
-	 *	Return collation used in database
+     *	Return collation used in database
      *
-	 *	@return		string		Collation value
+     *	@return		string		Collation value
      */
     function getDefaultCollationDatabase()
     {
@@ -1177,9 +1177,9 @@ 
     }
 
     /**
-	 *	Return list of available collation that can be used for database
+     *	Return list of available collation that can be used for database
      *
-	 *	@return		array		List of Collation
+     *	@return		array		List of Collation
      */
     function getListOfCollation()
     {
@@ -1191,13 +1191,13 @@ 
     }
 
     /**
-	 *	Return full path of dump program
+     *	Return full path of dump program
      *
-	 *	@return		string		Full path of dump program
+     *	@return		string		Full path of dump program
      */
     function getPathOfDump()
     {
-	    // FIXME: not for SQLite
+        // FIXME: not for SQLite
         $fullpathofdump='/pathtomysqldump/mysqldump';
 
         $resql=$this->query('SHOW VARIABLES LIKE \'basedir\'');
@@ -1211,13 +1211,13 @@ 
     }
 
     /**
-	 *	Return full path of restore program
+     *	Return full path of restore program
      *
-	 *	@return		string		Full path of restore program
+     *	@return		string		Full path of restore program
      */
     function getPathOfRestore()
     {
-	    // FIXME: not for SQLite
+        // FIXME: not for SQLite
         $fullpathofimport='/pathtomysql/mysql';
 
         $resql=$this->query('SHOW VARIABLES LIKE \'basedir\'');
@@ -1233,8 +1233,8 @@ 
     /**
      * Return value of server parameters
      *
-	 * @param	string	$filter		Filter list on a particular value
-	 * @return	array				Array of key-values (key=>value)
+     * @param	string	$filter		Filter list on a particular value
+     * @return	array				Array of key-values (key=>value)
      */
     function getServerParametersValues($filter='')
     {
@@ -1247,7 +1247,7 @@ 
             $pragmas = array(
                 'application_id', 'auto_vacuum', 'automatic_index', 'busy_timeout', 'cache_size',
                 'cache_spill', 'case_sensitive_like', 'checkpoint_fullsync', 'collation_list',
-				'compile_options', 'data_version',	/*'database_list',*/
+                'compile_options', 'data_version',	/*'database_list',*/
                 'defer_foreign_keys', 'encoding', 'foreign_key_check', 'freelist_count',
                 'full_column_names', 'fullsync', 'ingore_check_constraints', 'integrity_check',
                 'journal_mode', 'journal_size_limit', 'legacy_file_format', 'locking_mode',
@@ -1282,8 +1282,8 @@ 
     /**
      * Return value of server status
      *
-	 * @param	string	$filter		Filter list on a particular value
-	 * @return  array				Array of key-values (key=>value)
+     * @param	string	$filter		Filter list on a particular value
+     * @return  array				Array of key-values (key=>value)
      */
     function getServerStatusValues($filter='')
     {
@@ -1314,7 +1314,7 @@ 
     {
         if ($this->db)
         {
-        	$newname=preg_replace('/_/','',$name);
+            $newname=preg_replace('/_/','',$name);
             $localname = __CLASS__ . '::' . 'db' . $newname;
             $reflectClass = new ReflectionClass(__CLASS__);
             $reflectFunction = $reflectClass->getMethod('db' . $newname);
@@ -1381,16 +1381,16 @@ 
     }
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-	/**
-	 * calc_week
-	 *
-	 * @param 	string	$year				Year
-	 * @param 	string	$month				Month
-	 * @param 	string	$day				Day
-	 * @param 	string	$week_behaviour		Week behaviour
-	 * @param 	string	$calc_year			???
-	 * @return	string						???
-	 */
+    /**
+     * calc_week
+     *
+     * @param 	string	$year				Year
+     * @param 	string	$month				Month
+     * @param 	string	$day				Day
+     * @param 	string	$week_behaviour		Week behaviour
+     * @param 	string	$calc_year			???
+     * @return	string						???
+     */
     private static function calc_week($year, $month, $day, $week_behaviour, &$calc_year)
     {
         // phpcs:enable
@@ -1411,24 +1411,24 @@ 
             $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)) {
+        if (($first_weekday && $weekday != 0) || (!$first_weekday && $weekday >= 4)) {
         $days= $daynr - ($first_daynr+ (7-$weekday));
-      }
-      else {
+        }
+        else {
         $days= $daynr - ($first_daynr - $weekday);
-      }
+        }
 
-      if ($week_year && $days >= 52*7)
-      {
+        if ($week_year && $days >= 52*7)
+        {
         $weekday= ($weekday + self::calc_days_in_year($calc_year)) % 7;
         if ((!$first_weekday && $weekday < 4) || ($first_weekday && $weekday == 0))
         {
-          $calc_year++;
-          return 1;
+            $calc_year++;
+            return 1;
+        }
         }
-      }
-      return floor($days/7+1);
+        return floor($days/7+1);
     }
 }

Braces +117 added lines, -84 removed lines

@@ -62,8 +62,12 @@ 
         global $conf;
 
         // Note that having "static" property for "$forcecharset" and "$forcecollate" will make error here in strict mode, so they are not static
-        if (! empty($conf->db->character_set)) $this->forcecharset=$conf->db->character_set;
-        if (! empty($conf->db->dolibarr_main_db_collation)) $this->forcecollate=$conf->db->dolibarr_main_db_collation;
+        if (! empty($conf->db->character_set)) {
+            $this->forcecharset=$conf->db->character_set;
+        }
+        if (! empty($conf->db->dolibarr_main_db_collation)) {
+            $this->forcecollate=$conf->db->dolibarr_main_db_collation;
+        }
 
         $this->database_user=$user;
         $this->database_host=$host;
@@ -111,8 +115,7 @@ 
             $this->addCustomFunction('WEEKDAY');
             $this->addCustomFunction('date_format');
             //$this->db->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_EXCEPTION);
-        }
-        else
+        } else
         {
             // host, login ou password incorrect
             $this->connected = false;
@@ -149,9 +152,13 @@ 
         {
             if ($type == 'auto')
             {
-              if (preg_match('/ALTER TABLE/i',$line)) $type='dml';
-              else if (preg_match('/CREATE TABLE/i',$line)) $type='dml';
-              else if (preg_match('/DROP TABLE/i',$line)) $type='dml';
+              if (preg_match('/ALTER TABLE/i',$line)) {
+                  $type='dml';
+              } else if (preg_match('/CREATE TABLE/i',$line)) {
+                  $type='dml';
+              } else if (preg_match('/DROP TABLE/i',$line)) {
+                  $type='dml';
+              }
             }
 
             if ($type == 'dml')
@@ -271,9 +278,11 @@ 
             // DELETE FROM tabletodelete USING tabletodelete, othertable -> DELETE FROM tabletodelete USING othertable
             if (preg_match('/DELETE FROM ([a-z_]+) USING ([a-z_]+), ([a-z_]+)/i',$line,$reg))
             {
-				if ($reg[1] == $reg[2])	// If same table, we remove second one
+				if ($reg[1] == $reg[2]) {
+				    // If same table, we remove second one
                 {
                     $line=preg_replace('/DELETE FROM ([a-z_]+) USING ([a-z_]+), ([a-z_]+)/i','DELETE FROM \\1 USING \\3', $line);
+				}
                 }
             }
 
@@ -330,7 +339,9 @@ 
         dol_syslog(get_class($this)."::connect name=".$name,LOG_DEBUG);
 
         $dir=$main_data_dir;
-        if (empty($dir)) $dir=DOL_DATA_ROOT;
+        if (empty($dir)) {
+            $dir=DOL_DATA_ROOT;
+        }
         // With sqlite, port must be in connect parameters
         //if (! $newport) $newport=3306;
         $database_name = $dir.'/database_'.$name.'.sdb';
@@ -339,8 +350,7 @@ 
             //$this->db = new PDO("sqlite:".$dir.'/database_'.$name.'.sdb');
 			$this->db = new SQLite3($database_name);
             //$this->db->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_EXCEPTION);
-        }
-        catch(Exception $e)
+        } catch(Exception $e)
         {
             $this->error=  self::LABEL.' '.$e->getMessage().' current dir='.$database_name;
             return '';
@@ -383,7 +393,9 @@ 
     {
         if ($this->db)
         {
-            if ($this->transaction_opened > 0) dol_syslog(get_class($this)."::close Closing a connection with an opened transaction depth=".$this->transaction_opened,LOG_ERR);
+            if ($this->transaction_opened > 0) {
+                dol_syslog(get_class($this)."::close Closing a connection with an opened transaction depth=".$this->transaction_opened,LOG_ERR);
+            }
             $this->connected=false;
             $this->db->close();
             unset($this->db);    // Clean this->db
@@ -458,8 +470,7 @@ 
             if ($ret) {
                 $ret->queryString = $query;
             }
-        }
-        catch(Exception $e)
+        } catch(Exception $e)
         {
             $this->error=$this->db->lastErrorMsg();
         }
@@ -543,8 +554,7 @@ 
         {
             if (! is_object($resultset)) { $resultset=$this->_results; }
             return $resultset->fetchArray(SQLITE3_NUM);
-        }
-        else
+        } else
         {
             // si le curseur est un booleen on retourne la valeur 0
             return false;
@@ -607,7 +617,9 @@ 
         // If resultset not provided, we take the last used by connexion
         if (! is_object($resultset)) { $resultset=$this->_results; }
         // Si resultset en est un, on libere la memoire
-        if ($resultset && is_object($resultset)) $resultset->finalize();
+        if ($resultset && is_object($resultset)) {
+            $resultset->finalize();
+        }
     }
 
     /**
@@ -631,8 +643,7 @@ 
         if (! $this->connected) {
             // Si il y a eu echec de connexion, $this->db n'est pas valide.
             return 'DB_ERROR_FAILED_TO_CONNECT';
-        }
-        else {
+        } else {
             // Constants to convert error code to a generic Dolibarr error code
             /*$errorcode_map = array(
             1004 => 'DB_ERROR_CANNOT_CREATE',
@@ -669,14 +680,21 @@ 
             $errno=$this->db->lastErrorCode();
 			if ($errno=='HY000' || $errno == 0)
             {
-                if (preg_match('/table.*already exists/i',$this->error))     return 'DB_ERROR_TABLE_ALREADY_EXISTS';
-                elseif (preg_match('/index.*already exists/i',$this->error)) return 'DB_ERROR_KEY_NAME_ALREADY_EXISTS';
-                elseif (preg_match('/syntax error/i',$this->error))          return 'DB_ERROR_SYNTAX';
+                if (preg_match('/table.*already exists/i',$this->error)) {
+                    return 'DB_ERROR_TABLE_ALREADY_EXISTS';
+                } elseif (preg_match('/index.*already exists/i',$this->error)) {
+                    return 'DB_ERROR_KEY_NAME_ALREADY_EXISTS';
+                } elseif (preg_match('/syntax error/i',$this->error)) {
+                    return 'DB_ERROR_SYNTAX';
+                }
             }
             if ($errno=='23000')
             {
-                if (preg_match('/column.* not unique/i',$this->error))       return 'DB_ERROR_RECORD_ALREADY_EXISTS';
-                elseif (preg_match('/PRIMARY KEY must be unique/i',$this->error)) return 'DB_ERROR_RECORD_ALREADY_EXISTS';
+                if (preg_match('/column.* not unique/i',$this->error)) {
+                    return 'DB_ERROR_RECORD_ALREADY_EXISTS';
+                } elseif (preg_match('/PRIMARY KEY must be unique/i',$this->error)) {
+                    return 'DB_ERROR_RECORD_ALREADY_EXISTS';
+                }
             }
             if ($errno > 1) {
                 // TODO Voir la liste des messages d'erreur
@@ -696,8 +714,7 @@ 
         if (! $this->connected) {
             // Si il y a eu echec de connexion, $this->db n'est pas valide pour sqlite_error.
             return 'Not connected. Check setup parameters in conf/conf.php file and your sqlite version';
-        }
-        else {
+        } else {
             return $this->error;
         }
     }
@@ -741,8 +758,7 @@ 
             if ($cryptType == 2)
             {
                 $return = 'AES_ENCRYPT('.$return.',\''.$cryptKey.'\')';
-            }
-            else if ($cryptType == 1)
+            } else if ($cryptType == 1)
             {
                 $return = 'DES_ENCRYPT('.$return.',\''.$cryptKey.'\')';
             }
@@ -774,8 +790,7 @@ 
             if ($cryptType == 2)
             {
                 $return = 'AES_DECRYPT('.$value.',\''.$cryptKey.'\')';
-            }
-            else if ($cryptType == 1)
+            } else if ($cryptType == 1)
             {
                 $return = 'DES_DECRYPT('.$value.',\''.$cryptKey.'\')';
             }
@@ -813,8 +828,12 @@ 
     function DDLCreateDb($database,$charset='',$collation='',$owner='')
     {
         // phpcs:enable
-        if (empty($charset))   $charset=$this->forcecharset;
-        if (empty($collation)) $collation=$this->forcecollate;
+        if (empty($charset)) {
+            $charset=$this->forcecharset;
+        }
+        if (empty($collation)) {
+            $collation=$this->forcecollate;
+        }
 
         // ALTER DATABASE dolibarr_db DEFAULT CHARACTER SET latin DEFAULT COLLATE latin1_swedish_ci
         $sql = 'CREATE DATABASE '.$database;
@@ -846,7 +865,9 @@ 
         $listtables=array();
 
         $like = '';
-        if ($table) $like = "LIKE '".$table."'";
+        if ($table) {
+            $like = "LIKE '".$table."'";
+        }
         $sql="SHOW TABLES FROM ".$database." ".$like.";";
         //print $sql;
         $result = $this->query($sql);
@@ -913,26 +934,27 @@ 
         {
             $sqlfields[$i] = $field_name." ";
             $sqlfields[$i]  .= $field_desc['type'];
-            if( preg_match("/^[^\s]/i",$field_desc['value']))
-            $sqlfields[$i]  .= "(".$field_desc['value'].")";
-            else if( preg_match("/^[^\s]/i",$field_desc['attribute']))
-            $sqlfields[$i]  .= " ".$field_desc['attribute'];
-            else if( preg_match("/^[^\s]/i",$field_desc['default']))
+            if( preg_match("/^[^\s]/i",$field_desc['value'])) {
+                        $sqlfields[$i]  .= "(".$field_desc['value'].")";
+            } else if( preg_match("/^[^\s]/i",$field_desc['attribute'])) {
+                        $sqlfields[$i]  .= " ".$field_desc['attribute'];
+            } else if( preg_match("/^[^\s]/i",$field_desc['default']))
             {
-                if(preg_match("/null/i",$field_desc['default']))
-                $sqlfields[$i]  .= " default ".$field_desc['default'];
-                else
-                $sqlfields[$i]  .= " default '".$field_desc['default']."'";
+                if(preg_match("/null/i",$field_desc['default'])) {
+                                $sqlfields[$i]  .= " default ".$field_desc['default'];
+                } else {
+                                $sqlfields[$i]  .= " default '".$field_desc['default']."'";
+                }
+            } else if( preg_match("/^[^\s]/i",$field_desc['null'])) {
+                        $sqlfields[$i]  .= " ".$field_desc['null'];
+            } else if( preg_match("/^[^\s]/i",$field_desc['extra'])) {
+                        $sqlfields[$i]  .= " ".$field_desc['extra'];
             }
-            else if( preg_match("/^[^\s]/i",$field_desc['null']))
-            $sqlfields[$i]  .= " ".$field_desc['null'];
-
-            else if( preg_match("/^[^\s]/i",$field_desc['extra']))
-            $sqlfields[$i]  .= " ".$field_desc['extra'];
             $i++;
         }
-        if($primary_key != "")
-        $pk = "primary key(".$primary_key.")";
+        if($primary_key != "") {
+                $pk = "primary key(".$primary_key.")";
+        }
 
         if(is_array($unique_keys))
         {
@@ -953,17 +975,21 @@ 
             }
         }
         $sql .= implode(',',$sqlfields);
-        if($primary_key != "")
-        $sql .= ",".$pk;
-        if(is_array($unique_keys))
-        $sql .= ",".implode(',',$sqluq);
-        if(is_array($keys))
-        $sql .= ",".implode(',',$sqlk);
+        if($primary_key != "") {
+                $sql .= ",".$pk;
+        }
+        if(is_array($unique_keys)) {
+                $sql .= ",".implode(',',$sqluq);
+        }
+        if(is_array($keys)) {
+                $sql .= ",".implode(',',$sqlk);
+        }
         $sql .=") type=".$type;
 
         dol_syslog($sql,LOG_DEBUG);
-        if(! $this -> query($sql))
-            return -1;
+        if(! $this -> query($sql)) {
+                    return -1;
+        }
         return 1;
     }
 
@@ -979,10 +1005,11 @@ 
         // phpcs:enable
     	$sql = "DROP TABLE ".$table;
 
-    	if (! $this->query($sql))
-    		return -1;
-    	else
-    		return 1;
+    	if (! $this->query($sql)) {
+    	    		return -1;
+    	} else {
+    	    		return 1;
+    	}
     }
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
@@ -1020,24 +1047,29 @@ 
         // ex. : $field_desc = array('type'=>'int','value'=>'11','null'=>'not null','extra'=> 'auto_increment');
         $sql= "ALTER TABLE ".$table." ADD ".$field_name." ";
         $sql.= $field_desc['type'];
-        if(preg_match("/^[^\s]/i",$field_desc['value']))
-        if (! in_array($field_desc['type'],array('date','datetime')))
+        if(preg_match("/^[^\s]/i",$field_desc['value'])) {
+                if (! in_array($field_desc['type'],array('date','datetime')))
         {
             $sql.= "(".$field_desc['value'].")";
         }
-        if(preg_match("/^[^\s]/i",$field_desc['attribute']))
-        $sql.= " ".$field_desc['attribute'];
-        if(preg_match("/^[^\s]/i",$field_desc['null']))
-        $sql.= " ".$field_desc['null'];
+        }
+        if(preg_match("/^[^\s]/i",$field_desc['attribute'])) {
+                $sql.= " ".$field_desc['attribute'];
+        }
+        if(preg_match("/^[^\s]/i",$field_desc['null'])) {
+                $sql.= " ".$field_desc['null'];
+        }
         if(preg_match("/^[^\s]/i",$field_desc['default']))
         {
-            if(preg_match("/null/i",$field_desc['default']))
-            $sql.= " default ".$field_desc['default'];
-            else
-            $sql.= " default '".$field_desc['default']."'";
+            if(preg_match("/null/i",$field_desc['default'])) {
+                        $sql.= " default ".$field_desc['default'];
+            } else {
+                        $sql.= " default '".$field_desc['default']."'";
+            }
+        }
+        if(preg_match("/^[^\s]/i",$field_desc['extra'])) {
+                $sql.= " ".$field_desc['extra'];
         }
-        if(preg_match("/^[^\s]/i",$field_desc['extra']))
-        $sql.= " ".$field_desc['extra'];
         $sql.= " ".$field_position;
 
         dol_syslog(get_class($this)."::DDLAddField ".$sql,LOG_DEBUG);
@@ -1067,8 +1099,9 @@ 
         }
 
         dol_syslog(get_class($this)."::DDLUpdateField ".$sql,LOG_DEBUG);
-        if (! $this->query($sql))
-            return -1;
+        if (! $this->query($sql)) {
+                    return -1;
+        }
         return 1;
     }
 
@@ -1270,8 +1303,7 @@ 
                 $obj = $this->fetch_row($resql);
                 //dol_syslog(get_class($this)."::select_db getServerParametersValues $var=". print_r($obj, true), LOG_DEBUG);
                 $result[$var] = $obj[0];
-            }
-            else {
+            } else {
                 // TODO Récupérer le message
                 $result[$var] = 'FAIL';
             }
@@ -1341,11 +1373,12 @@ 
     {
         // phpcs:enable
         $y = $year;
-        if ($y == 0 && $month == 0) return 0;
+        if ($y == 0 && $month == 0) {
+            return 0;
+        }
         $num = (365* $y + 31 * ($month - 1) + $day);
         if ($month <= 2) {
-            $y--; }
-        else {
+            $y--; } else {
             $num -= floor(($month * 4 + 23) / 10);
         }
         $temp = floor(($y / 100 + 1) * 3 / 4);
@@ -1405,8 +1438,9 @@ 
 
         if ($month == 1 && $day <= 7-$weekday)
         {
-            if (!$week_year && (($first_weekday && $weekday != 0) || (!$first_weekday && $weekday >= 4)))
-                return 0;
+            if (!$week_year && (($first_weekday && $weekday != 0) || (!$first_weekday && $weekday >= 4))) {
+                            return 0;
+            }
             $week_year= 1;
             $calc_year--;
             $first_daynr-= ($days=self::calc_days_in_year($calc_year));
@@ -1415,8 +1449,7 @@ 
 
       if (($first_weekday && $weekday != 0) || (!$first_weekday && $weekday >= 4)) {
         $days= $daynr - ($first_daynr+ (7-$weekday));
-      }
-      else {
+      } else {
         $days= $daynr - ($first_daynr - $weekday);
       }
 

Spacing +253 added lines, -253 removed lines

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

dolibarr/htdocs/core/get_info.php

Indentation +28 added lines, -28 removed lines

@@ -66,12 +66,12 @@ 
 $appli=constant('DOL_APPLICATION_TITLE');
 if (! empty($conf->global->MAIN_APPLICATION_TITLE))
 {
-	$appli=$conf->global->MAIN_APPLICATION_TITLE;
-	if (preg_match('/\d\.\d/', $appli))
-	{
-		if (! preg_match('/'.preg_quote(DOL_VERSION).'/', $appli)) $appli.=" (".DOL_VERSION.")";	// If new title contains a version that is different than core
-	}
-	else $appli.=" ".DOL_VERSION;
+    $appli=$conf->global->MAIN_APPLICATION_TITLE;
+    if (preg_match('/\d\.\d/', $appli))
+    {
+        if (! preg_match('/'.preg_quote(DOL_VERSION).'/', $appli)) $appli.=" (".DOL_VERSION.")";	// If new title contains a version that is different than core
+    }
+    else $appli.=" ".DOL_VERSION;
 }
 else $appli.=" ".DOL_VERSION;
 
@@ -80,21 +80,21 @@ 
 $logouttext='';
 if (empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER))
 {
-	//$logouthtmltext=$appli.'<br>';
-	if ($_SESSION["dol_authmode"] != 'forceuser' && $_SESSION["dol_authmode"] != 'http')
-	{
-		$logouthtmltext.=$langs->trans("Logout").'<br>';
-
-		$logouttext .='<a href="'.DOL_URL_ROOT.'/user/logout.php">';
-		//$logouttext .= img_picto($langs->trans('Logout').":".$langs->trans('Logout'), 'logout_top.png', 'class="login"', 0, 0, 1);
-		$logouttext .='<span class="fa fa-sign-out atoplogin"></span>';
-		$logouttext .='</a>';
-	}
-	else
-	{
-		$logouthtmltext.=$langs->trans("NoLogoutProcessWithAuthMode",$_SESSION["dol_authmode"]);
-		$logouttext .= img_picto($langs->trans('Logout').":".$langs->trans('Logout'), 'logout_top.png', 'class="login"', 0, 0, 1);
-	}
+    //$logouthtmltext=$appli.'<br>';
+    if ($_SESSION["dol_authmode"] != 'forceuser' && $_SESSION["dol_authmode"] != 'http')
+    {
+        $logouthtmltext.=$langs->trans("Logout").'<br>';
+
+        $logouttext .='<a href="'.DOL_URL_ROOT.'/user/logout.php">';
+        //$logouttext .= img_picto($langs->trans('Logout').":".$langs->trans('Logout'), 'logout_top.png', 'class="login"', 0, 0, 1);
+        $logouttext .='<span class="fa fa-sign-out atoplogin"></span>';
+        $logouttext .='</a>';
+    }
+    else
+    {
+        $logouthtmltext.=$langs->trans("NoLogoutProcessWithAuthMode",$_SESSION["dol_authmode"]);
+        $logouttext .= img_picto($langs->trans('Logout').":".$langs->trans('Logout'), 'logout_top.png', 'class="login"', 0, 0, 1);
+    }
 }
 
 print '<div class="login_block_getinfo">'."\n";
@@ -117,19 +117,19 @@ 
 $result=$hookmanager->executeHooks('printTopRightMenu',$parameters);    // Note that $action and $object may have been modified by some hooks
 if (is_numeric($result))
 {
-	if (empty($result)) $toprightmenu.=$hookmanager->resPrint;		// add
-	else  $toprightmenu=$hookmanager->resPrint;						// replace
+    if (empty($result)) $toprightmenu.=$hookmanager->resPrint;		// add
+    else  $toprightmenu=$hookmanager->resPrint;						// replace
 }
 else $toprightmenu.=$result;	// For backward compatibility
 
 // Link to module builder
 if (! empty($conf->modulebuilder->enabled))
 {
-	$text ='<a href="'.DOL_URL_ROOT.'/modulebuilder/index.php?mainmenu=home&leftmenu=admintools" target="_modulebuilder">';
-	//$text.= img_picto(":".$langs->trans("ModuleBuilder"), 'printer_top.png', 'class="printer"');
-	$text.='<span class="fa fa-bug atoplogin"></span>';
-	$text.='</a>';
-	$toprightmenu.=@Form::textwithtooltip('',$langs->trans("ModuleBuilder"),2,1,$text,'login_block_elem',2);
+    $text ='<a href="'.DOL_URL_ROOT.'/modulebuilder/index.php?mainmenu=home&leftmenu=admintools" target="_modulebuilder">';
+    //$text.= img_picto(":".$langs->trans("ModuleBuilder"), 'printer_top.png', 'class="printer"');
+    $text.='<span class="fa fa-bug atoplogin"></span>';
+    $text.='</a>';
+    $toprightmenu.=@Form::textwithtooltip('',$langs->trans("ModuleBuilder"),2,1,$text,'login_block_elem',2);
 }
 
 // Link to print main content area

Spacing +44 added lines, -44 removed lines

@@ -27,31 +27,31 @@ 
 //if (! defined('NOREQUIREDB'))   define('NOREQUIREDB','1');		// Not disabled cause need to load personalized language
 //if (! defined('NOREQUIRESOC'))    define('NOREQUIRESOC','1');
 //if (! defined('NOREQUIRETRAN')) define('NOREQUIRETRAN','1');		// Not disabled cause need to do translations
-if (! defined('NOCSRFCHECK'))     define('NOCSRFCHECK',1);
-if (! defined('NOTOKENRENEWAL'))  define('NOTOKENRENEWAL',1);
+if (!defined('NOCSRFCHECK'))     define('NOCSRFCHECK', 1);
+if (!defined('NOTOKENRENEWAL'))  define('NOTOKENRENEWAL', 1);
 //if (! defined('NOLOGIN')) define('NOLOGIN',1);					// Not disabled cause need to load personalized language
-if (! defined('NOREQUIREMENU'))  define('NOREQUIREMENU',1);
+if (!defined('NOREQUIREMENU'))  define('NOREQUIREMENU', 1);
 
 require_once '../main.inc.php';
 
-if (GETPOST('lang', 'aZ09')) $langs->setDefaultLang(GETPOST('lang', 'aZ09'));	// If language was forced on URL by the main.inc.php
+if (GETPOST('lang', 'aZ09')) $langs->setDefaultLang(GETPOST('lang', 'aZ09')); // If language was forced on URL by the main.inc.php
 
 $langs->load("main");
 
-$right=($langs->trans("DIRECTION")=='rtl'?'left':'right');
-$left=($langs->trans("DIRECTION")=='rtl'?'right':'left');
+$right = ($langs->trans("DIRECTION") == 'rtl' ? 'left' : 'right');
+$left = ($langs->trans("DIRECTION") == 'rtl' ? 'right' : 'left');
 
 
 /*
  * View
  */
 
-$title=$langs->trans("Info");
+$title = $langs->trans("Info");
 
 // URL http://mydolibarr/core/search_page?dol_use_jmobile=1 can be used for tests
-$head='<!-- Quick access -->'."\n";
-$arrayofjs=array();
-$arrayofcss=array();
+$head = '<!-- Quick access -->'."\n";
+$arrayofjs = array();
+$arrayofcss = array();
 top_htmlhead($head, $title, 0, 0, $arrayofjs, $arrayofcss);
 
 
@@ -60,39 +60,39 @@ 
 print '<div style="padding: 20px;">';
 //print '<br>';
 
-$nbofsearch=0;
+$nbofsearch = 0;
 
 // Define link to login card
-$appli=constant('DOL_APPLICATION_TITLE');
-if (! empty($conf->global->MAIN_APPLICATION_TITLE))
+$appli = constant('DOL_APPLICATION_TITLE');
+if (!empty($conf->global->MAIN_APPLICATION_TITLE))
 {
-	$appli=$conf->global->MAIN_APPLICATION_TITLE;
+	$appli = $conf->global->MAIN_APPLICATION_TITLE;
 	if (preg_match('/\d\.\d/', $appli))
 	{
-		if (! preg_match('/'.preg_quote(DOL_VERSION).'/', $appli)) $appli.=" (".DOL_VERSION.")";	// If new title contains a version that is different than core
+		if (!preg_match('/'.preg_quote(DOL_VERSION).'/', $appli)) $appli .= " (".DOL_VERSION.")"; // If new title contains a version that is different than core
 	}
-	else $appli.=" ".DOL_VERSION;
+	else $appli .= " ".DOL_VERSION;
 }
-else $appli.=" ".DOL_VERSION;
+else $appli .= " ".DOL_VERSION;
 
-if (! empty($conf->global->MAIN_FEATURES_LEVEL)) $appli.="<br>".$langs->trans("LevelOfFeature").': '.$conf->global->MAIN_FEATURES_LEVEL;
+if (!empty($conf->global->MAIN_FEATURES_LEVEL)) $appli .= "<br>".$langs->trans("LevelOfFeature").': '.$conf->global->MAIN_FEATURES_LEVEL;
 
-$logouttext='';
+$logouttext = '';
 if (empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER))
 {
 	//$logouthtmltext=$appli.'<br>';
 	if ($_SESSION["dol_authmode"] != 'forceuser' && $_SESSION["dol_authmode"] != 'http')
 	{
-		$logouthtmltext.=$langs->trans("Logout").'<br>';
+		$logouthtmltext .= $langs->trans("Logout").'<br>';
 
-		$logouttext .='<a href="'.DOL_URL_ROOT.'/user/logout.php">';
+		$logouttext .= '<a href="'.DOL_URL_ROOT.'/user/logout.php">';
 		//$logouttext .= img_picto($langs->trans('Logout').":".$langs->trans('Logout'), 'logout_top.png', 'class="login"', 0, 0, 1);
-		$logouttext .='<span class="fa fa-sign-out atoplogin"></span>';
-		$logouttext .='</a>';
+		$logouttext .= '<span class="fa fa-sign-out atoplogin"></span>';
+		$logouttext .= '</a>';
 	}
 	else
 	{
-		$logouthtmltext.=$langs->trans("NoLogoutProcessWithAuthMode",$_SESSION["dol_authmode"]);
+		$logouthtmltext .= $langs->trans("NoLogoutProcessWithAuthMode", $_SESSION["dol_authmode"]);
 		$logouttext .= img_picto($langs->trans('Logout').":".$langs->trans('Logout'), 'logout_top.png', 'class="login"', 0, 0, 1);
 	}
 }
@@ -100,36 +100,36 @@ 
 print '<div class="login_block_getinfo">'."\n";
 
 // Add login user link
-$toprightmenu.='<div class="login_block_user">';
+$toprightmenu .= '<div class="login_block_user">';
 
 // Login name with photo and tooltip
-$mode=-1;
-$toprightmenu.='<div class="inline-block nowrap"><div class="inline-block login_block_elem login_block_elem_name" style="padding: 0px;">';
-$toprightmenu.=$user->getNomUrl($mode, '', -1, 0, 11, 0, ($user->firstname ? 'firstname' : -1),'atoplogin');
-$toprightmenu.='</div></div>';
+$mode = -1;
+$toprightmenu .= '<div class="inline-block nowrap"><div class="inline-block login_block_elem login_block_elem_name" style="padding: 0px;">';
+$toprightmenu .= $user->getNomUrl($mode, '', -1, 0, 11, 0, ($user->firstname ? 'firstname' : -1), 'atoplogin');
+$toprightmenu .= '</div></div>';
 
-$toprightmenu.='</div>'."\n";
+$toprightmenu .= '</div>'."\n";
 
-$toprightmenu.='<div class="login_block_other">';
+$toprightmenu .= '<div class="login_block_other">';
 
 // Execute hook printTopRightMenu (hooks should output string like '<div class="login"><a href="">mylink</a></div>')
-$parameters=array();
-$result=$hookmanager->executeHooks('printTopRightMenu',$parameters);    // Note that $action and $object may have been modified by some hooks
+$parameters = array();
+$result = $hookmanager->executeHooks('printTopRightMenu', $parameters); // Note that $action and $object may have been modified by some hooks
 if (is_numeric($result))
 {
-	if (empty($result)) $toprightmenu.=$hookmanager->resPrint;		// add
-	else  $toprightmenu=$hookmanager->resPrint;						// replace
+	if (empty($result)) $toprightmenu .= $hookmanager->resPrint; // add
+	else  $toprightmenu = $hookmanager->resPrint; // replace
 }
-else $toprightmenu.=$result;	// For backward compatibility
+else $toprightmenu .= $result; // For backward compatibility
 
 // Link to module builder
-if (! empty($conf->modulebuilder->enabled))
+if (!empty($conf->modulebuilder->enabled))
 {
-	$text ='<a href="'.DOL_URL_ROOT.'/modulebuilder/index.php?mainmenu=home&leftmenu=admintools" target="_modulebuilder">';
+	$text = '<a href="'.DOL_URL_ROOT.'/modulebuilder/index.php?mainmenu=home&leftmenu=admintools" target="_modulebuilder">';
 	//$text.= img_picto(":".$langs->trans("ModuleBuilder"), 'printer_top.png', 'class="printer"');
-	$text.='<span class="fa fa-bug atoplogin"></span>';
-	$text.='</a>';
-	$toprightmenu.=@Form::textwithtooltip('',$langs->trans("ModuleBuilder"),2,1,$text,'login_block_elem',2);
+	$text .= '<span class="fa fa-bug atoplogin"></span>';
+	$text .= '</a>';
+	$toprightmenu .= @Form::textwithtooltip('', $langs->trans("ModuleBuilder"), 2, 1, $text, 'login_block_elem', 2);
 }
 
 // Link to print main content area
@@ -194,13 +194,13 @@ 
 */
 
 // Logout link
-if (GETPOST('withlogout','int')) $toprightmenu.=@Form::textwithtooltip('',$logouthtmltext,2,1,$logouttext,'login_block_elem',2);
+if (GETPOST('withlogout', 'int')) $toprightmenu .= @Form::textwithtooltip('', $logouthtmltext, 2, 1, $logouttext, 'login_block_elem', 2);
 
-$toprightmenu.='</div>';
+$toprightmenu .= '</div>';
 
 print $toprightmenu;
 
-print "</div>\n";		// end div class="login_block"
+print "</div>\n"; // end div class="login_block"
 
 print '</div>';
 print '</body></html>'."\n";

Braces +39 added lines, -14 removed lines

@@ -27,14 +27,23 @@ 
 //if (! defined('NOREQUIREDB'))   define('NOREQUIREDB','1');		// Not disabled cause need to load personalized language
 //if (! defined('NOREQUIRESOC'))    define('NOREQUIRESOC','1');
 //if (! defined('NOREQUIRETRAN')) define('NOREQUIRETRAN','1');		// Not disabled cause need to do translations
-if (! defined('NOCSRFCHECK'))     define('NOCSRFCHECK',1);
-if (! defined('NOTOKENRENEWAL'))  define('NOTOKENRENEWAL',1);
+if (! defined('NOCSRFCHECK')) {
+    define('NOCSRFCHECK',1);
+}
+if (! defined('NOTOKENRENEWAL')) {
+    define('NOTOKENRENEWAL',1);
+}
 //if (! defined('NOLOGIN')) define('NOLOGIN',1);					// Not disabled cause need to load personalized language
-if (! defined('NOREQUIREMENU'))  define('NOREQUIREMENU',1);
+if (! defined('NOREQUIREMENU')) {
+    define('NOREQUIREMENU',1);
+}
 
 require_once '../main.inc.php';
 
-if (GETPOST('lang', 'aZ09')) $langs->setDefaultLang(GETPOST('lang', 'aZ09'));	// If language was forced on URL by the main.inc.php
+if (GETPOST('lang', 'aZ09')) {
+    $langs->setDefaultLang(GETPOST('lang', 'aZ09'));
+}
+// If language was forced on URL by the main.inc.php
 
 $langs->load("main");
 
@@ -69,13 +78,20 @@ 
 	$appli=$conf->global->MAIN_APPLICATION_TITLE;
 	if (preg_match('/\d\.\d/', $appli))
 	{
-		if (! preg_match('/'.preg_quote(DOL_VERSION).'/', $appli)) $appli.=" (".DOL_VERSION.")";	// If new title contains a version that is different than core
+		if (! preg_match('/'.preg_quote(DOL_VERSION).'/', $appli)) {
+		    $appli.=" (".DOL_VERSION.")";
+		}
+		// If new title contains a version that is different than core
+	} else {
+	    $appli.=" ".DOL_VERSION;
 	}
-	else $appli.=" ".DOL_VERSION;
+	} else {
+    $appli.=" ".DOL_VERSION;
 }
-else $appli.=" ".DOL_VERSION;
 
-if (! empty($conf->global->MAIN_FEATURES_LEVEL)) $appli.="<br>".$langs->trans("LevelOfFeature").': '.$conf->global->MAIN_FEATURES_LEVEL;
+if (! empty($conf->global->MAIN_FEATURES_LEVEL)) {
+    $appli.="<br>".$langs->trans("LevelOfFeature").': '.$conf->global->MAIN_FEATURES_LEVEL;
+}
 
 $logouttext='';
 if (empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER))
@@ -89,8 +105,7 @@ 
 		//$logouttext .= img_picto($langs->trans('Logout').":".$langs->trans('Logout'), 'logout_top.png', 'class="login"', 0, 0, 1);
 		$logouttext .='<span class="fa fa-sign-out atoplogin"></span>';
 		$logouttext .='</a>';
-	}
-	else
+	} else
 	{
 		$logouthtmltext.=$langs->trans("NoLogoutProcessWithAuthMode",$_SESSION["dol_authmode"]);
 		$logouttext .= img_picto($langs->trans('Logout').":".$langs->trans('Logout'), 'logout_top.png', 'class="login"', 0, 0, 1);
@@ -117,10 +132,18 @@ 
 $result=$hookmanager->executeHooks('printTopRightMenu',$parameters);    // Note that $action and $object may have been modified by some hooks
 if (is_numeric($result))
 {
-	if (empty($result)) $toprightmenu.=$hookmanager->resPrint;		// add
-	else  $toprightmenu=$hookmanager->resPrint;						// replace
+	if (empty($result)) {
+	    $toprightmenu.=$hookmanager->resPrint;
+	}
+	// add
+	else {
+	    $toprightmenu=$hookmanager->resPrint;
+	}
+	// replace
+} else {
+    $toprightmenu.=$result;
 }
-else $toprightmenu.=$result;	// For backward compatibility
+// For backward compatibility
 
 // Link to module builder
 if (! empty($conf->modulebuilder->enabled))
@@ -194,7 +217,9 @@ 
 */
 
 // Logout link
-if (GETPOST('withlogout','int')) $toprightmenu.=@Form::textwithtooltip('',$logouthtmltext,2,1,$logouttext,'login_block_elem',2);
+if (GETPOST('withlogout','int')) {
+    $toprightmenu.=@Form::textwithtooltip('',$logouthtmltext,2,1,$logouttext,'login_block_elem',2);
+}
 
 $toprightmenu.='</div>';
 

dolibarr/htdocs/core/actions_builddoc.inc.php

Indentation +14 added lines, -14 removed lines

@@ -40,7 +40,7 @@ 
     }
     else
     {
-   		// Reload to get all modified line records and be ready for hooks
+            // Reload to get all modified line records and be ready for hooks
         $ret = $object->fetch($id);
         $ret = $object->fetch_thirdparty();
         /*if (empty($object->id) || ! $object->id > 0)
@@ -50,10 +50,10 @@ 
         }*/
 
         // Save last template used to generate document
-    	if (GETPOST('model','alpha'))
-    	{
-    	    $object->setDocModel($user, GETPOST('model','alpha'));
-    	}
+        if (GETPOST('model','alpha'))
+        {
+            $object->setDocModel($user, GETPOST('model','alpha'));
+        }
 
         // Special case to force bank account
         //if (property_exists($object, 'fk_bank'))
@@ -91,17 +91,17 @@ 
         }
         else
         {
-        	if (empty($donotredirect))	// This is set when include is done by bulk action "Bill Orders"
-        	{
-	            setEventMessages($langs->trans("FileGenerated"), null);
+            if (empty($donotredirect))	// This is set when include is done by bulk action "Bill Orders"
+            {
+                setEventMessages($langs->trans("FileGenerated"), null);
 
-	            $urltoredirect = $_SERVER['REQUEST_URI'];
-	            $urltoredirect = preg_replace('/#builddoc$/', '', $urltoredirect);
-	            $urltoredirect = preg_replace('/action=builddoc&?/', '', $urltoredirect);	// To avoid infinite loop
+                $urltoredirect = $_SERVER['REQUEST_URI'];
+                $urltoredirect = preg_replace('/#builddoc$/', '', $urltoredirect);
+                $urltoredirect = preg_replace('/action=builddoc&?/', '', $urltoredirect);	// To avoid infinite loop
 
-	            header('Location: '.$urltoredirect.'#builddoc');
-	            exit;
-        	}
+                header('Location: '.$urltoredirect.'#builddoc');
+                exit;
+            }
         }
     }
 }

Spacing +24 added lines, -24 removed lines

@@ -34,9 +34,9 @@ 
 if ($action == 'builddoc' && $permissioncreate)
 {
 
-    if (is_numeric(GETPOST('model','alpha')))
+    if (is_numeric(GETPOST('model', 'alpha')))
     {
-        $error=$langs->trans("ErrorFieldRequired",$langs->transnoentities("Model"));
+        $error = $langs->trans("ErrorFieldRequired", $langs->transnoentities("Model"));
     }
     else
     {
@@ -50,44 +50,44 @@ 
         }*/
 
         // Save last template used to generate document
-    	if (GETPOST('model','alpha'))
+    	if (GETPOST('model', 'alpha'))
     	{
-    	    $object->setDocModel($user, GETPOST('model','alpha'));
+    	    $object->setDocModel($user, GETPOST('model', 'alpha'));
     	}
 
         // Special case to force bank account
         //if (property_exists($object, 'fk_bank'))
         //{
-            if (GETPOST('fk_bank','int')) { // this field may come from an external module
-                $object->fk_bank = GETPOST('fk_bank','int');
-            } else if (! empty($object->fk_account)) {
+            if (GETPOST('fk_bank', 'int')) { // this field may come from an external module
+                $object->fk_bank = GETPOST('fk_bank', 'int');
+            } else if (!empty($object->fk_account)) {
                 $object->fk_bank = $object->fk_account;
             }
         //}
 
         $outputlangs = $langs;
-        $newlang='';
+        $newlang = '';
 
-        if ($conf->global->MAIN_MULTILANGS && empty($newlang) && GETPOST('lang_id','aZ09')) $newlang=GETPOST('lang_id','aZ09');
-        if ($conf->global->MAIN_MULTILANGS && empty($newlang) && isset($object->thirdparty->default_lang)) $newlang=$object->thirdparty->default_lang;  // for proposal, order, invoice, ...
-        if ($conf->global->MAIN_MULTILANGS && empty($newlang) && isset($object->default_lang)) $newlang=$object->default_lang;                  // for thirdparty
-        if (! empty($newlang))
+        if ($conf->global->MAIN_MULTILANGS && empty($newlang) && GETPOST('lang_id', 'aZ09')) $newlang = GETPOST('lang_id', 'aZ09');
+        if ($conf->global->MAIN_MULTILANGS && empty($newlang) && isset($object->thirdparty->default_lang)) $newlang = $object->thirdparty->default_lang; // for proposal, order, invoice, ...
+        if ($conf->global->MAIN_MULTILANGS && empty($newlang) && isset($object->default_lang)) $newlang = $object->default_lang; // for thirdparty
+        if (!empty($newlang))
         {
-            $outputlangs = new Translate("",$conf);
+            $outputlangs = new Translate("", $conf);
             $outputlangs->setDefaultLang($newlang);
         }
 
         // To be sure vars is defined
-        if (empty($hidedetails)) $hidedetails=0;
-        if (empty($hidedesc)) $hidedesc=0;
-        if (empty($hideref)) $hideref=0;
-        if (empty($moreparams)) $moreparams=null;
+        if (empty($hidedetails)) $hidedetails = 0;
+        if (empty($hidedesc)) $hidedesc = 0;
+        if (empty($hideref)) $hideref = 0;
+        if (empty($moreparams)) $moreparams = null;
 
-        $result= $object->generateDocument($object->modelpdf, $outputlangs, $hidedetails, $hidedesc, $hideref, $moreparams);
+        $result = $object->generateDocument($object->modelpdf, $outputlangs, $hidedetails, $hidedesc, $hideref, $moreparams);
         if ($result <= 0)
         {
             setEventMessages($object->error, $object->errors, 'errors');
-            $action='';
+            $action = '';
         }
         else
         {
@@ -97,7 +97,7 @@ 
 
 	            $urltoredirect = $_SERVER['REQUEST_URI'];
 	            $urltoredirect = preg_replace('/#builddoc$/', '', $urltoredirect);
-	            $urltoredirect = preg_replace('/action=builddoc&?/', '', $urltoredirect);	// To avoid infinite loop
+	            $urltoredirect = preg_replace('/action=builddoc&?/', '', $urltoredirect); // To avoid infinite loop
 
 	            header('Location: '.$urltoredirect.'#builddoc');
 	            exit;
@@ -111,7 +111,7 @@ 
 {
     require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
 
-    if (empty($object->id) || ! $object->id > 0)
+    if (empty($object->id) || !$object->id > 0)
     {
         // Reload to get all modified line records and be ready for hooks
         $ret = $object->fetch($id);
@@ -119,9 +119,9 @@ 
     }
 
     $langs->load("other");
-    $filetodelete=GETPOST('file','alpha');
-    $file =	$upload_dir	. '/' .	$filetodelete;
-    $ret=dol_delete_file($file,0,0,0,$object);
+    $filetodelete = GETPOST('file', 'alpha');
+    $file = $upload_dir.'/'.$filetodelete;
+    $ret = dol_delete_file($file, 0, 0, 0, $object);
     if ($ret) setEventMessages($langs->trans("FileWasRemoved", $filetodelete), null, 'mesgs');
     else setEventMessages($langs->trans("ErrorFailToDeleteFile", $filetodelete), null, 'errors');
 

Braces +33 added lines, -14 removed lines

@@ -37,8 +37,7 @@ 
     if (is_numeric(GETPOST('model','alpha')))
     {
         $error=$langs->trans("ErrorFieldRequired",$langs->transnoentities("Model"));
-    }
-    else
+    } else
     {
    		// Reload to get all modified line records and be ready for hooks
         $ret = $object->fetch($id);
@@ -68,9 +67,17 @@ 
         $outputlangs = $langs;
         $newlang='';
 
-        if ($conf->global->MAIN_MULTILANGS && empty($newlang) && GETPOST('lang_id','aZ09')) $newlang=GETPOST('lang_id','aZ09');
-        if ($conf->global->MAIN_MULTILANGS && empty($newlang) && isset($object->thirdparty->default_lang)) $newlang=$object->thirdparty->default_lang;  // for proposal, order, invoice, ...
-        if ($conf->global->MAIN_MULTILANGS && empty($newlang) && isset($object->default_lang)) $newlang=$object->default_lang;                  // for thirdparty
+        if ($conf->global->MAIN_MULTILANGS && empty($newlang) && GETPOST('lang_id','aZ09')) {
+            $newlang=GETPOST('lang_id','aZ09');
+        }
+        if ($conf->global->MAIN_MULTILANGS && empty($newlang) && isset($object->thirdparty->default_lang)) {
+            $newlang=$object->thirdparty->default_lang;
+        }
+        // for proposal, order, invoice, ...
+        if ($conf->global->MAIN_MULTILANGS && empty($newlang) && isset($object->default_lang)) {
+            $newlang=$object->default_lang;
+        }
+        // for thirdparty
         if (! empty($newlang))
         {
             $outputlangs = new Translate("",$conf);
@@ -78,22 +85,31 @@ 
         }
 
         // To be sure vars is defined
-        if (empty($hidedetails)) $hidedetails=0;
-        if (empty($hidedesc)) $hidedesc=0;
-        if (empty($hideref)) $hideref=0;
-        if (empty($moreparams)) $moreparams=null;
+        if (empty($hidedetails)) {
+            $hidedetails=0;
+        }
+        if (empty($hidedesc)) {
+            $hidedesc=0;
+        }
+        if (empty($hideref)) {
+            $hideref=0;
+        }
+        if (empty($moreparams)) {
+            $moreparams=null;
+        }
 
         $result= $object->generateDocument($object->modelpdf, $outputlangs, $hidedetails, $hidedesc, $hideref, $moreparams);
         if ($result <= 0)
         {
             setEventMessages($object->error, $object->errors, 'errors');
             $action='';
-        }
-        else
+        } else
         {
-        	if (empty($donotredirect))	// This is set when include is done by bulk action "Bill Orders"
+        	if (empty($donotredirect)) {
+        	    // This is set when include is done by bulk action "Bill Orders"
         	{
 	            setEventMessages($langs->trans("FileGenerated"), null);
+        	}
 
 	            $urltoredirect = $_SERVER['REQUEST_URI'];
 	            $urltoredirect = preg_replace('/#builddoc$/', '', $urltoredirect);
@@ -122,8 +138,11 @@ 
     $filetodelete=GETPOST('file','alpha');
     $file =	$upload_dir	. '/' .	$filetodelete;
     $ret=dol_delete_file($file,0,0,0,$object);
-    if ($ret) setEventMessages($langs->trans("FileWasRemoved", $filetodelete), null, 'mesgs');
-    else setEventMessages($langs->trans("ErrorFailToDeleteFile", $filetodelete), null, 'errors');
+    if ($ret) {
+        setEventMessages($langs->trans("FileWasRemoved", $filetodelete), null, 'mesgs');
+    } else {
+        setEventMessages($langs->trans("ErrorFailToDeleteFile", $filetodelete), null, 'errors');
+    }
 
     // Make a redirect to avoid to keep the remove_file into the url that create side effects
     $urltoredirect = $_SERVER['REQUEST_URI'];