alxarafe / alixar

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

Spacing +177 added lines, -177 removed lines

@@ -31,7 +31,7 @@ 
 use Alxarafe\Helpers\Debug;

 

 //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

@@ -39,15 +39,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;

 

@@ -62,30 +62,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;

 		}

 

@@ -103,8 +103,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

@@ -121,8 +121,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

@@ -141,7 +141,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;

 	}

@@ -170,25 +170,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;

 	}

@@ -200,10 +200,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 '';

@@ -229,8 +229,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;

@@ -245,16 +245,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;

 		}

@@ -270,18 +270,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

@@ -303,15 +303,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)

@@ -331,61 +331,61 @@ 
      *  @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);

 

-        Debug::addMessage('SQL', 'MSSQL: ' . $query);

+        Debug::addMessage('SQL', 'MSSQL: '.$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) {

@@ -416,21 +416,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);

@@ -445,10 +445,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);

@@ -461,7 +461,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;

 		}

 

@@ -479,7 +479,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);

 	}

 

@@ -494,7 +494,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);

 	}

 

@@ -510,7 +510,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);

 	}

 

@@ -526,7 +526,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);

 	}

 

@@ -542,7 +542,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);

@@ -557,10 +557,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);

 	}

@@ -586,7 +586,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");

 	}

 

 	/**

@@ -596,7 +596,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';

@@ -637,8 +637,8 @@ 
 			{

 				return $errorcode_map[$this->lasterrno];

 			}

-			$errno=$this->lasterrno;

-			return ($errno?'DB_ERROR_'.$errno:'0');

+			$errno = $this->lasterrno;

+			return ($errno ? 'DB_ERROR_'.$errno : '0');

 		}

 	}

 

@@ -649,7 +649,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';

 		}

@@ -666,7 +666,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");

@@ -688,18 +688,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 ? "'" : "");

 	}

 

 	/**

@@ -713,10 +713,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;

@@ -732,10 +732,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 '?';

@@ -753,7 +753,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;

@@ -763,18 +763,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;

 	}

@@ -787,7 +787,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);

@@ -809,7 +809,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;

 	}

 

@@ -826,7 +826,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

@@ -834,58 +834,58 @@ 
 		// 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))

@@ -906,7 +906,7 @@ 
         // phpcs:enable

 		$sql = "DROP TABLE ".$table;

 

-		if (! $this->query($sql))

+		if (!$this->query($sql))

 			return -1;

 		else

 			return 1;

@@ -920,10 +920,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);

@@ -940,25 +940,25 @@ 
 	 *	@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;

 

@@ -977,17 +977,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;

@@ -1001,14 +1001,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;

@@ -1024,13 +1024,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')

             {

@@ -1042,9 +1042,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;

@@ -1054,9 +1054,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);

             }

         }

@@ -1096,12 +1096,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'];

 	}

 

@@ -1150,13 +1150,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;

 	}

 

@@ -1166,7 +1166,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

@@ -1197,25 +1197,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/sqlite3.class.php

Spacing +252 added lines, -252 removed lines

@@ -31,7 +31,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

@@ -39,17 +39,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;

 

 

     /**

@@ -63,19 +63,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>";

 

@@ -126,7 +126,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;

@@ -140,14 +140,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;

         }

@@ -155,114 +155,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;';

@@ -275,24 +275,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";

@@ -329,14 +329,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';

@@ -346,9 +346,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 '';

         }

 

@@ -364,7 +364,7 @@ 
      */

     function getVersion()

     {

-    	$tmp=$this->db->version();

+    	$tmp = $this->db->version();

         return $tmp['versionString'];

     }

 

@@ -389,10 +389,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;

@@ -407,17 +407,17 @@ 
      *  @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);

 

-        Debug::addMessage('SQL', 'SqLite: ' . $query);

+        Debug::addMessage('SQL', 'SqLite: '.$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)

@@ -425,19 +425,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 .= ')';

@@ -446,15 +446,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";

 

@@ -463,20 +463,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();

@@ -486,13 +486,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;

         }

 

@@ -510,7 +510,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) {

@@ -531,7 +531,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;

@@ -548,9 +548,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

@@ -574,9 +574,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;

     }

