alxarafe / alixar

Dolibarr/Lib/Filters.php

Spacing +16 added lines, -16 removed lines

@@ -66,15 +66,15 @@ 
     private static function getEmojis()
     {
         $arrayofcommonemoji = array(
-            'misc' => array('2600', '26FF'),        // Miscellaneous Symbols
-            'ding' => array('2700', '27BF'),        // Dingbats
-            '????' => array('9989', '9989'),        // Variation Selectors
-            'vars' => array('FE00', 'FE0F'),        // Variation Selectors
-            'pict' => array('1F300', '1F5FF'),      // Miscellaneous Symbols and Pictographs
-            'emot' => array('1F600', '1F64F'),      // Emoticons
-            'tran' => array('1F680', '1F6FF'),      // Transport and Map Symbols
-            'flag' => array('1F1E0', '1F1FF'),      // Flags (note: may be 1F1E6 instead of 1F1E0)
-            'supp' => array('1F900', '1F9FF'),      // Supplemental Symbols and Pictographs
+            'misc' => array('2600', '26FF'), // Miscellaneous Symbols
+            'ding' => array('2700', '27BF'), // Dingbats
+            '????' => array('9989', '9989'), // Variation Selectors
+            'vars' => array('FE00', 'FE0F'), // Variation Selectors
+            'pict' => array('1F300', '1F5FF'), // Miscellaneous Symbols and Pictographs
+            'emot' => array('1F600', '1F64F'), // Emoticons
+            'tran' => array('1F680', '1F6FF'), // Transport and Map Symbols
+            'flag' => array('1F1E0', '1F1FF'), // Flags (note: may be 1F1E6 instead of 1F1E0)
+            'supp' => array('1F900', '1F9FF'), // Supplemental Symbols and Pictographs
         );
 
         return $arrayofcommonemoji;
@@ -109,11 +109,11 @@ 
                 $ip = (empty($_SERVER['REMOTE_ADDR']) ? 'unknown' : $_SERVER['REMOTE_ADDR']);
 
                 if ($stopcode) {
-                    $errormessage = 'Access refused to ' . htmlentities($ip, ENT_COMPAT, 'UTF-8') . ' by SQL or Script injection protection in main.inc.php:analyseVarsForSqlAndScriptsInjection type=' . htmlentities((string)$type, ENT_COMPAT, 'UTF-8');
+                    $errormessage = 'Access refused to ' . htmlentities($ip, ENT_COMPAT, 'UTF-8') . ' by SQL or Script injection protection in main.inc.php:analyseVarsForSqlAndScriptsInjection type=' . htmlentities((string) $type, ENT_COMPAT, 'UTF-8');
                     //$errormessage .= ' paramkey='.htmlentities($key, ENT_COMPAT, 'UTF-8');    // Disabled to avoid text injection
 
                     $errormessage2 = 'page=' . htmlentities((empty($_SERVER["REQUEST_URI"]) ? '' : $_SERVER["REQUEST_URI"]), ENT_COMPAT, 'UTF-8');
-                    $errormessage2 .= ' paramtype=' . htmlentities((string)$type, ENT_COMPAT, 'UTF-8');
+                    $errormessage2 .= ' paramtype=' . htmlentities((string) $type, ENT_COMPAT, 'UTF-8');
                     $errormessage2 .= ' paramkey=' . htmlentities($key, ENT_COMPAT, 'UTF-8');
                     $errormessage2 .= ' paramvalue=' . htmlentities($value, ENT_COMPAT, 'UTF-8');
 
@@ -168,7 +168,7 @@ 
         //print "before decoding $val\n";
         do {
             $oldval = $val;
-            $val = html_entity_decode($val, ENT_QUOTES | ENT_HTML5);    // Decode ':', ''', '	', '&NewLine', ...
+            $val = html_entity_decode($val, ENT_QUOTES | ENT_HTML5); // Decode ':', ''', '	', '&NewLine', ...
             // Sometimes we have entities without the ; at end so html_entity_decode does not work but entities is still interpreted by browser.
             $val = preg_replace_callback(
                 '/&#(x?[0-9][0-9a-f]+;?)/i',
@@ -176,7 +176,7 @@ 
                  * @param string[] $m
                  * @return string
                  */
-                static function ($m) {
+                static function($m) {
                     // Decode 'n', ...
                     return Filters::realCharForNumericEntities($m);
                 },
@@ -217,7 +217,7 @@ 
             $inj += preg_match('/user\s*\(/i', $val); // avoid to use function user() or mysql_user() that return current database login
             $inj += preg_match('/information_schema/i', $val); // avoid to use request that read information_schema database
             $inj += preg_match('/<svg/i', $val); // <svg can be allowed in POST
-            $inj += preg_match('/update[^&=\w].*set.+=/i', $val);   // the [^&=\w] test is to avoid error when request is like action=update&...set... or &updatemodule=...set...
+            $inj += preg_match('/update[^&=\w].*set.+=/i', $val); // the [^&=\w] test is to avoid error when request is like action=update&...set... or &updatemodule=...set...
             $inj += preg_match('/union.+select/i', $val);
         }
         if ($type == 3) {
@@ -301,12 +301,12 @@ 
         if (preg_match('/^x/i', $newstringnumentity)) {     // if numeric is hexadecimal
             $newstringnumentity = hexdec(preg_replace('/^x/i', '', $newstringnumentity));
         } else {
-            $newstringnumentity = (int)$newstringnumentity;
+            $newstringnumentity = (int) $newstringnumentity;
         }
 
         // The numeric values we don't want as entities because they encode ascii char, and why using html entities on ascii except for haking ?
         if (($newstringnumentity >= 65 && $newstringnumentity <= 90) || ($newstringnumentity >= 97 && $newstringnumentity <= 122)) {
-            return chr((int)$newstringnumentity);
+            return chr((int) $newstringnumentity);
         }
 
         // The numeric values we want in UTF8 instead of entities because it is emoji

public/htdocs/main.inc.php

Spacing +18 added lines, -18 removed lines

@@ -54,7 +54,7 @@ 
 $micro_start_time = 0;
 if (!empty($_SERVER['MAIN_SHOW_TUNING_INFO'])) {
     list($usec, $sec) = explode(" ", microtime());
-    $micro_start_time = ((float)$usec + (float)$sec);
+    $micro_start_time = ((float) $usec + (float) $sec);
     // Add Xdebug code coverage
     //define('XDEBUGCOVERAGE',1);
     if (defined('XDEBUGCOVERAGE')) {
@@ -177,7 +177,7 @@ 
         session_set_cookie_params($sessioncookieparams);
     }
     session_name($sessionname);
-    dol_session_start();    // This call the open and read of session handler
+    dol_session_start(); // This call the open and read of session handler
     //exit; // this exist generates a call to write and close
 }
 
@@ -358,7 +358,7 @@ 
             // Note: Using MAIN_SECURITY_CSRF_TOKEN_RENEWAL_ON_EACH_CALL is not recommended: if a user succeed in entering a data from
             // a public page with a link that make a token regeneration, it can make use of the backoffice no more possible !
             // Save in $_SESSION['newtoken'] what will be next token. Into forms, we will add param token = $_SESSION['newtoken']
-            $token = dol_hash(uniqid((string)mt_rand(), false), 'md5'); // Generates a hash of a random number. We don't need a secured hash, just a changing random value.
+            $token = dol_hash(uniqid((string) mt_rand(), false), 'md5'); // Generates a hash of a random number. We don't need a secured hash, just a changing random value.
             $_SESSION['newtoken'] = $token;
             dol_syslog("NEW TOKEN generated by : " . $_SERVER['PHP_SELF'], LOG_DEBUG);
         }
@@ -441,16 +441,16 @@ 
         }
         $savid = null;
         if (isset($_POST['id'])) {
-            $savid = ((int)$_POST['id']);
+            $savid = ((int) $_POST['id']);
         }
         unset($_POST);
         unset($_GET['confirm']);
         unset($_GET['action']);
         unset($_GET['confirmmassaction']);
         unset($_GET['massaction']);
-        unset($_GET['token']);          // TODO Make a redirect if we have a token in url to remove it ?
+        unset($_GET['token']); // TODO Make a redirect if we have a token in url to remove it ?
         if (isset($savid)) {
-            $_POST['id'] = ((int)$savid);
+            $_POST['id'] = ((int) $savid);
         }
         // So rest of code can know something was wrong here
         $_GET['errorcode'] = 'InvalidToken';
@@ -758,7 +758,7 @@ 
                 if (!empty($_SERVER["HTTP_USER_AGENT"]) && $_SERVER["HTTP_USER_AGENT"] == 'securitytest') {
                     http_response_code(401); // It makes easier to understand if session was broken during security tests
                 }
-                dol_loginfunction($langs, $conf, (!empty($mysoc) ? $mysoc : ''));   // This include http headers
+                dol_loginfunction($langs, $conf, (!empty($mysoc) ? $mysoc : '')); // This include http headers
             }
             exit;
         }
@@ -1106,7 +1106,7 @@ 
 } else {
     // We may have NOLOGIN set, but NOREQUIREUSER not
     if (!empty($user) && method_exists($user, 'loadDefaultValues') && !defined('NODEFAULTVALUES')) {
-        $user->loadDefaultValues();     // Load default values for everybody (works even if $user->id = 0
+        $user->loadDefaultValues(); // Load default values for everybody (works even if $user->id = 0
     }
 }
 
