alxarafe / alixar

htdocs/ecm/class/ecmfiles.class.php

Indentation +2 added lines, -2 removed lines

@@ -952,7 +952,7 @@ 
         return $this->LibStatut($this->status, $mode);
     }
 
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
     /**
      *  Return the status
      *
@@ -962,7 +962,7 @@ 
      */
     public static function LibStatut($status, $mode = 0)
     {
-		// phpcs:enable
+        // phpcs:enable
         global $langs;
         return '';
     }

Spacing +6 added lines, -6 removed lines

@@ -163,16 +163,16 @@
         'label' => array('type' => 'varchar(128)', 'label' => 'Label', 'enabled' => 1, 'position' => 30, 'notnull' => 0, 'visible' => -1, 'searchall' => 1, 'css' => 'minwidth300', 'cssview' => 'wordbreak', 'help' => "Help text", 'showoncombobox' => 2, 'validate' => 1, 'comment' => "contains hash of file content"),
         'share' => array('type' => 'varchar(128)', 'label' => 'Share', 'enabled' => 1, 'position' => 40, 'notnull' => 0, 'visible' => -1, 'searchall' => 1, 'css' => 'minwidth300', 'cssview' => 'wordbreak', 'help' => "Help text", 'showoncombobox' => 2, 'validate' => 1, 'comment' => "contains hash for file sharing"),
         'entity' => array('type' => 'integer', 'label' => 'Entity', 'default' => '1', 'enabled' => 1, 'visible' => -2, 'notnull' => -1, 'position' => 50, 'index' => 1),
-        'filepath' => array('type' => 'varchar(255)', 'label' => 'FilePath', 'enabled' => 1, 'position' => 60, 'notnull' => 0, 'visible' => 0, 'searchall' => 0, 'css' => 'minwidth300', 'cssview' => 'wordbreak', 'help' => "Help text", 'showoncombobox' => 2, 'validate' => 1,'comment' => "relative to dolibarr document dir. Example module/def"),
-        'filename' => array('type' => 'varchar(255)', 'label' => 'FileName', 'enabled' => 1, 'position' => 70, 'notnull' => 0, 'visible' => 1, 'searchall' => 1, 'css' => 'minwidth300', 'cssview' => 'wordbreak', 'help' => "Help text", 'showoncombobox' => 2, 'validate' => 1,'comment' => "file name only without any directory"),
-        'src_object_type' => array('type' => 'varchar(64)', 'label' => 'SourceType', 'enabled' => 1, 'position' => 80, 'notnull' => 0, 'visible' => 0, 'searchall' => 1, 'css' => 'minwidth300', 'cssview' => 'wordbreak', 'help' => "Help text", 'showoncombobox' => 2, 'validate' => 1,'comment' => "Source object type ('proposal', 'invoice', ...)"),
+        'filepath' => array('type' => 'varchar(255)', 'label' => 'FilePath', 'enabled' => 1, 'position' => 60, 'notnull' => 0, 'visible' => 0, 'searchall' => 0, 'css' => 'minwidth300', 'cssview' => 'wordbreak', 'help' => "Help text", 'showoncombobox' => 2, 'validate' => 1, 'comment' => "relative to dolibarr document dir. Example module/def"),
+        'filename' => array('type' => 'varchar(255)', 'label' => 'FileName', 'enabled' => 1, 'position' => 70, 'notnull' => 0, 'visible' => 1, 'searchall' => 1, 'css' => 'minwidth300', 'cssview' => 'wordbreak', 'help' => "Help text", 'showoncombobox' => 2, 'validate' => 1, 'comment' => "file name only without any directory"),
+        'src_object_type' => array('type' => 'varchar(64)', 'label' => 'SourceType', 'enabled' => 1, 'position' => 80, 'notnull' => 0, 'visible' => 0, 'searchall' => 1, 'css' => 'minwidth300', 'cssview' => 'wordbreak', 'help' => "Help text", 'showoncombobox' => 2, 'validate' => 1, 'comment' => "Source object type ('proposal', 'invoice', ...)"),
         'src_object_id' => array('type' => 'integer', 'label' => 'SourceID', 'default' => '1', 'enabled' => 1, 'visible' => 0, 'notnull' => 1, 'position' => 90, 'index' => 1, 'comment' => "Source object id"),
