alxarafe / alixar

public/htdocs/reception/card.php

Indentation +1 added lines, -1 removed lines

@@ -966,7 +966,7 @@
             /**
              * @var array $suffix2numAsked map HTTP query parameter suffixes (like '1_0') to line indices so that
              *                             extrafields from HTTP query can be assigned to the correct dispatch line
-            */
+             */
             $suffix2numAsked = array();
             $dispatchLines = array();
 

public/htdocs/takepos/receipt.php

Indentation +14 added lines, -14 removed lines

@@ -163,15 +163,15 @@ 
         <th class="right"><?php print $langs->trans("Qty"); ?></th>
         <th class="right"><?php if ($gift != 1) {
             print $langs->trans("Price");
-                          } ?></th>
+                            } ?></th>
         <?php  if (getDolGlobalString('TAKEPOS_SHOW_HT_RECEIPT')) { ?>
         <th class="right"><?php if ($gift != 1) {
             print $langs->trans("TotalHT");
-                          } ?></th>
+                            } ?></th>
         <?php } ?>
         <th class="right"><?php if ($gift != 1) {
             print $langs->trans("TotalTTC");
-                          } ?></th>
+                            } ?></th>
     </tr>
     </thead>
     <tbody>
@@ -201,17 +201,17 @@ 
             <td class="right"><?php echo $line->qty; ?></td>
             <td class="right"><?php if ($gift != 1) {
                 echo price(price2num($line->total_ttc / $line->qty, 'MT'), 1);
-                              } ?></td>
+                                } ?></td>
             <?php
             if (getDolGlobalString('TAKEPOS_SHOW_HT_RECEIPT')) { ?>
                         <td class="right"><?php if ($gift != 1) {
                             echo price($line->total_ht, 1);
-                                          } ?></td>
+                                            } ?></td>
                 <?php
             } ?>
             <td class="right"><?php if ($gift != 1) {
                 echo price($line->total_ttc, 1);
-                              } ?></td>
+                                } ?></td>
         </tr>
             <?php
         }
@@ -224,10 +224,10 @@ 
 <tr>
     <th class="right"><?php if ($gift != 1) {
         echo $langs->trans("TotalHT");
-                      } ?></th>
+                        } ?></th>
     <td class="right"><?php if ($gift != 1) {
         echo price($object->total_ht, 1, '', 1, - 1, - 1, $conf->currency) . "\n";
-                      } ?></td>
+                        } ?></td>
 </tr>
 <?php if (getDolGlobalString('TAKEPOS_TICKET_VAT_GROUPPED')) {
         $vat_groups = array();
@@ -243,10 +243,10 @@ 
     <tr>
         <th align="right"><?php if ($gift != 1) {
                 echo $langs->trans("VAT") . ' ' . vatrate($key, 1);
-                          } ?></th>
+                            } ?></th>
         <td align="right"><?php if ($gift != 1) {
                 echo price($val, 1, '', 1, - 1, - 1, $conf->currency) . "\n";
-                          } ?></td>
+                            } ?></td>
     </tr>
         <?php
     }
@@ -254,7 +254,7 @@ 
 <tr>
     <th class="right"><?php if ($gift != 1) {
         echo $langs->trans("TotalVAT") . '</th><td class="right">' . price($object->total_tva, 1, '', 1, - 1, - 1, $conf->currency) . "\n";
-                      } ?></td>
+                        } ?></td>
 </tr>
 <?php }
 
