Completed
Push — master ( 09623d...f9e566 )
by Laurent
03:33
created
listFact.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -61,8 +61,8 @@
 block discarded – undo
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";
Please login to merge, or discard this patch.
readFlightsBalloon.php 2 patches
Spacing   +10 added lines, -10 removed lines patch added patch discarded remove patch
@@ -45,8 +45,8 @@  discard block
 block discarded – undo
45 45
     //il est titulaire d'un ballon
46 46
     $query = 'SELECT * FROM llx_bbc_ballons';
47 47
     if (!$user->rights->flightLog->vol->detail) {
48
-        $query.= ' WHERE `fk_responsable` = ' . $user->id;
49
-        $query.= ' OR `fk_co_responsable` = ' . $user->id;
48
+        $query .= ' WHERE `fk_responsable` = ' . $user->id;
49
+        $query .= ' OR `fk_co_responsable` = ' . $user->id;
50 50
     }
51 51
     $resql = $db->query($query);
52 52
     if ($resql) {
@@ -85,15 +85,15 @@  discard block
 block discarded – undo
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;
88
+    $query .= ' WHERE `BBC_ballons_idBBC_ballons` = ' . $ballon->id;
89 89
     if ($datep) {
90
-        $query.= ' AND date >= \'' . dol_print_date($datep, 'dayrfc') . '\'';
90
+        $query .= ' AND date >= \'' . dol_print_date($datep, 'dayrfc') . '\'';
91 91
     }
92 92
     if ($datef) {
93
-        $query.= ' AND date <= \'' . dol_print_date($datef, 'dayrfc') . '\'';
93
+        $query .= ' AND date <= \'' . dol_print_date($datef, 'dayrfc') . '\'';
94 94
     }
95 95
 
96
-    $query.= ' ORDER BY date';
96
+    $query .= ' ORDER BY date';
97 97
 
98 98
     $resql = $db->query($query);
99 99
 }
@@ -126,8 +126,8 @@  discard block
 block discarded – undo
126 126
         select_balloons($idBallon);
127 127
     } else {
128 128
         $query2 = 'SELECT * FROM llx_bbc_ballons';
129
-        $query2.= ' WHERE `fk_responsable` = ' . $user->id;
130
-        $query2.= ' OR `fk_co_responsable` = ' . $user->id;
129
+        $query2 .= ' WHERE `fk_responsable` = ' . $user->id;
130
+        $query2 .= ' OR `fk_co_responsable` = ' . $user->id;
131 131
         $resql2 = $db->query($query2);
132 132
         if ($resql2) {
133 133
             $num = $db->num_rows($resql2);
@@ -217,7 +217,7 @@  discard block
 block discarded – undo
217 217
                 print '<td>' . $obj->fk_type . '</td>';
218 218
                 print '<td>' . $obj->date . '</td>';
219 219
                 print '<td>' . $ballon->immat . '</td>';
220
-                print '<td>' . $pilot->getNomUrl(). '</td>';
220
+                print '<td>' . $pilot->getNomUrl() . '</td>';
221 221
                 print '<td>' . $obj->lieuD . '</td>';
222 222
                 print '<td>' . $obj->lieuA . '</td>';
223 223
                 print '<td>' . $obj->heureD . '</td>';
@@ -231,7 +231,7 @@  discard block
 block discarded – undo
231 231
                 if ($user->rights->flightLog->vol->status) {
232 232
                     $vol = new Bbcvols($db);
233 233
                     $vol->fetch($obj->idBBC_vols);
234
-                    print '<td>' . $vol->getStatus().'</td>';
234
+                    print '<td>' . $vol->getStatus() . '</td>';
235 235
                 }
236 236
             }
237 237
             print'</tr>';
Please login to merge, or discard this patch.
Braces   +6 added lines, -4 removed lines patch added patch discarded remove patch
@@ -169,15 +169,17 @@
 block discarded – undo
169 169
         print '</tr>';
170 170
     }
171 171
     // Date start
