laudeco / bbc-dolibarr-flightlog

class/bbcvols.class.php

Spacing +11 added lines, -11 removed lines

@@ -247,18 +247,18 @@ 
         $sql .= ' ' . (!isset($this->nbrPax) ? 'NULL' : "'" . $this->db->escape($this->nbrPax) . "'") . ',';
         $sql .= ' ' . (!isset($this->remarque) ? 'NULL' : "'" . $this->db->escape($this->remarque) . "'") . ',';
         $sql .= ' ' . (!isset($this->incidents) ? 'NULL' : "'" . $this->db->escape($this->incidents) . "'") . ',';
-        $sql .= ' ' . (!isset($this->fk_type) || (int)$this->fk_type === -1 ? 'NULL' : $this->fk_type) . ',';
-        $sql .= ' ' . (!isset($this->fk_pilot) || (int)$this->fk_pilot === -1 ? 'NULL' : $this->fk_pilot) . ',';
-        $sql .= ' ' . (!isset($this->fk_organisateur) || (int)$this->fk_organisateur === -1 ? 'NULL' : $this->fk_organisateur) . ',';
+        $sql .= ' ' . (!isset($this->fk_type) || (int) $this->fk_type === -1 ? 'NULL' : $this->fk_type) . ',';
+        $sql .= ' ' . (!isset($this->fk_pilot) || (int) $this->fk_pilot === -1 ? 'NULL' : $this->fk_pilot) . ',';
+        $sql .= ' ' . (!isset($this->fk_organisateur) || (int) $this->fk_organisateur === -1 ? 'NULL' : $this->fk_organisateur) . ',';
         $sql .= ' ' . (!isset($this->is_facture) ? '0' : $this->is_facture) . ',';
         $sql .= ' ' . (!isset($this->kilometers) || empty($this->kilometers) ? '0' : $this->kilometers) . ',';
         $sql .= ' ' . (!isset($this->cost) ? 'NULL' : "'" . $this->db->escape($this->cost) . "'") . ',';
-        $sql .= ' ' . (!isset($this->fk_receiver) || (int)$this->fk_receiver === -1 ? 'NULL' : $this->fk_receiver) . ',';
+        $sql .= ' ' . (!isset($this->fk_receiver) || (int) $this->fk_receiver === -1 ? 'NULL' : $this->fk_receiver) . ',';
         $sql .= ' ' . (!isset($this->justif_kilometers) ? 'NULL' : "'" . $this->db->escape($this->justif_kilometers) . "'") . ',';
         $sql .= ' ' . "'" . date('Y-m-d H:i:s') . "'" . ',';
         $sql .= ' ' . "'" . date('Y-m-d H:i:s') . "'" . ',';
         $sql .= ' ' . "'" . $this->passengerNames . "'" . ',';
-        $sql .= ' ' . (!isset($this->orderId) || (int)$this->orderId === -1 ? 'NULL' : $this->orderId) . '';
+        $sql .= ' ' . (!isset($this->orderId) || (int) $this->orderId === -1 ? 'NULL' : $this->orderId) . '';
 
         $sql .= ')';
 
@@ -476,17 +476,17 @@ 
         $sql .= ' nbrPax = ' . (isset($this->nbrPax) ? "'" . $this->db->escape($this->nbrPax) . "'" : "null") . ',';
         $sql .= ' remarque = ' . (isset($this->remarque) ? "'" . $this->db->escape($this->remarque) . "'" : "null") . ',';
         $sql .= ' incidents = ' . (isset($this->incidents) ? "'" . $this->db->escape($this->incidents) . "'" : "null") . ',';
-        $sql .= ' fk_type = ' . (isset($this->fk_type) && (int)$this->fk_type > 0 ? $this->fk_type : "null") . ',';
-        $sql .= ' fk_pilot = ' . (isset($this->fk_pilot) && (int)$this->fk_pilot > 0 ? $this->fk_pilot : "null") . ',';
-        $sql .= ' fk_organisateur = ' . (isset($this->fk_organisateur) && (int)$this->fk_organisateur > 0 ? $this->fk_organisateur : "null") . ',';
+        $sql .= ' fk_type = ' . (isset($this->fk_type) && (int) $this->fk_type > 0 ? $this->fk_type : "null") . ',';
+        $sql .= ' fk_pilot = ' . (isset($this->fk_pilot) && (int) $this->fk_pilot > 0 ? $this->fk_pilot : "null") . ',';
+        $sql .= ' fk_organisateur = ' . (isset($this->fk_organisateur) && (int) $this->fk_organisateur > 0 ? $this->fk_organisateur : "null") . ',';
         $sql .= ' is_facture = ' . (isset($this->is_facture) ? $this->is_facture : "0") . ',';
         $sql .= ' kilometers = ' . (!empty($this->kilometers) ? $this->kilometers : "0") . ',';
         $sql .= ' cost = ' . (isset($this->cost) ? "'" . $this->db->escape($this->cost) . "'" : "''") . ',';
-        $sql .= ' fk_receiver = ' . (isset($this->fk_receiver) && (int)$this->fk_receiver > 0 ? $this->fk_receiver : "null") . ',';
+        $sql .= ' fk_receiver = ' . (isset($this->fk_receiver) && (int) $this->fk_receiver > 0 ? $this->fk_receiver : "null") . ',';
         $sql .= ' justif_kilometers = ' . (isset($this->justif_kilometers) ? "'" . $this->db->escape($this->justif_kilometers) . "'," : "'',");
         $sql .= ' date_update = ' . "'" . date('Y-m-d H:i:s') . "',";
         $sql .= ' passenger_names = ' . "'" . trim($this->passengerNames) . "',";
-        $sql .= ' order_id = ' .  (!isset($this->orderId) || (int)$this->orderId === -1 ? 'null' : $this->orderId);
+        $sql .= ' order_id = ' . (!isset($this->orderId) || (int) $this->orderId === -1 ? 'null' : $this->orderId);
 
         $sql .= ' WHERE idBBC_vols=' . $this->idBBC_vols;
 
@@ -853,7 +853,7 @@ 
      */
     public function getAmountPerPassenger()
     {
-        $nbrPax = $this->nbrPax > 0 ? $this->nbrPax : 1 ;
+        $nbrPax = $this->nbrPax > 0 ? $this->nbrPax : 1;
         return $this->cost / $nbrPax;
     }
 

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