alxarafe / alixar

public/htdocs/install/step5.php

Spacing +4 added lines, -4 removed lines

@@ -77,7 +77,7 @@ 
 $login = GETPOST('login', 'alpha') ? GETPOST('login', 'alpha') : (empty($argv[5]) ? '' : $argv[5]);
 $pass = GETPOST('pass', 'alpha') ? GETPOST('pass', 'alpha') : (empty($argv[6]) ? '' : $argv[6]);
 $pass_verif = GETPOST('pass_verif', 'alpha') ? GETPOST('pass_verif', 'alpha') : (empty($argv[7]) ? '' : $argv[7]);
-$force_install_lockinstall = (int)(!empty($force_install_lockinstall) ? $force_install_lockinstall : (GETPOST('installlock', 'aZ09') ? GETPOST('installlock', 'aZ09') : (empty($argv[8]) ? '' : $argv[8])));
+$force_install_lockinstall = (int) (!empty($force_install_lockinstall) ? $force_install_lockinstall : (GETPOST('installlock', 'aZ09') ? GETPOST('installlock', 'aZ09') : (empty($argv[8]) ? '' : $argv[8])));
 
 $success = 0;
 
@@ -169,7 +169,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);
 
     // Create the global $hookmanager object
     $hookmanager = new HookManager($db);
@@ -234,8 +234,8 @@ 
             $newuser->admin = 1;
             $newuser->entity = 0;
 
-            $conf->global->USER_MAIL_REQUIRED = 0;          // Force global option to be sure to create a new user with no email
-            $conf->global->USER_PASSWORD_GENERATED = '';    // To not use any rule for password validation
+            $conf->global->USER_MAIL_REQUIRED = 0; // Force global option to be sure to create a new user with no email
+            $conf->global->USER_PASSWORD_GENERATED = ''; // To not use any rule for password validation
 
             $result = $newuser->create($createuser, 1);
             if ($result > 0) {

public/htdocs/install/upgrade.php

Spacing +2 added lines, -2 removed lines

@@ -150,7 +150,7 @@ 
     }
     $conf->db->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);
 
     // Create the global $hookmanager object
     $hookmanager = new HookManager($db);
@@ -426,7 +426,7 @@ 
 }
 dolibarr_install_syslog("Exit " . $ret);
 
-dolibarr_install_syslog("--- upgrade: end " . ((int)(!$ok && !GETPOST("ignoreerrors"))) . " dirmodule=" . $dirmodule);
+dolibarr_install_syslog("--- upgrade: end " . ((int) (!$ok && !GETPOST("ignoreerrors"))) . " dirmodule=" . $dirmodule);
 
 $nonext = (!$ok && !GETPOST("ignoreerrors")) ? 2 : 0;
 if ($dirmodule) {

public/htdocs/core/lib/functions.lib.php

Spacing +132 added lines, -132 removed lines

@@ -160,7 +160,7 @@ 
 function getDolGlobalString($key, $default = '')
 {
     global $conf;
-    return (string)(isset($conf->global->$key) ? $conf->global->$key : $default);
+    return (string) (isset($conf->global->$key) ? $conf->global->$key : $default);
 }
 
 /**
@@ -175,7 +175,7 @@ 
 function getDolGlobalInt($key, $default = 0)
 {
     global $conf;
-    return (int)(isset($conf->global->$key) ? $conf->global->$key : $default);
+    return (int) (isset($conf->global->$key) ? $conf->global->$key : $default);
 }
 
 /**
@@ -193,7 +193,7 @@ 
         $tmpuser = $user;
     }
 
-    return (string)(empty($tmpuser->conf->$key) ? $default : $tmpuser->conf->$key);
+    return (string) (empty($tmpuser->conf->$key) ? $default : $tmpuser->conf->$key);
 }
 
 /**
@@ -211,7 +211,7 @@ 
         $tmpuser = $user;
     }
 
-    return (int)(empty($tmpuser->conf->$key) ? $default : $tmpuser->conf->$key);
+    return (int) (empty($tmpuser->conf->$key) ? $default : $tmpuser->conf->$key);
 }
 
 
@@ -228,23 +228,23 @@ 
     'MODULE_MAPPING',
     array(
         // Map deprecated names to new names
-        'adherent' => 'member',  // Has new directory
-        'member_type' => 'adherent_type',   // No directory, but file called adherent_type
-        'banque' => 'bank',   // Has new directory
+        'adherent' => 'member', // Has new directory
+        'member_type' => 'adherent_type', // No directory, but file called adherent_type
+        'banque' => 'bank', // Has new directory
         'contrat' => 'contract', // Has new directory
-        'entrepot' => 'stock',   // Has new directory
+        'entrepot' => 'stock', // Has new directory
         'projet' => 'project', // Has new directory
         'categorie' => 'category', // Has old directory
-        'commande' => 'order',    // Has old directory
+        'commande' => 'order', // Has old directory
         'expedition' => 'shipping', // Has old directory
         'facture' => 'invoice', // Has old directory
         'fichinter' => 'intervention', // Has old directory
-        'ficheinter' => 'intervention',  // Backup for 'fichinter'
+        'ficheinter' => 'intervention', // Backup for 'fichinter'
         'propale' => 'propal', // Has old directory
         'socpeople' => 'contact', // Has old directory
-        'fournisseur' => 'supplier',  // Has old directory
+        'fournisseur' => 'supplier', // Has old directory
 
-        'actioncomm' => 'agenda',  // NO module directory (public dir agenda)
+        'actioncomm' => 'agenda', // NO module directory (public dir agenda)
         'product_price' => 'productprice', // NO directory
         'product_fournisseur_price' => 'productsupplierprice', // NO directory
     )
@@ -381,7 +381,7 @@ 
         if (in_array($element, $addzero)) {
             $out .= '0,';
         }
-        $out .= ((int)$conf->entity);
+        $out .= ((int) $conf->entity);
     }
 
     // Manipulate entities to query on the fly
@@ -474,7 +474,7 @@ 
     $os = 'unknown';
     $phone = '';
 
-    $user_agent = substr($user_agent, 0, 512);  // Avoid to process too large user agent
+    $user_agent = substr($user_agent, 0, 512); // Avoid to process too large user agent
 
     $detectmobile = new Mobile_Detect(null, $user_agent);
     $tablet = $detectmobile->isTablet();
@@ -563,8 +563,8 @@ 
         'browserversion' => $version,
         'browseros' => $os,
         'browserua' => $user_agent,
-        'layout' => $layout,    // tablet, phone, classic
-        'phone' => $phone,      // deprecated
+        'layout' => $layout, // tablet, phone, classic
+        'phone' => $phone, // deprecated
         'tablet' => $tablet     // deprecated
     );
 }
@@ -980,13 +980,13 @@ 
     // Sanitizing for special parameters.
     // Note: There is no reason to allow the backtopage, backtolist or backtourl parameter to contains an external URL. Only relative URLs are allowed.
     if ($paramname == 'backtopage' || $paramname == 'backtolist' || $paramname == 'backtourl') {
-        $out = str_replace('\\', '/', $out);                                // Can be before the loop because only 1 char is replaced. No risk to get it after other replacements.
-        $out = str_replace(array(':', ';', '@', "\t", ' '), '', $out);      // Can be before the loop because only 1 char is replaced. No risk to retrieve it after other replacements.
+        $out = str_replace('\\', '/', $out); // Can be before the loop because only 1 char is replaced. No risk to get it after other replacements.
+        $out = str_replace(array(':', ';', '@', "\t", ' '), '', $out); // Can be before the loop because only 1 char is replaced. No risk to retrieve it after other replacements.
         do {
             $oldstringtoclean = $out;
             $out = str_ireplace(array('javascript', 'vbscript', '&colon', '&#'), '', $out);
-            $out = preg_replace(array('/^[^?]*%/'), '', $out);             // We remove any % chars before the ?. Example in url: '/product/stock/card.php?action=create&backtopage=%2Fdolibarr_dev%2Fhtdocs%2Fpro%25duct%2Fcard.php%3Fid%3Dabc'
-            $out = preg_replace(array('/^[a-z]*\/\s*\/+/i'), '', $out);     // We remove schema*// to remove external URL
+            $out = preg_replace(array('/^[^?]*%/'), '', $out); // We remove any % chars before the ?. Example in url: '/product/stock/card.php?action=create&backtopage=%2Fdolibarr_dev%2Fhtdocs%2Fpro%25duct%2Fcard.php%3Fid%3Dabc'
+            $out = preg_replace(array('/^[a-z]*\/\s*\/+/i'), '', $out); // We remove schema*// to remove external URL
         } while ($oldstringtoclean != $out);
     }
 
