laudeco / bbc-dolibarr-flightlog

class/GraphicalData.php

Spacing +2 added lines, -2 removed lines

@@ -40,7 +40,7 @@ 
      */
     public function addValue($year, GraphicalValue $value)
     {
-        if(!isset($this->data[$year])){
+        if (!isset($this->data[$year])) {
             throw new \Exception("Year is not defined");
         }
 
@@ -54,7 +54,7 @@ 
     {
         $result = [];
 
-        foreach($this->data as $year){
+        foreach ($this->data as $year) {
             $result[] = $year->export();
         }
 

list.php

Indentation +7 added lines, -7 removed lines

@@ -136,12 +136,12 @@ 
 
     //'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),
 );
@@ -149,9 +149,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 +62 added lines, -62 removed lines

@@ -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');
 }
@@ -291,7 +291,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)) {
@@ -381,7 +381,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);
@@ -481,7 +481,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 {
@@ -496,7 +496,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";
@@ -593,7 +593,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,
@@ -711,7 +711,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
@@ -752,116 +752,116 @@ 
         // 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']))
         {
-            print '<td>'.$obj->kilometers.'</td>';
+            print '<td>' . $obj->kilometers . '</td>';
 
-            if (! $i) $totalarray['nbfield']++;
+            if (!$i) $totalarray['nbfield']++;
         }
-        if (! empty($arrayfields['t.cost']['checked']))
+        if (!empty($arrayfields['t.cost']['checked']))
         {
-            print '<td>'.$obj->cost.'</td>';
+            print '<td>' . $obj->cost . '</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
@@ -886,7 +886,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'])) {
@@ -963,7 +963,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 +60 added lines, -20 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 = '';
@@ -756,7 +758,9 @@ 
         {
             print '<td>'.$flight->getNomUrl(0).'</td>';
 
-            if (! $i) $totalarray['nbfield']++;
+            if (! $i) {
+                $totalarray['nbfield']++;
+            }
         }
         if (! empty($arrayfields['t.date']['checked']))
         {
@@ -764,104 +768,138 @@ 
                 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']))
         {
             print '<td>'.$obj->kilometers.'</td>';
 
-            if (! $i) $totalarray['nbfield']++;
+            if (! $i) {
+                $totalarray['nbfield']++;
+            }
         }
         if (! empty($arrayfields['t.cost']['checked']))
         {
             print '<td>'.$obj->cost.'</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
@@ -916,9 +954,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;
             }

readBalloonInc.php

Indentation +103 added lines, -103 removed lines

@@ -28,7 +28,7 @@ 
 // Protection if the user can't acces to the module
 if (!$user->rights->flightLog->vol->access)
 {
-	accessforbidden();
+    accessforbidden();
 }
 
 
@@ -42,54 +42,54 @@ 
 //l'utilisateur a le droit de selectionner le ballon qu'il veut
 if (($user->rights->flightLog->vol->detail))
 {
-	if(isset($_GET["ballon"])){
-		$idBallon = $_GET['ballon'];
-	}else{
-		$idBallon =1;
-	}
+    if(isset($_GET["ballon"])){
+        $idBallon = $_GET['ballon'];
+    }else{
+        $idBallon =1;
+    }
 	
 }else{
 	
-	//l'utilisateur n'a pas le choix du ballon
-	//il est titulaire d'un ballon
-	$query = 'SELECT * FROM llx_bbc_ballons';
-	$query.= ' WHERE `fk_responsable` = '.$user->id;
-	$resql = $db->query($query);
-	if($resql){
-		$num = $db->num_rows($resql);
-		$i = 0;
-		if($num){
-			print'</tr>';
-			while($i <$num){
-				$obj = $db->fetch_object($resql); //vol
-				if($obj){
-					$idBallon = ($obj->rowid);
-				}
-			}
-		}else{
-			//il n'est pas titulaire d'un ballon
-			accessforbidden("Vous n'&ecirc;tes pas titulaire du ballon");
-		}
-	}
+    //l'utilisateur n'a pas le choix du ballon
+    //il est titulaire d'un ballon
+    $query = 'SELECT * FROM llx_bbc_ballons';
+    $query.= ' WHERE `fk_responsable` = '.$user->id;
+    $resql = $db->query($query);
+    if($resql){
+        $num = $db->num_rows($resql);
+        $i = 0;
+        if($num){
+            print'</tr>';
+            while($i <$num){
+                $obj = $db->fetch_object($resql); //vol
+                if($obj){
+                    $idBallon = ($obj->rowid);
+                }
+            }
+        }else{
+            //il n'est pas titulaire d'un ballon
+            accessforbidden("Vous n'&ecirc;tes pas titulaire du ballon");
+        }
+    }
 }
 if($idBallon != -1){
 	
-	//balloon with ID
-	$ballon = New Bbc_ballons($db);
+    //balloon with ID
+    $ballon = New Bbc_ballons($db);
         
-	if($ballon->fetch($idBallon)==-1){
-		print "ERROR".$idBallon."<br/>";
-	}
-	//titulaire with ballon ID
+    if($ballon->fetch($idBallon)==-1){
+        print "ERROR".$idBallon."<br/>";
+    }
+    //titulaire with ballon ID
         $titulaire = new User($db);
         $titulaire->fetch($ballon->fk_responsable);
         //flight with balloon ID
-	$query = 'SELECT *, TIMEDIFF(heureA,heureD) AS time FROM llx_bbc_vols';
-	$query.= ' WHERE `BBC_ballons_idBBC_ballons` = '.$ballon->id;
-	$query.= ' AND `incidents` NOT LIKE \'RAS\'';
-	$query.= ' AND `incidents` NOT LIKE \'\'';
-	$query.= ' ORDER BY date';
-	$resql = $db->query($query);
+    $query = 'SELECT *, TIMEDIFF(heureA,heureD) AS time FROM llx_bbc_vols';
+    $query.= ' WHERE `BBC_ballons_idBBC_ballons` = '.$ballon->id;
+    $query.= ' AND `incidents` NOT LIKE \'RAS\'';
+    $query.= ' AND `incidents` NOT LIKE \'\'';
+    $query.= ' ORDER BY date';
+    $resql = $db->query($query);
 }
 
 
@@ -102,27 +102,27 @@ 
 
 llxHeader('','Carnet de vol','');
 if($msg && $idBallon != -1){
-	print $msg;
+    print $msg;
 }else{
-	$form=new Form($db);
+    $form=new Form($db);
 	
-	print '<!-- debut cartouche rapport -->
+    print '<!-- debut cartouche rapport -->
 	<div class="tabs">
 	<a  class="tab" href="readFlightsBalloon.php?ballon='.$idBallon.'">Carnet de vol</a>
 	<a id="active" class="tab" href="readBalloonInc.php?ballon='.$idBallon.'">Incidents</a>
 	</div>';
-	print '<div class="tabBar">';
-	print "<form name='readBalloon' action=\"readFlightsBalloon.php\" method=\"get\">\n";
-	print '<input type="hidden" name="mode" value="SELECT">';
-	print '<table width="100%" class="border">';
-	print '<tr><td>Ballon</td><td colspan="3">';
-	if($user->rights->flightLog->vol->detail){
-		select_balloons($idBallon);
-	}else{
-		print $ballon->immat;
-	}
+    print '<div class="tabBar">';
+    print "<form name='readBalloon' action=\"readFlightsBalloon.php\" method=\"get\">\n";
+    print '<input type="hidden" name="mode" value="SELECT">';
+    print '<table width="100%" class="border">';
+    print '<tr><td>Ballon</td><td colspan="3">';
+    if($user->rights->flightLog->vol->detail){
+        select_balloons($idBallon);
+    }else{
+        print $ballon->immat;
+    }
 	
-	print'</td></tr>';
+    print'</td></tr>';
         //titulaire
         print '<tr>';
         print '<td>Titulaire</td>';
@@ -134,10 +134,10 @@ 
         print '<td>'.dol_print_date($ballon->date, 'dayrfc').'</td>';
         print '</tr>';
         $num = 0;
-	if($resql){
-		//fetch pilot
+    if($resql){
+        //fetch pilot
 		
-		$num = $db->num_rows($resql);
+        $num = $db->num_rows($resql);
                 //>Nombre d'incidences
                 print '<tr>';
                 print '<td>Nombre d\'incidences</.td>';
@@ -149,54 +149,54 @@ 
 
 
                 print '<table class="border" width="100%">';
-		$i = 0;
-		if($num){
-			print '<tr class="liste_titre">';
-			print '<td class="liste_titre"> identifiant </td>';
-			print '<td class="liste_titre"> Date </td>';
-			print '<td class="liste_titre"> Ballon </td>';
-			print '<td class="liste_titre"> Pilote </td>';
-			print '<td class="liste_titre"> Lieu depart </td>';
-			print '<td class="liste_titre"> Lieu arrivee </td>';
-			print '<td class="liste_titre"> Heure depart</td>';
-			print '<td class="liste_titre"> Heure Arrivee </td>';
-			print '<td class="liste_titre"> Duree (min) </td>';
-			print '<td class="liste_titre"> Nbr Pax </td>';
-			print '<td class="liste_titre"> Rem </td>';
-			print '<td class="liste_titre"> Incidents </td>';
-			if($user->rights->flightLog->vol->status){
-				print '<td class="liste_titre"> Statut </td>';
-			}
-			print'</tr>';
-			while($i <$num){
-				$obj = $db->fetch_object($resql); //vol
-				print '<tr>';
-				if($obj){
-					$pilot = New User($db); //pilot
-					$pilot->fetch($obj->fk_pilot);
-					print '<td><a href="fiche.php?vol='.$obj->idBBC_vols.'">'.$obj->idBBC_vols.'</a></td>';
-					print '<td>'.$obj->date.'</td>';
-					print '<td>'.$ballon->immat.'</td>';
-					print '<td>'.$pilot->getNomUrl().'</a></td>';
-					print '<td>'.$obj->lieuD.'</td>';
-					print '<td>'.$obj->lieuA.'</td>';
-					print '<td>'.$obj->heureD.'</td>';
-					print '<td>'.$obj->heureA.'</td>';
-					print '<td>'.$obj->time.'</td>';
-					print '<td>'.$obj->nbrPax.'</td>';
-					print '<td>'.$obj->remarque.'</td>';
-					print '<td>'.$obj->incidents.'</td>';
-					if($user->rights->flightLog->vol->status){
-						$vol = new Bbcvols($db);
-						$vol->fetch($obj->idBBC_vols);
+        $i = 0;
+        if($num){
+            print '<tr class="liste_titre">';
+            print '<td class="liste_titre"> identifiant </td>';
+            print '<td class="liste_titre"> Date </td>';
+            print '<td class="liste_titre"> Ballon </td>';
+            print '<td class="liste_titre"> Pilote </td>';
+            print '<td class="liste_titre"> Lieu depart </td>';
+            print '<td class="liste_titre"> Lieu arrivee </td>';
+            print '<td class="liste_titre"> Heure depart</td>';
+            print '<td class="liste_titre"> Heure Arrivee </td>';
+            print '<td class="liste_titre"> Duree (min) </td>';
+            print '<td class="liste_titre"> Nbr Pax </td>';
+            print '<td class="liste_titre"> Rem </td>';
+            print '<td class="liste_titre"> Incidents </td>';
+            if($user->rights->flightLog->vol->status){
+                print '<td class="liste_titre"> Statut </td>';
+            }
+            print'</tr>';
+            while($i <$num){
+                $obj = $db->fetch_object($resql); //vol
+                print '<tr>';
+                if($obj){
+                    $pilot = New User($db); //pilot
+                    $pilot->fetch($obj->fk_pilot);
+                    print '<td><a href="fiche.php?vol='.$obj->idBBC_vols.'">'.$obj->idBBC_vols.'</a></td>';
+                    print '<td>'.$obj->date.'</td>';
+                    print '<td>'.$ballon->immat.'</td>';
+                    print '<td>'.$pilot->getNomUrl().'</a></td>';
+                    print '<td>'.$obj->lieuD.'</td>';
+                    print '<td>'.$obj->lieuA.'</td>';
+                    print '<td>'.$obj->heureD.'</td>';
+                    print '<td>'.$obj->heureA.'</td>';
+                    print '<td>'.$obj->time.'</td>';
+                    print '<td>'.$obj->nbrPax.'</td>';
+                    print '<td>'.$obj->remarque.'</td>';
+                    print '<td>'.$obj->incidents.'</td>';
+                    if($user->rights->flightLog->vol->status){
+                        $vol = new Bbcvols($db);
+                        $vol->fetch($obj->idBBC_vols);
                         print '<td>' . $vol->getStatus().'</td>';
-					}
-				}
-				print'</tr>';
-				$i++;
-			}
-		}	
-		print'</table>';
+                    }
+                }
+                print'</tr>';
+                $i++;
+            }
+        }	
+        print'</table>';
 	
 }
 /***************************************************

Spacing +47 added lines, -47 removed lines

@@ -23,7 +23,7 @@ 
 $langs->load("mymodule@mymodule");
 
 // Get parameters
-$myparam = isset($_GET["myparam"])?$_GET["myparam"]:'';
+$myparam = isset($_GET["myparam"]) ? $_GET["myparam"] : '';
 
 // Protection if the user can't acces to the module
 if (!$user->rights->flightLog->vol->access)
@@ -42,53 +42,53 @@ 
 //l'utilisateur a le droit de selectionner le ballon qu'il veut
 if (($user->rights->flightLog->vol->detail))
 {
-	if(isset($_GET["ballon"])){
+	if (isset($_GET["ballon"])) {
 		$idBallon = $_GET['ballon'];
-	}else{
-		$idBallon =1;
+	} else {
+		$idBallon = 1;
 	}
 	
-}else{
+} else {
 	
 	//l'utilisateur n'a pas le choix du ballon
 	//il est titulaire d'un ballon
 	$query = 'SELECT * FROM llx_bbc_ballons';
-	$query.= ' WHERE `fk_responsable` = '.$user->id;
+	$query .= ' WHERE `fk_responsable` = ' . $user->id;
 	$resql = $db->query($query);
-	if($resql){
+	if ($resql) {
 		$num = $db->num_rows($resql);
 		$i = 0;
-		if($num){
+		if ($num) {
 			print'</tr>';
-			while($i <$num){
+			while ($i < $num) {
 				$obj = $db->fetch_object($resql); //vol
-				if($obj){
+				if ($obj) {
 					$idBallon = ($obj->rowid);
 				}
 			}
-		}else{
+		} else {
 			//il n'est pas titulaire d'un ballon
 			accessforbidden("Vous n'&ecirc;tes pas titulaire du ballon");
 		}
 	}
 }
-if($idBallon != -1){
+if ($idBallon != -1) {
 	
 	//balloon with ID
 	$ballon = New Bbc_ballons($db);
         
-	if($ballon->fetch($idBallon)==-1){
-		print "ERROR".$idBallon."<br/>";
+	if ($ballon->fetch($idBallon) == -1) {
+		print "ERROR" . $idBallon . "<br/>";
 	}
 	//titulaire with ballon ID
         $titulaire = new User($db);
         $titulaire->fetch($ballon->fk_responsable);
         //flight with balloon ID
 	$query = 'SELECT *, TIMEDIFF(heureA,heureD) AS time FROM llx_bbc_vols';
-	$query.= ' WHERE `BBC_ballons_idBBC_ballons` = '.$ballon->id;
-	$query.= ' AND `incidents` NOT LIKE \'RAS\'';
-	$query.= ' AND `incidents` NOT LIKE \'\'';
-	$query.= ' ORDER BY date';
+	$query .= ' WHERE `BBC_ballons_idBBC_ballons` = ' . $ballon->id;
+	$query .= ' AND `incidents` NOT LIKE \'RAS\'';
+	$query .= ' AND `incidents` NOT LIKE \'\'';
+	$query .= ' ORDER BY date';
 	$resql = $db->query($query);
 }
 
@@ -100,25 +100,25 @@ 
 * Put here all code to build page
 ****************************************************/
 
-llxHeader('','Carnet de vol','');
-if($msg && $idBallon != -1){
+llxHeader('', 'Carnet de vol', '');
+if ($msg && $idBallon != -1) {
 	print $msg;
-}else{
-	$form=new Form($db);
+} else {
+	$form = new Form($db);
 	
 	print '<!-- debut cartouche rapport -->
 	<div class="tabs">
-	<a  class="tab" href="readFlightsBalloon.php?ballon='.$idBallon.'">Carnet de vol</a>
-	<a id="active" class="tab" href="readBalloonInc.php?ballon='.$idBallon.'">Incidents</a>
+	<a  class="tab" href="readFlightsBalloon.php?ballon='.$idBallon . '">Carnet de vol</a>
+	<a id="active" class="tab" href="readBalloonInc.php?ballon='.$idBallon . '">Incidents</a>
 	</div>';
 	print '<div class="tabBar">';
 	print "<form name='readBalloon' action=\"readFlightsBalloon.php\" method=\"get\">\n";
 	print '<input type="hidden" name="mode" value="SELECT">';
 	print '<table width="100%" class="border">';
 	print '<tr><td>Ballon</td><td colspan="3">';
-	if($user->rights->flightLog->vol->detail){
+	if ($user->rights->flightLog->vol->detail) {
 		select_balloons($idBallon);
-	}else{
+	} else {
 		print $ballon->immat;
 	}
 	
@@ -126,15 +126,15 @@ 
         //titulaire
         print '<tr>';
         print '<td>Titulaire</td>';
-        print '<td>'.$titulaire->getLoginUrl(1).'</td>';
+        print '<td>' . $titulaire->getLoginUrl(1) . '</td>';
         print '</tr>';
         //Vol initial
         print '<tr>';
         print '<td>Bapteme</td>';
-        print '<td>'.dol_print_date($ballon->date, 'dayrfc').'</td>';
+        print '<td>' . dol_print_date($ballon->date, 'dayrfc') . '</td>';
         print '</tr>';
         $num = 0;
-	if($resql){
+	if ($resql) {
 		//fetch pilot
 		
 		$num = $db->num_rows($resql);
@@ -150,7 +150,7 @@ 
 
                 print '<table class="border" width="100%">';
 		$i = 0;
-		if($num){
+		if ($num) {
 			print '<tr class="liste_titre">';
 			print '<td class="liste_titre"> identifiant </td>';
 			print '<td class="liste_titre"> Date </td>';
@@ -164,32 +164,32 @@ 
 			print '<td class="liste_titre"> Nbr Pax </td>';
 			print '<td class="liste_titre"> Rem </td>';
 			print '<td class="liste_titre"> Incidents </td>';
-			if($user->rights->flightLog->vol->status){
+			if ($user->rights->flightLog->vol->status) {
 				print '<td class="liste_titre"> Statut </td>';
 			}
 			print'</tr>';
-			while($i <$num){
+			while ($i < $num) {
 				$obj = $db->fetch_object($resql); //vol
 				print '<tr>';
-				if($obj){
+				if ($obj) {
 					$pilot = New User($db); //pilot
 					$pilot->fetch($obj->fk_pilot);
-					print '<td><a href="fiche.php?vol='.$obj->idBBC_vols.'">'.$obj->idBBC_vols.'</a></td>';
-					print '<td>'.$obj->date.'</td>';
-					print '<td>'.$ballon->immat.'</td>';
-					print '<td>'.$pilot->getNomUrl().'</a></td>';
-					print '<td>'.$obj->lieuD.'</td>';
-					print '<td>'.$obj->lieuA.'</td>';
-					print '<td>'.$obj->heureD.'</td>';
-					print '<td>'.$obj->heureA.'</td>';
-					print '<td>'.$obj->time.'</td>';
-					print '<td>'.$obj->nbrPax.'</td>';
-					print '<td>'.$obj->remarque.'</td>';
-					print '<td>'.$obj->incidents.'</td>';
-					if($user->rights->flightLog->vol->status){
+					print '<td><a href="fiche.php?vol=' . $obj->idBBC_vols . '">' . $obj->idBBC_vols . '</a></td>';
+					print '<td>' . $obj->date . '</td>';
+					print '<td>' . $ballon->immat . '</td>';
+					print '<td>' . $pilot->getNomUrl() . '</a></td>';
+					print '<td>' . $obj->lieuD . '</td>';
+					print '<td>' . $obj->lieuA . '</td>';
+					print '<td>' . $obj->heureD . '</td>';
+					print '<td>' . $obj->heureA . '</td>';
+					print '<td>' . $obj->time . '</td>';
+					print '<td>' . $obj->nbrPax . '</td>';
+					print '<td>' . $obj->remarque . '</td>';
+					print '<td>' . $obj->incidents . '</td>';
+					if ($user->rights->flightLog->vol->status) {
 						$vol = new Bbcvols($db);
 						$vol->fetch($obj->idBBC_vols);
-                        print '<td>' . $vol->getStatus().'</td>';
+                        print '<td>' . $vol->getStatus() . '</td>';
 					}
 				}
 				print'</tr>';

Braces +5 added lines, -5 removed lines

@@ -44,11 +44,11 @@ 
 {
 	if(isset($_GET["ballon"])){
 		$idBallon = $_GET['ballon'];
-	}else{
+	} else{
 		$idBallon =1;
 	}
 	
-}else{
+} else{
 	
 	//l'utilisateur n'a pas le choix du ballon
 	//il est titulaire d'un ballon
@@ -66,7 +66,7 @@ 
 					$idBallon = ($obj->rowid);
 				}
 			}
-		}else{
+		} else{
 			//il n'est pas titulaire d'un ballon
 			accessforbidden("Vous n'êtes pas titulaire du ballon");
 		}
@@ -103,7 +103,7 @@ 
 llxHeader('','Carnet de vol','');
 if($msg && $idBallon != -1){
 	print $msg;
-}else{
+} else{
 	$form=new Form($db);
 	
 	print '<!-- debut cartouche rapport -->
@@ -118,7 +118,7 @@ 
 	print '<tr><td>Ballon</td><td colspan="3">';
 	if($user->rights->flightLog->vol->detail){
 		select_balloons($idBallon);
-	}else{
+	} else{
 		print $ballon->immat;
 	}
 	

fiche.php

Spacing +9 added lines, -9 removed lines

@@ -33,9 +33,9 @@ 
     if ($_GET['vol']) {
         $tmp = New Bbcvols($db);
         $tmp->fetch($_GET['vol']);
-        if ($tmp->getId() && (($user->rights->flightLog->vol->delete && $user->id == $pilot->id ) || $user->admin)) {
+        if ($tmp->getId() && (($user->rights->flightLog->vol->delete && $user->id == $pilot->id) || $user->admin)) {
             if ($tmp->delete($user) > 0) {
-                dol_syslog("FLIGHT_DELETE : ".$tmp->toString().' BY : '.$user->id,LOG_WARNING);
+                dol_syslog("FLIGHT_DELETE : " . $tmp->toString() . ' BY : ' . $user->id, LOG_WARNING);
                 Header("Location: readFlights.php");
             }
         }
@@ -79,11 +79,11 @@ 
     $vol->justif_kilometers = $_POST['justif_kilometers'];
 
     if ($vol->update($user) < 0) {
-        dol_syslog("Error during update a flight ".$vol->error, LOG_ERR);
+        dol_syslog("Error during update a flight " . $vol->error, LOG_ERR);
         $msg = '<div class="error">Erreur lors de la MAJ </div>';
         $error++;
     } else {
-        Header("Location: fiche.php?vol=".$_POST['vol']);
+        Header("Location: fiche.php?vol=" . $_POST['vol']);
     }
 }
 
@@ -99,7 +99,7 @@ 
 
 llxHeader('', 'Carnet de vol', '');
 //delete
-if ((($user->rights->flightLog->vol->delete && $user->id == $pilot->id ) || $user->admin) && $_GET["action"] == 'delete') {
+if ((($user->rights->flightLog->vol->delete && $user->id == $pilot->id) || $user->admin) && $_GET["action"] == 'delete') {
     $html = New Form($db);
     print $html->formconfirm("fiche.php?vol=" . $_GET['vol'], "Delete vol", "Etes vous sure de vouloir supprimer ce vol?", 'deleteconfirm');
 }
@@ -155,7 +155,7 @@ 
     //Pilote
     print "<tr>";
     print '<td class="fieldrequired"> Pilote</td><td>';
-    print $html->select_dolusers($vol->fk_pilot,'pilot',0);
+    print $html->select_dolusers($vol->fk_pilot, 'pilot', 0);
     print '</td></tr>';
     //organisateur
     print "<tr>";
@@ -197,7 +197,7 @@ 
 //Justif KIlometers
     print "<tr>";
     print '<td width="25%" class="fieldrequired">Justificatif des KM</td><td>';
-    print '<textarea rows="2" cols="60" class="flat" name="justif_kilometers" >' . $vol->justif_kilometers. '</textarea> ';
+    print '<textarea rows="2" cols="60" class="flat" name="justif_kilometers" >' . $vol->justif_kilometers . '</textarea> ';
     print '</td></tr>';
 //NBR pax
     print "<tr>";
@@ -207,7 +207,7 @@ 
 //Flight cost
     print "<tr>";
     print '<td width="25%" class="fieldrequired">Montant perçu</td><td>';
-    print '<input type="text" name="cost" calss="flat" value="' .$vol->cost . '"/>';
+    print '<input type="text" name="cost" calss="flat" value="' . $vol->cost . '"/>';
     print "&euro;";
     print '</td></tr>';
 //Money receiver
@@ -255,7 +255,7 @@ 
 
 if (!isset($_GET['action'])) {
     //delete - if user has right
-    if (($user->rights->flightLog->vol->delete && $user->id == $pilot->id ) || $user->admin) {
+    if (($user->rights->flightLog->vol->delete && $user->id == $pilot->id) || $user->admin) {
         print '<a class="butActionDelete" href="fiche.php?action=delete&vol=' . $vol->getId() . '">' . $langs->trans('Delete') . '</a>';
     } else {
         print '<a class="butActionRefused" href="#" title="' . dol_escape_htmltag($langs->trans("NotAllowed")) . '">' . $langs->trans('Delete') . '</a>';

core/modules/modFlightLog.class.php

Spacing +2 added lines, -2 removed lines

@@ -430,7 +430,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;
@@ -485,7 +485,7 @@ 
 
     private function initCronJobs()
     {
-        $this->cronjobs = array();            // List of cron jobs entries to add
+        $this->cronjobs = array(); // List of cron jobs entries to add
         // Example: $this->cronjobs=array(0=>array('label'=>'My label', 'jobtype'=>'method', 'class'=>'/dir/class/file.class.php', 'objectname'=>'MyClass', 'method'=>'myMethod', 'parameters'=>'', 'comment'=>'Comment', 'frequency'=>2, 'unitfrequency'=>3600, 'test'=>true),
         //                                1=>array('label'=>'My label', 'jobtype'=>'command', 'command'=>'', 'parameters'=>'', 'comment'=>'Comment', 'frequency'=>1, 'unitfrequency'=>3600*24, 'test'=>true)
         // );

readFlights.php

Spacing +1 added lines, -1 removed lines

@@ -152,7 +152,7 @@
     print '<td class="liste_titre" colspan="2">' . $langs->trans("Type 1 : Sponsor") . '</td>';
     print '<td class="liste_titre" colspan="2">' . $langs->trans("Type 2 : Baptême") . '</td>';
     print '<td class="liste_titre" colspan="2">' . $langs->trans("Organisateur (T1/T2)") . '</td>';
-    print '<td class="liste_titre" >'            . $langs->trans("Total bonus") . '</td>';
+    print '<td class="liste_titre" >' . $langs->trans("Total bonus") . '</td>';
     print '<td class="liste_titre" colspan="2">' . $langs->trans("Type 3 : Privé") . '</td>';
     print '<td class="liste_titre" colspan="2">' . $langs->trans("Type 4: Meeting") . '</td>';
     print '<td class="liste_titre" colspan="1">' . $langs->trans("Type 5: Chambley") . '</td>';