@@ -701,7 +701,7 @@ |
||
| 701 | 701 | |
| 702 | 702 | $label = '<u>' . $langs->trans("MyModule") . '</u>'; |
| 703 | 703 | $label .= '<div width="100%">'; |
| 704 | - $label .= '<b>' . $langs->trans('Ref') . ':</b> ' . $this->ref.'<br>'; |
|
| 704 | + $label .= '<b>' . $langs->trans('Ref') . ':</b> ' . $this->ref . '<br>'; |
|
| 705 | 705 | $label .= '<b>' . $langs->trans('Date') . ':</b> ' . $this->date; |
| 706 | 706 | $label .= '</div>'; |
| 707 | 707 | |
@@ -23,7 +23,7 @@ discard block |
||
| 23 | 23 | $langs->load("mymodule@mymodule"); |
| 24 | 24 | |
| 25 | 25 | // Get parameters |
| 26 | -$myparam = isset($_GET["myparam"])?$_GET["myparam"]:''; |
|
| 26 | +$myparam = isset($_GET["myparam"]) ? $_GET["myparam"] : ''; |
|
| 27 | 27 | |
| 28 | 28 | // Protection if the user can't acces to the module |
| 29 | 29 | if (!$user->rights->flightLog->vol->access) |
@@ -42,53 +42,53 @@ discard block |
||
| 42 | 42 | //l'utilisateur a le droit de selectionner le ballon qu'il veut |
| 43 | 43 | if (($user->rights->flightLog->vol->detail)) |
| 44 | 44 | { |
| 45 | - if(isset($_GET["ballon"])){ |
|
| 45 | + if (isset($_GET["ballon"])) { |
|
| 46 | 46 | $idBallon = $_GET['ballon']; |
| 47 | - }else{ |
|
| 48 | - $idBallon =1; |
|
| 47 | + } else { |
|
| 48 | + $idBallon = 1; |
|
| 49 | 49 | } |
| 50 | 50 | |
| 51 | -}else{ |
|
| 51 | +} else { |
|
| 52 | 52 | |
| 53 | 53 | //l'utilisateur n'a pas le choix du ballon |
| 54 | 54 | //il est titulaire d'un ballon |
| 55 | 55 | $query = 'SELECT * FROM llx_bbc_ballons'; |
| 56 | - $query.= ' WHERE `fk_responsable` = '.$user->id; |
|
| 56 | + $query .= ' WHERE `fk_responsable` = ' . $user->id; |
|
| 57 | 57 | $resql = $db->query($query); |
| 58 | - if($resql){ |
|
| 58 | + if ($resql) { |
|
| 59 | 59 | $num = $db->num_rows($resql); |
| 60 | 60 | $i = 0; |
| 61 | - if($num){ |
|
| 61 | + if ($num) { |
|
| 62 | 62 | print'</tr>'; |
| 63 | - while($i <$num){ |
|
| 63 | + while ($i < $num) { |
|
| 64 | 64 | $obj = $db->fetch_object($resql); //vol |
| 65 | - if($obj){ |
|
| 65 | + if ($obj) { |
|
| 66 | 66 | $idBallon = ($obj->rowid); |
| 67 | 67 | } |
| 68 | 68 | } |
| 69 | - }else{ |
|
| 69 | + } else { |
|
| 70 | 70 | //il n'est pas titulaire d'un ballon |
| 71 | 71 | accessforbidden("Vous n'êtes pas titulaire du ballon"); |
| 72 | 72 | } |
| 73 | 73 | } |
| 74 | 74 | } |
| 75 | -if($idBallon != -1){ |
|
| 75 | +if ($idBallon != -1) { |
|
| 76 | 76 | |
| 77 | 77 | //balloon with ID |
| 78 | 78 | $ballon = New Bbc_ballons($db); |
| 79 | 79 | |
| 80 | - if($ballon->fetch($idBallon)==-1){ |
|
| 81 | - print "ERROR".$idBallon."<br/>"; |
|
| 80 | + if ($ballon->fetch($idBallon) == -1) { |
|
| 81 | + print "ERROR" . $idBallon . "<br/>"; |
|
| 82 | 82 | } |
| 83 | 83 | //titulaire with ballon ID |
| 84 | 84 | $titulaire = new User($db); |
| 85 | 85 | $titulaire->fetch($ballon->fk_responsable); |
| 86 | 86 | //flight with balloon ID |
| 87 | 87 | $query = 'SELECT *, TIMEDIFF(heureA,heureD) AS time FROM llx_bbc_vols'; |
| 88 | - $query.= ' WHERE `BBC_ballons_idBBC_ballons` = '.$ballon->id; |
|
| 89 | - $query.= ' AND `incidents` NOT LIKE \'RAS\''; |
|
| 90 | - $query.= ' AND `incidents` NOT LIKE \'\''; |
|
| 91 | - $query.= ' ORDER BY date'; |
|
| 88 | + $query .= ' WHERE `BBC_ballons_idBBC_ballons` = ' . $ballon->id; |
|
| 89 | + $query .= ' AND `incidents` NOT LIKE \'RAS\''; |
|
| 90 | + $query .= ' AND `incidents` NOT LIKE \'\''; |
|
| 91 | + $query .= ' ORDER BY date'; |
|
| 92 | 92 | $resql = $db->query($query); |
| 93 | 93 | } |
| 94 | 94 | |
@@ -100,25 +100,25 @@ discard block |
||
| 100 | 100 | * Put here all code to build page |
| 101 | 101 | ****************************************************/ |
| 102 | 102 | |
| 103 | -llxHeader('','Carnet de vol',''); |
|
| 104 | -if($msg && $idBallon != -1){ |
|
| 103 | +llxHeader('', 'Carnet de vol', ''); |
|
| 104 | +if ($msg && $idBallon != -1) { |
|
| 105 | 105 | print $msg; |
| 106 | -}else{ |
|
| 107 | - $form=new Form($db); |
|
| 106 | +} else { |
|
| 107 | + $form = new Form($db); |
|
| 108 | 108 | |
| 109 | 109 | print '<!-- debut cartouche rapport --> |
| 110 | 110 | <div class="tabs"> |
| 111 | - <a class="tab" href="readFlightsBalloon.php?ballon='.$idBallon.'">Carnet de vol</a> |
|
| 112 | - <a id="active" class="tab" href="readBalloonInc.php?ballon='.$idBallon.'">Incidents</a> |
|
| 111 | + <a class="tab" href="readFlightsBalloon.php?ballon='.$idBallon . '">Carnet de vol</a> |
|
| 112 | + <a id="active" class="tab" href="readBalloonInc.php?ballon='.$idBallon . '">Incidents</a> |
|
| 113 | 113 | </div>'; |
| 114 | 114 | print '<div class="tabBar">'; |
| 115 | 115 | print "<form name='readBalloon' action=\"readFlightsBalloon.php\" method=\"get\">\n"; |
| 116 | 116 | print '<input type="hidden" name="mode" value="SELECT">'; |
| 117 | 117 | print '<table width="100%" class="border">'; |
| 118 | 118 | print '<tr><td>Ballon</td><td colspan="3">'; |
| 119 | - if($user->rights->flightLog->vol->detail){ |
|
| 119 | + if ($user->rights->flightLog->vol->detail) { |
|
| 120 | 120 | select_balloons($idBallon); |
| 121 | - }else{ |
|
| 121 | + } else { |
|
| 122 | 122 | print $ballon->immat; |
| 123 | 123 | } |
| 124 | 124 | |
@@ -126,15 +126,15 @@ discard block |
||
| 126 | 126 | //titulaire |
| 127 | 127 | print '<tr>'; |
| 128 | 128 | print '<td>Titulaire</td>'; |
| 129 | - print '<td>'.$titulaire->getLoginUrl(1).'</td>'; |
|
| 129 | + print '<td>' . $titulaire->getLoginUrl(1) . '</td>'; |
|
| 130 | 130 | print '</tr>'; |
| 131 | 131 | //Vol initial |
| 132 | 132 | print '<tr>'; |
| 133 | 133 | print '<td>Bapteme</td>'; |
| 134 | - print '<td>'.dol_print_date($ballon->date, 'dayrfc').'</td>'; |
|
| 134 | + print '<td>' . dol_print_date($ballon->date, 'dayrfc') . '</td>'; |
|
| 135 | 135 | print '</tr>'; |
| 136 | 136 | $num = 0; |
| 137 | - if($resql){ |
|
| 137 | + if ($resql) { |
|
| 138 | 138 | //fetch pilot |
| 139 | 139 | |
| 140 | 140 | $num = $db->num_rows($resql); |
@@ -150,7 +150,7 @@ discard block |
||
| 150 | 150 | |
| 151 | 151 | print '<table class="border" width="100%">'; |
| 152 | 152 | $i = 0; |
| 153 | - if($num){ |
|
| 153 | + if ($num) { |
|
| 154 | 154 | print '<tr class="liste_titre">'; |
| 155 | 155 | print '<td class="liste_titre"> identifiant </td>'; |
| 156 | 156 | print '<td class="liste_titre"> Date </td>'; |
@@ -164,32 +164,32 @@ discard block |
||
| 164 | 164 | print '<td class="liste_titre"> Nbr Pax </td>'; |
| 165 | 165 | print '<td class="liste_titre"> Rem </td>'; |
| 166 | 166 | print '<td class="liste_titre"> Incidents </td>'; |
| 167 | - if($user->rights->flightLog->vol->status){ |
|
| 167 | + if ($user->rights->flightLog->vol->status) { |
|
| 168 | 168 | print '<td class="liste_titre"> Statut </td>'; |
| 169 | 169 | } |
| 170 | 170 | print'</tr>'; |
| 171 | - while($i <$num){ |
|
| 171 | + while ($i < $num) { |
|
| 172 | 172 | $obj = $db->fetch_object($resql); //vol |
| 173 | 173 | print '<tr>'; |
| 174 | - if($obj){ |
|
| 174 | + if ($obj) { |
|
| 175 | 175 | $pilot = New User($db); //pilot |
| 176 | 176 | $pilot->fetch($obj->fk_pilot); |
| 177 | - print '<td><a href="fiche.php?vol='.$obj->idBBC_vols.'">'.$obj->idBBC_vols.'</a></td>'; |
|
| 178 | - print '<td>'.$obj->date.'</td>'; |
|
| 179 | - print '<td>'.$ballon->immat.'</td>'; |
|
| 180 | - print '<td>'.$pilot->getNomUrl().'</a></td>'; |
|
| 181 | - print '<td>'.$obj->lieuD.'</td>'; |
|
| 182 | - print '<td>'.$obj->lieuA.'</td>'; |
|
| 183 | - print '<td>'.$obj->heureD.'</td>'; |
|
| 184 | - print '<td>'.$obj->heureA.'</td>'; |
|
| 185 | - print '<td>'.$obj->time.'</td>'; |
|
| 186 | - print '<td>'.$obj->nbrPax.'</td>'; |
|
| 187 | - print '<td>'.$obj->remarque.'</td>'; |
|
| 188 | - print '<td>'.$obj->incidents.'</td>'; |
|
| 189 | - if($user->rights->flightLog->vol->status){ |
|
| 177 | + print '<td><a href="fiche.php?vol=' . $obj->idBBC_vols . '">' . $obj->idBBC_vols . '</a></td>'; |
|
| 178 | + print '<td>' . $obj->date . '</td>'; |
|
| 179 | + print '<td>' . $ballon->immat . '</td>'; |
|
| 180 | + print '<td>' . $pilot->getNomUrl() . '</a></td>'; |
|
| 181 | + print '<td>' . $obj->lieuD . '</td>'; |
|
| 182 | + print '<td>' . $obj->lieuA . '</td>'; |
|
| 183 | + print '<td>' . $obj->heureD . '</td>'; |
|
| 184 | + print '<td>' . $obj->heureA . '</td>'; |
|
| 185 | + print '<td>' . $obj->time . '</td>'; |
|
| 186 | + print '<td>' . $obj->nbrPax . '</td>'; |
|
| 187 | + print '<td>' . $obj->remarque . '</td>'; |
|
| 188 | + print '<td>' . $obj->incidents . '</td>'; |
|
| 189 | + if ($user->rights->flightLog->vol->status) { |
|
| 190 | 190 | $vol = new Bbcvols($db); |
| 191 | 191 | $vol->fetch($obj->idBBC_vols); |
| 192 | - print '<td>' . $vol->getStatus().'</td>'; |
|
| 192 | + print '<td>' . $vol->getStatus() . '</td>'; |
|
| 193 | 193 | } |
| 194 | 194 | } |
| 195 | 195 | print'</tr>'; |
@@ -33,9 +33,9 @@ discard block |
||
| 33 | 33 | if ($_GET['vol']) { |
| 34 | 34 | $tmp = New Bbcvols($db); |
| 35 | 35 | $tmp->fetch($_GET['vol']); |
| 36 | - if ($tmp->getId() && (($user->rights->flightLog->vol->delete && $user->id == $pilot->id ) || $user->admin)) { |
|
| 36 | + if ($tmp->getId() && (($user->rights->flightLog->vol->delete && $user->id == $pilot->id) || $user->admin)) { |
|
| 37 | 37 | if ($tmp->delete($user) > 0) { |
| 38 | - dol_syslog("FLIGHT_DELETE : ".$tmp->toString().' BY : '.$user->id,LOG_WARNING); |
|
| 38 | + dol_syslog("FLIGHT_DELETE : " . $tmp->toString() . ' BY : ' . $user->id, LOG_WARNING); |
|
| 39 | 39 | Header("Location: readFlights.php"); |
| 40 | 40 | } |
| 41 | 41 | } |
@@ -79,11 +79,11 @@ discard block |
||
| 79 | 79 | $vol->justif_kilometers = $_POST['justif_kilometers']; |
| 80 | 80 | |
| 81 | 81 | if ($vol->update($user) < 0) { |
| 82 | - dol_syslog("Error during update a flight ".$vol->error, LOG_ERR); |
|
| 82 | + dol_syslog("Error during update a flight " . $vol->error, LOG_ERR); |
|
| 83 | 83 | $msg = '<div class="error">Erreur lors de la MAJ </div>'; |
| 84 | 84 | $error++; |
| 85 | 85 | } else { |
| 86 | - Header("Location: fiche.php?vol=".$_POST['vol']); |
|
| 86 | + Header("Location: fiche.php?vol=" . $_POST['vol']); |
|
| 87 | 87 | } |
| 88 | 88 | } |
| 89 | 89 | |
@@ -99,7 +99,7 @@ discard block |
||
| 99 | 99 | |
| 100 | 100 | llxHeader('', 'Carnet de vol', ''); |
| 101 | 101 | //delete |
| 102 | -if ((($user->rights->flightLog->vol->delete && $user->id == $pilot->id ) || $user->admin) && $_GET["action"] == 'delete') { |
|
| 102 | +if ((($user->rights->flightLog->vol->delete && $user->id == $pilot->id) || $user->admin) && $_GET["action"] == 'delete') { |
|
| 103 | 103 | $html = New Form($db); |
| 104 | 104 | print $html->formconfirm("fiche.php?vol=" . $_GET['vol'], "Delete vol", "Etes vous sure de vouloir supprimer ce vol?", 'deleteconfirm'); |
| 105 | 105 | } |
@@ -155,7 +155,7 @@ discard block |
||
| 155 | 155 | //Pilote |
| 156 | 156 | print "<tr>"; |
| 157 | 157 | print '<td class="fieldrequired"> Pilote</td><td>'; |
| 158 | - print $html->select_dolusers($vol->fk_pilot,'pilot',0); |
|
| 158 | + print $html->select_dolusers($vol->fk_pilot, 'pilot', 0); |
|
| 159 | 159 | print '</td></tr>'; |
| 160 | 160 | //organisateur |
| 161 | 161 | print "<tr>"; |
@@ -197,7 +197,7 @@ discard block |
||
| 197 | 197 | //Justif KIlometers |
| 198 | 198 | print "<tr>"; |
| 199 | 199 | print '<td width="25%" class="fieldrequired">Justificatif des KM</td><td>'; |
| 200 | - print '<textarea rows="2" cols="60" class="flat" name="justif_kilometers" >' . $vol->justif_kilometers. '</textarea> '; |
|
| 200 | + print '<textarea rows="2" cols="60" class="flat" name="justif_kilometers" >' . $vol->justif_kilometers . '</textarea> '; |
|
| 201 | 201 | print '</td></tr>'; |
| 202 | 202 | //NBR pax |
| 203 | 203 | print "<tr>"; |
@@ -207,7 +207,7 @@ discard block |
||
| 207 | 207 | //Flight cost |
| 208 | 208 | print "<tr>"; |
| 209 | 209 | print '<td width="25%" class="fieldrequired">Montant perçu</td><td>'; |
| 210 | - print '<input type="text" name="cost" calss="flat" value="' .$vol->cost . '"/>'; |
|
| 210 | + print '<input type="text" name="cost" calss="flat" value="' . $vol->cost . '"/>'; |
|
| 211 | 211 | print "€"; |
| 212 | 212 | print '</td></tr>'; |
| 213 | 213 | //Money receiver |
@@ -255,7 +255,7 @@ discard block |
||
| 255 | 255 | |
| 256 | 256 | if (!isset($_GET['action'])) { |
| 257 | 257 | //delete - if user has right |
| 258 | - if (($user->rights->flightLog->vol->delete && $user->id == $pilot->id ) || $user->admin) { |
|
| 258 | + if (($user->rights->flightLog->vol->delete && $user->id == $pilot->id) || $user->admin) { |
|
| 259 | 259 | print '<a class="butActionDelete" href="fiche.php?action=delete&vol=' . $vol->getId() . '">' . $langs->trans('Delete') . '</a>'; |
| 260 | 260 | } else { |
| 261 | 261 | print '<a class="butActionRefused" href="#" title="' . dol_escape_htmltag($langs->trans("NotAllowed")) . '">' . $langs->trans('Delete') . '</a>'; |
@@ -430,7 +430,7 @@ discard block |
||
| 430 | 430 | */ |
| 431 | 431 | private function initPermissions() |
| 432 | 432 | { |
| 433 | - $this->rights = array(); // Permission array used by this module |
|
| 433 | + $this->rights = array(); // Permission array used by this module |
|
| 434 | 434 | $r = 0; |
| 435 | 435 | |
| 436 | 436 | $this->rights[$r][0] = 9993; |
@@ -485,7 +485,7 @@ discard block |
||
| 485 | 485 | |
| 486 | 486 | private function initCronJobs() |
| 487 | 487 | { |
| 488 | - $this->cronjobs = array(); // List of cron jobs entries to add |
|
| 488 | + $this->cronjobs = array(); // List of cron jobs entries to add |
|
| 489 | 489 | // 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), |
| 490 | 490 | // 1=>array('label'=>'My label', 'jobtype'=>'command', 'command'=>'', 'parameters'=>'', 'comment'=>'Comment', 'frequency'=>1, 'unitfrequency'=>3600*24, 'test'=>true) |
| 491 | 491 | // ); |
@@ -152,7 +152,7 @@ |
||
| 152 | 152 | print '<td class="liste_titre" colspan="2">' . $langs->trans("Type 1 : Sponsor") . '</td>'; |
| 153 | 153 | print '<td class="liste_titre" colspan="2">' . $langs->trans("Type 2 : Baptême") . '</td>'; |
| 154 | 154 | print '<td class="liste_titre" colspan="2">' . $langs->trans("Organisateur (T1/T2)") . '</td>'; |
| 155 | - print '<td class="liste_titre" >' . $langs->trans("Total bonus") . '</td>'; |
|
| 155 | + print '<td class="liste_titre" >' . $langs->trans("Total bonus") . '</td>'; |
|
| 156 | 156 | print '<td class="liste_titre" colspan="2">' . $langs->trans("Type 3 : Privé") . '</td>'; |
| 157 | 157 | print '<td class="liste_titre" colspan="2">' . $langs->trans("Type 4: Meeting") . '</td>'; |
| 158 | 158 | print '<td class="liste_titre" colspan="1">' . $langs->trans("Type 5: Chambley") . '</td>'; |
@@ -179,7 +179,7 @@ discard block |
||
| 179 | 179 | |
| 180 | 180 | $parameters = array(); |
| 181 | 181 | $reshook = $hookmanager->executeHooks('doActions', $parameters, $object, |
| 182 | - $action); // Note that $action and $object may have been modified by some hooks |
|
| 182 | + $action); // Note that $action and $object may have been modified by some hooks |
|
| 183 | 183 | if ($reshook < 0) { |
| 184 | 184 | setEventMessages($hookmanager->error, $hookmanager->errors, 'errors'); |
| 185 | 185 | } |
@@ -291,7 +291,7 @@ discard block |
||
| 291 | 291 | // Add fields from hooks |
| 292 | 292 | $parameters = array(); |
| 293 | 293 | $reshook = $hookmanager->executeHooks('printFieldListSelect', |
| 294 | - $parameters); // Note that $action and $object may have been modified by hook |
|
| 294 | + $parameters); // Note that $action and $object may have been modified by hook |
|
| 295 | 295 | $sql .= $hookmanager->resPrint; |
| 296 | 296 | $sql .= " FROM " . MAIN_DB_PREFIX . "bbc_vols as t"; |
| 297 | 297 | if (is_array($extrafields->attribute_label) && count($extrafields->attribute_label)) { |
@@ -381,7 +381,7 @@ discard block |
||
| 381 | 381 | // Add where from hooks |
| 382 | 382 | $parameters = array(); |
| 383 | 383 | $reshook = $hookmanager->executeHooks('printFieldListWhere', |
| 384 | - $parameters); // Note that $action and $object may have been modified by hook |
|
| 384 | + $parameters); // Note that $action and $object may have been modified by hook |
|
| 385 | 385 | $sql .= $hookmanager->resPrint; |
| 386 | 386 | $sql .= $db->order($sortfield, $sortorder); |
| 387 | 387 | //$sql.= $db->plimit($conf->liste_limit+1, $offset); |
@@ -481,7 +481,7 @@ discard block |
||
| 481 | 481 | |
| 482 | 482 | $parameters = array(); |
| 483 | 483 | $reshook = $hookmanager->executeHooks('printFieldPreListTitle', |
| 484 | - $parameters); // Note that $action and $object may have been modified by hook |
|
| 484 | + $parameters); // Note that $action and $object may have been modified by hook |
|
| 485 | 485 | if (empty($reshook)) { |
| 486 | 486 | $moreforfilter .= $hookmanager->resPrint; |
| 487 | 487 | } else { |
@@ -496,7 +496,7 @@ discard block |
||
| 496 | 496 | |
| 497 | 497 | $varpage = empty($contextpage) ? $_SERVER["PHP_SELF"] : $contextpage; |
| 498 | 498 | $selectedfields = $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, |
| 499 | - $varpage); // This also change content of $arrayfields |
|
| 499 | + $varpage); // This also change content of $arrayfields |
|
| 500 | 500 | |
| 501 | 501 | print '<div class="div-table-responsive">'; |
| 502 | 502 | print '<table class="tagtable liste' . ($moreforfilter ? " listwithfilterbefore" : "") . '">' . "\n"; |
@@ -593,7 +593,7 @@ discard block |
||
| 593 | 593 | // Hook fields |
| 594 | 594 | $parameters = array('arrayfields' => $arrayfields); |
| 595 | 595 | $reshook = $hookmanager->executeHooks('printFieldListTitle', |
| 596 | - $parameters); // Note that $action and $object may have been modified by hook |
|
| 596 | + $parameters); // Note that $action and $object may have been modified by hook |
|
| 597 | 597 | print $hookmanager->resPrint; |
| 598 | 598 | if (!empty($arrayfields['t.datec']['checked'])) { |
| 599 | 599 | print_liste_field_titre($arrayfields['t.datec']['label'], $_SERVER["PHP_SELF"], "t.datec", "", $param, |
@@ -711,7 +711,7 @@ discard block |
||
| 711 | 711 | // Fields from hook |
| 712 | 712 | $parameters = array('arrayfields' => $arrayfields); |
| 713 | 713 | $reshook = $hookmanager->executeHooks('printFieldListOption', |
| 714 | - $parameters); // Note that $action and $object may have been modified by hook |
|
| 714 | + $parameters); // Note that $action and $object may have been modified by hook |
|
| 715 | 715 | print $hookmanager->resPrint; |
| 716 | 716 | if (!empty($arrayfields['t.datec']['checked'])) { |
| 717 | 717 | // Date creation |
@@ -752,116 +752,116 @@ discard block |
||
| 752 | 752 | // Show here line of result |
| 753 | 753 | print '<tr ' . $bc[$var] . '>'; |
| 754 | 754 | |
| 755 | - if (! empty($arrayfields['t.idBBC_vols']['checked'])) |
|
| 755 | + if (!empty($arrayfields['t.idBBC_vols']['checked'])) |
|
| 756 | 756 | { |
| 757 | - print '<td>'.$flight->getNomUrl(0).'</td>'; |
|
| 757 | + print '<td>' . $flight->getNomUrl(0) . '</td>'; |
|
| 758 | 758 | |
| 759 | - if (! $i) $totalarray['nbfield']++; |
|
| 759 | + if (!$i) $totalarray['nbfield']++; |
|
| 760 | 760 | } |
| 761 | - if (! empty($arrayfields['t.date']['checked'])) |
|
| 761 | + if (!empty($arrayfields['t.date']['checked'])) |
|
| 762 | 762 | { |
| 763 | 763 | print '<td>'; |
| 764 | 764 | print dol_print_date($db->jdate($obj->date), '%d-%m-%y'); |
| 765 | 765 | print '</td>'; |
| 766 | 766 | |
| 767 | - if (! $i) $totalarray['nbfield']++; |
|
| 767 | + if (!$i) $totalarray['nbfield']++; |
|
| 768 | 768 | } |
| 769 | - if (! empty($arrayfields['t.lieuD']['checked'])) |
|
| 769 | + if (!empty($arrayfields['t.lieuD']['checked'])) |
|
| 770 | 770 | { |
| 771 | - print '<td>'.$obj->lieuD.'</td>'; |
|
| 771 | + print '<td>' . $obj->lieuD . '</td>'; |
|
| 772 | 772 | |
| 773 | - if (! $i) $totalarray['nbfield']++; |
|
| 773 | + if (!$i) $totalarray['nbfield']++; |
|
| 774 | 774 | } |
| 775 | - if (! empty($arrayfields['t.lieuA']['checked'])) |
|
| 775 | + if (!empty($arrayfields['t.lieuA']['checked'])) |
|
| 776 | 776 | { |
| 777 | - print '<td>'.$obj->lieuA.'</td>'; |
|
| 777 | + print '<td>' . $obj->lieuA . '</td>'; |
|
| 778 | 778 | |
| 779 | - if (! $i) $totalarray['nbfield']++; |
|
| 779 | + if (!$i) $totalarray['nbfield']++; |
|
| 780 | 780 | } |
| 781 | - if (! empty($arrayfields['t.heureD']['checked'])) |
|
| 781 | + if (!empty($arrayfields['t.heureD']['checked'])) |
|
| 782 | 782 | { |
| 783 | - print '<td>'.$obj->heureD.'</td>'; |
|
| 783 | + print '<td>' . $obj->heureD . '</td>'; |
|
| 784 | 784 | |
| 785 | - if (! $i) $totalarray['nbfield']++; |
|
| 785 | + if (!$i) $totalarray['nbfield']++; |
|
| 786 | 786 | } |
| 787 | - if (! empty($arrayfields['t.heureA']['checked'])) |
|
| 787 | + if (!empty($arrayfields['t.heureA']['checked'])) |
|
| 788 | 788 | { |
| 789 | - print '<td>'.$obj->heureA.'</td>'; |
|
| 789 | + print '<td>' . $obj->heureA . '</td>'; |
|
| 790 | 790 | |
| 791 | - if (! $i) $totalarray['nbfield']++; |
|
| 791 | + if (!$i) $totalarray['nbfield']++; |
|
| 792 | 792 | } |
| 793 | - if (! empty($arrayfields['t.BBC_ballons_idBBC_ballons']['checked'])) |
|
| 793 | + if (!empty($arrayfields['t.BBC_ballons_idBBC_ballons']['checked'])) |
|
| 794 | 794 | { |
| 795 | - print '<td>'.$obj->bal.'</td>'; |
|
| 795 | + print '<td>' . $obj->bal . '</td>'; |
|
| 796 | 796 | |
| 797 | - if (! $i) $totalarray['nbfield']++; |
|
| 797 | + if (!$i) $totalarray['nbfield']++; |
|
| 798 | 798 | } |
| 799 | - if (! empty($arrayfields['t.nbrPax']['checked'])) |
|
| 799 | + if (!empty($arrayfields['t.nbrPax']['checked'])) |
|
| 800 | 800 | { |
| 801 | - print '<td>'.$obj->nbrPax.'</td>'; |
|
| 801 | + print '<td>' . $obj->nbrPax . '</td>'; |
|
| 802 | 802 | |
| 803 | - if (! $i) $totalarray['nbfield']++; |
|
| 803 | + if (!$i) $totalarray['nbfield']++; |
|
| 804 | 804 | } |
| 805 | - if (! empty($arrayfields['t.remarque']['checked'])) |
|
| 805 | + if (!empty($arrayfields['t.remarque']['checked'])) |
|
| 806 | 806 | { |
| 807 | - print '<td>'.$obj->remarque.'</td>'; |
|
| 807 | + print '<td>' . $obj->remarque . '</td>'; |
|
| 808 | 808 | |
| 809 | - if (! $i) $totalarray['nbfield']++; |
|
| 809 | + if (!$i) $totalarray['nbfield']++; |
|
| 810 | 810 | } |
| 811 | - if (! empty($arrayfields['t.incidents']['checked'])) |
|
| 811 | + if (!empty($arrayfields['t.incidents']['checked'])) |
|
| 812 | 812 | { |
| 813 | - print '<td>'.$obj->incidents.'</td>'; |
|
| 813 | + print '<td>' . $obj->incidents . '</td>'; |
|
| 814 | 814 | |
| 815 | - if (! $i) $totalarray['nbfield']++; |
|
| 815 | + if (!$i) $totalarray['nbfield']++; |
|
| 816 | 816 | } |
| 817 | - if (! empty($arrayfields['t.fk_type']['checked'])) |
|
| 817 | + if (!empty($arrayfields['t.fk_type']['checked'])) |
|
| 818 | 818 | { |
| 819 | - print '<td>'.$obj->flight_type.'</td>'; |
|
| 819 | + print '<td>' . $obj->flight_type . '</td>'; |
|
| 820 | 820 | |
| 821 | - if (! $i) $totalarray['nbfield']++; |
|
| 821 | + if (!$i) $totalarray['nbfield']++; |
|
| 822 | 822 | } |
| 823 | - if (! empty($arrayfields['t.fk_pilot']['checked'])) |
|
| 823 | + if (!empty($arrayfields['t.fk_pilot']['checked'])) |
|
| 824 | 824 | { |
| 825 | - print '<td>'.$obj->pilot.'</td>'; |
|
| 825 | + print '<td>' . $obj->pilot . '</td>'; |
|
| 826 | 826 | |
| 827 | - if (! $i) $totalarray['nbfield']++; |
|
| 827 | + if (!$i) $totalarray['nbfield']++; |
|
| 828 | 828 | } |
| 829 | - if (! empty($arrayfields['t.fk_organisateur']['checked'])) |
|
| 829 | + if (!empty($arrayfields['t.fk_organisateur']['checked'])) |
|
| 830 | 830 | { |
| 831 | - print '<td>'.$obj->organisator.'</td>'; |
|
| 831 | + print '<td>' . $obj->organisator . '</td>'; |
|
| 832 | 832 | |
| 833 | - if (! $i) $totalarray['nbfield']++; |
|
| 833 | + if (!$i) $totalarray['nbfield']++; |
|
| 834 | 834 | } |
| 835 | - if (! empty($arrayfields['t.is_facture']['checked'])) |
|
| 835 | + if (!empty($arrayfields['t.is_facture']['checked'])) |
|
| 836 | 836 | { |
| 837 | 837 | $flight->is_facture = $obj->is_facture; |
| 838 | - print '<td>'.$flight->getLibStatut(3).'</td>'; |
|
| 838 | + print '<td>' . $flight->getLibStatut(3) . '</td>'; |
|
| 839 | 839 | |
| 840 | - if (! $i) $totalarray['nbfield']++; |
|
| 840 | + if (!$i) $totalarray['nbfield']++; |
|
| 841 | 841 | } |
| 842 | - if (! empty($arrayfields['t.kilometers']['checked'])) |
|
| 842 | + if (!empty($arrayfields['t.kilometers']['checked'])) |
|
| 843 | 843 | { |
| 844 | - print '<td>'.$obj->kilometers.'</td>'; |
|
| 844 | + print '<td>' . $obj->kilometers . '</td>'; |
|
| 845 | 845 | |
| 846 | - if (! $i) $totalarray['nbfield']++; |
|
| 846 | + if (!$i) $totalarray['nbfield']++; |
|
| 847 | 847 | } |
| 848 | - if (! empty($arrayfields['t.cost']['checked'])) |
|
| 848 | + if (!empty($arrayfields['t.cost']['checked'])) |
|
| 849 | 849 | { |
| 850 | - print '<td>'.$obj->cost.'</td>'; |
|
| 850 | + print '<td>' . $obj->cost . '</td>'; |
|
| 851 | 851 | |
| 852 | - if (! $i) $totalarray['nbfield']++; |
|
| 852 | + if (!$i) $totalarray['nbfield']++; |
|
| 853 | 853 | } |
| 854 | - if (! empty($arrayfields['t.fk_receiver']['checked'])) |
|
| 854 | + if (!empty($arrayfields['t.fk_receiver']['checked'])) |
|
| 855 | 855 | { |
| 856 | - print '<td>'.$obj->receiver.'</td>'; |
|
| 856 | + print '<td>' . $obj->receiver . '</td>'; |
|
| 857 | 857 | |
| 858 | - if (! $i) $totalarray['nbfield']++; |
|
| 858 | + if (!$i) $totalarray['nbfield']++; |
|
| 859 | 859 | } |
| 860 | - if (! empty($arrayfields['t.justif_kilometers']['checked'])) |
|
| 860 | + if (!empty($arrayfields['t.justif_kilometers']['checked'])) |
|
| 861 | 861 | { |
| 862 | - print '<td>'.$obj->justif_kilometers.'</td>'; |
|
| 862 | + print '<td>' . $obj->justif_kilometers . '</td>'; |
|
| 863 | 863 | |
| 864 | - if (! $i) $totalarray['nbfield']++; |
|
| 864 | + if (!$i) $totalarray['nbfield']++; |
|
| 865 | 865 | } |
| 866 | 866 | |
| 867 | 867 | // Extra fields |
@@ -886,7 +886,7 @@ discard block |
||
| 886 | 886 | // Fields from hook |
| 887 | 887 | $parameters = array('arrayfields' => $arrayfields, 'obj' => $obj); |
| 888 | 888 | $reshook = $hookmanager->executeHooks('printFieldListValue', |
| 889 | - $parameters); // Note that $action and $object may have been modified by hook |
|
| 889 | + $parameters); // Note that $action and $object may have been modified by hook |
|
| 890 | 890 | print $hookmanager->resPrint; |
| 891 | 891 | // Date creation |
| 892 | 892 | if (!empty($arrayfields['t.datec']['checked'])) { |
@@ -963,7 +963,7 @@ discard block |
||
| 963 | 963 | |
| 964 | 964 | $parameters = array('arrayfields' => $arrayfields, 'sql' => $sql); |
| 965 | 965 | $reshook = $hookmanager->executeHooks('printFieldListFooter', |
| 966 | - $parameters); // Note that $action and $object may have been modified by hook |
|
| 966 | + $parameters); // Note that $action and $object may have been modified by hook |
|
| 967 | 967 | print $hookmanager->resPrint; |
| 968 | 968 | |
| 969 | 969 | print '</table>' . "\n"; |