alxarafe / alixar

public/htdocs/core/class/stats.class.php

Spacing +4 added lines, -4 removed lines

@@ -102,8 +102,8 @@ 
             return array();
         }
 
-        $data  = array();  // This is the return value
-        $datay = array();  // This is a work value
+        $data  = array(); // This is the return value
+        $datay = array(); // This is a work value
 
         // Search into cache
         if (!empty($cachedelay)) {
@@ -205,7 +205,7 @@ 
         }
 
         $datay = array();
-        $data = array();  // Return value
+        $data = array(); // Return value
 
         // Search into cache
         if (!empty($cachedelay)) {
@@ -359,7 +359,7 @@ 
         if ($foundintocache) {    // Cache file found and is not too old
             dol_syslog(get_class($this) . '::' . __FUNCTION__ . " read data from cache file " . $newpathofdestfile . " " . $filedate . ".");
             $data = json_decode(file_get_contents($newpathofdestfile), true);
-            '@phan-var-force array<int<0,11>,array{0:int<1,12>,1:int|float}> $data';  // Phan can't decode json_decode's return value
+            '@phan-var-force array<int<0,11>,array{0:int<1,12>,1:int|float}> $data'; // Phan can't decode json_decode's return value
         } else {
             // This method is defined in parent object only, not into abstract, so we disable phpstan warning
             /** @phpstan-ignore-next-line */

public/htdocs/core/class/fiscalyear.class.php

Spacing +1 added lines, -1 removed lines

@@ -240,7 +240,7 @@
 
             $this->id = $obj->rowid;
             $this->ref = $obj->rowid;
-            $this->date_start   = $this->db->jdate($obj->date_start);
+            $this->date_start = $this->db->jdate($obj->date_start);
             $this->date_end = $this->db->jdate($obj->date_end);
             $this->label = $obj->label;
             $this->statut = $obj->status;

public/htdocs/core/class/html.formwebsite.class.php

Spacing +1 added lines, -1 removed lines

@@ -387,7 +387,7 @@
 
             $out .= '<div class="template-option" data-template="' . $template . '" data-content="' . htmlentities($contentHtml) . '">';
             $out .= '<img class="maillayout" alt="' . $template . '" src="' . constant('BASE_URL') . '/theme/common/maillayout/' . $template . '.png" />';
-            $out .= '<span class="template-option-text">' . ($template != 'text'  ? ucfirst($template) : ucfirst($templateFunction)) . '</span>';
+            $out .= '<span class="template-option-text">' . ($template != 'text' ? ucfirst($template) : ucfirst($templateFunction)) . '</span>';
             $out .= '</div>';
         }
         $out .= '<input type="hidden" name="sample" value="" />';

public/htdocs/core/class/html.formticket.class.php

Spacing +9 added lines, -9 removed lines

@@ -86,17 +86,17 @@ 
 
     public $backtopage;
 
-    public $ispublic;  // to show information or not into public form
+    public $ispublic; // to show information or not into public form
 
     public $withtitletopic;
     public $withtopicreadonly;
     public $withreadid;
 
-    public $withcompany;  // to show company drop-down list
+    public $withcompany; // to show company drop-down list
     public $withfromsocid;
     public $withfromcontactid;
     public $withnotifytiersatcreate;
-    public $withusercreate;  // to show name of creating user in form
+    public $withusercreate; // to show name of creating user in form
     public $withcreatereadonly;
 
     /**
@@ -104,7 +104,7 @@ 
      */
     public $withextrafields;
 
-    public $withref;  // to show ref field
+    public $withref; // to show ref field
     public $withcancel;
 
     public $type_code;
@@ -149,7 +149,7 @@ 
         $this->withcreatereadonly = 1;
         $this->withemail = 0;
         $this->withref = 0;
-        $this->withextrafields = 0;  // to show extrafields or not
+        $this->withextrafields = 0; // to show extrafields or not
         //$this->withtopicreadonly=0;
     }
 
