@@ -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 |
@@ -48,9 +48,9 @@ discard block |
||
48 | 48 | $search_incidents = GETPOST('search_incidents', 'alpha'); |
49 | 49 | $search_fk_type = GETPOST('search_fk_type', 'int'); |
50 | 50 | |
51 | -if($user->rights->flightLog->vol->detail){ |
|
51 | +if ($user->rights->flightLog->vol->detail) { |
|
52 | 52 | $search_fk_pilot = GETPOST('search_fk_pilot', 'int'); |
53 | -}else{ |
|
53 | +} else { |
|
54 | 54 | $search_fk_pilot = $user->id; |
55 | 55 | } |
56 | 56 | |
@@ -183,7 +183,7 @@ discard block |
||
183 | 183 | |
184 | 184 | $parameters = array(); |
185 | 185 | $reshook = $hookmanager->executeHooks('doActions', $parameters, $object, |
186 | - $action); // Note that $action and $object may have been modified by some hooks |
|
186 | + $action); // Note that $action and $object may have been modified by some hooks |
|
187 | 187 | if ($reshook < 0) { |
188 | 188 | setEventMessages($hookmanager->error, $hookmanager->errors, 'errors'); |
189 | 189 | } |
@@ -295,7 +295,7 @@ discard block |
||
295 | 295 | // Add fields from hooks |
296 | 296 | $parameters = array(); |
297 | 297 | $reshook = $hookmanager->executeHooks('printFieldListSelect', |
298 | - $parameters); // Note that $action and $object may have been modified by hook |
|
298 | + $parameters); // Note that $action and $object may have been modified by hook |
|
299 | 299 | $sql .= $hookmanager->resPrint; |
300 | 300 | $sql .= " FROM " . MAIN_DB_PREFIX . "bbc_vols as t"; |
301 | 301 | if (is_array($extrafields->attribute_label) && count($extrafields->attribute_label)) { |
@@ -385,7 +385,7 @@ discard block |
||
385 | 385 | // Add where from hooks |
386 | 386 | $parameters = array(); |
387 | 387 | $reshook = $hookmanager->executeHooks('printFieldListWhere', |
388 | - $parameters); // Note that $action and $object may have been modified by hook |
|
388 | + $parameters); // Note that $action and $object may have been modified by hook |
|
389 | 389 | $sql .= $hookmanager->resPrint; |
390 | 390 | $sql .= $db->order($sortfield, $sortorder); |
391 | 391 | //$sql.= $db->plimit($conf->liste_limit+1, $offset); |
@@ -485,7 +485,7 @@ discard block |
||
485 | 485 | |
486 | 486 | $parameters = array(); |
487 | 487 | $reshook = $hookmanager->executeHooks('printFieldPreListTitle', |
488 | - $parameters); // Note that $action and $object may have been modified by hook |
|
488 | + $parameters); // Note that $action and $object may have been modified by hook |
|
489 | 489 | if (empty($reshook)) { |
490 | 490 | $moreforfilter .= $hookmanager->resPrint; |
491 | 491 | } else { |
@@ -500,7 +500,7 @@ discard block |
||
500 | 500 | |
501 | 501 | $varpage = empty($contextpage) ? $_SERVER["PHP_SELF"] : $contextpage; |
502 | 502 | $selectedfields = $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, |
503 | - $varpage); // This also change content of $arrayfields |
|
503 | + $varpage); // This also change content of $arrayfields |
|
504 | 504 | |
505 | 505 | print '<div class="div-table-responsive">'; |
506 | 506 | print '<table class="tagtable liste' . ($moreforfilter ? " listwithfilterbefore" : "") . '">' . "\n"; |
@@ -597,7 +597,7 @@ discard block |
||
597 | 597 | // Hook fields |
598 | 598 | $parameters = array('arrayfields' => $arrayfields); |
599 | 599 | $reshook = $hookmanager->executeHooks('printFieldListTitle', |
600 | - $parameters); // Note that $action and $object may have been modified by hook |
|
600 | + $parameters); // Note that $action and $object may have been modified by hook |
|
601 | 601 | print $hookmanager->resPrint; |
602 | 602 | if (!empty($arrayfields['t.datec']['checked'])) { |
603 | 603 | print_liste_field_titre($arrayfields['t.datec']['label'], $_SERVER["PHP_SELF"], "t.datec", "", $param, |
@@ -715,7 +715,7 @@ discard block |
||
715 | 715 | // Fields from hook |
716 | 716 | $parameters = array('arrayfields' => $arrayfields); |
717 | 717 | $reshook = $hookmanager->executeHooks('printFieldListOption', |
718 | - $parameters); // Note that $action and $object may have been modified by hook |
|
718 | + $parameters); // Note that $action and $object may have been modified by hook |
|
719 | 719 | print $hookmanager->resPrint; |
720 | 720 | if (!empty($arrayfields['t.datec']['checked'])) { |
721 | 721 | // Date creation |
@@ -756,116 +756,116 @@ discard block |
||
756 | 756 | // Show here line of result |
757 | 757 | print '<tr ' . $bc[$var] . '>'; |
758 | 758 | |
759 | - if (! empty($arrayfields['t.idBBC_vols']['checked'])) |
|
759 | + if (!empty($arrayfields['t.idBBC_vols']['checked'])) |
|
760 | 760 | { |
761 | - print '<td>'.$flight->getNomUrl(0).'</td>'; |
|
761 | + print '<td>' . $flight->getNomUrl(0) . '</td>'; |
|
762 | 762 | |
763 | - if (! $i) $totalarray['nbfield']++; |
|
763 | + if (!$i) $totalarray['nbfield']++; |
|
764 | 764 | } |
765 | - if (! empty($arrayfields['t.date']['checked'])) |
|
765 | + if (!empty($arrayfields['t.date']['checked'])) |
|
766 | 766 | { |
767 | 767 | print '<td>'; |
768 | 768 | print dol_print_date($db->jdate($obj->date), '%d-%m-%y'); |
769 | 769 | print '</td>'; |
770 | 770 | |
771 | - if (! $i) $totalarray['nbfield']++; |
|
771 | + if (!$i) $totalarray['nbfield']++; |
|
772 | 772 | } |
773 | - if (! empty($arrayfields['t.lieuD']['checked'])) |
|
773 | + if (!empty($arrayfields['t.lieuD']['checked'])) |
|
774 | 774 | { |
775 | - print '<td>'.$obj->lieuD.'</td>'; |
|
775 | + print '<td>' . $obj->lieuD . '</td>'; |
|
776 | 776 | |
777 | - if (! $i) $totalarray['nbfield']++; |
|
777 | + if (!$i) $totalarray['nbfield']++; |
|
778 | 778 | } |
779 | - if (! empty($arrayfields['t.lieuA']['checked'])) |
|
779 | + if (!empty($arrayfields['t.lieuA']['checked'])) |
|
780 | 780 | { |
781 | - print '<td>'.$obj->lieuA.'</td>'; |
|
781 | + print '<td>' . $obj->lieuA . '</td>'; |
|
782 | 782 | |
783 | - if (! $i) $totalarray['nbfield']++; |
|
783 | + if (!$i) $totalarray['nbfield']++; |
|
784 | 784 | } |
785 | - if (! empty($arrayfields['t.heureD']['checked'])) |
|
785 | + if (!empty($arrayfields['t.heureD']['checked'])) |
|
786 | 786 | { |
787 | - print '<td>'.$obj->heureD.'</td>'; |
|
787 | + print '<td>' . $obj->heureD . '</td>'; |
|
788 | 788 | |
789 | - if (! $i) $totalarray['nbfield']++; |
|
789 | + if (!$i) $totalarray['nbfield']++; |
|
790 | 790 | } |
791 | - if (! empty($arrayfields['t.heureA']['checked'])) |
|
791 | + if (!empty($arrayfields['t.heureA']['checked'])) |
|
792 | 792 | { |
793 | - print '<td>'.$obj->heureA.'</td>'; |
|
793 | + print '<td>' . $obj->heureA . '</td>'; |
|
794 | 794 | |
795 | - if (! $i) $totalarray['nbfield']++; |
|
795 | + if (!$i) $totalarray['nbfield']++; |
|
796 | 796 | } |
797 | - if (! empty($arrayfields['t.BBC_ballons_idBBC_ballons']['checked'])) |
|
797 | + if (!empty($arrayfields['t.BBC_ballons_idBBC_ballons']['checked'])) |
|
798 | 798 | { |
799 | - print '<td>'.$obj->bal.'</td>'; |
|
799 | + print '<td>' . $obj->bal . '</td>'; |
|
800 | 800 | |
801 | - if (! $i) $totalarray['nbfield']++; |
|
801 | + if (!$i) $totalarray['nbfield']++; |
|
802 | 802 | } |
803 | - if (! empty($arrayfields['t.nbrPax']['checked'])) |
|
803 | + if (!empty($arrayfields['t.nbrPax']['checked'])) |
|
804 | 804 | { |
805 | - print '<td>'.$obj->nbrPax.'</td>'; |
|
805 | + print '<td>' . $obj->nbrPax . '</td>'; |
|
806 | 806 | |
807 | - if (! $i) $totalarray['nbfield']++; |
|
807 | + if (!$i) $totalarray['nbfield']++; |
|
808 | 808 | } |
809 | - if (! empty($arrayfields['t.remarque']['checked'])) |
|
809 | + if (!empty($arrayfields['t.remarque']['checked'])) |
|
810 | 810 | { |
811 | - print '<td>'.$obj->remarque.'</td>'; |
|
811 | + print '<td>' . $obj->remarque . '</td>'; |
|
812 | 812 | |
813 | - if (! $i) $totalarray['nbfield']++; |
|
813 | + if (!$i) $totalarray['nbfield']++; |
|
814 | 814 | } |
815 | - if (! empty($arrayfields['t.incidents']['checked'])) |
|
815 | + if (!empty($arrayfields['t.incidents']['checked'])) |
|
816 | 816 | { |
817 | - print '<td>'.$obj->incidents.'</td>'; |
|
817 | + print '<td>' . $obj->incidents . '</td>'; |
|
818 | 818 | |
819 | - if (! $i) $totalarray['nbfield']++; |
|
819 | + if (!$i) $totalarray['nbfield']++; |
|
820 | 820 | } |
821 | - if (! empty($arrayfields['t.fk_type']['checked'])) |
|
821 | + if (!empty($arrayfields['t.fk_type']['checked'])) |
|
822 | 822 | { |
823 | - print '<td>'.$obj->flight_type.'</td>'; |
|
823 | + print '<td>' . $obj->flight_type . '</td>'; |
|
824 | 824 | |
825 | - if (! $i) $totalarray['nbfield']++; |
|
825 | + if (!$i) $totalarray['nbfield']++; |
|
826 | 826 | } |
827 | - if (! empty($arrayfields['t.fk_pilot']['checked'])) |
|
827 | + if (!empty($arrayfields['t.fk_pilot']['checked'])) |
|
828 | 828 | { |
829 | - print '<td>'.$obj->pilot.'</td>'; |
|
829 | + print '<td>' . $obj->pilot . '</td>'; |
|
830 | 830 | |
831 | - if (! $i) $totalarray['nbfield']++; |
|
831 | + if (!$i) $totalarray['nbfield']++; |
|
832 | 832 | } |
833 | - if (! empty($arrayfields['t.fk_organisateur']['checked'])) |
|
833 | + if (!empty($arrayfields['t.fk_organisateur']['checked'])) |
|
834 | 834 | { |
835 | - print '<td>'.$obj->organisator.'</td>'; |
|
835 | + print '<td>' . $obj->organisator . '</td>'; |
|
836 | 836 | |
837 | - if (! $i) $totalarray['nbfield']++; |
|
837 | + if (!$i) $totalarray['nbfield']++; |
|
838 | 838 | } |
839 | - if (! empty($arrayfields['t.is_facture']['checked'])) |
|
839 | + if (!empty($arrayfields['t.is_facture']['checked'])) |
|
840 | 840 | { |
841 | 841 | $flight->is_facture = $obj->is_facture; |
842 | - print '<td>'.$flight->getLibStatut(3).'</td>'; |
|
842 | + print '<td>' . $flight->getLibStatut(3) . '</td>'; |
|
843 | 843 | |
844 | - if (! $i) $totalarray['nbfield']++; |
|
844 | + if (!$i) $totalarray['nbfield']++; |
|
845 | 845 | } |
846 | - if (! empty($arrayfields['t.kilometers']['checked'])) |
|
846 | + if (!empty($arrayfields['t.kilometers']['checked'])) |
|
847 | 847 | { |
848 | - print '<td>'.$obj->kilometers.'</td>'; |
|
848 | + print '<td>' . $obj->kilometers . '</td>'; |
|
849 | 849 | |
850 | - if (! $i) $totalarray['nbfield']++; |
|
850 | + if (!$i) $totalarray['nbfield']++; |
|
851 | 851 | } |
852 | - if (! empty($arrayfields['t.cost']['checked'])) |
|
852 | + if (!empty($arrayfields['t.cost']['checked'])) |
|
853 | 853 | { |
854 | - print '<td>'.$obj->cost.'</td>'; |
|
854 | + print '<td>' . $obj->cost . '</td>'; |
|
855 | 855 | |
856 | - if (! $i) $totalarray['nbfield']++; |
|
856 | + if (!$i) $totalarray['nbfield']++; |
|
857 | 857 | } |
858 | - if (! empty($arrayfields['t.fk_receiver']['checked'])) |
|
858 | + if (!empty($arrayfields['t.fk_receiver']['checked'])) |
|
859 | 859 | { |
860 | - print '<td>'.$obj->receiver.'</td>'; |
|
860 | + print '<td>' . $obj->receiver . '</td>'; |
|
861 | 861 | |
862 | - if (! $i) $totalarray['nbfield']++; |
|
862 | + if (!$i) $totalarray['nbfield']++; |
|
863 | 863 | } |
864 | - if (! empty($arrayfields['t.justif_kilometers']['checked'])) |
|
864 | + if (!empty($arrayfields['t.justif_kilometers']['checked'])) |
|
865 | 865 | { |
866 | - print '<td>'.$obj->justif_kilometers.'</td>'; |
|
866 | + print '<td>' . $obj->justif_kilometers . '</td>'; |
|
867 | 867 | |
868 | - if (! $i) $totalarray['nbfield']++; |
|
868 | + if (!$i) $totalarray['nbfield']++; |
|
869 | 869 | } |
870 | 870 | |
871 | 871 | // Extra fields |
@@ -890,7 +890,7 @@ discard block |
||
890 | 890 | // Fields from hook |
891 | 891 | $parameters = array('arrayfields' => $arrayfields, 'obj' => $obj); |
892 | 892 | $reshook = $hookmanager->executeHooks('printFieldListValue', |
893 | - $parameters); // Note that $action and $object may have been modified by hook |
|
893 | + $parameters); // Note that $action and $object may have been modified by hook |
|
894 | 894 | print $hookmanager->resPrint; |
895 | 895 | // Date creation |
896 | 896 | if (!empty($arrayfields['t.datec']['checked'])) { |
@@ -967,7 +967,7 @@ discard block |
||
967 | 967 | |
968 | 968 | $parameters = array('arrayfields' => $arrayfields, 'sql' => $sql); |
969 | 969 | $reshook = $hookmanager->executeHooks('printFieldListFooter', |
970 | - $parameters); // Note that $action and $object may have been modified by hook |
|
970 | + $parameters); // Note that $action and $object may have been modified by hook |
|
971 | 971 | print $hookmanager->resPrint; |
972 | 972 | |
973 | 973 | print '</table>' . "\n"; |
@@ -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>'; |
@@ -211,13 +211,13 @@ discard block |
||
211 | 211 | $this->boxes = []; |
212 | 212 | |
213 | 213 | // Cronjobs |
214 | - $this->cronjobs = array(); // List of cron jobs entries to add |
|
214 | + $this->cronjobs = array(); // List of cron jobs entries to add |
|
215 | 215 | // 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), |
216 | 216 | // 1=>array('label'=>'My label', 'jobtype'=>'command', 'command'=>'', 'parameters'=>'', 'comment'=>'Comment', 'frequency'=>1, 'unitfrequency'=>3600*24, 'test'=>true) |
217 | 217 | // ); |
218 | 218 | |
219 | 219 | // Permissions |
220 | - $this->rights = array(); // Permission array used by this module |
|
220 | + $this->rights = array(); // Permission array used by this module |
|
221 | 221 | $r = 0; |
222 | 222 | |
223 | 223 | $this->rights[$r][0] = 9993; |
@@ -270,7 +270,7 @@ discard block |
||
270 | 270 | $r++; |
271 | 271 | |
272 | 272 | // Main menu entries |
273 | - $this->menus = array(); // List of menus to add |
|
273 | + $this->menus = array(); // List of menus to add |
|
274 | 274 | $r = 0; |
275 | 275 | |
276 | 276 | // Add here entries to declare new menus |
@@ -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>'; |