alxarafe / alixar

htdocs/core/actions_sendmails.inc.php

Spacing +1 added lines, -1 removed lines

@@ -398,7 +398,7 @@
                         $object->actionmsg = $message; // Long text
                         $object->actionmsg2 = $actionmsg2; // Short text ($langs->transnoentities('MailSentBy')...);
                         if (getDolGlobalString('MAIN_MAIL_REPLACE_EVENT_TITLE_BY_EMAIL_SUBJECT')) {
-                            $object->actionmsg2     = $subject; // Short text
+                            $object->actionmsg2 = $subject; // Short text
                         }
 
                         $object->trackid = $trackid;

htdocs/core/boxes/box_members_subscriptions_by_year.php

Spacing +1 added lines, -1 removed lines

@@ -112,7 +112,7 @@
                 }
 
 
-                $line = 0;  // @phan-suppress-current-line PhanPluginRedundantAssignment
+                $line = 0; // @phan-suppress-current-line PhanPluginRedundantAssignment
                 $this->info_box_contents[$line][] = array(
                     'td' => 'class=""',
                     'text' => $langs->trans("Year"),

htdocs/core/boxes/box_birthdays_members.php

Spacing +1 added lines, -1 removed lines

@@ -85,7 +85,7 @@
             $sql .= " WHERE u.entity IN (" . getEntity('adherent') . ")";
             $sql .= " AND u.statut = " . Adherent::STATUS_VALIDATED;
             $sql .= dolSqlDateFilter('u.birth', 0, $tmparray['mon'], 0);
-            $sql .= " ORDER BY daya ASC";   // We want to have date of the month sorted by the day without taking into consideration the year
+            $sql .= " ORDER BY daya ASC"; // We want to have date of the month sorted by the day without taking into consideration the year
             $sql .= $this->db->plimit($max, 0);
 
             dol_syslog(get_class($this) . "::loadBox", LOG_DEBUG);

htdocs/core/boxes/box_birthdays.php

Spacing +1 added lines, -1 removed lines

@@ -94,7 +94,7 @@
             $sql .= " AND u.statut = " . User::STATUS_ENABLED;
             $sql .= dolSqlDateFilter('u.dateemployment', 0, $tmparray['mon'], 0);
             $sql .= " AND u.dateemployment < '" . $this->db->idate(dol_get_first_day($tmparray['year'])) . "'";
-            $sql .= " ORDER BY daya ASC";   // We want to have date of the month sorted by the day without taking into consideration the year
+            $sql .= " ORDER BY daya ASC"; // We want to have date of the month sorted by the day without taking into consideration the year
             $sql .= $this->db->plimit($max, 0);
 
             dol_syslog(get_class($this) . "::loadBox", LOG_DEBUG);

htdocs/core/boxes/box_graph_product_distribution.php

Spacing +1 added lines, -1 removed lines

@@ -141,7 +141,7 @@
         $userid = 0; // No filter on user creation
 
         $WIDTH = ($nbofgraph >= 2 || !empty($conf->dol_optimize_smallscreen)) ? '300' : '320';
-        $HEIGHT = '150';    // Height require to have 5+1 entries into legend visible.
+        $HEIGHT = '150'; // Height require to have 5+1 entries into legend visible.
 
         if (isModEnabled("propal") && $user->hasRight('propal', 'lire')) {
             // Build graphic number of object. $data = array(array('Lib',val1,val2,val3),...)

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;

htdocs/core/bookmarks_page.php

Spacing +1 added lines, -1 removed lines

@@ -71,7 +71,7 @@
 $title = $langs->trans("Bookmarks");
 
 // URL http://mydolibarr/core/bookmarks_page?dol_use_jmobile=1 can be used for tests
-$head = '<!-- Bookmarks -->' . "\n";  // This is used by DoliDroid to know page is a bookmark selection page
+$head = '<!-- Bookmarks -->' . "\n"; // This is used by DoliDroid to know page is a bookmark selection page
 $arrayofjs = array();
 $arrayofcss = array();
 top_htmlhead($head, $title, 0, 0, $arrayofjs, $arrayofcss);

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;

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);