@@ -264,20 +264,20 @@ 
 <tr>
     <th class="right"><?php if ($gift != 1) {
         echo '' . $langs->trans("TotalLT1") . '</th><td class="right">' . price($object->total_localtax1, 1, '', 1, - 1, - 1, $conf->currency) . "\n";
-                      } ?></td>
+                        } ?></td>
 </tr>
 <?php } ?>
 <?php if (price2num($object->total_localtax2, 'MU') || $mysoc->useLocalTax(2)) { ?>
 <tr>
     <th class="right"><?php if ($gift != 1) {
         echo '' . $langs->trans("TotalLT2") . '</th><td class="right">' . price($object->total_localtax2, 1, '', 1, - 1, - 1, $conf->currency) . "\n";
-                      } ?></td>
+                        } ?></td>
 </tr>
 <?php } ?>
 <tr>
     <th class="right"><?php if ($gift != 1) {
         echo '' . $langs->trans("TotalTTC") . '</th><td class="right">' . price($object->total_ttc, 1, '', 1, - 1, - 1, $conf->currency) . "\n";
-                      } ?></td>
+                        } ?></td>
 </tr>
 <?php
 if (isModEnabled('multicurrency') && !empty($_SESSION["takeposcustomercurrency"]) && $_SESSION["takeposcustomercurrency"] != "" && $conf->currency != $_SESSION["takeposcustomercurrency"]) {

public/htdocs/takepos/floors.php

Indentation +3 added lines, -3 removed lines

@@ -228,9 +228,9 @@
         $floor--;
         echo $floor;
         $floor++;
-                                                                                                             } else {
-                                                                                                                 echo "1";
-                                                                                                             } ?>';">
+                                                                                                                } else {
+                                                                                                                    echo "1";
+                                                                                                                } ?>';">
     <?php } ?>
     <span class="valignmiddle"><?php echo $langs->trans("Floor") . " " . $floor; ?></span>
     <img src="./img/arrow-next.png" class="valignmiddle" width="5%" onclick="location.href='floors.php?floor=<?php $floor++;

public/htdocs/takepos/index.php

Indentation +5 added lines, -5 removed lines

@@ -1496,11 +1496,11 @@
             ?>
             <div class="wrapper" <?php if ($count == ($MAXCATEG - 2)) {
                 echo 'onclick="MoreCategories(\'less\')"';
-                                 } elseif ($count == ($MAXCATEG - 1)) {
-                                     echo 'onclick="MoreCategories(\'more\')"';
-                                 } else {
-                                     echo 'onclick="LoadProducts(' . $count . ')"';
-                                 } ?> id="catdiv<?php echo $count; ?>">
+                                    } elseif ($count == ($MAXCATEG - 1)) {
+                                        echo 'onclick="MoreCategories(\'more\')"';
+                                    } else {
+                                        echo 'onclick="LoadProducts(' . $count . ')"';
+                                    } ?> id="catdiv<?php echo $count; ?>">
                 <?php
                 if ($count == ($MAXCATEG - 2)) {
                     //echo '<img class="imgwrapper" src="img/arrow-prev-top.png" height="100%" id="catimg'.$count.'" />';

public/htdocs/contact/canvas/actions_contactcard_common.class.php

Indentation +4 added lines, -4 removed lines

@@ -81,7 +81,7 @@ 
         return $object;
     }
 
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
     /**
      *  Set content of ->tpl array, to use into template
      *
@@ -91,7 +91,7 @@ 
      */
     public function assign_values(&$action, $id)
     {
-		// phpcs:enable
+        // phpcs:enable
         global $conf, $langs, $user, $canvas;
         global $form, $formcompany, $objsoc;
 
@@ -275,7 +275,7 @@ 
         }
     }
 
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
     /**
      *  Assign POST values into object
      *
@@ -283,7 +283,7 @@ 
      */
     private function assign_post()
     {
-		// phpcs:enable
+        // phpcs:enable
         global $langs, $mysoc;
 
         $this->object->socid = GETPOSTINT("socid");

public/htdocs/contact/canvas/default/actions_contactcard_default.class.php

Indentation +2 added lines, -2 removed lines

@@ -74,7 +74,7 @@ 
         return $out;
     }
 
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
     /**
      *  Assign custom values for canvas
      *
@@ -84,7 +84,7 @@ 
      */
     public function assign_values(&$action, $id)
     {
-		// phpcs:enable
+        // phpcs:enable
         global $conf, $db, $langs, $user;
         global $form;
 

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) . "'";
 

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

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;