@@ -61,8 +61,8 @@ |
||
| 61 | 61 | $form = new Form($db); |
| 62 | 62 | print '<!-- debut cartouche rapport --> |
| 63 | 63 | <div class="tabs"> |
| 64 | - <a id="'.($viewSelection == 1 ? 'active' : '').'" class="tab" href="listFact.php?view=1">Facturation</a> |
|
| 65 | - <a id="'.($viewSelection == 2 ? 'active' : '').'" class="tab" href="listFact.php?view=2">AVIABEL</a> |
|
| 64 | + <a id="'.($viewSelection == 1 ? 'active' : '') . '" class="tab" href="listFact.php?view=1">Facturation</a> |
|
| 65 | + <a id="'.($viewSelection == 2 ? 'active' : '') . '" class="tab" href="listFact.php?view=2">AVIABEL</a> |
|
| 66 | 66 | </div>'; |
| 67 | 67 | print '<div class="tabBar">'; |
| 68 | 68 | print "<form name='listFact' action=\"listFact.php\" method=\"get\">\n"; |
@@ -81,9 +81,9 @@ discard block |
||
| 81 | 81 | |
| 82 | 82 | $missions = bbcKilometersByQuartil($year); |
| 83 | 83 | |
| 84 | - foreach($missions as $currentMissionUserId => $currentMission){ |
|
| 84 | + foreach ($missions as $currentMissionUserId => $currentMission) { |
|
| 85 | 85 | |
| 86 | - if($currentMission["quartil"][$quarter]["km"] == 0 && $currentMission["quartil"][$quarter]["flight"] == 0){ |
|
| 86 | + if ($currentMission["quartil"][$quarter]["km"] == 0 && $currentMission["quartil"][$quarter]["flight"] == 0) { |
|
| 87 | 87 | continue; |
| 88 | 88 | } |
| 89 | 89 | |
@@ -97,18 +97,18 @@ discard block |
||
| 97 | 97 | $object->fk_statut = 1; |
| 98 | 98 | $object->fk_user_validator = GETPOST("fk_user_validator", 'int'); |
| 99 | 99 | $object->note_public = GETPOST('public_note', 'alpha'); |
| 100 | - $object->note_private = GETPOST('private_note','alpha'); |
|
| 100 | + $object->note_private = GETPOST('private_note', 'alpha'); |
|
| 101 | 101 | |
| 102 | 102 | $expenseNoteId = $object->create($expenseNoteUser); |
| 103 | - if($expenseNoteId < 0){ |
|
| 104 | - dol_htmloutput_errors("Erreur lors de la création de la note de frais" , $object->errors); |
|
| 103 | + if ($expenseNoteId < 0) { |
|
| 104 | + dol_htmloutput_errors("Erreur lors de la création de la note de frais", $object->errors); |
|
| 105 | 105 | continue; |
| 106 | 106 | } |
| 107 | 107 | |
| 108 | 108 | |
| 109 | 109 | $flightsForQuarter = findFlightByPilotAndQuarter($currentMissionUserId, $year, $quarter); |
| 110 | 110 | |
| 111 | - foreach($flightsForQuarter as $currentFlightForQuarter) { |
|
| 111 | + foreach ($flightsForQuarter as $currentFlightForQuarter) { |
|
| 112 | 112 | |
| 113 | 113 | // Kilometers |
| 114 | 114 | $object_ligne = new ExpenseReportLine($db); |
@@ -168,7 +168,7 @@ discard block |
||
| 168 | 168 | |
| 169 | 169 | if ($result > 0) { |
| 170 | 170 | dol_htmloutput_mesg("Notes de frais créées"); |
| 171 | - }else{ |
|
| 171 | + } else { |
|
| 172 | 172 | dol_htmloutput_errors("Note de frais non créée"); |
| 173 | 173 | } |
| 174 | 174 | } else { |
@@ -187,15 +187,15 @@ discard block |
||
| 187 | 187 | $form = new Form($db); |
| 188 | 188 | |
| 189 | 189 | $tabLinks = []; |
| 190 | -foreach($flightYears as $currentFlightYear){ |
|
| 190 | +foreach ($flightYears as $currentFlightYear) { |
|
| 191 | 191 | $tabLinks[] = [ |
| 192 | - DOL_URL_ROOT."/flightLog/generateExpenseNote.php?year=".$currentFlightYear, |
|
| 192 | + DOL_URL_ROOT . "/flightLog/generateExpenseNote.php?year=" . $currentFlightYear, |
|
| 193 | 193 | $currentFlightYear, |
| 194 | - "tab_".$currentFlightYear |
|
| 194 | + "tab_" . $currentFlightYear |
|
| 195 | 195 | ]; |
| 196 | 196 | } |
| 197 | 197 | |
| 198 | -dol_fiche_head($tabLinks, "tab_".$year); |
|
| 198 | +dol_fiche_head($tabLinks, "tab_" . $year); |
|
| 199 | 199 | |
| 200 | 200 | ?> |
| 201 | 201 | <form method="POST"> |
@@ -211,7 +211,7 @@ discard block |
||
| 211 | 211 | <select name="quarter" id="field_quarter"> |
| 212 | 212 | <option value="1" <?= ($year == $currentYear && $currentQuarter <= 1) ? 'disabled="disabled"' : "" ?>>1</option> |
| 213 | 213 | <option value="2" <?= ($year == $currentYear && $currentQuarter <= 2) ? 'disabled="disabled"' : "" ?>>2</option> |
| 214 | - <option value="3" <?= ($year == $currentYear && $currentQuarter <= 3) ? 'disabled="disabled"': "" ?>>3</option> |
|
| 214 | + <option value="3" <?= ($year == $currentYear && $currentQuarter <= 3) ? 'disabled="disabled"' : "" ?>>3</option> |
|
| 215 | 215 | <option value="4" <?= ($year == $currentYear && $currentQuarter <= 4) ? 'disabled="disabled"' : "" ?>>4</option> |
| 216 | 216 | </select> |
| 217 | 217 | <br/> |
@@ -220,7 +220,7 @@ discard block |
||
| 220 | 220 | <label><?= $langs->trans("Validateur de la note de frais")?></label><br/> |
| 221 | 221 | <?php |
| 222 | 222 | $include_users = $object->fetch_users_approver_expensereport(); |
| 223 | - print $form->select_dolusers($user->id,"fk_user_validator",1,"",0,$include_users); |
|
| 223 | + print $form->select_dolusers($user->id, "fk_user_validator", 1, "", 0, $include_users); |
|
| 224 | 224 | ?> |
| 225 | 225 | <br/> |
| 226 | 226 | |
@@ -69,7 +69,7 @@ |
||
| 69 | 69 | $result = [$this->year]; |
| 70 | 70 | |
| 71 | 71 | foreach ($this->graphData as $typeId => $data) { |
| 72 | - if(!in_array($typeId, [1,2,3,6])){ |
|
| 72 | + if (!in_array($typeId, [1, 2, 3, 6])) { |
|
| 73 | 73 | continue; |
| 74 | 74 | } |
| 75 | 75 | |
@@ -36,14 +36,14 @@ |
||
| 36 | 36 | /** |
| 37 | 37 | * @param GraphicalValue $value |
| 38 | 38 | */ |
| 39 | - public function addValue(GraphicalValue $value){ |
|
| 39 | + public function addValue(GraphicalValue $value) { |
|
| 40 | 40 | $this->counter = $this->counter->add($value); |
| 41 | 41 | } |
| 42 | 42 | |
| 43 | 43 | /** |
| 44 | 44 | * @return int |
| 45 | 45 | */ |
| 46 | - public function getValue(){ |
|
| 46 | + public function getValue() { |
|
| 47 | 47 | return $this->counter->getValue(); |
| 48 | 48 | } |
| 49 | 49 | |
@@ -40,7 +40,7 @@ discard block |
||
| 40 | 40 | */ |
| 41 | 41 | public function addValue($year, GraphicalValue $value) |
| 42 | 42 | { |
| 43 | - if(!isset($this->data[$year])){ |
|
| 43 | + if (!isset($this->data[$year])) { |
|
| 44 | 44 | throw new \Exception("Year is not defined"); |
| 45 | 45 | } |
| 46 | 46 | |
@@ -54,7 +54,7 @@ discard block |
||
| 54 | 54 | { |
| 55 | 55 | $result = []; |
| 56 | 56 | |
| 57 | - foreach($this->data as $year){ |
|
| 57 | + foreach ($this->data as $year) { |
|
| 58 | 58 | $result[] = $year->export(); |
| 59 | 59 | } |
| 60 | 60 | |
@@ -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"; |
@@ -110,16 +110,16 @@ discard block |
||
| 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 |
||
| 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 |
||
| 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 |
||
| 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 |
||
| 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 |
||
| 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 |
||
| 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 |
||
| 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 |
||
| 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 |
||
| 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 |
||
| 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 |
||
| 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 |
||
| 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 |
||
| 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 |
||
| 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 |
||
| 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 |
||
| 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 |
||
| 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 |
||
| 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 ""; |