Completed
Push — master ( f9e566...747eba )
by Laurent
03:05
created
core/modules/modFlightLog.class.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -430,7 +430,7 @@  discard block
 block discarded – undo
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
 block discarded – undo
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
         // );
Please login to merge, or discard this patch.
readFlights.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -152,7 +152,7 @@
 block discarded – undo
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>';
Please login to merge, or discard this patch.
list.php 1 patch
Spacing   +62 added lines, -62 removed lines patch added patch discarded remove patch
@@ -179,7 +179,7 @@  discard block
 block discarded – undo
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
 block discarded – undo
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
 block discarded – undo
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
 block discarded – undo
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
 block discarded – undo
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
 block discarded – undo
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
 block discarded – undo
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
 block discarded – undo
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
 block discarded – undo
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
 block discarded – undo
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";
Please login to merge, or discard this patch.
card.php 1 patch
Spacing   +20 added lines, -20 removed lines patch added patch discarded remove patch
@@ -56,7 +56,7 @@  discard block
 block discarded – undo
56 56
 $langs->load("other");
57 57
 
58 58
 // Get parameters
59
-$id = GETPOST('id', 'int')?: GETPOST('idBBC_vols', 'int');
59
+$id = GETPOST('id', 'int') ?: GETPOST('idBBC_vols', 'int');
60 60
 $action = GETPOST('action', 'alpha');
61 61
 $cancel = GETPOST('cancel');
62 62
 $backtopage = GETPOST('backtopage');
@@ -106,7 +106,7 @@  discard block
 block discarded – undo
106 106
 $extralabels = $extrafields->fetch_name_optionals_label($object->table_element);
107 107
 
108 108
 // Load object
109
-include DOL_DOCUMENT_ROOT . '/core/actions_fetchobject.inc.php';  // Must be include, not include_once  // Must be include, not include_once. Include fetch and fetch_thirdparty but not fetch_optionals
109
+include DOL_DOCUMENT_ROOT . '/core/actions_fetchobject.inc.php'; // Must be include, not include_once  // Must be include, not include_once. Include fetch and fetch_thirdparty but not fetch_optionals
110 110
 
111 111
 // Initialize technical object to manage hooks of modules. Note that conf->hooks_modules contains array array
112 112
 $hookmanager->initHooks(array('bbcvols'));
@@ -125,7 +125,7 @@  discard block
 block discarded – undo
125 125
 
126 126
 $parameters = array();
127 127
 $reshook = $hookmanager->executeHooks('doActions', $parameters, $object,
128
-    $action);    // Note that $action and $object may have been modified by some hooks
128
+    $action); // Note that $action and $object may have been modified by some hooks
129 129
 if ($reshook < 0) {
130 130
     setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
131 131
 }
@@ -214,8 +214,8 @@  discard block
 block discarded – undo
214 214
         $object->id = $object->idBBC_vols;
215 215
         $object->lieuD = GETPOST('lieuD', 'alpha');
216 216
         $object->lieuA = GETPOST('lieuA', 'alpha');
217
-        $object->heureD = GETPOST('heureD_h', 'int').":".GETPOST('heureD_m', 'int').":00";
218
-        $object->heureA = GETPOST('heureA_h', 'int').":".GETPOST('heureA_m', 'int').":00";
217
+        $object->heureD = GETPOST('heureD_h', 'int') . ":" . GETPOST('heureD_m', 'int') . ":00";
218
+        $object->heureA = GETPOST('heureA_h', 'int') . ":" . GETPOST('heureA_m', 'int') . ":00";
219 219
         $object->BBC_ballons_idBBC_ballons = GETPOST('BBC_ballons_idBBC_ballons', 'int');
220 220
         $object->nbrPax = GETPOST('nbrPax', 'alpha');
221 221
         $object->remarque = GETPOST('remarque', 'alpha');
@@ -236,12 +236,12 @@  discard block
 block discarded – undo
236 236
                 null, 'errors');