-        'fullpath_orig' => array('type' => 'varchar(750)', 'label' => 'FullPathOrig', 'enabled' => 1, 'position' => 100, 'notnull' => 0, 'visible' => 0, 'searchall' => 0, 'css' => 'minwidth300', 'cssview' => 'wordbreak', 'help' => "Help text", 'showoncombobox' => 2, 'validate' => 1,'comment' => "full path of original filename, when file is uploaded from a local computer"),
+        'fullpath_orig' => array('type' => 'varchar(750)', 'label' => 'FullPathOrig', 'enabled' => 1, 'position' => 100, 'notnull' => 0, 'visible' => 0, 'searchall' => 0, 'css' => 'minwidth300', 'cssview' => 'wordbreak', 'help' => "Help text", 'showoncombobox' => 2, 'validate' => 1, 'comment' => "full path of original filename, when file is uploaded from a local computer"),
         'description' => array('type' => 'text', 'label' => 'Description', 'enabled' => 1, 'visible' => 0, 'position' => 110),
-        'keywords' => array('type' => 'varchar(750)', 'label' => 'Keywords', 'enabled' => 1, 'position' => 120, 'notnull' => 0, 'visible' => 1, 'searchall' => 1, 'css' => 'minwidth300', 'cssview' => 'wordbreak', 'help' => "Help text", 'showoncombobox' => 2, 'validate' => 1,'comment' => "list of keywords, separated with comma. Must be limited to most important keywords."),
+        'keywords' => array('type' => 'varchar(750)', 'label' => 'Keywords', 'enabled' => 1, 'position' => 120, 'notnull' => 0, 'visible' => 1, 'searchall' => 1, 'css' => 'minwidth300', 'cssview' => 'wordbreak', 'help' => "Help text", 'showoncombobox' => 2, 'validate' => 1, 'comment' => "list of keywords, separated with comma. Must be limited to most important keywords."),
         'cover' => array('type' => 'text', 'label' => 'Cover', 'enabled' => 1, 'visible' => 0, 'position' => 130, 'comment' => "is this file a file to use for a cover"),
         'position' => array('type' => 'integer', 'label' => 'Position', 'default' => '1', 'enabled' => 1, 'visible' => -2, 'notnull' => 1, 'position' => 140, 'index' => 1, 'comment' => "position of file among others"),
-        'gen_or_uploaded' => array('type' => 'varchar(12)', 'label' => 'GenOrUpload', 'enabled' => 1, 'position' => 150, 'notnull' => 0, 'visible' => -1, 'searchall' => 1, 'css' => 'minwidth300', 'cssview' => 'wordbreak', 'help' => "Help text", 'showoncombobox' => 2, 'validate' => 1,'comment' => "'generated' or 'uploaded'"),
+        'gen_or_uploaded' => array('type' => 'varchar(12)', 'label' => 'GenOrUpload', 'enabled' => 1, 'position' => 150, 'notnull' => 0, 'visible' => -1, 'searchall' => 1, 'css' => 'minwidth300', 'cssview' => 'wordbreak', 'help' => "Help text", 'showoncombobox' => 2, 'validate' => 1, 'comment' => "'generated' or 'uploaded'"),
         'extraparams' => array('type' => 'varchar(255)', 'label' => 'ExtraParams', 'enabled' => 1, 'position' => 160, 'notnull' => 0, 'visible' => 1, 'searchall' => 1, 'css' => 'minwidth300', 'cssview' => 'wordbreak', 'help' => "Help text", 'showoncombobox' => 2, 'validate' => 1, 'comment' => "for stocking other parameters with json format"),
         'date_c' => array('type' => 'datetime', 'label' => 'DateCreation', 'enabled' => 1, 'visible' => -1, 'position' => 170),
         'tms' => array('type' => 'timestamp', 'label' => 'DateModification', 'enabled' => 1, 'visible' => -1, 'notnull' => 1, 'position' => 175),

htdocs/ecm/class/ecmdirectory.class.php

Indentation +8 added lines, -8 removed lines