@@ -1277,7 +1277,7 @@ 
     }
     if (!class_exists('MenuManager')) {
         $menufound = 0;
-        $dirmenus = array_merge(array("/core/menus/"), (array)$conf->modules_parts['menus']);
+        $dirmenus = array_merge(array("/core/menus/"), (array) $conf->modules_parts['menus']);
         foreach ($dirmenus as $dirmenu) {
             $menufound = dol_include_once($dirmenu . "standard/" . $file_menu);
             if (class_exists('MenuManager')) {
@@ -1729,9 +1729,9 @@ 
 
         // CSS forced by modules (relative url starting with /)
         if (!empty($conf->modules_parts['css'])) {
-            $arraycss = (array)$conf->modules_parts['css'];
+            $arraycss = (array) $conf->modules_parts['css'];
             foreach ($arraycss as $modcss => $filescss) {
-                $filescss = (array)$filescss; // To be sure filecss is an array
+                $filescss = (array) $filescss; // To be sure filecss is an array
                 foreach ($filescss as $cssfile) {
                     if (empty($cssfile)) {
                         dol_syslog("Warning: module " . $modcss . " declared a css path file into its descriptor that is empty.", LOG_WARNING);
@@ -1890,9 +1890,9 @@ 
 
             // JS forced by modules (relative url starting with /)
             if (!empty($conf->modules_parts['js'])) {       // $conf->modules_parts['js'] is array('module'=>array('file1','file2'))
-                $arrayjs = (array)$conf->modules_parts['js'];
+                $arrayjs = (array) $conf->modules_parts['js'];
                 foreach ($arrayjs as $modjs => $filesjs) {
-                    $filesjs = (array)$filesjs; // To be sure filejs is an array
+                    $filesjs = (array) $filesjs; // To be sure filejs is an array
                     foreach ($filesjs as $jsfile) {
                         // jsfile is a relative path
                         $urlforjs = dol_buildpath($jsfile, 3);
@@ -2307,7 +2307,7 @@ 
     $langFlag = picto_from_langcode($langs->getDefaultLang());
     $dropdownBody .= '<br><b>' . $langs->trans("CurrentUserLanguage") . ':</b> ' . ($langFlag ? $langFlag . ' ' : '') . $langs->getDefaultLang();
 
-    $tz = (int)$_SESSION['dol_tz'] + (int)$_SESSION['dol_dst'];
+    $tz = (int) $_SESSION['dol_tz'] + (int) $_SESSION['dol_dst'];
     $dropdownBody .= '<br><b>' . $langs->trans("ClientTZ") . ':</b> ' . ($tz ? ($tz >= 0 ? '+' : '') . $tz : '');
     $dropdownBody .= ' (' . $_SESSION['dol_tz_string'] . ')';
     //$dropdownBody .= ' &nbsp; &nbsp; &nbsp; '.$langs->trans("DaylingSavingTime").': ';
@@ -2353,7 +2353,7 @@ 
 
     // Defined the links for bottom of card
     $profilLink = '<a accesskey="u" href="' . BASE_URL . '/user/card.php?id=' . $user->id . '" class="button-top-menu-dropdown" title="' . dol_escape_htmltag($langs->trans("YourUserFile") . ' (' . $stringforfirstkey . ' u)') . '"><i class="fa fa-user"></i>  ' . $langs->trans("Card") . '</a>';
-    $urltovirtualcard = '/user/virtualcard.php?id=' . ((int)$user->id);
+    $urltovirtualcard = '/user/virtualcard.php?id=' . ((int) $user->id);
     $virtuelcardLink = dolButtonToOpenUrlInDialogPopup('publicvirtualcardmenu', $langs->transnoentitiesnoconv("PublicVirtualCardUrl") . (is_object($user) ? ' - ' . $user->getFullName($langs) : '') . ' (' . $stringforfirstkey . ' v)', img_picto($langs->trans("PublicVirtualCardUrl") . ' (' . $stringforfirstkey . ' v)', 'card', ''), $urltovirtualcard, '', 'button-top-menu-dropdown marginleftonly nohover', "closeTopMenuLoginDropdown()", '', 'v');
     $logoutLink = '<a accesskey="l" href="' . $urllogout . '" class="button-top-menu-dropdown" title="' . dol_escape_htmltag($langs->trans("Logout") . ' (' . $stringforfirstkey . ' l)') . '"><i class="fa fa-sign-out-alt padingright"></i><span class="hideonsmartphone">' . $langs->trans("Logout") . '</span></a>';
 
@@ -3597,7 +3597,7 @@ 
         $forceping = GETPOST('forceping', 'alpha');
         if (($_SERVER["PHP_SELF"] == constant('BASE_URL') . '/index.php') || $forceping) {
             //print '<!-- instance_unique_id='.$conf->file->instance_unique_id.' MAIN_FIRST_PING_OK_ID='.$conf->global->MAIN_FIRST_PING_OK_ID.' -->';
-            $hash_unique_id = dol_hash('dolibarr' . $conf->file->instance_unique_id, 'sha256');   // Note: if the global salt changes, this hash changes too so ping may be counted twice. We don't mind. It is for statistics purpose only.
+            $hash_unique_id = dol_hash('dolibarr' . $conf->file->instance_unique_id, 'sha256'); // Note: if the global salt changes, this hash changes too so ping may be counted twice. We don't mind. It is for statistics purpose only.
 
             if (
                 !getDolGlobalString('MAIN_FIRST_PING_OK_DATE')
@@ -3639,8 +3639,8 @@ 
                                         hash_algo: 'dol_hash-sha256',
                                         hash_unique_id: '<?php echo dol_escape_js($hash_unique_id); ?>',
                                         action: 'dolibarrping',
-                                        version: '<?php echo (float)DOL_VERSION; ?>',
-                                        entity: '<?php echo (int)$conf->entity; ?>',
+                                        version: '<?php echo (float) DOL_VERSION; ?>',
+                                        entity: '<?php echo (int) $conf->entity; ?>',
                                         dbtype: '<?php echo dol_escape_js($db->type); ?>',
                                         country_code: '<?php echo $mysoc->country_code ? dol_escape_js($mysoc->country_code) : 'unknown'; ?>',
                                         php_version: '<?php echo dol_escape_js(phpversion()); ?>',

public/htdocs/core/lib/html.lib.php

Spacing +42 added lines, -42 removed lines

@@ -80,7 +80,7 @@ 
 
     $form = new Form($db);
 
-    $templatenameforexport = $website->name_template;   // Example 'website_template-corporate'
+    $templatenameforexport = $website->name_template; // Example 'website_template-corporate'
     if (empty($templatenameforexport)) {
         $templatenameforexport = 'website_' . $website->ref;
     }
@@ -676,7 +676,7 @@ 
                 } else {
                     $width = 14;
                     $cssclass = 'photorefcenter';
-                    $picto = $object->picto;  // @phan-suppress-current-line PhanUndeclaredProperty
+                    $picto = $object->picto; // @phan-suppress-current-line PhanUndeclaredProperty
                     $prefix = 'object_';
                     if ($object->element == 'project' && !$object->public) {  // @phan-suppress-current-line PhanUndeclaredProperty
                         $picto = 'project'; // instead of projectpub
@@ -786,7 +786,7 @@ 
     }
     // Show address and email
     if (method_exists($object, 'getBannerAddress') && !in_array($object->element, array('product', 'bookmark', 'ecm_directories', 'ecm_files'))) {
-        $moreaddress = $object->getBannerAddress('refaddress', $object);    // address, email, url, social networks
+        $moreaddress = $object->getBannerAddress('refaddress', $object); // address, email, url, social networks
         if ($moreaddress) {
             $morehtmlref .= '<div class="refidno refaddress">';
             $morehtmlref .= $moreaddress;
@@ -796,7 +796,7 @@ 
     if (getDolGlobalString('MAIN_SHOW_TECHNICAL_ID') && (getDolGlobalString('MAIN_SHOW_TECHNICAL_ID') == '1' || preg_match('/' . preg_quote($object->element, '/') . '/i', $conf->global->MAIN_SHOW_TECHNICAL_ID)) && !empty($object->id)) {
         $morehtmlref .= '<div style="clear: both;"></div>';
         $morehtmlref .= '<div class="refidno opacitymedium">';
-        $morehtmlref .= $langs->trans("TechnicalID") . ': ' . ((int)$object->id);
+        $morehtmlref .= $langs->trans("TechnicalID") . ': ' . ((int) $object->id);
         $morehtmlref .= '</div>';
     }
 
@@ -954,7 +954,7 @@ 
             $type = 'AC_EMAIL';
             $linktoaddaction = '';
             if (getDolGlobalString('AGENDA_ADDACTIONFOREMAIL')) {
-                $linktoaddaction = '<a href="' . constant('BASE_URL') . '/comm/action/card.php?action=create&amp;backtopage=1&amp;actioncode=' . urlencode($type) . '&amp;contactid=' . ((int)$cid) . '&amp;socid=' . ((int)$socid) . '">' . img_object($langs->trans("AddAction"), "calendar") . '</a>';
+                $linktoaddaction = '<a href="' . constant('BASE_URL') . '/comm/action/card.php?action=create&amp;backtopage=1&amp;actioncode=' . urlencode($type) . '&amp;contactid=' . ((int) $cid) . '&amp;socid=' . ((int) $socid) . '">' . img_object($langs->trans("AddAction"), "calendar") . '</a>';
             }
             if ($linktoaddaction) {
                 $newemail = '<div>' . $newemail . ' ' . $linktoaddaction . '</div>';
@@ -1334,7 +1334,7 @@ 
             $url = make_substitutions($url, $substitarray);
             if (!getDolGlobalString('CLICKTODIAL_DO_NOT_USE_AJAX_CALL')) {
                 // Default and recommended: New method using ajax without submitting a page making a javascript history.go(-1) back
-                $newphoneastart = '<a href="' . $url . '" class="cssforclicktodial">';  // Call of ajax is handled by the lib_foot.js.php on class 'cssforclicktodial'
+                $newphoneastart = '<a href="' . $url . '" class="cssforclicktodial">'; // Call of ajax is handled by the lib_foot.js.php on class 'cssforclicktodial'
                 $newphoneaend = '</a>';
             } else {
                 // Old method
@@ -1365,7 +1365,7 @@ 
 
     if (getDolGlobalString('CONTACT_PHONEMOBILE_SHOW_LINK_TO_WHATSAPP') && $withpicto == 'mobile') {
         // Link to Whatsapp
-        $newphone .= ' <a href="https://wa.me/' . $newphonewa . '" target="_blank"';// Use api to whatasapp contacts
+        $newphone .= ' <a href="https://wa.me/' . $newphonewa . '" target="_blank"'; // Use api to whatasapp contacts
         $newphone .= '><span class="paddingright fab fa-whatsapp" style="color:#25D366;" title="WhatsApp"></span></a>';
     }
 
@@ -1864,7 +1864,7 @@ 
             top_httphead();
         }
         //http_response_code(500);      // If we use 500, message is not output with some command line tools
-        http_response_code(202);        // If we use 202, this is not really an error message, but this allow to output message on command line tools
+        http_response_code(202); // If we use 202, this is not really an error message, but this allow to output message on command line tools
     }
 
     if (empty($dolibarr_main_prod)) {
@@ -2134,7 +2134,7 @@ 
     }
     $return .= '<td class="nobordernopadding valignmiddle col-title">';
     $return .= '<div class="titre inline-block">';
-    $return .= $title;  // $title is already HTML sanitized content
+    $return .= $title; // $title is already HTML sanitized content
     $return .= '</div>';
     $return .= '</td>';
     if (dol_strlen($morehtmlcenter)) {
@@ -2181,7 +2181,7 @@ 
         $totalnboflines = abs($totalnboflines);
     }
 
-    $page = (int)$page;
+    $page = (int) $page;
 
     if ($picto == 'setup') {
         $picto = 'title_setup.png';
@@ -2212,8 +2212,8 @@ 
 
     print '<td class="nobordernopadding valignmiddle col-title">';
     print '<div class="titre inline-block">';
-    print $title;   // $title may contains HTML
-    if (!empty($title) && $savtotalnboflines >= 0 && (string)$savtotalnboflines != '') {
+    print $title; // $title may contains HTML
+    if (!empty($title) && $savtotalnboflines >= 0 && (string) $savtotalnboflines != '') {
         print '<span class="opacitymedium colorblack paddingleft">(' . $totalnboflines . ')</span>';
     }
     print '</div></td>';
@@ -2225,7 +2225,7 @@ 
 
     // Right
     print '<td class="nobordernopadding valignmiddle right col-right">';
-    print '<input type="hidden" name="pageplusoneold" value="' . ((int)$page + 1) . '">';
+    print '<input type="hidden" name="pageplusoneold" value="' . ((int) $page + 1) . '">';
     if ($sortfield) {
         $options .= "&sortfield=" . urlencode($sortfield);
     }
@@ -2344,7 +2344,7 @@ 
     }
 
     if (empty($hidenavigation)) {
-        if ((int)$limit > 0 && empty($hideselectlimit)) {
+        if ((int) $limit > 0 && empty($hideselectlimit)) {
             $pagesizechoices = '10:10,15:15,20:20,25:25,50:50,100:100,250:250,500:500,1000:1000';
             $pagesizechoices .= ',5000:5000,10000:10000,20000:20000';
             //$pagesizechoices.=',0:'.$langs->trans("All");     // Not yet supported
@@ -2377,7 +2377,7 @@ 
                 $key = $tmp[0];
                 $val = $tmp[1];
                 if ($key != '' && $val != '') {
-                    if ((int)$key == (int)$limit) {
+                    if ((int) $key == (int) $limit) {
                         $selected = ' selected="selected"';
                     }
                     print '<option name="' . $key . '"' . $selected . '>' . dol_escape_htmltag($val) . '</option>' . "\n";
@@ -2578,7 +2578,7 @@ 
         if (is_object($objcon) && $objcon->id > 0) {
             $force_filter_contact = true;
             $sql .= " INNER JOIN " . MAIN_DB_PREFIX . "actioncomm_resources as r ON a.id = r.fk_actioncomm";
-            $sql .= " AND r.element_type = '" . $db->escape($objcon->table_element) . "' AND r.fk_element = " . ((int)$objcon->id);
+            $sql .= " AND r.element_type = '" . $db->escape($objcon->table_element) . "' AND r.fk_element = " . ((int) $objcon->id);
         }
 
         if (is_object($filterobj) && get_only_class($filterobj) == 'Societe') {
@@ -2587,7 +2587,7 @@ 
             $sql .= " INNER JOIN " . MAIN_DB_PREFIX . "element_resources as er";
             $sql .= " ON er.resource_type = 'dolresource'";
             $sql .= " AND er.element_id = a.id";
-            $sql .= " AND er.resource_id = " . ((int)$filterobj->id);
+            $sql .= " AND er.resource_id = " . ((int) $filterobj->id);
         } elseif (is_object($filterobj) && get_only_class($filterobj) == 'Adherent') {
             $sql .= ", " . MAIN_DB_PREFIX . "adherent as m";
         } elseif (is_object($filterobj) && get_only_class($filterobj) == 'CommandeFournisseur') {
@@ -2605,42 +2605,42 @@ 
         $sql .= " WHERE a.entity IN (" . getEntity('agenda') . ")";
         if (!$force_filter_contact) {
             if (is_object($filterobj) && in_array(get_only_class($filterobj), array('Societe', 'Client', 'Fournisseur')) && $filterobj->id) {
-                $sql .= " AND a.fk_soc = " . ((int)$filterobj->id);
+                $sql .= " AND a.fk_soc = " . ((int) $filterobj->id);
             } elseif (is_object($filterobj) && get_only_class($filterobj) == 'Project' && $filterobj->id) {
-                $sql .= " AND a.fk_project = " . ((int)$filterobj->id);
+                $sql .= " AND a.fk_project = " . ((int) $filterobj->id);
             } elseif (is_object($filterobj) && get_only_class($filterobj) == 'Adherent') {
                 $sql .= " AND a.fk_element = m.rowid AND a.elementtype = 'member'";
                 if ($filterobj->id) {
-                    $sql .= " AND a.fk_element = " . ((int)$filterobj->id);
+                    $sql .= " AND a.fk_element = " . ((int) $filterobj->id);
                 }
             } elseif (is_object($filterobj) && get_only_class($filterobj) == 'CommandeFournisseur') {
                 $sql .= " AND a.fk_element = o.rowid AND a.elementtype = 'order_supplier'";
                 if ($filterobj->id) {
-                    $sql .= " AND a.fk_element = " . ((int)$filterobj->id);
+                    $sql .= " AND a.fk_element = " . ((int) $filterobj->id);
                 }
             } elseif (is_object($filterobj) && get_only_class($filterobj) == 'Product') {
                 $sql .= " AND a.fk_element = o.rowid AND a.elementtype = 'product'";
                 if ($filterobj->id) {
-                    $sql .= " AND a.fk_element = " . ((int)$filterobj->id);
+                    $sql .= " AND a.fk_element = " . ((int) $filterobj->id);
                 }
             } elseif (is_object($filterobj) && get_only_class($filterobj) == 'Ticket') {
                 $sql .= " AND a.fk_element = o.rowid AND a.elementtype = 'ticket'";
                 if ($filterobj->id) {
-                    $sql .= " AND a.fk_element = " . ((int)$filterobj->id);
+                    $sql .= " AND a.fk_element = " . ((int) $filterobj->id);
                 }
             } elseif (is_object($filterobj) && get_only_class($filterobj) == 'BOM') {
                 $sql .= " AND a.fk_element = o.rowid AND a.elementtype = 'bom'";
                 if ($filterobj->id) {
-                    $sql .= " AND a.fk_element = " . ((int)$filterobj->id);
+                    $sql .= " AND a.fk_element = " . ((int) $filterobj->id);
                 }
             } elseif (is_object($filterobj) && get_only_class($filterobj) == 'Contrat') {
                 $sql .= " AND a.fk_element = o.rowid AND a.elementtype = 'contract'";
                 if ($filterobj->id) {
-                    $sql .= " AND a.fk_element = " . ((int)$filterobj->id);
+                    $sql .= " AND a.fk_element = " . ((int) $filterobj->id);
                 }
             }
         } else {
-            $sql .= " AND u.rowid = " . ((int)$filterobj->id);
+            $sql .= " AND u.rowid = " . ((int) $filterobj->id);
         }
 
         // Condition on actioncode
@@ -3328,7 +3328,7 @@ 
         $showonlyonhover = 0;
     }*/
 
-    $tag = 'span';  // Using div (like any style of type 'block') does not work when using the js copy code.
+    $tag = 'span'; // Using div (like any style of type 'block') does not work when using the js copy code.
     if ($texttoshow === 'none') {
         $result = '<span class="clipboardCP' . ($showonlyonhover ? ' clipboardCPShowOnHover' : '') . '"><' . $tag . ' class="clipboardCPValue hidewithsize">' . dol_escape_htmltag($valuetocopy, 1, 1) . '</' . $tag . '><span class="clipboardCPValueToPrint"></span><span class="clipboardCPButton far fa-clipboard opacitymedium paddingleft paddingright"></span><span class="clipboardCPText"></span></span>';
     } elseif ($texttoshow) {
@@ -3669,7 +3669,7 @@ 
         $table_element = 'adherent_type';
     } elseif ($elementType == 'bank_account') {
         $classpath = 'compta/bank/class';
-        $module = 'bank';   // We need $conf->bank->dir_output and not $conf->banque->dir_output
+        $module = 'bank'; // We need $conf->bank->dir_output and not $conf->banque->dir_output
         $classfile = 'account';
         $classname = 'Account';
     } elseif ($elementType == 'category') {
@@ -4321,8 +4321,8 @@ 
 
 
     $parameters = array(
-        'TCompiledAttr' => $TCompiledAttr,              // array
-        'compiledAttributes' => $compiledAttributes,    // string
+        'TCompiledAttr' => $TCompiledAttr, // array
+        'compiledAttributes' => $compiledAttributes, // string
         'attr' => $attr,
         'tag' => $tag,
         'label' => $label,
@@ -4438,7 +4438,7 @@ 
                     if ($posstart > 0) {
                         $res1 = substr($str, $posstart + 1, $posend - $posstart - 1);
                         if (is_numeric($res1)) {
-                            $postab = (int)$res1;
+                            $postab = (int) $res1;
                             $values[1] = '+' . substr($str, $posend + 1);
                         }
                     }
@@ -5014,7 +5014,7 @@ 
 
             if (!empty($out) && getDolGlobalString('MAIN_RESTRICTHTML_ONLY_VALID_HTML') && $check != 'restricthtmlallowunvalid') {
                 try {
-                    libxml_use_internal_errors(false);  // Avoid to fill memory with xml errors
+                    libxml_use_internal_errors(false); // Avoid to fill memory with xml errors
                     if (LIBXML_VERSION < 20900) {
                         // Avoid load of external entities (security problem).
                         // Required only if LIBXML_VERSION < 20900
@@ -5055,7 +5055,7 @@ 
                         // See options at https://tidy.sourceforge.net/docs/quickref.html
                         $config = array(
                             'clean' => false,
-                            'quote-marks' => false,     // do not replace " that are used for real text content (not a string symbol for html attribute) into &quot;
+                            'quote-marks' => false, // do not replace " that are used for real text content (not a string symbol for html attribute) into &quot;
                             'doctype' => 'strict',
                             'show-body-only' => true,
                             "indent-attributes" => false,
@@ -5098,7 +5098,7 @@ 
                  * @param string[] $m
                  * @return string
                  */
-                static function ($m) {
+                static function($m) {
                     return Filters::realCharForNumericEntities($m);
                 },
                 $out
@@ -5231,7 +5231,7 @@ 
  */
 function dol_htmlcleanlastbr($stringtodecode)
 {
-    $ret = preg_replace('/&nbsp;$/i', "", $stringtodecode);     // Because wysiwyg editor may add a &nbsp; at end of last line
+    $ret = preg_replace('/&nbsp;$/i', "", $stringtodecode); // Because wysiwyg editor may add a &nbsp; at end of last line
     $ret = preg_replace('/(<br>|<br(\s[\sa-zA-Z_="]*)?\/?>|' . "\n" . '|' . "\r" . ')+$/i', "", $ret);
     return $ret;
 }
@@ -5251,7 +5251,7 @@ 
     if ($keepsomeentities) {
         $newstring = strtr($newstring, array('&amp;' => '__andamp__', '&lt;' => '__andlt__', '&gt;' => '__andgt__', '"' => '__dquot__'));
     }
-    $newstring = html_entity_decode((string)$newstring, (int)$b, (string)$c);
+    $newstring = html_entity_decode((string) $newstring, (int) $b, (string) $c);
     if ($keepsomeentities) {
         $newstring = strtr($newstring, array('__andamp__' => '&amp;', '__andlt__' => '&lt;', '__andgt__' => '&gt;', '__dquot__' => '"'));
     }
@@ -5327,7 +5327,7 @@ 
                             if (isset($valuetoclean)) {
                                 do {
                                     $oldvaluetoclean = $valuetoclean;
-                                    $valuetoclean = preg_replace('/\/\*.*\*\//m', '', $valuetoclean);   // clean css comments
+                                    $valuetoclean = preg_replace('/\/\*.*\*\//m', '', $valuetoclean); // clean css comments
                                     $valuetoclean = preg_replace('/position\s*:\s*[a-z]+/mi', '', $valuetoclean);
                                     if ($els->item($i)->tagName == 'a') {   // more paranoiac cleaning for clickable tags.
                                         $valuetoclean = preg_replace('/display\s*:/mi', '', $valuetoclean);
@@ -5415,7 +5415,7 @@ 
         $tempbis = $temp;
         do {
             $temp = $tempbis;
-            $tempbis = str_replace('<>', '', $temp);    // No reason to have this into a text, except if value is to try bypass the next html cleaning
+            $tempbis = str_replace('<>', '', $temp); // No reason to have this into a text, except if value is to try bypass the next html cleaning
             $tempbis = preg_replace($pattern, '', $tempbis);
             //$idowhile++; print $temp.'-'.$tempbis."\n"; if ($idowhile > 100) break;
         } while ($tempbis != $temp);
@@ -5470,7 +5470,7 @@ 
             "header", "footer", "nav", "section", "menu", "menuitem"    // html5 tags
         );
     }
-    $allowed_tags[] = "comment";        // this tags is added to manage comment <!--...--> that are replaced into <comment>...</comment>
+    $allowed_tags[] = "comment"; // this tags is added to manage comment <!--...--> that are replaced into <comment>...</comment>
     if ($allowiframe) {
         if (!in_array('iframe', $allowed_tags)) {
             $allowed_tags[] = "iframe";
@@ -5485,7 +5485,7 @@ 
     $allowed_tags_string = implode("><", $allowed_tags);
     $allowed_tags_string = '<' . $allowed_tags_string . '>';
 
-    $stringtoclean = str_replace('<!DOCTYPE html>', '__!DOCTYPE_HTML__', $stringtoclean);   // Replace DOCTYPE to avoid to have it removed by the strip_tags
+    $stringtoclean = str_replace('<!DOCTYPE html>', '__!DOCTYPE_HTML__', $stringtoclean); // Replace DOCTYPE to avoid to have it removed by the strip_tags
 
     $stringtoclean = dol_string_nounprintableascii($stringtoclean, 0);
 
@@ -5495,7 +5495,7 @@ 
     $stringtoclean = preg_replace('/&colon;/i', ':', $stringtoclean);
     $stringtoclean = preg_replace('/&#58;|&#0+58|&#x3A/i', '', $stringtoclean); // refused string ':' encoded (no reason to have a : encoded like this) to disable 'javascript:...'
 
-    $temp = strip_tags($stringtoclean, $allowed_tags_string);   // Warning: This remove also undesired </>, so may changes string obfuscated with </> that pass the injection detection into a harmfull string
+    $temp = strip_tags($stringtoclean, $allowed_tags_string); // Warning: This remove also undesired </>, so may changes string obfuscated with </> that pass the injection detection into a harmfull string
 
     if ($cleanalsosomestyles) { // Clean for remaining html tags
         $temp = preg_replace('/position\s*:\s*(absolute|fixed)\s*!\s*important/i', '', $temp); // Note: If hacker try to introduce css comment into string to bypass this regex, the string must also be encoded by the dol_htmlentitiesbr during output so it become harmless
@@ -5512,7 +5512,7 @@ 
 
     $temp = str_replace('__!DOCTYPE_HTML__', '<!DOCTYPE html>', $temp); // Restore the DOCTYPE
 
-    $temp = preg_replace('/<comment>([^>]*)<\/comment>/', '<!--\1-->', $temp);  // Restore html comments
+    $temp = preg_replace('/<comment>([^>]*)<\/comment>/', '<!--\1-->', $temp); // Restore html comments
 
 
     return $temp;

public/htdocs/core/lib/functions2.lib.php

Spacing +34 added lines, -34 removed lines

@@ -166,7 +166,7 @@ 
     include_once DOL_DOCUMENT_ROOT . '/core/lib/date.lib.php';
 
     $deltadateforserver = getServerTimeZoneInt('now');
-    $deltadateforclient = ((int)$_SESSION['dol_tz'] + (int)$_SESSION['dol_dst']);
+    $deltadateforclient = ((int) $_SESSION['dol_tz'] + (int) $_SESSION['dol_dst']);
     //$deltadateforcompany=((int) $_SESSION['dol_tz'] + (int) $_SESSION['dol_dst']);
     $deltadateforuser = round($deltadateforclient - $deltadateforserver);
     //print "x".$deltadateforserver." - ".$deltadateforclient." - ".$deltadateforuser;
@@ -1016,7 +1016,7 @@ 
     while (preg_match('/\{([A-Z]+)\-([1-9])\}/', $tmpmask, $regKey)) {
         $maskperso[$regKey[1]] = '{' . $regKey[1] . '-' . $regKey[2] . '}';
         // @phan-suppress-next-line PhanParamSuspiciousOrder
-        $maskpersonew[$regKey[1]] = str_pad('', (int)$regKey[2], '_', STR_PAD_RIGHT);
+        $maskpersonew[$regKey[1]] = str_pad('', (int) $regKey[2], '_', STR_PAD_RIGHT);
         $tmpmask = preg_replace('/\{' . $regKey[1] . '\-' . $regKey[2] . '\}/i', $maskpersonew[$regKey[1]], $tmpmask);
     }
 
@@ -1078,7 +1078,7 @@ 
 
     if ($maskraz > 0) {   // A reset is required
         if ($maskraz == 99) {
-            $maskraz = (int)date('m', $date);
+            $maskraz = (int) date('m', $date);
             $resetEveryMonth = true;
         }
         if ($maskraz > 12) {
@@ -1131,7 +1131,7 @@ 
         $yearcomp = 0;
 
         if (!empty($yearoffsettype) && !is_numeric($yearoffsettype) && $yearoffsettype != '=') {    // $yearoffsettype is - or +
-            $currentyear = (int)date("Y", $date);
+            $currentyear = (int) date("Y", $date);
             $fiscaldate = dol_mktime('0', '0', '0', $maskraz, '1', $currentyear);
             $newyeardate = dol_mktime('0', '0', '0', '1', '1', $currentyear);
             $nextnewyeardate = dol_mktime('0', '0', '0', '1', '1', $currentyear + 1);
@@ -1147,7 +1147,7 @@ 
                 // If after or equal of current new year date
                 $yearoffset = -1;
             }
-        } elseif ((int)date("m", $date) < $maskraz && empty($resetEveryMonth)) {
+        } elseif ((int) date("m", $date) < $maskraz && empty($resetEveryMonth)) {
             // For backward compatibility
             $yearoffset = -1;
         }   // If current month lower that month of return to zero, year is previous year
@@ -1157,7 +1157,7 @@ 
         } elseif ($yearlen == 2) {
             $yearcomp = sprintf("%02d", idate("y", $date) + $yearoffset);
         } elseif ($yearlen == 1) {
-            $yearcomp = (int)substr(date('y', $date), 1, 1) + $yearoffset;
+            $yearcomp = (int) substr(date('y', $date), 1, 1) + $yearoffset;
         }
         if ($monthcomp > 1 && empty($resetEveryMonth)) {    // Test with month is useless if monthcomp = 0 or 1 (0 is same as 1) (regis: $monthcomp can't equal 0)
             if ($yearlen == 4) {
@@ -1391,9 +1391,9 @@ 
 
         // We replace special codes except refclient
         if (!empty($yearoffsettype) && !is_numeric($yearoffsettype) && $yearoffsettype != '=') {    // yearoffsettype is - or +, so we don't want current year
-            $numFinal = preg_replace('/\{yyyy\}/i', (string)((int)date("Y", $date) + $yearoffset), $numFinal);
-            $numFinal = preg_replace('/\{yy\}/i', (string)((int)date("y", $date) + $yearoffset), $numFinal);
-            $numFinal = preg_replace('/\{y\}/i', (string)((int)substr((string)date("y", $date), 1, 1) + $yearoffset), $numFinal);
+            $numFinal = preg_replace('/\{yyyy\}/i', (string) ((int) date("Y", $date) + $yearoffset), $numFinal);
+            $numFinal = preg_replace('/\{yy\}/i', (string) ((int) date("y", $date) + $yearoffset), $numFinal);
+            $numFinal = preg_replace('/\{y\}/i', (string) ((int) substr((string) date("y", $date), 1, 1) + $yearoffset), $numFinal);
         } else { // we want yyyy to be current year
             $numFinal = preg_replace('/\{yyyy\}/i', date("Y", $date), $numFinal);
             $numFinal = preg_replace('/\{yy\}/i', date("y", $date), $numFinal);
@@ -1549,7 +1549,7 @@ 
     }
     if ($maskraz >= 0) {
         if ($maskraz == 99) {
-            $maskraz = (int)date('m');
+            $maskraz = (int) date('m');
             $resetEveryMonth = true;
         }
         if ($maskraz > 12) {
@@ -1644,9 +1644,9 @@ 
 
     if (preg_match('/^([0-9]+)\-([0-9]+)\-([0-9]+)\s?([0-9]+)?:?([0-9]+)?/i', $stime, $reg)) {
         // Date est au format 'YYYY-MM-DD' ou 'YYYY-MM-DD HH:MM:SS'
-        $annee = (int)$reg[1];
-        $mois = (int)$reg[2];
-        $jour = (int)$reg[3];
+        $annee = (int) $reg[1];
+        $mois = (int) $reg[2];
+        $jour = (int) $reg[3];
     }
 
     /*
@@ -1657,33 +1657,33 @@ 
      */
 
     // Definition du Jeudi de la semaine
-    if ((int)date("w", mktime(12, 0, 0, $mois, $jour, $annee)) == 0) { // Dimanche
+    if ((int) date("w", mktime(12, 0, 0, $mois, $jour, $annee)) == 0) { // Dimanche
         $jeudiSemaine = mktime(12, 0, 0, $mois, $jour, $annee) - 3 * 24 * 60 * 60;
     } elseif (date("w", mktime(12, 0, 0, $mois, $jour, $annee)) < 4) { // du Lundi au Mercredi
-        $jeudiSemaine = mktime(12, 0, 0, $mois, $jour, $annee) + (4 - (int)date("w", mktime(12, 0, 0, $mois, $jour, $annee))) * 24 * 60 * 60;
-    } elseif ((int)date("w", mktime(12, 0, 0, $mois, $jour, $annee)) > 4) { // du Vendredi au Samedi
-        $jeudiSemaine = mktime(12, 0, 0, $mois, $jour, $annee) - ((int)date("w", mktime(12, 0, 0, $mois, $jour, $annee)) - 4) * 24 * 60 * 60;
+        $jeudiSemaine = mktime(12, 0, 0, $mois, $jour, $annee) + (4 - (int) date("w", mktime(12, 0, 0, $mois, $jour, $annee))) * 24 * 60 * 60;
+    } elseif ((int) date("w", mktime(12, 0, 0, $mois, $jour, $annee)) > 4) { // du Vendredi au Samedi
+        $jeudiSemaine = mktime(12, 0, 0, $mois, $jour, $annee) - ((int) date("w", mktime(12, 0, 0, $mois, $jour, $annee)) - 4) * 24 * 60 * 60;
     } else { // Jeudi
         $jeudiSemaine = mktime(12, 0, 0, $mois, $jour, $annee);
     }
 
     // Definition du premier Jeudi de l'annee
-    if ((int)date("w", mktime(12, 0, 0, 1, 1, (int)date("Y", $jeudiSemaine))) == 0) { // Dimanche
-        $premierJeudiAnnee = mktime(12, 0, 0, 1, 1, (int)date("Y", $jeudiSemaine)) + 4 * 24 * 60 * 60;
-    } elseif ((int)date("w", mktime(12, 0, 0, 1, 1, (int)date("Y", $jeudiSemaine))) < 4) { // du Lundi au Mercredi
-        $premierJeudiAnnee = mktime(12, 0, 0, 1, 1, (int)date("Y", $jeudiSemaine)) + (4 - (int)date("w", mktime(12, 0, 0, 1, 1, (int)date("Y", $jeudiSemaine)))) * 24 * 60 * 60;
-    } elseif ((int)date("w", mktime(12, 0, 0, 1, 1, (int)date("Y", $jeudiSemaine))) > 4) { // du Vendredi au Samedi
-        $premierJeudiAnnee = mktime(12, 0, 0, 1, 1, (int)date("Y", $jeudiSemaine)) + (7 - ((int)date("w", mktime(12, 0, 0, 1, 1, (int)date("Y", $jeudiSemaine))) - 4)) * 24 * 60 * 60;
+    if ((int) date("w", mktime(12, 0, 0, 1, 1, (int) date("Y", $jeudiSemaine))) == 0) { // Dimanche
+        $premierJeudiAnnee = mktime(12, 0, 0, 1, 1, (int) date("Y", $jeudiSemaine)) + 4 * 24 * 60 * 60;
+    } elseif ((int) date("w", mktime(12, 0, 0, 1, 1, (int) date("Y", $jeudiSemaine))) < 4) { // du Lundi au Mercredi
+        $premierJeudiAnnee = mktime(12, 0, 0, 1, 1, (int) date("Y", $jeudiSemaine)) + (4 - (int) date("w", mktime(12, 0, 0, 1, 1, (int) date("Y", $jeudiSemaine)))) * 24 * 60 * 60;
+    } elseif ((int) date("w", mktime(12, 0, 0, 1, 1, (int) date("Y", $jeudiSemaine))) > 4) { // du Vendredi au Samedi
+        $premierJeudiAnnee = mktime(12, 0, 0, 1, 1, (int) date("Y", $jeudiSemaine)) + (7 - ((int) date("w", mktime(12, 0, 0, 1, 1, (int) date("Y", $jeudiSemaine))) - 4)) * 24 * 60 * 60;
     } else { // Jeudi
-        $premierJeudiAnnee = mktime(12, 0, 0, 1, 1, (int)date("Y", $jeudiSemaine));
+        $premierJeudiAnnee = mktime(12, 0, 0, 1, 1, (int) date("Y", $jeudiSemaine));
     }
 
     // Definition du numero de semaine: nb de jours entre "premier Jeudi de l'annee" et "Jeudi de la semaine";
     $numeroSemaine = (
             (
-                (int)date("z", mktime(12, 0, 0, (int)date("m", $jeudiSemaine), (int)date("d", $jeudiSemaine), (int)date("Y", $jeudiSemaine)))
+                (int) date("z", mktime(12, 0, 0, (int) date("m", $jeudiSemaine), (int) date("d", $jeudiSemaine), (int) date("Y", $jeudiSemaine)))
                 -
-                (int)date("z", mktime(12, 0, 0, (int)date("m", $premierJeudiAnnee), (int)date("d", $premierJeudiAnnee), (int)date("Y", $premierJeudiAnnee)))
+                (int) date("z", mktime(12, 0, 0, (int) date("m", $premierJeudiAnnee), (int) date("d", $premierJeudiAnnee), (int) date("Y", $premierJeudiAnnee)))
             ) / 7
         ) + 1;
 
@@ -1691,10 +1691,10 @@ 
     if ($numeroSemaine == 53) {
         // Les annees qui commencent un Jeudi et les annees bissextiles commencant un Mercredi en possedent 53
         if (
-            ((int)date("w", mktime(12, 0, 0, 1, 1, (int)date("Y", $jeudiSemaine))) == 4)
+            ((int) date("w", mktime(12, 0, 0, 1, 1, (int) date("Y", $jeudiSemaine))) == 4)
             || (
-                ((int)date("w", mktime(12, 0, 0, 1, 1, (int)date("Y", $jeudiSemaine))) == 3)
-                && ((int)date("z", mktime(12, 0, 0, 12, 31, (int)date("Y", $jeudiSemaine))) == 365)
+                ((int) date("w", mktime(12, 0, 0, 1, 1, (int) date("Y", $jeudiSemaine))) == 3)
+                && ((int) date("z", mktime(12, 0, 0, 12, 31, (int) date("Y", $jeudiSemaine))) == 365)
             )
         ) {
             $numeroSemaine = 53;
@@ -1762,8 +1762,8 @@ 
 
     // We remove old parameters for all keys in $tab
     $sql = "DELETE FROM " . MAIN_DB_PREFIX . "user_param";
-    $sql .= " WHERE fk_user = " . ((int)$user->id);
-    $sql .= " AND entity = " . ((int)$conf->entity);
+    $sql .= " WHERE fk_user = " . ((int) $user->id);
+    $sql .= " AND entity = " . ((int) $conf->entity);
     $sql .= " AND param in (";
     $i = 0;
     foreach ($tab as $key => $value) {
@@ -1787,7 +1787,7 @@ 
         // Set new parameters
         if ($value) {
             $sql = "INSERT INTO " . MAIN_DB_PREFIX . "user_param(fk_user,entity,param,value)";
-            $sql .= " VALUES (" . ((int)$user->id) . "," . ((int)$conf->entity) . ",";
+            $sql .= " VALUES (" . ((int) $user->id) . "," . ((int) $conf->entity) . ",";
             $sql .= " '" . $db->escape($key) . "','" . $db->escape($value) . "')";
 
             dol_syslog("functions2.lib::dol_set_user_param", LOG_DEBUG);
@@ -2549,7 +2549,7 @@ 
     $rgb['g'] = hexdec($length == 6 ? substr($hex, 2, 2) : ($length == 3 ? str_repeat(substr($hex, 1, 1), 2) : 0));
     $rgb['b'] = hexdec($length == 6 ? substr($hex, 4, 2) : ($length == 3 ? str_repeat(substr($hex, 2, 1), 2) : 0));
     if ($alpha !== false) {
-        $rgb['a'] = (float)$alpha;
+        $rgb['a'] = (float) $alpha;
         $string = 'rgba(' . implode(',', array_map('strval', $rgb)) . ')';
     } else {
         $string = 'rgb(' . implode(',', array_map('strval', $rgb)) . ')';
@@ -2882,7 +2882,7 @@ 
         $code = ob_get_clean();
         $code = strip_tags($code);
         if (preg_match("'syntax error, (.+) in .+ on line (\d+)$'s", $code, $code)) {
-            $code[2] = (int)$code[2];
+            $code[2] = (int) $code[2];
             $code = $code[2] <= $braces
                 ? array($code[1], $code[2])
                 : array('unexpected $end' . substr($code[1], 14), $braces);

Dolibarr/Core/Model/Constant.php

Spacing +2 added lines, -2 removed lines

@@ -155,7 +155,7 @@ 
             $query->where('entity', $entity);
         }
         return $query
-            ->get(['name', 'entity', 'value']);  // Return only the columns 'name', 'entity' y 'value'.
+            ->get(['name', 'entity', 'value']); // Return only the columns 'name', 'entity' y 'value'.
     }
 
     public static function deleteByNameLike(string $name_like, ?int $entity = null): ?bool
@@ -218,6 +218,6 @@ 
             ->orWhere('name', 'LIKE', 'MAIN_MODULE_%_MODULEFOREXTERNAL')
             ->orderBy('name')
             ->orderBy('entity')
-            ->get(['name', 'entity', 'value']);  // Return only the columns 'name', 'entity' y 'value'.
+            ->get(['name', 'entity', 'value']); // Return only the columns 'name', 'entity' y 'value'.
     }
 }

Dolibarr/Core/Base/DolibarrModules.php

Spacing +22 added lines, -22 removed lines

@@ -555,9 +555,9 @@ 
 
                 // If the module is active
                 foreach ($this->rights as $key => $value) {
-                    $r_id = $this->rights[$key][self::KEY_ID];  // permission id in llx_rights_def (not unique because primary key is couple id-entity)
+                    $r_id = $this->rights[$key][self::KEY_ID]; // permission id in llx_rights_def (not unique because primary key is couple id-entity)
                     $r_label = $this->rights[$key][self::KEY_LABEL];
-                    $r_type = $this->rights[$key][self::KEY_TYPE] ?? 'w';   // TODO deprecated
+                    $r_type = $this->rights[$key][self::KEY_TYPE] ?? 'w'; // TODO deprecated
                     $r_default = $this->rights[$key][self::KEY_DEFAULT] ?? 0;
                     $r_perms = $this->rights[$key][self::KEY_FIRST_LEVEL] ?? '';
                     $r_subperms = $this->rights[$key][self::KEY_SECOND_LEVEL] ?? '';
@@ -585,8 +585,8 @@ 
 
                     // Search if perm already present
                     $sql = "SELECT count(*) as nb FROM " . MAIN_DB_PREFIX . "rights_def";
-                    $sql .= " WHERE entity = " . ((int)$entity);
-                    $sql .= " AND id = " . ((int)$r_id);
+                    $sql .= " WHERE entity = " . ((int) $entity);
+                    $sql .= " AND id = " . ((int) $r_id);
 
                     $resqlselect = $this->db->query($sql);
                     if ($resqlselect) {
@@ -598,19 +598,19 @@ 
                             $sql .= ", libelle";
                             $sql .= ", module";
                             $sql .= ", module_origin";
-                            $sql .= ", type";   // TODO deprecated
+                            $sql .= ", type"; // TODO deprecated
                             $sql .= ", bydefault";
                             $sql .= ", perms";
                             $sql .= ", subperms";
                             $sql .= ", enabled";
                             $sql .= ") VALUES (";
-                            $sql .= ((int)$r_id);
-                            $sql .= ", " . ((int)$entity);
+                            $sql .= ((int) $r_id);
+                            $sql .= ", " . ((int) $entity);
                             $sql .= ", '" . $this->db->escape($r_label) . "'";
                             $sql .= ", '" . $this->db->escape($r_module) . "'";
                             $sql .= ", '" . $this->db->escape($r_module_origin) . "'";
-                            $sql .= ", '" . $this->db->escape($r_type) . "'";   // TODO deprecated
-                            $sql .= ", " . ((int)$r_default);
+                            $sql .= ", '" . $this->db->escape($r_type) . "'"; // TODO deprecated
+                            $sql .= ", " . ((int) $r_default);
                             $sql .= ", '" . $this->db->escape($r_perms) . "'";
                             $sql .= ", '" . $this->db->escape($r_subperms) . "'";
                             $sql .= ", '" . $this->db->escape($r_enabled) . "'";
@@ -846,7 +846,7 @@ 
         }
 
         // Run complementary sql requests
-        $num = count((array)$array_sql);
+        $num = count((array) $array_sql);
         for ($i = 0; $i < $num; $i++) {
             if (!$err) {
                 dol_syslog(get_only_class($this) . "::_remove", LOG_DEBUG);
@@ -871,7 +871,7 @@ 
                 $moduleNameInConf = 'supplier_proposal';
             }
 
-            unset($conf->modules[$moduleNameInConf]);   // Add this module in list of enabled modules so isModEnabled() will work (conf->module->enabled must no more be used)
+            unset($conf->modules[$moduleNameInConf]); // Add this module in list of enabled modules so isModEnabled() will work (conf->module->enabled must no more be used)
 
             return 1;
         } else {
@@ -1050,7 +1050,7 @@ 
 
                 $sql = "DELETE FROM " . MAIN_DB_PREFIX . "boxes_def";
                 $sql .= " WHERE file = '" . $this->db->escape($file) . "'";
-                $sql .= " AND entity = " . $conf->entity;     // Do not use getEntity here, we want to delete only in current company
+                $sql .= " AND entity = " . $conf->entity; // Do not use getEntity here, we want to delete only in current company
 
                 dol_syslog(get_only_class($this) . "::delete_boxes", LOG_DEBUG);
                 $resql = $this->db->query($sql);
@@ -1113,7 +1113,7 @@ 
 
         // Delete all entities if core module
         if (empty($this->core_enabled)) {
-            $sql .= " AND entity = " . ((int)$conf->entity);
+            $sql .= " AND entity = " . ((int) $conf->entity);
         }
 
         dol_syslog(get_only_class($this) . "::delete_permissions", LOG_DEBUG);
@@ -1142,7 +1142,7 @@ 
 
         $sql = "DELETE FROM " . MAIN_DB_PREFIX . "menu";
         $sql .= " WHERE module = '" . $this->db->escape($module) . "'";
-        $sql .= " AND menu_handler = 'all'";    // We delete only lines that were added manually or by the module activation. We keep entry added by menuhandler like 'auguria'
+        $sql .= " AND menu_handler = 'all'"; // We delete only lines that were added manually or by the module activation. We keep entry added by menuhandler like 'auguria'
         $sql .= " AND entity IN (0, " . $conf->entity . ")";
 
         dol_syslog(get_only_class($this) . "::delete_menus", LOG_DEBUG);
@@ -1196,7 +1196,7 @@ 
         if ($pathoffile) {     // Mostly for external modules
             $content = file_get_contents($pathoffile, false, null, 0, 1024 * 1024); // Max size loaded 1Mb
 
-            if ((float)DOL_VERSION >= 6.0) {
+            if ((float) DOL_VERSION >= 6.0) {
                 @include_once DOL_DOCUMENT_ROOT . '/core/lib/parsemd.lib.php';
 
                 $content = dolMd2Html(
@@ -1296,7 +1296,7 @@ 
         if ($filefound) {     // Mostly for external modules
             $content = file_get_contents($pathoffile);
 
-            if ((float)DOL_VERSION >= 6.0) {
+            if ((float) DOL_VERSION >= 6.0) {
                 @include_once DOL_DOCUMENT_ROOT . '/core/lib/parsemd.lib.php';
 
                 $content = dolMd2Html($content, 'parsedown', array('doc/' => dol_buildpath(strtolower($this->name) . '/doc/', 1)));
@@ -1574,7 +1574,7 @@ 
                     $ignoreerror = $val['ignoreerror'];
                 }
                 // Add current entity id
-                $sql = str_replace('__ENTITY__', (string)$conf->entity, $sql);
+                $sql = str_replace('__ENTITY__', (string) $conf->entity, $sql);
 
                 dol_syslog(get_only_class($this) . "::_init ignoreerror=" . $ignoreerror, LOG_DEBUG);
                 $result = $this->db->query($sql, $ignoreerror);
@@ -1951,7 +1951,7 @@ 
                                 }
 
                                 $sql = "INSERT INTO " . MAIN_DB_PREFIX . "boxes (box_id, position, box_order, fk_user, entity)";
-                                $sql .= " VALUES (" . ((int)$lastid) . ", " . ((int)$key2) . ", '0', 0, " . ((int)$conf->entity) . ")";
+                                $sql .= " VALUES (" . ((int) $lastid) . ", " . ((int) $key2) . ", '0', 0, " . ((int) $conf->entity) . ")";
 
                                 dol_syslog(get_only_class($this) . "::insert_boxes onto page " . $key2 . "=" . $val2, LOG_DEBUG);
                                 $resql = $this->db->query($sql);
@@ -2034,7 +2034,7 @@ 
                 if ($parameters) {
                     $sql .= " AND params = '".$this->db->escape($parameters)."'";
                 }*/
-                $sql .= " AND entity = " . ((int)$entity); // Must be exact entity
+                $sql .= " AND entity = " . ((int) $entity); // Must be exact entity
 
                 $now = dol_now();
 
@@ -2082,7 +2082,7 @@ 
                                 $sql .= "'" . $this->db->escape($priority) . "', ";
                             }
                             if (is_int($status)) {
-                                $sql .= ((int)$status) . ", ";
+                                $sql .= ((int) $status) . ", ";
                             }
                             $sql .= $entity . ",";
                             $sql .= "'" . $this->db->escape($test) . "'";
@@ -2394,7 +2394,7 @@ 
 
         $return .= '<div class="valignmiddle inline-block info-box-more">';
         //if ($versiontrans) print img_warning($langs->trans("Version").' '.$this->getVersion(1)).' ';
-        $return .= '<a class="valignmiddle inline-block" href="javascript:document_preview(\'' . constant('BASE_URL') . '/admin/modulehelp.php?id=' . ((int)$this->numero) . '\',\'text/html\',\'' . dol_escape_js($langs->trans("Module")) . '\')">' . img_picto(($this->isCoreOrExternalModule() == 'external' ? $langs->trans("ExternalModule") . ' - ' : '') . $langs->trans("ClickToShowDescription"), $imginfo) . '</a>';
+        $return .= '<a class="valignmiddle inline-block" href="javascript:document_preview(\'' . constant('BASE_URL') . '/admin/modulehelp.php?id=' . ((int) $this->numero) . '\',\'text/html\',\'' . dol_escape_js($langs->trans("Module")) . '\')">' . img_picto(($this->isCoreOrExternalModule() == 'external' ? $langs->trans("ExternalModule") . ' - ' : '') . $langs->trans("ClickToShowDescription"), $imginfo) . '</a>';
         $return .= '</div><br>';
 
         $return .= '<div class="valignmiddle inline-block info-box-actions">';
@@ -2550,7 +2550,7 @@ 
     {
         require_once constant('DOL_DOCUMENT_ROOT') . '/core/lib/geturl.lib.php';
         if (!empty($this->url_last_version)) {
-            $lastVersion = getURLContent($this->url_last_version, 'GET', '', 1, array(), array('http', 'https'), 0);    // Accept http or https links on external remote server only
+            $lastVersion = getURLContent($this->url_last_version, 'GET', '', 1, array(), array('http', 'https'), 0); // Accept http or https links on external remote server only
             if (isset($lastVersion['content']) && strlen($lastVersion['content']) < 30) {
                 // Security warning :  be careful with remote data content, the module editor could be hacked (or evil) so limit to a-z A-Z 0-9 _ . -
                 $this->lastVersion = preg_replace("/[^a-zA-Z0-9_\.\-]+/", "", $lastVersion['content']);

Dolibarr/Modules/Api.php

Spacing +4 added lines, -4 removed lines

@@ -148,11 +148,11 @@
 
         // Add here list of permission defined by an id, a label, a boolean and two constant strings.
         // Example:
-        $this->rights[$r][0] = $this->numero + $r;  // Permission id (must not be already used)
+        $this->rights[$r][0] = $this->numero + $r; // Permission id (must not be already used)
         $this->rights[$r][1] = 'Generate/modify users API key'; // Permission label
-        $this->rights[$r][3] = 0;                   // Permission by default for new user (0/1)
-        $this->rights[$r][4] = 'apikey';                // In php code, permission will be checked by test if ($user->hasRight('permkey','level1','level2'))
-        $this->rights[$r][5] = 'generate';              // In php code, permission will be checked by test if ($user->hasRight('permkey','level1','level2'))
+        $this->rights[$r][3] = 0; // Permission by default for new user (0/1)
+        $this->rights[$r][4] = 'apikey'; // In php code, permission will be checked by test if ($user->hasRight('permkey','level1','level2'))
+        $this->rights[$r][5] = 'generate'; // In php code, permission will be checked by test if ($user->hasRight('permkey','level1','level2'))
         $r++;
 
 

public/htdocs/install/repair.php

Spacing +31 added lines, -31 removed lines

@@ -153,7 +153,7 @@ 
 $conf->db->dolibarr_main_db_encryption = isset($dolibarr_main_db_encryption) ? $dolibarr_main_db_encryption : 0;
 $conf->db->dolibarr_main_db_cryptkey = isset($dolibarr_main_db_cryptkey) ? $dolibarr_main_db_cryptkey : '';
 
-$db = getDoliDBInstance($conf->db->type, $conf->db->host, $conf->db->user, $conf->db->pass, $conf->db->name, (int)$conf->db->port);
+$db = getDoliDBInstance($conf->db->type, $conf->db->host, $conf->db->user, $conf->db->pass, $conf->db->name, (int) $conf->db->port);
 new Database();
 
 if ($db->connected) {
@@ -391,11 +391,11 @@ 
         $name = $reg[1];
 
         if (GETPOST('standard', 'alpha') !== 'confirmed') {
-            print '<tr><td>Widget ' . $constant->name . ' set in entity ' . $constant->entity . ' with value ' . $constant->value . ' -> Module ' . $name . ' not enabled in entity ' . ((int)$constant->entity) . ', we should delete record (not done, mode test)</td></tr>';
+            print '<tr><td>Widget ' . $constant->name . ' set in entity ' . $constant->entity . ' with value ' . $constant->value . ' -> Module ' . $name . ' not enabled in entity ' . ((int) $constant->entity) . ', we should delete record (not done, mode test)</td></tr>';
             continue;
         }
 
-        print '<tr><td>Widget ' . $constant->name . ' set in entity ' . $constant->entity . ' with value ' . $constant->value . ' -> Module ' . $name . ' not enabled in entity ' . ((int)$constant->entity) . ', we delete record</td></tr>';
+        print '<tr><td>Widget ' . $constant->name . ' set in entity ' . $constant->entity . ' with value ' . $constant->value . ' -> Module ' . $name . ' not enabled in entity ' . ((int) $constant->entity) . ', we delete record</td></tr>';
         Constant::deleteByName($constant->name, $constant->entity);
     }
 }
@@ -426,16 +426,16 @@ 
                     $module_instance = Constant::getByName('MAIN_MODULE_' . $module, $obj->entity);
                     if ($module_instance && $module_instance->value !== 0) {
                         // Module not found, so we canremove entry
-                        $sqldeletea = "DELETE FROM " . MAIN_DB_PREFIX . "boxes WHERE entity = " . ((int)$obj->entity) . " AND box_id IN (SELECT rowid FROM " . MAIN_DB_PREFIX . "boxes_def WHERE file = '" . $db->escape($obj->file) . "' AND entity = " . ((int)$obj->entity) . ")";
-                        $sqldeleteb = "DELETE FROM " . MAIN_DB_PREFIX . "boxes_def WHERE file = '" . $db->escape($obj->file) . "' AND entity = " . ((int)$obj->entity);
+                        $sqldeletea = "DELETE FROM " . MAIN_DB_PREFIX . "boxes WHERE entity = " . ((int) $obj->entity) . " AND box_id IN (SELECT rowid FROM " . MAIN_DB_PREFIX . "boxes_def WHERE file = '" . $db->escape($obj->file) . "' AND entity = " . ((int) $obj->entity) . ")";
+                        $sqldeleteb = "DELETE FROM " . MAIN_DB_PREFIX . "boxes_def WHERE file = '" . $db->escape($obj->file) . "' AND entity = " . ((int) $obj->entity);
 
                         if (GETPOST('standard', 'alpha') == 'confirmed') {
                             $db->query($sqldeletea);
                             $db->query($sqldeleteb);
 
-                            print '<tr><td>Constant ' . $obj->file . ' set in boxes_def for entity ' . $obj->entity . ' but MAIN_MODULE_' . strtoupper($module) . ' not defined in entity ' . ((int)$obj->entity) . ', we delete record</td></tr>';
+                            print '<tr><td>Constant ' . $obj->file . ' set in boxes_def for entity ' . $obj->entity . ' but MAIN_MODULE_' . strtoupper($module) . ' not defined in entity ' . ((int) $obj->entity) . ', we delete record</td></tr>';
                         } else {
-                            print '<tr><td>Constant ' . $obj->file . ' set in boxes_def for entity ' . $obj->entity . ' but MAIN_MODULE_' . strtoupper($module) . ' not defined in entity ' . ((int)$obj->entity) . ', we should delete record (not done, mode test)</td></tr>';
+                            print '<tr><td>Constant ' . $obj->file . ' set in boxes_def for entity ' . $obj->entity . ' but MAIN_MODULE_' . strtoupper($module) . ' not defined in entity ' . ((int) $obj->entity) . ', we should delete record (not done, mode test)</td></tr>';
                         }
                     }
                 }
@@ -481,7 +481,7 @@ 
             if (!empty($name)) {
                 $filetotest = $dolibarr_main_data_root . '/societe/logos/' . $name . $ext;
                 $filetotestsmall = $dolibarr_main_data_root . '/societe/logos/thumbs/' . $name . '_small' . $ext;
-                $exists = (int)dol_is_file($filetotest);
+                $exists = (int) dol_is_file($filetotest);
                 print 'Check thirdparty ' . $obj->rowid . ' name=' . $obj->name . ' logo=' . $obj->logo . ' file ' . $filetotest . " exists=" . $exists . "<br>\n";
                 if ($exists) {
                     $filetarget = $dolibarr_main_data_root . '/societe/' . $obj->rowid . '/logos/' . $name . $ext;
@@ -555,7 +555,7 @@ 
                 $filetotest = $dolibarr_main_data_root . '/users/' . substr(sprintf('%08d', $obj->rowid), -1, 1) . '/' . substr(sprintf('%08d', $obj->rowid), -2, 1) . '/' . $name . $ext;
                 $filetotestsmall = $dolibarr_main_data_root . '/users/' . substr(sprintf('%08d', $obj->rowid), -1, 1) . '/' . substr(sprintf('%08d', $obj->rowid), -2, 1) . '/thumbs/' . $name . '_small' . $ext;
                 $filetotestmini = $dolibarr_main_data_root . '/users/' . substr(sprintf('%08d', $obj->rowid), -1, 1) . '/' . substr(sprintf('%08d', $obj->rowid), -2, 1) . '/thumbs/' . $name . '_mini' . $ext;
-                $exists = (int)dol_is_file($filetotest);
+                $exists = (int) dol_is_file($filetotest);
                 print 'Check user ' . $obj->rowid . ' lastname=' . $obj->lastname . ' firstname=' . $obj->firstname . ' photo=' . $obj->photo . ' file ' . $filetotest . " exists=" . $exists . "<br>\n";
                 if ($exists) {
                     $filetarget = $dolibarr_main_data_root . '/users/' . $obj->rowid . '/' . $name . $ext;
@@ -915,7 +915,7 @@ 
                         // If product is not a product that support batches, we can clean stock by deleting the product batch lines
                         print ' -> Delete qty ' . $obj->reelbatch . ' for any lot linked to fk_product_stock=' . $obj->psrowid;
                         $sql2 = "DELETE FROM " . MAIN_DB_PREFIX . "product_batch";
-                        $sql2 .= " WHERE fk_product_stock = " . ((int)$obj->psrowid);
+                        $sql2 .= " WHERE fk_product_stock = " . ((int) $obj->psrowid);
                         print '<br>' . $sql2;
 
                         if (GETPOST('clean_product_stock_batch') == 'confirmed') {
@@ -930,7 +930,7 @@ 
                             // Method 1
                             print ' -> Insert qty ' . ($obj->reel - $obj->reelbatch) . ' with lot 000000 linked to fk_product_stock=' . $obj->psrowid;
                             $sql2 = "INSERT INTO " . MAIN_DB_PREFIX . "product_batch(fk_product_stock, batch, qty)";
-                            $sql2 .= "VALUES(" . ((int)$obj->psrowid) . ", '000000', " . ((float)($obj->reel - $obj->reelbatch)) . ")";
+                            $sql2 .= "VALUES(" . ((int) $obj->psrowid) . ", '000000', " . ((float) ($obj->reel - $obj->reelbatch)) . ")";
                             print '<br>' . $sql2;
 
                             if (GETPOST('clean_product_stock_batch') == 'confirmed') {
@@ -945,9 +945,9 @@ 
                         }
                         if ($methodtofix == 'updatestock') {
                             // Method 2
-                            print ' -> Update qty of product_stock with qty = ' . ($obj->reelbatch ? ((float)$obj->reelbatch) : '0') . ' for ps.rowid = ' . ((int)$obj->psrowid);
+                            print ' -> Update qty of product_stock with qty = ' . ($obj->reelbatch ? ((float) $obj->reelbatch) : '0') . ' for ps.rowid = ' . ((int) $obj->psrowid);
                             $sql2 = "UPDATE " . MAIN_DB_PREFIX . "product_stock";
-                            $sql2 .= " SET reel = " . ($obj->reelbatch ? ((float)$obj->reelbatch) : '0') . " WHERE rowid = " . ((int)$obj->psrowid);
+                            $sql2 .= " SET reel = " . ($obj->reelbatch ? ((float) $obj->reelbatch) : '0') . " WHERE rowid = " . ((int) $obj->psrowid);
                             print '<br>' . $sql2;
 
                             if (GETPOST('clean_product_stock_batch') == 'confirmed') {
@@ -1042,7 +1042,7 @@ 
 
                 if (GETPOST('set_empty_time_spent_amount') == 'confirmed') {
                     $sql2 = "UPDATE " . MAIN_DB_PREFIX . "element_time";
-                    $sql2 .= " SET thm = " . $obj->user_thm . " WHERE thm IS NULL AND fk_user = " . ((int)$obj->user_id);
+                    $sql2 .= " SET thm = " . $obj->user_thm . " WHERE thm IS NULL AND fk_user = " . ((int) $obj->user_id);
                     $resql2 = $db->query($sql2);
                     if (!$resql2) {
                         $error++;
@@ -1107,13 +1107,13 @@ 
             }
             if ($key == 'js') {
                 $value = $obj->value;
-                $valuearray = (array)json_decode($value);  // Force cast into array because sometimes it is a stdClass
+                $valuearray = (array) json_decode($value); // Force cast into array because sometimes it is a stdClass
                 $reloffile = $valuearray[0];
                 $reloffile = preg_replace('/^\//', '', $valuearray[0]);
             }
             if ($key == 'css') {
                 $value = $obj->value;
-                $valuearray = (array)json_decode($value);  // Force cast into array because sometimes it is a stdClass
+                $valuearray = (array) json_decode($value); // Force cast into array because sometimes it is a stdClass
                 if ($value && (!is_array($valuearray) || count($valuearray) == 0)) {
                     $valuearray = array();
                     $valuearray[0] = $value; // If value was not a json array but a string
@@ -1129,7 +1129,7 @@ 
                     $result = 'found'; // If error, we force like if we found to avoid any deletion
                 }
             } else {
-                $result = 'found';  //
+                $result = 'found'; //
             }
 
             if (!$result) {
@@ -1181,7 +1181,7 @@ 
                 if ($obj->id > 0) {
                     print '<tr><td>Found line with id ' . $obj->id . ', label "' . $obj->label . '" of module "' . $obj->module . '" to delete';
                     if (GETPOST('clean_perm_table', 'alpha') == 'confirmed') {
-                        $sqldelete = "DELETE FROM " . MAIN_DB_PREFIX . "rights_def WHERE id = " . ((int)$obj->id);
+                        $sqldelete = "DELETE FROM " . MAIN_DB_PREFIX . "rights_def WHERE id = " . ((int) $obj->id);
                         $resqldelete = $db->query($sqldelete);
                         if (!$resqldelete) {
                             dol_print_error($db);
@@ -1433,8 +1433,8 @@ 
         }
         while ($obj_dispatch = $db->fetch_object($resql_dispatch)) {
             $sql_line = 'SELECT line.rowid, line.qty FROM ' . MAIN_DB_PREFIX . 'commande_fournisseurdet AS line';
-            $sql_line .= ' WHERE line.fk_commande = ' . ((int)$obj_dispatch->fk_commande);
-            $sql_line .= ' AND   line.fk_product  = ' . ((int)$obj_dispatch->fk_product);
+            $sql_line .= ' WHERE line.fk_commande = ' . ((int) $obj_dispatch->fk_commande);
+            $sql_line .= ' AND   line.fk_product  = ' . ((int) $obj_dispatch->fk_product);
             $resql_line = $db->query($sql_line);
 
             // s’il y a plusieurs lignes avec le même produit sur cette commande fournisseur,
@@ -1462,20 +1462,20 @@ 
                 $qty_for_line = min($remaining_qty, $obj_line->qty);
                 if ($first_iteration) {
                     $sql_attach = 'UPDATE ' . MAIN_DB_PREFIX . 'receptiondet_batch';
-                    $sql_attach .= ' SET fk_elementdet = ' . ((int)$obj_line->rowid) . ', qty = ' . ((float)$qty_for_line);
-                    $sql_attach .= ' WHERE rowid = ' . ((int)$obj_dispatch->rowid);
+                    $sql_attach .= ' SET fk_elementdet = ' . ((int) $obj_line->rowid) . ', qty = ' . ((float) $qty_for_line);
+                    $sql_attach .= ' WHERE rowid = ' . ((int) $obj_dispatch->rowid);
                     $first_iteration = false;
                 } else {
                     $sql_attach_values = array(
-                        (string)((int)$obj_dispatch->fk_element),
-                        (string)((int)$obj_dispatch->fk_product),
-                        (string)((int)$obj_line->rowid),
-                        (string)((float)$qty_for_line),
-                        (string)((int)$obj_dispatch->fk_entrepot),
-                        (string)((int)$obj_dispatch->fk_user),
+                        (string) ((int) $obj_dispatch->fk_element),
+                        (string) ((int) $obj_dispatch->fk_product),
+                        (string) ((int) $obj_line->rowid),
+                        (string) ((float) $qty_for_line),
+                        (string) ((int) $obj_dispatch->fk_entrepot),
+                        (string) ((int) $obj_dispatch->fk_user),
                         $obj_dispatch->datec ? "'" . $db->idate($db->jdate($obj_dispatch->datec)) . "'" : 'NULL',
                         $obj_dispatch->comment ? "'" . $db->escape($obj_dispatch->comment) . "'" : 'NULL',
-                        $obj_dispatch->status ? (string)((int)$obj_dispatch->status) : 'NULL',
+                        $obj_dispatch->status ? (string) ((int) $obj_dispatch->status) : 'NULL',
                         $obj_dispatch->tms ? "'" . $db->idate($db->jdate($obj_dispatch->tms)) . "'" : 'NULL',
                         $obj_dispatch->batch ? "'" . $db->escape($obj_dispatch->batch) . "'" : 'NULL',
                         $obj_dispatch->eatby ? "'" . $db->escape($obj_dispatch->eatby) . "'" : 'NULL',
@@ -1485,7 +1485,7 @@ 
 
                     $sql_attach = 'INSERT INTO ' . MAIN_DB_PREFIX . 'receptiondet_batch';
                     $sql_attach .= ' (fk_element, fk_product, fk_elementdet, qty, fk_entrepot, fk_user, datec, comment, status, tms, batch, eatby, sellby)';
-                    $sql_attach .= " VALUES (" . $sql_attach_values . ")";  // The string is already sanitized
+                    $sql_attach .= " VALUES (" . $sql_attach_values . ")"; // The string is already sanitized
                 }
 
                 if ($repair_link_dispatch_lines_supplier_order_lines == 'confirmed') {
@@ -1565,7 +1565,7 @@ 
 
             $newRef = $supplierOrder->getNextNumRef($soc);
 
-            $sql = "UPDATE " . MAIN_DB_PREFIX . "commande_fournisseur cf SET cf.ref = '" . $db->escape($newRef) . "' WHERE cf.rowid = " . (int)$supplierOrder->id;
+            $sql = "UPDATE " . MAIN_DB_PREFIX . "commande_fournisseur cf SET cf.ref = '" . $db->escape($newRef) . "' WHERE cf.rowid = " . (int) $supplierOrder->id;
             if (!$db->query($sql)) {
                 $err++;
             }