alxarafe / alixar

Dolibarr/Lib/Security.php

Spacing +20 added lines, -20 removed lines

@@ -87,10 +87,10 @@ 
 function dolGetRandomBytes($length)
 {
     if (function_exists('random_bytes')) {    // Available with PHP 7 only.
-        return bin2hex(random_bytes((int)floor($length / 2)));    // the bin2hex will double the number of bytes so we take length / 2
+        return bin2hex(random_bytes((int) floor($length / 2))); // the bin2hex will double the number of bytes so we take length / 2
     }
 
-    return bin2hex(openssl_random_pseudo_bytes((int)floor($length / 2)));        // the bin2hex will double the number of bytes so we take length / 2. May be very slow on Windows.
+    return bin2hex(openssl_random_pseudo_bytes((int) floor($length / 2))); // the bin2hex will double the number of bytes so we take length / 2. May be very slow on Windows.
 }
 
 /**
@@ -201,7 +201,7 @@ 
             if (!empty($tmpexplode[1]) && is_string($tmpexplode[0])) {
                 $newchain = openssl_decrypt($tmpexplode[1], $ciphering, $key, 0, $tmpexplode[0]);
             } else {
-                $newchain = openssl_decrypt((string)$tmpexplode[0], $ciphering, $key, 0, '');
+                $newchain = openssl_decrypt((string) $tmpexplode[0], $ciphering, $key, 0, '');
             }
         } else {
             dol_syslog("Error dolDecrypt openssl_decrypt is not available", LOG_ERR);
@@ -308,7 +308,7 @@ 
         $type = 'md5';
     }
 
-    $salt = substr(sha1((string)time()), 0, 8);
+    $salt = substr(sha1((string) time()), 0, 8);
 
     if ($type === 'md5') {
         return '{MD5}' . base64_encode(hash("md5", $password, true)); //For OpenLdap with md5 (based on an unencrypted password in base)
@@ -335,7 +335,7 @@ 
     } elseif ($type === 'crypt') {
         return '{CRYPT}' . crypt($password, $salt);
     } elseif ($type === 'clear') {
-        return '{CLEAR}' . $password;  // Just for test, plain text password is not secured !
+        return '{CLEAR}' . $password; // Just for test, plain text password is not secured !
     }
     return "";
 }
@@ -380,13 +380,13 @@ 
     if (is_object($object)) {
         $objectid = $object->id;
     } else {
-        $objectid = $object;        // $objectid can be X or 'X,Y,Z'
+        $objectid = $object; // $objectid can be X or 'X,Y,Z'
     }
     if ($objectid == "-1") {
         $objectid = 0;
     }
     if ($objectid) {
-        $objectid = preg_replace('/[^0-9\.\,]/', '', (string)$objectid);    // For the case value is coming from a non sanitized user input
+        $objectid = preg_replace('/[^0-9\.\,]/', '', (string) $objectid); // For the case value is coming from a non sanitized user input
     }
 
     //dol_syslog("functions.lib:restrictedArea $feature, $objectid, $dbtablename, $feature2, $dbt_socfield, $dbt_select, $isdraft");
@@ -874,9 +874,9 @@ 
     if (is_object($object)) {
         $objectid = $object->id;
     } else {
-        $objectid = $object;        // $objectid can be X or 'X,Y,Z'
+        $objectid = $object; // $objectid can be X or 'X,Y,Z'
     }
-    $objectid = preg_replace('/[^0-9\.\,]/', '', $objectid);    // For the case value is coming from a non sanitized user input
+    $objectid = preg_replace('/[^0-9\.\,]/', '', $objectid); // For the case value is coming from a non sanitized user input
 
     //dol_syslog("functions.lib:restrictedArea $feature, $objectid, $dbtablename, $feature2, $dbt_socfield, $dbt_select, $isdraft");
     //print "user_id=".$user->id.", features=".join(',', $featuresarray).", objectid=".$objectid;
@@ -926,8 +926,8 @@ 
         $checkparentsoc = ['agenda', 'contact', 'contrat']; // Test on entity + link to third party on field $dbt_keyfield. Allowed if link is empty (Ex: contacts...).
         $checkproject = ['projet', 'project']; // Test for project object
         $checktask = ['projet_task']; // Test for task object
-        $checkhierarchy = ['expensereport', 'holiday'];    // check permission among the hierarchy of user
-        $checkuser = ['bookmark'];    // check permission among the fk_user (must be myself or null)
+        $checkhierarchy = ['expensereport', 'holiday']; // check permission among the hierarchy of user
+        $checkuser = ['bookmark']; // check permission among the fk_user (must be myself or null)
         $nocheck = ['barcode', 'stock']; // No test
 
         //$checkdefault = 'all other not already defined'; // Test on entity + link to third party on field $dbt_keyfield. Not allowed if link is empty (Ex: invoice, orders...).
@@ -940,7 +940,7 @@ 
 
         // To avoid an access forbidden with a numeric ref
         if ($dbt_select != 'rowid' && $dbt_select != 'id') {
-            $objectid = "'" . $objectid . "'";    // Note: $objectid was already cast into int at begin of this method.
+            $objectid = "'" . $objectid . "'"; // Note: $objectid was already cast into int at begin of this method.
         }
         // Check permission for objectid on entity only
         if (in_array($feature, $check) && $objectid > 0) {        // For $objectid = 0, no check
@@ -987,7 +987,7 @@ 
                 $sql .= " FROM (" . MAIN_DB_PREFIX . "societe_commerciaux as sc";
                 $sql .= ", " . MAIN_DB_PREFIX . "societe as s)";
                 $sql .= " WHERE sc.fk_soc IN (" . $db->sanitize($objectid, 1) . ")";
-                $sql .= " AND (sc.fk_user = " . ((int)$user->id);
+                $sql .= " AND (sc.fk_user = " . ((int) $user->id);
                 if (getDolGlobalInt('MAIN_SEE_SUBORDINATES')) {
                     $userschilds = $user->getAllChildIds();
                     $sql .= " OR sc.fk_user IN (" . $db->sanitize(implode(',', $userschilds)) . ")";
@@ -1011,12 +1011,12 @@ 
                 $sql = "SELECT COUNT(dbt." . $dbt_select . ") as nb";
                 $sql .= " FROM " . MAIN_DB_PREFIX . $dbtablename . " as dbt";
                 $sql .= " WHERE dbt." . $dbt_select . " IN (" . $db->sanitize($objectid, 1) . ")";
-                $sql .= " AND dbt.fk_soc = " . ((int)$user->socid);
+                $sql .= " AND dbt.fk_soc = " . ((int) $user->socid);
             } elseif (isModEnabled("societe") && ($user->hasRight('societe', 'lire') && !$user->hasRight('societe', 'client', 'voir'))) {
                 // If internal user: Check permission for internal users that are restricted on their objects
                 $sql = "SELECT COUNT(dbt." . $dbt_select . ") as nb";
                 $sql .= " FROM " . MAIN_DB_PREFIX . $dbtablename . " as dbt";
-                $sql .= " LEFT JOIN " . MAIN_DB_PREFIX . "societe_commerciaux as sc ON dbt.fk_soc = sc.fk_soc AND sc.fk_user = " . ((int)$user->id);
+                $sql .= " LEFT JOIN " . MAIN_DB_PREFIX . "societe_commerciaux as sc ON dbt.fk_soc = sc.fk_soc AND sc.fk_user = " . ((int) $user->id);
                 $sql .= " WHERE dbt." . $dbt_select . " IN (" . $db->sanitize($objectid, 1) . ")";
                 $sql .= " AND (dbt.fk_soc IS NULL OR sc.fk_soc IS NOT NULL)"; // Contact not linked to a company or to a company of user
                 $sql .= " AND dbt.entity IN (" . getEntity($sharedelement, 1) . ")";
@@ -1084,7 +1084,7 @@ 
                 $sql = "SELECT COUNT(dbt." . $dbt_keyfield . ") as nb";
                 $sql .= " FROM " . MAIN_DB_PREFIX . $dbtablename . " as dbt";
                 $sql .= " WHERE dbt.rowid IN (" . $db->sanitize($objectid, 1) . ")";
-                $sql .= " AND dbt." . $dbt_keyfield . " = " . ((int)$user->socid);
+                $sql .= " AND dbt." . $dbt_keyfield . " = " . ((int) $user->socid);
             } elseif (isModEnabled("societe") && !$user->hasRight('societe', 'client', 'voir')) {
                 // If internal user without permission to see all thirdparties: Check permission for internal users that are restricted on their objects
                 if ($feature != 'ticket') {
@@ -1097,11 +1097,11 @@ 
                     $sql .= " WHERE dbt." . $dbt_select . " IN (" . $db->sanitize($objectid, 1) . ")";
                     $sql .= " AND dbt.entity IN (" . getEntity($sharedelement, 1) . ")";
                     $sql .= " AND sc.fk_soc = dbt." . $dbt_keyfield;
-                    $sql .= " AND (sc.fk_user = " . ((int)$user->id);
+                    $sql .= " AND (sc.fk_user = " . ((int) $user->id);
                     if (getDolGlobalInt('MAIN_SEE_SUBORDINATES')) {
                         $userschilds = $user->getAllChildIds();
                         foreach ($userschilds as $key => $value) {
-                            $sql .= ' OR sc.fk_user = ' . ((int)$value);
+                            $sql .= ' OR sc.fk_user = ' . ((int) $value);
                         }
                     }
                     $sql .= ')';
@@ -1109,10 +1109,10 @@ 
                     // On ticket, the thirdparty is not mandatory, so we need a special test to accept record with no thirdparties.
                     $sql = "SELECT COUNT(dbt." . $dbt_select . ") as nb";
                     $sql .= " FROM " . MAIN_DB_PREFIX . $dbtablename . " as dbt";
-                    $sql .= " LEFT JOIN " . MAIN_DB_PREFIX . "societe_commerciaux as sc ON sc.fk_soc = dbt." . $dbt_keyfield . " AND sc.fk_user = " . ((int)$user->id);
+                    $sql .= " LEFT JOIN " . MAIN_DB_PREFIX . "societe_commerciaux as sc ON sc.fk_soc = dbt." . $dbt_keyfield . " AND sc.fk_user = " . ((int) $user->id);
                     $sql .= " WHERE dbt." . $dbt_select . " IN (" . $db->sanitize($objectid, 1) . ")";
                     $sql .= " AND dbt.entity IN (" . getEntity($sharedelement, 1) . ")";
-                    $sql .= " AND (sc.fk_user = " . ((int)$user->id) . " OR sc.fk_user IS NULL)";
+                    $sql .= " AND (sc.fk_user = " . ((int) $user->id) . " OR sc.fk_user IS NULL)";
                 }
             } elseif (isModEnabled('multicompany')) {
                 // If multicompany, and user is an internal user with all permissions, check that object is in correct entity

Dolibarr/Modules/User/Controller/DashboardController.php

Braces +9 added lines, -3 removed lines

@@ -86,9 +86,15 @@
          */
 
         $nbmodulesnotautoenabled = count($conf->modules);
