@@ -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 ""; |