@@ -565,7 +565,7 @@ 
                 $maxfilesizearray = getMaxFileSizeArray();
                 $maxmin = $maxfilesizearray['maxmin'];
                 if ($maxmin > 0) {
-                    $out .= '<input type="hidden" name="MAX_FILE_SIZE" value="' . ($maxmin * 1024) . '">';  // MAX_FILE_SIZE must precede the field type=file
+                    $out .= '<input type="hidden" name="MAX_FILE_SIZE" value="' . ($maxmin * 1024) . '">'; // MAX_FILE_SIZE must precede the field type=file
                 }
                 $out .= '<input type="file" class="flat" id="addedfile" name="addedfile" value="' . $langs->trans("Upload") . '" />';
                 $out .= ' ';
@@ -881,7 +881,7 @@ 
         $publicgroups = ($filtertype == 'public=1' || $filtertype == '(public:=:1)');
 
         $ticketstat = new Ticket($this->db);
-        $ticketstat->loadCacheCategoriesTickets($publicgroups ? 1 : -1);    // get list of active ticket groups
+        $ticketstat->loadCacheCategoriesTickets($publicgroups ? 1 : -1); // get list of active ticket groups
 
         if ($use_multilevel <= 0) {
             print '<select id="select' . $htmlname . '" class="flat minwidth100' . ($morecss ? ' ' . $morecss : '') . '" name="' . $htmlname . '">';
@@ -1053,7 +1053,7 @@ 
             }
             $stringtoprint .= '</select>&nbsp;';
 