@@ -595,7 +595,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);

         }

@@ -611,10 +611,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();

     }

@@ -637,7 +637,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';

         }

@@ -675,23 +675,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');

         }

     }

 

@@ -702,7 +702,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';

         }

@@ -719,7 +719,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();

@@ -733,17 +733,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))

         {

@@ -771,10 +771,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;

 

@@ -819,24 +819,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;

     }

@@ -849,19 +849,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];

             }

@@ -880,15 +880,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;

             }

@@ -909,7 +909,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

@@ -917,60 +917,60 @@ 
         // 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,LOG_DEBUG);

+        dol_syslog($sql, LOG_DEBUG);

         if (!$this->query($sql))

             return -1;

         return 1;

@@ -988,7 +988,7 @@ 
         // phpcs:enable

     	$sql = "DROP TABLE ".$table;

 

-    	if (! $this->query($sql))

+    	if (!$this->query($sql))

     		return -1;

     	else

     		return 1;

@@ -1002,12 +1002,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;

     }

@@ -1022,35 +1022,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;

         }

@@ -1066,17 +1066,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;

     }

@@ -1089,14 +1089,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;

@@ -1113,38 +1113,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;

         }

@@ -1169,7 +1169,7 @@ 
     function getListOfCharacterSet()

     {

         $liste = array();

-        $i=0;

+        $i = 0;

         $liste[$i]['charset'] = 'UTF-8';

         $liste[$i]['description'] = 'UTF-8';

         return $liste;

@@ -1193,7 +1193,7 @@ 
     function getListOfCollation()

     {

         $liste = array();

-        $i=0;

+        $i = 0;

         $liste[$i]['charset'] = 'UTF-8';

         $liste[$i]['description'] = 'UTF-8';

         return $liste;

@@ -1207,14 +1207,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;

     }

@@ -1227,14 +1227,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;

     }

@@ -1245,18 +1245,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',

@@ -1271,9 +1271,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);

@@ -1294,9 +1294,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)."'";

@@ -1323,10 +1323,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();

             }

@@ -1351,7 +1351,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 {

@@ -1386,7 +1386,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

@@ -1403,41 +1403,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/db/mysqli.class.php

Spacing +180 added lines, -180 removed lines

@@ -31,7 +31,7 @@ 
 

 use Alxarafe\Helpers\Debug;

 

-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

@@ -41,11 +41,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;

 

@@ -60,36 +60,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

@@ -100,7 +100,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;

@@ -116,16 +116,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

@@ -133,8 +133,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

@@ -145,16 +145,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);

 				}

 			}

         }

@@ -168,7 +168,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;

     }

@@ -201,7 +201,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);

@@ -240,8 +240,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;

@@ -256,17 +256,17 @@ 
      *  @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);

 

-        Debug::addMessage('SQL', 'MySQL: ' . $query);

+        Debug::addMessage('SQL', 'MySQL: '.$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);

@@ -276,19 +276,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;

         }

 

@@ -306,7 +306,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();

     }

 

@@ -322,7 +322,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();

     }

 

@@ -337,9 +337,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

@@ -361,7 +361,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;

     }

 

@@ -377,7 +377,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;

@@ -390,10 +390,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();

     }

@@ -416,7 +416,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 {

@@ -448,15 +448,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');

         }

     }

 

@@ -467,7 +467,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';

         }

@@ -484,7 +484,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;

@@ -499,17 +499,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))

         {

@@ -537,10 +537,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;

 

@@ -569,10 +569,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 '?';

@@ -590,24 +590,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;

     }

@@ -620,19 +620,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];

             }

@@ -650,15 +650,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;

             }

@@ -679,7 +679,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

@@ -687,64 +687,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;

@@ -762,7 +762,7 @@ 
         // phpcs:enable

         $sql = "DROP TABLE ".$table;

 

-		if (! $this->query($sql))

+		if (!$this->query($sql))

  			return -1;

     	else

     		return 1;

@@ -776,12 +776,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;

     }

@@ -796,42 +796,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;

         }

@@ -847,39 +847,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;

@@ -893,15 +893,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;

     }

 

@@ -916,13 +916,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')

             {

@@ -935,18 +935,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;

         }