237 237
         }
238 238
 
239
-        if(!dol_validElement($object->lieuD)){
239
+        if (!dol_validElement($object->lieuD)) {
240 240
             $error++;
241 241
             setEventMessage("Erreur le champ : lieu de décollage", 'errors');
242 242
         }
243 243
 
244
-        if(!dol_validElement($object->lieuA)){
244
+        if (!dol_validElement($object->lieuA)) {
245 245
             $error++;
246 246
             setEventMessage("Erreur le champ : lieu d'atterissage", 'errors');
247 247
         }
@@ -253,12 +253,12 @@  discard block
 block discarded – undo
253 253
             setEventMessage("Erreur avec les heures de vol", 'errors');
254 254
         }
255 255
 
256
-        if(!is_numeric($object->nbrPax) || $object->nbrPax < 0 ){
256
+        if (!is_numeric($object->nbrPax) || $object->nbrPax < 0) {
257 257
             $error++;
258 258
             setEventMessage("Erreur le champ : nombre de passagers", 'errors');
259 259
         }
260 260
 
261
-        if(!$pilotService->isPilot($object->fk_pilot)){
261
+        if (!$pilotService->isPilot($object->fk_pilot)) {
262 262
             $error++;
263 263
             setEventMessage("Le pilote selectionne n'est pas pilote", 'errors');
264 264
         }
@@ -399,18 +399,18 @@  discard block
 block discarded – undo
399 399
         select_balloons($object->BBC_ballons_idBBC_ballons, "BBC_ballons_idBBC_ballons");
400 400
     print "</td></tr>";
401 401
     print "<tr><td class=\"fieldrequired\">" . $langs->trans("FieldnbrPax") . "</td><td><input class=\"flat\" type=\"number\" name=\"nbrPax\" value=\"" . $object->nbrPax . "\"></td></tr>";
402
-    print "<tr><td class=\"fieldrequired\">" . $langs->trans("Fieldremarque") . "</td><td><textarea class=\"flat\" name=\"remarque\">".$object->remarque."</textarea></td></tr>";
403
-    print "<tr><td class=\"fieldrequired\">" . $langs->trans("Fieldincidents") . "</td><td><textarea class=\"flat\" name=\"incidents\">".$object->incidents."</textarea></td></tr>";
402
+    print "<tr><td class=\"fieldrequired\">" . $langs->trans("Fieldremarque") . "</td><td><textarea class=\"flat\" name=\"remarque\">" . $object->remarque . "</textarea></td></tr>";
403
+    print "<tr><td class=\"fieldrequired\">" . $langs->trans("Fieldincidents") . "</td><td><textarea class=\"flat\" name=\"incidents\">" . $object->incidents . "</textarea></td></tr>";
404 404
     print "<tr><td class=\"fieldrequired\">" . $langs->trans("Fieldfk_type") . "</td><td>";
405 405
         select_flight_type($object->fk_type, "fk_type");
406 406
     print "</td></tr>";
407
-    print "<tr><td class=\"fieldrequired\">" . $langs->trans("Fieldfk_pilot") . "</td><td>".$form->select_dolusers($object->fk_pilot, "fk_pilot", 0, '', 0, '', '', 0, 0, 0, '', 0, '', '', 1)."</td></tr>";
408
-    print "<tr><td class=\"fieldrequired\">" . $langs->trans("Fieldfk_organisateur") . "</td><td>".$form->select_dolusers($object->fk_organisateur, "fk_organisateur")."</td></tr>";
407
+    print "<tr><td class=\"fieldrequired\">" . $langs->trans("Fieldfk_pilot") . "</td><td>" . $form->select_dolusers($object->fk_pilot, "fk_pilot", 0, '', 0, '', '', 0, 0, 0, '', 0, '', '', 1) . "</td></tr>";
408
+    print "<tr><td class=\"fieldrequired\">" . $langs->trans("Fieldfk_organisateur") . "</td><td>" . $form->select_dolusers($object->fk_organisateur, "fk_organisateur") . "</td></tr>";
409 409
 
410
-    if($user->rights->flightLog->vol->financial || $user->id == $object->fk_pilot) {
410
+    if ($user->rights->flightLog->vol->financial || $user->id == $object->fk_pilot) {
411 411
         print "<tr><td class=\"fieldrequired\">" . $langs->trans("Fieldkilometers") . "</td><td><input class=\"flat\" type=\"number\" name=\"kilometers\" value=\"" . $object->kilometers . "\"></td></tr>";
412 412
         print "<tr><td class=\"fieldrequired\">" . $langs->trans("Fieldcost") . "</td><td><input class=\"flat\" type=\"number\" name=\"cost\" value=\"" . $object->cost . "\"></td></tr>";
413
-        print "<tr><td class=\"fieldrequired\">" . $langs->trans("Fieldfk_receiver") . "</td><td>" . $form->select_dolusers($object->fk_receiver,"fk_receiver", true ) . "</td></tr>";
413
+        print "<tr><td class=\"fieldrequired\">" . $langs->trans("Fieldfk_receiver") . "</td><td>" . $form->select_dolusers($object->fk_receiver, "fk_receiver", true) . "</td></tr>";
414 414
         print "<tr><td class=\"fieldrequired\">" . $langs->trans("Fieldjustif_kilometers") . "</td><td><textarea class=\"flat\" name=\"justif_kilometers\">" . $object->justif_kilometers . "</textarea></td></tr>";
415 415
     }
416 416
     print '</table>';
@@ -432,7 +432,7 @@  discard block
 block discarded – undo
432 432
 
433 433
     print load_fiche_titre($langs->trans($pageTitle));
434 434
 
435
-    $linkback = '<a href="'.DOL_URL_ROOT.'/flightLog/list.php">'.$langs->trans("BackToList").'</a>';
435
+    $linkback = '<a href="' . DOL_URL_ROOT . '/flightLog/list.php">' . $langs->trans("BackToList") . '</a>';
436 436
     print $form->showrefnav($object, "idBBC_vols", $linkback, true, "idBBC_vols");
437 437
     dol_fiche_head();
438 438
 
@@ -459,13 +459,13 @@  discard block
 block discarded – undo
459 459
     print '<tr><td class="fieldrequired">' . $langs->trans("Fieldfk_pilot") . '</td><td>' . $pilot->getNomUrl(1) . '</td></tr>';
460 460
     print '<tr><td class="fieldrequired">' . $langs->trans("Fieldfk_organisateur") . '</td><td>' . $organisator->getNomUrl(1) . '</td></tr>';
461 461
 
462
-    if($user->rights->flightLog->vol->financial){
462
+    if ($user->rights->flightLog->vol->financial) {
463 463
         print '<tr><td class="fieldrequired">' . $langs->trans("Fieldis_facture") . '</td><td>' . $object->is_facture . '</td></tr>';
464 464
     }
465 465
 
466
-    if($user->rights->flightLog->vol->financial || $user->id == $object->fk_pilot) {
466
+    if ($user->rights->flightLog->vol->financial || $user->id == $object->fk_pilot) {
467 467
         print '<tr><td class="fieldrequired">' . $langs->trans("Fieldkilometers") . '</td><td>' . $object->kilometers . ' KM</td></tr>';
468
-        print '<tr><td class="fieldrequired">' . $langs->trans("Fieldcost") . '</td><td>' . $object->cost ." ". $langs->getCurrencySymbol($conf->currency).'</td></tr>';
468
+        print '<tr><td class="fieldrequired">' . $langs->trans("Fieldcost") . '</td><td>' . $object->cost . " " . $langs->getCurrencySymbol($conf->currency) . '</td></tr>';
469 469
         print '<tr><td class="fieldrequired">' . $langs->trans("Fieldfk_receiver") . '</td><td>' . $receiver->getNomUrl(1) . '</td></tr>';
470 470
         print '<tr><td class="fieldrequired">' . $langs->trans("Fieldjustif_kilometers") . '</td><td>' . $object->justif_kilometers . '</td></tr>';
471 471
     }
@@ -478,7 +478,7 @@  discard block
 block discarded – undo
478 478
     print '<div class="tabsAction">' . "\n";
479 479
     $parameters = array();
480 480
     $reshook = $hookmanager->executeHooks('addMoreActionsButtons', $parameters, $object,
481
-        $action);    // Note that $action and $object may have been modified by hook
481
+        $action); // Note that $action and $object may have been modified by hook
482 482
     if ($reshook < 0) {
483 483
         setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
484 484
     }
Please login to merge, or discard this patch.
class/bbctypes.class.php 1 patch
Spacing   +49 added lines, -49 removed lines patch added patch discarded remove patch
@@ -110,16 +110,16 @@  discard block
 block discarded – undo
110 110
 		// Insert request
111 111
 		$sql = 'INSERT INTO ' . MAIN_DB_PREFIX . $this->table_element . '(';
112 112
 		
113
-		$sql.= 'numero,';
114
-		$sql.= 'nom';
115
-		$sql.= 'active';
113
+		$sql .= 'numero,';
114
+		$sql .= 'nom';
115
+		$sql .= 'active';
116 116
 
117 117
 		
118 118
 		$sql .= ') VALUES (';
119 119
 		
120
-		$sql .= ' '.(! isset($this->numero)?'NULL':$this->numero).',';
121
-		$sql .= ' '.(! isset($this->nom)?'NULL':"'".$this->db->escape($this->nom)."'").',';
122
-		$sql .= ' '.(! isset($this->active)?'NULL':$this->active);
120
+		$sql .= ' ' . (!isset($this->numero) ? 'NULL' : $this->numero) . ',';
121
+		$sql .= ' ' . (!isset($this->nom) ? 'NULL' : "'" . $this->db->escape($this->nom) . "'") . ',';
122
+		$sql .= ' ' . (!isset($this->active) ? 'NULL' : $this->active);
123 123
 
124 124
 		
125 125
 		$sql .= ')';
@@ -128,7 +128,7 @@  discard block
 block discarded – undo
128 128
 
129 129
 		$resql = $this->db->query($sql);
130 130
 		if (!$resql) {
131
-			$error ++;
131
+			$error++;
132 132
 			$this->errors[] = 'Error ' . $this->db->lasterror();
133 133
 			dol_syslog(__METHOD__ . ' ' . join(',', $this->errors), LOG_ERR);
134 134
 		}
@@ -151,7 +151,7 @@  discard block
 block discarded – undo
151 151
 		if ($error) {
152 152
 			$this->db->rollback();
153 153
 
154
-			return - 1 * $error;
154
+			return -1 * $error;
155 155
 		} else {
156 156
 			$this->db->commit();
157 157
 
@@ -212,7 +212,7 @@  discard block
 block discarded – undo
212 212
 			$this->errors[] = 'Error ' . $this->db->lasterror();
213 213
 			dol_syslog(__METHOD__ . ' ' . join(',', $this->errors), LOG_ERR);
214 214
 
215
-			return - 1;
215
+			return -1;
216 216
 		}
217 217
 	}
218 218
 
@@ -228,7 +228,7 @@  discard block
 block discarded – undo
228 228
 	 *
229 229
 	 * @return int <0 if KO, >0 if OK
230 230
 	 */
231
-	public function fetchAll($sortorder='', $sortfield='', $limit=0, $offset=0, array $filter = array(), $filtermode='AND')
231
+	public function fetchAll($sortorder = '', $sortfield = '', $limit = 0, $offset = 0, array $filter = array(), $filtermode = 'AND')
232 232
 	{
233 233
 		dol_syslog(__METHOD__, LOG_DEBUG);
234 234
 
@@ -239,32 +239,32 @@  discard block
 block discarded – undo
239 239
 		$sql .= " t.active";
240 240
 
241 241
 		
242
-		$sql .= ' FROM ' . MAIN_DB_PREFIX . $this->table_element. ' as t';
242
+		$sql .= ' FROM ' . MAIN_DB_PREFIX . $this->table_element . ' as t';
243 243
 
244 244
 		// Manage filter
245 245
 		$sqlwhere = array();
246 246
 
247 247
 		foreach ($filter as $key => $value) {
248
-		    if(is_string($value)){
248
+		    if (is_string($value)) {
249 249
                 $sqlwhere [] = $key . ' LIKE \'%' . $this->db->escape($value) . '%\'';
250 250
                 continue;
251 251
             }
252 252
 
253
-            if(is_int($value)){
254
-                $sqlwhere [] = $key . ' = ' .(int)$value;
253
+            if (is_int($value)) {
254
+                $sqlwhere [] = $key . ' = ' . (int) $value;
255 255
                 continue;
256 256
             }
257 257
         }
258 258
 
259 259
 		if (count($sqlwhere) > 0) {
260
-			$sql .= ' WHERE ' . implode(' '.$filtermode.' ', $sqlwhere);
260
+			$sql .= ' WHERE ' . implode(' ' . $filtermode . ' ', $sqlwhere);
261 261
 		}
262 262
 		
263 263
 		if (!empty($sortfield)) {
264
-			$sql .= $this->db->order($sortfield,$sortorder);
264
+			$sql .= $this->db->order($sortfield, $sortorder);
265 265
 		}
266 266
 		if (!empty($limit)) {
267
-		 $sql .=  ' ' . $this->db->plimit($limit + 1, $offset);
267
+		 $sql .= ' ' . $this->db->plimit($limit + 1, $offset);
268 268
 		}
269 269
 		$this->lines = array();
270 270
 
@@ -290,7 +290,7 @@  discard block
 block discarded – undo
290 290
 			$this->errors[] = 'Error ' . $this->db->lasterror();
291 291
 			dol_syslog(__METHOD__ . ' ' . join(',', $this->errors), LOG_ERR);
292 292
 
293
-			return - 1;
293
+			return -1;
294 294
 		}
295 295
 	}
296 296
 
@@ -331,9 +331,9 @@  discard block
 block discarded – undo
331 331
 		// Update request
332 332
 		$sql = 'UPDATE ' . MAIN_DB_PREFIX . $this->table_element . ' SET';
333 333
 		
334
-		$sql .= ' numero = '.(isset($this->numero)?$this->numero:"null").',';
335
-		$sql .= ' nom = '.(isset($this->nom)?"'".$this->db->escape($this->nom)."'":"null").',';
336
-		$sql .= ' active = '.(isset($this->active)?$this->active:"null");
334
+		$sql .= ' numero = ' . (isset($this->numero) ? $this->numero : "null") . ',';
335
+		$sql .= ' nom = ' . (isset($this->nom) ? "'" . $this->db->escape($this->nom) . "'" : "null") . ',';
336
+		$sql .= ' active = ' . (isset($this->active) ? $this->active : "null");
337 337
 
338 338
         
339 339
 		$sql .= ' WHERE idType=' . $this->id;
@@ -342,7 +342,7 @@  discard block
 block discarded – undo
342 342
 
343 343
 		$resql = $this->db->query($sql);
344 344
 		if (!$resql) {
345
-			$error ++;
345
+			$error++;
346 346
 			$this->errors[] = 'Error ' . $this->db->lasterror();
347 347
 			dol_syslog(__METHOD__ . ' ' . join(',', $this->errors), LOG_ERR);
348 348
 		}
@@ -361,7 +361,7 @@  discard block
 block discarded – undo
361 361
 		if ($error) {
362 362
 			$this->db->rollback();
363 363
 
364
-			return - 1 * $error;
364
+			return -1 * $error;
365 365
 		} else {
366 366
 			$this->db->commit();
367 367
 
@@ -403,7 +403,7 @@  discard block
 block discarded – undo
403 403
 
404 404
 			$resql = $this->db->query($sql);
405 405
 			if (!$resql) {
406
-				$error ++;
406
+				$error++;
407 407
 				$this->errors[] = 'Error ' . $this->db->lasterror();
408 408
 				dol_syslog(__METHOD__ . ' ' . join(',', $this->errors), LOG_ERR);
409 409
 			}
@@ -413,7 +413,7 @@  discard block
 block discarded – undo
413 413
 		if ($error) {
414 414
 			$this->db->rollback();
415 415
 
416
-			return - 1 * $error;
416
+			return -1 * $error;
417 417
 		} else {
418 418
 			$this->db->commit();
419 419
 
@@ -451,7 +451,7 @@  discard block
 block discarded – undo
451 451
 
452 452
 		// Other options
453 453
 		if ($result < 0) {
454
-			$error ++;
454
+			$error++;
455 455
 			$this->errors = $object->errors;
456 456
 			dol_syslog(__METHOD__ . ' ' . join(',', $this->errors), LOG_ERR);
457 457
 		}
@@ -464,7 +464,7 @@  discard block
 block discarded – undo
464 464
 		} else {
465 465
 			$this->db->rollback();
466 466
 
467
-			return - 1;
467
+			return -1;
468 468
 		}
469 469
 	}
470 470
 
@@ -479,7 +479,7 @@  discard block
 block discarded – undo
479 479
      *  @param  string  $morecss            Add more css on link
480 480
 	 *	@return	string						String with URL
481 481
 	 */
482
-	function getNomUrl($withpicto=0, $option='', $notooltip=0, $maxlen=24, $morecss='')
482
+	function getNomUrl($withpicto = 0, $option = '', $notooltip = 0, $maxlen = 24, $morecss = '')
483 483
 	{
484 484
 		global $langs, $conf, $db;
485 485
         global $dolibarr_main_authentication, $dolibarr_main_demo;
@@ -490,20 +490,20 @@  discard block
 block discarded – undo
490 490
         $companylink = '';
491 491
 
492 492
         $label = '<u>' . $langs->trans("MyModule") . '</u>';
493
-        $label.= '<div width="100%">';
494
-        $label.= '<b>' . $langs->trans('Ref') . ':</b> ' . $this->ref;
493
+        $label .= '<div width="100%">';
494
+        $label .= '<b>' . $langs->trans('Ref') . ':</b> ' . $this->ref;
495 495
 
496
-        $link = '<a href="'.DOL_URL_ROOT.'/flightLog/card.php?id='.$this->id.'"';
497
-        $link.= ($notooltip?'':' title="'.dol_escape_htmltag($label, 1).'" class="classfortooltip'.($morecss?' '.$morecss:'').'"');
498
-        $link.= '>';
499
-		$linkend='</a>';
496
+        $link = '<a href="' . DOL_URL_ROOT . '/flightLog/card.php?id=' . $this->id . '"';
497
+        $link .= ($notooltip ? '' : ' title="' . dol_escape_htmltag($label, 1) . '" class="classfortooltip' . ($morecss ? ' ' . $morecss : '') . '"');
498
+        $link .= '>';
499
+		$linkend = '</a>';
500 500
 
501 501
         if ($withpicto)
502 502
         {
503
-            $result.=($link.img_object(($notooltip?'':$label), 'label', ($notooltip?'':'class="classfortooltip"')).$linkend);
504
-            if ($withpicto != 2) $result.=' ';
503
+            $result .= ($link . img_object(($notooltip ? '' : $label), 'label', ($notooltip ? '' : 'class="classfortooltip"')) . $linkend);
504
+            if ($withpicto != 2) $result .= ' ';
505 505
 		}
506
-		$result.= $link . $this->ref . $linkend;
506
+		$result .= $link . $this->ref . $linkend;
507 507
 		return $result;
508 508
 	}
509 509
 	
@@ -513,9 +513,9 @@  discard block
 block discarded – undo
513 513
 	 *  @param	int		$mode          0=libelle long, 1=libelle court, 2=Picto + Libelle court, 3=Picto, 4=Picto + Libelle long, 5=Libelle court + Picto
514 514
 	 *  @return	string 			       Label of status
515 515
 	 */
516
-	function getLibStatut($mode=0)
516
+	function getLibStatut($mode = 0)
517 517
 	{
518
-		return $this->LibStatut($this->status,$mode);
518
+		return $this->LibStatut($this->status, $mode);
519 519
 	}
520 520
 
521 521
 	/**
@@ -525,13 +525,13 @@  discard block
 block discarded – undo
525 525
 	 *  @param  int		$mode          	0=libelle long, 1=libelle court, 2=Picto + Libelle court, 3=Picto, 4=Picto + Libelle long, 5=Libelle court + Picto
526 526
 	 *  @return string 			       	Label of status
527 527
 	 */
528
-	function LibStatut($status,$mode=0)
528
+	function LibStatut($status, $mode = 0)
529 529
 	{
530 530
 		global $langs;
531 531
 
532 532
 		if ($mode == 0)
533 533
 		{
534
-			$prefix='';
534
+			$prefix = '';
535 535
 			if ($status == 1) return $langs->trans('Enabled');
536 536
 			if ($status == 0) return $langs->trans('Disabled');
537 537
 		}
@@ -542,23 +542,23 @@  discard block
 block discarded – undo
542 542
 		}
543 543
 		if ($mode == 2)
544 544
 		{
545
-			if ($status == 1) return img_picto($langs->trans('Enabled'),'statut4').' '.$langs->trans('Enabled');
546
-			if ($status == 0) return img_picto($langs->trans('Disabled'),'statut5').' '.$langs->trans('Disabled');
545
+			if ($status == 1) return img_picto($langs->trans('Enabled'), 'statut4') . ' ' . $langs->trans('Enabled');
546
+			if ($status == 0) return img_picto($langs->trans('Disabled'), 'statut5') . ' ' . $langs->trans('Disabled');
547 547
 		}
548 548
 		if ($mode == 3)
549 549
 		{
550
-			if ($status == 1) return img_picto($langs->trans('Enabled'),'statut4');
551
-			if ($status == 0) return img_picto($langs->trans('Disabled'),'statut5');
550
+			if ($status == 1) return img_picto($langs->trans('Enabled'), 'statut4');
551
+			if ($status == 0) return img_picto($langs->trans('Disabled'), 'statut5');
552 552
 		}
553 553
 		if ($mode == 4)
554 554
 		{
555
-			if ($status == 1) return img_picto($langs->trans('Enabled'),'statut4').' '.$langs->trans('Enabled');
556
-			if ($status == 0) return img_picto($langs->trans('Disabled'),'statut5').' '.$langs->trans('Disabled');
555
+			if ($status == 1) return img_picto($langs->trans('Enabled'), 'statut4') . ' ' . $langs->trans('Enabled');
556
+			if ($status == 0) return img_picto($langs->trans('Disabled'), 'statut5') . ' ' . $langs->trans('Disabled');
557 557
 		}
558 558
 		if ($mode == 5)
559 559
 		{
560
-			if ($status == 1) return $langs->trans('Enabled').' '.img_picto($langs->trans('Enabled'),'statut4');
561
-			if ($status == 0) return $langs->trans('Disabled').' '.img_picto($langs->trans('Disabled'),'statut5');
560
+			if ($status == 1) return $langs->trans('Enabled') . ' ' . img_picto($langs->trans('Enabled'), 'statut4');
561
+			if ($status == 0) return $langs->trans('Disabled') . ' ' . img_picto($langs->trans('Disabled'), 'statut5');
562 562
 		}
563 563
 
564 564
 		return "";
Please login to merge, or discard this patch.