172
-    if (GETPOST('datep', 'int', 1))
173
-        $datep = dol_stringtotime(GETPOST('datep', 'int', 1), 0);
172
+    if (GETPOST('datep', 'int', 1)) {
173
+            $datep = dol_stringtotime(GETPOST('datep', 'int', 1), 0);
174
+    }
174 175
     print '<tr><td width="30%" nowrap="nowrap"><span>Debut</span></td><td>';
175 176
     $form->select_date($datep, 'ap', 0, 0, 1, "readBalloon", 1, 1, 0, 0);
176 177
     print '</td></tr>';
177 178
 
178 179
     // Date end
179
-    if (GETPOST('datef', 'int', 1))
180
-        $datef = dol_stringtotime(GETPOST('datef', 'int', 1), 0);
180
+    if (GETPOST('datef', 'int', 1)) {
181
+            $datef = dol_stringtotime(GETPOST('datef', 'int', 1), 0);
182
+    }
181 183
     print '<tr><td>Fin</span></td><td>';
182 184
     $form->select_date($datef, 'p2', 0, 0, 1, "readBalloon", 1, 1, 0, 0);
183 185
     print '</td></tr>';
Please login to merge, or discard this patch.
readFlightsPilot.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -60,10 +60,10 @@
 block discarded – undo
60 60
 $query = 'SELECT *,TIMEDIFF(heureA,heureD) AS time  FROM llx_bbc_vols WHERE 1=1';
61 61
 
62 62
 if ($datep) {
63
-    $query .= ' AND date >= \'' . dol_print_date($datep, 'dayrfc'). '\'';
63
+    $query .= ' AND date >= \'' . dol_print_date($datep, 'dayrfc') . '\'';
64 64
 }
65 65
 if ($datef) {
66
-    $query .= ' AND date <= \'' . dol_print_date($datef, 'dayrfc'). '\'';
66
+    $query .= ' AND date <= \'' . dol_print_date($datef, 'dayrfc') . '\'';
67 67
 }
68 68
 
69 69
 $query .= ' AND `fk_pilot` = ' . $bbcUser->id;
Please login to merge, or discard this patch.
generateExpenseNote.php 2 patches
Spacing   +13 added lines, -13 removed lines patch added patch discarded remove patch
@@ -81,9 +81,9 @@  discard block
 block discarded – undo
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
 block discarded – undo
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
 block discarded – undo
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
 block discarded – undo
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
 block discarded – undo
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
 block discarded – undo
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
 