-        if (in_array('fckeditor', $conf->modules)) $nbmodulesnotautoenabled--;
-        if (in_array('export', $conf->modules)) $nbmodulesnotautoenabled--;
-        if (in_array('import', $conf->modules)) $nbmodulesnotautoenabled--;
+        if (in_array('fckeditor', $conf->modules)) {
+            $nbmodulesnotautoenabled--;
+        }
+        if (in_array('export', $conf->modules)) {
+            $nbmodulesnotautoenabled--;
+        }
+        if (in_array('import', $conf->modules)) {
+            $nbmodulesnotautoenabled--;
+        }
 
 // Check if company name is defined (first install)
         if (!isset($conf->global->MAIN_INFO_SOCIETE_NOM) || !getDolGlobalString('MAIN_INFO_SOCIETE_NOM')) {

Dolibarr/Core/Base/Config.php

Spacing +7 added lines, -7 removed lines

@@ -269,8 +269,8 @@ 
         $conf->file->main_force_https = empty($dolibarr_main_force_https) ? '' : $dolibarr_main_force_https; // Force https
         $conf->file->strict_mode = empty($dolibarr_strict_mode) ? '' : $dolibarr_strict_mode; // Force php strict mode (for debug)
         $conf->file->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
-        $conf->file->main_path = empty($dolibarr_main_document_root ?? '') ? BASE_PATH : $dolibarr_main_document_root;  // Define htdocs path inside the config file
-        $conf->file->main_url = empty($dolibarr_main_url_root ?? '') ? BASE_URL : $dolibarr_main_url_root;    // Define url inside the config file
+        $conf->file->main_path = empty($dolibarr_main_document_root ?? '') ? BASE_PATH : $dolibarr_main_document_root; // Define htdocs path inside the config file
+        $conf->file->main_url = empty($dolibarr_main_url_root ?? '') ? BASE_URL : $dolibarr_main_url_root; // Define url inside the config file
         $conf->file->main_doc = empty($dolibarr_main_data_root ?? '') ? static::getDataDir($conf->file->main_path) : $dolibarr_main_data_root;
         $conf->file->path = ['main' => $conf->file->main_path];
         $conf->file->url = ['main' => '/'];
@@ -285,7 +285,7 @@ 
 
             $i = 0;
             foreach ($path as $value) {
-                $conf->file->path['alt' . ($i++)] = (string)$value;
+                $conf->file->path['alt' . ($i++)] = (string) $value;
             }
             $values = preg_split('/[;,]/', $dolibarr_main_url_root_alt);
             $i = 0;
@@ -305,7 +305,7 @@ 
                     print "\"/custom\"<br>\n";
                     exit;
                 }