@@ -1020,7 +1020,7 @@ 
  */
 function GETPOSTINT($paramname, $method = 0)
 {
-    return (int)GETPOST($paramname, 'int', $method, null, null, 0);
+    return (int) GETPOST($paramname, 'int', $method, null, null, 0);
 }
 
 
@@ -1035,7 +1035,7 @@ 
 function GETPOSTFLOAT($paramname, $rounding = '')
 {
     // price2num() is used to sanitize any valid user input (such as "1 234.5", "1 234,5", "1'234,5", "1·234,5", "1,234.5", etc.)
-    return (float)price2num(GETPOST($paramname), $rounding, 2);
+    return (float) price2num(GETPOST($paramname), $rounding, 2);
 }
 
 
@@ -1226,7 +1226,7 @@ 
         }
 
         // If prefix is for session (no need to have $conf loaded)
-        global $dolibarr_main_instance_unique_id, $dolibarr_main_cookie_cryptkey;   // This is loaded by filefunc.inc.php
+        global $dolibarr_main_instance_unique_id, $dolibarr_main_cookie_cryptkey; // This is loaded by filefunc.inc.php
         $tmp_instance_unique_id = empty($dolibarr_main_instance_unique_id) ? (empty($dolibarr_main_cookie_cryptkey) ? '' : $dolibarr_main_cookie_cryptkey) : $dolibarr_main_instance_unique_id; // Unique id of instance
 
         // The recommended value (may be not defined for old versions)
@@ -1428,7 +1428,7 @@ 
         $tmpsavdb = null;
         if (isset($object->db) && isset($object->db->db) && is_object($object->db->db) && get_class($object->db->db) == 'PgSql\Connection') {
             $tmpsavdb = $object->db;
-            unset($object->db);     // Such property can not be serialized with pgsl (when object->db->db = 'PgSql\Connection')
+            unset($object->db); // Such property can not be serialized with pgsl (when object->db->db = 'PgSql\Connection')
         }
 
         $myclone = unserialize(serialize($object)); // serialize then unserialize is a hack to be sure to have a new object for all fields
