alxarafe / alixar

public/htdocs/core/lib/invoice.lib.php

Spacing +3 added lines, -3 removed lines

@@ -143,7 +143,7 @@ 
             } else {
                 dol_syslog('Failed to count actioncomm ' . $db->lasterror(), LOG_ERR);
             }
-            dol_setcache($cachekey, $nbEvent, 120);     // If setting cache fails, this is not a problem, so we do not test result.
+            dol_setcache($cachekey, $nbEvent, 120); // If setting cache fails, this is not a problem, so we do not test result.
         }
 
         $head[$h][1] .= '/';
@@ -285,7 +285,7 @@ 
             } else {
                 dol_syslog('Failed to count actioncomm ' . $db->lasterror(), LOG_ERR);
             }
-            dol_setcache($cachekey, $nbEvent, 120);     // If setting cache fails, this is not a problem, so we do not test result.
+            dol_setcache($cachekey, $nbEvent, 120); // If setting cache fails, this is not a problem, so we do not test result.
         }
 
         $head[$h][1] .= '/';
@@ -453,7 +453,7 @@ 
                 $dolgraph->setShowPercent(1);
                 $dolgraph->SetType(array('bars', 'bars', 'bars', 'bars', 'bars', 'bars'));
                 //$dolgraph->SetType(array('pie'));
