alxarafe / alixar

public/htdocs/asset/admin/setup.php

Spacing +3 added lines, -3 removed lines

@@ -78,7 +78,7 @@ 
 $error = 0;
 $setupnotempty = 0;
 
-$dirmodels = array_merge(array('/'), (array)$conf->modules_parts['models']);
+$dirmodels = array_merge(array('/'), (array) $conf->modules_parts['models']);
 
 $moduledir = 'asset';
 $myTmpObjects = array();
@@ -122,7 +122,7 @@ 
     // Search template files
     $file = '';
     $classname = '';
-    $dirmodels = array_merge(array('/'), (array)$conf->modules_parts['models']);
+    $dirmodels = array_merge(array('/'), (array) $conf->modules_parts['models']);
     foreach ($dirmodels as $reldir) {
         $file = dol_buildpath($reldir . "core/modules/asset/doc/pdf_" . $modele . "_" . strtolower($tmpobjectkey) . ".modules.php", 0);
         if (file_exists($file)) {
@@ -558,7 +558,7 @@ 
                     $accountsystem->fetch(getDolGlobalInt('CHARTOFACCOUNTS'));
                     $sql = 'SELECT DISTINCT pcg_type FROM ' . MAIN_DB_PREFIX . 'accounting_account';
                     $sql .= " WHERE fk_pcg_version = '" . $db->escape($accountsystem->ref) . "'";
-                    $sql .= ' AND entity in (' . getEntity('accounting_account', 0) . ')';      // Always limit to current entity. No sharing in accountancy.
+                    $sql .= ' AND entity in (' . getEntity('accounting_account', 0) . ')'; // Always limit to current entity. No sharing in accountancy.
                     $sql .= ' LIMIT 50000'; // just as a sanity check
                     $resql = $db->query($sql);
                     if ($resql) {

public/htdocs/bom/bom_net_needs.php

Spacing +1 added lines, -1 removed lines

@@ -229,7 +229,7 @@
         print '<td class="left">' . $langs->trans('ProducedBy') . '</td>';
     }
     print '<td class="linecolqty right">' . $langs->trans('Quantity') . '</td>';
-    print '<td></td>';  // For unit
+    print '<td></td>'; // For unit
     print '<td class="linecolstock right">' . $form->textwithpicto($langs->trans("PhysicalStock"), $text_stock_options, 1) . '</td>';
     print '<td class="linecoltheoricalstock right">' . $form->textwithpicto($langs->trans("VirtualStock"), $langs->trans("VirtualStockDesc")) . '</td>';
     print  '</tr>';

public/htdocs/bom/bom_card.php

Spacing +3 added lines, -3 removed lines

@@ -288,7 +288,7 @@ 
                 $fk_default_workstation = GETPOSTINT('idworkstations');
             }
 
-            $result = $object->updateLine($lineid, $qty, (int)$qty_frozen, (int)$disable_stock_change, $efficiency, $bomline->position, $bomline->import_key, $fk_unit, $array_options, $fk_default_workstation);
+            $result = $object->updateLine($lineid, $qty, (int) $qty_frozen, (int) $disable_stock_change, $efficiency, $bomline->position, $bomline->import_key, $fk_unit, $array_options, $fk_default_workstation);
 
             if ($result <= 0) {
                 setEventMessages($object->error, $object->errors, 'errors');
@@ -592,7 +592,7 @@ 
     if (!empty($object->table_element_line)) {
         // Products
 
-        $res = $object->fetchLinesbytypeproduct(0);     // Load all lines products into ->lines
+        $res = $object->fetchLinesbytypeproduct(0); // Load all lines products into ->lines
         $object->calculateCosts();
 
         print ($res == 0 && $object->status >= $object::STATUS_VALIDATED) ? '' : load_fiche_titre($langs->trans('BOMProductsList'), '', 'product');
@@ -646,7 +646,7 @@ 
         // Services
 
         $filtertype = 1;
-        $res = $object->fetchLinesbytypeproduct(1);     // Load all lines services into ->lines
+        $res = $object->fetchLinesbytypeproduct(1); // Load all lines services into ->lines
         $object->calculateCosts();
 
         print ($res == 0 && $object->status >= $object::STATUS_VALIDATED) ? '' : load_fiche_titre($langs->trans('BOMServicesList'), '', 'service');

public/htdocs/core/ajax/fileupload.php

Spacing +2 added lines, -2 removed lines

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

Dolibarr/Code/Categories/Classes/Categorie.php

Spacing +49 added lines, -49 removed lines

@@ -357,7 +357,7 @@ 
             if (intval($searchCategory) == -2) {
                 $searchCategorySqlList[] = " cp.fk_categorie IS NULL";
             } elseif (intval($searchCategory) > 0) {
-                $searchCategorySqlList[] = " " . $rowIdName . " IN (SELECT fk_" . $type . " FROM " . MAIN_DB_PREFIX . "categorie_" . $type . " WHERE fk_categorie = " . ((int)$searchCategory) . ")";
+                $searchCategorySqlList[] = " " . $rowIdName . " IN (SELECT fk_" . $type . " FROM " . MAIN_DB_PREFIX . "categorie_" . $type . " WHERE fk_categorie = " . ((int) $searchCategory) . ")";
             }
         }
 
@@ -420,7 +420,7 @@ 
         $this->label = trim($this->label);
         $this->description = trim($this->description);
         $this->color = trim($this->color);
-        $this->position = (int)$this->position;
+        $this->position = (int) $this->position;
         $this->import_key = trim($this->import_key);
         $this->ref_ext = trim($this->ref_ext);
         if (empty($this->visible)) {
@@ -454,21 +454,21 @@ 
         $sql .= " date_creation,";
         $sql .= " fk_user_creat";
         $sql .= ") VALUES (";
-        $sql .= (int)$this->fk_parent . ",";
+        $sql .= (int) $this->fk_parent . ",";
         $sql .= "'" . $this->db->escape($this->label) . "', ";
         $sql .= "'" . $this->db->escape($this->description) . "', ";
         $sql .= "'" . $this->db->escape($this->color) . "', ";
-        $sql .= (int)$this->position . ",";
+        $sql .= (int) $this->position . ",";
         if (getDolGlobalString('CATEGORY_ASSIGNED_TO_A_CUSTOMER')) {
             $sql .= ($this->socid > 0 ? $this->socid : 'null') . ", ";
         }
         $sql .= "'" . $this->db->escape($this->visible) . "', ";
-        $sql .= ((int)$type) . ", ";
+        $sql .= ((int) $type) . ", ";
         $sql .= (!empty($this->import_key) ? "'" . $this->db->escape($this->import_key) . "'" : 'null') . ", ";
         $sql .= (!empty($this->ref_ext) ? "'" . $this->db->escape($this->ref_ext) . "'" : 'null') . ", ";
-        $sql .= (int)$conf->entity . ", ";
+        $sql .= (int) $conf->entity . ", ";
         $sql .= "'" . $this->db->idate($now) . "', ";
-        $sql .= (int)$user->id;
+        $sql .= (int) $user->id;
         $sql .= ")";
 
         $res = $this->db->query($sql);
@@ -537,8 +537,8 @@ 
         $sql = "SELECT c.rowid";
         $sql .= " FROM " . MAIN_DB_PREFIX . "categorie as c ";
         $sql .= " WHERE c.entity IN (" . getEntity('category') . ")";
-        $sql .= " AND c.type = " . ((int)$type);
-        $sql .= " AND c.fk_parent = " . ((int)$this->fk_parent);
+        $sql .= " AND c.type = " . ((int) $type);
+        $sql .= " AND c.fk_parent = " . ((int) $this->fk_parent);
         $sql .= " AND c.label = '" . $this->db->escape($this->label) . "'";
 
         dol_syslog(get_class($this) . "::already_exists", LOG_DEBUG);
@@ -601,14 +601,14 @@ 
         $sql .= " description = '" . $this->db->escape($this->description) . "',";
         $sql .= " ref_ext = '" . $this->db->escape($this->ref_ext) . "',";
         $sql .= " color = '" . $this->db->escape($this->color) . "'";
-        $sql .= ", position = " . (int)$this->position;
+        $sql .= ", position = " . (int) $this->position;
         if (getDolGlobalString('CATEGORY_ASSIGNED_TO_A_CUSTOMER')) {
             $sql .= ", fk_soc = " . ($this->socid > 0 ? $this->socid : 'null');
         }
-        $sql .= ", visible = " . (int)$this->visible;
-        $sql .= ", fk_parent = " . (int)$this->fk_parent;
-        $sql .= ", fk_user_modif = " . (int)$user->id;
-        $sql .= " WHERE rowid = " . ((int)$this->id);
+        $sql .= ", visible = " . (int) $this->visible;
+        $sql .= ", fk_parent = " . (int) $this->fk_parent;
+        $sql .= ", fk_user_modif = " . (int) $user->id;
+        $sql .= " WHERE rowid = " . ((int) $this->id);
 
         dol_syslog(get_class($this) . "::update", LOG_DEBUG);
         if ($this->db->query($sql)) {
@@ -675,8 +675,8 @@ 
         /* FIX #1317 : Check for child category and move up 1 level*/
         if (!$error) {
             $sql = "UPDATE " . MAIN_DB_PREFIX . "categorie";
-            $sql .= " SET fk_parent = " . ((int)$this->fk_parent);
-            $sql .= " WHERE fk_parent = " . ((int)$this->id);
+            $sql .= " SET fk_parent = " . ((int) $this->fk_parent);
+            $sql .= " WHERE fk_parent = " . ((int) $this->id);
 
             if (!$this->db->query($sql)) {
                 $this->error = $this->db->lasterror();
@@ -710,7 +710,7 @@ 
                 $value = $value['field'];
             }
             $sql = "DELETE FROM " . MAIN_DB_PREFIX . $key;
-            $sql .= " WHERE " . $value . " = " . ((int)$this->id);
+            $sql .= " WHERE " . $value . " = " . ((int) $this->id);
             if (!$this->db->query($sql)) {
                 $this->errors[] = $this->db->lasterror();
                 dol_syslog("Error sql=" . $sql . " " . $this->error, LOG_ERR);
@@ -765,12 +765,12 @@ 
 
         $sql = "INSERT INTO " . MAIN_DB_PREFIX . "categorie_" . (empty($this->MAP_CAT_TABLE[$type]) ? $type : $this->MAP_CAT_TABLE[$type]);
         $sql .= " (fk_categorie, fk_" . (empty($this->MAP_CAT_FK[$type]) ? $type : $this->MAP_CAT_FK[$type]) . ")";
-        $sql .= " VALUES (" . ((int)$this->id) . ", " . ((int)$obj->id) . ")";
+        $sql .= " VALUES (" . ((int) $this->id) . ", " . ((int) $obj->id) . ")";
 
         if ($this->db->query($sql)) {
             if (getDolGlobalString('CATEGORIE_RECURSIV_ADD')) {
                 $sql = 'SELECT fk_parent FROM ' . MAIN_DB_PREFIX . 'categorie';
-                $sql .= " WHERE rowid = " . ((int)$this->id);
+                $sql .= " WHERE rowid = " . ((int) $this->id);
 
                 dol_syslog(get_class($this) . "::add_type", LOG_DEBUG);
                 $resql = $this->db->query($sql);
@@ -839,7 +839,7 @@ 
     public function containsObject($type, $object_id)
     {
         $sql = "SELECT COUNT(*) as nb FROM " . MAIN_DB_PREFIX . "categorie_" . (empty($this->MAP_CAT_TABLE[$type]) ? $type : $this->MAP_CAT_TABLE[$type]);
-        $sql .= " WHERE fk_categorie = " . ((int)$this->id) . " AND fk_" . (empty($this->MAP_CAT_FK[$type]) ? $type : $this->MAP_CAT_FK[$type]) . " = " . ((int)$object_id);
+        $sql .= " WHERE fk_categorie = " . ((int) $this->id) . " AND fk_" . (empty($this->MAP_CAT_FK[$type]) ? $type : $this->MAP_CAT_FK[$type]) . " = " . ((int) $object_id);
 
         dol_syslog(get_class($this) . "::containsObject", LOG_DEBUG);
 
@@ -881,8 +881,8 @@ 
         $this->db->begin();
 
         $sql = "DELETE FROM " . MAIN_DB_PREFIX . "categorie_" . (empty($this->MAP_CAT_TABLE[$type]) ? $type : $this->MAP_CAT_TABLE[$type]);
-        $sql .= " WHERE fk_categorie = " . ((int)$this->id);
-        $sql .= " AND fk_" . (empty($this->MAP_CAT_FK[$type]) ? $type : $this->MAP_CAT_FK[$type]) . " = " . ((int)$obj->id);
+        $sql .= " WHERE fk_categorie = " . ((int) $this->id);
+        $sql .= " AND fk_" . (empty($this->MAP_CAT_FK[$type]) ? $type : $this->MAP_CAT_FK[$type]) . " = " . ((int) $obj->id);
 
         dol_syslog(get_class($this) . '::del_type', LOG_DEBUG);
         if ($this->db->query($sql)) {
@@ -938,7 +938,7 @@ 
         $sql .= " FROM " . MAIN_DB_PREFIX . "categorie_" . (empty($this->MAP_CAT_TABLE[$type]) ? $type : $this->MAP_CAT_TABLE[$type]) . " as c";
         $sql .= ", " . MAIN_DB_PREFIX . (empty($this->MAP_OBJ_TABLE[$type]) ? $type : $this->MAP_OBJ_TABLE[$type]) . " as o";
         $sql .= " WHERE o.entity IN (" . getEntity($obj->element) . ")";
-        $sql .= " AND c.fk_categorie = " . ((int)$this->id);
+        $sql .= " AND c.fk_categorie = " . ((int) $this->id);
         // Compatibility with actioncomm table which has id instead of rowid
         if ((array_key_exists($type, $this->MAP_OBJ_TABLE) && $this->MAP_OBJ_TABLE[$type] == "actioncomm") || $type == "actioncomm") {
             $sql .= " AND c.fk_" . (empty($this->MAP_CAT_FK[$type]) ? $type : $this->MAP_CAT_FK[$type]) . " = o.id";
@@ -947,7 +947,7 @@ 
         }
         // Protection for external users
         if (($type == 'customer' || $type == 'supplier') && $user->socid > 0) {
-            $sql .= " AND o.rowid = " . ((int)$user->socid);
+            $sql .= " AND o.rowid = " . ((int) $user->socid);
         }
 
         $errormessage = '';
@@ -1013,13 +1013,13 @@ 
         $sql .= ", date_creation, tms, fk_user_creat, fk_user_modif";
         $sql .= " FROM " . MAIN_DB_PREFIX . "categorie";
         if ($id) {
-            $sql .= " WHERE rowid = " . ((int)$id);
+            $sql .= " WHERE rowid = " . ((int) $id);
         } elseif (!empty($ref_ext)) {
             $sql .= " WHERE ref_ext LIKE '" . $this->db->escape($ref_ext) . "'";
         } else {
             $sql .= " WHERE label = '" . $this->db->escape($label) . "' AND entity IN (" . getEntity('category') . ")";
             if (!is_null($type)) {
-                $sql .= " AND type = " . ((int)$type);
+                $sql .= " AND type = " . ((int) $type);
             }
         }
 
@@ -1029,20 +1029,20 @@ 
             if ($this->db->num_rows($resql) > 0 && $res = $this->db->fetch_array($resql)) {
                 $this->id = $res['rowid'];
                 //$this->ref = $res['rowid'];
-                $this->fk_parent = (int)$res['fk_parent'];
+                $this->fk_parent = (int) $res['fk_parent'];
                 $this->label = $res['label'];
                 $this->description = $res['description'];
                 $this->color = $res['color'];
                 $this->position = $res['position'];
-                $this->socid = (int)$res['fk_soc'];
-                $this->visible = (int)$res['visible'];
+                $this->socid = (int) $res['fk_soc'];
+                $this->visible = (int) $res['visible'];
                 $this->type = $res['type'];
                 $this->ref_ext = $res['ref_ext'];
-                $this->entity = (int)$res['entity'];
+                $this->entity = (int) $res['entity'];
                 $this->date_creation = $this->db->jdate($res['date_creation']);
                 $this->date_modification = $this->db->jdate($res['tms']);
-                $this->user_creation_id = (int)$res['fk_user_creat'];
-                $this->user_modification_id = (int)$res['fk_user_modif'];
+                $this->user_creation_id = (int) $res['fk_user_creat'];
+                $this->user_modification_id = (int) $res['fk_user_modif'];
 
                 // Retrieve all extrafield
                 // fetch optionals attributes and labels
@@ -1081,7 +1081,7 @@ 
 
         $sql = "SELECT lang, label, description";
         $sql .= " FROM " . MAIN_DB_PREFIX . "categorie_lang";
-        $sql .= " WHERE fk_category=" . ((int)$this->id);
+        $sql .= " WHERE fk_category=" . ((int) $this->id);
 
         $result = $this->db->query($sql);
         if ($result) {
@@ -1122,7 +1122,7 @@ 
         foreach ($langs_available as $key => $value) {
             $sql = "SELECT rowid";
             $sql .= " FROM " . MAIN_DB_PREFIX . "categorie_lang";
-            $sql .= " WHERE fk_category=" . ((int)$this->id);
+            $sql .= " WHERE fk_category=" . ((int) $this->id);
             $sql .= " AND lang = '" . $this->db->escape($key) . "'";
 
             $result = $this->db->query($sql);
@@ -1133,10 +1133,10 @@ 
                     $sql2 = "UPDATE " . MAIN_DB_PREFIX . "categorie_lang";
                     $sql2 .= " SET label = '" . $this->db->escape($this->label) . "',";
                     $sql2 .= " description = '" . $this->db->escape($this->description) . "'";
-                    $sql2 .= " WHERE fk_category = " . ((int)$this->id) . " AND lang = '" . $this->db->escape($key) . "'";
+                    $sql2 .= " WHERE fk_category = " . ((int) $this->id) . " AND lang = '" . $this->db->escape($key) . "'";
                 } elseif (isset($this->multilangs[$key])) {
                     $sql2 = "INSERT INTO " . MAIN_DB_PREFIX . "categorie_lang (fk_category, lang, label, description)";
-                    $sql2 .= " VALUES(" . ((int)$this->id) . ", '" . $this->db->escape($key) . "', '" . $this->db->escape($this->label) . "'";
+                    $sql2 .= " VALUES(" . ((int) $this->id) . ", '" . $this->db->escape($key) . "', '" . $this->db->escape($this->label) . "'";
                     $sql2 .= ", '" . $this->db->escape($this->multilangs[$key]["description"]) . "')";
                 }
                 dol_syslog(get_class($this) . '::setMultiLangs', LOG_DEBUG);
@@ -1149,10 +1149,10 @@ 
                     $sql2 = "UPDATE " . MAIN_DB_PREFIX . "categorie_lang";
                     $sql2 .= " SET label='" . $this->db->escape($this->multilangs[$key]["label"]) . "',";
                     $sql2 .= " description='" . $this->db->escape($this->multilangs[$key]["description"]) . "'";
-                    $sql2 .= " WHERE fk_category=" . ((int)$this->id) . " AND lang='" . $this->db->escape($key) . "'";
+                    $sql2 .= " WHERE fk_category=" . ((int) $this->id) . " AND lang='" . $this->db->escape($key) . "'";
                 } else {
                     $sql2 = "INSERT INTO " . MAIN_DB_PREFIX . "categorie_lang (fk_category, lang, label, description)";
-                    $sql2 .= " VALUES(" . ((int)$this->id) . ", '" . $this->db->escape($key) . "', '" . $this->db->escape($this->multilangs[$key]["label"]) . "'";
+                    $sql2 .= " VALUES(" . ((int) $this->id) . ", '" . $this->db->escape($key) . "', '" . $this->db->escape($this->multilangs[$key]["label"]) . "'";
                     $sql2 .= ",'" . $this->db->escape($this->multilangs[$key]["description"]) . "')";
                 }
 
@@ -1218,9 +1218,9 @@ 
         $sql = "SELECT s.rowid";
         $sql .= " FROM " . MAIN_DB_PREFIX . "categorie as s, " . MAIN_DB_PREFIX . "categorie_" . $sub_type . " as sub";
         $sql .= ' WHERE s.entity IN (' . getEntity('category') . ')';
-        $sql .= ' AND s.type=' . ((int)$idoftype);
+        $sql .= ' AND s.type=' . ((int) $idoftype);
         $sql .= ' AND s.rowid = sub.fk_categorie';
-        $sql .= " AND sub." . $subcol_name . " = " . ((int)$id);
+        $sql .= " AND sub." . $subcol_name . " = " . ((int) $id);
 
         $sql .= $this->db->order($sortfield, $sortorder);
 
@@ -1295,7 +1295,7 @@ 
     {
         // phpcs:enable
         $sql = "SELECT rowid FROM " . MAIN_DB_PREFIX . "categorie";
-        $sql .= " WHERE fk_parent = " . ((int)$this->id);
+        $sql .= " WHERE fk_parent = " . ((int) $this->id);
         $sql .= " AND entity IN (" . getEntity('category') . ")";
 
         $res = $this->db->query($sql);
@@ -1377,7 +1377,7 @@ 
             $sql .= " LEFT  JOIN " . MAIN_DB_PREFIX . "categorie_lang as t ON t.fk_category=c.rowid AND t.lang='" . $this->db->escape($current_lang) . "'";
         }
         $sql .= " WHERE c.entity IN (" . getEntity('category') . ")";
-        $sql .= " AND c.type = " . (int)$type;
+        $sql .= " AND c.type = " . (int) $type;
 
         dol_syslog(get_class($this) . "::get_full_arbo get category list", LOG_DEBUG);
         $resql = $this->db->query($sql);
@@ -1423,7 +1423,7 @@ 
             $keyfilter3 = '^' . $keyfiltercatid . '_';
             $keyfilter4 = '_' . $keyfiltercatid . '_';
             foreach (array_keys($this->cats) as $key) {
-                $fullpath = (string)$this->cats[$key]['fullpath'];
+                $fullpath = (string) $this->cats[$key]['fullpath'];
                 $test = (preg_match('/' . $keyfilter1 . '/', $fullpath) || preg_match('/' . $keyfilter2 . '/', $fullpath)
                     || preg_match('/' . $keyfilter3 . '/', $fullpath) || preg_match('/' . $keyfilter4 . '/', $fullpath));
 
@@ -1550,7 +1550,7 @@ 
         $sql = "SELECT rowid FROM " . MAIN_DB_PREFIX . "categorie";
         $sql .= " WHERE entity IN (" . getEntity('category') . ")";
         if (!is_null($type)) {
-            $sql .= " AND type = " . (int)$type;
+            $sql .= " AND type = " . (int) $type;
         }
         if ($parent) {
             $sql .= " AND fk_parent = 0";
@@ -1668,7 +1668,7 @@ 
         $parents = array();
 
         $sql = "SELECT fk_parent FROM " . MAIN_DB_PREFIX . "categorie";
-        $sql .= " WHERE rowid = " . ((int)$this->id);
+        $sql .= " WHERE rowid = " . ((int) $this->id);
 
         $res = $this->db->query($sql);
 
@@ -1712,7 +1712,7 @@ 
             // Load bank categories
             $sql = "SELECT c.label, c.rowid";
             $sql .= " FROM " . MAIN_DB_PREFIX . "bank_class as a, " . MAIN_DB_PREFIX . "bank_categ as c";
-            $sql .= " WHERE a.lineid=" . ((int)$id) . " AND a.fk_categ = c.rowid";
+            $sql .= " WHERE a.lineid=" . ((int) $id) . " AND a.fk_categ = c.rowid";
             $sql .= " AND c.entity IN (" . getEntity('category') . ")";
             $sql .= " ORDER BY c.label";
 
@@ -1737,7 +1737,7 @@ 
         } else {
             $sql = "SELECT ct.fk_categorie, c.label, c.rowid";
             $sql .= " FROM " . MAIN_DB_PREFIX . "categorie_" . (empty($this->MAP_CAT_TABLE[$type]) ? $type : $this->MAP_CAT_TABLE[$type]) . " as ct, " . MAIN_DB_PREFIX . "categorie as c";
-            $sql .= " WHERE ct.fk_categorie = c.rowid AND ct.fk_" . (empty($this->MAP_CAT_FK[$type]) ? $type : $this->MAP_CAT_FK[$type]) . " = " . (int)$id;
+            $sql .= " WHERE ct.fk_categorie = c.rowid AND ct.fk_" . (empty($this->MAP_CAT_FK[$type]) ? $type : $this->MAP_CAT_FK[$type]) . " = " . (int) $id;
             // This seems useless because the table already contains id of category of 1 unique type. So commented.
             // So now it works also with external added categories.
             //$sql .= " AND c.type = ".((int) $this->MAP_ID[$type]);
@@ -1797,7 +1797,7 @@ 
 
         // Generation requete recherche
         $sql = "SELECT rowid FROM " . MAIN_DB_PREFIX . "categorie";
-        $sql .= " WHERE type = " . ((int)$this->MAP_ID[$type]);
+        $sql .= " WHERE type = " . ((int) $this->MAP_ID[$type]);
         $sql .= " AND entity IN (" . getEntity('category') . ")";
         if ($nom) {
             if (!$exact) {
@@ -1810,7 +1810,7 @@ 
             }
         }
         if ($id) {
-            $sql .= " AND rowid = " . ((int)$id);
+            $sql .= " AND rowid = " . ((int) $id);
         }
 
         $res = $this->db->query($sql);

public/htdocs/categories/card.php

Spacing +3 added lines, -3 removed lines

@@ -57,9 +57,9 @@
 $urlfrom = GETPOST('urlfrom', 'alpha');
 $backtopage = GETPOST('backtopage', 'alpha');
 
-$label = (string)GETPOST('label', 'alphanohtml');
-$description = (string)GETPOST('description', 'restricthtml');
-$color = preg_replace('/[^0-9a-f#]/i', '', (string)GETPOST('color', 'alphanohtml'));
+$label = (string) GETPOST('label', 'alphanohtml');
+$description = (string) GETPOST('description', 'restricthtml');
+$color = preg_replace('/[^0-9a-f#]/i', '', (string) GETPOST('color', 'alphanohtml'));
 $position = GETPOSTINT('position');
 $visible = GETPOSTINT('visible');
 $parent = GETPOSTINT('parent');

public/htdocs/bookmarks/lib/bookmarks.lib.php

Spacing +1 added lines, -1 removed lines

@@ -38,7 +38,7 @@
 
     $langs->load("bookmarks");
 
-    $authorized_var = array('limit','optioncss','contextpage');
+    $authorized_var = array('limit', 'optioncss', 'contextpage');
     $url = $_SERVER["PHP_SELF"];
     $url_param = array();
     if (!empty($_SERVER["QUERY_STRING"])) {

Dolibarr/Code/Core/Classes/FormFile.php

Spacing +2 added lines, -2 removed lines

@@ -209,7 +209,7 @@ 
             $maxphptoshow = $maxfilesizearray['maxphptoshow'];
             $maxphptoshowparam = $maxfilesizearray['maxphptoshowparam'];
             if ($maxmin > 0) {
-                $out .= '<input type="hidden" name="MAX_FILE_SIZE" value="' . ($maxmin * 1024) . '">';  // MAX_FILE_SIZE must precede the field type=file
+                $out .= '<input type="hidden" name="MAX_FILE_SIZE" value="' . ($maxmin * 1024) . '">'; // MAX_FILE_SIZE must precede the field type=file
             }
             $out .= '<input class="flat minwidth400 maxwidth200onsmartphone" type="file"';
             $out .= ((getDolGlobalString('MAIN_DISABLE_MULTIPLE_FILEUPLOAD') || $disablemulti) ? ' name="userfile"' : ' name="userfile[]" multiple');
@@ -2231,7 +2231,7 @@ 
                 print '<td class="right">';
                 print '<a href="' . $_SERVER['PHP_SELF'] . '?action=update&linkid=' . $link->id . $param . '&token=' . newToken() . '" class="editfilelink editfielda reposition" >' . img_edit() . '</a>'; // id= is included into $param
                 if ($permissiontodelete) {
-                    print ' &nbsp; <a class="deletefilelink reposition" href="' . $_SERVER['PHP_SELF'] . '?action=deletelink&token=' . newToken() . '&linkid=' . ((int)$link->id) . $param . '">' . img_delete() . '</a>'; // id= is included into $param
+                    print ' &nbsp; <a class="deletefilelink reposition" href="' . $_SERVER['PHP_SELF'] . '?action=deletelink&token=' . newToken() . '&linkid=' . ((int) $link->id) . $param . '">' . img_delete() . '</a>'; // id= is included into $param
                 } else {
                     print '&nbsp;';
                 }

Dolibarr/Code/Cron/Classes/Cronjob.php

Spacing +33 added lines, -33 removed lines

@@ -251,7 +251,7 @@ 
             if (count($filter) > 0) {
                 foreach ($filter as $key => $value) {
                     if ($key == 't.rowid') {
-                        $sql .= " AND " . $this->db->sanitize($key) . " = " . ((int)$value);
+                        $sql .= " AND " . $this->db->sanitize($key) . " = " . ((int) $value);
                     } else {
                         $sql .= " AND " . $this->db->sanitize($key) . " LIKE '%" . $this->db->escape($this->db->escapeforlike($value)) . "%'";
                     }
@@ -350,7 +350,7 @@ 
         $this->db->begin();
 
         $sql = "DELETE FROM " . MAIN_DB_PREFIX . "cronjob";
-        $sql .= " WHERE rowid=" . ((int)$this->id);
+        $sql .= " WHERE rowid=" . ((int) $this->id);
 
         dol_syslog(get_class($this) . "::delete", LOG_DEBUG);
         $resql = $this->db->query($sql);
@@ -473,7 +473,7 @@ 
         $sql .= " t.test";
         $sql .= " FROM " . MAIN_DB_PREFIX . "cronjob as t";
         if ($id > 0) {
-            $sql .= " WHERE t.rowid = " . ((int)$id);
+            $sql .= " WHERE t.rowid = " . ((int) $id);
         } else {
             $sql .= " WHERE t.entity IN(0, " . getEntity('cron') . ")";
             $sql .= " AND t.objectname = '" . $this->db->escape($objectname) . "'";
@@ -505,7 +505,7 @@ 
                 $this->datenextrun = $this->db->jdate($obj->datenextrun);
                 $this->dateend = $this->db->jdate($obj->dateend);
                 $this->datestart = $this->db->jdate($obj->datestart);
-                $this->lastresult = (string)$obj->lastresult;
+                $this->lastresult = (string) $obj->lastresult;
                 $this->lastoutput = $obj->lastoutput;
                 $this->datelastresult = $this->db->jdate($obj->datelastresult);
                 $this->unitfrequency = $obj->unitfrequency;
@@ -586,19 +586,19 @@ 
             $this->unitfrequency = trim($this->unitfrequency);
         }
         if (isset($this->frequency)) {
-            $this->frequency = (int)$this->frequency;
+            $this->frequency = (int) $this->frequency;
         }
         if (isset($this->status)) {
-            $this->status = (int)$this->status;
+            $this->status = (int) $this->status;
         }
         if (isset($this->note_private)) {
             $this->note_private = trim($this->note_private);
         }
         if (isset($this->nbrun)) {
-            $this->nbrun = (int)$this->nbrun;
+            $this->nbrun = (int) $this->nbrun;
         }
         if (isset($this->maxrun)) {
-            $this->maxrun = (int)$this->maxrun;
+            $this->maxrun = (int) $this->maxrun;
         }
         if (isset($this->libname)) {
             $this->libname = trim($this->libname);
@@ -698,13 +698,13 @@ 
         $sql .= " " . (!isset($this->datelastresult) || dol_strlen($this->datelastresult) == 0 ? 'NULL' : "'" . $this->db->idate($this->datelastresult) . "'") . ",";
         $sql .= " " . (!isset($this->lastoutput) ? 'NULL' : "'" . $this->db->escape($this->lastoutput) . "'") . ",";
         $sql .= " " . (!isset($this->unitfrequency) ? 'NULL' : "'" . $this->db->escape($this->unitfrequency) . "'") . ",";
-        $sql .= " " . (!isset($this->frequency) ? '0' : ((int)$this->frequency)) . ",";
-        $sql .= " " . (!isset($this->status) ? '0' : ((int)$this->status)) . ",";
-        $sql .= " " . ($user->id ? (int)$user->id : "NULL") . ",";
-        $sql .= " " . ($user->id ? (int)$user->id : "NULL") . ",";
+        $sql .= " " . (!isset($this->frequency) ? '0' : ((int) $this->frequency)) . ",";
+        $sql .= " " . (!isset($this->status) ? '0' : ((int) $this->status)) . ",";
+        $sql .= " " . ($user->id ? (int) $user->id : "NULL") . ",";
+        $sql .= " " . ($user->id ? (int) $user->id : "NULL") . ",";
         $sql .= " " . (!isset($this->note_private) ? 'NULL' : "'" . $this->db->escape($this->note_private) . "'") . ",";
-        $sql .= " " . (!isset($this->nbrun) ? '0' : ((int)$this->nbrun)) . ",";
-        $sql .= " " . (empty($this->maxrun) ? '0' : ((int)$this->maxrun)) . ",";
+        $sql .= " " . (!isset($this->nbrun) ? '0' : ((int) $this->nbrun)) . ",";
+        $sql .= " " . (empty($this->maxrun) ? '0' : ((int) $this->maxrun)) . ",";
         $sql .= " " . (!isset($this->libname) ? 'NULL' : "'" . $this->db->escape($this->libname) . "'") . ",";
         $sql .= " " . (!isset($this->test) ? 'NULL' : "'" . $this->db->escape($this->test) . "'");
         $sql .= ")";
@@ -969,7 +969,7 @@ 
         $sql = "SELECT";
         $sql .= " f.rowid, f.datec, f.tms, f.fk_user_mod, f.fk_user_author";
         $sql .= " FROM " . MAIN_DB_PREFIX . "cronjob as f";
-        $sql .= " WHERE f.rowid = " . ((int)$id);
+        $sql .= " WHERE f.rowid = " . ((int) $id);
 
         dol_syslog(get_class($this) . "::fetch", LOG_DEBUG);
         $resql = $this->db->query($sql);
@@ -1144,7 +1144,7 @@ 
                 dol_syslog(get_class($this) . "::run_jobs START " . $this->objectname . "->" . $this->methodename . "(" . $this->params . "); (Note: Log for cron jobs may be into a different log file)", LOG_DEBUG);
 
                 // Create Object for the called module
-                $nameofclass = (string)$this->objectname;
+                $nameofclass = (string) $this->objectname;
                 $object = Misc::getCodeLibClass($this->objectname, $this->db);
                 // $object = new $nameofclass($this->db);
                 if ($this->entity > 0) {
@@ -1280,7 +1280,7 @@ 
             $msg = $langs->trans("ErrorInBatch", $this->label);
             $from = getDolGlobalString('MAIN_MAIL_EMAIL_FROM');
             $cmailfile = new CMailFile($subject, $this->email_alert, $from, $msg);
-            $result = $cmailfile->sendfile();   // Do not test result
+            $result = $cmailfile->sendfile(); // Do not test result
         }
 
         return $error ? -1 : 1;
@@ -1342,16 +1342,16 @@ 
             $this->unitfrequency = trim($this->unitfrequency);
         }
         if (isset($this->frequency)) {
-            $this->frequency = (int)$this->frequency;
+            $this->frequency = (int) $this->frequency;
         }
         if (isset($this->status)) {
-            $this->status = (int)$this->status;
+            $this->status = (int) $this->status;
         }
         if (isset($this->note_private)) {
             $this->note_private = trim($this->note_private);
         }
         if (isset($this->nbrun)) {
-            $this->nbrun = (is_numeric($this->nbrun)) ? (int)trim((string)$this->nbrun) : 0;
+            $this->nbrun = (is_numeric($this->nbrun)) ? (int) trim((string) $this->nbrun) : 0;
         }
         if (isset($this->libname)) {
             $this->libname = trim($this->libname);
@@ -1419,7 +1419,7 @@ 
 
         // Update request
         $sql = "UPDATE " . MAIN_DB_PREFIX . "cronjob SET";
-        $sql .= " entity=" . (isset($this->entity) ? ((int)$this->entity) : $conf->entity) . ",";
+        $sql .= " entity=" . (isset($this->entity) ? ((int) $this->entity) : $conf->entity) . ",";
         $sql .= " label=" . (isset($this->label) ? "'" . $this->db->escape($this->label) . "'" : "null") . ",";
         $sql .= " jobtype=" . (isset($this->jobtype) ? "'" . $this->db->escape($this->jobtype) . "'" : "null") . ",";
         $sql .= " command=" . (isset($this->command) ? "'" . $this->db->escape($this->command) . "'" : "null") . ",";
@@ -1429,7 +1429,7 @@ 
         $sql .= " params=" . (isset($this->params) ? "'" . $this->db->escape($this->params) . "'" : "null") . ",";
         $sql .= " md5params=" . (isset($this->md5params) ? "'" . $this->db->escape($this->md5params) . "'" : "null") . ",";
         $sql .= " module_name=" . (isset($this->module_name) ? "'" . $this->db->escape($this->module_name) . "'" : "null") . ",";
-        $sql .= " priority=" . (isset($this->priority) ? ((int)$this->priority) : "null") . ",";
+        $sql .= " priority=" . (isset($this->priority) ? ((int) $this->priority) : "null") . ",";
         $sql .= " datelastrun=" . (dol_strlen($this->datelastrun) != 0 ? "'" . $this->db->idate($this->datelastrun) . "'" : 'null') . ",";
         $sql .= " datenextrun=" . (dol_strlen($this->datenextrun) != 0 ? "'" . $this->db->idate($this->datenextrun) . "'" : 'null') . ",";
         $sql .= " dateend=" . (dol_strlen($this->dateend) != 0 ? "'" . $this->db->idate($this->dateend) . "'" : 'null') . ",";
@@ -1438,18 +1438,18 @@ 
         $sql .= " lastresult=" . (isset($this->lastresult) ? "'" . $this->db->escape($this->lastresult) . "'" : "null") . ",";
         $sql .= " lastoutput=" . (isset($this->lastoutput) ? "'" . $this->db->escape($this->lastoutput) . "'" : "null") . ",";
         $sql .= " unitfrequency=" . (isset($this->unitfrequency) ? "'" . $this->db->escape($this->unitfrequency) . "'" : "null") . ",";
-        $sql .= " frequency=" . (isset($this->frequency) ? ((int)$this->frequency) : "null") . ",";
-        $sql .= " status=" . (isset($this->status) ? ((int)$this->status) : "null") . ",";
+        $sql .= " frequency=" . (isset($this->frequency) ? ((int) $this->frequency) : "null") . ",";
+        $sql .= " status=" . (isset($this->status) ? ((int) $this->status) : "null") . ",";
         $sql .= " processing=" . ((isset($this->processing) && $this->processing > 0) ? $this->processing : "0") . ",";
-        $sql .= " pid=" . (isset($this->pid) ? ((int)$this->pid) : "null") . ",";
+        $sql .= " pid=" . (isset($this->pid) ? ((int) $this->pid) : "null") . ",";
         $sql .= " email_alert = " . (isset($this->email_alert) ? "'" . $this->db->escape($this->email_alert) . "'" : "null") . ",";
-        $sql .= " fk_user_mod = " . ((int)$user->id) . ",";
+        $sql .= " fk_user_mod = " . ((int) $user->id) . ",";
         $sql .= " note=" . (isset($this->note_private) ? "'" . $this->db->escape($this->note_private) . "'" : "null") . ",";
         $sql .= " nbrun=" . ((isset($this->nbrun) && $this->nbrun > 0) ? $this->nbrun : "null") . ",";
         $sql .= " maxrun=" . ((isset($this->maxrun) && $this->maxrun > 0) ? $this->maxrun : "0") . ",";
         $sql .= " libname=" . (isset($this->libname) ? "'" . $this->db->escape($this->libname) . "'" : "null") . ",";
         $sql .= " test=" . (isset($this->test) ? "'" . $this->db->escape($this->test) . "'" : "null");
-        $sql .= " WHERE rowid=" . ((int)$this->id);
+        $sql .= " WHERE rowid=" . ((int) $this->id);
 
         $this->db->begin();
 
@@ -1506,16 +1506,16 @@ 
 
         if (empty($this->datenextrun)) {
             if (empty($this->datestart)) {
-                if (!is_numeric($this->frequency) || (int)$this->unitfrequency == 2678400) {
+                if (!is_numeric($this->frequency) || (int) $this->unitfrequency == 2678400) {
                     $this->datenextrun = dol_time_plus_duree($now, $this->frequency, 'm');
                 } else {
-                    $this->datenextrun = $now + ($this->frequency * (int)$this->unitfrequency);
+                    $this->datenextrun = $now + ($this->frequency * (int) $this->unitfrequency);
                 }
             } else {
-                if (!is_numeric($this->frequency) || (int)$this->unitfrequency == 2678400) {
+                if (!is_numeric($this->frequency) || (int) $this->unitfrequency == 2678400) {
                     $this->datenextrun = dol_time_plus_duree($this->datestart, $this->frequency, 'm');
                 } else {
-                    $this->datenextrun = $this->datestart + ($this->frequency * (int)$this->unitfrequency);
+                    $this->datenextrun = $this->datestart + ($this->frequency * (int) $this->unitfrequency);
                 }
             }
         }
@@ -1523,10 +1523,10 @@ 
         if ($this->datenextrun < $now && $this->frequency > 0 && !empty($this->unitfrequency)) {
             // Loop until date is after future
             while ($this->datenextrun < $now) {
-                if (!is_numeric($this->unitfrequency) || (int)$this->unitfrequency == 2678400 || (int)$this->unitfrequency <= 0) {
+                if (!is_numeric($this->unitfrequency) || (int) $this->unitfrequency == 2678400 || (int) $this->unitfrequency <= 0) {
                     $this->datenextrun = dol_time_plus_duree($this->datenextrun, $this->frequency, 'm');
                 } else {
-                    $this->datenextrun += ($this->frequency * (int)$this->unitfrequency);
+                    $this->datenextrun += ($this->frequency * (int) $this->unitfrequency);
                 }
             }
         } else {