-                $conf->file->url['alt' . ($i++)] = (string)$value;
+                $conf->file->url['alt' . ($i++)] = (string) $value;
             }
         }
 
@@ -433,7 +433,7 @@ 
     public static function getDb($db): ?DoliDB
     {
         if (!isset(self::$db)) {
-            self::$db = getDoliDBInstance($db->type, $db->host, $db->user, $db->pass, $db->name, (int)$db->port);
+            self::$db = getDoliDBInstance($db->type, $db->host, $db->user, $db->pass, $db->name, (int) $db->port);
         }
         return self::$db;
     }
@@ -560,7 +560,7 @@ 
             }
             if (!class_exists('MenuManager')) {
                 $menufound = 0;
-                $dirmenus = array_merge(["/core/menus/"], (array)$conf->modules_parts['menus']);
+                $dirmenus = array_merge(["/core/menus/"], (array) $conf->modules_parts['menus']);
                 foreach ($dirmenus as $dirmenu) {
                     $menufound = dol_include_once($dirmenu . "standard/" . $file_menu);
                     if (class_exists('MenuManager')) {
@@ -632,7 +632,7 @@ 
     private static function loadDb()
     {
         $conf = static::$dolibarrConfig;
-        static::$db = getDoliDBInstance($conf->db->type, $conf->db->host, $conf->db->user, $conf->db->pass, $conf->db->name, (int)$conf->db->port);
+        static::$db = getDoliDBInstance($conf->db->type, $conf->db->host, $conf->db->user, $conf->db->pass, $conf->db->name, (int) $conf->db->port);
         static::$dolibarrConfig->setValues(static::$db);
 
         return static::$db;

htdocs/main.inc.php

Spacing +10 added lines, -10 removed lines

@@ -88,7 +88,7 @@ 
 $micro_start_time = 0;
 if (isset($config) && isset($config->server) && $config->server->detailed_info) {
     [$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')) {
@@ -117,7 +117,7 @@ 
 
         // The numeric value 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);
         }
 
         return '&#' . $matches[1]; // Value will be unchanged because regex was /&#(  )/
@@ -147,7 +147,7 @@ 
         //print "before decoding $val\n";
         do {
             $oldval = $val;
-            $val = html_entity_decode($val, ENT_QUOTES | ENT_HTML5);    // Decode '&colon;', '&apos;', '&Tab;', '&NewLine', ...
+            $val = html_entity_decode($val, ENT_QUOTES | ENT_HTML5); // Decode '&colon;', '&apos;', '&Tab;', '&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',
@@ -156,7 +156,7 @@ 
                  *
                  * @return string
                  */
-                static function ($m) {
+                static function($m) {
                     // Decode '&#110;', ...
                     return realCharForNumericEntities($m);
                 },
@@ -197,7 +197,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) {
@@ -442,7 +442,7 @@ 
     ];
     session_set_cookie_params($sessioncookieparams);
     session_name($sessionname);
-    session_start();    // This call the open and read of session handler
+    session_start(); // This call the open and read of session handler
     //exit; // this exist generates a call to write and close
 }
 
@@ -722,16 +722,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';
@@ -949,7 +949,7 @@ 
     }
     if (!class_exists('MenuManager')) {
         $menufound = 0;
-        $dirmenus = array_merge(["/core/menus/"], (array)$conf->modules_parts['menus']);
+        $dirmenus = array_merge(["/core/menus/"], (array) $conf->modules_parts['menus']);
         foreach ($dirmenus as $dirmenu) {
             $menufound = dol_include_once($dirmenu . "standard/" . $file_menu);
             if (class_exists('MenuManager')) {

Core/Base/Controller/Trait/DbTrait.php

Spacing +1 added lines, -1 removed lines

@@ -23,7 +23,7 @@
 
 trait DbTrait
 {
-    public static function connectDb(\stdClass|null $db = null): bool
+    public static function connectDb(\stdClass | null $db = null): bool
     {
         if ($db === null) {
             return false;

Core/Model/User.php

Spacing +1 added lines, -1 removed lines

@@ -13,7 +13,7 @@
 
     public static function createTable()
     {
-        DB::schema()->create((new static())->table, function (Blueprint $table) {
+        DB::schema()->create((new static())->table, function(Blueprint $table) {
             $table->increments('id');
             $table->string('name');
             $table->string('email')->unique();