alxarafe / alixar

public/htdocs/categories/traduction.php

Spacing +1 added lines, -1 removed lines

@@ -59,7 +59,7 @@
 
 $type = $object->type;
 if (is_numeric($type)) {
-    $type = Categorie::$MAP_ID_TO_CODE[$type];   // For backward compatibility
+    $type = Categorie::$MAP_ID_TO_CODE[$type]; // For backward compatibility
 }
 
 

public/htdocs/emailcollector/lib/emailcollector.lib.php

Spacing +2 added lines, -2 removed lines

@@ -118,7 +118,7 @@ 
  */
 function getAttachments($jk, $mbox)
 {
-    $structure = imap_fetchstructure($mbox, $jk, FT_UID);  // @phan-suppress-current-line PhanTypeMismatchArgumentInternal
+    $structure = imap_fetchstructure($mbox, $jk, FT_UID); // @phan-suppress-current-line PhanTypeMismatchArgumentInternal
     $parts = getParts($structure);
 
     $fpos = 2;
@@ -155,7 +155,7 @@ 
  */
 function getFileData($jk, $fpos, $type, $mbox)
 {
-    $merge = imap_fetchbody($mbox, $jk, $fpos, FT_UID);  // @phan-suppress-current-line PhanTypeMismatchArgumentInternal
+    $merge = imap_fetchbody($mbox, $jk, $fpos, FT_UID); // @phan-suppress-current-line PhanTypeMismatchArgumentInternal
     $data = getDecodeValue($merge, $type);
 
     return $data;

public/htdocs/emailcollector/class/emailcollector.class.php

Spacing +30 added lines, -30 removed lines

@@ -32,19 +32,19 @@ 
 require_once constant('DOL_DOCUMENT_ROOT') . '/core/lib/files.lib.php';
 require_once constant('DOL_DOCUMENT_ROOT') . '/core/lib/functions2.lib.php';
 
-require_once constant('DOL_DOCUMENT_ROOT') . '/comm/propal/class/propal.class.php';                   // Customer Proposal
-require_once constant('DOL_DOCUMENT_ROOT') . '/commande/class/commande.class.php';                    // Sale Order
-require_once constant('DOL_DOCUMENT_ROOT') . '/compta/facture/class/facture.class.php';               // Customer Invoice
-require_once constant('DOL_DOCUMENT_ROOT') . '/contact/class/contact.class.php';                      // Contact / Address
-require_once constant('DOL_DOCUMENT_ROOT') . '/expedition/class/expedition.class.php';                // Shipping / Delivery
-require_once constant('DOL_DOCUMENT_ROOT') . '/fourn/class/fournisseur.commande.class.php';           // Purchase Order
-require_once constant('DOL_DOCUMENT_ROOT') . '/fourn/class/fournisseur.facture.class.php';            // Purchase Invoice
-require_once constant('DOL_DOCUMENT_ROOT') . '/projet/class/project.class.php';                       // Project
-require_once constant('DOL_DOCUMENT_ROOT') . '/reception/class/reception.class.php';                  // Reception
-require_once constant('DOL_DOCUMENT_ROOT') . '/recruitment/class/recruitmentcandidature.class.php';   // Recruiting
-require_once constant('DOL_DOCUMENT_ROOT') . '/societe/class/societe.class.php';                      // Third-Party
-require_once constant('DOL_DOCUMENT_ROOT') . '/supplier_proposal/class/supplier_proposal.class.php';  // Supplier Proposal
-require_once constant('DOL_DOCUMENT_ROOT') . '/ticket/class/ticket.class.php';                        // Ticket
+require_once constant('DOL_DOCUMENT_ROOT') . '/comm/propal/class/propal.class.php'; // Customer Proposal
+require_once constant('DOL_DOCUMENT_ROOT') . '/commande/class/commande.class.php'; // Sale Order
+require_once constant('DOL_DOCUMENT_ROOT') . '/compta/facture/class/facture.class.php'; // Customer Invoice
+require_once constant('DOL_DOCUMENT_ROOT') . '/contact/class/contact.class.php'; // Contact / Address
+require_once constant('DOL_DOCUMENT_ROOT') . '/expedition/class/expedition.class.php'; // Shipping / Delivery
+require_once constant('DOL_DOCUMENT_ROOT') . '/fourn/class/fournisseur.commande.class.php'; // Purchase Order
+require_once constant('DOL_DOCUMENT_ROOT') . '/fourn/class/fournisseur.facture.class.php'; // Purchase Invoice
+require_once constant('DOL_DOCUMENT_ROOT') . '/projet/class/project.class.php'; // Project
+require_once constant('DOL_DOCUMENT_ROOT') . '/reception/class/reception.class.php'; // Reception
+require_once constant('DOL_DOCUMENT_ROOT') . '/recruitment/class/recruitmentcandidature.class.php'; // Recruiting
+require_once constant('DOL_DOCUMENT_ROOT') . '/societe/class/societe.class.php'; // Third-Party
+require_once constant('DOL_DOCUMENT_ROOT') . '/supplier_proposal/class/supplier_proposal.class.php'; // Supplier Proposal
+require_once constant('DOL_DOCUMENT_ROOT') . '/ticket/class/ticket.class.php'; // Ticket
 //require_once DOL_DOCUMENT_ROOT .'/expensereport/class/expensereport.class.php';        // Expense Report
 //require_once DOL_DOCUMENT_ROOT .'/holiday/class/holiday.class.php';                    // Holidays (leave request)
 
@@ -821,8 +821,8 @@ 
     {
         if (function_exists('mb_convert_encoding')) {
             // change spaces by entropy because mb_convert fail with spaces
-            $str = preg_replace("/ /", "xxxSPACExxx", $str);        // the replacement string must be valid in utf7 so _ can't be used
-            $str = preg_replace("/\[Gmail\]/", "xxxGMAILxxx", $str);    // the replacement string must be valid in utf7 so _ can't be used
+            $str = preg_replace("/ /", "xxxSPACExxx", $str); // the replacement string must be valid in utf7 so _ can't be used
+            $str = preg_replace("/\[Gmail\]/", "xxxGMAILxxx", $str); // the replacement string must be valid in utf7 so _ can't be used
             // if mb_convert work
             if ($str = mb_convert_encoding($str, "UTF-7")) {
                 // change characters
@@ -1444,7 +1444,7 @@ 
                 }
 
                 if ($rule['type'] == 'from') {
-                    $tmprulevaluearray = explode('*', $rule['rulevalue']);  // Search on abc*def means searching on 'abc' and on 'def'
+                    $tmprulevaluearray = explode('*', $rule['rulevalue']); // Search on abc*def means searching on 'abc' and on 'def'
                     if (count($tmprulevaluearray) >= 2) {
                         foreach ($tmprulevaluearray as $tmprulevalue) {
                             $search .= ($search ? ' ' : '') . $not . 'FROM "' . str_replace('"', '', $tmprulevalue) . '"';
@@ -1454,7 +1454,7 @@ 
                     }
                 }
                 if ($rule['type'] == 'to') {
-                    $tmprulevaluearray = explode('*', $rule['rulevalue']);  // Search on abc*def means searching on 'abc' and on 'def'
+                    $tmprulevaluearray = explode('*', $rule['rulevalue']); // Search on abc*def means searching on 'abc' and on 'def'
                     if (count($tmprulevaluearray) >= 2) {
                         foreach ($tmprulevaluearray as $tmprulevalue) {
                             $search .= ($search ? ' ' : '') . $not . 'TO "' . str_replace('"', '', $tmprulevalue) . '"';
@@ -1641,7 +1641,7 @@ 
             }
         }
 
-        $arrayofemailtodelete = array();    // Track email to delete to make the deletion at end.
+        $arrayofemailtodelete = array(); // Track email to delete to make the deletion at end.
 
         // Loop on each email found
         if (!$error && !empty($arrayofemail) && count($arrayofemail) > 0) {
@@ -1973,7 +1973,7 @@ 
                     $tmpdate = $overview['date']->toDate();
                     $tmptimezone = $tmpdate->getTimezone()->getName();
 
-                    $dateemail = dol_stringtotime((string) $overview['date'], 'gmt');    // if $overview['timezone'] is "+00:00"
+                    $dateemail = dol_stringtotime((string) $overview['date'], 'gmt'); // if $overview['timezone'] is "+00:00"
                     if (preg_match('/^([+\-])(\d\d):(\d\d)/', $tmptimezone, $reg)) {
                         if ($reg[1] == '+' && ($reg[2] != '00' || $reg[3] != '00')) {
                             $dateemail -= (3600 * (int) $reg[2]);
@@ -1987,7 +1987,7 @@ 
                     $subject = $overview['subject'];
                 } else {
                     $fromstring = $overview[0]->from;
-                    $replytostring = (!empty($overview['in_reply-to']) ? $overview['in_reply-to'] : (!empty($headers['Reply-To']) ? $headers['Reply-To'] : "")) ;
+                    $replytostring = (!empty($overview['in_reply-to']) ? $overview['in_reply-to'] : (!empty($headers['Reply-To']) ? $headers['Reply-To'] : ""));
 
                     $sender = !empty($overview[0]->sender) ? $overview[0]->sender : '';
                     $to = $overview[0]->to;
@@ -2058,15 +2058,15 @@ 
                 foreach ($arrayofreferences as $reference) {
                     //print "Process mail ".$iforemailloop." email_msgid ".$msgid.", date ".dol_print_date($dateemail, 'dayhour', 'gmt').", subject ".$subject.", reference ".dol_escape_htmltag($reference)."<br>\n";
                     if (!empty($trackidfoundintorecipienttype)) {
-                        $resultsearchtrackid = -1;      // trackid found
+                        $resultsearchtrackid = -1; // trackid found
                         $reg[1] = $trackidfoundintorecipienttype;
                         $reg[2] = $trackidfoundintorecipientid;
                     } elseif (!empty($trackidfoundintomsgidtype)) {
-                        $resultsearchtrackid = -1;      // trackid found
+                        $resultsearchtrackid = -1; // trackid found
                         $reg[1] = $trackidfoundintomsgidtype;
                         $reg[2] = $trackidfoundintomsgidid;
                     } else {
-                        $resultsearchtrackid = preg_match('/dolibarr-([a-z]+)([0-9]+)@' . preg_quote($host, '/') . '/', $reference, $reg);  // trackid found or not
+                        $resultsearchtrackid = preg_match('/dolibarr-([a-z]+)([0-9]+)@' . preg_quote($host, '/') . '/', $reference, $reg); // trackid found or not
                         if (empty($resultsearchtrackid) && getDolGlobalString('EMAIL_ALTERNATIVE_HOST_SIGNATURE')) {
                             $resultsearchtrackid = preg_match('/dolibarr-([a-z]+)([0-9]+)@' . preg_quote(getDolGlobalString('EMAIL_ALTERNATIVE_HOST_SIGNATURE'), '/') . '/', $reference, $reg); // trackid found
                         }
@@ -2364,7 +2364,7 @@ 
 
                         // Make Operation
                         dol_syslog("Execute action " . $operation['type'] . " actionparam=" . $operation['actionparam'] . ' thirdpartystatic->id=' . $thirdpartystatic->id . ' contactstatic->id=' . $contactstatic->id . ' projectstatic->id=' . $projectstatic->id);
-                        dol_syslog("Execute action fk_element_id=" . $fk_element_id . " fk_element_type=" . $fk_element_type);    // If a Dolibarr tracker id is found, we should now the id of object
+                        dol_syslog("Execute action fk_element_id=" . $fk_element_id . " fk_element_type=" . $fk_element_type); // If a Dolibarr tracker id is found, we should now the id of object
 
                         // Try to guess if this is an email in or out.
                         $actioncode = 'EMAIL_IN';
@@ -2417,7 +2417,7 @@ 
                                     $operationslog .= '<br>Ticket not found using trackid=' . $trackid . ' or msgid=' . $msgid;
                                     $ticketalreadyexists = 0;
                                 } else {
-                                    $operationslog .= '<br>Ticket already found using trackid=' . $trackid . ' or msgid=' . $msgid;   // We change the operation type to do
+                                    $operationslog .= '<br>Ticket already found using trackid=' . $trackid . ' or msgid=' . $msgid; // We change the operation type to do
                                     $ticketalreadyexists = 1;
                                     $operation['type'] = 'recordevent';
                                 }
@@ -2791,8 +2791,8 @@ 
                                 $actioncomm->label       = $langs->trans("ActionAC_" . $actioncode) . ' - ' . $langs->trans("MailFrom") . ' ' . $from;
                                 $actioncomm->note_private = $descriptionfull;
                                 $actioncomm->fk_project  = $projectstatic->id;
-                                $actioncomm->datep       = $dateemail;  // date of email
-                                $actioncomm->datef       = $dateemail;  // date of email
+                                $actioncomm->datep       = $dateemail; // date of email
+                                $actioncomm->datef       = $dateemail; // date of email
                                 $actioncomm->percentage  = -1; // Not applicable
                                 $actioncomm->socid       = $thirdpartystatic->id;
                                 $actioncomm->contact_id = $contactstatic->id;
@@ -2991,7 +2991,7 @@ 
                                 }
                                 $hookmanager->initHooks(array('emailcolector'));
                                 $parameters = array('arrayobject' => $arrayobject);
-                                $reshook = $hookmanager->executeHooks('addmoduletoeamailcollectorjoinpiece', $parameters);    // Note that $action and $object may have been modified by some hooks
+                                $reshook = $hookmanager->executeHooks('addmoduletoeamailcollectorjoinpiece', $parameters); // Note that $action and $object may have been modified by some hooks
                                 if ($reshook > 0) {
                                     $arrayobject = $hookmanager->resArray;
                                 }
@@ -3080,7 +3080,7 @@ 
                                 $percent_opp_status = dol_getIdFromCode($this->db, 'PROSP', 'c_lead_status', 'code', 'percent');
 
                                 $projecttocreate->title = $subject;
-                                $projecttocreate->date_start = $date;   // date of email
+                                $projecttocreate->date_start = $date; // date of email
                                 $projecttocreate->date_end = 0;
                                 $projecttocreate->opp_status = $id_opp_status;
                                 $projecttocreate->opp_percent = $percent_opp_status;
@@ -3342,7 +3342,7 @@ 
                                 $candidaturetocreate->note_private = $descriptionfull;
                                 $candidaturetocreate->entity = $conf->entity;
                                 $candidaturetocreate->email_msgid = $msgid;
-                                $candidaturetocreate->email_date = $date;       // date of email
+                                $candidaturetocreate->email_date = $date; // date of email
                                 $candidaturetocreate->status = $candidaturetocreate::STATUS_DRAFT;
                                 //$candidaturetocreate->fk_contact = $contactstatic->id;
 

public/htdocs/expedition/ajax/searchfrombarcode.php

Spacing +6 added lines, -6 removed lines

@@ -98,22 +98,22 @@
                     $fk_product = $obj->fk_product;
                     $reelqty = $obj->reel;
 
-                    $objectreturn = array('fk_warehouse' => $warehouseid,'fk_product' => $fk_product,'reelqty' => $reelqty);
+                    $objectreturn = array('fk_warehouse' => $warehouseid, 'fk_product' => $fk_product, 'reelqty' => $reelqty);
                 }
             }
         }
         if ($warehousefound < 1) {
-            $response = array('status' => 'error','errorcode' => 'NotFound','message' => 'No warehouse found for barcode' . $barcode);
+            $response = array('status' => 'error', 'errorcode' => 'NotFound', 'message' => 'No warehouse found for barcode' . $barcode);
         } elseif ($warehousefound > 1) {
-            $response = array('status' => 'error','errorcode' => 'TooManyWarehouse','message' => 'Too many warehouse found');
+            $response = array('status' => 'error', 'errorcode' => 'TooManyWarehouse', 'message' => 'Too many warehouse found');
         } else {
-            $response = array('status' => 'success','message' => 'Warehouse found','object' => $objectreturn);
+            $response = array('status' => 'success', 'message' => 'Warehouse found', 'object' => $objectreturn);
         }
     } else {
-        $response = array('status' => 'error','errorcode' => 'NotFound','message' => "No results found for barcode");
+        $response = array('status' => 'error', 'errorcode' => 'NotFound', 'message' => "No results found for barcode");
     }
 } else {
-    $response = array('status' => 'error','errorcode' => 'ActionError','message' => "Error on action");
+    $response = array('status' => 'error', 'errorcode' => 'ActionError', 'message' => "Error on action");
 }
 
 $response = json_encode($response);

public/htdocs/expedition/card.php

Spacing +2 added lines, -2 removed lines

@@ -1449,7 +1449,7 @@ 
                                         $tooltipClass = ' classfortooltip';
                                         $tooltipTitle = $langs->trans('StockQuantitiesAlreadyAllocatedOnPreviousLines') . ' : ' . $alreadyQtyBatchSetted[$line->fk_product][$dbatch->batch][intval($warehouse_id)];
                                     } else {
-                                        $alreadyQtyBatchSetted[$line->fk_product][$dbatch->batch][intval($warehouse_id)] = 0 ;
+                                        $alreadyQtyBatchSetted[$line->fk_product][$dbatch->batch][intval($warehouse_id)] = 0;
                                     }
                                     $alreadyQtyBatchSetted[$line->fk_product][$dbatch->batch][intval($warehouse_id)] = $deliverableQty + $alreadyQtyBatchSetted[$line->fk_product][$dbatch->batch][intval($warehouse_id)];
 
@@ -1688,7 +1688,7 @@ 
                                             $tooltipClass = ' classfortooltip';
                                             $tooltipTitle = $langs->trans('StockQuantitiesAlreadyAllocatedOnPreviousLines') . ' : ' . $alreadyQtyBatchSetted[$line->fk_product][$dbatch->batch][intval($warehouse_id)];
                                         } else {
-                                            $alreadyQtyBatchSetted[$line->fk_product][$dbatch->batch][intval($warehouse_id)] = 0 ;
+                                            $alreadyQtyBatchSetted[$line->fk_product][$dbatch->batch][intval($warehouse_id)] = 0;
                                         }
                                         $alreadyQtyBatchSetted[$line->fk_product][$dbatch->batch][intval($warehouse_id)] = $deliverableQty + $alreadyQtyBatchSetted[$line->fk_product][$dbatch->batch][intval($warehouse_id)];
 

public/htdocs/expedition/dispatch.php

Spacing +6 added lines, -6 removed lines

@@ -180,8 +180,8 @@ 
                         $sql .= " JOIN " . MAIN_DB_PREFIX . "product_stock as ps";
                         $sql .= " ON ps.rowid = pb.fk_product_stock";
                         $sql .= " WHERE pb.batch = '" . $db->escape($lot) . "'";
-                        $sql .= " AND ps.fk_product = " . ((int) $prod_id) ;
-                        $sql .= " AND ps.fk_entrepot = " . ((int) $warehouse_id) ;
+                        $sql .= " AND ps.fk_product = " . ((int) $prod_id);
+                        $sql .= " AND ps.fk_entrepot = " . ((int) $warehouse_id);
 
                         $resql = $db->query($sql);
                         if ($resql) {
@@ -209,7 +209,7 @@ 
                     $qtystart = 0;
 
                     if ($idline > 0) {
-                        $result = $expeditiondispatch->fetch($idline);  // get line from llx_expeditiondet
+                        $result = $expeditiondispatch->fetch($idline); // get line from llx_expeditiondet
                         if ($result < 0) {
                             setEventMessages($expeditiondispatch->error, $expeditiondispatch->errors, 'errors');
                             $error++;
@@ -382,7 +382,7 @@ 
 llxHeader('', $title, $help_url, '', 0, 0, $morejs);
 
 if ($object->id > 0 || !empty($object->ref)) {
-    $lines = $object->lines;    // This is an array of detail of line, on line per source order line found intolines[]->fk_elementdet, then each line may have sub data
+    $lines = $object->lines; // This is an array of detail of line, on line per source order line found intolines[]->fk_elementdet, then each line may have sub data
     //var_dump($lines[0]->fk_elementdet); exit;
 
     $num_prod = count($lines);
@@ -531,7 +531,7 @@ 
     print '<center>';
 
     print '<br>';
-    $disabled = 0;  // This is used to disable or not the bulk selection of target warehouse. No reason to have it disabled so forced to 0.
+    $disabled = 0; // This is used to disable or not the bulk selection of target warehouse. No reason to have it disabled so forced to 0.
 
     if ($object->statut == Expedition::STATUS_DRAFT) {
         require_once constant('DOL_DOCUMENT_ROOT') . '/product/class/html.formproduct.class.php';
@@ -635,7 +635,7 @@ 
                 }
                 print '<td class="right">' . $langs->trans("QtyOrdered") . '</td>';
                 if ($object->status == Expedition::STATUS_DRAFT) {
-                    print '<td class="right">' . $langs->trans("QtyToShip");  // Qty to dispatch (sum for all lines of batch detail if there is)
+                    print '<td class="right">' . $langs->trans("QtyToShip"); // Qty to dispatch (sum for all lines of batch detail if there is)
                 } else {
                     print '<td class="right">' . $langs->trans("QtyDispatchedShort") . '</td>';
                 }

public/htdocs/expedition/list.php

Spacing +1 added lines, -1 removed lines

@@ -153,7 +153,7 @@
 
 $object->fields = dol_sort_array($object->fields, 'position');
 $arrayfields = dol_sort_array($arrayfields, 'position');
-'@phan-var-force array<string,array{label:string,checked?:int<0,1>,position?:int,help?:string}> $arrayfields';  // dol_sort_array looses type for Phan
+'@phan-var-force array<string,array{label:string,checked?:int<0,1>,position?:int,help?:string}> $arrayfields'; // dol_sort_array looses type for Phan
 
 // Security check
 $expeditionid = GETPOSTINT('id');

public/htdocs/expedition/document.php

Spacing +1 added lines, -1 removed lines

@@ -96,7 +96,7 @@
 }
 $result = restrictedArea($user, 'expedition', $object->id, '');
 
-$permissiontoadd = $user->hasRight('expedition', 'creer');  // Used by the include of actions_dellink.inc.php
+$permissiontoadd = $user->hasRight('expedition', 'creer'); // Used by the include of actions_dellink.inc.php
 
 
 /*

public/htdocs/expedition/class/api_shipments.class.php

Spacing +5 added lines, -5 removed lines

@@ -203,11 +203,11 @@
                 $shipmentline = new ExpeditionLigne($this->db);
 
                 $shipmentline->entrepot_id = $line['entrepot_id'];
-                $shipmentline->fk_element = $line['fk_element'] ?? $line['origin_id'];              // example: order id.  this->origin is 'commande'
-                $shipmentline->origin_line_id = $line['fk_elementdet'] ?? $line['origin_line_id'];  // example: order id
-                $shipmentline->fk_elementdet = $line['fk_elementdet'] ?? $line['origin_line_id'];   // example: order line id
-                $shipmentline->origin_type = $line['element_type'] ?? $line['origin_type'];         // example 'commande' or 'order'
-                $shipmentline->element_type = $line['element_type'] ?? $line['origin_type'];        // example 'commande' or 'order'
+                $shipmentline->fk_element = $line['fk_element'] ?? $line['origin_id']; // example: order id.  this->origin is 'commande'
+                $shipmentline->origin_line_id = $line['fk_elementdet'] ?? $line['origin_line_id']; // example: order id
+                $shipmentline->fk_elementdet = $line['fk_elementdet'] ?? $line['origin_line_id']; // example: order line id
+                $shipmentline->origin_type = $line['element_type'] ?? $line['origin_type']; // example 'commande' or 'order'
+                $shipmentline->element_type = $line['element_type'] ?? $line['origin_type']; // example 'commande' or 'order'
                 $shipmentline->qty = $line['qty'];
                 $shipmentline->rang = $line['rang'];
                 $shipmentline->array_options = $line['array_options'];