-                $dolgraph->setHeight('160');    /* 160 min is required to show the 6 lines of legend */
+                $dolgraph->setHeight('160'); /* 160 min is required to show the 6 lines of legend */
                 $dolgraph->setWidth('450');
                 $dolgraph->setHideXValues(true);
                 if ($mode == 'customers') {

public/htdocs/core/lib/files.lib.php

Spacing +7 added lines, -7 removed lines

@@ -117,7 +117,7 @@ 
             'types' => $types,
             'recursive' => $recursive,
             'filter' => $filter,
-            'excludefilter' => $exclude_array,  // Already converted to array.
+            'excludefilter' => $exclude_array, // Already converted to array.
             'sortcriteria' => $sortcriteria,
             'sortorder' => $sortorder,
             'loaddate' => $loaddate,
@@ -151,7 +151,7 @@ 
 
                 $qualified = 1;
 
-                $utf8_fullpathfile = "$utf8_path/$utf8_file";  // Temp variable for speed
+                $utf8_fullpathfile = "$utf8_path/$utf8_file"; // Temp variable for speed
 
                 // Check if file is qualified
                 foreach ($excludefilterarray as $filt) {
@@ -1955,7 +1955,7 @@ 
                     $maxwidthmini = $tmparraysize['maxwidthmini'];
                     $maxheightmini = $tmparraysize['maxheightmini'];
                     //$quality = $tmparraysize['quality'];
-                    $quality = 50;  // For thumbs, we force quality to 50
+                    $quality = 50; // For thumbs, we force quality to 50
 
                     // Generate thumbs.
                     if ($generatethumbs) {
@@ -2383,9 +2383,9 @@ 
                     // Skip directories (they would be added automatically)
                     if (!$file->isDir()) {
                         // Get real and relative path for current file
-                        $filePath = $file->getPath();               // the full path with filename using the $inputdir root.
+                        $filePath = $file->getPath(); // the full path with filename using the $inputdir root.
                         $fileName = $file->getFilename();
-                        $fileFullRealPath = $file->getRealPath();   // the full path with name and transformed to use real path directory.
+                        $fileFullRealPath = $file->getRealPath(); // the full path with name and transformed to use real path directory.
 
                         //$relativePath = substr($fileFullRealPath, strlen($rootPath) + 1);
                         $relativePath = substr(($filePath ? $filePath . '/' : '') . $fileName, strlen($rootPath) + 1);
@@ -2656,9 +2656,9 @@ 
                     // Skip directories (they would be added automatically)
                     if (!$file->isDir()) {
                         // Get real and relative path for current file
-                        $filePath = $file->getPath();               // the full path with filename using the $inputdir root.
+                        $filePath = $file->getPath(); // the full path with filename using the $inputdir root.
                         $fileName = $file->getFilename();
-                        $fileFullRealPath = $file->getRealPath();   // the full path with name and transformed to use real path directory.
+                        $fileFullRealPath = $file->getRealPath(); // the full path with name and transformed to use real path directory.
 
                         //$relativePath = ($rootdirinzip ? $rootdirinzip.'/' : '').substr($fileFullRealPath, strlen($inputdir) + 1);
                         $relativePath = ($rootdirinzip ? $rootdirinzip . '/' : '') . substr(($filePath ? $filePath . '/' : '') . $fileName, strlen($inputdir) + 1);

public/htdocs/core/lib/xcal.lib.php

Spacing +2 added lines, -2 removed lines

@@ -210,7 +210,7 @@ 
                     // the default behaviour but there is no way to change keeping old saved date compatible.
                     $tzforfullday = getDolGlobalString('MAIN_STORE_FULL_EVENT_IN_GMT');
                     // Local time should be used to prevent users in time zones earlier than GMT from being one day earlier
-                    $prefix     = ";VALUE=DATE";
+                    $prefix = ";VALUE=DATE";
                     if ($tzforfullday) {
                         $startdatef = dol_print_date($startdate, "dayxcard", 'gmt');
                     } else {
@@ -238,7 +238,7 @@ 
                 $enddatef = dol_print_date($enddate, "dayhourxcard", 'gmt');
 
                 if ($fulldayevent) {
-                    $prefix   = ";VALUE=DATE";
+                    $prefix = ";VALUE=DATE";
                     // We add 1 second so we reach the +1 day needed for full day event (DTEND must be next day after event)
                     // This is mention in https://datatracker.ietf.org/doc/html/rfc5545:
                     // "The "DTEND" property for a "VEVENT" calendar component specifies the non-inclusive end of the event."

public/htdocs/core/lib/member.lib.php

Spacing +1 added lines, -1 removed lines

@@ -144,7 +144,7 @@
             } else {
                 dol_syslog('Failed to count actioncomm ' . $db->lasterror(), LOG_ERR);
             }
-            dol_setcache($cachekey, $nbEvent, 120);     // If setting cache fails, this is not a problem, so we do not test result.
+            dol_setcache($cachekey, $nbEvent, 120); // If setting cache fails, this is not a problem, so we do not test result.
         }
 
         $head[$h][1] .= '/';

public/htdocs/core/lib/images.lib.php

Spacing +1 added lines, -1 removed lines

@@ -212,7 +212,7 @@
 
     $filetoread = realpath(dol_osencode($file)); // Chemin canonique absolu de l'image
 
-    $infoImg = getimagesize($filetoread);           // Get data about src image
+    $infoImg = getimagesize($filetoread); // Get data about src image
     $imgWidth = $infoImg[0]; // Largeur de l'image
     $imgHeight = $infoImg[1]; // Hauteur de l'image
 

public/htdocs/core/lib/oauth.lib.php

Spacing +1 added lines, -1 removed lines

@@ -283,7 +283,7 @@
     // Supported OAUTH (a provider is supported when a file xxx_oauthcallback.php is available into htdocs/core/modules/oauth)
     $supportedoauth2array = array(
         'OAUTH_GOOGLE_NAME' => array(
-            'callbackfile' => 'google',     // used to generate the filename: google_oauthcallback.php
+            'callbackfile' => 'google', // used to generate the filename: google_oauthcallback.php
             'picto' => 'google',
             'urlforapp' => 'OAUTH_GOOGLE_DESC',
             'name' => 'Google',

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

Indentation +14 added lines, -14 removed lines

@@ -2045,23 +2045,23 @@
     //print extension_loaded('soap');
     if ($proxyuse) {
         $params = array('connection_timeout' => $timeout,
-                      'response_timeout' => $response_timeout,
-                      'proxy_use'      => 1,
-                      'proxy_host'     => $proxyhost,
-                      'proxy_port'     => $proxyport,
-                      'proxy_login'    => $proxyuser,
-                      'proxy_password' => $proxypass,
-                      'trace'          => 1
+                        'response_timeout' => $response_timeout,
+                        'proxy_use'      => 1,
+                        'proxy_host'     => $proxyhost,
+                        'proxy_port'     => $proxyport,
+                        'proxy_login'    => $proxyuser,
+                        'proxy_password' => $proxypass,
+                        'trace'          => 1
         );
     } else {
         $params = array('connection_timeout' => $timeout,
-                      'response_timeout' => $response_timeout,
-                      'proxy_use'      => 0,
-                      'proxy_host'     => false,
-                      'proxy_port'     => false,
-                      'proxy_login'    => false,
-                      'proxy_password' => false,
-                      'trace'          => 1
+                        'response_timeout' => $response_timeout,
+                        'proxy_use'      => 0,
+                        'proxy_host'     => false,
+                        'proxy_port'     => false,
+                        'proxy_login'    => false,
+                        'proxy_password' => false,
+                        'trace'          => 1
         );
     }
     return $params;

Spacing +12 added lines, -12 removed lines

@@ -90,7 +90,7 @@ 
     $main_dir = realpath(constant('BASE_PATH') . '/../Dolibarr/Modules');
 
     $modulesdir = array();
-    $modulesdir[$main_dir.'/'] = $main_dir.'/';
+    $modulesdir[$main_dir . '/'] = $main_dir . '/';
 
     foreach ($conf->file->dol_document_root as $type => $dirroot) {
         // Default core/modules dir
@@ -201,7 +201,7 @@ 
         } else {
             print ': ';
         }
-        if (! empty($object->user_creation) && is_object($object->user_creation)) { // deprecated mode
+        if (!empty($object->user_creation) && is_object($object->user_creation)) { // deprecated mode
             if ($object->user_creation->id) {
                 print $object->user_creation->getNomUrl(-1, '', 0, 0, 0);
             } else {
@@ -2962,7 +2962,7 @@ 
     $string = trim($string);
 
     // If string does not start and end with parenthesis, we return $string as is.
-    if (! preg_match('/^\(.*\)$/', $string)) {
+    if (!preg_match('/^\(.*\)$/', $string)) {
         return $string;
     }
 
@@ -3000,15 +3000,15 @@ 
 function getArrayOfEmojiBis()
 {
     $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;

public/htdocs/core/lib/bank.lib.php

Spacing +1 added lines, -1 removed lines

@@ -309,7 +309,7 @@
     if ($account == null && $ibantocheck == null) {
         return false;
     } elseif ($ibantocheck == null) {
-        $ibantocheck = ($account->iban ? $account->iban : $account->iban_prefix);       // iban or iban_prefix for backward compatibility
+        $ibantocheck = ($account->iban ? $account->iban : $account->iban_prefix); // iban or iban_prefix for backward compatibility
     }
     //require_once constant('DOL_DOCUMENT_ROOT') . '/includes/php-iban/oophp-iban.php';
 

public/htdocs/core/lib/security.lib.php

Spacing +9 added lines, -9 removed lines

@@ -106,7 +106,7 @@ 
         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.
 }
 
 /**
@@ -285,7 +285,7 @@ 
 function dol_verifyHash($chain, $hash, $type = '0')
 {
     if ($type == '0' && getDolGlobalString('MAIN_SECURITY_HASH_ALGO') && getDolGlobalString('MAIN_SECURITY_HASH_ALGO') == 'password_hash' && function_exists('password_verify')) {
-        if (! empty($hash[0]) && $hash[0] == '$') {
+        if (!empty($hash[0]) && $hash[0] == '$') {
             return password_verify($chain, $hash);
         } elseif (dol_strlen($hash) == 32) {
             return dol_verifyHash($chain, $hash, '3'); // md5
@@ -339,7 +339,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 "";
 }
@@ -372,13 +372,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");
@@ -863,9 +863,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;
@@ -915,7 +915,7 @@ 
         $checkparentsoc = array('agenda', 'contact', 'contrat'); // Test on entity + link to third party on field $dbt_keyfield. Allowed if link is empty (Ex: contacts...).
         $checkproject = array('projet', 'project'); // Test for project object
         $checktask = array('projet_task'); // Test for task object
-        $checkhierarchy = array('expensereport', 'holiday');    // check permission among the hierarchy of user
+        $checkhierarchy = array('expensereport', 'holiday'); // check permission among the hierarchy of user
         $checkuser = array('bookmark'); // check permission among the fk_user (must be myself or null)
         $nocheck = array('barcode', 'stock'); // No test
 
@@ -929,7 +929,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