-            $levelid = 1;   // The first combobox
+            $levelid = 1; // The first combobox
             while ($levelid <= $use_multilevel) {   // Loop to take the child of the combo
                 $tabscript = array();
                 $stringtoprint .= '<select id="' . $htmlname . '_child_' . $levelid . '" class="maxwidth500 minwidth400 groupticketchild" child_id="' . $levelid . '">';
@@ -1129,7 +1129,7 @@ 
                 $stringtoprint .= '</select>';
 
                 $stringtoprint .= '<script nonce="' . getNonce() . '">';
-                $stringtoprint .= 'arraynotparents = ' . json_encode($arraycodenotparent) . ';';    // when the last visible combo list is number x, this is the array of group
+                $stringtoprint .= 'arraynotparents = ' . json_encode($arraycodenotparent) . ';'; // when the last visible combo list is number x, this is the array of group
                 $stringtoprint .= 'if (arraynotparents.includes($("#' . $htmlname . ($levelid > 1 ? '_child_' . ($levelid - 1) : '') . '").val())){
 					console.log("' . $htmlname . '_child_' . $levelid . '")
 					if($("#' . $htmlname . '_child_' . $levelid . '").val() == "" && ($("#' . $htmlname . '_child_' . $levelid . '").attr("child_id")>' . $child_id . ')){

public/htdocs/core/class/html.formprojet.class.php

Spacing +1 added lines, -1 removed lines

@@ -792,7 +792,7 @@
         if (is_array($selected)) {
             $selectedarray = $selected;
         } elseif ($selected == 99) {
-            $selectedarray = array(0,1);
+            $selectedarray = array(0, 1);
         } else {
             $selectedarray = explode(',', $selected);
         }

public/htdocs/core/class/html.formother.class.php

Spacing +3 added lines, -3 removed lines

@@ -1017,9 +1017,9 @@
 
         $color = substr($color, 1, 6);
 
-        $red = hexdec(substr($color, 0, 2));    // Red channel conversion
-        $green  = hexdec(substr($color, 2, 2)); // Green channel conversion
-        $blue  = hexdec(substr($color, 4, 2));  // Blue channel conversion
+        $red = hexdec(substr($color, 0, 2)); // Red channel conversion
+        $green = hexdec(substr($color, 2, 2)); // Green channel conversion
+        $blue = hexdec(substr($color, 4, 2)); // Blue channel conversion
 
         $couleur = imagecolorallocate($image, $red, $green, $blue);
         //print $red.$green.$blue;

public/htdocs/core/class/dolgraph.class.php

Spacing +4 added lines, -4 removed lines

@@ -638,7 +638,7 @@ 
         foreach ($this->data as $x) {   // Loop on each x
             for ($i = 0; $i < $nbseries; $i++) {    // Loop on each series
                 if (is_null($max)) {
-                    $max = $x[$i + 1];      // $i+1 because the index 0 is the legend
+                    $max = $x[$i + 1]; // $i+1 because the index 0 is the legend
                 } elseif ($max < $x[$i + 1]) {
                     $max = $x[$i + 1];
                 }
@@ -668,7 +668,7 @@ 
         foreach ($this->data as $x) {   // Loop on each x
             for ($i = 0; $i < $nbseries; $i++) {    // Loop on each series
                 if (is_null($min)) {
-                    $min = $x[$i + 1];      // $i+1 because the index 0 is the legend
+                    $min = $x[$i + 1]; // $i+1 because the index 0 is the legend
                 } elseif ($min > $x[$i + 1]) {
                     $min = $x[$i + 1];
                 }
@@ -757,7 +757,7 @@ 
             $this->error = "Call to draw method was made but SetData was is an empty dataset";
             dol_syslog(get_class($this) . "::draw " . $this->error, LOG_WARNING);
         }
-        $call = "draw_" . $this->_library;  // Example "draw_jflot"
+        $call = "draw_" . $this->_library; // Example "draw_jflot"
 
         return call_user_func_array(array($this, $call), array($file, $fileurl));
     }
@@ -1284,7 +1284,7 @@ 
                 if ($i > 0) {
                     $this->stringtoshow .= ', ';
                 }
-                $this->stringtoshow .= "'" . dol_escape_js(dol_trunc($val, 25)) . "'";  // Lower than 25 make some important label (that we can't shorten) to be truncated
+                $this->stringtoshow .= "'" . dol_escape_js(dol_trunc($val, 25)) . "'"; // Lower than 25 make some important label (that we can't shorten) to be truncated
                 $i++;
             }
 

public/htdocs/core/class/CSMSFile.class.php

Spacing +3 added lines, -3 removed lines

@@ -154,10 +154,10 @@
         if (!getDolGlobalString('MAIN_DISABLE_ALL_SMS')) {
             // Action according to the chose sending method
             if (getDolGlobalString('MAIN_SMS_SENDMODE')) {
-                $sendmode = getDolGlobalString('MAIN_SMS_SENDMODE');    // $conf->global->MAIN_SMS_SENDMODE looks like a value 'module'
-                $classmoduleofsender = getDolGlobalString('MAIN_MODULE_' . strtoupper($sendmode) . '_SMS', $sendmode);  // $conf->global->MAIN_MODULE_XXX_SMS looks like a value 'class@module'
+                $sendmode = getDolGlobalString('MAIN_SMS_SENDMODE'); // $conf->global->MAIN_SMS_SENDMODE looks like a value 'module'
+                $classmoduleofsender = getDolGlobalString('MAIN_MODULE_' . strtoupper($sendmode) . '_SMS', $sendmode); // $conf->global->MAIN_MODULE_XXX_SMS looks like a value 'class@module'
                 if ($classmoduleofsender == 'ovh') {
-                    $classmoduleofsender = 'ovhsms@ovh';    // For backward compatibility
+                    $classmoduleofsender = 'ovhsms@ovh'; // For backward compatibility
                 }
 
                 $tmp = explode('@', $classmoduleofsender);

public/htdocs/core/class/commonobject.class.php

Spacing +28 added lines, -28 removed lines

@@ -476,11 +476,11 @@ 
      *
      * Note: cond_reglement can not be aliased to cond_reglement!!!
      */
-    private $cond_reglement;  // Private to call DolDeprecationHandler
+    private $cond_reglement; // Private to call DolDeprecationHandler
     /**
      * @var int|string Internal to detect deprecated access
      */
-    protected $depr_cond_reglement;  // Internal value for deprecation
+    protected $depr_cond_reglement; // Internal value for deprecation
 
     /**
      * @var int         Delivery address ID
@@ -537,12 +537,12 @@ 
     /**
      * @var float Multicurrency total localta1
      */
-    public $multicurrency_total_localtax1;  // not in database
+    public $multicurrency_total_localtax1; // not in database
 
     /**
      * @var float Multicurrency total localtax2
      */
-    public $multicurrency_total_localtax2;  // not in database
+    public $multicurrency_total_localtax2; // not in database
 
     /**
      * @var string
@@ -3700,7 +3700,7 @@ 
             $newsuffix = '';
         }
         if (in_array($this->table_element, array('actioncomm', 'adherent', 'advtargetemailing', 'cronjob', 'establishment'))) {
-            $fieldusermod =  "fk_user_mod";
+            $fieldusermod = "fk_user_mod";
         } elseif ($this->table_element == 'ecm_files') {
             $fieldusermod = "fk_user_m";
         } else {
@@ -4673,14 +4673,14 @@ 
             $sql .= ", date_validation = '" . $this->db->idate(dol_now()) . "'";
         }
         $sql .= " WHERE rowid = " . ((int) $elementId);
-        $sql .= " AND " . $fieldstatus . " <> " . ((int) $status);    // We avoid update if status already correct
+        $sql .= " AND " . $fieldstatus . " <> " . ((int) $status); // We avoid update if status already correct
 
         dol_syslog(get_class($this) . "::setStatut", LOG_DEBUG);
         $resql = $this->db->query($sql);
         if ($resql) {
             $error = 0;
 
-            $nb_rows_affected = $this->db->affected_rows($resql);   // should be 1 or 0 if status was already correct
+            $nb_rows_affected = $this->db->affected_rows($resql); // should be 1 or 0 if status was already correct
 
             if ($nb_rows_affected > 0) {
                 if (empty($trigkey)) {
@@ -4725,7 +4725,7 @@ 
                     if ($fieldstatus == 'tosell') {
                         $this->status = $status;
                     } elseif ($fieldstatus == 'tobuy') {
-                        $this->status_buy = $status;    // @phpstan-ignore-line
+                        $this->status_buy = $status; // @phpstan-ignore-line
                     } else {
                         $this->status = $status;
                     }
@@ -4833,7 +4833,7 @@ 
             return -1;
         }
 
-        $arraytoscan = $this->childtables;      // array('tablename'=>array('fk_element'=>'parentfield'), ...) or array('tablename'=>array('parent'=>table_parent, 'parentkey'=>'nameoffieldforparentfkkey'), ...)
+        $arraytoscan = $this->childtables; // array('tablename'=>array('fk_element'=>'parentfield'), ...) or array('tablename'=>array('parent'=>table_parent, 'parentkey'=>'nameoffieldforparentfkkey'), ...)
         // For backward compatibility, we check if array is old format array('tablename1', 'tablename2', ...)
         $tmparray = array_keys($this->childtables);
         if (is_numeric($tmparray[0])) {
@@ -5907,7 +5907,7 @@ 
             $setsharekey = false;
             if ($this->element == 'propal' || $this->element == 'proposal') {
                 if (getDolGlobalInt("PROPOSAL_ALLOW_ONLINESIGN")) {
-                    $setsharekey = true;    // feature to make online signature is not set or set to on (default)
+                    $setsharekey = true; // feature to make online signature is not set or set to on (default)
                 }
                 if (getDolGlobalInt("PROPOSAL_ALLOW_EXTERNAL_DOWNLOAD")) {
                     $setsharekey = true;
@@ -5965,7 +5965,7 @@ 
                 $ecmfile->gen_or_uploaded = 'generated';
                 $ecmfile->description = ''; // indexed content
                 $ecmfile->keywords = ''; // keyword content
-                $ecmfile->src_object_type = $this->table_element;   // $this->table_name is 'myobject' or 'mymodule_myobject'.
+                $ecmfile->src_object_type = $this->table_element; // $this->table_name is 'myobject' or 'mymodule_myobject'.
                 $ecmfile->src_object_id   = $this->id;
 
                 $result = $ecmfile->create($user);
@@ -6017,7 +6017,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
 
             // Create small thumbs for company (Ratio is near 16/9)
             // Used on logon for example
@@ -6310,7 +6310,7 @@ 
         $savDisableCompute = $conf->disable_compute;
         $conf->disable_compute = 1;
 
-        $ret = $this->fetch($id);   /* @phpstan-ignore-line */
+        $ret = $this->fetch($id); /* @phpstan-ignore-line */
 
         $conf->disable_compute = $savDisableCompute;
 
@@ -6372,7 +6372,7 @@ 
         if (is_array($optionsArray) && count($optionsArray) > 0) {
             $sql = "SELECT rowid";
             foreach ($optionsArray as $name => $label) {
-                if (empty($extrafields->attributes[$this->table_element]['type'][$name]) || (!in_array($extrafields->attributes[$this->table_element]['type'][$name], ['separate', 'point', 'multipts', 'linestrg','polygon']))) {
+                if (empty($extrafields->attributes[$this->table_element]['type'][$name]) || (!in_array($extrafields->attributes[$this->table_element]['type'][$name], ['separate', 'point', 'multipts', 'linestrg', 'polygon']))) {
                     $sql .= ", " . $name;
                 }
                 // use geo sql fonction to read as text
@@ -6437,8 +6437,8 @@ 
                         if (!empty($extrafields->attributes[$this->table_element]) && !empty($extrafields->attributes[$this->table_element]['computed'][$key])) {
                             //var_dump($conf->disable_compute);
                             if (empty($conf->disable_compute)) {
-                                global $objectoffield;        // We set a global variable to $objectoffield so
-                                $objectoffield = $this;        // we can use it inside computed formula
+                                global $objectoffield; // We set a global variable to $objectoffield so
+                                $objectoffield = $this; // we can use it inside computed formula
                                 $this->array_options['options_' . $key] = dol_eval($extrafields->attributes[$this->table_element]['computed'][$key], 1, 0, '2');
                             }
                         }
@@ -6620,7 +6620,7 @@ 
                                         // If old value encrypted in database is same than submitted new value, it means we don't change it, so we don't update.
                                         if ($algo == 'dolcrypt') {  // dolibarr reversible encryption
                                             if (!preg_match('/^dolcrypt:/', $this->array_options[$key])) {
-                                                $new_array_options[$key] = dolEncrypt($this->array_options[$key]);  // warning, must be called when on the master
+                                                $new_array_options[$key] = dolEncrypt($this->array_options[$key]); // warning, must be called when on the master
                                             } else {
                                                 $new_array_options[$key] = $this->array_options[$key]; // Value is kept
                                             }
@@ -6631,7 +6631,7 @@ 
                                         // If value has changed
                                         if ($algo == 'dolcrypt') {  // dolibarr reversible encryption
                                             if (!preg_match('/^dolcrypt:/', $this->array_options[$key])) {
-                                                $new_array_options[$key] = dolEncrypt($this->array_options[$key]);  // warning, must be called when on the master
+                                                $new_array_options[$key] = dolEncrypt($this->array_options[$key]); // warning, must be called when on the master
                                             } else {
                                                 $new_array_options[$key] = $this->array_options[$key]; // Value is kept
                                             }
@@ -6643,7 +6643,7 @@ 
                                     //var_dump('jjj'.$algo.' '.$this->oldcopy->array_options[$key].' -> '.$this->array_options[$key]);
                                     // If this->oldcopy is not defined, we can't know if we change attribute or not, so we must keep value
                                     if ($algo == 'dolcrypt' && !preg_match('/^dolcrypt:/', $this->array_options[$key])) {   // dolibarr reversible encryption
-                                        $new_array_options[$key] = dolEncrypt($this->array_options[$key]);  // warning, must be called when on the master
+                                        $new_array_options[$key] = dolEncrypt($this->array_options[$key]); // warning, must be called when on the master
                                     } else {
                                         $new_array_options[$key] = $this->array_options[$key]; // Value is kept
                                     }
@@ -7068,7 +7068,7 @@ 
                                 if (isset($this->oldcopy->array_options["options_" . $key]) && $this->array_options["options_" . $key] == $this->oldcopy->array_options["options_" . $key]) { // If old value encrypted in database is same than submitted new value, it means we don't change it, so we don't update.
                                     if ($algo == 'dolcrypt') {  // dolibarr reversible encryption
                                         if (!preg_match('/^dolcrypt:/', $this->array_options["options_" . $key])) {
-                                            $new_array_options["options_" . $key] = dolEncrypt($this->array_options["options_" . $key]);    // warning, must be called when on the master
+                                            $new_array_options["options_" . $key] = dolEncrypt($this->array_options["options_" . $key]); // warning, must be called when on the master
                                         } else {
                                             $new_array_options["options_" . $key] = $this->array_options["options_" . $key]; // Value is kept
                                         }
@@ -7088,7 +7088,7 @@ 
                                 }
                             } else {
                                 if ($algo == 'dolcrypt' && !preg_match('/^dolcrypt:/', $this->array_options["options_" . $key])) {    // dolibarr reversible encryption
-                                    $new_array_options["options_" . $key] = dolEncrypt($this->array_options["options_" . $key]);    // warning, must be called when on the master
+                                    $new_array_options["options_" . $key] = dolEncrypt($this->array_options["options_" . $key]); // warning, must be called when on the master
                                 } else {
                                     $new_array_options["options_" . $key] = $this->array_options["options_" . $key]; // Value is kept
                                 }
@@ -7611,7 +7611,7 @@ 
             if (is_array($param['options'])) {
                 $param_list = array_keys($param['options']);
                 $InfoFieldList = explode(":", $param_list[0], 5);
-                if (! empty($InfoFieldList[4])) {
+                if (!empty($InfoFieldList[4])) {
                     $pos = 0;
                     $parenthesisopen = 0;
                     while (substr($InfoFieldList[4], $pos, 1) !== '' && ($parenthesisopen || $pos == 0 || substr($InfoFieldList[4], $pos, 1) != ':')) {
@@ -8232,7 +8232,7 @@ 
             $value = isset($param['options'][(string) $value]) ? $param['options'][(string) $value] : '';
             if (strpos($value, "|") !== false) {
                 $value = $langs->trans(explode('|', $value)[0]);
-            } elseif (! is_numeric($value)) {
+            } elseif (!is_numeric($value)) {
                 $value = $langs->trans($value);
             }
         } elseif ($type == 'sellist') {
@@ -8903,7 +8903,7 @@ 
                                     $value = $getposttemp;
                                 }
                             } elseif (in_array($extrafields->attributes[$this->table_element]['type'][$key], array('int'))) {
-                                $value = ( !empty($this->array_options["options_" . $key]) || $this->array_options["options_" . $key] === '0' ) ? $this->array_options["options_" . $key] : '';
+                                $value = (!empty($this->array_options["options_" . $key]) || $this->array_options["options_" . $key] === '0') ? $this->array_options["options_" . $key] : '';
                             } else {
                                 $value = (!empty($this->array_options["options_" . $key]) ? $this->array_options["options_" . $key] : ''); // No GET, no POST, no default value, so we take value of object.
                             }
@@ -10042,7 +10042,7 @@ 
         if (!$error) {
             $sql = "INSERT INTO " . $this->db->prefix() . $this->table_element;
             $sql .= " (" . implode(", ", $keys) . ')';
-            $sql .= " VALUES (" . implode(", ", $values) . ")";     // $values can contains 'abc' or 123
+            $sql .= " VALUES (" . implode(", ", $values) . ")"; // $values can contains 'abc' or 123
 
             $res = $this->db->query($sql);
             if (!$res) {
@@ -10339,7 +10339,7 @@ 
 
         // Update extrafield
         if (!$error) {
-            $result = $this->insertExtraFields();   // This delete and reinsert extrafields
+            $result = $this->insertExtraFields(); // This delete and reinsert extrafields
             if ($result < 0) {
                 $error++;
             }
@@ -10541,7 +10541,7 @@ 
                 $error++;
             } else {
                 while ($obj = $this->db->fetch_object($resql)) {
-                    $result = $this->fetch($obj->rowid);    // @phpstan-ignore-line
+                    $result = $this->fetch($obj->rowid); // @phpstan-ignore-line
                     if ($result < 0) {
                         $error++;
                         $this->errors[] = $this->error;
@@ -10762,7 +10762,7 @@ 
         );
         foreach ($fields as $key => $value) {
             if (array_key_exists($key, $this->fields)) {
-                $this->{$key} = $value;     // @phpstan-ignore-line
+                $this->{$key} = $value; // @phpstan-ignore-line
             }
         }