laudeco / bbc-dolibarr-flightlog

generateBilling.php

Braces +5 added lines, -2 removed lines

@@ -613,9 +613,12 @@
 
         <?php if ($year >= $currentYear || !$t1->service || !$t2->service || !$t3->service || !$t4->service || !$t5->service || !$t6->service || !$t7->service) : ?>
             <a class="butActionRefused" href="#">Générer</a>
-        <?php else: ?>
+        <?php else {
+    : ?>
             <button class="butAction" type="submit">Générer</button>
-        <?php endif; ?>
+        <?php endif;
+}
+?>
 
     </form>
 

core/triggers/interface_50001_modFlightLog_mailOnIncident.class.php

Indentation +54 added lines, -54 removed lines

@@ -26,58 +26,58 @@ 
  */
 class InterfaceMailOnIncident extends DolibarrTriggers
 {
-	/**
-	 * @var DoliDB Database handler
-	 */
-	protected $db;
-
-	/**
-	 * Constructor
-	 *
-	 * @param DoliDB $db Database handler
-	 */
-	public function __construct($db)
-	{
-		$this->db = $db;
-
-		$this->name = preg_replace('/^Interface/i', '', get_class($this));
-		$this->family = "Belgian balloon club";
-		$this->description = "Trigger that send an e-mail on flight incident.";
-		$this->version = '1.0';
-		$this->picto = 'flightlog@flightlog';
-	}
-
-	/**
-	 * Trigger name
-	 *
-	 * @return string Name of trigger file
-	 */
-	public function getName()
-	{
-		return $this->name;
-	}
-
-	/**
-	 * Trigger description
-	 *
-	 * @return string Description of trigger file
-	 */
-	public function getDesc()
-	{
-		return $this->description;
-	}
-
-
-	/**
-	 * @param string 		$action 	Event action code
-	 * @param Bbcvols 	    $object 	Object
-	 * @param User 			$user 		Object user
-	 * @param Translate 	$langs 		Object langs
-	 * @param Conf 			$conf 		Object conf
-	 * @return int              		<0 if KO, 0 if no triggered ran, >0 if OK
-	 */
-	public function runTrigger($action, $object, User $user, Translate $langs, Conf $conf)
-	{
+    /**
+     * @var DoliDB Database handler
+     */
+    protected $db;
+
+    /**
+     * Constructor
+     *
+     * @param DoliDB $db Database handler
+     */
+    public function __construct($db)
+    {
+        $this->db = $db;
+
+        $this->name = preg_replace('/^Interface/i', '', get_class($this));
+        $this->family = "Belgian balloon club";
+        $this->description = "Trigger that send an e-mail on flight incident.";
+        $this->version = '1.0';
+        $this->picto = 'flightlog@flightlog';
+    }
+
+    /**
+     * Trigger name
+     *
+     * @return string Name of trigger file
+     */
+    public function getName()
+    {
+        return $this->name;
+    }
+
+    /**
+     * Trigger description
+     *
+     * @return string Description of trigger file
+     */
+    public function getDesc()
+    {
+        return $this->description;
+    }
+
+
+    /**
+     * @param string 		$action 	Event action code
+     * @param Bbcvols 	    $object 	Object
+     * @param User 			$user 		Object user
+     * @param Translate 	$langs 		Object langs
+     * @param Conf 			$conf 		Object conf
+     * @return int              		<0 if KO, 0 if no triggered ran, >0 if OK
+     */
+    public function runTrigger($action, $object, User $user, Translate $langs, Conf $conf)
+    {
         if (empty($conf->flightlog->enabled) || empty($conf->workflow->enabled)){
             return 0;
         }
@@ -132,6 +132,6 @@ 
             dol_syslog("Error while sending mail in flight log module : incident", LOG_ERR);
         }
 
-		return 0;
-	}
+        return 0;
+    }
 }

Spacing +12 added lines, -12 removed lines

@@ -16,7 +16,7 @@ 
  */
 
 
-require_once DOL_DOCUMENT_ROOT.'/core/triggers/dolibarrtriggers.class.php';
+require_once DOL_DOCUMENT_ROOT . '/core/triggers/dolibarrtriggers.class.php';
 dol_include_once('/flightlog/class/bbcvols.class.php');
 dol_include_once('/core/class/CMailFile.class.php');
 
