alxarafe / alixar

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

Braces +113 added lines, -99 removed lines

@@ -97,8 +97,7 @@ 
 			// (La base Dolibarr a ete forcee en this->forcecharset a l'install)

 			$this->connected = true;

 			$this->ok = true;

-		}

-		else

+		} else

 		{

 			// host, login ou password incorrect

 			$this->connected = false;

@@ -115,8 +114,7 @@ 
 				$this->database_selected = true;

 				$this->database_name = $name;

 				$this->ok = true;

-			}

-			else

+			} else

 			{

 				$this->database_selected = false;

 				$this->database_name = '';

@@ -124,8 +122,7 @@ 
 				$this->error=$this->error();

 				dol_syslog(get_class($this)."::DoliDBMssql : Erreur Select_db ".$this->error,LOG_ERR);

 			}

-		}

-		else

+		} else

 		{

 			// Pas de selection de base demandee, ok ou ko

 			$this->database_selected = false;

@@ -174,7 +171,9 @@ 
 	{

 		dol_syslog(get_class($this)."::connect host=$host, port=$port, login=$login, passwd=--hidden--, name=$name");

 		$newhost=$host;

-		if ($port) $newhost.=':'.$port;

+		if ($port) {
+		    $newhost.=':'.$port;
+		}
 		$this->db  = @mssql_connect($newhost, $login, $passwd);

 		//force les enregistrement en latin1 si la base est en utf8 par defaut

 		// Supprime car plante sur mon PHP-Mysql. De plus, la base est forcement en latin1 avec

@@ -205,8 +204,9 @@ 
 		{

             $version=$this->fetch_array($resql);

             return $version['computed'];

-		}

-		else return '';

+		} else {
+		    return '';
+		}
 	}

 

 	/**

@@ -229,7 +229,9 @@ 
     {

         if ($this->db)

         {

-          if ($this->transaction_opened > 0) dol_syslog(get_class($this)."::close Closing a connection with an opened transaction depth=".$this->transaction_opened,LOG_ERR);

+          if ($this->transaction_opened > 0) {
+              dol_syslog(get_class($this)."::close Closing a connection with an opened transaction depth=".$this->transaction_opened,LOG_ERR);
+          }
           $this->connected=false;

           return mssql_close($this->db);

         }

@@ -257,8 +259,7 @@ 
 				dol_syslog("BEGIN Transaction",LOG_DEBUG);

 			}

 			return $ret;

-		}

-		else

+		} else

 		{

 			return true;

 		}

@@ -283,13 +284,11 @@ 
 			{

 				dol_syslog("COMMIT Transaction",LOG_DEBUG);

 				return true;

-			}

-			else

+			} else

 			{

 				return false;

 			}

-		}

-		elseif ($this->transaction_opened > 1)

+		} elseif ($this->transaction_opened > 1)

 		{

 			return true;

 		}

@@ -313,8 +312,7 @@ 
 			$ret=mssql_query("ROLLBACK TRANSACTION",$this->db);

 			dol_syslog("ROLLBACK Transaction".($log?' '.$log:''),LOG_DEBUG);

 			return $ret;

-		}

-		elseif ($this->transaction_opened > 1)

+		} elseif ($this->transaction_opened > 1)

 		{

 			return true;

 		}

@@ -337,7 +335,9 @@ 
 

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

@@ -371,11 +371,11 @@ 
                             $query_comp[]=$fld->COLUMN_NAME." IS NOT NULL";

                         }

                     }

-                    if (! empty($query_comp))

-                        $query.=" WHERE ".implode(" AND ",$query_comp);

+                    if (! empty($query_comp)) {
+                                            $query.=" WHERE ".implode(" AND ",$query_comp);
+                    }
                 }

-    		}

-    		else

+    		} else

     		{

     		    if (preg_match('/ALTER TABLE\h+(\w+?)\h+ADD\h+PRIMARY\h+KEY\h+(\w+?)\h*\((.+)\)/is', $query, $matches))

     		    {

@@ -428,14 +428,15 @@ 
 		}

 		//print "<!--".$query."-->";

 

-		if (! in_array($query,array('BEGIN','COMMIT','ROLLBACK'))) dol_syslog('sql='.$query, LOG_DEBUG);

+		if (! in_array($query,array('BEGIN','COMMIT','ROLLBACK'))) {
+		    dol_syslog('sql='.$query, LOG_DEBUG);
+		}
 

 		if (! $this->database_name)

 		{

 			// Ordre SQL ne necessitant pas de connexion a une base (exemple: CREATE DATABASE)

 			$ret = mssql_query($query, $this->db);

-		}

-		else

+		} else

 		{

 			$ret = mssql_query($query, $this->db);

 		}

@@ -458,7 +459,9 @@ 
 				$this->lasterrno = $row["code"];

 

 				dol_syslog(get_class($this)."::query SQL Error query: ".$query, LOG_ERR);

-				if ($original_query) dol_syslog(get_class($this)."::query SQL Original query: ".$original_query, LOG_ERR);

+				if ($original_query) {
+				    dol_syslog(get_class($this)."::query SQL Original query: ".$original_query, LOG_ERR);
+				}
 				dol_syslog(get_class($this)."::query SQL Error message: ".$this->lasterror." (".$this->lasterrno.")", LOG_ERR);

 			}

 			$this->lastquery=$query;

@@ -562,7 +565,9 @@ 
 		// Si le resultset n'est pas fourni, on prend le dernier utilise sur cette connexion

 		if (! is_resource($resultset)) { $resultset=$this->_results; }

 		// Si resultset en est un, on libere la memoire

-		if (is_resource($resultset)) mssql_free_result($resultset);

+		if (is_resource($resultset)) {
+		    mssql_free_result($resultset);
+		}
 	}

 

 	/**

@@ -600,8 +605,7 @@ 
 		{

 			// Si il y a eu echec de connexion, $this->db n'est pas valide.

 			return 'DB_ERROR_FAILED_TO_CONNECT';

-		}

-		else

+		} else

 		{

 			// Constants to convert a MSSql error code to a generic Dolibarr error code

 			$errorcode_map = array(

@@ -652,8 +656,7 @@ 
 		if (! $this->connected) {

 			// Si il y a eu echec de connexion, $this->db n'est pas valide pour mssql_get_last_message.

 			return 'Not connected. Check setup parameters in conf/conf.php file and your mssql client and server versions';

-		}

-		else {

+		} else {

 			return mssql_get_last_message();

 		}

 	}

@@ -673,8 +676,7 @@ 
 		if ($res && $data = $this->fetch_array($res))

 		{

 			return $data["id"];

-		}

-		else

+		} else

 		{

 			return -1;

 		}

@@ -737,8 +739,9 @@ 
 		{

             $row=$this->fetch_row($resql);

             return $row[0];

-		}

-		else return '?';

+		} else {
+		    return '?';
+		}
 	}

 

     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps

@@ -839,26 +842,27 @@ 
 		{

 			$sqlfields[$i] = $field_name." ";

 			$sqlfields[$i]  .= $field_desc['type'];

-			if( preg_match("/^[^\s]/i",$field_desc['value']))

-			$sqlfields[$i]  .= "(".$field_desc['value'].")";

-			else if( preg_match("/^[^\s]/i",$field_desc['attribute']))

-			$sqlfields[$i]  .= " ".$field_desc['attribute'];

-			else if( preg_match("/^[^\s]/i",$field_desc['default']))

+			if( preg_match("/^[^\s]/i",$field_desc['value'])) {
+						$sqlfields[$i]  .= "(".$field_desc['value'].")";
+			} else if( preg_match("/^[^\s]/i",$field_desc['attribute'])) {
+						$sqlfields[$i]  .= " ".$field_desc['attribute'];
+			} else if( preg_match("/^[^\s]/i",$field_desc['default']))

 			{

-				if(preg_match("/null/i",$field_desc['default']))

-				$sqlfields[$i]  .= " default ".$field_desc['default'];

-				else

-				$sqlfields[$i]  .= " default '".$field_desc['default']."'";

-			}

-			else if( preg_match("/^[^\s]/i",$field_desc['null']))

-			$sqlfields[$i]  .= " ".$field_desc['null'];

-

-			else if( preg_match("/^[^\s]/i",$field_desc['extra']))

-			$sqlfields[$i]  .= " ".$field_desc['extra'];

+				if(preg_match("/null/i",$field_desc['default'])) {
+								$sqlfields[$i]  .= " default ".$field_desc['default'];
+				} else {
+								$sqlfields[$i]  .= " default '".$field_desc['default']."'";
+				}
+			} else if( preg_match("/^[^\s]/i",$field_desc['null'])) {
+						$sqlfields[$i]  .= " ".$field_desc['null'];
+			} else if( preg_match("/^[^\s]/i",$field_desc['extra'])) {
+						$sqlfields[$i]  .= " ".$field_desc['extra'];
+			}
 			$i++;

 		}

-		if($primary_key != "")

-		$pk = "primary key(".$primary_key.")";

+		if($primary_key != "") {
+				$pk = "primary key(".$primary_key.")";
+		}
 

 		if(is_array($unique_keys))

 		{

@@ -879,19 +883,23 @@ 
 			}

 		}

 		$sql .= implode(',',$sqlfields);

-		if($primary_key != "")

-		$sql .= ",".$pk;

-		if(is_array($unique_keys))

-		$sql .= ",".implode(',',$sqluq);

-		if(is_array($keys))

-		$sql .= ",".implode(',',$sqlk);

+		if($primary_key != "") {
+				$sql .= ",".$pk;
+		}
+		if(is_array($unique_keys)) {
+				$sql .= ",".implode(',',$sqluq);
+		}
+		if(is_array($keys)) {
+				$sql .= ",".implode(',',$sqlk);
+		}
 		$sql .=") type=".$type;

 

 		dol_syslog($sql);

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

-            return -1;

-		else

-		return 1;

+		if (!$this->query($sql)) {
+		            return -1;
+		} else {
+				return 1;
+		}
 	}

 

     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps

@@ -906,10 +914,11 @@ 
         // phpcs:enable

 		$sql = "DROP TABLE ".$table;

 

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

-			return -1;

-		else

-			return 1;

+		if (! $this->query($sql)) {
+					return -1;
+		} else {
+					return 1;
+		}
 	}

 

     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps

@@ -947,25 +956,31 @@ 
 		// ex. : $field_desc = array('type'=>'int','value'=>'11','null'=>'not null','extra'=> 'auto_increment');

 		$sql= "ALTER TABLE ".$table." ADD ".$field_name." ";

 		$sql .= $field_desc['type'];

-		if( preg_match("/^[^\s]/i",$field_desc['value']))

-		$sql  .= "(".$field_desc['value'].")";

-		if( preg_match("/^[^\s]/i",$field_desc['attribute']))

-		$sql  .= " ".$field_desc['attribute'];

-		if( preg_match("/^[^\s]/i",$field_desc['null']))

-		$sql  .= " ".$field_desc['null'];

-		if( preg_match("/^[^\s]/i",$field_desc['default']))

-		if(preg_match("/null/i",$field_desc['default']))

-		$sql  .= " default ".$field_desc['default'];

-		else

-		$sql  .= " default '".$field_desc['default']."'";

-		if( preg_match("/^[^\s]/i",$field_desc['extra']))

-		$sql  .= " ".$field_desc['extra'];

+		if( preg_match("/^[^\s]/i",$field_desc['value'])) {
+				$sql  .= "(".$field_desc['value'].")";
+		}
+		if( preg_match("/^[^\s]/i",$field_desc['attribute'])) {
+				$sql  .= " ".$field_desc['attribute'];
+		}
+		if( preg_match("/^[^\s]/i",$field_desc['null'])) {
+				$sql  .= " ".$field_desc['null'];
+		}
+		if( preg_match("/^[^\s]/i",$field_desc['default'])) {
+				if(preg_match("/null/i",$field_desc['default']))

+		$sql  .= " default ".$field_desc['default'];
+		} else {
+				$sql  .= " default '".$field_desc['default']."'";
+		}
+		if( preg_match("/^[^\s]/i",$field_desc['extra'])) {
+				$sql  .= " ".$field_desc['extra'];
+		}
 		$sql .= " ".$field_position;

 

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

-            return -1;

-		else

-		return 1;

+		if (!$this->query($sql)) {
+		            return -1;
+		} else {
+				return 1;
+		}
 	}

 

     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps

@@ -987,10 +1002,11 @@ 
 		}

 

 		dol_syslog($sql,LOG_DEBUG);

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

-		return -1;

-		else

-		return 1;

+		if (! $this->query($sql)) {
+				return -1;
+		} else {
+				return 1;
+		}
 	}

 

     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps

@@ -1010,8 +1026,9 @@ 
 		{

 			$this->error=$this->lasterror();

 			return -1;

-		}

-		else return 1;

+		} else {
+		    return 1;
+		}
 	}

 

     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps

@@ -1035,8 +1052,7 @@ 
             if ($this->lasterrno != '15025')

             {

 	            return -1;

-            }

-            else

+            } else

 			{

             	// If user already exists, we continue to set permissions

             	dol_syslog(get_class($this)."::DDLCreateUser sql=".$sql, LOG_WARNING);

@@ -1048,8 +1064,7 @@ 
         {

             dol_syslog(get_class($this)."::DDLCreateUser sql=".$sql, LOG_WARNING);

             return -1;

-        }

-        else

+        } else

         {

             if ($num)

             {

@@ -1204,8 +1219,7 @@ 
 	    if (is_array($fields))

 	    {

 	        $where=" IN ('".implode("','",$fields)."')";

-	    }

-	    else

+	    } else

 	    {

 	        $where="='".$this->escape($fields)."'";

 	    }

@@ -1217,9 +1231,9 @@ 
 	        {

 	            $result[]=$obj;

 	        }

-	    }

-	    else

-	        return false;

+	    } else {
+	    	        return false;
+	    }
 

 	    return $result;

 	}

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

Braces +120 added lines, -87 removed lines

@@ -68,8 +68,12 @@ 
         global $conf;

 

         // Note that having "static" property for "$forcecharset" and "$forcecollate" will make error here in strict mode, so they are not static

-        if (! empty($conf->db->character_set)) $this->forcecharset=$conf->db->character_set;

-        if (! empty($conf->db->dolibarr_main_db_collation)) $this->forcecollate=$conf->db->dolibarr_main_db_collation;

+        if (! empty($conf->db->character_set)) {
+            $this->forcecharset=$conf->db->character_set;
+        }
+        if (! empty($conf->db->dolibarr_main_db_collation)) {
+            $this->forcecollate=$conf->db->dolibarr_main_db_collation;
+        }
 

         $this->database_user=$user;

         $this->database_host=$host;

@@ -117,8 +121,7 @@ 
             $this->addCustomFunction('WEEKDAY');

             $this->addCustomFunction('date_format');

             //$this->db->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_EXCEPTION);

-        }

-        else

+        } else

         {

             // host, login ou password incorrect

             $this->connected = false;

@@ -155,9 +158,13 @@ 
         {

             if ($type == 'auto')

             {

-              if (preg_match('/ALTER TABLE/i',$line)) $type='dml';

-              else if (preg_match('/CREATE TABLE/i',$line)) $type='dml';

-              else if (preg_match('/DROP TABLE/i',$line)) $type='dml';

+              if (preg_match('/ALTER TABLE/i',$line)) {
+                  $type='dml';
+              } else if (preg_match('/CREATE TABLE/i',$line)) {
+                  $type='dml';
+              } else if (preg_match('/DROP TABLE/i',$line)) {
+                  $type='dml';
+              }
             }

 

             if ($type == 'dml')

@@ -277,9 +284,11 @@ 
             // DELETE FROM tabletodelete USING tabletodelete, othertable -> DELETE FROM tabletodelete USING othertable

             if (preg_match('/DELETE FROM ([a-z_]+) USING ([a-z_]+), ([a-z_]+)/i',$line,$reg))

             {

-				if ($reg[1] == $reg[2])	// If same table, we remove second one

+				if ($reg[1] == $reg[2]) {
+				    // If same table, we remove second one

                 {

-                    $line=preg_replace('/DELETE FROM ([a-z_]+) USING ([a-z_]+), ([a-z_]+)/i','DELETE FROM \\1 USING \\3', $line);

+                    $line=preg_replace('/DELETE FROM ([a-z_]+) USING ([a-z_]+), ([a-z_]+)/i','DELETE FROM \\1 USING \\3', $line);
+				}
                 }

             }

 

@@ -336,7 +345,9 @@ 
         dol_syslog(get_class($this)."::connect name=".$name,LOG_DEBUG);

 

         $dir=$main_data_dir;

-        if (empty($dir)) $dir=DOL_DATA_ROOT;

+        if (empty($dir)) {
+            $dir=DOL_DATA_ROOT;
+        }
         // With sqlite, port must be in connect parameters

         //if (! $newport) $newport=3306;

         $database_name = $dir.'/database_'.$name.'.sdb';

@@ -345,8 +356,7 @@ 
             //$this->db = new PDO("sqlite:".$dir.'/database_'.$name.'.sdb');

 			$this->db = new SQLite3($database_name);

             //$this->db->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_EXCEPTION);

-        }

-        catch(Exception $e)

+        } catch(Exception $e)

         {

             $this->error=  self::LABEL.' '.$e->getMessage().' current dir='.$database_name;

             return '';

@@ -389,7 +399,9 @@ 
     {

         if ($this->db)

         {

-            if ($this->transaction_opened > 0) dol_syslog(get_class($this)."::close Closing a connection with an opened transaction depth=".$this->transaction_opened,LOG_ERR);

+            if ($this->transaction_opened > 0) {
+                dol_syslog(get_class($this)."::close Closing a connection with an opened transaction depth=".$this->transaction_opened,LOG_ERR);
+            }
             $this->connected=false;

             $this->db->close();

             unset($this->db);    // Clean this->db

@@ -467,8 +479,7 @@ 
             if ($ret) {

                 $ret->queryString = $query;

             }

-        }

-        catch(Exception $e)

+        } catch(Exception $e)

         {

             $this->error=$this->db->lastErrorMsg();

         }

@@ -552,8 +563,7 @@ 
         {

             if (! is_object($resultset)) { $resultset=$this->_results; }

             return $resultset->fetchArray(SQLITE3_NUM);

-        }

-        else

+        } else

         {

             // si le curseur est un booleen on retourne la valeur 0

             return false;

@@ -616,7 +626,9 @@ 
         // If resultset not provided, we take the last used by connexion

         if (! is_object($resultset)) { $resultset=$this->_results; }

         // Si resultset en est un, on libere la memoire

-        if ($resultset && is_object($resultset)) $resultset->finalize();

+        if ($resultset && is_object($resultset)) {
+            $resultset->finalize();
+        }
     }

 

     /**

@@ -640,8 +652,7 @@ 
         if (! $this->connected) {

             // Si il y a eu echec de connexion, $this->db n'est pas valide.

             return 'DB_ERROR_FAILED_TO_CONNECT';

-        }

-        else {

+        } else {

             // Constants to convert error code to a generic Dolibarr error code

             /*$errorcode_map = array(

             1004 => 'DB_ERROR_CANNOT_CREATE',

@@ -678,14 +689,21 @@ 
             $errno=$this->db->lastErrorCode();

 			if ($errno=='HY000' || $errno == 0)

             {

-                if (preg_match('/table.*already exists/i',$this->error))     return 'DB_ERROR_TABLE_ALREADY_EXISTS';

-                elseif (preg_match('/index.*already exists/i',$this->error)) return 'DB_ERROR_KEY_NAME_ALREADY_EXISTS';

-                elseif (preg_match('/syntax error/i',$this->error))          return 'DB_ERROR_SYNTAX';

+                if (preg_match('/table.*already exists/i',$this->error)) {
+                    return 'DB_ERROR_TABLE_ALREADY_EXISTS';
+                } elseif (preg_match('/index.*already exists/i',$this->error)) {
+                    return 'DB_ERROR_KEY_NAME_ALREADY_EXISTS';
+                } elseif (preg_match('/syntax error/i',$this->error)) {
+                    return 'DB_ERROR_SYNTAX';
+                }
             }

             if ($errno=='23000')

             {

-                if (preg_match('/column.* not unique/i',$this->error))       return 'DB_ERROR_RECORD_ALREADY_EXISTS';

-                elseif (preg_match('/PRIMARY KEY must be unique/i',$this->error)) return 'DB_ERROR_RECORD_ALREADY_EXISTS';

+                if (preg_match('/column.* not unique/i',$this->error)) {
+                    return 'DB_ERROR_RECORD_ALREADY_EXISTS';
+                } elseif (preg_match('/PRIMARY KEY must be unique/i',$this->error)) {
+                    return 'DB_ERROR_RECORD_ALREADY_EXISTS';
+                }
             }

             if ($errno > 1) {

                 // TODO Voir la liste des messages d'erreur

@@ -705,8 +723,7 @@ 
         if (! $this->connected) {

             // Si il y a eu echec de connexion, $this->db n'est pas valide pour sqlite_error.

             return 'Not connected. Check setup parameters in conf/conf.php file and your sqlite version';

-        }

-        else {

+        } else {

             return $this->error;

         }

     }

@@ -750,8 +767,7 @@ 
             if ($cryptType == 2)

             {

                 $return = 'AES_ENCRYPT('.$return.',\''.$cryptKey.'\')';

-            }

-            else if ($cryptType == 1)

+            } else if ($cryptType == 1)

             {

                 $return = 'DES_ENCRYPT('.$return.',\''.$cryptKey.'\')';

             }

@@ -783,8 +799,7 @@ 
             if ($cryptType == 2)

             {

                 $return = 'AES_DECRYPT('.$value.',\''.$cryptKey.'\')';

-            }

-            else if ($cryptType == 1)

+            } else if ($cryptType == 1)

             {

                 $return = 'DES_DECRYPT('.$value.',\''.$cryptKey.'\')';

             }

@@ -822,8 +837,12 @@ 
     function DDLCreateDb($database,$charset='',$collation='',$owner='')

     {

         // phpcs:enable

-        if (empty($charset))   $charset=$this->forcecharset;

-        if (empty($collation)) $collation=$this->forcecollate;

+        if (empty($charset)) {
+            $charset=$this->forcecharset;
+        }
+        if (empty($collation)) {
+            $collation=$this->forcecollate;
+        }
 

         // ALTER DATABASE dolibarr_db DEFAULT CHARACTER SET latin DEFAULT COLLATE latin1_swedish_ci

         $sql = 'CREATE DATABASE '.$database;

@@ -855,7 +874,9 @@ 
         $listtables=array();

 

         $like = '';

-        if ($table) $like = "LIKE '".$table."'";

+        if ($table) {
+            $like = "LIKE '".$table."'";
+        }
         $sql="SHOW TABLES FROM ".$database." ".$like.";";

         //print $sql;

         $result = $this->query($sql);

@@ -922,26 +943,27 @@ 
         {

             $sqlfields[$i] = $field_name." ";

             $sqlfields[$i]  .= $field_desc['type'];

-            if( preg_match("/^[^\s]/i",$field_desc['value']))

-            $sqlfields[$i]  .= "(".$field_desc['value'].")";

-            else if( preg_match("/^[^\s]/i",$field_desc['attribute']))

-            $sqlfields[$i]  .= " ".$field_desc['attribute'];

-            else if( preg_match("/^[^\s]/i",$field_desc['default']))

+            if( preg_match("/^[^\s]/i",$field_desc['value'])) {
+                        $sqlfields[$i]  .= "(".$field_desc['value'].")";
+            } else if( preg_match("/^[^\s]/i",$field_desc['attribute'])) {
+                        $sqlfields[$i]  .= " ".$field_desc['attribute'];
+            } else if( preg_match("/^[^\s]/i",$field_desc['default']))

             {

-                if(preg_match("/null/i",$field_desc['default']))

-                $sqlfields[$i]  .= " default ".$field_desc['default'];

-                else

-                $sqlfields[$i]  .= " default '".$field_desc['default']."'";

-            }

-            else if( preg_match("/^[^\s]/i",$field_desc['null']))

-            $sqlfields[$i]  .= " ".$field_desc['null'];

-

-            else if( preg_match("/^[^\s]/i",$field_desc['extra']))

-            $sqlfields[$i]  .= " ".$field_desc['extra'];

+                if(preg_match("/null/i",$field_desc['default'])) {
+                                $sqlfields[$i]  .= " default ".$field_desc['default'];
+                } else {
+                                $sqlfields[$i]  .= " default '".$field_desc['default']."'";
+                }
+            } else if( preg_match("/^[^\s]/i",$field_desc['null'])) {
+                        $sqlfields[$i]  .= " ".$field_desc['null'];
+            } else if( preg_match("/^[^\s]/i",$field_desc['extra'])) {
+                        $sqlfields[$i]  .= " ".$field_desc['extra'];
+            }
             $i++;

         }

-        if($primary_key != "")

-        $pk = "primary key(".$primary_key.")";

+        if($primary_key != "") {
+                $pk = "primary key(".$primary_key.")";
+        }
 

         if(is_array($unique_keys))

         {

@@ -962,17 +984,21 @@ 
             }

         }

         $sql .= implode(',',$sqlfields);

-        if($primary_key != "")

-        $sql .= ",".$pk;

-        if(is_array($unique_keys))

-        $sql .= ",".implode(',',$sqluq);

-        if(is_array($keys))

-        $sql .= ",".implode(',',$sqlk);

+        if($primary_key != "") {
+                $sql .= ",".$pk;
+        }
+        if(is_array($unique_keys)) {
+                $sql .= ",".implode(',',$sqluq);
+        }
+        if(is_array($keys)) {
+                $sql .= ",".implode(',',$sqlk);
+        }
         $sql .=") type=".$type;

 

         dol_syslog($sql,LOG_DEBUG);

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

-            return -1;

+        if (!$this->query($sql)) {
+                    return -1;
+        }
         return 1;

     }

 

@@ -988,10 +1014,11 @@ 
         // phpcs:enable

     	$sql = "DROP TABLE ".$table;

 

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

-    		return -1;

-    	else

-    		return 1;

+    	if (! $this->query($sql)) {
+    	    		return -1;
+    	} else {
+    	    		return 1;
+    	}
     }

 

     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps

@@ -1029,24 +1056,29 @@ 
         // ex. : $field_desc = array('type'=>'int','value'=>'11','null'=>'not null','extra'=> 'auto_increment');

         $sql= "ALTER TABLE ".$table." ADD ".$field_name." ";

         $sql.= $field_desc['type'];

-        if(preg_match("/^[^\s]/i",$field_desc['value']))

-        if (! in_array($field_desc['type'],array('date','datetime')))

+        if(preg_match("/^[^\s]/i",$field_desc['value'])) {
+                if (! in_array($field_desc['type'],array('date','datetime')))

         {

-            $sql.= "(".$field_desc['value'].")";

+            $sql.= "(".$field_desc['value'].")";
+        }
         }

-        if(preg_match("/^[^\s]/i",$field_desc['attribute']))

-        $sql.= " ".$field_desc['attribute'];

-        if(preg_match("/^[^\s]/i",$field_desc['null']))

-        $sql.= " ".$field_desc['null'];

+        if(preg_match("/^[^\s]/i",$field_desc['attribute'])) {
+                $sql.= " ".$field_desc['attribute'];
+        }
+        if(preg_match("/^[^\s]/i",$field_desc['null'])) {
+                $sql.= " ".$field_desc['null'];
+        }
         if(preg_match("/^[^\s]/i",$field_desc['default']))

         {

-            if(preg_match("/null/i",$field_desc['default']))

-            $sql.= " default ".$field_desc['default'];

-            else

-            $sql.= " default '".$field_desc['default']."'";

+            if(preg_match("/null/i",$field_desc['default'])) {
+                        $sql.= " default ".$field_desc['default'];
+            } else {
+                        $sql.= " default '".$field_desc['default']."'";
+            }
         }

-        if(preg_match("/^[^\s]/i",$field_desc['extra']))

-        $sql.= " ".$field_desc['extra'];

+        if(preg_match("/^[^\s]/i",$field_desc['extra'])) {
+                $sql.= " ".$field_desc['extra'];
+        }
         $sql.= " ".$field_position;

 

         dol_syslog(get_class($this)."::DDLAddField ".$sql,LOG_DEBUG);

@@ -1076,8 +1108,9 @@ 
         }

 

         dol_syslog(get_class($this)."::DDLUpdateField ".$sql,LOG_DEBUG);

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

-            return -1;

+        if (! $this->query($sql)) {
+                    return -1;
+        }
         return 1;

     }

 

@@ -1279,8 +1312,7 @@ 
                 $obj = $this->fetch_row($resql);

                 //dol_syslog(get_class($this)."::select_db getServerParametersValues $var=". print_r($obj, true), LOG_DEBUG);

                 $result[$var] = $obj[0];

-            }

-            else {

+            } else {

                 // TODO Récupérer le message

                 $result[$var] = 'FAIL';

             }

@@ -1350,11 +1382,12 @@ 
     {

         // phpcs:enable

         $y = $year;

-        if ($y == 0 && $month == 0) return 0;

+        if ($y == 0 && $month == 0) {
+            return 0;
+        }
         $num = (365* $y + 31 * ($month - 1) + $day);

         if ($month <= 2) {

-            $y--; }

-        else {

+            $y--; } else {

             $num -= floor(($month * 4 + 23) / 10);

         }

         $temp = floor(($y / 100 + 1) * 3 / 4);

@@ -1414,8 +1447,9 @@ 
 

         if ($month == 1 && $day <= 7-$weekday)

         {

-            if (!$week_year && (($first_weekday && $weekday != 0) || (!$first_weekday && $weekday >= 4)))

-                return 0;

+            if (!$week_year && (($first_weekday && $weekday != 0) || (!$first_weekday && $weekday >= 4))) {
+                            return 0;
+            }
             $week_year= 1;

             $calc_year--;

             $first_daynr-= ($days=self::calc_days_in_year($calc_year));

@@ -1424,8 +1458,7 @@ 
 

       if (($first_weekday && $weekday != 0) || (!$first_weekday && $weekday >= 4)) {

         $days= $daynr - ($first_daynr+ (7-$weekday));

-      }

-      else {

+      } else {

         $days= $daynr - ($first_daynr - $weekday);

       }

 

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

Braces +109 added lines, -67 removed lines

@@ -65,8 +65,12 @@ 
         global $conf,$langs;

 

         // Note that having "static" property for "$forcecharset" and "$forcecollate" will make error here in strict mode, so they are not static

-        if (! empty($conf->db->character_set)) $this->forcecharset=$conf->db->character_set;

-        if (! empty($conf->db->dolibarr_main_db_collation)) $this->forcecollate=$conf->db->dolibarr_main_db_collation;

+        if (! empty($conf->db->character_set)) {
+            $this->forcecharset=$conf->db->character_set;
+        }
+        if (! empty($conf->db->dolibarr_main_db_collation)) {
+            $this->forcecollate=$conf->db->dolibarr_main_db_collation;
+        }
 

         $this->database_user=$user;

         $this->database_host=$host;

@@ -117,18 +121,23 @@ 
 

                 // If client is old latin, we force utf8

                 $clientmustbe=empty($conf->db->dolibarr_main_db_character_set)?'utf8':$conf->db->dolibarr_main_db_character_set;

-                if (preg_match('/latin1/', $clientmustbe)) $clientmustbe='utf8';

+                if (preg_match('/latin1/', $clientmustbe)) {
+                    $clientmustbe='utf8';
+                }
 

 				if ($this->db->character_set_name() != $clientmustbe) {

 					$this->db->set_charset($clientmustbe);	// This set charset, but with a bad collation

 

 					$collation = $conf->db->dolibarr_main_db_collation;

-					if (preg_match('/latin1/', $collation)) $collation='utf8_unicode_ci';

+					if (preg_match('/latin1/', $collation)) {
+					    $collation='utf8_unicode_ci';
+					}
 

-					if (! preg_match('/general/', $collation)) $this->db->query("SET collation_connection = ".$collation);

+					if (! preg_match('/general/', $collation)) {
+					    $this->db->query("SET collation_connection = ".$collation);
+					}
 				}

-            }

-            else

+            } else

             {

                 $this->database_selected = false;

                 $this->database_name = '';

@@ -136,8 +145,7 @@ 
                 $this->error=$this->error();

                 dol_syslog(get_class($this)."::DoliDBMysqli : Select_db error ".$this->error,LOG_ERR);

             }

-        }

-        else

+        } else

         {

             // Pas de selection de base demandee, ok ou ko

             $this->database_selected = false;

@@ -146,15 +154,21 @@ 
             {

             	// If client is old latin, we force utf8

             	$clientmustbe=empty($conf->db->dolibarr_main_db_character_set)?'utf8':$conf->db->dolibarr_main_db_character_set;

-            	if (preg_match('/latin1/', $clientmustbe)) $clientmustbe='utf8';

+            	if (preg_match('/latin1/', $clientmustbe)) {
+            	    $clientmustbe='utf8';
+            	}
 

 				if ($this->db->character_set_name() != $clientmustbe) {

 					$this->db->set_charset($clientmustbe);	// This set utf8_general_ci

 

 					$collation = $conf->db->dolibarr_main_db_collation;

-					if (preg_match('/latin1/', $collation)) $collation='utf8_unicode_ci';

+					if (preg_match('/latin1/', $collation)) {
+					    $collation='utf8_unicode_ci';
+					}
 

-					if (! preg_match('/general/', $collation)) $this->db->query("SET collation_connection = ".$collation);

+					if (! preg_match('/general/', $collation)) {
+					    $this->db->query("SET collation_connection = ".$collation);
+					}
 				}

 			}

         }

@@ -240,7 +254,9 @@ 
     {

         if ($this->db)

         {

-	        if ($this->transaction_opened > 0) dol_syslog(get_class($this)."::close Closing a connection with an opened transaction depth=".$this->transaction_opened,LOG_ERR);

+	        if ($this->transaction_opened > 0) {
+	            dol_syslog(get_class($this)."::close Closing a connection with an opened transaction depth=".$this->transaction_opened,LOG_ERR);
+	        }
             $this->connected=false;

             return $this->db->close();

         }

@@ -264,14 +280,15 @@ 
 

         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)

         {

             // Ordre SQL ne necessitant pas de connexion a une base (exemple: CREATE DATABASE)

             $ret = $this->db->query($query);

-        }

-        else

+        } else

         {

             $ret = $this->db->query($query);

         }

@@ -285,7 +302,10 @@ 
                 $this->lasterror = $this->error();

                 $this->lasterrno = $this->errno();

 

-				if ($conf->global->SYSLOG_LEVEL < LOG_DEBUG) dol_syslog(get_class($this)."::query SQL Error query: ".$query, LOG_ERR);	// Log of request was not yet done previously

+				if ($conf->global->SYSLOG_LEVEL < LOG_DEBUG) {
+				    dol_syslog(get_class($this)."::query SQL Error query: ".$query, LOG_ERR);
+				}
+				// Log of request was not yet done previously

                 dol_syslog(get_class($this)."::query SQL Error message: ".$this->lasterrno." ".$this->lasterror, LOG_ERR);

             }

             $this->lastquery=$query;

@@ -341,8 +361,7 @@ 
         {

             if (! is_object($resultset)) { $resultset=$this->_results; }

             return $resultset->fetch_row();

-        }

-        else

+        } else

         {

             // si le curseur est un booleen on retourne la valeur 0

             return 0;

@@ -395,7 +414,9 @@ 
         // If resultset not provided, we take the last used by connexion

         if (! is_object($resultset)) { $resultset=$this->_results; }

         // Si resultset en est un, on libere la memoire

-        if (is_object($resultset)) $resultset->free_result();

+        if (is_object($resultset)) {
+            $resultset->free_result();
+        }
     }

 

     /**

@@ -470,8 +491,7 @@ 
         if (! $this->connected) {

             // Si il y a eu echec de connexion, $this->db n'est pas valide pour mysqli_error.

             return 'Not connected. Check setup parameters in conf/conf.php file and your mysql client and server versions';

-        }

-        else {

+        } else {

             return $this->db->error;

         }

     }

@@ -516,8 +536,7 @@ 
             if ($cryptType == 2)

             {

                 $return = 'AES_ENCRYPT('.$return.',\''.$cryptKey.'\')';

-            }

-            else if ($cryptType == 1)

+            } else if ($cryptType == 1)

             {

                 $return = 'DES_ENCRYPT('.$return.',\''.$cryptKey.'\')';

             }

@@ -549,8 +568,7 @@ 
             if ($cryptType == 2)

             {

                 $return = 'AES_DECRYPT('.$value.',\''.$cryptKey.'\')';

-            }

-            else if ($cryptType == 1)

+            } else if ($cryptType == 1)

             {

                 $return = 'DES_DECRYPT('.$value.',\''.$cryptKey.'\')';

             }

@@ -574,8 +592,9 @@ 
         {

             $row=$this->fetch_row($resql);

             return $row[0];

-        }

-        else return '?';

+        } else {
+            return '?';
+        }
     }

 

     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps

@@ -593,8 +612,12 @@ 
     function DDLCreateDb($database,$charset='',$collation='',$owner='')

     {

         // phpcs:enable

-        if (empty($charset))   $charset=$this->forcecharset;

-        if (empty($collation)) $collation=$this->forcecollate;

+        if (empty($charset)) {
+            $charset=$this->forcecharset;
+        }
+        if (empty($collation)) {
+            $collation=$this->forcecollate;
+        }
 

         // ALTER DATABASE dolibarr_db DEFAULT CHARACTER SET latin DEFAULT COLLATE latin1_swedish_ci

 		$sql = "CREATE DATABASE `".$this->escape($database)."`";

@@ -626,7 +649,9 @@ 
         $listtables=array();

 

         $like = '';

-        if ($table) $like = "LIKE '".$table."'";

+        if ($table) {
+            $like = "LIKE '".$table."'";
+        }
         $sql="SHOW TABLES FROM ".$database." ".$like.";";

         //print $sql;

         $result = $this->query($sql);

@@ -702,8 +727,7 @@ 
 			{

 				if ((preg_match("/null/i",$field_desc['default'])) || (preg_match("/CURRENT_TIMESTAMP/i",$field_desc['default']))) {

 					$sqlfields[$i]  .= " default ".$field_desc['default'];

-				}

-				else {

+				} else {

 					$sqlfields[$i]  .= " default '".$field_desc['default']."'";

 				}

 			}

@@ -715,8 +739,9 @@ 
 			}

             $i++;

         }

-        if($primary_key != "")

-        $pk = "primary key(".$primary_key.")";

+        if($primary_key != "") {
+                $pk = "primary key(".$primary_key.")";
+        }
 

         if(is_array($unique_keys)) {

             $i = 0;

@@ -736,18 +761,22 @@ 
             }

         }

         $sql .= implode(',',$sqlfields);

-        if($primary_key != "")

-        $sql .= ",".$pk;

-        if($unique_keys != "")

-        $sql .= ",".implode(',',$sqluq);

-        if(is_array($keys))

-        $sql .= ",".implode(',',$sqlk);

+        if($primary_key != "") {
+                $sql .= ",".$pk;
+        }
+        if($unique_keys != "") {
+                $sql .= ",".implode(',',$sqluq);
+        }
+        if(is_array($keys)) {
+                $sql .= ",".implode(',',$sqlk);
+        }
         $sql .=") engine=".$type;

 

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

-        return -1;

-        else

-        return 1;

+        if(! $this->query($sql)) {
+                return -1;
+        } else {
+                return 1;
+        }
     }

 

     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps

@@ -762,10 +791,11 @@ 
         // phpcs:enable

         $sql = "DROP TABLE ".$table;

 

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

- 			return -1;

-    	else

-    		return 1;

+		if (! $this->query($sql)) {
+		 			return -1;
+		} else {
+    	    		return 1;
+    	}
     }

 

     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps

@@ -820,10 +850,11 @@ 
         }

         if (isset($field_desc['default']) && preg_match("/^[^\s]/i",$field_desc['default']))

         {

-            if(preg_match("/null/i",$field_desc['default']))

-            $sql.= " default ".$field_desc['default'];

-            else

-            $sql.= " default '".$field_desc['default']."'";

+            if(preg_match("/null/i",$field_desc['default'])) {
+                        $sql.= " default ".$field_desc['default'];
+            } else {
+                        $sql.= " default '".$field_desc['default']."'";
+            }
         }

         if (isset($field_desc['extra']) && preg_match("/^[^\s]/i",$field_desc['extra']))

         {

@@ -862,8 +893,7 @@ 
         	{

         		$sqlbis="UPDATE ".$table." SET ".$field_name." = '".$this->escape($field_desc['default'] ? $field_desc['default'] : '')."' WHERE ".$field_name." IS NULL";

         		$this->query($sqlbis);

-        	}

-        	elseif ($field_desc['type'] == 'tinyint' || $field_desc['type'] == 'int')

+        	} elseif ($field_desc['type'] == 'tinyint' || $field_desc['type'] == 'int')

         	{

         		$sqlbis="UPDATE ".$table." SET ".$field_name." = ".((int) $this->escape($field_desc['default'] ? $field_desc['default'] : 0))." WHERE ".$field_name." IS NULL";

         		$this->query($sqlbis);

@@ -874,15 +904,20 @@ 
 

         if ($field_desc['default'] != '')

         {

-			if ($field_desc['type'] == 'double' || $field_desc['type'] == 'tinyint' || $field_desc['type'] == 'int') $sql.=" DEFAULT ".$this->escape($field_desc['default']);

-        	elseif ($field_desc['type'] == 'text') $sql.=" DEFAULT '".$this->escape($field_desc['default'])."'";							// Default not supported on text fields

+			if ($field_desc['type'] == 'double' || $field_desc['type'] == 'tinyint' || $field_desc['type'] == 'int') {
+			    $sql.=" DEFAULT ".$this->escape($field_desc['default']);
+			} elseif ($field_desc['type'] == 'text') {
+        	    $sql.=" DEFAULT '".$this->escape($field_desc['default'])."'";
+        	}
+        	// Default not supported on text fields

         }

 

         dol_syslog(get_class($this)."::DDLUpdateField ".$sql,LOG_DEBUG);

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

-        return -1;

-        else

-        return 1;

+        if (! $this->query($sql)) {
+                return -1;
+        } else {
+                return 1;
+        }
     }

 

     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps

@@ -927,8 +962,7 @@ 
             if ($this->lasterrno != 'DB_ERROR_USER_ALREADY_EXISTS')

             {

             	return -1;

-            }

-            else

+            } else

 			{

             	// If user already exists, we continue to set permissions

             	dol_syslog(get_class($this)."::DDLCreateUser sql=".$sql, LOG_WARNING);

@@ -1095,11 +1129,15 @@ 
         $result=array();

 

         $sql='SHOW VARIABLES';

-        if ($filter) $sql.=" LIKE '".$this->escape($filter)."'";

+        if ($filter) {
+            $sql.=" LIKE '".$this->escape($filter)."'";
+        }
         $resql=$this->query($sql);

         if ($resql)

         {

-        	while($obj=$this->fetch_object($resql)) $result[$obj->Variable_name]=$obj->Value;

+        	while($obj=$this->fetch_object($resql)) {
+        	    $result[$obj->Variable_name]=$obj->Value;
+        	}
         }

 

         return $result;

@@ -1116,11 +1154,15 @@ 
         $result=array();

 

         $sql='SHOW STATUS';

-        if ($filter) $sql.=" LIKE '".$this->escape($filter)."'";

+        if ($filter) {
+            $sql.=" LIKE '".$this->escape($filter)."'";
+        }
         $resql=$this->query($sql);

         if ($resql)

         {

-            while($obj=$this->fetch_object($resql)) $result[$obj->Variable_name]=$obj->Value;

+            while($obj=$this->fetch_object($resql)) {
+                $result[$obj->Variable_name]=$obj->Value;
+            }
         }

 

         return $result;

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

Braces +164 added lines, -100 removed lines

@@ -74,8 +74,12 @@ 
 		global $conf,$langs;

 

         // Note that having "static" property for "$forcecharset" and "$forcecollate" will make error here in strict mode, so they are not static

-		if (! empty($conf->db->character_set)) $this->forcecharset=$conf->db->character_set;

-		if (! empty($conf->db->dolibarr_main_db_collation))	$this->forcecollate=$conf->db->dolibarr_main_db_collation;

+		if (! empty($conf->db->character_set)) {
+		    $this->forcecharset=$conf->db->character_set;
+		}
+		if (! empty($conf->db->dolibarr_main_db_collation)) {
+		    $this->forcecollate=$conf->db->dolibarr_main_db_collation;
+		}
 

 		$this->database_user=$user;

         $this->database_host=$host;

@@ -111,8 +115,7 @@ 
 		{

 			$this->connected = true;

 			$this->ok = true;

-		}

-		else

+		} else

 		{

 			// host, login ou password incorrect

 			$this->connected = false;

@@ -129,8 +132,7 @@ 
 				$this->database_selected = true;

 				$this->database_name = $name;

 				$this->ok = true;

-			}

-			else

+			} else

 			{

 				$this->database_selected = false;

 				$this->database_name = '';

@@ -138,8 +140,7 @@ 
 				$this->error=$this->error();

 				dol_syslog(get_class($this)."::DoliDBPgsql : Erreur Select_db ".$this->error,LOG_ERR);

 			}

-		}

-		else

+		} else

 		{

 			// Pas de selection de base demandee, ok ou ko

 			$this->database_selected = false;

@@ -179,9 +180,13 @@ 
 

 		    if ($type == 'auto')

 		    {

-              if (preg_match('/ALTER TABLE/i',$line)) $type='dml';

-              else if (preg_match('/CREATE TABLE/i',$line)) $type='dml';

-              else if (preg_match('/DROP TABLE/i',$line)) $type='dml';

+              if (preg_match('/ALTER TABLE/i',$line)) {
+                  $type='dml';
+              } else if (preg_match('/CREATE TABLE/i',$line)) {
+                  $type='dml';
+              } else if (preg_match('/DROP TABLE/i',$line)) {
+                  $type='dml';
+              }
 		    }

 

     		$line=preg_replace('/ as signed\)/i',' as integer)',$line);

@@ -328,9 +333,11 @@ 
 			// DELETE FROM tabletodelete USING tabletodelete, othertable -> DELETE FROM tabletodelete USING othertable

 			if (preg_match('/DELETE FROM ([a-z_]+) USING ([a-z_]+), ([a-z_]+)/i',$line,$reg))

 			{

-				if ($reg[1] == $reg[2])	// If same table, we remove second one

+				if ($reg[1] == $reg[2]) {
+				    // If same table, we remove second one

 				{

-					$line=preg_replace('/DELETE FROM ([a-z_]+) USING ([a-z_]+), ([a-z_]+)/i','DELETE FROM \\1 USING \\3', $line);

+					$line=preg_replace('/DELETE FROM ([a-z_]+) USING ([a-z_]+), ([a-z_]+)/i','DELETE FROM \\1 USING \\3', $line);
+				}
 				}

 			}

 

@@ -358,7 +365,9 @@ 
 			// By default we do not (should be already done by db->escape function if required

 			// except for sql insert in data file that are mysql escaped so we removed them to

 			// be compatible with standard_conforming_strings=on that considers \ as ordinary character).

-			if ($unescapeslashquot) $line=preg_replace("/\\\'/","''",$line);

+			if ($unescapeslashquot) {
+			    $line=preg_replace("/\\\'/","''",$line);
+			}
 

 			//print "type=".$type." newline=".$line."<br>\n";

 		}

@@ -409,7 +418,10 @@ 
 		$name = str_replace(array("\\", "'"), array("\\\\", "\\'"), $name);

 		$port = str_replace(array("\\", "'"), array("\\\\", "\\'"), $port);

 

-		if (! $name) $name="postgres";    // When try to connect using admin user

+		if (! $name) {
+		    $name="postgres";
+		}
+		// When try to connect using admin user

 

 		// try first Unix domain socket (local)

 		if ((! empty($host) && $host == "socket") && ! defined('NOLOCALSOCKETPGCONNECT'))

@@ -421,8 +433,12 @@ 
 		// if local connection failed or not requested, use TCP/IP

 		if (! $this->db)

 		{

-		    if (! $host) $host = "localhost";

-			if (! $port) $port = 5432;

+		    if (! $host) {
+		        $host = "localhost";
+		    }
+			if (! $port) {
+			    $port = 5432;
+			}
 

 			$con_string = "host='".$host."' port='".$port."' dbname='".$name."' user='".$login."' password='".$passwd."'";

 			$this->db = @pg_connect($con_string);

@@ -475,7 +491,9 @@ 
     {

         if ($this->db)

         {

-          if ($this->transaction_opened > 0) dol_syslog(get_class($this)."::close Closing a connection with an opened transaction depth=".$this->transaction_opened,LOG_ERR);

+          if ($this->transaction_opened > 0) {
+              dol_syslog(get_class($this)."::close Closing a connection with an opened transaction depth=".$this->transaction_opened,LOG_ERR);
+          }
           $this->connected=false;

           return pg_close($this->db);

         }

@@ -512,8 +530,9 @@ 
 				{

 					$query=preg_replace('/([^\'])([0-9][0-9][0-9][0-9]-[0-9][0-9]-[0-9][0-9] [0-9][0-9]:[0-9][0-9]:[0-9][0-9])/','\\1\'\\2\'',$query);

 					dol_syslog("Warning: Bad formed request converted into ".$query,LOG_WARNING);

-				}

-				else $loop=false;

+				} else {
+				    $loop=false;
+				}
 			}

 		}

 

@@ -522,29 +541,38 @@ 
 			@pg_query($this->db, 'SAVEPOINT mysavepoint');

 		}

 

-		if (! in_array($query,array('BEGIN','COMMIT','ROLLBACK'))) dol_syslog('sql='.$query, LOG_DEBUG);

+		if (! in_array($query,array('BEGIN','COMMIT','ROLLBACK'))) {
+		    dol_syslog('sql='.$query, LOG_DEBUG);
+		}
 

 		$ret = @pg_query($this->db, $query);

 

 		//print $query;

-		if (! preg_match("/^COMMIT/i",$query) && ! preg_match("/^ROLLBACK/i",$query)) // Si requete utilisateur, on la sauvegarde ainsi que son resultset

+		if (! preg_match("/^COMMIT/i",$query) && ! preg_match("/^ROLLBACK/i",$query)) {
+		    // Si requete utilisateur, on la sauvegarde ainsi que son resultset

 		{

 			if (! $ret)

 			{

 			    if ($this->errno() != 'DB_ERROR_25P02')	// Do not overwrite errors if this is a consecutive error

 			    {

-    				$this->lastqueryerror = $query;

+    				$this->lastqueryerror = $query;
+		}
     				$this->lasterror = $this->error();

     				$this->lasterrno = $this->errno();

 

-    				if ($conf->global->SYSLOG_LEVEL < LOG_DEBUG) dol_syslog(get_class($this)."::query SQL Error query: ".$query, LOG_ERR);	// Log of request was not yet done previously

+    				if ($conf->global->SYSLOG_LEVEL < LOG_DEBUG) {
+    				    dol_syslog(get_class($this)."::query SQL Error query: ".$query, LOG_ERR);
+    				}
+    				// Log of request was not yet done previously

 					dol_syslog(get_class($this)."::query SQL Error message: ".$this->lasterror." (".$this->lasterrno.")", LOG_ERR);

 					dol_syslog(get_class($this)."::query SQL Error usesavepoint = ".$usesavepoint, LOG_ERR);

 			    }

 

-				if ($usesavepoint && $this->transaction_opened)	// Warning, after that errno will be erased

+				if ($usesavepoint && $this->transaction_opened) {
+				    // Warning, after that errno will be erased

 				{

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

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

 			}

 			$this->lastquery=$query;

@@ -645,7 +673,9 @@ 
         // If resultset not provided, we take the last used by connexion

 		if (! is_resource($resultset)) { $resultset=$this->_results; }

 		// Si resultset en est un, on libere la memoire

-		if (is_resource($resultset)) pg_free_result($resultset);

+		if (is_resource($resultset)) {
+		    pg_free_result($resultset);
+		}
 	}

 

 

@@ -659,10 +689,17 @@ 
 	function plimit($limit=0,$offset=0)

 	{

 		global $conf;

-        if (empty($limit)) return "";

-		if ($limit < 0) $limit=$conf->liste_limit;

-		if ($offset > 0) return " LIMIT ".$limit." OFFSET ".$offset." ";

-		else return " LIMIT $limit ";

+        if (empty($limit)) {
+            return "";
+        }
+		if ($limit < 0) {
+		    $limit=$conf->liste_limit;
+		}
+		if ($offset > 0) {
+		    return " LIMIT ".$limit." OFFSET ".$offset." ";
+		} else {
+		    return " LIMIT $limit ";
+		}
 	}

 

 

@@ -712,8 +749,7 @@ 
 		if (! $this->connected) {

 			// Si il y a eu echec de connexion, $this->db n'est pas valide.

 			return 'DB_ERROR_FAILED_TO_CONNECT';

-		}

-		else {

+		} else {

 			// Constants to convert error code to a generic Dolibarr error code

 			$errorcode_map = array(

 			1004 => 'DB_ERROR_CANNOT_CREATE',

@@ -874,8 +910,12 @@ 
 	function DDLCreateDb($database,$charset='',$collation='',$owner='')

 	{

         // phpcs:enable

-	    if (empty($charset))   $charset=$this->forcecharset;

-		if (empty($collation)) $collation=$this->forcecollate;

+	    if (empty($charset)) {
+	        $charset=$this->forcecharset;
+	    }
+		if (empty($collation)) {
+		    $collation=$this->forcecollate;
+		}
 

 		// Test charset match LC_TYPE (pgsql error otherwise)

 		//print $charset.' '.setlocale(LC_CTYPE,'0'); exit;

@@ -900,7 +940,9 @@ 
 		$listtables=array();

 

 		$like = '';

-		if ($table) $like = " AND table_name LIKE '".$table."'";

+		if ($table) {
+		    $like = " AND table_name LIKE '".$table."'";
+		}
 		$result = pg_query($this->db, "SELECT table_name FROM information_schema.tables WHERE table_schema = 'public'".$like." ORDER BY table_name");

         if ($result)

         {

@@ -980,26 +1022,27 @@ 
 		{

 			$sqlfields[$i] = $field_name." ";

 			$sqlfields[$i]  .= $field_desc['type'];

-			if( preg_match("/^[^\s]/i",$field_desc['value']))

-			$sqlfields[$i]  .= "(".$field_desc['value'].")";

-			else if( preg_match("/^[^\s]/i",$field_desc['attribute']))

-			$sqlfields[$i]  .= " ".$field_desc['attribute'];

-			else if( preg_match("/^[^\s]/i",$field_desc['default']))

+			if( preg_match("/^[^\s]/i",$field_desc['value'])) {
+						$sqlfields[$i]  .= "(".$field_desc['value'].")";
+			} else if( preg_match("/^[^\s]/i",$field_desc['attribute'])) {
+						$sqlfields[$i]  .= " ".$field_desc['attribute'];
+			} else if( preg_match("/^[^\s]/i",$field_desc['default']))

 			{

-				if(preg_match("/null/i",$field_desc['default']))

-				$sqlfields[$i]  .= " default ".$field_desc['default'];

-				else

-				$sqlfields[$i]  .= " default '".$field_desc['default']."'";

-			}

-			else if( preg_match("/^[^\s]/i",$field_desc['null']))

-			$sqlfields[$i]  .= " ".$field_desc['null'];

-

-			else if( preg_match("/^[^\s]/i",$field_desc['extra']))

-			$sqlfields[$i]  .= " ".$field_desc['extra'];

+				if(preg_match("/null/i",$field_desc['default'])) {
+								$sqlfields[$i]  .= " default ".$field_desc['default'];
+				} else {
+								$sqlfields[$i]  .= " default '".$field_desc['default']."'";
+				}
+			} else if( preg_match("/^[^\s]/i",$field_desc['null'])) {
+						$sqlfields[$i]  .= " ".$field_desc['null'];
+			} else if( preg_match("/^[^\s]/i",$field_desc['extra'])) {
+						$sqlfields[$i]  .= " ".$field_desc['extra'];
+			}
 			$i++;

 		}

-		if($primary_key != "")

-		$pk = "primary key(".$primary_key.")";

+		if($primary_key != "") {
+				$pk = "primary key(".$primary_key.")";
+		}
 

 		if(is_array($unique_keys))

 		{

@@ -1020,19 +1063,23 @@ 
 			}

 		}

 		$sql .= implode(',',$sqlfields);

-		if($primary_key != "")

-		$sql .= ",".$pk;

-		if(is_array($unique_keys))

-		$sql .= ",".implode(',',$sqluq);

-		if(is_array($keys))

-		$sql .= ",".implode(',',$sqlk);

+		if($primary_key != "") {
+				$sql .= ",".$pk;
+		}
+		if(is_array($unique_keys)) {
+				$sql .= ",".implode(',',$sqluq);
+		}
+		if(is_array($keys)) {
+				$sql .= ",".implode(',',$sqlk);
+		}
 		$sql .=") type=".$type;

 

 		dol_syslog($sql,LOG_DEBUG);

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

-		return -1;

-		else

-		return 1;

+		if(! $this->query($sql)) {
+				return -1;
+		} else {
+				return 1;
+		}
 	}

 

     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps

@@ -1047,10 +1094,11 @@ 
         // phpcs:enable

 		$sql = "DROP TABLE ".$table;

 

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

-			return -1;

-		else

-			return 1;

+		if (! $this->query($sql)) {
+					return -1;
+		} else {
+					return 1;
+		}
 	}

 

     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps

@@ -1092,7 +1140,9 @@ 
         // phpcs:enable

 		$sql ="SELECT attname FROM pg_attribute, pg_type WHERE typname = '".$table."' AND attrelid = typrelid";

 		$sql.=" AND attname NOT IN ('cmin', 'cmax', 'ctid', 'oid', 'tableoid', 'xmin', 'xmax')";

-		if ($field) $sql.= " AND attname = '".$field."'";

+		if ($field) {
+		    $sql.= " AND attname = '".$field."'";
+		}
 

 		dol_syslog($sql,LOG_DEBUG);

 		$this->_results = $this->query($sql);

@@ -1116,27 +1166,33 @@ 
 		// ex. : $field_desc = array('type'=>'int','value'=>'11','null'=>'not null','extra'=> 'auto_increment');

 		$sql= "ALTER TABLE ".$table." ADD ".$field_name." ";

 		$sql .= $field_desc['type'];

-		if (preg_match("/^[^\s]/i",$field_desc['value']))

-		    if (! in_array($field_desc['type'],array('int','date','datetime')))

+		if (preg_match("/^[^\s]/i",$field_desc['value'])) {
+				    if (! in_array($field_desc['type'],array('int','date','datetime')))

 		    {

-		        $sql.= "(".$field_desc['value'].")";

+		        $sql.= "(".$field_desc['value'].")";
+		}
 		    }

-		if (preg_match("/^[^\s]/i",$field_desc['attribute']))

-            $sql .= " ".$field_desc['attribute'];

-		if (preg_match("/^[^\s]/i",$field_desc['null']))

-            $sql .= " ".$field_desc['null'];

-		if (preg_match("/^[^\s]/i",$field_desc['default']))

-            if (preg_match("/null/i",$field_desc['default']))

-                $sql .= " default ".$field_desc['default'];

-		    else

-                $sql .= " default '".$field_desc['default']."'";

-		if (preg_match("/^[^\s]/i",$field_desc['extra']))

-            $sql .= " ".$field_desc['extra'];

+		if (preg_match("/^[^\s]/i",$field_desc['attribute'])) {
+		            $sql .= " ".$field_desc['attribute'];
+		}
+		if (preg_match("/^[^\s]/i",$field_desc['null'])) {
+		            $sql .= " ".$field_desc['null'];
+		}
+		if (preg_match("/^[^\s]/i",$field_desc['default'])) {
+		            if (preg_match("/null/i",$field_desc['default']))

+                $sql .= " default ".$field_desc['default'];
+		} else {
+		                    $sql .= " default '".$field_desc['default']."'";
+		    }
+		if (preg_match("/^[^\s]/i",$field_desc['extra'])) {
+		            $sql .= " ".$field_desc['extra'];
+		}
 		$sql .= " ".$field_position;

 

 		dol_syslog($sql,LOG_DEBUG);

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

-            return -1;

+		if (!$this->query($sql)) {
+		            return -1;
+		}
 		return 1;

 	}

 

@@ -1165,8 +1221,7 @@ 
         	{

         		$sqlbis="UPDATE ".$table." SET ".$field_name." = '".$this->escape($field_desc['default'] ? $field_desc['default'] : '')."' WHERE ".$field_name." IS NULL";

         		$this->query($sqlbis);

-        	}

-        	elseif ($field_desc['type'] == 'tinyint' || $field_desc['type'] == 'int')

+        	} elseif ($field_desc['type'] == 'tinyint' || $field_desc['type'] == 'int')

         	{

         		$sqlbis="UPDATE ".$table." SET ".$field_name." = ".((int) $this->escape($field_desc['default'] ? $field_desc['default'] : 0))." WHERE ".$field_name." IS NULL";

         		$this->query($sqlbis);

@@ -1175,13 +1230,18 @@ 
 

 		if ($field_desc['default'] != '')

 		{

-			if ($field_desc['type'] == 'double' || $field_desc['type'] == 'tinyint' || $field_desc['type'] == 'int') $sql.=" DEFAULT ".$this->escape($field_desc['default']);

-        	elseif ($field_desc['type'] == 'text') $sql.=" DEFAULT '".$this->escape($field_desc['default'])."'";							// Default not supported on text fields

+			if ($field_desc['type'] == 'double' || $field_desc['type'] == 'tinyint' || $field_desc['type'] == 'int') {
+			    $sql.=" DEFAULT ".$this->escape($field_desc['default']);
+			} elseif ($field_desc['type'] == 'text') {
+        	    $sql.=" DEFAULT '".$this->escape($field_desc['default'])."'";
+        	}
+        	// Default not supported on text fields

 		}

 

 		dol_syslog($sql,LOG_DEBUG);

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

-			return -1;

+		if (! $this->query($sql)) {
+					return -1;
+		}
 		return 1;

 	}

 

@@ -1218,8 +1278,9 @@ 
 		{

             $liste=$this->fetch_array($resql);

 		    return $liste['server_encoding'];

-		}

-		else return '';

+		} else {
+		    return '';
+		}
 	}

 

 	/**

@@ -1259,8 +1320,9 @@ 
 		{

 		    $liste=$this->fetch_array($resql);

 			return $liste['lc_collate'];

-		}

-		else return '';

+		} else {
+		    return '';
+		}
 	}

 

 	/**

@@ -1299,8 +1361,7 @@ 
 		if (file_exists('/usr/bin/pg_dump'))

 		{

 		    $fullpathofdump='/usr/bin/pg_dump';

-		}

-		else

+		} else

 		{

             // TODO L'utilisateur de la base doit etre un superadmin pour lancer cette commande

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

@@ -1330,8 +1391,7 @@ 
         if (file_exists('/usr/bin/'.$tool))

         {

             $fullpathofdump='/usr/bin/'.$tool;

-        }

-        else

+        } else

         {

             // TODO L'utilisateur de la base doit etre un superadmin pour lancer cette commande

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

@@ -1357,11 +1417,15 @@ 
 		$result=array();

 

 		$resql='select name,setting from pg_settings';

-		if ($filter) $resql.=" WHERE name = '".$this->escape($filter)."'";

+		if ($filter) {
+		    $resql.=" WHERE name = '".$this->escape($filter)."'";
+		}
 		$resql=$this->query($resql);

 		if ($resql)

 		{

-			while ($obj=$this->fetch_object($resql)) $result[$obj->name]=$obj->setting;

+			while ($obj=$this->fetch_object($resql)) {
+			    $result[$obj->name]=$obj->setting;
+			}
 		}

 

 		return $result;