laudeco / bbc-dolibarr-flightlog

class/Damage/ValueObject/DamageLabel.php

Spacing +1 added lines, -1 removed lines

@@ -15,7 +15,7 @@
         $this->label = $label;
     }
 
-    public function value(){
+    public function value() {
         return $this->label;
     }
 

class/flight/Pilot.php

Spacing +11 added lines, -11 removed lines

@@ -106,11 +106,11 @@ 
         return new Pilot($this->name, $this->id, $types);
     }
 
-    public function addDamage(FlightDamageCount $damage){
+    public function addDamage(FlightDamageCount $damage) {
         $this->damages[] = $damage;
     }
 
-    public function addInvoicedDamage(FlightInvoicedDamageCount $damage){
+    public function addInvoicedDamage(FlightInvoicedDamageCount $damage) {
         $this->damages[] = $damage;
     }
 
@@ -161,21 +161,21 @@ 
         return $flightsCost;
     }
 
-    public function totalDamageCost(){
+    public function totalDamageCost() {
         $flightCost = FlightCost::zero();
 
-        foreach($this->damages as $damage){
+        foreach ($this->damages as $damage) {
             $flightCost = $flightCost->addCost($damage->getCost());
         }
 
         return $flightCost;
     }
 
-    public function damageCost(){
+    public function damageCost() {
         $flightCost = FlightCost::zero();
 
-        foreach($this->damages as $damage){
-            if(!$damage instanceof FlightDamageCount){
+        foreach ($this->damages as $damage) {
+            if (!$damage instanceof FlightDamageCount) {
                 continue;
             }
 
@@ -185,11 +185,11 @@ 
         return $flightCost;
     }
 
-    public function invoicedDamageCost(){
+    public function invoicedDamageCost() {
         $flightCost = FlightCost::zero();
 
-        foreach($this->damages as $damage){
-            if(!$damage instanceof FlightInvoicedDamageCount){
+        foreach ($this->damages as $damage) {
+            if (!$damage instanceof FlightInvoicedDamageCount) {
                 continue;
             }
 
@@ -199,7 +199,7 @@ 
         return $flightCost;
     }
 
-    public function damages(){
+    public function damages() {
         return $this->damages;
     }
 

query/BillableFlightQueryHandler.php

Spacing +7 added lines, -7 removed lines

@@ -71,7 +71,7 @@ 
                     $pilots[$obj->pilot] = $pilots[$obj->pilot]->addCount(
                         new FlightTypeCount(
                             $obj->type,
-                            (int)$obj->nbr,
+                            (int) $obj->nbr,
                             $this->getFactorByType($obj->type)
                         )
                     );
@@ -106,7 +106,7 @@ 
                         $pilots[$obj->rowid] = $pilots[$obj->rowid]->addCount(
                             new FlightTypeCount(
                                 'orga',
-                                (int)$obj->total,
+                                (int) $obj->total,
                                 $this->getFactorByType('orga')
                             )
                         );
@@ -136,7 +136,7 @@ 
                         $pilots[$obj->rowid] = $pilots[$obj->rowid]->addCount(
                             new FlightTypeCount(
                                 'orga_T6',
-                                (int)$obj->total,
+                                (int) $obj->total,
                                 $this->getFactorByType('orga_T6')
                             )
                         );
@@ -148,7 +148,7 @@ 
 
         //Total damages
         $damages = $this->pilotDamageQueryRepository->query($query->getFiscalYear());
-        foreach($damages as $currentDamage){
+        foreach ($damages as $currentDamage) {
 
             //Pilot doesn't exist
             if (!isset($pilots[$currentDamage->getAuthorId()])) {
@@ -157,13 +157,13 @@ 
 
             // Add all damage
             $pilots[$currentDamage->getAuthorId()]->addDamage(
-                new FlightDamageCount('',  $currentDamage->getAmount())
+                new FlightDamageCount('', $currentDamage->getAmount())
             );
 
             // The damage is already invoiced. So not take into account.
-            if($currentDamage->isInvoiced()){
+            if ($currentDamage->isInvoiced()) {
                 $pilots[$currentDamage->getAuthorId()]->addInvoicedDamage(
-                    new FlightInvoicedDamageCount('',  $currentDamage->getAmount())
+                    new FlightInvoicedDamageCount('', $currentDamage->getAmount())
                 );
             }
         }

card_tab_financial.php

Spacing +13 added lines, -13 removed lines

@@ -43,7 +43,7 @@ 
 
 $id = GETPOST('id', 'int') ?: GETPOST('idBBC_vols', 'int');
 $action = GETPOST('action', 'alpha');
-$permissiondellink=$user->rights->flightlog->vol->financial;
+$permissiondellink = $user->rights->flightlog->vol->financial;
 
 $object = new Bbcvols($db);
 $extrafields = new ExtraFields($db);
@@ -62,8 +62,8 @@ 
 $extralabels = $extrafields->fetch_name_optionals_label($object->table_element);
 
 // Load object
-include DOL_DOCUMENT_ROOT . '/core/actions_fetchobject.inc.php';  // Must be include, not include_once  // Must be include, not include_once. Include fetch and fetch_thirdparty but not fetch_optionals
-include DOL_DOCUMENT_ROOT.'/core/actions_dellink.inc.php';
+include DOL_DOCUMENT_ROOT . '/core/actions_fetchobject.inc.php'; // Must be include, not include_once  // Must be include, not include_once. Include fetch and fetch_thirdparty but not fetch_optionals
+include DOL_DOCUMENT_ROOT . '/core/actions_dellink.inc.php';
 
 // Initialize technical object to manage hooks of modules. Note that conf->hooks_modules contains array array
 $hookmanager->initHooks(array('bbcvols'));
@@ -99,20 +99,20 @@ 
 print '<tr><td class="fieldrequired">' . $langs->trans("Fielddate") . '</td><td>' . dol_print_date($object->date) . '</td></tr>';
 
 if ($user->rights->flightlog->vol->financial) {
-    print '<tr><td class="fieldrequired">' . $langs->trans("Fieldis_facture") . '</td><td>' . $object->getLibStatut(5). '</td></tr>';
+    print '<tr><td class="fieldrequired">' . $langs->trans("Fieldis_facture") . '</td><td>' . $object->getLibStatut(5) . '</td></tr>';
 }
 
 print '<tr><td class="fieldrequired">' . $langs->trans("Fieldkilometers") . '</td><td>' . $object->kilometers . ' KM</td></tr>';
 print '<tr><td class="fieldrequired">' . $langs->trans("Fieldjustif_kilometers") . '</td><td>' . $object->justif_kilometers . '</td></tr>';
-if($object->hasReceiver()){
+if ($object->hasReceiver()) {
     print '<tr><td class="fieldrequired">' . $langs->trans("Fieldcost") . '</td><td>' . $object->cost . " " . $langs->getCurrencySymbol($conf->currency) . '</td></tr>';
     print '<tr><td class="fieldrequired">' . $langs->trans("Fieldfk_receiver") . '</td><td>' . $receiver->getNomUrl(1) . '</td></tr>';
 }
 
-if($object->isLinkedToOrder()){
+if ($object->isLinkedToOrder()) {
     print '<tr><td class="fieldrequired">' . $langs->trans("Order") . '</td><td><ul>';
-    foreach($object->getOrders() as $currentOrder){
-        print '<li>'.$currentOrder->getNomUrl(1).'</li>';
+    foreach ($object->getOrders() as $currentOrder) {
+        print '<li>' . $currentOrder->getNomUrl(1) . '</li>';
     }
     print '</ul></td></tr>';
 }
@@ -124,18 +124,18 @@ 
 print '<div class="tabsAction">' . "\n";
 
 // Make invoice
-if($user->rights->flightlog->vol->financial && $object->fk_type == 2 && !$object->hasFacture()){
-    print '<div class="inline-block divButAction"><a class="butAction" href="' . DOL_URL_ROOT . '/flightlog/facture.php?id=' . $object->id.'">' . $langs->trans("Facturer") . '</a></div>' . "\n";
+if ($user->rights->flightlog->vol->financial && $object->fk_type == 2 && !$object->hasFacture()) {
+    print '<div class="inline-block divButAction"><a class="butAction" href="' . DOL_URL_ROOT . '/flightlog/facture.php?id=' . $object->id . '">' . $langs->trans("Facturer") . '</a></div>' . "\n";
 }
 
 // Open
-if($object->isBilled() && $object->isBillingRequired()){
-    print '<div class="inline-block divButAction"><a class="butAction" href="' . DOL_URL_ROOT . '/flightlog/card_tab_financial.php?action=open&id=' . $object->id.'">' . $langs->trans("Ouvrir") . '</a></div>' . "\n";
+if ($object->isBilled() && $object->isBillingRequired()) {
+    print '<div class="inline-block divButAction"><a class="butAction" href="' . DOL_URL_ROOT . '/flightlog/card_tab_financial.php?action=open&id=' . $object->id . '">' . $langs->trans("Ouvrir") . '</a></div>' . "\n";
 }
 
 print '</div>' . "\n";
 
-if($user->rights->flightlog->vol->financial){
+if ($user->rights->flightlog->vol->financial) {
     print '<div class="fichecenter"><div class="fichehalfleft">';
     $form->showLinkedObjectBlock($object);
     print '</div></div>';

lib/flightLog.lib.php

Spacing +5 added lines, -5 removed lines

@@ -90,11 +90,11 @@ 
         if ($num) {
             while ($i < $num) {
                 $obj = $db->fetch_object($resql);
-                $currentValue = substr($obj->immat, 0,2);
+                $currentValue = substr($obj->immat, 0, 2);
 
                 if ($obj) {
-                    if(true === $group && $currentValue !== $lastValue){
-                        print '<optgroup label="'.$currentValue.'">';
+                    if (true === $group && $currentValue !== $lastValue) {
+                        print '<optgroup label="' . $currentValue . '">';
                     }
 
                     $lastValue = $currentValue;
@@ -111,8 +111,8 @@ 
                     echo strtoupper($obj->immat);
                     print "</option>";
 
-                    if(true === $group && $currentValue !== $lastValue){
-                        print '<optgroup label="'.$currentValue.'">';
+                    if (true === $group && $currentValue !== $lastValue) {
+                        print '<optgroup label="' . $currentValue . '">';
                     }
 
 

command/CreateFlightCommandHandler.php

Spacing +11 added lines, -11 removed lines

@@ -65,7 +65,7 @@ 
         $vol = new Bbcvols($this->db);
         $vol->date = $command->getDate()->getTimestamp();
         $vol->lieuD = $command->getLieuD();
-        $vol->lieuA =$command->getLieuA();
+        $vol->lieuA = $command->getLieuA();
         $vol->heureD = $command->getHeureD()->format('Hi');
         $vol->heureA = $command->getHeureA()->format('Hi');
         $vol->BBC_ballons_idBBC_ballons = $command->getBBCBallonsIdBBCBallons();
@@ -73,14 +73,14 @@ 
         $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();
         $vol->fk_receiver = $command->getFkReceiver();
         $vol->justif_kilometers = $command->getJustifKilometers();
         $vol->setPassengerNames($command->getPassengerNames());
-        foreach($command->getOrderIds() as $orderId => $nbrPassengers){
+        foreach ($command->getOrderIds() as $orderId => $nbrPassengers) {
             $vol->addOrderId($orderId, $nbrPassengers);
         }
 
@@ -88,12 +88,12 @@ 
             throw new Exception();
         }
 
-        if(!$vol->isBillingRequired() || ($vol->isLinkedToOrder() && $vol->hasReceiver())){
+        if (!$vol->isBillingRequired() || ($vol->isLinkedToOrder() && $vol->hasReceiver())) {
             $vol->is_facture = true;
         }
 
         $result = $vol->create($this->user);
-        if($result <= 0){
+        if ($result <= 0) {
             throw new Exception();
         }
 
@@ -113,27 +113,27 @@ 
     {
         $flight->fetch($flight->id);
 
-        if(!$flight->isLinkedToOrder()){
+        if (!$flight->isLinkedToOrder()) {
             return;
         }
 
-        foreach($flight->getOrders() as $currentOrder){
+        foreach ($flight->getOrders() as $currentOrder) {
             $currentOrder->add_object_linked('flightlog_bbcvols', $flight->getId());
             $currentOrder->fetch_lines();
 
             $qtyOrder = 0;
             /** @var OrderLine $currentOrderLine */
-            foreach($currentOrder->lines as $currentOrderLine){
-                $qtyOrder += (int)$currentOrderLine->qty;
+            foreach ($currentOrder->lines as $currentOrderLine) {
+                $qtyOrder += (int) $currentOrderLine->qty;
             }
 
             $passangersCount = $this->numberOfPassengersLinkedToOrder($currentOrder->id);
 
-            if($passangersCount < $qtyOrder){
+            if ($passangersCount < $qtyOrder) {
                 continue;
             }
 
-            if($currentOrder->statut == Commande::STATUS_VALIDATED){
+            if ($currentOrder->statut == Commande::STATUS_VALIDATED) {
                 $currentOrder->cloture($this->user);
             }
         }

validators/FlightValidator.php

Spacing +6 added lines, -6 removed lines

@@ -151,7 +151,7 @@ 
      */
     private function checkPassengersInformation($vol)
     {
-        if (!is_numeric($vol->nbrPax) || (int)$vol->nbrPax < 0) {
+        if (!is_numeric($vol->nbrPax) || (int) $vol->nbrPax < 0) {
             $this->addError('nbrPax', 'Erreur le nombre de passager est un nombre négatif.');
         }
 
@@ -203,13 +203,13 @@ 
      */
     private function checkFlightInformation($vol)
     {
-        if(empty($vol->getHeureD()) || $vol->getHeureD() === '0000'){
+        if (empty($vol->getHeureD()) || $vol->getHeureD() === '0000') {
             $this->addError('heureD', "L'heure depart est vide");
         }
         if (!$this->isHourValid($vol->heureD)) {
             $this->addError('heureD', "L'heure depart n'est pas correcte");
         }
-        if(empty($vol->getHeureA()) || $vol->getHeureA() === '0000'){
+        if (empty($vol->getHeureA()) || $vol->getHeureA() === '0000') {
             $this->addError('heureD', "L'heure d'arrivée est vide");
         }
 
@@ -249,10 +249,10 @@ 
                 $this->addError('order_id', 'Le nombre de passager par commande doit être >= 0.');
             }
 
-            $totalPassenegrs += (int)$nbrPassengers;
+            $totalPassenegrs += (int) $nbrPassengers;
         }
 
-        if (!$vol->hasReceiver() && $totalPassenegrs !== (int)$vol->getNumberOfPassengers()) {
+        if (!$vol->hasReceiver() && $totalPassenegrs !== (int) $vol->getNumberOfPassengers()) {
             $this->addError('nbrPax', 'Le nombre de passagers ne correspond pas au nombre entré sur les commandes');
         }
 
@@ -278,7 +278,7 @@ 
 
     private function checkBalloon(Bbcvols $flight)
     {
-        if($flight->getBBCBallonsIdBBCBallons() > 0){
+        if ($flight->getBBCBallonsIdBBCBallons() > 0) {
             return $this;
         }
 

class/bbcvols.class.php

Spacing +18 added lines, -18 removed lines

@@ -259,7 +259,7 @@ 
         $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 .= ' ' . "'" . $this->passengerNames . "'";
         $sql .= ')';
 
         $this->db->begin();
@@ -273,7 +273,7 @@ 
 
         if (!$error) {
             $this->id = $this->db->last_insert_id(MAIN_DB_PREFIX . $this->table_element);
-            if(!$this->insertOrders()){
+            if (!$this->insertOrders()) {
                 $error++;
             }
 
@@ -299,9 +299,9 @@ 
     /**
      * Inserts the order linked to the flight
      */
-    private function insertOrders(){
+    private function insertOrders() {
 
-        if(empty($this->orderIds)){
+        if (empty($this->orderIds)) {
             return true;
         }
 
@@ -316,12 +316,12 @@ 
         
         $values = [];
 
-        foreach($this->orderIds as $orderId=>$nbrPassengers){
+        foreach ($this->orderIds as $orderId=>$nbrPassengers) {
             $values[] = sprintf(
                 $valueTemplate,
                 $orderId,
                 $this->db->escape($this->id),
-                (!isset($nbrPassengers) ? '0' :  $this->db->escape($nbrPassengers))
+                (!isset($nbrPassengers) ? '0' : $this->db->escape($nbrPassengers))
             );
         }
 
@@ -339,9 +339,9 @@ 
     /**
      * Inserts the order linked to the flight
      */
-    private function updateOrders(){
+    private function updateOrders() {
 
-        if(empty($this->orderIds)){
+        if (empty($this->orderIds)) {
             return true;
         }
 
@@ -352,9 +352,9 @@ 
     /**
      * Inserts the order linked to the flight
      */
-    private function deleteOrders(){
+    private function deleteOrders() {
 
-        if(empty($this->orderIds)){
+        if (empty($this->orderIds)) {
             return true;
         }
 
@@ -559,7 +559,7 @@ 
         $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 .= ' passenger_names = ' . "'" . trim($this->passengerNames) . "'";
 
         $sql .= ' WHERE idBBC_vols=' . $this->idBBC_vols;
 
@@ -1022,8 +1022,8 @@ 
      * @param int $orderId
      * @param int $nbrPassengers
      */
-    public function addOrderId($orderId, $nbrPassengers){
-        if(!isset($this->orderIds)){
+    public function addOrderId($orderId, $nbrPassengers) {
+        if (!isset($this->orderIds)) {
             $this->orderIds = [];
         }
 
@@ -1063,7 +1063,7 @@ 
         if ($resql) {
             $numrows = $this->db->num_rows($resql);
             if ($numrows) {
-                for($i = 0 ; $i < $numrows ; $i++){
+                for ($i = 0; $i < $numrows; $i++) {
                     $obj = $this->db->fetch_object($resql);
                     $this->orderIds[$obj->order_id] = $obj->nbr_passengers;
 
@@ -1084,7 +1084,7 @@ 
      */
     public function getOrders()
     {
-        if(!isset($this->orders) || empty($this->orders)){
+        if (!isset($this->orders) || empty($this->orders)) {
             $this->fetchOrder();
         }
         return $this->orders;
@@ -1209,7 +1209,7 @@ 
      */
     public function getBBCBallonsIdBBCBallons()
     {
-        return (int)$this->BBC_ballons_idBBC_ballons;
+        return (int) $this->BBC_ballons_idBBC_ballons;
     }
 
     /**
@@ -1285,7 +1285,7 @@ 
      */
     public function getFkType()
     {
-        return (int)$this->fk_type;
+        return (int) $this->fk_type;
     }
 
     /**
@@ -1380,7 +1380,7 @@ 
      */
     public function getFkReceiver()
     {
-        return (int)$this->fk_receiver;
+        return (int) $this->fk_receiver;
     }
 
     /**

card.php

Spacing +35 added lines, -35 removed lines

@@ -127,7 +127,7 @@ 
 $extralabels = $extrafields->fetch_name_optionals_label($object->table_element);
 
 // Load object
-include DOL_DOCUMENT_ROOT . '/core/actions_fetchobject.inc.php';  // Must be include, not include_once. Include fetch and fetch_thirdparty but not fetch_optionals
+include DOL_DOCUMENT_ROOT . '/core/actions_fetchobject.inc.php'; // Must be include, not include_once. Include fetch and fetch_thirdparty but not fetch_optionals
 include DOL_DOCUMENT_ROOT . '/core/actions_dellink.inc.php';
 
 // Initialize technical object to manage hooks of modules. Note that conf->hooks_modules contains array array
@@ -156,7 +156,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');
 }
@@ -234,12 +234,12 @@ 
 
     // Action to classify in a project
     if (!empty($conf->projet->enabled) && $user->rights->projet->creer && $action === ACTION_CLASSIN) {
-        try{
+        try {
             $handler = new \flightlog\command\ClassifyFlightHandler($db, $conf, $langs, $user);
             $handler->handle(new \flightlog\command\ClassifyFlight($id, GETPOST('projectid')));
             $object->fetch($id);
             $action = 'show';
-        }catch(Exception $e){
+        } catch (Exception $e) {
             setEventMessages($e->getMessage(), null, 'errors');
         }
     }
@@ -272,7 +272,7 @@ 
 
 
 // Part to edit record
-if (($user->rights->flightlog->vol->edit || ($user->rights->flightlog->vol->add && $object->fk_pilot == $user->id )) && ($id || $ref) && $action == 'edit'): ?>
+if (($user->rights->flightlog->vol->edit || ($user->rights->flightlog->vol->add && $object->fk_pilot == $user->id)) && ($id || $ref) && $action == 'edit'): ?>
 
     <?php $renderer = new \flightlog\form\SimpleFormRenderer(); ?>
 
@@ -286,11 +286,11 @@ 
 
     <form class="flight-form js-form" name='add' action="card.php?rowid=<?php echo $object->getId(); ?>" method="POST">
         <input type="hidden" name="action" value="update"/>
-        <input type="hidden" name="token" value="<?php echo newToken();?>"/>
+        <input type="hidden" name="token" value="<?php echo newToken(); ?>"/>
 
         <?php echo $renderer->render($formFlight->getElement('idBBC_vols')); ?>
 
-        <?php if($formFlight->has('fk_type')): ?>
+        <?php if ($formFlight->has('fk_type')): ?>
         <section class="form-section">
             <h1 class="form-section-title"><?php echo $langs->trans('Type de vol'); ?></h1>
             <table class="border" width="50%">
@@ -304,7 +304,7 @@ 
         <?php endif; ?>
 
         <!-- Date et heures -->
-        <?php if($formFlight->has('date')): ?>
+        <?php if ($formFlight->has('date')): ?>
             <section class="form-section">
                 <h1 class="form-section-title"><?php echo $langs->trans('Date'); ?></h1>
                 <table class="border" width="50%">
@@ -316,7 +316,7 @@ 
             </section>
         <?php endif; ?>
 
-        <?php if($formFlight->has('heureD') && $formFlight->has('heureA')): ?>
+        <?php if ($formFlight->has('heureD') && $formFlight->has('heureA')): ?>
             <section class="form-section">
                 <h1 class="form-section-title"><?php echo $langs->trans('Heures'); ?></h1>
                 <table class="border" width="50%">
@@ -336,14 +336,14 @@ 
             <h1 class="form-section-title"><?php echo $langs->trans('Pilote & ballon') ?></h1>
             <table class="border" width="50%">
 
-                <?php if($formFlight->has('fk_pilot')): ?>
+                <?php if ($formFlight->has('fk_pilot')): ?>
                 <tr>
                     <td class="fieldrequired"> Pilote </td>
-                    <td><?php echo $renderer->render($formFlight->getElement('fk_pilot'),['ajax' => true]); ?></td>
+                    <td><?php echo $renderer->render($formFlight->getElement('fk_pilot'), ['ajax' => true]); ?></td>
                 </tr>
                 <?php endif; ?>
 
-                <?php if($formFlight->has('BBC_ballons_idBBC_ballons')): ?>
+                <?php if ($formFlight->has('BBC_ballons_idBBC_ballons')): ?>
                 <tr>
                     <td width="25%" class="fieldrequired">Ballon</td>
                     <td><?php echo $renderer->render($formFlight->getElement('BBC_ballons_idBBC_ballons')); ?></td>
@@ -378,7 +378,7 @@ 
             </table>
         </section>
 
-        <?php if($formFlight->has('fk_organisateur')): ?>
+        <?php if ($formFlight->has('fk_organisateur')): ?>
             <section class="form-section">
                 <h1 class="form-section-title"><span class="js-organisator-field">Organisateur</span></h1>
                 <table class="border" width="50%">
@@ -387,7 +387,7 @@ 
                         <td>
                             <?php
                             //organisateur
-                            print $renderer->render($formFlight->getElement('fk_organisateur'),['ajax' => true]);
+                            print $renderer->render($formFlight->getElement('fk_organisateur'), ['ajax' => true]);
                             ?>
                         </td>
                     </tr>
@@ -399,7 +399,7 @@ 
         <section class="form-section js-expensable-field">
             <h1 class="form-section-title"><?php echo $langs->trans('Déplacements') ?></h1>
             <table class="border" width="50%">
-                <?php if($formFlight->has('kilometers')): ?>
+                <?php if ($formFlight->has('kilometers')): ?>
                     <!-- number of kilometers done for the flight -->
                     <tr>
                         <td class="fieldrequired">Nombre de kilometres effectués pour le vol</td>
@@ -409,7 +409,7 @@ 
                     </tr>
                 <?php endif; ?>
 
-                <?php if($formFlight->has('justif_kilometers')): ?>
+                <?php if ($formFlight->has('justif_kilometers')): ?>
                     <!-- Justif Kilometers -->
                     <tr>
 
@@ -427,7 +427,7 @@ 
         <section class="form-section">
             <h1 class="form-section-title"><?php echo $langs->trans('Passager') ?></h1>
             <table class="border" width="50%">
-                <?php if($formFlight->has('nbrPax')): ?>
+                <?php if ($formFlight->has('nbrPax')): ?>
                     <tr>
                         <td class="fieldrequired"><?php echo $langs->trans('Nombre de passagers'); ?></td>
                         <td>
@@ -436,7 +436,7 @@ 
                     </tr>
                 <?php endif; ?>
 
-                <?php if($formFlight->has('passengerNames')): ?>
+                <?php if ($formFlight->has('passengerNames')): ?>
                     <!-- passenger names -->
                     <tr>
                         <td width="25%" class="fieldrequired"><?php echo $langs->trans('Noms des passagers'); ?><br/>(Séparé
@@ -446,7 +446,7 @@ 
                             <?php print $renderer->render($formFlight->getElement('passengerNames')); ?>
                         </td>
                     </tr>
-                <?php endif;?>
+                <?php endif; ?>
             </table>
         </section>
 
@@ -455,17 +455,17 @@ 
             <h1 class="form-section-title js-billable-field"><?php echo $langs->trans('Facturation') ?></h1>
             <table class="border" width="50%">
 
-                <?php if($formFlight->has('fk_receiver')): ?>
+                <?php if ($formFlight->has('fk_receiver')): ?>
                     <!-- Money receiver -->
                     <tr class="js-hide-order js-billable-field">
                         <td class="fieldrequired"><?php echo $langs->trans('Qui a perçu l\'argent') ?></td>
                         <td>
-                            <?php print $renderer->render($formFlight->getElement('fk_receiver'),['ajax' => true]); ?>
+                            <?php print $renderer->render($formFlight->getElement('fk_receiver'), ['ajax' => true]); ?>
                         </td>
                     </tr>
                 <?php endif; ?>
 
-                <?php if($formFlight->has('cost')): ?>
+                <?php if ($formFlight->has('cost')): ?>
                     <!-- Flight cost -->
                     <tr class="js-hide-order js-billable-field">
                         <td class="fieldrequired">Montant perçu</td>
@@ -486,7 +486,7 @@ 
             <h1 class="form-section-title"><?php echo $langs->trans('Commentaires') ?></h1>
             <table class="border" width="50%">
 
-                <?php if($formFlight->has('remarque')): ?>
+                <?php if ($formFlight->has('remarque')): ?>
                     <!-- commentaires -->
                     <tr class="">
                         <td class="fieldrequired"> Commentaire</td>
@@ -496,7 +496,7 @@ 
                     </tr>
                 <?php endif; ?>
 
-                <?php if($formFlight->has('incidents')): ?>
+                <?php if ($formFlight->has('incidents')): ?>
                     <!-- incidents -->
                     <tr class="">
                         <td class="fieldrequired"> incidents</td>
@@ -530,7 +530,7 @@ 
         $formconfirm = $form->formconfirm($_SERVER["PHP_SELF"] . '?id=' . $object->id, $langs->trans('DeleteMyOjbect'),
             $langs->trans('êtes-vous sure de vouloir supprimer ce vol ?'), 'confirm_delete', '', 0, 1);
         print $formconfirm;
-    } elseif ($user->rights->flightlog->vol->financial  && $action == ACTION_FLAG_BILLED) {
+    } elseif ($user->rights->flightlog->vol->financial && $action == ACTION_FLAG_BILLED) {
         $formconfirm = $form->formconfirm($_SERVER["PHP_SELF"] . '?id=' . $object->id,
             $langs->trans('Marque comme facturé'),
             $langs->trans('Ce vol va être marqué comme facturé, est-ce bien le cas ?'), ACTION_CONFIRM_FLAG_BILLED, '',
@@ -554,29 +554,29 @@ 
     print '<tr><td class="fieldrequired">' . $langs->trans("Fieldfk_pilot") . '</td><td>' . $pilot->getNomUrl(1) . '</td></tr>';
     print '<tr><td class="fieldrequired">' . $langs->trans("Fieldfk_organisateur") . '</td><td>' . $organisator->getNomUrl(1) . '</td></tr>';
 
-    if (! empty($conf->projet->enabled))
+    if (!empty($conf->projet->enabled))
     {
         print '<tr><td class="fieldrequired">' . $langs->trans("Project") . '</td><td>';
         $morehtmlref = '';
         if ($user->rights->projet->creer)
         {
             if ($action !== ACTION_CLASSIFY) {
-                $morehtmlref .= '<a href="' . $_SERVER['PHP_SELF'] . '?action='.ACTION_CLASSIFY.'&amp;id=' . $object->id . '">' . img_edit($langs->transnoentitiesnoconv('SetProject')) . '</a> ';
+                $morehtmlref .= '<a href="' . $_SERVER['PHP_SELF'] . '?action=' . ACTION_CLASSIFY . '&amp;id=' . $object->id . '">' . img_edit($langs->transnoentitiesnoconv('SetProject')) . '</a> ';
             }
             if ($action === ACTION_CLASSIFY) {
-                $morehtmlref.='<form method="post" action="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'">';
-                $morehtmlref.='<input type="hidden" name="action" value="'.ACTION_CLASSIN.'">';
-                $morehtmlref.='<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
-                $morehtmlref.=$formproject->select_projects((empty($conf->global->PROJECT_CAN_ALWAYS_LINK_TO_ALL_SUPPLIERS)?$object->socid:-1), $object->fk_project, 'projectid', 80, 0, 1, 0, 1, 0, 0, '', 1);
-                $morehtmlref.='<input type="submit" class="button valignmiddle" value="'.$langs->trans("Modify").'">';
-                $morehtmlref.='</form>';
+                $morehtmlref .= '<form method="post" action="' . $_SERVER['PHP_SELF'] . '?id=' . $object->id . '">';
+                $morehtmlref .= '<input type="hidden" name="action" value="' . ACTION_CLASSIN . '">';
+                $morehtmlref .= '<input type="hidden" name="token" value="' . $_SESSION['newtoken'] . '">';
+                $morehtmlref .= $formproject->select_projects((empty($conf->global->PROJECT_CAN_ALWAYS_LINK_TO_ALL_SUPPLIERS) ? $object->socid : -1), $object->fk_project, 'projectid', 80, 0, 1, 0, 1, 0, 0, '', 1);
+                $morehtmlref .= '<input type="submit" class="button valignmiddle" value="' . $langs->trans("Modify") . '">';
+                $morehtmlref .= '</form>';
             }
         }
 
         if ($object->hasProject()) {
             $proj = new Project($db);
             $proj->fetch($object->fk_project);
-            $morehtmlref.=$proj->getNomUrl(1);
+            $morehtmlref .= $proj->getNomUrl(1);
         }
         print $morehtmlref . '</td>';
     }
@@ -591,7 +591,7 @@ 
     print '<div class="tabsAction">' . "\n";
     $parameters = array();
     $reshook = $hookmanager->executeHooks('addMoreActionsButtons', $parameters, $object,
-        $action);    // Note that $action and $object may have been modified by hook
+        $action); // Note that $action and $object may have been modified by hook
     if ($reshook < 0) {
         setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
     }