@@ -78,23 +78,23 @@ 
 	 */
 	public function runTrigger($action, $object, User $user, Translate $langs, Conf $conf)
 	{
-        if (empty($conf->flightlog->enabled) || empty($conf->workflow->enabled)){
+        if (empty($conf->flightlog->enabled) || empty($conf->workflow->enabled)) {
             return 0;
         }
 
-        if(empty($conf->global->WORKFLOW_BBC_FLIGHTLOG_SEND_MAIL_ON_INCIDENT)){
+        if (empty($conf->global->WORKFLOW_BBC_FLIGHTLOG_SEND_MAIL_ON_INCIDENT)) {
             return 0;
         }
 
-        if($action !== 'BBC_FLIGHT_LOG_ADD_FLIGHT'){
+        if ($action !== 'BBC_FLIGHT_LOG_ADD_FLIGHT') {
             return 0;
         }
 
-        if(!$object->hasIncidents() && !$object->hasComment()){
+        if (!$object->hasIncidents() && !$object->hasComment()) {
             return 0;
         }
 
-        if(!empty($conf->global->MAIN_DISABLE_ALL_MAILS)){
+        if (!empty($conf->global->MAIN_DISABLE_ALL_MAILS)) {
             return 0;
         }
 
@@ -102,11 +102,11 @@ 
         $message .= sprintf("<p>Vous recevez cet e-mail car un vol a été encodé avec un incident/ une remarque sur le ballon : %s dont vous êtes titulaire ou co-titulaire.</p>", $object->getBalloon()->immat);
         $message .= sprintf("<p><b>Vol id :</b> %d</p>", $object->getId());
         $message .= sprintf("<p><b>Réalisé par :</b> %s </p>", $object->getPilot()->getFullName($langs));
-        if($object->hasComment()){
+        if ($object->hasComment()) {
             $message .= sprintf("<p><b>Commentaire :</b> %s </p>", $object->getComment());
         }
 
-        if($object->hasIncidents()){
+        if ($object->hasIncidents()) {
             $message .= sprintf("<p><b>Incident :</b> %s </p>", $object->getIncident());
         }
 
@@ -118,18 +118,18 @@ 
 
         $responsable = new User($user->db);
         $res = $responsable->fetch($object->getBalloon()->fk_responsable);
-        if($res > 0){
+        if ($res > 0) {
             $to[] = $responsable->email;
         }
 
 
         $backup = new User($user->db);
         $res = $backup->fetch($object->getBalloon()->fk_co_responsable);
-        if($res > 0){
+        if ($res > 0) {
             $to[] = $backup->email;
         }
 
-        if(empty($to)){
+        if (empty($to)) {
             return 0;
         }
 
@@ -149,7 +149,7 @@ 
         );
 
 
-        if (! $mailfile->sendfile())
+        if (!$mailfile->sendfile())
         {
             dol_syslog("Error while sending mail in flight log module : incident", LOG_ERR);
         }

core/modules/modFlightLog.class.php

Spacing +1 added lines, -1 removed lines

@@ -341,7 +341,7 @@
      */
     private function initPermissions()
     {
-        $this->rights = array();        // Permission array used by this module
+        $this->rights = array(); // Permission array used by this module
         $r = 0;
 
         $this->rights[$r][0] = 9993;

admin/vol.php

Spacing +7 added lines, -7 removed lines

@@ -25,15 +25,15 @@ 
  * Actions
  */
 // Save
-if($action === ACTION_SAVE){
-    foreach($services as $flightTypeId => $serviceId){
+if ($action === ACTION_SAVE) {
+    foreach ($services as $flightTypeId => $serviceId) {
         $res = $flightType->fetch($flightTypeId);
-        if($res > 0 ){
+        if ($res > 0) {
             $flightType->fkService = $serviceId;
             $flightType->update($user);
         }
 
-        dolibarr_set_const($db, 'BBC_POINTS_BONUS_'.$flightTypeId, GETPOST('points_bonus_'.$flightTypeId), 'chaine', 0, 'Points pour le vol T'.$flightTypeId, $conf->entity);
+        dolibarr_set_const($db, 'BBC_POINTS_BONUS_' . $flightTypeId, GETPOST('points_bonus_' . $flightTypeId), 'chaine', 0, 'Points pour le vol T' . $flightTypeId, $conf->entity);
     }
 
     dolibarr_set_const($db, 'BBC_FLIGHT_TYPE_CUSTOMER', GETPOST('customer_product'), 'chaine', 0, '', $conf->entity);
@@ -71,7 +71,7 @@ 
                 <tr class="<?= $flightTypeLine->id % 2 == 0 ? "pair" : "impair" ?>">
                     <td>(T<?= $flightTypeLine->numero ?>) - <?= $flightTypeLine->nom ?></td>
                     <td>
-                        <?php $form->select_produits($flightTypeLine->fkService, 'idprod['.$flightTypeLine->id.']', $filtertype, $conf->product->limit_size, $buyer->price_level, 1, 2, '', 1, array(),$buyer->id); ?>
+                        <?php $form->select_produits($flightTypeLine->fkService, 'idprod[' . $flightTypeLine->id . ']', $filtertype, $conf->product->limit_size, $buyer->price_level, 1, 2, '', 1, array(), $buyer->id); ?>
                     </td>
                 </tr>
             <?php endforeach; ?>
@@ -83,7 +83,7 @@ 
                 </td>
                 <td>
                     <?php $form->select_produits($conf->global->BBC_FLIGHT_TYPE_CUSTOMER, 'customer_product',
-                        $filtertype, $conf->product->limit_size, $buyer->price_level, 1, 2, '', 1, array(),$buyer->id); ?>
+                        $filtertype, $conf->product->limit_size, $buyer->price_level, 1, 2, '', 1, array(), $buyer->id); ?>
                 </td>
             </tr>
 
@@ -106,7 +106,7 @@ 
                     <label for="points_bonus_<?php echo $flightTypeLine->numero; ?>">
                         (T<?php echo $flightTypeLine->numero ?>) - <?php echo $flightTypeLine->nom ?>
                     </label>
-                    <?php $prop = 'BBC_POINTS_BONUS_'.$flightTypeLine->numero; ?>
+                    <?php $prop = 'BBC_POINTS_BONUS_' . $flightTypeLine->numero; ?>
                     <input type="number" id="points_bonus_<?php echo $flightTypeLine->numero; ?>" name="points_bonus_<?php echo $flightTypeLine->numero; ?>" value="<?php echo $conf->global->$prop?>" />
                     <br/>
                 <?php endforeach; ?>

command/CreateFlightBillCommandHandlerFactory.php

Spacing +3 added lines, -3 removed lines

@@ -1,7 +1,7 @@ 
 <?php
 
-require_once __DIR__.'/CreateFlightBillCommandHandler.php';
-require_once __DIR__.'/CreateFlightBillTransactionalCommandHandler.php';
+require_once __DIR__ . '/CreateFlightBillCommandHandler.php';
+require_once __DIR__ . '/CreateFlightBillTransactionalCommandHandler.php';
 
 /**
  * @author Laurent De Coninck <lau.deconinck@gmail.com>
@@ -11,7 +11,7 @@ 
     /**
      * @return CreateFlightBillCommandHandler
      */
-    public static function factory($db, $conf, $user, $langs){
+    public static function factory($db, $conf, $user, $langs) {
         return new CreateFlightBillTransactionalCommandHandler($db, $conf, $user, $langs);
     }
 

generateMonthlyBilling.php

Braces +5 added lines, -2 removed lines

@@ -239,9 +239,12 @@
                     <?php echo $langs->trans('La periode demandée n\'est pas cloturée.') ?>
                 </p>
                 <a class="butActionRefused" href="#">Générer</a>
-            <?php else: ?>
+            <?php else {
+    : ?>
                 <button class="butAction" type="submit">Générer</button>
-            <?php endif; ?>
+            <?php endif;
+}
+?>
 
         </form>
     </section>

Spacing +1 added lines, -1 removed lines

@@ -95,7 +95,7 @@
 if ($action == EXPENSE_REPORT_GENERATOR_ACTION_GENERATE) {
     try {
 
-        $command = new CreateMonthBillCommand( $type, $publicNote, $privateNote, $year, $month);
+        $command = new CreateMonthBillCommand($type, $publicNote, $privateNote, $year, $month);
         $handler->handle($command);
         dol_htmloutput_mesg('Génération : OK');
     } catch (Exception $e) {

core/cron/BbcMonthlyFlightsBillCron.php

Spacing +1 added lines, -1 removed lines

@@ -53,7 +53,7 @@
 
         try {
 
-            if(date('d')>=15){
+            if (date('d') >= 15) {
                 dol_syslog('Monthly bill generation : date over');
                 return -2;
             }

tabs/project/instructions.php

Spacing +1 added lines, -1 removed lines

@@ -232,7 +232,7 @@
                                     <?php echo !empty($flight->linkedObjectsIds) && in_array($currentTask->id,
                                         $flight->linkedObjectsIds[$currentTask->table_element]) ? 'checked' : '' ?>
                                 />
-                            <?php else: ?>
+                            <?php else : ?>
 
                                 <?php if (!empty($flight->linkedObjectsIds) && in_array($currentTask->id,
                                         $flight->linkedObjectsIds[$currentTask->table_element])): ?>

Braces +10 added lines, -4 removed lines

@@ -211,8 +211,11 @@ 
                         <?php if ($userWrite): ?>
                             <?php echo $formOther->select_percent($currentTask->progress,
                                 sprintf('progression[%s]', $currentTask->id, false, 10)); ?>
-                        <?php else: ?>
-                            <span><?php echo $currentTask->progress; ?> %</span>
+                        <?php else {
+    : ?>
+                            <span><?php echo $currentTask->progress;
+}
+?> %</span>
                         <?php endif; ?>
 
                     </td>
@@ -232,14 +235,17 @@ 
                                     <?php echo !empty($flight->linkedObjectsIds) && in_array($currentTask->id,
                                         $flight->linkedObjectsIds[$currentTask->table_element]) ? 'checked' : '' ?>
                                 />
-                            <?php else: ?>
+                            <?php else {
+    : ?>
 
                                 <?php if (!empty($flight->linkedObjectsIds) && in_array($currentTask->id,
                                         $flight->linkedObjectsIds[$currentTask->table_element])): ?>
                                     <span class="fa fa-check"></span>
                                 <?php else: ?>
                                     <span class="fa fa-times"></span>
-                                <?php endif; ?>
+                                <?php endif;
+}
+?>
 
                             <?php endif; ?>
 

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