alxarafe / alixar

public/htdocs/core/tpl/massactions_pre.tpl.php

Spacing +3 added lines, -3 removed lines

@@ -189,7 +189,7 @@ 
             $result = $objecttmp->fetch($toselectid);
             if ($result > 0) {
                 $listofselectedid[$toselectid] = $toselectid;
-                $thirdpartyid = ($objecttmp->fk_soc ? $objecttmp->fk_soc : $objecttmp->socid);  // For proposal, order, invoice, conferenceorbooth, ...
+                $thirdpartyid = ($objecttmp->fk_soc ? $objecttmp->fk_soc : $objecttmp->socid); // For proposal, order, invoice, conferenceorbooth, ...
                 if (in_array($objecttmp->element, array('societe', 'conferenceorboothattendee'))) {
                     $thirdpartyid = $objecttmp->id;
                 } elseif ($objecttmp->element == 'contact') {
@@ -270,7 +270,7 @@ 
         $formmail->withfile = 0;
         $formmail->withmaindocfile = 0; // Add a checkbox "Attach also main document"
     } else {
-        $formmail->withfile = 1;    // $formmail->withfile = 2 to allow to upload files is not yet supported in mass action
+        $formmail->withfile = 1; // $formmail->withfile = 2 to allow to upload files is not yet supported in mass action
         // Add a checkbox "Attach also main document"
         if (isset($withmaindocfilemail)) {
             $formmail->withmaindocfile = $withmaindocfilemail;
@@ -307,7 +307,7 @@ 
 
     // Tableau des parameters complementaires du post
     $formmail->param['action'] = $action;
-    $formmail->param['models'] = $modelmail;    // the filter to know which kind of template emails to show. 'none' means no template suggested.
+    $formmail->param['models'] = $modelmail; // the filter to know which kind of template emails to show. 'none' means no template suggested.
     $formmail->param['models_id'] = GETPOSTINT('modelmailselected') ? GETPOSTINT('modelmailselected') : '-1';
     $formmail->param['id'] = implode(',', $arrayofselected);
     // $formmail->param['returnurl']=$_SERVER["PHP_SELF"].'?id='.$object->id;

public/htdocs/core/class/cgenericdic.class.php

Spacing +2 added lines, -2 removed lines

@@ -37,12 +37,12 @@
     /**
      * @var string Id to identify managed objects
      */
-    public $element = 'undefined';  // Will be defined into constructor
+    public $element = 'undefined'; // Will be defined into constructor
 
     /**
      * @var string Name of table without prefix where object is stored
      */
-    public $table_element = 'undefined';    // Will be defined into constructor
+    public $table_element = 'undefined'; // Will be defined into constructor
 
     /**
      * @var CtyperesourceLine[] Lines

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

Spacing +1 added lines, -1 removed lines

@@ -158,7 +158,7 @@
             $maxphptoshow = $maxfilesizearray['maxphptoshow'];
             $maxphptoshowparam = $maxfilesizearray['maxphptoshowparam'];
             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 class="flat minwidth400 maxwidth200onsmartphone" type="file"';
             $out .= ((getDolGlobalString('MAIN_DISABLE_MULTIPLE_FILEUPLOAD') || $disablemulti) ? ' name="userfile"' : ' name="userfile[]" multiple');

public/htdocs/core/class/vcard.class.php

Spacing +2 added lines, -2 removed lines

@@ -135,7 +135,7 @@ 
     {
         // $type = "GIF" | "JPEG"
         //$this->properties["PHOTO;MEDIATYPE=$type;ENCODING=BASE64"] = base64_encode($photo);
-        $this->properties["PHOTO;MEDIATYPE=$type"] = $photo;        // must be url of photo
+        $this->properties["PHOTO;MEDIATYPE=$type"] = $photo; // must be url of photo
         //$this->properties["PHOTO;TYPE=$type;ENCODING=BASE64"] = base64_encode($photo);   // must be content of image
     }
 
@@ -359,7 +359,7 @@ 
     public function getVCard()
     {
         $text = "BEGIN:VCARD\r\n";
-        $text .= "VERSION:4.0\r\n";     // With V4, all encoding are UTF-8
+        $text .= "VERSION:4.0\r\n"; // With V4, all encoding are UTF-8
         //$text.= "VERSION:2.1\r\n";
         foreach ($this->properties as $key => $value) {
             $newkey = preg_replace('/-.*$/', '', $key); // remove suffix -twitter, -facebook, ...

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

Spacing +1 added lines, -1 removed lines

@@ -886,7 +886,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
                         }
                         // Can add other files
                         if (!getDolGlobalString('FROM_MAIL_DONT_USE_INPUT_FILE_MULTIPLE')) {

public/htdocs/core/class/extrafields.class.php

Spacing +8 added lines, -8 removed lines

@@ -1239,7 +1239,7 @@ 
             } else {
                 $out = $form->selectyesno($keyprefix . $key . $keysuffix, $value, 1, false, 1);
             }
-            $out .= '<input type="hidden" name="' . $keyprefix . $key . $keysuffix . '_boolean" value="1">';    // A hidden field ending with "_boolean" that is always set to 1.
+            $out .= '<input type="hidden" name="' . $keyprefix . $key . $keysuffix . '_boolean" value="1">'; // A hidden field ending with "_boolean" that is always set to 1.
         } elseif ($type == 'price') {
             if (!empty($value)) {       // $value in memory is a php numeric, we format it into user number format.
                 $value = price($value);
@@ -1707,7 +1707,7 @@ 
 
             $tmparray = explode(':', $param_list[0]);
 
-            $element = $extrafieldsobjectkey;       // $extrafieldsobjectkey comes from $object->table_element but we need $object->element
+            $element = $extrafieldsobjectkey; // $extrafieldsobjectkey comes from $object->table_element but we need $object->element
             if ($element == 'socpeople') {
                 $element = 'contact';
             } elseif ($element == 'projet') {
@@ -1715,8 +1715,8 @@ 
             }
 
             //$objectdesc = $param_list[0];             // Example: 'ObjectName:classPath:1:(status:=:1)'   Replaced by next line: this was propagated also a filter by ajax call that was blocked by some WAF
-            $objectdesc = $tmparray[0];                 // Example: 'ObjectName:classPath'                  To not propagate any filter (selectForForms do ajax call and propagating SQL filter is blocked by some WAF). Also we should use the one into the definition in the ->fields of $elem if found.
-            $objectfield = $element . ':options_' . $key;   // Example: 'actioncomm:options_fff'                To be used in priority to know object linked with all its definition (including filters)
+            $objectdesc = $tmparray[0]; // Example: 'ObjectName:classPath'                  To not propagate any filter (selectForForms do ajax call and propagating SQL filter is blocked by some WAF). Also we should use the one into the definition in the ->fields of $elem if found.
+            $objectfield = $element . ':options_' . $key; // Example: 'actioncomm:options_fff'                To be used in priority to know object linked with all its definition (including filters)
 
             $out = $form->selectForForms($objectdesc, $keyprefix . $key . $keysuffix, $value, $showempty, '', '', $morecss, '', 0, 0, '', $objectfield);
         } elseif (in_array($type, ['point', 'multipts', 'linestrg', 'polygon'])) {
@@ -1781,7 +1781,7 @@ 
 
         $label = $this->attributes[$extrafieldsobjectkey]['label'][$key];
         $type = $this->attributes[$extrafieldsobjectkey]['type'][$key];
-        $size = $this->attributes[$extrafieldsobjectkey]['size'][$key];         // Can be '255', '24,8'...
+        $size = $this->attributes[$extrafieldsobjectkey]['size'][$key]; // Can be '255', '24,8'...
         $default = $this->attributes[$extrafieldsobjectkey]['default'][$key];
         $computed = $this->attributes[$extrafieldsobjectkey]['computed'][$key];
         $unique = $this->attributes[$extrafieldsobjectkey]['unique'][$key];
@@ -2109,7 +2109,7 @@ 
             } else {
                 $value = '';
             }
-        } elseif (in_array($type, ['multipts','linestrg', 'polygon'])) {
+        } elseif (in_array($type, ['multipts', 'linestrg', 'polygon'])) {
             if (!empty($value)) {
                 require_once constant('DOL_DOCUMENT_ROOT') . '/core/class/dolgeophp.class.php';
                 $dolgeophp = new DolGeoPHP($this->db);
@@ -2300,7 +2300,7 @@ 
                     continue;
                 }
 
-                if (!empty($onlykey) && $onlykey == '@GETPOSTISSET' && !GETPOSTISSET('options_' . $key) && (! in_array($this->attributes[$object->table_element]['type'][$key], array('boolean', 'checkbox', 'chkbxlst', 'point', 'multipts', 'linestrg', 'polygon')))) {
+                if (!empty($onlykey) && $onlykey == '@GETPOSTISSET' && !GETPOSTISSET('options_' . $key) && (!in_array($this->attributes[$object->table_element]['type'][$key], array('boolean', 'checkbox', 'chkbxlst', 'point', 'multipts', 'linestrg', 'polygon')))) {
                     //when unticking boolean field, it's not set in POST
                     continue;
                 }
@@ -2330,7 +2330,7 @@ 
                         $onlykey === '@GETPOSTISSET'
                         && in_array($this->attributes[$object->table_element]['type'][$key], array('boolean', 'checkbox', 'chkbxlst'))
                         && in_array(abs($enabled), array(2, 5))
-                        && ! GETPOSTISSET('options_' . $key) // Update hidden checkboxes and multiselect only if they are provided
+                        && !GETPOSTISSET('options_' . $key) // Update hidden checkboxes and multiselect only if they are provided
                     )
                 ) {
                     continue;

public/htdocs/core/class/fileupload.class.php

Spacing +1 added lines, -1 removed lines

@@ -428,7 +428,7 @@
         // Sanitize to avoid stream execution when calling file_size(). Not that this is a second security because
         // most streams are already disabled by stream_wrapper_unregister() in filefunc.inc.php
         $uploaded_file = preg_replace('/\s*(http|ftp)s?:/i', '', $uploaded_file);
-        $uploaded_file = realpath($uploaded_file);  // A hack to be sure the file point to an existing file on disk (and is not a SSRF attack)
+        $uploaded_file = realpath($uploaded_file); // A hack to be sure the file point to an existing file on disk (and is not a SSRF attack)
 
         $validate = $this->validate($uploaded_file, $file, $error, $index);
 

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

Spacing +3 added lines, -3 removed lines

@@ -898,7 +898,7 @@ 
         } elseif ($this->type == 'html') {
             $out .= $this->generateInputFieldHtml();
         } elseif ($this->type == 'color') {
-            $out .=  $this->generateInputFieldColor();
+            $out .= $this->generateInputFieldColor();
         } elseif ($this->type == 'yesno') {
             if (!empty($conf->use_javascript_ajax)) {
                 $out .= ajax_constantonoff($this->confKey);
@@ -1209,9 +1209,9 @@ 
         } elseif ($this->type == 'selectUser') {
             $out .= $this->generateOutputFieldSelectUser();
         } elseif ($this->type == 'html') {
-            $out .=  $this->fieldValue;
+            $out .= $this->fieldValue;
         } elseif ($this->type == 'color') {
-            $out .=  $this->generateOutputFieldColor();
+            $out .= $this->generateOutputFieldColor();
         } elseif ($this->type == 'yesno') {
             if (!empty($conf->use_javascript_ajax)) {
                 $out .= ajax_constantonoff($this->confKey, array(), $this->entity); // TODO possibility to add $input parameter

public/htdocs/core/class/CMailFile.class.php

Spacing +10 added lines, -10 removed lines

@@ -365,7 +365,7 @@ 
                     }
                 }
                 if ($emailtoadd && preg_match('/' . preg_quote($emailtoadd, '/') . '/i', $to)) {
-                    $emailtoadd = '';   // Email already in the "To"
+                    $emailtoadd = ''; // Email already in the "To"
                 }
                 if ($emailtoadd) {
                     $listofemailstoadd[$key] = $emailtoadd;
@@ -559,7 +559,7 @@ 
                     $this->buildCSS();
                 }
                 $msg = $this->html;
-                $msg = $this->checkIfHTML($msg);        // This add a header and a body including custom CSS to the HTML content
+                $msg = $this->checkIfHTML($msg); // This add a header and a body including custom CSS to the HTML content
             }
 
             // Replace . alone on a new line with .. to avoid to have SMTP interpret this as end of message
@@ -706,7 +706,7 @@ 
                     $this->buildCSS();
                 }
                 $msg = $this->html;
-                $msg = $this->checkIfHTML($msg);        // This add a header and a body including custom CSS to the HTML content
+                $msg = $this->checkIfHTML($msg); // This add a header and a body including custom CSS to the HTML content
             }
 
             if ($this->atleastoneimage) {
@@ -1149,8 +1149,8 @@ 
                     }
 
                     $smtperrorcode = 0;
-                    if (! $result) {
-                        $smtperrorcode = $this->smtps->lastretval;  // SMTP error code
+                    if (!$result) {
+                        $smtperrorcode = $this->smtps->lastretval; // SMTP error code
                         dol_syslog("CMailFile::sendfile: mail SMTP error code " . $smtperrorcode, LOG_WARNING);
 
                         if ($smtperrorcode == '421') {  // Try later
@@ -1168,7 +1168,7 @@ 
                         }
                     }
 
-                    $result = $this->smtps->getErrors();    // applicative error code (not SMTP error code)
+                    $result = $this->smtps->getErrors(); // applicative error code (not SMTP error code)
                     if (empty($this->error) && empty($result)) {
                         dol_syslog("CMailFile::sendfile: mail end success", LOG_DEBUG);
                         $res = true;
@@ -1418,7 +1418,7 @@ 
 
         if (@is_writable($dolibarr_main_data_root)) {   // Avoid fatal error on fopen with open_basedir
             $outputfile = $dolibarr_main_data_root . "/dolibarr_mail.log";
-            $fp = fopen($outputfile, "w");  // overwrite
+            $fp = fopen($outputfile, "w"); // overwrite
 
             if ($this->sendmode == 'mail') {
                 fwrite($fp, $this->headers);
@@ -1683,11 +1683,11 @@ 
             // Similar code to forge a text from html is also in smtps.class.php
             $strContentAltText = preg_replace("/<br\s*[^>]*>/", " ", $strContent);
             // TODO We could replace <img ...> with [Filename.ext] like Gmail do.
-            $strContentAltText = html_entity_decode(strip_tags($strContentAltText));    // Remove any HTML tags
+            $strContentAltText = html_entity_decode(strip_tags($strContentAltText)); // Remove any HTML tags
             $strContentAltText = trim(wordwrap($strContentAltText, 75, !getDolGlobalString('MAIN_FIX_FOR_BUGGED_MTA') ? "\r\n" : "\n"));
 
             // Check if html header already in message, if not complete the message
-            $strContent = $this->checkIfHTML($strContent);      // This add a header and a body including custom CSS to the HTML content
+            $strContent = $this->checkIfHTML($strContent); // This add a header and a body including custom CSS to the HTML content
         }
 
         // Make RFC2045 Compliant, split lines
@@ -2075,7 +2075,7 @@ 
                 // We save the image to send in disk
                 $filecontent = $matches[2][$key];
 
-                $cid = 'cid000' . dol_hash($filecontent, 'md5');      // The id must not change if image is same
+                $cid = 'cid000' . dol_hash($filecontent, 'md5'); // The id must not change if image is same
 
                 $destfiletmp = $images_dir . '/' . $cid . '.' . $ext;