@@ -1439,7 +1439,7 @@ 
     } elseif ($native == 2) {
         // recommended method to have a full isolated cloned object
         $myclone = new stdClass();
-        $tmparray = get_object_vars($object);   // return only public properties
+        $tmparray = get_object_vars($object); // return only public properties
 
         if (is_array($tmparray)) {
             foreach ($tmparray as $propertykey => $propertyval) {
@@ -1884,9 +1884,9 @@ 
 
     // escape quotes and backslashes, newlines, etc.
     if ($escapeonlyhtmltags) {
-        $tmp = htmlspecialchars_decode((string)$stringtoescape, ENT_COMPAT);
+        $tmp = htmlspecialchars_decode((string) $stringtoescape, ENT_COMPAT);
     } else {
-        $tmp = html_entity_decode((string)$stringtoescape, ENT_COMPAT, 'UTF-8');
+        $tmp = html_entity_decode((string) $stringtoescape, ENT_COMPAT, 'UTF-8');
     }
     if (!$keepb) {
         $tmp = strtr($tmp, array("<b>" => '', '</b>' => '', '<strong>' => '', '</strong>' => ''));
@@ -1916,7 +1916,7 @@ 
                 // For case of tag with attribute
                 $reg = array();
                 if (preg_match('/<' . preg_quote($tagtoreplace, '/') . '\s+([^>]+)>/', $tmp, $reg)) {
-                    $tmpattributes = str_ireplace(array('[', ']'), '_', $reg[1]);   // We must never have [ ] inside the attribute string
+                    $tmpattributes = str_ireplace(array('[', ']'), '_', $reg[1]); // We must never have [ ] inside the attribute string
                     $tmpattributes = str_ireplace('href="http:', '__HREFHTTPA', $tmpattributes);
                     $tmpattributes = str_ireplace('href="https:', '__HREFHTTPSA', $tmpattributes);
                     $tmpattributes = str_ireplace('src="http:', '__SRCHTTPIMG', $tmpattributes);
@@ -1926,7 +1926,7 @@ 
                     $tmp = preg_replace('/<' . preg_quote($tagtoreplace, '/') . '\s+([^>]+)>/', '__BEGINTAGTOREPLACE' . $tagtoreplace . '[' . $tmpattributes . ']__', $tmp);
                 }
                 if (preg_match('/<' . preg_quote($tagtoreplace, '/') . '\s+([^>]+)> \/>/', $tmp, $reg)) {
-                    $tmpattributes = str_ireplace(array('[', ']'), '_', $reg[1]);   // We must not have [ ] inside the attribute string
+                    $tmpattributes = str_ireplace(array('[', ']'), '_', $reg[1]); // We must not have [ ] inside the attribute string
                     $tmpattributes = str_ireplace('"', '__DOUBLEQUOTE', $tmpattributes);
                     $tmpattributes = preg_replace('/[^a-z0-9_\/?;\s=&]/i', '', $tmpattributes);
                     $tmp = preg_replace('/<' . preg_quote($tagtoreplace, '/') . '\s+([^>]+) \/>/', '__BEGINENDTAGTOREPLACE' . $tagtoreplace . '[' . $tmpattributes . ']__', $tmp);
@@ -2371,7 +2371,7 @@ 
                 $to_gmt = false;
                 $offsettzstring = @date_default_timezone_get(); // Example 'Europe/Berlin' or 'Indian/Reunion'
                 // @phan-suppress-next-line PhanPluginRedundantAssignment
-                $offsettz = 0;  // Timezone offset with server timezone (because to_gmt is false), so 0
+                $offsettz = 0; // Timezone offset with server timezone (because to_gmt is false), so 0
                 // @phan-suppress-next-line PhanPluginRedundantAssignment
                 $offsetdst = 0; // Dst offset with server timezone (because to_gmt is false), so 0
             } elseif ($tzoutput == 'tzuser' || $tzoutput == 'tzuserrel') {
@@ -2382,8 +2382,8 @@ 
                     $user_date_tz = new DateTimeZone($offsettzstring);
                     $user_dt = new DateTime();
                     $user_dt->setTimezone($user_date_tz);
-                    $user_dt->setTimestamp($tzoutput == 'tzuser' ? dol_now() : (int)$time);
-                    $offsettz = $user_dt->getOffset();  // should include dst ?
+                    $user_dt->setTimestamp($tzoutput == 'tzuser' ? dol_now() : (int) $time);
+                    $offsettz = $user_dt->getOffset(); // should include dst ?
                 } else {    // with old method (The 'tzuser' was processed like the 'tzuserrel')
                     $offsettz = (empty($_SESSION['dol_tz']) ? 0 : $_SESSION['dol_tz']) * 60 * 60; // Will not be used anymore
                     $offsetdst = (empty($_SESSION['dol_dst']) ? 0 : $_SESSION['dol_dst']) * 60 * 60; // Will not be used anymore
@@ -2400,7 +2400,7 @@ 
 
     // Do we have to reduce the length of date (year on 2 chars) to save space.
     // Note: dayinputnoreduce is same than day but no reduction of year length will be done
-    $reduceformat = (!empty($conf->dol_optimize_smallscreen) && in_array($format, array('day', 'dayhour', 'dayhoursec'))) ? 1 : 0;  // Test on original $format param.
+    $reduceformat = (!empty($conf->dol_optimize_smallscreen) && in_array($format, array('day', 'dayhour', 'dayhoursec'))) ? 1 : 0; // Test on original $format param.
     $format = preg_replace('/inputnoreduce/', '', $format); // so format 'dayinputnoreduce' is processed like day
     $formatwithoutreduce = preg_replace('/reduceformat/', '', $format);
     if ($formatwithoutreduce != $format) {
@@ -2467,10 +2467,10 @@ 
 
     // Analyze date
     $reg = array();
-    if (preg_match('/^([0-9][0-9][0-9][0-9])([0-9][0-9])([0-9][0-9])([0-9][0-9])([0-9][0-9])([0-9][0-9])$/i', (string)$time, $reg)) {  // Deprecated. Ex: 1970-01-01, 1970-01-01 01:00:00, 19700101010000
+    if (preg_match('/^([0-9][0-9][0-9][0-9])([0-9][0-9])([0-9][0-9])([0-9][0-9])([0-9][0-9])([0-9][0-9])$/i', (string) $time, $reg)) {  // Deprecated. Ex: 1970-01-01, 1970-01-01 01:00:00, 19700101010000
         dol_print_error(null, "Functions.lib::dol_print_date function called with a bad value from page " . (empty($_SERVER["PHP_SELF"]) ? 'unknown' : $_SERVER["PHP_SELF"]));
         return '';
-    } elseif (preg_match('/^([0-9]+)-([0-9]+)-([0-9]+) ?([0-9]+)?:?([0-9]+)?:?([0-9]+)?/i', (string)$time, $reg)) {    // Still available to solve problems in extrafields of type date
+    } elseif (preg_match('/^([0-9]+)-([0-9]+)-([0-9]+) ?([0-9]+)?:?([0-9]+)?:?([0-9]+)?/i', (string) $time, $reg)) {    // Still available to solve problems in extrafields of type date
         // This part of code should not be used anymore.
         dol_syslog("Functions.lib::dol_print_date function called with a bad value from page " . (empty($_SERVER["PHP_SELF"]) ? 'unknown' : $_SERVER["PHP_SELF"]), LOG_WARNING);
         //if (function_exists('debug_print_backtrace')) debug_print_backtrace();
@@ -2487,7 +2487,7 @@ 
         if ($to_gmt) {
             $tzo = new DateTimeZone('UTC'); // when to_gmt is true, base for offsettz and offsetdst (so timetouse) is UTC
         } else {
-            $tzo = new DateTimeZone(date_default_timezone_get());   // when to_gmt is false, base for offsettz and offsetdst (so timetouse) is PHP server
+            $tzo = new DateTimeZone(date_default_timezone_get()); // when to_gmt is false, base for offsettz and offsetdst (so timetouse) is PHP server
         }
         $dtts = new DateTime();
         $dtts->setTimestamp($time);
@@ -2511,7 +2511,7 @@ 
             if ($to_gmt) {
                 $tzo = new DateTimeZone('UTC'); // when to_gmt is true, base for offsettz and offsetdst (so timetouse) is UTC
             } else {
-                $tzo = new DateTimeZone(date_default_timezone_get());   // when to_gmt is false, base for offsettz and offsetdst (so timetouse) is PHP server
+                $tzo = new DateTimeZone(date_default_timezone_get()); // when to_gmt is false, base for offsettz and offsetdst (so timetouse) is PHP server
             }
             $dtts = new DateTime();
             $dtts->setTimestamp($timetouse);
@@ -2539,12 +2539,12 @@ 
         if ($to_gmt) {
             $tzo = new DateTimeZone('UTC'); // when to_gmt is true, base for offsettz and offsetdst (so timetouse) is UTC
         } else {
-            $tzo = new DateTimeZone(date_default_timezone_get());   // when to_gmt is false, base for offsettz and offsetdst (so timetouse) is PHP server
+            $tzo = new DateTimeZone(date_default_timezone_get()); // when to_gmt is false, base for offsettz and offsetdst (so timetouse) is PHP server
         }
         $dtts = new DateTime();
         $dtts->setTimestamp($timetouse);
         $dtts->setTimezone($tzo);
-        $month = (int)$dtts->format("m");
+        $month = (int) $dtts->format("m");
         $month = sprintf("%02d", $month); // $month may be return with format '06' on some installation and '6' on other, so we force it to '06'.
         if ($encodetooutput) {
             $monthtext = $outputlangs->transnoentities('Month' . $month);
@@ -2615,14 +2615,14 @@ 
         $datetimeobj->setTimezone(new DateTimeZone($forcetimezone == 'gmt' ? 'UTC' : $forcetimezone)); //  (add timezone relative to the date entered)
     }
     $arrayinfo = array(
-        'year' => ((int)date_format($datetimeobj, 'Y')),
-        'mon' => ((int)date_format($datetimeobj, 'm')),
-        'mday' => ((int)date_format($datetimeobj, 'd')),
-        'wday' => ((int)date_format($datetimeobj, 'w')),
-        'yday' => ((int)date_format($datetimeobj, 'z')),
-        'hours' => ((int)date_format($datetimeobj, 'H')),
-        'minutes' => ((int)date_format($datetimeobj, 'i')),
-        'seconds' => ((int)date_format($datetimeobj, 's')),
+        'year' => ((int) date_format($datetimeobj, 'Y')),
+        'mon' => ((int) date_format($datetimeobj, 'm')),
+        'mday' => ((int) date_format($datetimeobj, 'd')),
+        'wday' => ((int) date_format($datetimeobj, 'w')),
+        'yday' => ((int) date_format($datetimeobj, 'z')),
+        'hours' => ((int) date_format($datetimeobj, 'H')),
+        'minutes' => ((int) date_format($datetimeobj, 'i')),
+        'seconds' => ((int) date_format($datetimeobj, 's')),
         '0' => $timestamp
     );
 
@@ -2720,8 +2720,8 @@ 
     //var_dump($localtz);
     //var_dump($year.'-'.$month.'-'.$day.'-'.$hour.'-'.$minute);
     $dt = new DateTime('now', $localtz);
-    $dt->setDate((int)$year, (int)$month, (int)$day);
-    $dt->setTime((int)$hour, (int)$minute, (int)$second);
+    $dt->setDate((int) $year, (int) $month, (int) $day);
+    $dt->setTime((int) $hour, (int) $minute, (int) $second);
     $date = $dt->getTimestamp(); // should include daylight saving time
     //var_dump($date);
     return $date;
@@ -2751,7 +2751,7 @@ 
     } elseif ($mode == 'tzserver') {        // Time for now with PHP server timezone added
         require_once constant('DOL_DOCUMENT_ROOT') . '/core/lib/date.lib.php';
         $tzsecond = getServerTimeZoneInt('now'); // Contains tz+dayling saving time
-        $ret = (int)(dol_now('gmt') + ($tzsecond * 3600));
+        $ret = (int) (dol_now('gmt') + ($tzsecond * 3600));
         //} elseif ($mode == 'tzref') {// Time for now with parent company timezone is added
         //  require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
         //  $tzsecond=getParentCompanyTimeZoneInt();    // Contains tz+dayling saving time
@@ -2762,7 +2762,7 @@ 
         //print 'time: '.time();
         $offsettz = (empty($_SESSION['dol_tz']) ? 0 : $_SESSION['dol_tz']) * 60 * 60;
         $offsetdst = (empty($_SESSION['dol_dst']) ? 0 : $_SESSION['dol_dst']) * 60 * 60;
-        $ret = (int)(dol_now('gmt') + ($offsettz + $offsetdst));
+        $ret = (int) (dol_now('gmt') + ($offsettz + $offsetdst));
     }
 
     return $ret;
@@ -2937,9 +2937,9 @@ 
     if (empty($_SERVER['HTTP_X_FORWARDED_FOR']) || preg_match('/[^0-9.:,\[\]]/', $_SERVER['HTTP_X_FORWARDED_FOR'])) {
         if (empty($_SERVER['HTTP_CLIENT_IP']) || preg_match('/[^0-9.:,\[\]]/', $_SERVER['HTTP_CLIENT_IP'])) {
             if (empty($_SERVER["HTTP_CF_CONNECTING_IP"])) {
-                $ip = (empty($_SERVER['REMOTE_ADDR']) ? '' : $_SERVER['REMOTE_ADDR']);  // value may have been the IP of the proxy and not the client
+                $ip = (empty($_SERVER['REMOTE_ADDR']) ? '' : $_SERVER['REMOTE_ADDR']); // value may have been the IP of the proxy and not the client
             } else {
-                $ip = $_SERVER["HTTP_CF_CONNECTING_IP"];    // value here may have been forged by client
+                $ip = $_SERVER["HTTP_CF_CONNECTING_IP"]; // value here may have been forged by client
             }
         } else {
             $ip = $_SERVER['HTTP_CLIENT_IP']; // value is clean here but may have been forged by proxy
@@ -3139,7 +3139,7 @@ 
             if (count($mxhosts) > 1) {
                 return 1;
             }
-            if (count($mxhosts) == 1 && !in_array((string)$mxhosts[0], array('', '.'))) {
+            if (count($mxhosts) == 1 && !in_array((string) $mxhosts[0], array('', '.'))) {
                 return 1;
             }
 
@@ -4165,7 +4165,7 @@ 
     }
     // Si on depasse max
     $max_nbdecimal = getDolGlobalString('MAIN_MAX_DECIMALS_SHOWN');
-    if ($trunc && $nbdecimal > (int)$max_nbdecimal) {
+    if ($trunc && $nbdecimal > (int) $max_nbdecimal) {
         $nbdecimal = $max_nbdecimal;
         if (preg_match('/\.\.\./i', $nbdecimal)) {
             // Si un affichage est tronque, on montre des ...
@@ -4174,7 +4174,7 @@ 
     }
 
     // If force rounding
-    if ((string)$forcerounding != '-1') {
+    if ((string) $forcerounding != '-1') {
         if ($forcerounding === 'MU') {
             $nbdecimal = getDolGlobalString('MAIN_MAX_DECIMALS_UNIT');
         } elseif ($forcerounding === 'MT') {
@@ -4185,7 +4185,7 @@ 
     }
 
     // Format number
-    $output = number_format((float)$amount, $nbdecimal, $dec, $thousand);
+    $output = number_format((float) $amount, $nbdecimal, $dec, $thousand);
     if ($form) {
         $output = preg_replace('/\s/', '&nbsp;', $output);
         $output = preg_replace('/\'/', '&#039;', $output);
@@ -4274,7 +4274,7 @@ 
             $amount = preg_replace('/[a-zA-Z\/\\\*\(\)\<\>\_]/', '', $amount);
         }
 
-        if ($option == 2 && $thousand == '.' && preg_match('/\.(\d\d\d)$/', (string)$amount)) {    // It means the . is used as a thousand separator and string come from input data, so 1.123 is 1123
+        if ($option == 2 && $thousand == '.' && preg_match('/\.(\d\d\d)$/', (string) $amount)) {    // It means the . is used as a thousand separator and string come from input data, so 1.123 is 1123
             $amount = str_replace($thousand, '', $amount);
         }
 
@@ -4299,7 +4299,7 @@ 
         $amount = str_replace($thousand, '', $amount); // Replace of thousand before replace of dec to avoid pb if thousand is .
         $amount = str_replace($dec, '.', $amount);
 
-        $amount = preg_replace('/[^0-9\-\.]/', '', $amount);    // Clean non numeric chars (so it clean some UTF8 spaces for example.
+        $amount = preg_replace('/[^0-9\-\.]/', '', $amount); // Clean non numeric chars (so it clean some UTF8 spaces for example.
     }
     //print ' XX'.$amount.' '.$rounding;
 
@@ -4315,14 +4315,14 @@ 
         } elseif ($rounding == 'CU') {
             $nbofdectoround = max(getDolGlobalString('MAIN_MAX_DECIMALS_UNIT'), 8); // TODO Use param of currency
         } elseif ($rounding == 'CT') {
-            $nbofdectoround = max(getDolGlobalString('MAIN_MAX_DECIMALS_TOT'), 8);      // TODO Use param of currency
+            $nbofdectoround = max(getDolGlobalString('MAIN_MAX_DECIMALS_TOT'), 8); // TODO Use param of currency
         } elseif (is_numeric($rounding)) {
-            $nbofdectoround = (int)$rounding;
+            $nbofdectoround = (int) $rounding;
         }
 
         //print " RR".$amount.' - '.$nbofdectoround.'<br>';
         if (dol_strlen($nbofdectoround)) {
-            $amount = round(is_string($amount) ? (float)$amount : $amount, $nbofdectoround); // $nbofdectoround can be 0.
+            $amount = round(is_string($amount) ? (float) $amount : $amount, $nbofdectoround); // $nbofdectoround can be 0.
         } else {
             return 'ErrorBadParameterProvidedToFunction';
         }
@@ -4349,7 +4349,7 @@ 
         $amount = str_replace($thousand, '', $amount); // Replace of thousand before replace of dec to avoid pb if thousand is .
         $amount = str_replace($dec, '.', $amount);
 
-        $amount = preg_replace('/[^0-9\-\.]/', '', $amount);    // Clean non numeric chars (so it clean some UTF8 spaces for example.
+        $amount = preg_replace('/[^0-9\-\.]/', '', $amount); // Clean non numeric chars (so it clean some UTF8 spaces for example.
     }
 
     return $amount;
@@ -4429,7 +4429,7 @@ 
 
     $vatratecleaned = $vatrate;
     $reg = array();
-    if (preg_match('/^(.*)\s*\((.*)\)$/', (string)$vatrate, $reg)) {     // If vat is "xx (yy)"
+    if (preg_match('/^(.*)\s*\((.*)\)$/', (string) $vatrate, $reg)) {     // If vat is "xx (yy)"
         $vatratecleaned = trim($reg[1]);
         $vatratecode = $reg[2];
     }
@@ -4442,7 +4442,7 @@ 
     // Some test to guess with no need to make database access
     if ($mysoc->country_code == 'ES') { // For spain localtaxes 1 and 2, tax is qualified if buyer use local tax
         if ($local == 1) {
-            if (!$mysoc->localtax1_assuj || (string)$vatratecleaned == "0") {
+            if (!$mysoc->localtax1_assuj || (string) $vatratecleaned == "0") {
                 return 0;
             }
             if ($thirdparty_seller->id == $mysoc->id) {
@@ -4518,7 +4518,7 @@ 
     $sql = "SELECT t.localtax1, t.localtax2, t.localtax1_type, t.localtax2_type";
     $sql .= " FROM " . MAIN_DB_PREFIX . "c_tva as t, " . MAIN_DB_PREFIX . "c_country as c";
     $sql .= " WHERE t.fk_pays = c.rowid AND c.code = '" . $db->escape($thirdparty_seller->country_code) . "'";
-    $sql .= " AND t.taux = " . ((float)$vatratecleaned) . " AND t.active = 1";
+    $sql .= " AND t.taux = " . ((float) $vatratecleaned) . " AND t.active = 1";
     $sql .= " AND t.entity IN (" . getEntity('c_tva') . ")";
     if (!empty($vatratecode)) {
         $sql .= " AND t.code ='" . $db->escape($vatratecode) . "'"; // If we have the code, we use it in priority
@@ -4618,7 +4618,7 @@ 
     $sql .= " t.localtax1, t.localtax1_type, t.localtax2, t.localtax2_type";
     $sql .= " FROM " . MAIN_DB_PREFIX . "c_tva as t";
     if ($firstparamisid) {
-        $sql .= " WHERE t.rowid = " . (int)$vatrate;
+        $sql .= " WHERE t.rowid = " . (int) $vatrate;
     } else {
         $vatratecleaned = $vatrate;
         $vatratecode = '';
@@ -4632,7 +4632,7 @@ 
         /*if ($mysoc->country_code == 'ES') $sql.= " WHERE t.fk_pays = c.rowid AND c.code = '".$db->escape($buyer->country_code)."'";    // vat in spain use the buyer country ??
         else $sql.= " WHERE t.fk_pays = c.rowid AND c.code = '".$db->escape($seller->country_code)."'";*/
         $sql .= " WHERE t.fk_pays = c.rowid AND c.code = '" . $db->escape($seller->country_code) . "'";
-        $sql .= " AND t.taux = " . ((float)$vatratecleaned) . " AND t.active = 1";
+        $sql .= " AND t.taux = " . ((float) $vatratecleaned) . " AND t.active = 1";
         $sql .= " AND t.entity IN (" . getEntity('c_tva') . ")";
         if ($vatratecode) {
             $sql .= " AND t.code = '" . $db->escape($vatratecode) . "'";
@@ -4691,7 +4691,7 @@ 
     $sql = "SELECT t.taux as rate, t.code, t.localtax1, t.localtax1_type, t.localtax2, t.localtax2_type, t.accountancy_code_sell, t.accountancy_code_buy";
     $sql .= " FROM " . MAIN_DB_PREFIX . "c_tva as t";
     if ($firstparamisid) {
-        $sql .= " WHERE t.rowid = " . (int)$vatrate;
+        $sql .= " WHERE t.rowid = " . (int) $vatrate;
     } else {
         $vatratecleaned = $vatrate;
         $vatratecode = '';
@@ -4709,7 +4709,7 @@ 
             $countrycodetouse = ((empty($seller) || empty($seller->country_code)) ? $mysoc->country_code : $seller->country_code);
             $sql .= " WHERE t.fk_pays = c.rowid AND c.code = '" . $db->escape($countrycodetouse) . "'";
         }
-        $sql .= " AND t.taux = " . ((float)$vatratecleaned) . " AND t.active = 1";
+        $sql .= " AND t.taux = " . ((float) $vatratecleaned) . " AND t.active = 1";
         if ($vatratecode) {
             $sql .= " AND t.code = '" . $db->escape($vatratecode) . "'";
         }
@@ -4775,7 +4775,7 @@ 
                 }
             }
             if (!$found) {
-                $ret = $product->tva_tx;    // Default sales vat of product
+                $ret = $product->tva_tx; // Default sales vat of product
                 if ($product->default_vat_code) {
                     $ret .= ' (' . $product->default_vat_code . ')';
                 }
@@ -4926,7 +4926,7 @@ 
     $buyer_country_code = $thirdparty_buyer->country_code;
     $buyer_in_cee = isInEEC($thirdparty_buyer);
 
-    dol_syslog("get_default_tva: seller use vat=" . $seller_use_vat . ", seller country=" . $seller_country_code . ", seller in cee=" . ((string)(int)$seller_in_cee) . ", buyer vat number=" . $thirdparty_buyer->tva_intra . " buyer country=" . $buyer_country_code . ", buyer in cee=" . ((string)(int)$buyer_in_cee) . ", idprod=" . $idprod . ", idprodfournprice=" . $idprodfournprice . ", SERVICE_ARE_ECOMMERCE_200238EC=" . (getDolGlobalString('SERVICES_ARE_ECOMMERCE_200238EC') ? $conf->global->SERVICES_ARE_ECOMMERCE_200238EC : ''));
+    dol_syslog("get_default_tva: seller use vat=" . $seller_use_vat . ", seller country=" . $seller_country_code . ", seller in cee=" . ((string) (int) $seller_in_cee) . ", buyer vat number=" . $thirdparty_buyer->tva_intra . " buyer country=" . $buyer_country_code . ", buyer in cee=" . ((string) (int) $buyer_in_cee) . ", idprod=" . $idprod . ", idprodfournprice=" . $idprodfournprice . ", SERVICE_ARE_ECOMMERCE_200238EC=" . (getDolGlobalString('SERVICES_ARE_ECOMMERCE_200238EC') ? $conf->global->SERVICES_ARE_ECOMMERCE_200238EC : ''));
 
     // If services are eServices according to EU Council Directive 2002/38/EC (http://ec.europa.eu/taxation_customs/taxation/vat/traders/e-commerce/article_1610_en.htm)
     // we use the buyer VAT.
@@ -5167,7 +5167,7 @@ 
         // In a future, we may distribute directories on several levels depending on setup and object.
         // Here, $object->id, $object->ref and $modulepart are required.
         //var_dump($modulepart);
-        $path = dol_sanitizeFileName(empty($object->ref) ? (string)((is_object($object) && property_exists($object, 'id')) ? $object->id : '') : $object->ref);
+        $path = dol_sanitizeFileName(empty($object->ref) ? (string) ((is_object($object) && property_exists($object, 'id')) ? $object->id : '') : $object->ref);
     }
 
     if (empty($withoutslash) && !empty($path)) {
@@ -5227,7 +5227,7 @@ 
                 dol_syslog("functions.lib::dol_mkdir: Directory '" . $ccdir . "' does not exists or is outside open_basedir PHP setting.", LOG_DEBUG);
 
                 umask(0);
-                $dirmaskdec = octdec((string)$newmask);
+                $dirmaskdec = octdec((string) $newmask);
                 if (empty($newmask)) {
                     $dirmaskdec = !getDolGlobalString('MAIN_UMASK') ? octdec('0755') : octdec($conf->global->MAIN_UMASK);
                 }
@@ -5446,7 +5446,7 @@ 
     }
     $a = preg_split($pattern, $text, -1, PREG_SPLIT_DELIM_CAPTURE | PREG_SPLIT_NO_EMPTY);
 
-    $nblines = (int)floor((count($a) + 1) / 2);
+    $nblines = (int) floor((count($a) + 1) / 2);
     // count possible auto line breaks
     if ($maxlinesize) {
         foreach ($a as $line) {
@@ -5582,26 +5582,26 @@ 
         $emailsendersignature = $user->signature; //  dy default, we use the signature of current user. We must complete substitution with signature in c_email_senderprofile of array after calling getCommonSubstitutionArray()
         $usersignature = $user->signature;
         $substitutionarray = array_merge($substitutionarray, array(
-            '__SENDEREMAIL_SIGNATURE__' => (string)((!getDolGlobalString('MAIN_MAIL_DO_NOT_USE_SIGN')) ? ($onlykey == 2 ? dol_trunc('SignatureFromTheSelectedSenderProfile', 30) : $emailsendersignature) : ''),
-            '__USER_SIGNATURE__' => (string)(($usersignature && !getDolGlobalString('MAIN_MAIL_DO_NOT_USE_SIGN')) ? ($onlykey == 2 ? dol_trunc(dol_string_nohtmltag($usersignature), 30) : $usersignature) : '')
+            '__SENDEREMAIL_SIGNATURE__' => (string) ((!getDolGlobalString('MAIN_MAIL_DO_NOT_USE_SIGN')) ? ($onlykey == 2 ? dol_trunc('SignatureFromTheSelectedSenderProfile', 30) : $emailsendersignature) : ''),
+            '__USER_SIGNATURE__' => (string) (($usersignature && !getDolGlobalString('MAIN_MAIL_DO_NOT_USE_SIGN')) ? ($onlykey == 2 ? dol_trunc(dol_string_nohtmltag($usersignature), 30) : $usersignature) : '')
         ));
 
         if (is_object($user) && ($user instanceof User)) {
             $substitutionarray = array_merge($substitutionarray, array(
-                '__USER_ID__' => (string)$user->id,
-                '__USER_LOGIN__' => (string)$user->login,
-                '__USER_EMAIL__' => (string)$user->email,
-                '__USER_PHONE__' => (string)dol_print_phone($user->office_phone, '', 0, 0, '', " ", '', '', -1),
-                '__USER_PHONEPRO__' => (string)dol_print_phone($user->user_mobile, '', 0, 0, '', " ", '', '', -1),
-                '__USER_PHONEMOBILE__' => (string)dol_print_phone($user->personal_mobile, '', 0, 0, '', " ", '', '', -1),
-                '__USER_FAX__' => (string)$user->office_fax,
-                '__USER_LASTNAME__' => (string)$user->lastname,
-                '__USER_FIRSTNAME__' => (string)$user->firstname,
-                '__USER_FULLNAME__' => (string)$user->getFullName($outputlangs),
-                '__USER_SUPERVISOR_ID__' => (string)($user->fk_user ? $user->fk_user : '0'),
-                '__USER_JOB__' => (string)$user->job,
-                '__USER_REMOTE_IP__' => (string)getUserRemoteIP(),
-                '__USER_VCARD_URL__' => (string)$user->getOnlineVirtualCardUrl('', 'external')
+                '__USER_ID__' => (string) $user->id,
+                '__USER_LOGIN__' => (string) $user->login,
+                '__USER_EMAIL__' => (string) $user->email,
+                '__USER_PHONE__' => (string) dol_print_phone($user->office_phone, '', 0, 0, '', " ", '', '', -1),
+                '__USER_PHONEPRO__' => (string) dol_print_phone($user->user_mobile, '', 0, 0, '', " ", '', '', -1),
+                '__USER_PHONEMOBILE__' => (string) dol_print_phone($user->personal_mobile, '', 0, 0, '', " ", '', '', -1),
+                '__USER_FAX__' => (string) $user->office_fax,
+                '__USER_LASTNAME__' => (string) $user->lastname,
+                '__USER_FIRSTNAME__' => (string) $user->firstname,
+                '__USER_FULLNAME__' => (string) $user->getFullName($outputlangs),
+                '__USER_SUPERVISOR_ID__' => (string) ($user->fk_user ? $user->fk_user : '0'),
+                '__USER_JOB__' => (string) $user->job,
+                '__USER_REMOTE_IP__' => (string) getUserRemoteIP(),
+                '__USER_VCARD_URL__' => (string) $user->getOnlineVirtualCardUrl('', 'external')
             ));
         }
     }
@@ -5622,7 +5622,7 @@ 
             '__MYCOMPANY_PROFID9__' => $mysoc->idprof9,
             '__MYCOMPANY_PROFID10__' => $mysoc->idprof10,
             '__MYCOMPANY_CAPITAL__' => $mysoc->capital,
-            '__MYCOMPANY_FULLADDRESS__' => (method_exists($mysoc, 'getFullAddress') ? $mysoc->getFullAddress(1, ', ') : ''),    // $mysoc may be stdClass
+            '__MYCOMPANY_FULLADDRESS__' => (method_exists($mysoc, 'getFullAddress') ? $mysoc->getFullAddress(1, ', ') : ''), // $mysoc may be stdClass
             '__MYCOMPANY_ADDRESS__' => $mysoc->address,
             '__MYCOMPANY_ZIP__' => $mysoc->zip,
             '__MYCOMPANY_TOWN__' => $mysoc->town,
@@ -5994,7 +5994,7 @@ 
                                 $substitutionarray['__EXTRAFIELD_' . strtoupper($key) . '__'] = dol_print_phone($object->array_options['options_' . $key]);
                             } elseif ($extrafields->attributes[$object->table_element]['type'][$key] == 'price') {
                                 $substitutionarray['__EXTRAFIELD_' . strtoupper($key) . '__'] = $object->array_options['options_' . $key];
-                                $substitutionarray['__EXTRAFIELD_' . strtoupper($key) . '_FORMATED__'] = price($object->array_options['options_' . $key]);    // For compatibility
+                                $substitutionarray['__EXTRAFIELD_' . strtoupper($key) . '_FORMATED__'] = price($object->array_options['options_' . $key]); // For compatibility
                                 $substitutionarray['__EXTRAFIELD_' . strtoupper($key) . '_FORMATTED__'] = price($object->array_options['options_' . $key]);
                             } elseif ($extrafields->attributes[$object->table_element]['type'][$key] != 'separator') {
                                 $substitutionarray['__EXTRAFIELD_' . strtoupper($key) . '__'] = !empty($object->array_options['options_' . $key]) ? $object->array_options['options_' . $key] : '';
@@ -6209,26 +6209,26 @@ 
         $daytext = $outputlangs->trans('Day' . $tmp['wday']);
 
         $substitutionarray = array_merge($substitutionarray, array(
-            '__NOW_TMS__' => (string)$now,     // Must be the string that represent the int
+            '__NOW_TMS__' => (string) $now, // Must be the string that represent the int
             '__NOW_TMS_YMD__' => dol_print_date($now, 'day', 'auto', $outputlangs),
-            '__DAY__' => (string)$tmp['mday'],
+            '__DAY__' => (string) $tmp['mday'],
             '__DAY_TEXT__' => $daytext, // Monday
             '__DAY_TEXT_SHORT__' => dol_trunc($daytext, 3, 'right', 'UTF-8', 1), // Mon
             '__DAY_TEXT_MIN__' => dol_trunc($daytext, 1, 'right', 'UTF-8', 1), // M
-            '__MONTH__' => (string)$tmp['mon'],
+            '__MONTH__' => (string) $tmp['mon'],
             '__MONTH_TEXT__' => $outputlangs->trans('Month' . sprintf("%02d", $tmp['mon'])),
             '__MONTH_TEXT_SHORT__' => $outputlangs->trans('MonthShort' . sprintf("%02d", $tmp['mon'])),
             '__MONTH_TEXT_MIN__' => $outputlangs->trans('MonthVeryShort' . sprintf("%02d", $tmp['mon'])),
-            '__YEAR__' => (string)$tmp['year'],
-            '__PREVIOUS_DAY__' => (string)$tmp2['day'],
-            '__PREVIOUS_MONTH__' => (string)$tmp3['month'],
-            '__PREVIOUS_YEAR__' => (string)($tmp['year'] - 1),
-            '__NEXT_DAY__' => (string)$tmp4['day'],
-            '__NEXT_MONTH__' => (string)$tmp5['month'],
+            '__YEAR__' => (string) $tmp['year'],
+            '__PREVIOUS_DAY__' => (string) $tmp2['day'],
+            '__PREVIOUS_MONTH__' => (string) $tmp3['month'],
+            '__PREVIOUS_YEAR__' => (string) ($tmp['year'] - 1),
+            '__NEXT_DAY__' => (string) $tmp4['day'],
+            '__NEXT_MONTH__' => (string) $tmp5['month'],
             '__NEXT_MONTH_TEXT__' => $outputlangs->trans('Month' . sprintf("%02d", $tmp5['month'])),
             '__NEXT_MONTH_TEXT_SHORT__' => $outputlangs->trans('MonthShort' . sprintf("%02d", $tmp5['month'])),
             '__NEXT_MONTH_TEXT_MIN__' => $outputlangs->trans('MonthVeryShort' . sprintf("%02d", $tmp5['month'])),
-            '__NEXT_YEAR__' => (string)($tmp['year'] + 1),
+            '__NEXT_YEAR__' => (string) ($tmp['year'] + 1),
         ));
     }
 
@@ -6396,7 +6396,7 @@ 
                         $path = $param_arr[0];
                         $class = $param_arr[1];
                         $method = $param_arr[2];
-                        $id = (int)$param_arr[3];
+                        $id = (int) $param_arr[3];
 
                         // load class file and init object list in memory
                         if (!isset($memory_object_list[$class])) {
@@ -6458,7 +6458,7 @@ 
     // Note: substitution key for each extrafields, using key __EXTRA_XXX__ is already available into the getCommonSubstitutionArray used to build the substitution array.
 
     // Check if there is external substitution to do, requested by plugins
-    $dirsubstitutions = array_merge(array(), (array)$conf->modules_parts['substitutions']);
+    $dirsubstitutions = array_merge(array(), (array) $conf->modules_parts['substitutions']);
 
     foreach ($dirsubstitutions as $reldir) {
         $dir = dol_buildpath($reldir, 0);
@@ -6601,7 +6601,7 @@ 
 {
     //dol_syslog(__FUNCTION__ . " is deprecated", LOG_WARNING);     This is not deprecated, it is used by setEventMessages function
     if (!is_array($mesgs)) {
-        $mesgs = trim((string)$mesgs);
+        $mesgs = trim((string) $mesgs);
         // If mesgs is a not an empty string
         if ($mesgs) {
             if (!empty($noduplicate) && isset($_SESSION['dol_events'][$style]) && in_array($mesgs, $_SESSION['dol_events'][$style])) {
@@ -6612,7 +6612,7 @@ 
     } else {
         // If mesgs is an array
         foreach ($mesgs as $mesg) {
-            $mesg = trim((string)$mesg);
+            $mesg = trim((string) $mesg);
             if ($mesg) {
                 if (!empty($noduplicate) && isset($_SESSION['dol_events'][$style]) && in_array($mesg, $_SESSION['dol_events'][$style])) {
                     return;
@@ -6646,7 +6646,7 @@ 
             $mesg .= '';
         }
         if (empty($messagekey) || empty($_COOKIE["DOLHIDEMESSAGE" . $messagekey])) {
-            if (!in_array((string)$style, array('mesgs', 'warnings', 'errors'))) {
+            if (!in_array((string) $style, array('mesgs', 'warnings', 'errors'))) {
                 dol_print_error(null, 'Bad parameter style=' . $style . ' for setEventMessages');
             }
             if (empty($mesgs)) {
@@ -6691,7 +6691,7 @@ 
                     $temp[$key] = empty($array[$key][$index]) ? 0 : $array[$key][$index];
                 }
                 if ($natsort == -1) {
-                    $temp[$key] = '___' . $temp[$key];        // We add a string at begin of value to force an alpha order when using asort.
+                    $temp[$key] = '___' . $temp[$key]; // We add a string at begin of value to force an alpha order when using asort.
                 }
             }
 
@@ -6734,7 +6734,7 @@ 
  */
 function utf8_check($str)
 {
-    $str = (string)$str;   // Sometimes string is an int.
+    $str = (string) $str; // Sometimes string is an int.
 
     // We must use here a binary strlen function (so not dol_strlen)
     $strLength = strlen($str);
@@ -6929,7 +6929,7 @@ 
     if (isset($strToEvaluate) && $strToEvaluate !== '') {
         //var_dump($strToEvaluate);
         //$rep = dol_eval($strToEvaluate, 1, 0, '1'); // to show the error
-        $rep = (int)dol_eval($strToEvaluate, 1, 1, $onlysimplestring); // The dol_eval() must contains all the "global $xxx;" for all variables $xxx found into the string condition
+        $rep = (int) dol_eval($strToEvaluate, 1, 1, $onlysimplestring); // The dol_eval() must contains all the "global $xxx;" for all variables $xxx found into the string condition
         $rights = $rep && (!is_string($rep) || strpos($rep, 'Bad string syntax to evaluate') === false);
         //var_dump($rights);
     }
@@ -6953,17 +6953,17 @@ 
 function dol_eval($s, $returnvalue = 1, $hideerrors = 1, $onlysimplestring = '1')
 {
     // Only this global variables can be read by eval function and returned to caller
-    global $conf;   // Read of const is done with getDolGlobalString() but we need $conf->currency for example
+    global $conf; // Read of const is done with getDolGlobalString() but we need $conf->currency for example
     global $db, $langs, $user, $website, $websitepage;
     global $action, $mainmenu, $leftmenu;
     global $mysoc;
-    global $objectoffield;  // To allow the use of $objectoffield in computed fields
+    global $objectoffield; // To allow the use of $objectoffield in computed fields
 
     // Old variables used
     global $object;
     global $obj; // To get $obj used into list when dol_eval() is used for computed fields and $obj is not yet $object
 
-    $isObBufferActive = false;  // When true, the ObBuffer must be cleaned in the exception handler
+    $isObBufferActive = false; // When true, the ObBuffer must be cleaned in the exception handler
     if (!in_array($onlysimplestring, array('0', '1', '2'))) {
         return "Bad call of dol_eval. Parameter onlysimplestring must be '0' (deprecated), '1' or '2'";
     }
@@ -6994,11 +6994,11 @@ 
             while ($scheck && $savescheck != $scheck) {
                 $savescheck = $scheck;
                 $scheck = preg_replace('/->[a-zA-Z0-9_]+\(/', '->__METHOD__', $scheck); // accept parenthesis in '...->method(...'
-                $scheck = preg_replace('/^\(/', '__PARENTHESIS__ ', $scheck);   // accept parenthesis in '(...'. Must replace with __PARENTHESIS__ with a space after to allow following substitutions
-                $scheck = preg_replace('/\s\(/', '__PARENTHESIS__ ', $scheck);  // accept parenthesis in '... ('. Must replace with __PARENTHESIS__ with a space after to allow following substitutions
+                $scheck = preg_replace('/^\(/', '__PARENTHESIS__ ', $scheck); // accept parenthesis in '(...'. Must replace with __PARENTHESIS__ with a space after to allow following substitutions
+                $scheck = preg_replace('/\s\(/', '__PARENTHESIS__ ', $scheck); // accept parenthesis in '... ('. Must replace with __PARENTHESIS__ with a space after to allow following substitutions
                 $scheck = preg_replace('/^!?[a-zA-Z0-9_]+\(/', '__FUNCTION__', $scheck); // accept parenthesis in 'function(' and '!function('
                 $scheck = preg_replace('/\s!?[a-zA-Z0-9_]+\(/', '__FUNCTION__', $scheck); // accept parenthesis in '... function(' and '... !function('
-                $scheck = preg_replace('/(\^|\')\(/', '__REGEXSTART__', $scheck);   // To allow preg_match('/^(aaa|bbb)/'...  or  isStringVarMatching('leftmenu', '(aaa|bbb)')
+                $scheck = preg_replace('/(\^|\')\(/', '__REGEXSTART__', $scheck); // To allow preg_match('/^(aaa|bbb)/'...  or  isStringVarMatching('leftmenu', '(aaa|bbb)')
             }
             //print 'scheck='.$scheck." : ".strpos($scheck, '(')."<br>\n";
             if (strpos($scheck, '(') !== false) {
@@ -7055,7 +7055,7 @@ 
         $forbiddenphpfunctions = array_merge($forbiddenphpfunctions, array("eval", "create_function", "assert", "mb_ereg_replace")); // function with eval capabilities
         $forbiddenphpfunctions = array_merge($forbiddenphpfunctions, array("dol_compress_dir", "dol_decode", "dol_delete_file", "dol_delete_dir", "dol_delete_dir_recursive", "dol_copy", "archiveOrBackupFile")); // more dolibarr functions
 
-        $forbiddenphpmethods = array('invoke', 'invokeArgs');   // Method of ReflectionFunction to execute a function
+        $forbiddenphpmethods = array('invoke', 'invokeArgs'); // Method of ReflectionFunction to execute a function
 
         $forbiddenphpregex = 'global\s+\$|\b(' . implode('|', $forbiddenphpfunctions) . ')\b';
 
@@ -7273,8 +7273,8 @@ 
         'en-GB',
         'en-IE',
         'en-IN',
-        'as-IN',    // as-IN must be after en-IN (en in priority if country is IN)
-        'bn-IN',    // bn-IN must be after en-IN (en in priority if country is IN)
+        'as-IN', // as-IN must be after en-IN (en in priority if country is IN)
+        'bn-IN', // bn-IN must be after en-IN (en in priority if country is IN)
         'en-JM',
         'en-MY',
         'en-NZ',
@@ -7476,7 +7476,7 @@ 
     if (!function_exists('getmypid')) {
         return mt_rand(99900000, 99965535);
     } else {
-        return getmypid();  // May be a number on 64 bits (depending on OS)
+        return getmypid(); // May be a number on 64 bits (depending on OS)
     }
 }
 
@@ -7523,15 +7523,15 @@ 
         $fields = array($fields);
     }
 
-    $i1 = 0;    // count the nb of and criteria added (all fields / criteria)
+    $i1 = 0; // count the nb of and criteria added (all fields / criteria)
     foreach ($crits as $crit) {     // Loop on each AND criteria
         $crit = trim($crit);
-        $i2 = 0;    // count the nb of valid criteria added for this this first criteria
+        $i2 = 0; // count the nb of valid criteria added for this this first criteria
         $newres = '';
         foreach ($fields as $field) {
             if ($mode == 1) {
                 $tmpcrits = explode('|', $crit);
-                $i3 = 0;    // count the nb of valid criteria added for this current field
+                $i3 = 0; // count the nb of valid criteria added for this current field
                 foreach ($tmpcrits as $tmpcrit) {
                     if ($tmpcrit !== '0' && empty($tmpcrit)) {
                         continue;
@@ -7551,7 +7551,7 @@ 
                     if ($newcrit != '') {
                         $numnewcrit = price2num($newcrit);
                         if (is_numeric($numnewcrit)) {
-                            $newres .= $field . ' ' . $operator . ' ' . ((float)$numnewcrit); // should be a numeric
+                            $newres .= $field . ' ' . $operator . ' ' . ((float) $numnewcrit); // should be a numeric
                         } else {
                             $newres .= '1 = 2'; // force false, we received a corrupted data
                         }
@@ -7602,7 +7602,7 @@ 
                 }
             } else { // $mode=0
                 $tmpcrits = explode('|', $crit);
-                $i3 = 0;    // count the nb of valid criteria added for the current couple criteria/field
+                $i3 = 0; // count the nb of valid criteria added for the current couple criteria/field
                 foreach ($tmpcrits as $tmpcrit) {   // loop on each OR criteria
                     if ($tmpcrit !== '0' && empty($tmpcrit)) {
                         continue;
@@ -7616,7 +7616,7 @@ 
                     }
 
                     if (preg_match('/\.(id|rowid)$/', $field)) {    // Special case for rowid that is sometimes a ref so used as a search field
-                        $newres .= $field . " = " . (is_numeric($tmpcrit) ? ((float)$tmpcrit) : '0');
+                        $newres .= $field . " = " . (is_numeric($tmpcrit) ? ((float) $tmpcrit) : '0');
                     } else {
                         $tmpcrit2 = $tmpcrit;
                         $tmpbefore = '%';
@@ -8121,7 +8121,7 @@ 
     }
 
     // Return mimetype string
-    switch ((int)$mode) {
+    switch ((int) $mode) {
         case 1:
             $tmp = explode('/', $mime);
             return (!empty($tmp[1]) ? $tmp[1] : $tmp[0]);
@@ -8150,7 +8150,7 @@ 
 {
     global $conf, $db;
 
-    $tablename = preg_replace('/^' . preg_quote(MAIN_DB_PREFIX, '/') . '/', '', $tablename);    // Clean name of table for backward compatibility.
+    $tablename = preg_replace('/^' . preg_quote(MAIN_DB_PREFIX, '/') . '/', '', $tablename); // Clean name of table for backward compatibility.
 
     $dictvalues = (isset($conf->cache['dictvalues_' . $tablename]) ? $conf->cache['dictvalues_' . $tablename] : null);
 
@@ -8165,7 +8165,7 @@ 
         $resql = $db->query($sql);
         if ($resql) {
             while ($obj = $db->fetch_object($resql)) {
-                $dictvalues[$obj->$rowidfield] = $obj;  // $obj is stdClass
+                $dictvalues[$obj->$rowidfield] = $obj; // $obj is stdClass
             }
         } else {
             dol_print_error($db);
@@ -8269,7 +8269,7 @@ 
 function roundUpToNextMultiple($n, $x = 5)
 {
     $result = (ceil($n) % $x === 0) ? ceil($n) : (round(($n + $x / 2) / $x) * $x);
-    return (int)$result;
+    return (int) $result;
 }
 
 /**
@@ -8346,7 +8346,7 @@ 
                     return $objecttmp;
                 }
             } else {
-                return $objecttmp;  // returned an object without fetch
+                return $objecttmp; // returned an object without fetch
             }
         } else {
             return -1;

public/htdocs/core/lib/data.lib.php

Spacing +8 added lines, -8 removed lines

@@ -213,9 +213,9 @@ 
         if (strtoupper($tmpescaped) == 'NULL') {
             $tmpescaped = 'NULL';
         } elseif (is_int($tmpescaped)) {
-            $tmpescaped = (int)$tmpescaped;
+            $tmpescaped = (int) $tmpescaped;
         } else {
-            $tmpescaped = (float)$tmpescaped;
+            $tmpescaped = (float) $tmpescaped;
         }
     }
 
@@ -250,20 +250,20 @@ 
         $filter = '(' . $filter . ')';
     }
 
-    $regexstring = '\(([a-zA-Z0-9_.]+:[<>!=insotlke]+:[^()]+)\)';    // Must be  (aaa:bbb:...) with aaa is a field name (with alias or not) and bbb is one of this operator '=', '<', '>', '<=', '>=', '!=', 'in', 'notin', 'like', 'notlike', 'is', 'isnot'
+    $regexstring = '\(([a-zA-Z0-9_.]+:[<>!=insotlke]+:[^()]+)\)'; // Must be  (aaa:bbb:...) with aaa is a field name (with alias or not) and bbb is one of this operator '=', '<', '>', '<=', '>=', '!=', 'in', 'notin', 'like', 'notlike', 'is', 'isnot'
     $firstandlastparenthesis = 0;
 
     if (!dolCheckFilters($filter, $errorstr, $firstandlastparenthesis)) {
         if ($noerror) {
             return '1 = 2';
         } else {
-            return 'Filter syntax error - ' . $errorstr;      // Bad balance of parenthesis, we return an error message or force a SQL not found
+            return 'Filter syntax error - ' . $errorstr; // Bad balance of parenthesis, we return an error message or force a SQL not found
         }
     }
 
     // Test the filter syntax
     $t = preg_replace_callback('/' . $regexstring . '/i', 'dolForgeDummyCriteriaCallback', $filter);
-    $t = str_replace(array('and', 'or', 'AND', 'OR', ' '), '', $t);     // Remove the only strings allowed between each () criteria
+    $t = str_replace(array('and', 'or', 'AND', 'OR', ' '), '', $t); // Remove the only strings allowed between each () criteria
     // If the string result contains something else than '()', the syntax was wrong
 
     if (preg_match('/[^()]/', $t)) {
@@ -272,7 +272,7 @@ 
         if ($noerror) {
             return '1 = 2';
         } else {
-            return 'Filter error - ' . $tmperrorstr;      // Bad syntax of the search string, we return an error message or force a SQL not found
+            return 'Filter error - ' . $tmperrorstr; // Bad syntax of the search string, we return an error message or force a SQL not found
         }
     }
 
@@ -282,7 +282,7 @@ 
         $ret = str_replace('__NOW__', $db->idate(dol_now()), $ret);
     }
     if (is_object($user)) {
-        $ret = str_replace('__USER_ID__', (string)$user->id, $ret);
+        $ret = str_replace('__USER_ID__', (string) $user->id, $ret);
     }
 
     return $ret;
@@ -433,7 +433,7 @@ 
         return '';
     }
 
-    return '()';    // An empty criteria
+    return '()'; // An empty criteria
 }
 
 /**