@@ -558,7 +558,7 @@ 
         return $ret;
     }
 
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
     /**
      *  Load this->motherof that is array(id_son=>id_parent, ...)
      *
@@ -566,7 +566,7 @@ 
      */
     public function load_motherof()
     {
-		// phpcs:enable
+        // phpcs:enable
         global $conf;
 
         $this->motherof = array();
@@ -603,7 +603,7 @@ 
         return $this->LibStatut($this->status, $mode);
     }
 
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
     /**
      *  Return the status
      *
@@ -613,13 +613,13 @@ 
      */
     public static function LibStatut($status, $mode = 0)
     {
-		// phpcs:enable
+        // phpcs:enable
         global $langs;
         return '';
     }
 
 
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
     /**
      *  Reconstruit l'arborescence des categories sous la forme d'un tableau à partir de la base de donnée
      *  Renvoi un tableau de tableau('id','id_mere',...) trie selon arbre et avec:
@@ -641,7 +641,7 @@ 
      */
     public function get_full_arbo($force = 0)
     {
-		// phpcs:enable
+        // phpcs:enable
         global $conf;
 
         if (empty($force) && !empty($this->full_arbo_loaded)) {
@@ -789,7 +789,7 @@ 
         }
     }
 
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
     /**
      * Call trigger based on this instance.
      * We implement it here because this class doe not extend CommonObject.
@@ -804,7 +804,7 @@ 
      */
     public function call_trigger($triggerName, $user)
     {
-		// phpcs:enable
+        // phpcs:enable
         global $langs, $conf;
 
         include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php';

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

Spacing +7 added lines, -7 removed lines

@@ -343,7 +343,7 @@ 
 
         // Loop lines to calculate $totalqty
         for ($i = 1; $i <= $num; $i++) {
-            $idl = "idl" . $i;    // id line source
+            $idl = "idl" . $i; // id line source
 
             //$sub_qty = array();
             //$subtotalqty = 0;
@@ -351,7 +351,7 @@ 
             //$j = 0;
             //$batch = "batchl".$i."_0";
             //$stockLocation = "ent1".$i."_0";
-            $qty = "qtyl" . $i;   // qty
+            $qty = "qtyl" . $i; // qty
 
             //reception line for product with no batch management and no multiple stock location
             if (GETPOST($qty, 'alpha') > 0) {
@@ -365,7 +365,7 @@ 
 
         if ($totalqty > 0) {  // There is at least one thing to ship
             for ($i = 1; $i <= $num; $i++) {
-                $idl = "idl" . $i;    // id line source
+                $idl = "idl" . $i; // id line source
                 $lineToTest = '';
                 $lineId = GETPOSTINT($idl);
                 foreach ($objectsrc->lines as $linesrc) {
@@ -1144,7 +1144,7 @@ 
 
                     print '<input type="hidden" name="productl' . $indiceAsked . '" value="' . $line->fk_product . '">';
 
-                    if (! array_key_exists($line->id, $arrayofpurchaselinealreadyoutput)) { // Add test to avoid to show qty twice
+                    if (!array_key_exists($line->id, $arrayofpurchaselinealreadyoutput)) { // Add test to avoid to show qty twice
                         print '<input type="hidden" name="productid' . $indiceAsked . '" value="' . $line->fk_product . '">';
 
                         // Show product and description
@@ -1166,7 +1166,7 @@ 
                     print '</td>';
                 } else {
                     print "<td>";
-                    if (! array_key_exists($line->id, $arrayofpurchaselinealreadyoutput)) { // Add test to avoid to show qty twice
+                    if (!array_key_exists($line->id, $arrayofpurchaselinealreadyoutput)) { // Add test to avoid to show qty twice
                         if ($type == 1) {
                             $text = img_object($langs->trans('Service'), 'service');
                         } else {
@@ -1195,7 +1195,7 @@ 
 
                 // Qty in source purchase order line
                 print '<td class="center">';
-                if (! array_key_exists($line->id, $arrayofpurchaselinealreadyoutput)) { // Add test to avoid to show qty twice
+                if (!array_key_exists($line->id, $arrayofpurchaselinealreadyoutput)) { // Add test to avoid to show qty twice
                     print $line->qty;
                 }
                 print '<input type="hidden" name="fk_commandefournisseurdet' . $indiceAsked . '" value="' . $line->id . '">';
@@ -1207,7 +1207,7 @@ 
                 // Qty already received
                 print '<td class="center">';
                 $quantityDelivered = $objectsrc->receptions[$line->id];
-                if (! array_key_exists($line->id, $arrayofpurchaselinealreadyoutput)) { // Add test to avoid to show qty twice
+                if (!array_key_exists($line->id, $arrayofpurchaselinealreadyoutput)) { // Add test to avoid to show qty twice
                     print $quantityDelivered;
                 }
                 print '<input name="qtydelivered' . $indiceAsked . '" id="qtydelivered' . $indiceAsked . '" type="hidden" value="' . $quantityDelivered . '">';

htdocs/admin/dolistore/class/dolistore.class.php

Indentation +14 added lines, -14 removed lines

@@ -198,7 +198,7 @@ 
         }
     }
 
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
     /**
      * Return tree of Dolistore categories. $this->categories must have been loaded before.
      *
@@ -207,7 +207,7 @@ 
      */
     public function get_categories($parent = 0)
     {
-		// phpcs:enable
+        // phpcs:enable
         if (!isset($this->categories)) {
             die('not possible');
         }
@@ -245,7 +245,7 @@ 
         }
     }
 
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
     /**
      * Return list of product formatted for output
      *
@@ -253,7 +253,7 @@ 
      */
     public function get_products()
     {
-		// phpcs:enable
+        // phpcs:enable
         global $langs, $conf;
         $html       = "";
         $last_month = time() - (30 * 24 * 60 * 60);
@@ -342,7 +342,7 @@ 
         return $html;
     }
 
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
     /**
      * get previous link
      *
@@ -351,11 +351,11 @@ 
      */
     public function get_previous_link($text = '<<')
     {
-		// phpcs:enable
+        // phpcs:enable
         return '<a href="' . $this->get_previous_url() . '" class="button">' . dol_escape_htmltag($text) . '</a>';
     }
 
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
     /**
      * get next link
      *
@@ -364,11 +364,11 @@ 
      */
     public function get_next_link($text = '>>')
     {
-		// phpcs:enable
+        // phpcs:enable
         return '<a href="' . $this->get_next_url() . '" class="button">' . dol_escape_htmltag($text) . '</a>';
     }
 
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
     /**
      * get previous url
      *
@@ -376,7 +376,7 @@ 
      */
     public function get_previous_url()
     {
-		// phpcs:enable
+        // phpcs:enable
         $param_array = array();
         if ($this->start < $this->per_page) {
             $sub = 0;
@@ -392,7 +392,7 @@ 
         return $this->url . "&" . $param;
     }
 
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
     /**
      * get next url
      *
@@ -400,7 +400,7 @@ 
      */
     public function get_next_url()
     {
-		// phpcs:enable
+        // phpcs:enable
         $param_array = array();
         if (count($this->products) < $this->per_page) {
             $add = 0;
@@ -416,7 +416,7 @@ 
         return $this->url . "&" . $param;
     }
 
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
     /**
      * version compare
      *
@@ -426,7 +426,7 @@ 
      */
     public function version_compare($v1, $v2)
     {
-		// phpcs:enable
+        // phpcs:enable
         $v1       = explode('.', $v1);
         $v2       = explode('.', $v2);
         $ret      = 0;

Spacing +2 added lines, -2 removed lines

@@ -324,12 +324,12 @@
             //output template
             $html .= '<tr class="app oddeven ' . dol_escape_htmltag($compatible) . '">';
             $html .= '<td class="center" width="210"><div class="newAppParent">';
-            $html .= $newapp . $images;   // No dol_escape_htmltag, it is already escape html
+            $html .= $newapp . $images; // No dol_escape_htmltag, it is already escape html
             $html .= '</div></td>';
             $html .= '<td class="margeCote"><h2 class="appTitle">';
             $html .= dol_escape_htmltag($product->name->language[$this->lang - 1]);
             $html .= '<br><small>';
-            $html .= $version;          // No dol_escape_htmltag, it is already escape html
+            $html .= $version; // No dol_escape_htmltag, it is already escape html
             $html .= '</small></h2>';
             $html .= '<small> ' . dol_print_date(dol_stringtotime($product->date_upd), 'dayhour') . ' - ' . $langs->trans('Ref') . ': ' . dol_escape_htmltag($product->reference) . ' - ' . dol_escape_htmltag($langs->trans('Id')) . ': ' . ((int) $product->id) . '</small><br><br>' . dol_escape_htmltag($product->description_short->language[$this->lang - 1]) . '</td>';
             // do not load if display none

htdocs/core/tpl/contacts.tpl.php

Indentation +1 added lines, -1 removed lines

@@ -189,7 +189,7 @@
         <div class="tagtd center noborderbottom">
             <input type="submit" id="add-customer-contact" class="button small" value="<?php echo $langs->trans("Add"); ?>"<?php if (!$nbofcontacts) {
                 echo ' disabled';
-                                                                                       } ?>>
+                                                                                        } ?>>
         </div>
     </form>
 

Spacing +2 added lines, -2 removed lines

@@ -40,7 +40,7 @@ 
 $module = $object->element;
 
 // Special cases
-if (isset($permissiontoadd) && ! isset($permission)) {
+if (isset($permissiontoadd) && !isset($permission)) {
     $permission = $permissiontoadd;
 }
 // TODO Remove this section. We already got $permissiontoadd.
@@ -164,7 +164,7 @@ 
         <div class="tagtd nowrap noborderbottom">
             <?php
             $selectedCompany = GETPOSTISSET("newcompany") ? GETPOSTINT("newcompany") : (empty($object->socid) ? 0 : $object->socid);
-            $selectedCompany = $formcompany->selectCompaniesForNewContact($object, 'id', $selectedCompany, 'newcompany', '', 0, '', 'minwidth300imp');  // This also print the select component?>
+            $selectedCompany = $formcompany->selectCompaniesForNewContact($object, 'id', $selectedCompany, 'newcompany', '', 0, '', 'minwidth300imp'); // This also print the select component?>
         </div>
         <div class="tagtd noborderbottom minwidth500imp">
             <?php

htdocs/core/db/pgsql.class.php

Indentation +38 added lines, -38 removed lines

@@ -376,7 +376,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`
@@ -387,7 +387,7 @@ 
      */
     public function select_db($database)
     {
-		// phpcs:enable
+        // phpcs:enable
         if ($database == $this->database_name) {
             return true;
         } else {
@@ -584,7 +584,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
      *
@@ -593,7 +593,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;
@@ -601,7 +601,7 @@ 
         return pg_fetch_object($resultset);
     }
 
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
     /**
      *  Return datas as an array
      *
@@ -610,7 +610,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;
@@ -618,7 +618,7 @@ 
         return pg_fetch_array($resultset);
     }
 
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
     /**
      *  Return datas as an array
      *
@@ -627,7 +627,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;
@@ -635,7 +635,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
      *
@@ -645,7 +645,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;
@@ -653,7 +653,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
      *
@@ -663,7 +663,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;
@@ -844,7 +844,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
      *
@@ -854,7 +854,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) {
@@ -910,7 +910,7 @@ 
     }
 
 
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
     /**
      * Return connection ID
      *
@@ -918,13 +918,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
@@ -938,7 +938,7 @@ 
      */
     public function DDLCreateDb($database, $charset = '', $collation = '', $owner = '')
     {
-		// phpcs:enable
+        // phpcs:enable
         if (empty($charset)) {
             $charset = $this->forcecharset;
         }
@@ -956,7 +956,7 @@ 
         return $ret;
     }
 
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
     /**
      *  List tables into a database
      *
@@ -966,7 +966,7 @@ 
      */
     public function DDLListTables($database, $table = '')
     {
-		// phpcs:enable
+        // phpcs:enable
         $listtables = array();
 
         $escapedlike = '';
@@ -984,7 +984,7 @@ 
         return $listtables;
     }
 
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
     /**
      *  List tables into a database
      *
@@ -994,7 +994,7 @@ 
      */
     public function DDLListTablesFull($database, $table = '')
     {
-		// phpcs:enable
+        // phpcs:enable
         $listtables = array();
 
         $escapedlike = '';
@@ -1012,7 +1012,7 @@ 
         return $listtables;
     }
 
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
     /**
      *  List information of columns into a table.
      *
@@ -1022,7 +1022,7 @@ 
      */
     public function DDLInfoTable($table)
     {
-		// phpcs:enable
+        // phpcs:enable
         $infotables = array();
 
         $sql = "SELECT ";
@@ -1052,7 +1052,7 @@ 
     }
 
 
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
     /**
      *  Create a table into database
      *
@@ -1067,7 +1067,7 @@ 
      */
     public function DDLCreateTable($table, $fields, $primary_key, $type, $unique_keys = null, $fulltext_keys = null, $keys = null)
     {
-		// phpcs:enable
+        // phpcs:enable
         // FIXME: $fulltext_keys parameter is unused
 
         $sqlfields = array();
@@ -1136,7 +1136,7 @@ 
         }
     }
 
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
     /**
      *  Drop a table into database
      *
@@ -1145,7 +1145,7 @@ 
      */
     public function DDLDropTable($table)
     {
-		// phpcs:enable
+        // phpcs:enable
         $tmptable = preg_replace('/[^a-z0-9\.\-\_]/i', '', $table);
 
         $sql = "DROP TABLE " . $tmptable;
@@ -1157,7 +1157,7 @@ 
         }
     }
 
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
     /**
      *  Create a user to connect to database
      *
@@ -1169,7 +1169,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->escape($dolibarr_main_db_user) . " with password '" . $this->escape($dolibarr_main_db_pass) . "'";
 
@@ -1182,7 +1182,7 @@ 
         return 1;
     }
 
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
     /**
      *  Return a pointer of line with description of a table or field
      *
@@ -1192,7 +1192,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) {
@@ -1204,7 +1204,7 @@ 
         return $this->_results;
     }
 
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
     /**
      *  Create a new field into table
      *
@@ -1216,7 +1216,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 . " ";
@@ -1251,7 +1251,7 @@ 
         return 1;
     }
 
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
     /**
      *  Update format of a field into a table
      *
@@ -1262,7 +1262,7 @@ 
      */
     public function DDLUpdateField($table, $field_name, $field_desc)
     {
-		// phpcs:enable
+        // phpcs:enable
         $sql = "ALTER TABLE " . $table;
         $sql .= " ALTER COLUMN " . $this->escape($field_name) . " TYPE " . $field_desc['type'];
         if (preg_match("/^[^\s]/i", $field_desc['value'])) {
@@ -1297,7 +1297,7 @@ 
         return 1;
     }
 
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
     /**
      *  Drop a field from table
      *
@@ -1307,7 +1307,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 " . $table . " DROP COLUMN " . $tmp_field_name;

htdocs/core/db/Database.interface.php

Indentation +38 added lines, -38 removed lines

@@ -36,7 +36,7 @@ 
      */
     public function ifsql($test, $resok, $resko);
 
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
     /**
      * Return datas as an array
      *
@@ -44,7 +44,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.
@@ -70,7 +70,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
@@ -83,7 +83,7 @@ 
      * @return  resource                    resource defined if OK, null if KO
      */
     public function DDLCreateDb($database, $charset = '', $collation = '', $owner = '');
-	// phpcs:enable
+    // phpcs:enable
 
     /**
      * Return version of database server into an array
@@ -101,7 +101,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
      *
@@ -110,7 +110,7 @@ 
      * @see     num_rows()
      */
     public function affected_rows($resultset);
-	// phpcs:enable
+    // phpcs:enable
 
     /**
      * Return description of last error
@@ -119,7 +119,7 @@ 
      */
     public function error();
 
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
     /**
      *  List tables into a database
      *
@@ -128,9 +128,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
      *
@@ -139,7 +139,7 @@ 
      *  @return array                   List of tables in an array
      */
     public function DDLListTablesFull($database, $table = '');
-	// phpcs:enable
+    // phpcs:enable
 
     /**
      * Return last request executed with query()
@@ -165,7 +165,7 @@ 
      */
     public function decrypt($value);
 
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
     /**
      *    Return datas as an array
      *
@@ -173,7 +173,7 @@ 
      * @return  array                    Array
      */
     public function fetch_array($resultset);
-	// phpcs:enable
+    // phpcs:enable
 
     /**
      * Return last error label
@@ -207,7 +207,7 @@ 
      */
     public function sanitize($stringtosanitize);
 
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
     /**
      * Get last ID after an insert INSERT
      *
@@ -216,7 +216,7 @@ 
      * @return  int                 Id of row
      */
     public function last_insert_id($tab, $fieldid = 'rowid');
-	// phpcs:enable
+    // phpcs:enable
 
     /**
      *    Return full path of restore program
@@ -290,7 +290,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
      *
@@ -299,7 +299,7 @@ 
      * @see     affected_rows()
      */
     public function num_rows($resultset);
-	// phpcs:enable
+    // phpcs:enable
 
     /**
      * Return full path of dump program
@@ -322,7 +322,7 @@ 
      */
     public function errno();
 
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
     /**
      * Create a table into database
      *
@@ -336,9 +336,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
      *
@@ -346,7 +346,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
@@ -355,7 +355,7 @@ 
      */
     public function getListOfCharacterSet();
 
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
     /**
      * Create a new field into table
      *
@@ -366,9 +366,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
      *
@@ -377,9 +377,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
      *
@@ -389,7 +389,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
@@ -398,7 +398,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
      *
@@ -407,7 +407,7 @@ 
      * @return   resource                   Resource
      */
     public function DDLDescTable($table, $field = "");
-	// phpcs:enable
+    // phpcs:enable
 
     /**
      * Return version of database server
@@ -423,7 +423,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)
      *
@@ -439,7 +439,7 @@ 
         $dolibarr_main_db_pass,
         $dolibarr_main_db_name
     );
-	// phpcs:enable
+    // phpcs:enable
 
     /**
      * Convert (by PHP) a PHP server TZ string date into a Timestamps date (GMT if gm=true)
@@ -470,7 +470,7 @@ 
      */
     public function commit($log = '');
 
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
     /**
      * List information of columns into a table.
      *
@@ -478,7 +478,7 @@ 
      * @return  array                           Array with information on table
      */
     public function DDLInfoTable($table);
-	// phpcs:enable
+    // phpcs:enable
 
     /**
      * Free last resultset used.
@@ -503,16 +503,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
      *
@@ -520,9 +520,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
      *
@@ -530,5 +530,5 @@ 
      * @return  boolean            true if OK, false if KO
      */
     public function select_db($database);
-	// phpcs:enable
+    // phpcs:enable
 }

htdocs/core/db/sqlite3.class.php

Indentation +46 added lines, -46 removed lines

@@ -291,7 +291,7 @@ 
         return $line;
     }
 
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
     /**
      *  Select a database
      *
@@ -300,7 +300,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);
@@ -507,7 +507,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
      *
@@ -516,7 +516,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;
@@ -530,7 +530,7 @@ 
     }
 
 
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
     /**
      *  Return datas as an array
      *
@@ -539,7 +539,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;
@@ -549,7 +549,7 @@ 
         return $ret;
     }
 
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
     /**
      *  Return datas as an array
      *
@@ -558,7 +558,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)) {
@@ -571,7 +571,7 @@ 
         }
     }
 
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
     /**
      *  Return number of lines for result of a SELECT
      *
@@ -581,7 +581,7 @@ 
      */
     public function num_rows($resultset)
     {
-		// phpcs:enable
+        // phpcs:enable
         // FIXME: SQLite3Result does not have a queryString member
 
         // If resultset not provided, we take the last used by connection
@@ -594,7 +594,7 @@ 
         return 0;
     }
 
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
     /**
      *  Return number of lines for result of a SELECT
      *
@@ -604,7 +604,7 @@ 
      */
     public function affected_rows($resultset)
     {
-		// phpcs:enable
+        // phpcs:enable
         // FIXME: SQLite3Result does not have a queryString member
 
         // If resultset not provided, we take the last used by connection
@@ -744,7 +744,7 @@ 
         }
     }
 
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
     /**
      * Get last ID after an insert INSERT
      *
@@ -754,7 +754,7 @@ 
      */
     public function last_insert_id($tab, $fieldid = 'rowid')
     {
-		// phpcs:enable
+        // phpcs:enable
         return $this->db->lastInsertRowId();
     }
 
@@ -819,7 +819,7 @@ 
     }
 
 
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
     /**
      * Return connection ID
      *
@@ -827,12 +827,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
@@ -846,7 +846,7 @@ 
      */
     public function DDLCreateDb($database, $charset = '', $collation = '', $owner = '')
     {
-		// phpcs:enable
+        // phpcs:enable
         if (empty($charset)) {
             $charset = $this->forcecharset;
         }
@@ -864,7 +864,7 @@ 
         return $ret;
     }
 
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
     /**
      *  List tables into a database
      *
@@ -874,7 +874,7 @@ 
      */
     public function DDLListTables($database, $table = '')
     {
-		// phpcs:enable
+        // phpcs:enable
         $listtables = array();
 
         $like = '';
@@ -896,7 +896,7 @@ 
         return $listtables;
     }
 
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
     /**
      *  List tables into a database with table type
      *
@@ -906,7 +906,7 @@ 
      */
     public function DDLListTablesFull($database, $table = '')
     {
-		// phpcs:enable
+        // phpcs:enable
         $listtables = array();
 
         $like = '';
@@ -928,7 +928,7 @@ 
         return $listtables;
     }
 
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
     /**
      *  List information of columns into a table.
      *
@@ -938,7 +938,7 @@ 
      */
     public function DDLInfoTable($table)
     {
-		// phpcs:enable
+        // phpcs:enable
         $infotables = array();
 
         $tmptable = preg_replace('/[^a-z0-9\.\-\_]/i', '', $table);
@@ -955,7 +955,7 @@ 
         return $infotables;
     }
 
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
     /**
      *  Create a table into database
      *
@@ -970,7 +970,7 @@ 
      */
     public function DDLCreateTable($table, $fields, $primary_key, $type, $unique_keys = null, $fulltext_keys = null, $keys = null)
     {
-		// phpcs:enable
+        // phpcs:enable
         // FIXME: $fulltext_keys parameter is unused
 
         $sqlfields = array();
@@ -1038,7 +1038,7 @@ 
         return 1;
     }
 
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
     /**
      *  Drop a table into database
      *
@@ -1047,7 +1047,7 @@ 
      */
     public function DDLDropTable($table)
     {
-		// phpcs:enable
+        // phpcs:enable
         $tmptable = preg_replace('/[^a-z0-9\.\-\_]/i', '', $table);
 
         $sql = "DROP TABLE " . $tmptable;
@@ -1059,7 +1059,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
      *
@@ -1069,7 +1069,7 @@ 
      */
     public function DDLDescTable($table, $field = "")
     {
-		// phpcs:enable
+        // phpcs:enable
         $sql = "DESC " . $table . " " . $field;
 
         dol_syslog(get_class($this) . "::DDLDescTable " . $sql, LOG_DEBUG);
@@ -1077,7 +1077,7 @@ 
         return $this->_results;
     }
 
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
     /**
      *  Create a new field into table
      *
@@ -1089,7 +1089,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 . " ";
@@ -1124,7 +1124,7 @@ 
         return 1;
     }
 
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
     /**
      *  Update format of a field into a table
      *
@@ -1135,7 +1135,7 @@ 
      */
     public function DDLUpdateField($table, $field_name, $field_desc)
     {
-		// phpcs:enable
+        // phpcs:enable
         $sql = "ALTER TABLE " . $table;
         $sql .= " MODIFY COLUMN " . $field_name . " " . $field_desc['type'];
         if ($field_desc['type'] == 'tinyint' || $field_desc['type'] == 'int' || $field_desc['type'] == 'varchar') {
@@ -1149,7 +1149,7 @@ 
         return 1;
     }
 
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
     /**
      *  Drop a field from table
      *
@@ -1159,7 +1159,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 " . $table . " DROP COLUMN `" . $tmp_field_name . "`";
@@ -1171,7 +1171,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)
      *
@@ -1183,7 +1183,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) . "')";
@@ -1398,7 +1398,7 @@ 
         }
     }
 
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
     /**
      * calc_daynr
      *
@@ -1409,7 +1409,7 @@ 
      */
     private static function calc_daynr($year, $month, $day)
     {
-		// phpcs:enable
+        // phpcs:enable
         $y = $year;
         if ($y == 0 && $month == 0) {
             return 0;
@@ -1424,7 +1424,7 @@ 
         return (int) ($num + floor($y / 4) - $temp);
     }
 
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
     /**
      * calc_weekday
      *
@@ -1434,12 +1434,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
      *
@@ -1448,11 +1448,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
      *
@@ -1465,7 +1465,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;

htdocs/core/lib/prelevement.lib.php

Indentation +7 added lines, -7 removed lines

@@ -118,13 +118,13 @@
 }
 
     /**
- *  Return array head with list of tabs to view object information
- *
- *  @param  BonPrelevement  $object             Member
- *  @param  int             $nbOfInvoices       No of invoices
- *  @param  int             $nbOfSalaryInvoice  No of salary invoices
- *  @return array                               head
- */
+     *  Return array head with list of tabs to view object information
+     *
+     *  @param  BonPrelevement  $object             Member
+     *  @param  int             $nbOfInvoices       No of invoices
+     *  @param  int             $nbOfSalaryInvoice  No of salary invoices
+     *  @return array                               head
+     */
 function bon_prelevement_prepare_head(BonPrelevement $object, $nbOfInvoices, $nbOfSalaryInvoice)
 {
     global $langs, $conf;