laudeco / bbc-dolibarr-flightlog

command/CreateOrderCommand.php

Spacing +2 added lines, -2 removed lines

@@ -228,7 +228,7 @@ 
     /**
      * @return boolean
      */
-    public function hasTVA(){
+    public function hasTVA() {
         return !empty($this->tva);
     }
 
@@ -259,7 +259,7 @@ 
     /**
      * @return bool
      */
-    public function isCommentPublic(){
+    public function isCommentPublic() {
         return $this->publicComment;
     }
 

command/CreateFlightCommand.php

Spacing +1 added lines, -1 removed lines

@@ -393,7 +393,7 @@
     /**
      * @return bool
      */
-    public function hasOrderId(){
+    public function hasOrderId() {
         return $this->orderId !== null;
     }
 }
\ No newline at end of file

command/CreateFlightCommandHandler.php

Spacing +9 added lines, -9 removed lines

@@ -65,7 +65,7 @@ 
         $vol = new Bbcvols($this->db);
         $vol->date = $command->getDate();
         $vol->lieuD = $command->getLieuD();
-        $vol->lieuA =$command->getLieuA();
+        $vol->lieuA = $command->getLieuA();
         $vol->heureD = $command->getHeureD();
         $vol->heureA = $command->getHeureA();
         $vol->BBC_ballons_idBBC_ballons = $command->getBBCBallonsIdBBCBallons();
@@ -73,7 +73,7 @@ 
         $vol->remarque = $command->getRemarque();
         $vol->incidents = $command->getIncidents();
         $vol->fk_type = $command->getFkType();
-        $vol->fk_pilot =$command->getFkPilot();
+        $vol->fk_pilot = $command->getFkPilot();
         $vol->fk_organisateur = $command->getFkOrganisateur();
         $vol->kilometers = $command->getKilometers();
         $vol->cost = $command->getCost();
@@ -86,12 +86,12 @@ 
             throw new Exception();
         }
 
-        if(!$vol->getFlightType()->isBillingRequired() || $vol->isLinkedToOrder()){
+        if (!$vol->getFlightType()->isBillingRequired() || $vol->isLinkedToOrder()) {
             $vol->is_facture = true;
         }
 
         $result = $vol->create($this->user);
-        if($result <= 0){
+        if ($result <= 0) {
             throw new Exception();
         }
 
@@ -111,7 +111,7 @@ 
     {
         $flight->fetch($flight->id);
 
-        if(!$flight->isLinkedToOrder()){
+        if (!$flight->isLinkedToOrder()) {
             return;
         }
 
@@ -122,17 +122,17 @@ 
 
         $qtyOrder = 0;
         /** @var OrderLine $currentOrderLine */
-        foreach($order->lines as $currentOrderLine){
-            $qtyOrder += (int)$currentOrderLine->qty;
+        foreach ($order->lines as $currentOrderLine) {
+            $qtyOrder += (int) $currentOrderLine->qty;
         }
 
         $passangersCount = $this->numberOfPassengersLinkedToOrder($order->id);
 
-        if($passangersCount != $qtyOrder){
+        if ($passangersCount != $qtyOrder) {
             return;
         }
 
-        if($order->statut == Commande::STATUS_VALIDATED){
+        if ($order->statut == Commande::STATUS_VALIDATED) {
             $order->cloture($this->user);
         }
     }

list.php

Indentation +7 added lines, -7 removed lines

@@ -132,12 +132,12 @@ 
     //'t.justif_kilometers'         => array('label' => $langs->trans("Fieldjustif_kilometers"), 'checked' => 1),
     //'t.entity'=>array('label'=>$langs->trans("Entity"), 'checked'=>1, 'enabled'=>(! empty($conf->multicompany->enabled) && empty($conf->multicompany->transverse_mode))),
     't.datec'                     => array('label'    => $langs->trans("DateCreationShort"),
-                                           'checked'  => 0,
-                                           'position' => 500
+                                            'checked'  => 0,
+                                            'position' => 500
     ),
     't.tms'                       => array('label'    => $langs->trans("DateModificationShort"),
-                                           'checked'  => 0,
-                                           'position' => 500
+                                            'checked'  => 0,
+                                            'position' => 500
     ),
     //'t.statut'=>array('label'=>$langs->trans("Status"), 'checked'=>1, 'position'=>1000),
 );
@@ -145,9 +145,9 @@ 
 if (is_array($extrafields->attribute_label) && count($extrafields->attribute_label)) {
     foreach ($extrafields->attribute_label as $key => $val) {
         $arrayfields["ef." . $key] = array('label'    => $extrafields->attribute_label[$key],
-                                           'checked'  => $extrafields->attribute_list[$key],
-                                           'position' => $extrafields->attribute_pos[$key],
-                                           'enabled'  => $extrafields->attribute_perms[$key]
+                                            'checked'  => $extrafields->attribute_list[$key],
+                                            'position' => $extrafields->attribute_pos[$key],
+                                            'enabled'  => $extrafields->attribute_perms[$key]
         );
     }
 }

Spacing +93 added lines, -93 removed lines

@@ -50,8 +50,8 @@ 
 $search_fk_type = GETPOST('search_fk_type', 'int');
 $search_fk_pilot = GETPOST('search_fk_pilot', 'int') ?: ($user->admin ? '' : $user->id);
 $search_fk_organisateur = GETPOST('search_fk_organisateur', 'int');
-$search_is_facture = GETPOST('search_is_facture', 'int') === ''? -1 : (int)GETPOST('search_is_facture', 'int');
-if($search_is_facture === 0){
+$search_is_facture = GETPOST('search_is_facture', 'int') === '' ? -1 : (int) GETPOST('search_is_facture', 'int');
+if ($search_is_facture === 0) {
     $search_is_facture = '<=0';
 }
 $search_kilometers = GETPOST('search_kilometers', 'alpha');
@@ -179,7 +179,7 @@ 
 
 $parameters = array();
 $reshook = $hookmanager->executeHooks('doActions', $parameters, $object,
-    $action);    // Note that $action and $object may have been modified by some hooks
+    $action); // Note that $action and $object may have been modified by some hooks
 if ($reshook < 0) {
     setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
 }
@@ -276,7 +276,7 @@ 
 // Add fields from hooks
 $parameters = array();
 $reshook = $hookmanager->executeHooks('printFieldListSelect',
-    $parameters);    // Note that $action and $object may have been modified by hook
+    $parameters); // Note that $action and $object may have been modified by hook
 $sql .= $hookmanager->resPrint;
 $sql .= " FROM " . MAIN_DB_PREFIX . "bbc_vols as t";
 if (is_array($extrafields->attribute_label) && count($extrafields->attribute_label)) {
@@ -290,8 +290,8 @@ 
 
 $sql .= " WHERE 1 = 1";
 
-if($search_all){
-    $sql .= natural_search(["idBBC_vols",  "lieuD", "lieuA", "pilot.lastname", "pilot.firstname", "balloon.immat"], $search_all);
+if ($search_all) {
+    $sql .= natural_search(["idBBC_vols", "lieuD", "lieuA", "pilot.lastname", "pilot.firstname", "balloon.immat"], $search_all);
 }
 
 if ($search_idBBC_vols) {
@@ -335,7 +335,7 @@ 
 }
 
 if ($search_is_facture != -1) {
-    $sql .= natural_search("is_facture", $search_is_facture,1);
+    $sql .= natural_search("is_facture", $search_is_facture, 1);
 }
 if ($search_kilometers) {
     $sql .= natural_search("kilometers", $search_kilometers, 1);
@@ -370,7 +370,7 @@ 
 // Add where from hooks
 $parameters = array();
 $reshook = $hookmanager->executeHooks('printFieldListWhere',
-    $parameters);    // Note that $action and $object may have been modified by hook
+    $parameters); // Note that $action and $object may have been modified by hook
 $sql .= $hookmanager->resPrint;
 $sql .= $db->order($sortfield, $sortorder);
 //$sql.= $db->plimit($conf->liste_limit+1, $offset);
@@ -412,58 +412,58 @@ 
 if ($limit > 0 && $limit != $conf->liste_limit) {
     $param .= '&limit=' . $limit;
 }
-if ($search_idBBC_vols  != '') {
+if ($search_idBBC_vols != '') {
     $param .= '&amp;search_idBBC_vols=' . urlencode($search_idBBC_vols);
 }
-if ($search_date  != '') {
+if ($search_date != '') {
     $param .= '&amp;search_date=' . urlencode($search_date);
 }
-if ($search_lieuD  != '') {
+if ($search_lieuD != '') {
     $param .= '&amp;search_lieuD=' . urlencode($search_lieuD);
 }
-if ($search_lieuA  != '') {
+if ($search_lieuA != '') {
     $param .= '&amp;search_lieuA=' . urlencode($search_lieuA);
 }
-if ($search_heureD  != '') {
+if ($search_heureD != '') {
     $param .= '&amp;search_heureD=' . urlencode($search_heureD);
 }
-if ($search_heureA  != '') {
+if ($search_heureA != '') {
     $param .= '&amp;search_heureA=' . urlencode($search_heureA);
 }
-if ($search_BBC_ballons_idBBC_ballons  != '') {
+if ($search_BBC_ballons_idBBC_ballons != '') {
     $param .= '&amp;search_BBC_ballons_idBBC_ballons=' . urlencode($search_BBC_ballons_idBBC_ballons);
 }
-if ($search_nbrPax  != '') {
+if ($search_nbrPax != '') {
     $param .= '&amp;search_nbrPax=' . urlencode($search_nbrPax);
 }
-if ($search_remarque  != '') {
+if ($search_remarque != '') {
     $param .= '&amp;search_remarque=' . urlencode($search_remarque);
 }
-if ($search_incidents  != '') {
+if ($search_incidents != '') {
     $param .= '&amp;search_incidents=' . urlencode($search_incidents);
 }
-if ($search_fk_type  != '') {
+if ($search_fk_type != '') {
     $param .= '&amp;search_fk_type=' . urlencode($search_fk_type);
 }
 if ($search_fk_pilot != '') {
     $param .= '&amp;search_fk_pilot=' . urlencode($search_fk_pilot);
 }
-if ($search_fk_organisateur  != '') {
+if ($search_fk_organisateur != '') {
     $param .= '&amp;search_fk_organisateur=' . urlencode($search_fk_organisateur);
 }
-if ($search_is_facture  != -1) {
+if ($search_is_facture != -1) {
     $param .= '&amp;search_is_facture=' . urlencode($search_is_facture);
 }
-if ($search_kilometers  != '') {
+if ($search_kilometers != '') {
     $param .= '&amp;search_kilometers=' . urlencode($search_kilometers);
 }
-if ($search_cost  != '') {
+if ($search_cost != '') {
     $param .= '&amp;search_cost=' . urlencode($search_cost);
 }
-if ($search_fk_receiver  != '') {
+if ($search_fk_receiver != '') {
     $param .= '&amp;search_fk_receiver=' . urlencode($search_fk_receiver);
 }
-if ($search_justif_kilometers  != '') {
+if ($search_justif_kilometers != '') {
     $param .= '&amp;search_justif_kilometers=' . urlencode($search_justif_kilometers);
 }
 if ($search_all != '') {
@@ -507,8 +507,8 @@ 
 
 
 $moreHtml = "";
-if($search_all !== ""){
-    $moreHtml = "<p>".$langs->trans(sprintf("La liste est en recherche globale sur : l'identifiant du vol, le nom du pilote, l'immat du ballon, le lieu de Décollage et le lieu d'atterissage : %s", $search_all))."</p>";
+if ($search_all !== "") {
+    $moreHtml = "<p>" . $langs->trans(sprintf("La liste est en recherche globale sur : l'identifiant du vol, le nom du pilote, l'immat du ballon, le lieu de Décollage et le lieu d'atterissage : %s", $search_all)) . "</p>";
 }
 
 print_barre_liste($title, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, '', $num, $nbtotalofrecords,
@@ -528,7 +528,7 @@ 
 
 $parameters = array();
 $reshook = $hookmanager->executeHooks('printFieldPreListTitle',
-    $parameters);    // Note that $action and $object may have been modified by hook
+    $parameters); // Note that $action and $object may have been modified by hook
 if (empty($reshook)) {
     $moreforfilter .= $hookmanager->resPrint;
 } else {
@@ -543,7 +543,7 @@ 
 
 $varpage = empty($contextpage) ? $_SERVER["PHP_SELF"] : $contextpage;
 $selectedfields = $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields,
-    $varpage);    // This also change content of $arrayfields
+    $varpage); // This also change content of $arrayfields
 
 print '<div class="div-table-responsive">';
 print '<table class="tagtable liste' . ($moreforfilter ? " listwithfilterbefore" : "") . '">' . "\n";
@@ -639,7 +639,7 @@ 
 // Hook fields
 $parameters = array('arrayfields' => $arrayfields);
 $reshook = $hookmanager->executeHooks('printFieldListTitle',
-    $parameters);    // Note that $action and $object may have been modified by hook
+    $parameters); // Note that $action and $object may have been modified by hook
 print $hookmanager->resPrint;
 if (!empty($arrayfields['t.datec']['checked'])) {
     print_liste_field_titre($arrayfields['t.datec']['label'], $_SERVER["PHP_SELF"], "t.datec", "", $param,
@@ -697,18 +697,18 @@ 
 }
 if (!empty($arrayfields['t.fk_pilot']['checked'])) {
     print '<td class="liste_titre">';
-        print $form->select_dolusers($search_fk_pilot, "search_fk_pilot", true, null, 0, '', '', 0,0,0,'',0,'','', true);
+        print $form->select_dolusers($search_fk_pilot, "search_fk_pilot", true, null, 0, '', '', 0, 0, 0, '', 0, '', '', true);
     print '</td>';
 }
 if (!empty($arrayfields['t.fk_organisateur']['checked'])) {
     print '<td class="liste_titre">';
-        print $form->select_dolusers($search_fk_organisateur, "search_fk_organisateur", true, null, 0, '', '', 0,0,0,'',0,'','', true);
+        print $form->select_dolusers($search_fk_organisateur, "search_fk_organisateur", true, null, 0, '', '', 0, 0, 0, '', 0, '', '', true);
     print '</td>';
 }
 
 if (!empty($arrayfields['t.is_facture']['checked'])) {
     print '<td class="liste_titre">';
-    print '<select name="search_is_facture"><option value="-1" '.($search_is_facture != 1 && $search_is_facture != 0 && $search_is_facture != '<=0'? 'selected' : '' ).'></option><option value="1" '.($search_is_facture == 1 ? 'selected' : '' ).'>Facturé</option><option value="0" '.($search_is_facture == 0 || $search_is_facture == '<=0' ? 'selected' : '' ).'>Ouvert</option></select>';
+    print '<select name="search_is_facture"><option value="-1" ' . ($search_is_facture != 1 && $search_is_facture != 0 && $search_is_facture != '<=0' ? 'selected' : '') . '></option><option value="1" ' . ($search_is_facture == 1 ? 'selected' : '') . '>Facturé</option><option value="0" ' . ($search_is_facture == 0 || $search_is_facture == '<=0' ? 'selected' : '') . '>Ouvert</option></select>';
     print '</td>';
 }
 
@@ -753,7 +753,7 @@ 
 // Fields from hook
 $parameters = array('arrayfields' => $arrayfields);
 $reshook = $hookmanager->executeHooks('printFieldListOption',
-    $parameters);    // Note that $action and $object may have been modified by hook
+    $parameters); // Note that $action and $object may have been modified by hook
 print $hookmanager->resPrint;
 if (!empty($arrayfields['t.datec']['checked'])) {
     // Date creation
@@ -795,125 +795,125 @@ 
         // Show here line of result
         print '<tr ' . $bc[$var] . '>';
 
-        if (! empty($arrayfields['t.idBBC_vols']['checked']))
+        if (!empty($arrayfields['t.idBBC_vols']['checked']))
         {
-            print '<td>'.$flight->getNomUrl(0).'</td>';
+            print '<td>' . $flight->getNomUrl(0) . '</td>';
 
-            if (! $i) $totalarray['nbfield']++;
+            if (!$i) $totalarray['nbfield']++;
         }
-        if (! empty($arrayfields['t.date']['checked']))
+        if (!empty($arrayfields['t.date']['checked']))
         {
             print '<td>';
                 print dol_print_date($db->jdate($obj->date), '%d-%m-%y');
             print '</td>';
 
-            if (! $i) $totalarray['nbfield']++;
+            if (!$i) $totalarray['nbfield']++;
         }
-        if (! empty($arrayfields['t.lieuD']['checked']))
+        if (!empty($arrayfields['t.lieuD']['checked']))
         {
-            print '<td>'.$obj->lieuD.'</td>';
+            print '<td>' . $obj->lieuD . '</td>';
 
-            if (! $i) $totalarray['nbfield']++;
+            if (!$i) $totalarray['nbfield']++;
         }
-        if (! empty($arrayfields['t.lieuA']['checked']))
+        if (!empty($arrayfields['t.lieuA']['checked']))
         {
-            print '<td>'.$obj->lieuA.'</td>';
+            print '<td>' . $obj->lieuA . '</td>';
 
-            if (! $i) $totalarray['nbfield']++;
+            if (!$i) $totalarray['nbfield']++;
         }
-        if (! empty($arrayfields['t.heureD']['checked']))
+        if (!empty($arrayfields['t.heureD']['checked']))
         {
-            print '<td>'.$obj->heureD.'</td>';
+            print '<td>' . $obj->heureD . '</td>';
 
-            if (! $i) $totalarray['nbfield']++;
+            if (!$i) $totalarray['nbfield']++;
         }
-        if (! empty($arrayfields['t.heureA']['checked']))
+        if (!empty($arrayfields['t.heureA']['checked']))
         {
-            print '<td>'.$obj->heureA.'</td>';
+            print '<td>' . $obj->heureA . '</td>';
 
-            if (! $i) $totalarray['nbfield']++;
+            if (!$i) $totalarray['nbfield']++;
         }
-        if (! empty($arrayfields['t.BBC_ballons_idBBC_ballons']['checked']))
+        if (!empty($arrayfields['t.BBC_ballons_idBBC_ballons']['checked']))
         {
-            print '<td>'.$obj->bal.'</td>';
+            print '<td>' . $obj->bal . '</td>';
 
-            if (! $i) $totalarray['nbfield']++;
+            if (!$i) $totalarray['nbfield']++;
         }
-        if (! empty($arrayfields['t.nbrPax']['checked']))
+        if (!empty($arrayfields['t.nbrPax']['checked']))
         {
-            print '<td>'.$obj->nbrPax.'</td>';
+            print '<td>' . $obj->nbrPax . '</td>';
 
-            if (! $i) $totalarray['nbfield']++;
+            if (!$i) $totalarray['nbfield']++;
         }
-        if (! empty($arrayfields['t.remarque']['checked']))
+        if (!empty($arrayfields['t.remarque']['checked']))
         {
-            print '<td>'.$obj->remarque.'</td>';
+            print '<td>' . $obj->remarque . '</td>';
 
-            if (! $i) $totalarray['nbfield']++;
+            if (!$i) $totalarray['nbfield']++;
         }
-        if (! empty($arrayfields['t.incidents']['checked']))
+        if (!empty($arrayfields['t.incidents']['checked']))
         {
-            print '<td>'.$obj->incidents.'</td>';
+            print '<td>' . $obj->incidents . '</td>';
 
-            if (! $i) $totalarray['nbfield']++;
+            if (!$i) $totalarray['nbfield']++;
         }
-        if (! empty($arrayfields['t.fk_type']['checked']))
+        if (!empty($arrayfields['t.fk_type']['checked']))
         {
-            print '<td>'.$obj->flight_type.'</td>';
+            print '<td>' . $obj->flight_type . '</td>';
 
-            if (! $i) $totalarray['nbfield']++;
+            if (!$i) $totalarray['nbfield']++;
         }
-        if (! empty($arrayfields['t.fk_pilot']['checked']))
+        if (!empty($arrayfields['t.fk_pilot']['checked']))
         {
-            print '<td>'.$obj->pilot.'</td>';
+            print '<td>' . $obj->pilot . '</td>';
 
-            if (! $i) $totalarray['nbfield']++;
+            if (!$i) $totalarray['nbfield']++;
         }
-        if (! empty($arrayfields['t.fk_organisateur']['checked']))
+        if (!empty($arrayfields['t.fk_organisateur']['checked']))
         {
-            print '<td>'.$obj->organisator.'</td>';
+            print '<td>' . $obj->organisator . '</td>';
 
-            if (! $i) $totalarray['nbfield']++;
+            if (!$i) $totalarray['nbfield']++;
         }
-        if (! empty($arrayfields['t.is_facture']['checked']))
+        if (!empty($arrayfields['t.is_facture']['checked']))
         {
             $flight->is_facture = $obj->is_facture;
-            print '<td>'.$flight->getLibStatut(3).'</td>';
+            print '<td>' . $flight->getLibStatut(3) . '</td>';
 
-            if (! $i) $totalarray['nbfield']++;
+            if (!$i) $totalarray['nbfield']++;
         }
-        if (! empty($arrayfields['t.kilometers']['checked']))
+        if (!empty($arrayfields['t.kilometers']['checked']))
         {
-            if($user->rights->flightlog->vol->financial || $user->id == $flight->fk_pilot){
-                print '<td>'.$obj->kilometers.' KM</td>';
-            }else{
+            if ($user->rights->flightlog->vol->financial || $user->id == $flight->fk_pilot) {
+                print '<td>' . $obj->kilometers . ' KM</td>';
+            } else {
                 print '<td> - Km</td>';
             }
 
-            if (! $i) $totalarray['nbfield']++;
+            if (!$i) $totalarray['nbfield']++;
         }
-        if (! empty($arrayfields['t.cost']['checked']))
+        if (!empty($arrayfields['t.cost']['checked']))
         {
-            if(($user->rights->flightlog->vol->financial || $user->id == $flight->fk_pilot) && $obj->cost > 0){
+            if (($user->rights->flightlog->vol->financial || $user->id == $flight->fk_pilot) && $obj->cost > 0) {
                 $nbrPax = $obj->nbrPax > 0 ? $obj->nbrPax : 1;
-                print sprintf('<td>%s - (%s/pax)</td>', price($obj->cost, 0, $langs, 0, 0, -1, $conf->currency), price($obj->cost/$nbrPax, 0, $langs, -1, -1, -1, $conf->currency));
-            }else{
+                print sprintf('<td>%s - (%s/pax)</td>', price($obj->cost, 0, $langs, 0, 0, -1, $conf->currency), price($obj->cost / $nbrPax, 0, $langs, -1, -1, -1, $conf->currency));
+            } else {
                 print '<td> - €</td>';
             }
 
-            if (! $i) $totalarray['nbfield']++;
+            if (!$i) $totalarray['nbfield']++;
         }
-        if (! empty($arrayfields['t.fk_receiver']['checked']))
+        if (!empty($arrayfields['t.fk_receiver']['checked']))
         {
-            print '<td>'.$obj->receiver.'</td>';
+            print '<td>' . $obj->receiver . '</td>';
 
-            if (! $i) $totalarray['nbfield']++;
+            if (!$i) $totalarray['nbfield']++;
         }
-        if (! empty($arrayfields['t.justif_kilometers']['checked']))
+        if (!empty($arrayfields['t.justif_kilometers']['checked']))
         {
-            print '<td>'.$obj->justif_kilometers.'</td>';
+            print '<td>' . $obj->justif_kilometers . '</td>';
 
-            if (! $i) $totalarray['nbfield']++;
+            if (!$i) $totalarray['nbfield']++;
         }
 
         // Extra fields
@@ -938,7 +938,7 @@ 
         // Fields from hook
         $parameters = array('arrayfields' => $arrayfields, 'obj' => $obj);
         $reshook = $hookmanager->executeHooks('printFieldListValue',
-            $parameters);    // Note that $action and $object may have been modified by hook
+            $parameters); // Note that $action and $object may have been modified by hook
         print $hookmanager->resPrint;
         // Date creation
         if (!empty($arrayfields['t.datec']['checked'])) {
@@ -1008,7 +1008,7 @@ 
 
 $parameters = array('arrayfields' => $arrayfields, 'sql' => $sql);
 $reshook = $hookmanager->executeHooks('printFieldListFooter',
-    $parameters);    // Note that $action and $object may have been modified by hook
+    $parameters); // Note that $action and $object may have been modified by hook
 print $hookmanager->resPrint;
 
 print '</table>' . "\n";

Braces +62 added lines, -22 removed lines

@@ -189,10 +189,12 @@ 
     include DOL_DOCUMENT_ROOT . '/core/actions_changeselectedfields.inc.php';
 
     // Purge search criteria
-    if (GETPOST("button_removefilter_x") || GETPOST("button_removefilter.x") || GETPOST("button_removefilter")) // All tests are required to be compatible with all browsers
+    if (GETPOST("button_removefilter_x") || GETPOST("button_removefilter.x") || GETPOST("button_removefilter")) {
+        // All tests are required to be compatible with all browsers
     {
 
         $search_idBBC_vols = '';
+    }
         $search_date = '';
         $search_lieuD = '';
         $search_lieuA = '';
@@ -799,7 +801,9 @@ 
         {
             print '<td>'.$flight->getNomUrl(0).'</td>';
 
-            if (! $i) $totalarray['nbfield']++;
+            if (! $i) {
+                $totalarray['nbfield']++;
+            }
         }
         if (! empty($arrayfields['t.date']['checked']))
         {
@@ -807,113 +811,147 @@ 
                 print dol_print_date($db->jdate($obj->date), '%d-%m-%y');
             print '</td>';
 
-            if (! $i) $totalarray['nbfield']++;
+            if (! $i) {
+                $totalarray['nbfield']++;
+            }
         }
         if (! empty($arrayfields['t.lieuD']['checked']))
         {
             print '<td>'.$obj->lieuD.'</td>';
 
-            if (! $i) $totalarray['nbfield']++;
+            if (! $i) {
+                $totalarray['nbfield']++;
+            }
         }
         if (! empty($arrayfields['t.lieuA']['checked']))
         {
             print '<td>'.$obj->lieuA.'</td>';
 
-            if (! $i) $totalarray['nbfield']++;
+            if (! $i) {
+                $totalarray['nbfield']++;
+            }
         }
         if (! empty($arrayfields['t.heureD']['checked']))
         {
             print '<td>'.$obj->heureD.'</td>';
 
-            if (! $i) $totalarray['nbfield']++;
+            if (! $i) {
+                $totalarray['nbfield']++;
+            }
         }
         if (! empty($arrayfields['t.heureA']['checked']))
         {
             print '<td>'.$obj->heureA.'</td>';
 
-            if (! $i) $totalarray['nbfield']++;
+            if (! $i) {
+                $totalarray['nbfield']++;
+            }
         }
         if (! empty($arrayfields['t.BBC_ballons_idBBC_ballons']['checked']))
         {
             print '<td>'.$obj->bal.'</td>';
 
-            if (! $i) $totalarray['nbfield']++;
+            if (! $i) {
+                $totalarray['nbfield']++;
+            }
         }
         if (! empty($arrayfields['t.nbrPax']['checked']))
         {
             print '<td>'.$obj->nbrPax.'</td>';
 
-            if (! $i) $totalarray['nbfield']++;
+            if (! $i) {
+                $totalarray['nbfield']++;
+            }
         }
         if (! empty($arrayfields['t.remarque']['checked']))
         {
             print '<td>'.$obj->remarque.'</td>';
 
-            if (! $i) $totalarray['nbfield']++;
+            if (! $i) {
+                $totalarray['nbfield']++;
+            }
         }
         if (! empty($arrayfields['t.incidents']['checked']))
         {
             print '<td>'.$obj->incidents.'</td>';
 
-            if (! $i) $totalarray['nbfield']++;
+            if (! $i) {
+                $totalarray['nbfield']++;
+            }
         }
         if (! empty($arrayfields['t.fk_type']['checked']))
         {
             print '<td>'.$obj->flight_type.'</td>';
 
-            if (! $i) $totalarray['nbfield']++;
+            if (! $i) {
+                $totalarray['nbfield']++;
+            }
         }
         if (! empty($arrayfields['t.fk_pilot']['checked']))
         {
             print '<td>'.$obj->pilot.'</td>';
 
-            if (! $i) $totalarray['nbfield']++;
+            if (! $i) {
+                $totalarray['nbfield']++;
+            }
         }
         if (! empty($arrayfields['t.fk_organisateur']['checked']))
         {
             print '<td>'.$obj->organisator.'</td>';
 
-            if (! $i) $totalarray['nbfield']++;
+            if (! $i) {
+                $totalarray['nbfield']++;
+            }
         }
         if (! empty($arrayfields['t.is_facture']['checked']))
         {
             $flight->is_facture = $obj->is_facture;
             print '<td>'.$flight->getLibStatut(3).'</td>';
 
-            if (! $i) $totalarray['nbfield']++;
+            if (! $i) {
+                $totalarray['nbfield']++;
+            }
         }
         if (! empty($arrayfields['t.kilometers']['checked']))
         {
             if($user->rights->flightlog->vol->financial || $user->id == $flight->fk_pilot){
                 print '<td>'.$obj->kilometers.' KM</td>';
-            }else{
+            } else{
                 print '<td> - Km</td>';
             }
 
-            if (! $i) $totalarray['nbfield']++;
+            if (! $i) {
+                $totalarray['nbfield']++;
+            }
         }
         if (! empty($arrayfields['t.cost']['checked']))
         {
             if(($user->rights->flightlog->vol->financial || $user->id == $flight->fk_pilot) && $obj->cost > 0){
                 $nbrPax = $obj->nbrPax > 0 ? $obj->nbrPax : 1;
                 print sprintf('<td>%s - (%s/pax)</td>', price($obj->cost, 0, $langs, 0, 0, -1, $conf->currency), price($obj->cost/$nbrPax, 0, $langs, -1, -1, -1, $conf->currency));
-            }else{
+            } else{
                 print '<td> - €</td>';
             }
 
-            if (! $i) $totalarray['nbfield']++;
+            if (! $i) {
+                $totalarray['nbfield']++;
+            }
         }
         if (! empty($arrayfields['t.fk_receiver']['checked']))
         {
             print '<td>'.$obj->receiver.'</td>';
 
-            if (! $i) $totalarray['nbfield']++;
+            if (! $i) {
+                $totalarray['nbfield']++;
+            }
         }
         if (! empty($arrayfields['t.justif_kilometers']['checked']))
         {
             print '<td>'.$obj->justif_kilometers.'</td>';
 
-            if (! $i) $totalarray['nbfield']++;
+            if (! $i) {
+                $totalarray['nbfield']++;
+            }
         }
 
         // Extra fields
@@ -961,9 +999,11 @@ 
 
         // Action column
         print '<td class="nowrap" align="center">';
-        if ($massactionbutton || $massaction)   // If we are in select mode (massactionbutton defined) or if we have already selected and sent an action ($massaction) defined
+        if ($massactionbutton || $massaction) {
+            // If we are in select mode (massactionbutton defined) or if we have already selected and sent an action ($massaction) defined
         {
             $selected = 0;
+        }
             if (in_array($obj->idBBC_vols, $arrayofselected)) {
                 $selected = 1;
             }

class/missions/FlightMission.php

Spacing +1 added lines, -1 removed lines

@@ -64,7 +64,7 @@
         Assert::string($kilometersComment);
         Assert::integerish($numberOfKilometers);
 
-        $this->id = (int)$id;
+        $this->id = (int) $id;
         $this->startPoint = $startPoint;
         $this->endPoint = $endPoint;
         $this->kilometersComment = $kilometersComment;

class/missions/PilotMissions.php

Spacing +7 added lines, -7 removed lines

@@ -46,7 +46,7 @@ 
         Assert::nullOrString($pilotLastname);
         Assert::nullOrString($pilotFirstname);
 
-        $this->pilotId = (int)$pilotId;
+        $this->pilotId = (int) $pilotId;
         $this->pilotFirstname = $pilotFirstname;
         $this->pilotLastname = $pilotLastname;
 
@@ -59,9 +59,9 @@ 
      * @param int $numberOfFlights
      * @param int $numberOfKilometers
      */
-    public function addQuarter($quarter, $numberOfFlights, $numberOfKilometers){
+    public function addQuarter($quarter, $numberOfFlights, $numberOfKilometers) {
         Assert::integerish($quarter);
-        $quarter = (int)$quarter;
+        $quarter = (int) $quarter;
 
         Assert::keyNotExists($this->quarterMissions, $quarter);
 
@@ -119,13 +119,13 @@ 
      *
      * @return QuarterMission
      */
-    private function getQuarterMission($quarter){
+    private function getQuarterMission($quarter) {
         Assert::integer($quarter);
         Assert::greaterThan($quarter, 0);
         Assert::lessThanEq($quarter, 4);
 
-        if(!isset($this->quarterMissions[$quarter])){
-            return new QuarterMission($quarter,0,0);
+        if (!isset($this->quarterMissions[$quarter])) {
+            return new QuarterMission($quarter, 0, 0);
         }
 
         return $this->quarterMissions[$quarter];
@@ -136,6 +136,6 @@ 
      */
     public function getPilotName()
     {
-        return $this->pilotFirstname.' '.$this->pilotLastname;
+        return $this->pilotFirstname . ' ' . $this->pilotLastname;
     }
 }
\ No newline at end of file

generateExpenseNote.php

Spacing +8 added lines, -8 removed lines

@@ -87,9 +87,9 @@ 
     try {
         $command = new CreateExpenseNoteCommand($year, $quarter, $userValidatorId, $privateNote, $publicNote);
         $commandHandler->__invoke($command);
-    } catch(PeriodNotFinishedException $e){
+    } catch (PeriodNotFinishedException $e) {
         dol_htmloutput_errors("Le quadri n'est pas encore fini !");
-    } catch(\Exception $e){
+    } catch (\Exception $e) {
         dol_syslog($e->getMessage(), LOG_ERR);
         dol_htmloutput_errors('Error : ' . $e->getMessage());
     }
@@ -105,15 +105,15 @@ 
 $form = new Form($db);
 
 $tabLinks = [];
-foreach($flightYears as $currentFlightYear){
+foreach ($flightYears as $currentFlightYear) {
     $tabLinks[] = [
-        DOL_URL_ROOT."/flightlog/generateExpenseNote.php?year=".$currentFlightYear,
+        DOL_URL_ROOT . "/flightlog/generateExpenseNote.php?year=" . $currentFlightYear,
         $currentFlightYear,
-        "tab_".$currentFlightYear
+        "tab_" . $currentFlightYear
     ];
 }
 
-dol_fiche_head($tabLinks, "tab_".$year);
+dol_fiche_head($tabLinks, "tab_" . $year);
 
 ?>
     <form method="POST">
@@ -134,7 +134,7 @@ 
         <select name="quarter" id="field_quarter">
             <option value="1" <?= ($year == $currentYear && $currentQuarter <= 1) ? 'disabled="disabled"' : "" ?>>1</option>
             <option value="2" <?= ($year == $currentYear && $currentQuarter <= 2) ? 'disabled="disabled"' : "" ?>>2</option>
-            <option value="3" <?= ($year == $currentYear && $currentQuarter <= 3) ? 'disabled="disabled"': "" ?>>3</option>
+            <option value="3" <?= ($year == $currentYear && $currentQuarter <= 3) ? 'disabled="disabled"' : "" ?>>3</option>
             <option value="4" <?= ($year == $currentYear && $currentQuarter <= 4) ? 'disabled="disabled"' : "" ?>>4</option>
         </select>
         <br/>
@@ -143,7 +143,7 @@ 
         <label><?= $langs->trans("Validateur de la note de frais")?></label><br/>
         <?php
             $include_users = $object->fetch_users_approver_expensereport();
-            print $form->select_dolusers($user->id,"fk_user_validator",1,"",0,$include_users);
+            print $form->select_dolusers($user->id, "fk_user_validator", 1, "", 0, $include_users);
         ?>
         <br/>
 

readFlights.php

Spacing +2 added lines, -2 removed lines

@@ -266,7 +266,7 @@ 
 print '<td>' . $totalT3 . '</td>';
 print '<td></td>';
 
-print '<td>' . $totalT4. '</td>';
+print '<td>' . $totalT4 . '</td>';
 print '<td></td>';
 
 print '<td>' . $totalT5 . '</td>';
@@ -292,7 +292,7 @@ 
 //table km
 $tauxRemb = isset($conf->global->BBC_FLIGHT_LOG_TAUX_REMB_KM) ? $conf->global->BBC_FLIGHT_LOG_TAUX_REMB_KM : 0;
 $year = GETPOST("year", 'int');
-if(empty($year)){
+if (empty($year)) {
     $year = date('Y');
 }
 

lib/flightLog.lib.php

Doc Comments +1 added lines, -1 removed lines

@@ -108,7 +108,7 @@
 }
 
 /**
- * @param null $year
+ * @param integer $year
  * @param null $pilotId
  * @param null $quarter
  * @param bool $groupBy