Please login to merge, or discard this patch.
Braces   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -168,7 +168,7 @@
 block discarded – undo
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 {
Please login to merge, or discard this patch.
lib/flightLog.lib.php 2 patches
Braces   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -171,7 +171,7 @@
 block discarded – undo
171 171
     if($groupBy){
172 172
         $sql.= " , SUM(VOL.kilometers) as SUM";
173 173
         $sql.= " , COUNT(VOL.idBBC_vols) as nbrFlight";
174
-    }else{
174
+    } else{
175 175
         $sql.= " , VOL.*";
176 176
     }
177 177
 
Please login to merge, or discard this patch.
Spacing   +19 added lines, -19 removed lines patch added patch discarded remove patch
@@ -54,7 +54,7 @@  discard block
 block discarded – undo
54 54
 
55 55
     $bbcTypes = new Bbctypes($db);
56 56
 
57
-    $bbcTypes->fetchAll('','',0,0, [
57
+    $bbcTypes->fetchAll('', '', 0, 0, [
58 58
         "active" => $active
59 59
     ]);
60 60
 
@@ -78,7 +78,7 @@  discard block
 block discarded – undo
78 78
 
79 79
     print '<select class="flat" name="' . $htmlname . '">';
80 80
 
81
-    if($showempty){
81
+    if ($showempty) {
82 82
         print sprintf('<option selected="%s" value=""></option>', (($selected == "" || $selected = 0 || $selected == -1) ? "selected" : ""));
83 83
     }
84 84
 
@@ -88,7 +88,7 @@  discard block
 block discarded – undo
88 88
             print ' selected="selected"';
89 89
         }
90 90
         print '>';
91
-        echo "T".$flightType->numero . '-' . $flightType->nom;
91
+        echo "T" . $flightType->numero . '-' . $flightType->nom;
92 92
         print "</option>";
93 93
     }
94 94
 
@@ -110,7 +110,7 @@  discard block
 block discarded – undo
110 110
     print '<select class="flat" name="' . $htmlname . '">';
111 111
 
112 112
     print '<option value=""';
113
-    if ($selected == -1 || $selected == ''|| $selected == 0) {
113
+    if ($selected == -1 || $selected == '' || $selected == 0) {
114 114
         print ' selected="selected"';
115 115
     }
116 116
     print '>&nbsp;</option>';
@@ -156,17 +156,17 @@  discard block
 block discarded – undo
156 156
  *
157 157
  * @return string
158 158
  */
159
-function generateQuarterQuery($year = null, $pilotId = null, $quarter = null, $groupBy = true){
159
+function generateQuarterQuery($year = null, $pilotId = null, $quarter = null, $groupBy = true) {
160 160
 
161 161
     global $db;
162 162
 
163 163
     $sql = "SELECT USR.rowid, USR.lastname, USR.firstname, QUARTER(VOL.date) as quartil ";
164 164
 
165
-    if($groupBy){
166
-        $sql.= " , SUM(VOL.kilometers) as SUM";
167
-        $sql.= " , COUNT(VOL.idBBC_vols) as nbrFlight";
168
-    }else{
169
-        $sql.= " , VOL.*";
165
+    if ($groupBy) {
166
+        $sql .= " , SUM(VOL.kilometers) as SUM";
167
+        $sql .= " , COUNT(VOL.idBBC_vols) as nbrFlight";
168
+    } else {
169
+        $sql .= " , VOL.*";
170 170
     }
171 171
 
172 172
     $sql .= " FROM llx_bbc_vols as VOL";
@@ -176,15 +176,15 @@  discard block
 block discarded – undo
176 176
     $sql .= " AND YEAR(VOL.date) = " . ($year ?: 'YEAR(NOW())');
177 177
     $sql .= " AND ( VOL.fk_type = 1 OR VOL.fk_type = 2 ) ";
178 178
 
179
-    if($pilotId !== null){
180
-        $sql .= " AND USR.rowid = ".$pilotId;
179
+    if ($pilotId !== null) {
180
+        $sql .= " AND USR.rowid = " . $pilotId;
181 181
     }
182 182
 
183
-    if($quarter !== null){
184
-        $sql .= " AND QUARTER(VOL.date) = ".$quarter;
183
+    if ($quarter !== null) {
184
+        $sql .= " AND QUARTER(VOL.date) = " . $quarter;
185 185
     }
186 186
 
187
-    if($groupBy){
187
+    if ($groupBy) {
188 188
         $sql .= " GROUP BY QUARTER(VOL.date), VOL.fk_pilot";
189 189
     }
190 190
     $sql .= " ORDER BY QUARTER(VOL.date), VOL.fk_pilot";
@@ -199,7 +199,7 @@  discard block
 block discarded – undo
199 199
  *
200 200
  * @return array
201 201
  */
202
-function findFlightByPilotAndQuarter($pilotId, $year, $quarter){
202
+function findFlightByPilotAndQuarter($pilotId, $year, $quarter) {
203 203
     global $db;
204 204
 
205 205
     $sql = generateQuarterQuery($year, $pilotId, $quarter, false);
@@ -323,7 +323,7 @@  discard block
 block discarded – undo
323 323
     print '</tr>';
324 324
 
325 325
     foreach ($kmByQuartil as $id => $rembKm) {
326
-        if(!$user->rights->flightLog->vol->detail && $id != $user->id){
326
+        if (!$user->rights->flightLog->vol->detail && $id != $user->id) {
327 327
             continue;
328 328
         }
329 329
 
@@ -477,10 +477,10 @@  discard block
 block discarded – undo
477 477
 
478 478
     $graphData = new GraphicalData();
479 479
 
480
-    foreach(getFlightYears() as $flightYear){
480
+    foreach (getFlightYears() as $flightYear) {
481 481
         $pieceData = new YearGraphicalData($flightYear);
482 482
 
483
-        foreach($flightTypes as $flightType){
483
+        foreach ($flightTypes as $flightType) {
484 484
             $pieceData->addType(new GraphicalType($flightType->id, $flightType->nom));
485 485
         }
486 486
 
Please login to merge, or discard this patch.
class/YearGraphicalData.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -69,7 +69,7 @@
 block discarded – undo
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
 
Please login to merge, or discard this patch.
class/bbctypes.class.php 2 patches
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
 	
Please login to merge, or discard this patch.
Braces   +39 added lines, -13 removed lines patch added patch discarded remove patch
@@ -501,7 +501,9 @@  discard block
 block discarded – undo
501 501
         if ($withpicto)
502 502
         {
503 503
             $result.=($link.img_object(($notooltip?'':$label), 'label', ($notooltip?'':'class="classfortooltip"')).$linkend);
504
-            if ($withpicto != 2) $result.=' ';
504
+            if ($withpicto != 2) {
505
+                $result.=' ';
506
+            }
505 507
 		}
506 508
 		$result.= $link . $this->ref . $linkend;
507 509
 		return $result;
@@ -532,33 +534,57 @@  discard block
 block discarded – undo
532 534
 		if ($mode == 0)
533 535
 		{
534 536
 			$prefix='';
535
-			if ($status == 1) return $langs->trans('Enabled');
536
-			if ($status == 0) return $langs->trans('Disabled');
537
+			if ($status == 1) {
538
+			    return $langs->trans('Enabled');
539
+			}
540
+			if ($status == 0) {
541
+			    return $langs->trans('Disabled');
542
+			}
537 543
 		}
538 544
 		if ($mode == 1)
539 545
 		{
540
-			if ($status == 1) return $langs->trans('Enabled');
541
-			if ($status == 0) return $langs->trans('Disabled');
546
+			if ($status == 1) {
547
+			    return $langs->trans('Enabled');
548
+			}
549
+			if ($status == 0) {
550
+			    return $langs->trans('Disabled');
551
+			}
542 552
 		}
543 553
 		if ($mode == 2)
544 554
 		{
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');
555
+			if ($status == 1) {
556
+			    return img_picto($langs->trans('Enabled'),'statut4').' '.$langs->trans('Enabled');
557
+			}
558
+			if ($status == 0) {
559
+			    return img_picto($langs->trans('Disabled'),'statut5').' '.$langs->trans('Disabled');
560
+			}
547 561
 		}
548 562
 		if ($mode == 3)
549 563
 		{
550
-			if ($status == 1) return img_picto($langs->trans('Enabled'),'statut4');
551
-			if ($status == 0) return img_picto($langs->trans('Disabled'),'statut5');
564
+			if ($status == 1) {
565
+			    return img_picto($langs->trans('Enabled'),'statut4');
566
+			}
567
+			if ($status == 0) {
568
+			    return img_picto($langs->trans('Disabled'),'statut5');
569
+			}
552 570
 		}
553 571
 		if ($mode == 4)
554 572
 		{
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');
573
+			if ($status == 1) {
574
+			    return img_picto($langs->trans('Enabled'),'statut4').' '.$langs->trans('Enabled');
575
+			}
576
+			if ($status == 0) {
577
+			    return img_picto($langs->trans('Disabled'),'statut5').' '.$langs->trans('Disabled');
578
+			}
557 579
 		}
558 580
 		if ($mode == 5)
559 581
 		{
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');
582
+			if ($status == 1) {
583
+			    return $langs->trans('Enabled').' '.img_picto($langs->trans('Enabled'),'statut4');
584
+			}
585
+			if ($status == 0) {
586
+			    return $langs->trans('Disabled').' '.img_picto($langs->trans('Disabled'),'statut5');
587
+			}
562 588
 		}
563 589
 	}
564 590
 	
Please login to merge, or discard this patch.
class/GraphicalValueType.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -36,14 +36,14 @@
 block discarded – undo
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
 
Please login to merge, or discard this patch.
class/GraphicalData.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -40,7 +40,7 @@  discard block
 block discarded – undo
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
 block discarded – undo
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
 
Please login to merge, or discard this patch.