alxarafe / alixar

public/htdocs/core/login/functions_googleoauth.php

Spacing +2 added lines, -2 removed lines

@@ -76,10 +76,10 @@
             //global $dolibarr_main_url_root;
             //$urlwithouturlroot = preg_replace('/'.preg_quote(DOL_URL_ROOT, '/').'$/i', '', trim($dolibarr_main_url_root));
             //$urlwithroot = $urlwithouturlroot.DOL_URL_ROOT; // This is to use external domain name found into config file
-            $urlwithroot = DOL_MAIN_URL_ROOT;                 // This is to use same domain name than current
+            $urlwithroot = DOL_MAIN_URL_ROOT; // This is to use same domain name than current
 
             //$shortscope = 'userinfo_email,userinfo_profile';
-            $shortscope = 'openid,email,profile';   // For openid connect
+            $shortscope = 'openid,email,profile'; // For openid connect
 
             $oauthstateanticsrf = bin2hex(random_bytes(128 / 8));
             $_SESSION['oauthstateanticsrf'] = $shortscope . '-' . $oauthstateanticsrf;

public/htdocs/core/login/functions_http.php

Spacing +1 added lines, -1 removed lines

@@ -62,7 +62,7 @@
  */
 function decodeHttpBasicAuth($value)
 {
-    $encoded_basic_auth = substr($value, 6);    // Remove the "Basic " string
+    $encoded_basic_auth = substr($value, 6); // Remove the "Basic " string
     $decoded_basic_auth = base64_decode($encoded_basic_auth);
     $credentials_basic_auth = explode(':', $decoded_basic_auth);
 

public/htdocs/core/login/functions_dolibarr.php

Spacing +2 added lines, -2 removed lines

@@ -164,7 +164,7 @@ 
                     }
                 } else {
                     dol_syslog("functions_dolibarr::check_user_password_dolibarr Authentication KO user not found for '" . $usertotest . "'", LOG_NOTICE);
-                    sleep(1);   // Anti brut force protection. Must be same delay when password is not valid
+                    sleep(1); // Anti brut force protection. Must be same delay when password is not valid
 
                     // Load translation files required by the page
                     $langs->loadLangs(array('main', 'errors'));
@@ -178,7 +178,7 @@ 
             }
         } else {
             dol_syslog("functions_dolibarr::check_user_password_dolibarr Authentication KO Too many attempts", LOG_NOTICE);
-            sleep(1);   // Anti brut force protection. Must be same delay when password is not valid
+            sleep(1); // Anti brut force protection. Must be same delay when password is not valid
             // Load translation files required by the page
             $langs->loadLangs(array('main', 'errors'));
             $_SESSION["dol_loginmesg"] = $langs->transnoentitiesnoconv("ErrorTooManyAttempts");

public/htdocs/core/extrafieldsinimport.inc.php

Spacing +1 added lines, -1 removed lines

@@ -50,7 +50,7 @@
             case 'sellist':
                 $tmp = '';
                 $tmpparam = jsonOrUnserialize($obj->param); // $tmp may be array 'options' => array 'c_currencies:code_iso:code_iso' => null
-                if (is_array($tmpparam) && array_key_exists('options', $tmpparam) &&  $tmpparam['options'] && is_array($tmpparam['options'])) {
+                if (is_array($tmpparam) && array_key_exists('options', $tmpparam) && $tmpparam['options'] && is_array($tmpparam['options'])) {
                     $tmpkeys = array_keys($tmpparam['options']);
                     $tmp = array_shift($tmpkeys);
                 }

public/htdocs/core/triggers/interface_50_modTicket_TicketEmail.class.php

Spacing +1 added lines, -1 removed lines

@@ -265,7 +265,7 @@
                         // Refuse email if not
                         $contact = new Contact($this->db);
                         $res = $contact->fetch($contactid);
-                        if (! in_array($contact, $linked_contacts)) {
+                        if (!in_array($contact, $linked_contacts)) {
                             $error_msg = $langs->trans('Error') . ': ';
                             $error_msg .= $langs->transnoentities('TicketWrongContact');
                             setEventMessages($error_msg, [], 'errors');

public/htdocs/core/actions_massactions.inc.php

Spacing +5 added lines, -5 removed lines

@@ -605,7 +605,7 @@ 
                                 $objectobj2->fk_element     = $objid2;
                                 $objectobj2->elementtype    = $objectobj2->element;
                                 if (getDolGlobalString('MAIN_MAIL_REPLACE_EVENT_TITLE_BY_EMAIL_SUBJECT')) {
-                                    $objectobj2->actionmsg2     = $subjectreplaced; // Short text
+                                    $objectobj2->actionmsg2 = $subjectreplaced; // Short text
                                 }
 
                                 $triggername = strtoupper(get_class($objectobj2)) . '_SENTBYMAIL';
@@ -1064,7 +1064,7 @@ 
                 continue;
             }
 
-            if ($objectclass == 'Holiday' && ! in_array($objecttmp->statut, array(Holiday::STATUS_DRAFT, Holiday::STATUS_CANCELED, Holiday::STATUS_REFUSED))) {
+            if ($objectclass == 'Holiday' && !in_array($objecttmp->statut, array(Holiday::STATUS_DRAFT, Holiday::STATUS_CANCELED, Holiday::STATUS_REFUSED))) {
                 $langs->load("errors");
                 $nbignored++;
                 $TMsg[] = '<div class="error">' . $langs->trans('ErrorLeaveRequestMustBeDraftCanceledOrRefusedToBeDeleted', $objecttmp->ref) . '</div><br>';
@@ -1468,7 +1468,7 @@ 
     $db->begin();
 
     $objecttmp = new $objectclass($db);
-    $e = new ExtraFields($db);// fetch optionals attributes and labels
+    $e = new ExtraFields($db); // fetch optionals attributes and labels
     $e->fetch_name_optionals_label($objecttmp->table_element);
 
     $nbok = 0;
@@ -1606,7 +1606,7 @@ 
                 $objecttmp->date_valid = dol_now();
                 $objecttmp->fk_user_valid = $user->id;
                 $objecttmp->status = Holiday::STATUS_APPROVED;
-                $objecttmp->statut = $objecttmp->status;    // deprecated
+                $objecttmp->statut = $objecttmp->status; // deprecated
 
                 $verif = $objecttmp->approve($user);
 
@@ -1713,7 +1713,7 @@ 
     $objecttmp = new $objectclass($db);
     $nbok = 0;
     $typeholiday = GETPOST('typeholiday', 'alpha');
-    $nbdaysholidays = GETPOSTFLOAT('nbdaysholidays');   // May be 1.5
+    $nbdaysholidays = GETPOSTFLOAT('nbdaysholidays'); // May be 1.5
 
     if ($nbdaysholidays <= 0) {
         setEventMessages($langs->trans("WrongAmount"), "", 'errors');

public/htdocs/core/actions_setmoduleoptions.inc.php

Spacing +6 added lines, -6 removed lines

@@ -81,19 +81,19 @@ 
     $listofdir = explode(',', preg_replace('/[\r\n]+/', ',', trim(getDolGlobalString($keyforuploaddir))));
 
     foreach ($listofdir as $key => $tmpdir) {
-        $tmpdir = preg_replace('/DOL_DATA_ROOT\/*/', '', $tmpdir);  // Clean string if we found a hardcoded DOL_DATA_ROOT
+        $tmpdir = preg_replace('/DOL_DATA_ROOT\/*/', '', $tmpdir); // Clean string if we found a hardcoded DOL_DATA_ROOT
         if (!$tmpdir) {
             unset($listofdir[$key]);
             continue;
         }
-        $tmpdir = DOL_DATA_ROOT . '/' . $tmpdir;    // Complete with DOL_DATA_ROOT. Only files into DOL_DATA_ROOT can be reach/set
+        $tmpdir = DOL_DATA_ROOT . '/' . $tmpdir; // Complete with DOL_DATA_ROOT. Only files into DOL_DATA_ROOT can be reach/set
         if (!is_dir($tmpdir)) {
             if (empty($nomessageinsetmoduleoptions)) {
                 setEventMessages($langs->trans("ErrorDirNotFound", $tmpdir), null, 'warnings');
             }
         } else {
             $upload_dir = $tmpdir;
-            break;  // So we take the first directory found into setup $conf->global->$keyforuploaddir
+            break; // So we take the first directory found into setup $conf->global->$keyforuploaddir
         }
     }
 
@@ -133,19 +133,19 @@ 
 
         foreach ($listofdir as $key => $tmpdir) {
             $tmpdir = trim($tmpdir);
-            $tmpdir = preg_replace('/DOL_DATA_ROOT\/*/', '', $tmpdir);  // Clean string if we found a hardcoded DOL_DATA_ROOT
+            $tmpdir = preg_replace('/DOL_DATA_ROOT\/*/', '', $tmpdir); // Clean string if we found a hardcoded DOL_DATA_ROOT
             if (!$tmpdir) {
                 unset($listofdir[$key]);
                 continue;
             }
-            $tmpdir = DOL_DATA_ROOT . '/' . $tmpdir;    // Complete with DOL_DATA_ROOT. Only files into DOL_DATA_ROOT can be reach/set
+            $tmpdir = DOL_DATA_ROOT . '/' . $tmpdir; // Complete with DOL_DATA_ROOT. Only files into DOL_DATA_ROOT can be reach/set
             if (!is_dir($tmpdir)) {
                 if (empty($nomessageinsetmoduleoptions)) {
                     setEventMessages($langs->trans("ErrorDirNotFound", $tmpdir), null, 'warnings');
                 }
             } else {
                 $upload_dir = $tmpdir;
-                break;  // So we take the first directory found into setup $conf->global->$keyforuploaddir
+                break; // So we take the first directory found into setup $conf->global->$keyforuploaddir
             }
         }
 

public/htdocs/core/customreports.php

Spacing +12 added lines, -12 removed lines

@@ -191,7 +191,7 @@ 
 }
 
 // Fetch optionals attributes and labels
-$extrafields->fetch_name_optionals_label('all');    // We load all extrafields definitions for all objects
+$extrafields->fetch_name_optionals_label('all'); // We load all extrafields definitions for all objects
 //$extrafields->fetch_name_optionals_label($object->table_element_line);
 
 $search_array_options = $extrafields->getOptionalsFromPost($object->table_element, '', 'search_');
@@ -216,14 +216,14 @@ 
     $crits = explode(' ', trim($value)); // the string after the name of the field. Explode on each AND
     $res = '';
 
-    $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 first criteria
+        $i2 = 0; // count the nb of valid criteria added for this first criteria
         $newres = '';
         $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;
@@ -241,8 +241,8 @@ 
                 }
             }
 
-            $field = preg_replace('/(:[!<>=\s]+:|:in:|:notin:|:like:|:notlike:).*$/', '', $tmpcrit);        // the name of the field
-            $tmpcrit = preg_replace('/^.*(:[!<>=\s]+:|:in:|:notin:|:like:|:notlike:)/', '\1', $tmpcrit);    // the condition after the name of the field
+            $field = preg_replace('/(:[!<>=\s]+:|:in:|:notin:|:like:|:notlike:).*$/', '', $tmpcrit); // the name of the field
+            $tmpcrit = preg_replace('/^.*(:[!<>=\s]+:|:in:|:notin:|:like:|:notlike:)/', '\1', $tmpcrit); // the condition after the name of the field
             //var_dump($field); var_dump($tmpcrit); var_dump($i3);
 
             $newres .= (($i2 > 0 || $i3 > 0) ? ' OR ' : '');
@@ -612,7 +612,7 @@ 
     foreach ($arrayofmesures as $key => $val) {
         $simplearrayofmesures[$key] = $arrayofmesures[$key]['label'];
     }
-    print $form->multiselectarray('search_measures', $simplearrayofmesures, $search_measures, 0, 0, 'minwidth300', 1, 0, '', '', $langs->trans("Measures"));    // Fill the array $arrayofmeasures with possible fields
+    print $form->multiselectarray('search_measures', $simplearrayofmesures, $search_measures, 0, 0, 'minwidth300', 1, 0, '', '', $langs->trans("Measures")); // Fill the array $arrayofmeasures with possible fields
     print '</div>';
 
     // XAxis
@@ -620,14 +620,14 @@ 
     print '<div class="divadvancedsearchfield">';
     print '<div class="inline-block"><span class="fas fa-ruler-combined paddingright pictofixedwidth" title="' . dol_escape_htmltag($langs->trans("XAxis")) . '"></span><span class="fas fa-caret-down caretdownaxis" title="' . dol_escape_htmltag($langs->trans("XAxis")) . '"></span></div>';
     //var_dump($arrayofxaxis);
-    print $formother->selectXAxisField($object, $search_xaxis, $arrayofxaxis, $langs->trans("XAxis"), 'minwidth300 maxwidth400');   // Fill the array $arrayofxaxis with possible fields
+    print $formother->selectXAxisField($object, $search_xaxis, $arrayofxaxis, $langs->trans("XAxis"), 'minwidth300 maxwidth400'); // Fill the array $arrayofxaxis with possible fields
     print '</div>';
 
     // Group by
     $count = 0;
     print '<div class="divadvancedsearchfield">';
     print '<div class="inline-block opacitymedium"><span class="fas fa-ruler-horizontal paddingright pictofixedwidth" title="' . dol_escape_htmltag($langs->trans("GroupBy")) . '"></span></div>';
-    print $formother->selectGroupByField($object, $search_groupby, $arrayofgroupby, 'minwidth250 maxwidth300', $langs->trans("GroupBy"));   // Fill the array $arrayofgroupby with possible fields
+    print $formother->selectGroupByField($object, $search_groupby, $arrayofgroupby, 'minwidth250 maxwidth300', $langs->trans("GroupBy")); // Fill the array $arrayofgroupby with possible fields
     print '</div>';
 
 
@@ -784,7 +784,7 @@ 
             //var_dump($arrayofgroupby);
             $tmpforloop = dolExplodeIntoArray($arrayofxaxis[$val]['tablefromt'], ',');
             foreach ($tmpforloop as $tmptable => $tmptablealias) {
-                if (! in_array($tmptable, $listoftablesalreadyadded)) { // We do not add join for main table and tables already added
+                if (!in_array($tmptable, $listoftablesalreadyadded)) { // We do not add join for main table and tables already added
                     $tmpforexplode = explode('__', $tmptablealias);
                     $endpart = end($tmpforexplode);
                     $parenttableandfield = preg_replace('/__' . $endpart . '$/', '', $tmptablealias) . '.' . $endpart;
@@ -811,7 +811,7 @@ 
             //var_dump($arrayofgroupby[$val]); var_dump($tmpval);
             $tmpforloop = dolExplodeIntoArray($arrayofgroupby[$val]['tablefromt'], ',');
             foreach ($tmpforloop as $tmptable => $tmptablealias) {
-                if (! in_array($tmptable, $listoftablesalreadyadded)) { // We do not add join for main table and tables already added
+                if (!in_array($tmptable, $listoftablesalreadyadded)) { // We do not add join for main table and tables already added
                     $tmpforexplode = explode('__', $tmptablealias);
                     $endpart = end($tmpforexplode);
                     $parenttableandfield = preg_replace('/__' . $endpart . '$/', '', $tmptablealias) . '.' . $endpart;
@@ -838,7 +838,7 @@ 
             //var_dump($arrayofgroupby);
             $tmpforloop = dolExplodeIntoArray($arrayofmesures[$val]['tablefromt'], ',');
             foreach ($tmpforloop as $tmptable => $tmptablealias) {
-                if (! in_array($tmptable, $listoftablesalreadyadded)) { // We do not add join for main table and tables already added
+                if (!in_array($tmptable, $listoftablesalreadyadded)) { // We do not add join for main table and tables already added
                     $tmpforexplode = explode('__', $tmptablealias);
                     $endpart = end($tmpforexplode);
                     $parenttableandfield = preg_replace('/__' . $endpart . '$/', '', $tmptablealias) . '.' . $endpart;

public/htdocs/core/filemanagerdol/connectors/php/connector.php

Spacing +1 added lines, -1 removed lines

@@ -25,7 +25,7 @@
 
 ob_start();
 
-require 'config.inc.php';   // This include the main.inc.php
+require 'config.inc.php'; // This include the main.inc.php
 require 'connector.lib.php';
 
 if (!$Config['Enabled']) {