@@ -963,13 +963,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;

@@ -982,12 +982,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;

@@ -1009,13 +1009,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;

@@ -1028,12 +1028,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++;

@@ -1053,14 +1053,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;

     }

@@ -1072,14 +1072,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;

     }

@@ -1090,16 +1090,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;

@@ -1111,16 +1111,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/pgsql.class.php

Spacing +263 added lines, -263 removed lines

@@ -35,7 +35,7 @@ 
 

 use Alxarafe\Helpers\Debug;

 

-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

@@ -43,15 +43,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;

 

@@ -69,37 +69,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;

 		}

 

@@ -117,8 +117,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

@@ -135,8 +135,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

@@ -157,14 +157,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;

 		}

@@ -179,186 +179,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";

 		}

@@ -396,7 +396,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

 

@@ -409,20 +409,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);

@@ -432,7 +432,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';");

 		}

 

@@ -446,10 +446,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 '';

@@ -475,8 +475,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;

@@ -490,30 +490,30 @@ 
      * @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);

 

-        Debug::addMessage('SQL', 'PgSQL: ' . $query);

+        Debug::addMessage('SQL', 'PgSQL: '.$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;

 			}

 		}

 

@@ -522,14 +522,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

 			    {

@@ -537,7 +537,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);

 			    }

@@ -547,7 +547,7 @@ 
 					@pg_query($this->db, 'ROLLBACK TO SAVEPOINT mysavepoint');

 				}

 			}

-			$this->lastquery=$query;

+			$this->lastquery = $query;

 			$this->_results = $ret;

 		}

 

@@ -565,7 +565,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);

 	}

 

@@ -580,7 +580,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);

 	}

 

@@ -595,7 +595,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);

 	}

 

@@ -611,7 +611,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);

 	}

 

@@ -627,7 +627,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);

@@ -640,10 +640,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);

 	}

@@ -656,11 +656,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 ";

 	}

@@ -686,7 +686,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");

 	}

 

 	/**

@@ -697,7 +697,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)';

 	}

@@ -709,7 +709,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';

 		}

@@ -731,7 +731,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',

@@ -745,18 +745,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',

@@ -786,18 +786,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;

 	}

 

@@ -809,18 +809,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 ? "'" : "");

 	}

 

 

@@ -835,10 +835,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;

@@ -871,18 +871,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;

 	}

 

@@ -894,17 +894,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];

     		}

@@ -923,29 +923,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;

     		 }

@@ -967,7 +967,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

@@ -975,61 +975,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;

@@ -1047,7 +1047,7 @@ 
         // phpcs:enable

 		$sql = "DROP TABLE ".$table;

 

-		if (! $this->query($sql))

+		if (!$this->query($sql))

 			return -1;

 		else

 			return 1;

@@ -1063,15 +1063,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;

 		}

@@ -1087,14 +1087,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;

 	}

@@ -1109,32 +1109,32 @@ 
 	 *	@param	string	$field_position 	Optionnel ex.: "after champtruc"

 	 *	@return	int							<0 if KO, >0 if OK

 	 */

-	function DDLAddField($table,$field_name,$field_desc,$field_position="")

+	function DDLAddField($table, $field_name, $field_desc, $field_position = "")

 	{

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

+		dol_syslog($sql, LOG_DEBUG);

 		if (!$this->query($sql))

             return -1;

 		return 1;

@@ -1149,13 +1149,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')

@@ -1163,24 +1163,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;

 	}

@@ -1193,14 +1193,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;

@@ -1213,10 +1213,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 '';

@@ -1229,7 +1229,7 @@ 
 	 */

 	function getListOfCharacterSet()

 	{

-		$resql=$this->query('SHOW SERVER_ENCODING');

+		$resql = $this->query('SHOW SERVER_ENCODING');

 		$liste = array();

 		if ($resql)

 		{

@@ -1254,10 +1254,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 '';

@@ -1270,12 +1270,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++;

@@ -1294,21 +1294,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';

     		}

 		}

 

@@ -1323,23 +1323,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;

             }

         }

 

@@ -1352,16 +1352,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;

@@ -1373,7 +1373,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';