alxarafe / alixar

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

Indentation +38 added lines, -38 removed lines

@@ -378,7 +378,7 @@ 
         return $line;
     }
 
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
     /**
      *  Select a database
      *  PostgreSQL does not have an equivalent for `mysql_select_db`
@@ -389,7 +389,7 @@ 
      */
     public function select_db($database)
     {
-		// phpcs:enable
+        // phpcs:enable
         if ($database == $this->database_name) {
             return true;
         } else {
@@ -586,7 +586,7 @@ 
         return $ret;
     }
 
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
     /**
      *  Returns the current line (as an object) for the resultset cursor
      *
@@ -595,7 +595,7 @@ 
      */
     public function fetch_object($resultset)
     {
-		// phpcs:enable
+        // phpcs:enable
         // If resultset not provided, we take the last used by connection
         if (!is_resource($resultset) && !is_object($resultset)) {
             $resultset = $this->_results;
@@ -603,7 +603,7 @@ 
         return pg_fetch_object($resultset);
     }
 
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
     /**
      *  Return datas as an array
      *
@@ -612,7 +612,7 @@ 
      */
     public function fetch_array($resultset)
     {
-		// phpcs:enable
+        // phpcs:enable
         // If resultset not provided, we take the last used by connection
         if (!is_resource($resultset) && !is_object($resultset)) {
             $resultset = $this->_results;
@@ -620,7 +620,7 @@ 
         return pg_fetch_array($resultset);
     }
 
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
     /**
      *  Return datas as an array
      *
@@ -629,7 +629,7 @@ 
      */
     public function fetch_row($resultset)
     {
-		// phpcs:enable
+        // phpcs:enable
         // Si le resultset n'est pas fourni, on prend le dernier utilise sur cette connection
         if (!is_resource($resultset) && !is_object($resultset)) {
             $resultset = $this->_results;
@@ -637,7 +637,7 @@ 
         return pg_fetch_row($resultset);
     }
 
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
     /**
      *  Return number of lines for result of a SELECT
      *
@@ -647,7 +647,7 @@ 
      */
     public function num_rows($resultset)
     {
-		// phpcs:enable
+        // phpcs:enable
         // If resultset not provided, we take the last used by connection
         if (!is_resource($resultset) && !is_object($resultset)) {
             $resultset = $this->_results;
@@ -655,7 +655,7 @@ 
         return pg_num_rows($resultset);
     }
 
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
     /**
      * Return the number of lines in the result of a request INSERT, DELETE or UPDATE
      *
@@ -665,7 +665,7 @@ 
      */
     public function affected_rows($resultset)
     {
-		// phpcs:enable
+        // phpcs:enable
         // If resultset not provided, we take the last used by connection
         if (!is_resource($resultset) && !is_object($resultset)) {
             $resultset = $this->_results;
@@ -846,7 +846,7 @@ 
         return pg_last_error($this->db);
     }
 
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
     /**
      * Get last ID after an insert INSERT
      *
@@ -856,7 +856,7 @@ 
      */
     public function last_insert_id($tab, $fieldid = 'rowid')
     {
-		// phpcs:enable
+        // phpcs:enable
         //$result = pg_query($this->db,"SELECT MAX(".$fieldid.") FROM ".$tab);
         $result = pg_query($this->db, "SELECT currval('" . $tab . "_" . $fieldid . "_seq')");
         if (!$result) {
@@ -912,7 +912,7 @@ 
     }
 
 
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
     /**
      * Return connection ID
      *
@@ -920,13 +920,13 @@ 
      */
     public function DDLGetConnectId()
     {
-		// phpcs:enable
+        // phpcs:enable
         return '?';
     }
 
 
 
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
     /**
      *  Create a new database
      *  Do not use function xxx_create_db (xxx=mysql, ...) as they are deprecated
@@ -940,7 +940,7 @@ 
      */
     public function DDLCreateDb($database, $charset = '', $collation = '', $owner = '')
     {
-		// phpcs:enable
+        // phpcs:enable
         if (empty($charset)) {
             $charset = $this->forcecharset;
         }
@@ -960,7 +960,7 @@ 
         return $ret;
     }
 
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
     /**
      *  List tables into a database
      *
@@ -970,7 +970,7 @@ 
      */
     public function DDLListTables($database, $table = '')
     {
-		// phpcs:enable
+        // phpcs:enable
         $listtables = array();
 
         $escapedlike = '';
@@ -988,7 +988,7 @@ 
         return $listtables;
     }
 
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
     /**
      *  List tables into a database
      *
@@ -998,7 +998,7 @@ 
      */
     public function DDLListTablesFull($database, $table = '')
     {
-		// phpcs:enable
+        // phpcs:enable
         $listtables = array();
 
         $escapedlike = '';
@@ -1016,7 +1016,7 @@ 
         return $listtables;
     }
 
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
     /**
      *  List information of columns into a table.
      *
@@ -1025,7 +1025,7 @@ 
      */
     public function DDLInfoTable($table)
     {
-		// phpcs:enable
+        // phpcs:enable
         $infotables = array();
 
         $sql = "SELECT ";
@@ -1054,7 +1054,7 @@ 
     }
 
 
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
     /**
      *  Create a table into database
      *
@@ -1069,7 +1069,7 @@ 
      */
     public function DDLCreateTable($table, $fields, $primary_key, $type, $unique_keys = null, $fulltext_keys = null, $keys = null)
     {
-		// phpcs:enable
+        // phpcs:enable
         // @TODO: $fulltext_keys parameter is unused
 
         $sqlk = array();
@@ -1146,7 +1146,7 @@ 
         }
     }
 
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
     /**
      *  Drop a table into database
      *
@@ -1155,7 +1155,7 @@ 
      */
     public function DDLDropTable($table)
     {
-		// phpcs:enable
+        // phpcs:enable
         $tmptable = preg_replace('/[^a-z0-9\.\-\_]/i', '', $table);
 
         $sql = "DROP TABLE " . $this->sanitize($tmptable);
@@ -1167,7 +1167,7 @@ 
         }
     }
 
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
     /**
      *  Return a pointer of line with description of a table or field
      *
@@ -1177,7 +1177,7 @@ 
      */
     public function DDLDescTable($table, $field = "")
     {
-		// phpcs:enable
+        // phpcs:enable
         $sql = "SELECT attname FROM pg_attribute, pg_type WHERE typname = '" . $this->escape($table) . "' AND attrelid = typrelid";
         $sql .= " AND attname NOT IN ('cmin', 'cmax', 'ctid', 'oid', 'tableoid', 'xmin', 'xmax')";
         if ($field) {
@@ -1189,7 +1189,7 @@ 
         return $this->_results;
     }
 
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
     /**
      *  Create a new field into table
      *
@@ -1201,7 +1201,7 @@ 
      */
     public function DDLAddField($table, $field_name, $field_desc, $field_position = "")
     {
-		// phpcs:enable
+        // 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 " . $this->sanitize($table) . " ADD " . $this->sanitize($field_name) . " ";
@@ -1238,7 +1238,7 @@ 
         return 1;
     }
 
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
     /**
      *  Update format of a field into a table
      *
@@ -1249,7 +1249,7 @@ 
      */
     public function DDLUpdateField($table, $field_name, $field_desc)
     {
-		// phpcs:enable
+        // phpcs:enable
         $sql = "ALTER TABLE " . $this->sanitize($table);
         $sql .= " ALTER COLUMN " . $this->sanitize($field_name) . " TYPE " . $this->sanitize($field_desc['type']);
         if (isset($field_desc['value']) && preg_match("/^[^\s]/i", $field_desc['value'])) {
@@ -1284,7 +1284,7 @@ 
         return 1;
     }
 
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
     /**
      *  Drop a field from table
      *
@@ -1294,7 +1294,7 @@ 
      */
     public function DDLDropField($table, $field_name)
     {
-		// phpcs:enable
+        // phpcs:enable
         $tmp_field_name = preg_replace('/[^a-z0-9\.\-\_]/i', '', $field_name);
 
         $sql = "ALTER TABLE " . $this->sanitize($table) . " DROP COLUMN " . $this->sanitize($tmp_field_name);
@@ -1305,7 +1305,7 @@ 
         return 1;
     }
 
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
     /**
      *  Create a user to connect to database
      *
@@ -1317,7 +1317,7 @@ 
      */
     public function DDLCreateUser($dolibarr_main_db_host, $dolibarr_main_db_user, $dolibarr_main_db_pass, $dolibarr_main_db_name)
     {
-		// phpcs:enable
+        // phpcs:enable
         // Note: using ' on user does not works with pgsql
         $sql = "CREATE USER " . $this->sanitize($dolibarr_main_db_user) . " with password '" . $this->escape($dolibarr_main_db_pass) . "'";
 

Spacing +1 added lines, -1 removed lines

@@ -1110,7 +1110,7 @@
                 $sqlfields[$i] .= " " . $this->sanitize($field_desc['extra'], 0, 0, 1);
             }
             if (!empty($primary_key) && $primary_key == $field_name) {
-                $sqlfields[$i] .= " AUTO_INCREMENT PRIMARY KEY";    // mysql instruction that will be converted by driver late
+                $sqlfields[$i] .= " AUTO_INCREMENT PRIMARY KEY"; // mysql instruction that will be converted by driver late
             }
             $i++;
         }

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

Indentation +38 added lines, -38 removed lines

@@ -215,7 +215,7 @@ 
     }
 
 
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
     /**
      *  Select a database
      *
@@ -224,7 +224,7 @@ 
      */
     public function select_db($database)
     {
-		// phpcs:enable
+        // phpcs:enable
         dol_syslog(get_class($this) . "::select_db database=" . $database, LOG_DEBUG);
         $result = false;
         try {
@@ -388,7 +388,7 @@ 
         return $msg;
     }
 
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
     /**
      *  Returns the current line (as an object) for the resultset cursor
      *
@@ -397,7 +397,7 @@ 
      */
     public function fetch_object($resultset)
     {
-		// phpcs:enable
+        // phpcs:enable
         // If the resultset was not provided, we get the last one for this connection
         if (!is_object($resultset)) {
             $resultset = $this->_results;
@@ -406,7 +406,7 @@ 
     }
 
 
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
     /**
      *  Return datas as an array
      *
@@ -415,7 +415,7 @@ 
      */
     public function fetch_array($resultset)
     {
-		// phpcs:enable
+        // phpcs:enable
         // If resultset not provided, we take the last used by connection
         if (!is_object($resultset)) {
             $resultset = $this->_results;
@@ -423,7 +423,7 @@ 
         return $resultset->fetch_array();
     }
 
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
     /**
      *  Return datas as an array
      *
@@ -432,7 +432,7 @@ 
      */
     public function fetch_row($resultset)
     {
-		// phpcs:enable
+        // phpcs:enable
         // If resultset not provided, we take the last used by connection
         if (!is_bool($resultset)) {
             if (!is_object($resultset)) {
@@ -445,7 +445,7 @@ 
         }
     }
 
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
     /**
      *  Return number of lines for result of a SELECT
      *
@@ -455,7 +455,7 @@ 
      */
     public function num_rows($resultset)
     {
-		// phpcs:enable
+        // phpcs:enable
         // If resultset not provided, we take the last used by connection
         if (!is_object($resultset)) {
             $resultset = $this->_results;
@@ -463,7 +463,7 @@ 
         return isset($resultset->num_rows) ? $resultset->num_rows : 0;
     }
 
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
     /**
      *  Return the number of lines in the result of a request INSERT, DELETE or UPDATE
      *
@@ -473,7 +473,7 @@ 
      */
     public function affected_rows($resultset)
     {
-		// phpcs:enable
+        // phpcs:enable
         // If resultset not provided, we take the last used by connection
         if (!is_object($resultset)) {
             $resultset = $this->_results;
@@ -591,7 +591,7 @@ 
         }
     }
 
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
     /**
      * Get last ID after an insert INSERT
      *
@@ -601,7 +601,7 @@ 
      */
     public function last_insert_id($tab, $fieldid = 'rowid')
     {
-		// phpcs:enable
+        // phpcs:enable
         return $this->db->insert_id;
     }
 
@@ -666,7 +666,7 @@ 
     }
 
 
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
     /**
      * Return connection ID
      *
@@ -674,7 +674,7 @@ 
      */
     public function DDLGetConnectId()
     {
-		// phpcs:enable
+        // phpcs:enable
         $resql = $this->query('SELECT CONNECTION_ID()');
         if ($resql) {
             $row = $this->fetch_row($resql);
@@ -684,7 +684,7 @@ 
         }
     }
 
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
     /**
      *  Create a new database
      *  Do not use function xxx_create_db (xxx=mysql, ...) as they are deprecated
@@ -698,7 +698,7 @@ 
      */
     public function DDLCreateDb($database, $charset = '', $collation = '', $owner = '')
     {
-		// phpcs:enable
+        // phpcs:enable
         if (empty($charset)) {
             $charset = $this->forcecharset;
         }
@@ -722,7 +722,7 @@ 
         return $ret;
     }
 
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
     /**
      *  List tables into a database
      *
@@ -732,7 +732,7 @@ 
      */
     public function DDLListTables($database, $table = '')
     {
-		// phpcs:enable
+        // phpcs:enable
         $listtables = array();
 
         $like = '';
@@ -754,7 +754,7 @@ 
         return $listtables;
     }
 
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
     /**
      *  List tables into a database
      *
@@ -764,7 +764,7 @@ 
      */
     public function DDLListTablesFull($database, $table = '')
     {
-		// phpcs:enable
+        // phpcs:enable
         $listtables = array();
 
         $like = '';
@@ -786,7 +786,7 @@ 
         return $listtables;
     }
 
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
     /**
      *  List information of columns into a table.
      *
@@ -795,7 +795,7 @@ 
      */
     public function DDLInfoTable($table)
     {
-		// phpcs:enable
+        // phpcs:enable
         $infotables = array();
 
         $tmptable = preg_replace('/[^a-z0-9\.\-\_]/i', '', $table);
@@ -812,7 +812,7 @@ 
         return $infotables;
     }
 
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
     /**
      *  Create a table into database
      *
@@ -827,7 +827,7 @@ 
      */
     public function DDLCreateTable($table, $fields, $primary_key, $type, $unique_keys = null, $fulltext_keys = null, $keys = null)
     {
-		// phpcs:enable
+        // phpcs:enable
         // @TODO: $fulltext_keys parameter is unused
 
         if (empty($type)) {
@@ -909,7 +909,7 @@ 
         }
     }
 
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
     /**
      *  Drop a table into database
      *
@@ -918,7 +918,7 @@ 
      */
     public function DDLDropTable($table)
     {
-		// phpcs:enable
+        // phpcs:enable
         $tmptable = preg_replace('/[^a-z0-9\.\-\_]/i', '', $table);
 
         $sql = "DROP TABLE " . $this->sanitize($tmptable);
@@ -930,7 +930,7 @@ 
         }
     }
 
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
     /**
      *  Return a pointer of line with description of a table or field
      *
@@ -940,7 +940,7 @@ 
      */
     public function DDLDescTable($table, $field = "")
     {
-		// phpcs:enable
+        // phpcs:enable
         $sql = "DESC " . $this->sanitize($table) . " " . $this->sanitize($field);
 
         dol_syslog(get_class($this) . "::DDLDescTable " . $sql, LOG_DEBUG);
@@ -948,7 +948,7 @@ 
         return $this->_results;
     }
 
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
     /**
      *  Create a new field into table
      *
@@ -960,7 +960,7 @@ 
      */
     public function DDLAddField($table, $field_name, $field_desc, $field_position = "")
     {
-		// phpcs:enable
+        // 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 " . $this->sanitize($table) . " ADD " . $this->sanitize($field_name) . " ";
@@ -997,7 +997,7 @@ 
         return -1;
     }
 
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
     /**
      *  Update format of a field into a table
      *
@@ -1008,7 +1008,7 @@ 
      */
     public function DDLUpdateField($table, $field_name, $field_desc)
     {
-		// phpcs:enable
+        // phpcs:enable
         $sql = "ALTER TABLE " . $this->sanitize($table);
         $sql .= " MODIFY COLUMN " . $this->sanitize($field_name) . " " . $this->sanitize($field_desc['type']);
         if (in_array($field_desc['type'], array('double', 'tinyint', 'int', 'varchar')) && $field_desc['value']) {
@@ -1043,7 +1043,7 @@ 
         }
     }
 
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
     /**
      *  Drop a field from table
      *
@@ -1053,7 +1053,7 @@ 
      */
     public function DDLDropField($table, $field_name)
     {
-		// phpcs:enable
+        // phpcs:enable
         $tmp_field_name = preg_replace('/[^a-z0-9\.\-\_]/i', '', $field_name);
 
         $sql = "ALTER TABLE " . $this->sanitize($table) . " DROP COLUMN `" . $this->sanitize($tmp_field_name) . "`";
@@ -1065,7 +1065,7 @@ 
     }
 
 
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
     /**
      *  Create a user and privileges to connect to database (even if database does not exists yet)
      *
@@ -1077,7 +1077,7 @@ 
      */
     public function DDLCreateUser($dolibarr_main_db_host, $dolibarr_main_db_user, $dolibarr_main_db_pass, $dolibarr_main_db_name)
     {
-		// phpcs:enable
+        // phpcs:enable
         $sql = "CREATE USER '" . $this->escape($dolibarr_main_db_user) . "' 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);

Spacing +2 added lines, -2 removed lines

@@ -120,7 +120,7 @@ 
                     $clientmustbe = 'utf8';
                 }
 
-                $disableforcecharset = 0;   // Set to 1 to test without charset forcing
+                $disableforcecharset = 0; // Set to 1 to test without charset forcing
                 if (empty($disableforcecharset) && $this->db->character_set_name() != $clientmustbe) {
                     try {
                         //print "You should set the \$dolibarr_main_db_character_set and \$dolibarr_main_db_collation for the PHP to the one of the database ".$this->db->character_set_name();
@@ -873,7 +873,7 @@ 
                 $sqlfields[$i] .= " " . $this->sanitize($field_desc['extra'], 0, 0, 1);
             }
             if (!empty($primary_key) && $primary_key == $field_name) {
-                $sqlfields[$i] .= " AUTO_INCREMENT PRIMARY KEY";    // mysql instruction that will be converted by driver late
+                $sqlfields[$i] .= " AUTO_INCREMENT PRIMARY KEY"; // mysql instruction that will be converted by driver late
             }
             $i++;
         }

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

Indentation +46 added lines, -46 removed lines

@@ -297,7 +297,7 @@ 
         return $line;
     }
 
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
     /**
      *  Select a database
      *
@@ -306,7 +306,7 @@ 
      */
     public function select_db($database)
     {
-		// phpcs:enable
+        // phpcs:enable
         dol_syslog(get_class($this) . "::select_db database=" . $database, LOG_DEBUG);
         // sqlite_select_db() does not exist
         //return sqlite_select_db($this->db,$database);
@@ -513,7 +513,7 @@ 
         return $ret;
     }
 
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
     /**
      *  Returns the current line (as an object) for the resultset cursor
      *
@@ -522,7 +522,7 @@ 
      */
     public function fetch_object($resultset)
     {
-		// phpcs:enable
+        // phpcs:enable
         // Si le resultset n'est pas fourni, on prend le dernier utilise sur cette connection
         if (!is_object($resultset)) {
             $resultset = $this->_results;
@@ -536,7 +536,7 @@ 
     }
 
 
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
     /**
      *  Return datas as an array
      *
@@ -545,7 +545,7 @@ 
      */
     public function fetch_array($resultset)
     {
-		// phpcs:enable
+        // phpcs:enable
         // If resultset not provided, we take the last used by connection
         if (!is_object($resultset)) {
             $resultset = $this->_results;
@@ -555,7 +555,7 @@ 
         return $ret;
     }
 
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
     /**
      *  Return datas as an array
      *
@@ -564,7 +564,7 @@ 
      */
     public function fetch_row($resultset)
     {
-		// phpcs:enable
+        // phpcs:enable
         // If resultset not provided, we take the last used by connection
         if (!is_bool($resultset)) {
             if (!is_object($resultset)) {
@@ -577,7 +577,7 @@ 
         }
     }
 
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
     /**
      *  Return number of lines for result of a SELECT
      *
@@ -587,7 +587,7 @@ 
      */
     public function num_rows($resultset)
     {
-		// phpcs:enable
+        // phpcs:enable
 
         // If resultset not provided, we take the last used by connection
         if (!is_object($resultset)) {
@@ -599,7 +599,7 @@ 
         return 0;
     }
 
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
     /**
      *  Return number of lines for result of a SELECT
      *
@@ -609,7 +609,7 @@ 
      */
     public function affected_rows($resultset)
     {
-		// phpcs:enable
+        // phpcs:enable
 
         // If resultset not provided, we take the last used by connection
         if (!is_object($resultset)) {
@@ -748,7 +748,7 @@ 
         }
     }
 
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
     /**
      * Get last ID after an insert INSERT
      *
@@ -758,7 +758,7 @@ 
      */
     public function last_insert_id($tab, $fieldid = 'rowid')
     {
-		// phpcs:enable
+        // phpcs:enable
         return $this->db->lastInsertRowId();
     }
 
@@ -823,7 +823,7 @@ 
     }
 
 
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
     /**
      * Return connection ID
      *
@@ -831,12 +831,12 @@ 
      */
     public function DDLGetConnectId()
     {
-		// phpcs:enable
+        // phpcs:enable
         return '?';
     }
 
 
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
     /**
      *  Create a new database
      *  Do not use function xxx_create_db (xxx=mysql, ...) as they are deprecated
@@ -850,7 +850,7 @@ 
      */
     public function DDLCreateDb($database, $charset = '', $collation = '', $owner = '')
     {
-		// phpcs:enable
+        // phpcs:enable
         if (empty($charset)) {
             $charset = $this->forcecharset;
         }
@@ -868,7 +868,7 @@ 
         return $ret;
     }
 
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
     /**
      *  List tables into a database
      *
@@ -878,7 +878,7 @@ 
      */
     public function DDLListTables($database, $table = '')
     {
-		// phpcs:enable
+        // phpcs:enable
         $listtables = array();
 
         $like = '';
@@ -900,7 +900,7 @@ 
         return $listtables;
     }
 
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
     /**
      *  List tables into a database with table type
      *
@@ -910,7 +910,7 @@ 
      */
     public function DDLListTablesFull($database, $table = '')
     {
-		// phpcs:enable
+        // phpcs:enable
         $listtables = array();
 
         $like = '';
@@ -932,7 +932,7 @@ 
         return $listtables;
     }
 
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
     /**
      *  List information of columns into a table.
      *
@@ -942,7 +942,7 @@ 
      */
     public function DDLInfoTable($table)
     {
-		// phpcs:enable
+        // phpcs:enable
         $infotables = array();
 
         $tmptable = preg_replace('/[^a-z0-9\.\-\_]/i', '', $table);
@@ -959,7 +959,7 @@ 
         return $infotables;
     }
 
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
     /**
      *  Create a table into database
      *
@@ -974,7 +974,7 @@ 
      */
     public function DDLCreateTable($table, $fields, $primary_key, $type, $unique_keys = null, $fulltext_keys = null, $keys = null)
     {
-		// phpcs:enable
+        // phpcs:enable
         // @TODO: $fulltext_keys parameter is unused
 
         $sqlk = array();
@@ -1054,7 +1054,7 @@ 
         }
     }
 
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
     /**
      *  Drop a table into database
      *
@@ -1063,7 +1063,7 @@ 
      */
     public function DDLDropTable($table)
     {
-		// phpcs:enable
+        // phpcs:enable
         $tmptable = preg_replace('/[^a-z0-9\.\-\_]/i', '', $table);
 
         $sql = "DROP TABLE " . $tmptable;
@@ -1075,7 +1075,7 @@ 
         }
     }
 
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
     /**
      *  Return a pointer of line with description of a table or field
      *
@@ -1085,7 +1085,7 @@ 
      */
     public function DDLDescTable($table, $field = "")
     {
-		// phpcs:enable
+        // phpcs:enable
         $sql = "DESC " . $table . " " . $field;
 
         dol_syslog(get_class($this) . "::DDLDescTable " . $sql, LOG_DEBUG);
@@ -1093,7 +1093,7 @@ 
         return $this->_results;
     }
 
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
     /**
      *  Create a new field into table
      *
@@ -1105,7 +1105,7 @@ 
      */
     public function DDLAddField($table, $field_name, $field_desc, $field_position = "")
     {
-		// phpcs:enable
+        // 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 . " ";
@@ -1142,7 +1142,7 @@ 
         return 1;
     }
 
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
     /**
      *  Update format of a field into a table
      *
@@ -1153,7 +1153,7 @@ 
      */
     public function DDLUpdateField($table, $field_name, $field_desc)
     {
-		// phpcs:enable
+        // phpcs:enable
         $sql = "ALTER TABLE " . $this->sanitize($table);
         $sql .= " MODIFY COLUMN " . $this->sanitize($field_name) . " " . $this->sanitize($field_desc['type']);
         if ($field_desc['type'] == 'tinyint' || $field_desc['type'] == 'int' || $field_desc['type'] == 'varchar') {
@@ -1167,7 +1167,7 @@ 
         return 1;
     }
 
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
     /**
      *  Drop a field from table
      *
@@ -1177,7 +1177,7 @@ 
      */
     public function DDLDropField($table, $field_name)
     {
-		// phpcs:enable
+        // phpcs:enable
         $tmp_field_name = preg_replace('/[^a-z0-9\.\-\_]/i', '', $field_name);
 
         $sql = "ALTER TABLE " . $this->sanitize($table) . " DROP COLUMN `" . $this->sanitize($tmp_field_name) . "`";
@@ -1189,7 +1189,7 @@ 
     }
 
 
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
     /**
      *  Create a user and privileges to connect to database (even if database does not exists yet)
      *
@@ -1201,7 +1201,7 @@ 
      */
     public function DDLCreateUser($dolibarr_main_db_host, $dolibarr_main_db_user, $dolibarr_main_db_pass, $dolibarr_main_db_name)
     {
-		// phpcs:enable
+        // 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) . "')";
@@ -1416,7 +1416,7 @@ 
         }
     }
 
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
     /**
      * calc_daynr
      *
@@ -1427,7 +1427,7 @@ 
      */
     private static function calc_daynr($year, $month, $day)
     {
-		// phpcs:enable
+        // phpcs:enable
         $y = $year;
         if ($y == 0 && $month == 0) {
             return 0;
@@ -1442,7 +1442,7 @@ 
         return (int) ($num + floor($y / 4) - $temp);
     }
 
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
     /**
      * calc_weekday
      *
@@ -1452,12 +1452,12 @@ 
      */
     private static function calc_weekday($daynr, $sunday_first_day_of_week)
     {
-		// phpcs:enable
+        // phpcs:enable
         $ret = (int) floor(($daynr + 5 + ($sunday_first_day_of_week ? 1 : 0)) % 7);
         return $ret;
     }
 
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
     /**
      * calc_days_in_year
      *
@@ -1466,11 +1466,11 @@ 
      */
     private static function calc_days_in_year($year)
     {
-		// phpcs:enable
+        // phpcs:enable
         return (($year & 3) == 0 && ($year % 100 || ($year % 400 == 0 && $year)) ? 366 : 365);
     }
 
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
     /**
      * calc_week
      *
@@ -1483,7 +1483,7 @@ 
      */
     private static function calc_week($year, $month, $day, $week_behaviour, &$calc_year)
     {
-		// phpcs:enable
+        // 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;

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

Indentation +38 added lines, -38 removed lines

@@ -47,7 +47,7 @@ 
      */
     public function stddevpop($nameoffield);
 
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
     /**
      * Return datas as an array
      * @TODO deprecate this. Use fetch_object() so you can access a field with its name instead of using an index of position of field.
@@ -56,7 +56,7 @@ 
      * @return  array                               Array
      */
     public function fetch_row($resultset);
-	// phpcs:enable
+    // phpcs:enable
 
     /**
      * Convert (by PHP) a GM Timestamp date into a string date with PHP server TZ to insert into a date field.
@@ -82,7 +82,7 @@ 
      */
     public function begin($textinlog = '');
 
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
     /**
      * Create a new database
      * Do not use function xxx_create_db (xxx=mysql, ...) as they are deprecated
@@ -95,7 +95,7 @@ 
      * @return  bool|SQLite3Result|mysqli_result|resource      Resource result of the query to create database if OK, null if KO
      */
     public function DDLCreateDb($database, $charset = '', $collation = '', $owner = '');
-	// phpcs:enable
+    // phpcs:enable
 
     /**
      * Return version of database server into an array
@@ -113,7 +113,7 @@ 
      */
     public function convertSQLFromMysql($line, $type = 'ddl');
 
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
     /**
      * Return the number of lines in the result of a request INSERT, DELETE or UPDATE
      *
@@ -122,7 +122,7 @@ 
      * @see     num_rows()
      */
     public function affected_rows($resultset);
-	// phpcs:enable
+    // phpcs:enable
 
     /**
      * Return description of last error
@@ -131,7 +131,7 @@ 
      */
     public function error();
 
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
     /**
      *  List tables into a database
      *
@@ -140,9 +140,9 @@ 
      *  @return array                   List of tables in an array
      */
     public function DDLListTables($database, $table = '');
-	// phpcs:enable
+    // phpcs:enable
 
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
     /**
      *  List tables into a database with table type
      *
@@ -151,7 +151,7 @@ 
      *  @return array                   List of tables in an array
      */
     public function DDLListTablesFull($database, $table = '');
-	// phpcs:enable
+    // phpcs:enable
 
     /**
      * Return last request executed with query()
@@ -177,7 +177,7 @@ 
      */
     public function decrypt($value);
 
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
     /**
      *    Return datas as an array
      *
@@ -185,7 +185,7 @@ 
      * @return  array|null|false                                    Result with row
      */
     public function fetch_array($resultset);
-	// phpcs:enable
+    // phpcs:enable
 
     /**
      * Return last error label
@@ -219,7 +219,7 @@ 
      */
     public function sanitize($stringtosanitize);
 
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
     /**
      * Get last ID after an insert INSERT
      *
@@ -228,7 +228,7 @@ 
      * @return  int                 Id of row
      */
     public function last_insert_id($tab, $fieldid = 'rowid');
-	// phpcs:enable
+    // phpcs:enable
 
     /**
      *    Return full path of restore program
@@ -302,7 +302,7 @@ 
      */
     public function getDefaultCollationDatabase();
 
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
     /**
      * Return number of lines for result of a SELECT
      *
@@ -311,7 +311,7 @@ 
      * @see     affected_rows()
      */
     public function num_rows($resultset);
-	// phpcs:enable
+    // phpcs:enable
 
     /**
      * Return full path of dump program
@@ -334,7 +334,7 @@ 
      */
     public function errno();
 
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
     /**
      * Create a table into database
      *
@@ -348,9 +348,9 @@ 
      * @return       int                    Return integer <0 if KO, >=0 if OK
      */
     public function DDLCreateTable($table, $fields, $primary_key, $type, $unique_keys = null, $fulltext_keys = null, $keys = null);
-	// phpcs:enable
+    // phpcs:enable
 
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
     /**
      * Drop a table into database
      *
@@ -358,7 +358,7 @@ 
      * @return       int                    Return integer <0 if KO, >=0 if OK
      */
     public function DDLDropTable($table);
-	// phpcs:enable
+    // phpcs:enable
 
     /**
      * Return list of available charset that can be used to store data in database
@@ -367,7 +367,7 @@ 
      */
     public function getListOfCharacterSet();
 
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
     /**
      * Create a new field into table
      *
@@ -378,9 +378,9 @@ 
      * @return   int                        Return integer <0 if KO, >0 if OK
      */
     public function DDLAddField($table, $field_name, $field_desc, $field_position = "");
-	// phpcs:enable
+    // phpcs:enable
 
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
     /**
      * Drop a field from table
      *
@@ -389,9 +389,9 @@ 
      * @return   int                        Return integer <0 if KO, >0 if OK
      */
     public function DDLDropField($table, $field_name);
-	// phpcs:enable
+    // phpcs:enable
 
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
     /**
      * Update format of a field into a table
      *
@@ -401,7 +401,7 @@ 
      * @return   int                        Return integer <0 if KO, >0 if OK
      */
     public function DDLUpdateField($table, $field_name, $field_desc);
-	// phpcs:enable
+    // phpcs:enable
 
     /**
      * Return list of available collation that can be used for database
@@ -410,7 +410,7 @@ 
      */
     public function getListOfCollation();
 
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
     /**
      * Return a pointer of line with description of a table or field
      *
@@ -419,7 +419,7 @@ 
      * @return   bool|resource|mysqli_result|SQLite3Result            Resource
      */
     public function DDLDescTable($table, $field = "");
-	// phpcs:enable
+    // phpcs:enable
 
     /**
      * Return version of database server
@@ -435,7 +435,7 @@ 
      */
     public function getDefaultCharacterSetDatabase();
 
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
     /**
      * Create a user and privileges to connect to database (even if database does not exists yet)
      *
@@ -451,9 +451,9 @@ 
         $dolibarr_main_db_pass,
         $dolibarr_main_db_name
     );
-	// phpcs:enable
+    // phpcs:enable
 
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
     /**
      * List information of columns into a table.
      *
@@ -461,7 +461,7 @@ 
      * @return  array                           Array with information on table
      */
     public function DDLInfoTable($table);
-	// phpcs:enable
+    // phpcs:enable
 
     /**
      * Convert (by PHP) a PHP server TZ string date into a Timestamps date (GMT if gm=true)
@@ -515,16 +515,16 @@ 
      */
     public function lastqueryerror();
 
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
     /**
      * Return connection ID
      *
      * @return  string      Id connection
      */
     public function DDLGetConnectId();
-	// phpcs:enable
+    // phpcs:enable
 
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
     /**
      * Returns the current line (as an object) for the resultset cursor
      *
@@ -532,9 +532,9 @@ 
      * @return  Object|false                                                                Object result line or false if KO or end of cursor
      */
     public function fetch_object($resultset);
-	// phpcs:enable
+    // phpcs:enable
 
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
     /**
      * Select a database
      *
@@ -542,5 +542,5 @@ 
      * @return  boolean            true if OK, false if KO
      */
     public function select_db($database);
-	// phpcs:enable
+    // phpcs:enable
 }

public/htdocs/core/ajax/onlineSign.php

Spacing +26 added lines, -26 removed lines

@@ -50,7 +50,7 @@ 
 if (!defined('NOBROWSERNOTIF')) {
     define('NOBROWSERNOTIF', '1');
 }
-$entity = (!empty($_GET['entity']) ? (int) $_GET['entity'] : (!empty($_POST['entity']) ? (int) $_POST['entity'] : 1));  // Keep $_GET and $_POST here. GETPOST not yet defined.
+$entity = (!empty($_GET['entity']) ? (int) $_GET['entity'] : (!empty($_POST['entity']) ? (int) $_POST['entity'] : 1)); // Keep $_GET and $_POST here. GETPOST not yet defined.
 if (is_numeric($entity)) {
     define("DOLENTITY", $entity);
 }
@@ -61,7 +61,7 @@ 
 
 $signature = GETPOST('signaturebase64');
 $ref = GETPOST('ref', 'aZ09');
-$mode = GETPOST('mode', 'aZ09');    // 'proposal', ...
+$mode = GETPOST('mode', 'aZ09'); // 'proposal', ...
 $SECUREKEY = GETPOST("securekey"); // Secure key
 $online_sign_name = GETPOST("onlinesignname");
 
@@ -118,8 +118,8 @@ 
             $upload_dir = !empty($conf->propal->multidir_output[$object->entity]) ? $conf->propal->multidir_output[$object->entity] : $conf->propal->dir_output;
             $upload_dir .= '/' . dol_sanitizeFileName($object->ref) . '/';
 
-            $default_font_size = pdf_getPDFFontSize($langs);    // Must be after pdf_getInstance
-            $default_font = pdf_getPDFFont($langs);    // Must be after pdf_getInstance
+            $default_font_size = pdf_getPDFFontSize($langs); // Must be after pdf_getInstance
+            $default_font = pdf_getPDFFont($langs); // Must be after pdf_getInstance
             $langs->loadLangs(array("main", "companies"));
 
             $date = dol_print_date(dol_now(), "%Y%m%d%H%M%S");
@@ -142,7 +142,7 @@ 
             if (!$error) {
                 // Defined modele of doc
                 $last_main_doc_file = $object->last_main_doc;
-                $directdownloadlink = $object->getLastMainDocLink('proposal');    // url to download the $object->last_main_doc
+                $directdownloadlink = $object->getLastMainDocLink('proposal'); // url to download the $object->last_main_doc
 
                 if (preg_match('/\.pdf/i', $last_main_doc_file)) {
                     // TODO Use the $last_main_doc_file to defined the $newpdffilename and $sourcefile
@@ -170,13 +170,13 @@ 
                             }
 
                             //$pdf->Open();
-                            $pagecount = $pdf->setSourceFile($sourcefile);        // original PDF
+                            $pagecount = $pdf->setSourceFile($sourcefile); // original PDF
 
                             $param = array();
                             $param['online_sign_name'] = $online_sign_name;
                             $param['pathtoimage'] = $upload_dir . $filename;
 
-                            $s = array();    // Array with size of each page. Example array(w'=>210, 'h'=>297);
+                            $s = array(); // Array with size of each page. Example array(w'=>210, 'h'=>297);
                             for ($i = 1; $i < ($pagecount + 1); $i++) {
                                 try {
                                     $tppl = $pdf->importPage($i);
@@ -332,7 +332,7 @@ 
             if (!$error) {
                 // Defined modele of doc
                 $last_main_doc_file = $object->last_main_doc;
-                $directdownloadlink = $object->getLastMainDocLink('contrat');    // url to download the $object->last_main_doc
+                $directdownloadlink = $object->getLastMainDocLink('contrat'); // url to download the $object->last_main_doc
 
                 if (preg_match('/\.pdf/i', $last_main_doc_file)) {
                     // TODO Use the $last_main_doc_file to defined the $newpdffilename and $sourcefile
@@ -360,13 +360,13 @@ 
                             }
 
                             //$pdf->Open();
-                            $pagecount = $pdf->setSourceFile($sourcefile);        // original PDF
+                            $pagecount = $pdf->setSourceFile($sourcefile); // original PDF
 
                             $param = array();
                             $param['online_sign_name'] = $online_sign_name;
                             $param['pathtoimage'] = $upload_dir . $filename;
 
-                            $s = array();    // Array with size of each page. Example array(w'=>210, 'h'=>297);
+                            $s = array(); // Array with size of each page. Example array(w'=>210, 'h'=>297);
                             for ($i = 1; $i < ($pagecount + 1); $i++) {
                                 try {
                                     $tppl = $pdf->importPage($i);
@@ -443,7 +443,7 @@ 
 
             $langs->loadLangs(array("main", "companies"));
 
-            $default_font_size = pdf_getPDFFontSize($langs);    // Must be after pdf_getInstance
+            $default_font_size = pdf_getPDFFontSize($langs); // Must be after pdf_getInstance
             $default_font = pdf_getPDFFont($langs); // Must be
 
             $date = dol_print_date(dol_now(), "%Y%m%d%H%M%S");
@@ -466,7 +466,7 @@ 
             if (!$error) {
                 // Defined modele of doc
                 $last_main_doc_file = $object->last_main_doc;
-                $directdownloadlink = $object->getLastMainDocLink('fichinter');    // url to download the $object->last_main_doc
+                $directdownloadlink = $object->getLastMainDocLink('fichinter'); // url to download the $object->last_main_doc
 
                 if (preg_match('/\.pdf/i', $last_main_doc_file)) {
                     // TODO Use the $last_main_doc_file to defined the $newpdffilename and $sourcefile
@@ -494,13 +494,13 @@ 
                             }
 
                             //$pdf->Open();
-                            $pagecount = $pdf->setSourceFile($sourcefile);        // original PDF
+                            $pagecount = $pdf->setSourceFile($sourcefile); // original PDF
 
                             $param = array();
                             $param['online_sign_name'] = $online_sign_name;
                             $param['pathtoimage'] = $upload_dir . $filename;
 
-                            $s = array();    // Array with size of each page. Example array(w'=>210, 'h'=>297);
+                            $s = array(); // Array with size of each page. Example array(w'=>210, 'h'=>297);
                             for ($i = 1; $i < ($pagecount + 1); $i++) {
                                 try {
                                     $tppl = $pdf->importPage($i);
@@ -578,8 +578,8 @@ 
 
                 $upload_dir = $conf->societe->multidir_output[$object->thirdparty->entity] . '/' . dol_sanitizeFileName($object->thirdparty->id) . '/';
 
-                $default_font_size = pdf_getPDFFontSize($langs);    // Must be after pdf_getInstance
-                $default_font = pdf_getPDFFont($langs);    // Must be after pdf_getInstance
+                $default_font_size = pdf_getPDFFontSize($langs); // Must be after pdf_getInstance
+                $default_font = pdf_getPDFFont($langs); // Must be after pdf_getInstance
                 $langs->loadLangs(array("main", "companies"));
 
                 $date = dol_print_date(dol_now(), "%Y%m%d%H%M%S");
@@ -611,7 +611,7 @@ 
                     // Defined modele of doc
                     $last_main_doc_file = $object->last_main_doc;
                     $last_modelpdf = $object->model_pdf;
-                    $directdownloadlink = $object->getLastMainDocLink('company');    // url to download the $object->last_main_doc
+                    $directdownloadlink = $object->getLastMainDocLink('company'); // url to download the $object->last_main_doc
 
                     if (preg_match('/\.pdf/i', $last_main_doc_file)) {
                         $sourcefile = '';
@@ -641,9 +641,9 @@ 
                                 }
 
                                 //$pdf->Open();
-                                $pagecount = $pdf->setSourceFile($sourcefile);        // original PDF
+                                $pagecount = $pdf->setSourceFile($sourcefile); // original PDF
 
-                                $s = array();    // Array with size of each page. Example array(w'=>210, 'h'=>297);
+                                $s = array(); // Array with size of each page. Example array(w'=>210, 'h'=>297);
                                 for ($i = 1; $i < ($pagecount + 1); $i++) {
                                     try {
                                         $tppl = $pdf->importPage($i);
@@ -784,7 +784,7 @@ 
 
             $langs->loadLangs(array("main", "companies"));
 
-            $default_font_size = pdf_getPDFFontSize($langs);    // Must be after pdf_getInstance
+            $default_font_size = pdf_getPDFFontSize($langs); // Must be after pdf_getInstance
             $default_font = pdf_getPDFFont($langs); // Must be
 
             $date = dol_print_date(dol_now(), "%Y%m%d%H%M%S");
@@ -810,11 +810,11 @@ 
                 if (empty($last_main_doc_file) || !dol_is_file(DOL_DATA_ROOT . '/' . $object->last_main_doc)) {
                     // It seems document has never been generated, or was generated and then deleted.
                     // So we try to regenerate it with its default template.
-                    $defaulttemplate = '';      // We force the use an empty string instead of $object->model_pdf to be sure to use a "main" default template and not the last one used.
+                    $defaulttemplate = ''; // We force the use an empty string instead of $object->model_pdf to be sure to use a "main" default template and not the last one used.
                     $object->generateDocument($defaulttemplate, $langs);
                 }
                 $last_main_doc_file = $object->last_main_doc;
-                $directdownloadlink = $object->getLastMainDocLink('expedition');    // url to download the $object->last_main_doc
+                $directdownloadlink = $object->getLastMainDocLink('expedition'); // url to download the $object->last_main_doc
 
                 if (preg_match('/\.pdf/i', $last_main_doc_file)) {
                     // TODO Use the $last_main_doc_file to defined the $newpdffilename and $sourcefile
@@ -842,13 +842,13 @@ 
                             }
 
                             //$pdf->Open();
-                            $pagecount = $pdf->setSourceFile($sourcefile);        // original PDF
+                            $pagecount = $pdf->setSourceFile($sourcefile); // original PDF
 
                             $param = array();
                             $param['online_sign_name'] = $online_sign_name;
                             $param['pathtoimage'] = $upload_dir . $filename;
 
-                            $s = array();    // Array with size of each page. Example array(w'=>210, 'h'=>297);
+                            $s = array(); // Array with size of each page. Example array(w'=>210, 'h'=>297);
                             for ($i = 1; $i < ($pagecount + 1); $i++) {
                                 try {
                                     $tppl = $pdf->importPage($i);
@@ -907,7 +907,7 @@ 
                 $db->begin();
 
                 $sql = "UPDATE " . MAIN_DB_PREFIX . "expedition";
-                $sql .= " SET signed_status = " . ((int) $object::STATUS_SIGNED) ;
+                $sql .= " SET signed_status = " . ((int) $object::STATUS_SIGNED);
                 $sql .= " WHERE rowid = " . ((int) $object->id);
 
                 dol_syslog(__FILE__, LOG_DEBUG);
@@ -950,7 +950,7 @@ 
  */
 function dolPrintSignatureImage(TCPDF $pdf, $langs, $params)
 {
-    $default_font_size = pdf_getPDFFontSize($langs);    // Must be after pdf_getInstance
+    $default_font_size = pdf_getPDFFontSize($langs); // Must be after pdf_getInstance
     $default_font = pdf_getPDFFont($langs); // Must be
     $xforimgstart = $params['xforimgstart'];
     $yforimgstart = $params['yforimgstart'];

public/htdocs/core/ajax/box.php

Spacing +1 added lines, -1 removed lines

@@ -45,7 +45,7 @@
 
 $boxid = GETPOSTINT('boxid');
 $boxorder = GETPOST('boxorder');
-$zone = GETPOST('zone');        // Can be '0' or '1' or 'pagename'...
+$zone = GETPOST('zone'); // Can be '0' or '1' or 'pagename'...
 $userid = GETPOSTINT('userid');
 
 // Security check

public/htdocs/core/ajax/fileupload.php

Spacing +2 added lines, -2 removed lines

@@ -38,7 +38,7 @@ 
 
 // Load Dolibarr environment
 require constant('DOL_DOCUMENT_ROOT') . '/main.inc.php';
-require_once constant('DOL_DOCUMENT_ROOT') . '/core/class/fileupload.class.php';  // Class to upload common files
+require_once constant('DOL_DOCUMENT_ROOT') . '/core/class/fileupload.class.php'; // Class to upload common files
 require_once constant('DOL_DOCUMENT_ROOT') . '/core/class/genericobject.class.php';
 require_once constant('DOL_DOCUMENT_ROOT') . '/core/lib/geturl.lib.php';
 
@@ -63,7 +63,7 @@ 
 if (!empty($user->socid)) {
     $socid = $user->socid;
     if (!empty($object->socid) && $socid != $object->socid) {
-        httponly_accessforbidden("Access on object not allowed for this external user.");   // This includes the exit.
+        httponly_accessforbidden("Access on object not allowed for this external user."); // This includes the exit.
     }
 }
 

public/htdocs/core/ajax/selectobject.php

Spacing +2 added lines, -2 removed lines

@@ -93,9 +93,9 @@
     $vartmp = (empty($InfoFieldList[3]) ? '' : $InfoFieldList[3]);
     $reg = array();
     if (preg_match('/^.*:(\w*)$/', $vartmp, $reg)) {
-        $InfoFieldList[4] = $reg[1];    // take the sort field
+        $InfoFieldList[4] = $reg[1]; // take the sort field
     }
-    $InfoFieldList[3] = preg_replace('/:\w*$/', '', $vartmp);    // take the filter field
+    $InfoFieldList[3] = preg_replace('/:\w*$/', '', $vartmp); // take the filter field
 
     $classname = $InfoFieldList[0];
     $classpath = $InfoFieldList[1];

public/htdocs/core/ajax/fetchKnowledgeRecord.php

Spacing +1 added lines, -1 removed lines

@@ -94,7 +94,7 @@
         $response = array();
         while ($i < $num) {
             $obj = $db->fetch_object($resql);
-            $response[] = array('title' => $obj->question,'ref' => $obj->ref,'answer' => dol_escape_htmltag(preg_replace('/\\r|\\r\\n|\\n/', "", $obj->answer)),'url' => $obj->url);
+            $response[] = array('title' => $obj->question, 'ref' => $obj->ref, 'answer' => dol_escape_htmltag(preg_replace('/\\r|\\r\\n|\\n/', "", $obj->answer)), 'url' => $obj->url);
             $i++;
         }
     } else {