@@ -21,8 +21,8 @@ discard block |
||
21 | 21 | * @copyright Copyright (c) 2018 by CANTICO ({@link http://www.cantico.fr}) |
22 | 22 | */ |
23 | 23 | |
24 | -require_once dirname(__FILE__) . '/define.php'; |
|
25 | -require_once dirname(__FILE__) . '/functions.php'; |
|
24 | +require_once dirname(__FILE__).'/define.php'; |
|
25 | +require_once dirname(__FILE__).'/functions.php'; |
|
26 | 26 | |
27 | 27 | |
28 | 28 | |
@@ -55,14 +55,14 @@ discard block |
||
55 | 55 | $this->addonName = 'libapp'; |
56 | 56 | $this->addonPrefix = 'app'; |
57 | 57 | |
58 | - $this->classPrefix = $this->addonPrefix . '_'; |
|
59 | - $this->controllerTg = 'addon/' . $this->addonName . '/main'; |
|
58 | + $this->classPrefix = $this->addonPrefix.'_'; |
|
59 | + $this->controllerTg = 'addon/'.$this->addonName.'/main'; |
|
60 | 60 | |
61 | 61 | $addon = bab_getAddonInfosInstance($this->addonName); |
62 | 62 | $this->phpPath = $addon->getPhpPath(); |
63 | 63 | $this->recordSetPath = $this->phpPath; |
64 | 64 | $this->ctrlPath = $this->phpPath; |
65 | - $this->uiPath = $this->phpPath . 'ui/'; |
|
65 | + $this->uiPath = $this->phpPath.'ui/'; |
|
66 | 66 | |
67 | 67 | $babDB = bab_getDB(); |
68 | 68 | |
@@ -109,8 +109,8 @@ discard block |
||
109 | 109 | public function getRecordSetPathname($class) |
110 | 110 | { |
111 | 111 | // $App->MyRecordSet() -> myrecord.class.php |
112 | - $file = strtolower(substr($class, strlen($this->classPrefix), -3)) . '.class.php'; |
|
113 | - return $this->recordSetPath . $file; |
|
112 | + $file = strtolower(substr($class, strlen($this->classPrefix), -3)).'.class.php'; |
|
113 | + return $this->recordSetPath.$file; |
|
114 | 114 | } |
115 | 115 | |
116 | 116 | /** |
@@ -122,8 +122,8 @@ discard block |
||
122 | 122 | public function getRecordPathname($class) |
123 | 123 | { |
124 | 124 | // $App->MyRecord() -> myrecord.class.php |
125 | - $file = strtolower(substr($class, strlen($this->classPrefix))) . '.class.php'; |
|
126 | - return $this->recordSetPath . $file; |
|
125 | + $file = strtolower(substr($class, strlen($this->classPrefix))).'.class.php'; |
|
126 | + return $this->recordSetPath.$file; |
|
127 | 127 | } |
128 | 128 | |
129 | 129 | /** |
@@ -224,7 +224,7 @@ discard block |
||
224 | 224 | |
225 | 225 | if (substr($method, 0, 7) === 'include' && substr($method, -3) === 'Set') { |
226 | 226 | $incl = $method; |
227 | - $classNameMethod = substr($method, strlen('include')) . 'ClassName'; |
|
227 | + $classNameMethod = substr($method, strlen('include')).'ClassName'; |
|
228 | 228 | |
229 | 229 | |
230 | 230 | $classname = $this->$classNameMethod(); |
@@ -246,7 +246,7 @@ discard block |
||
246 | 246 | // We need to revert to multilang fields before synchronizing. |
247 | 247 | $set->useLang(false); |
248 | 248 | } |
249 | - $sql .= $mysqlbackend->setToSql($set) . "\n"; |
|
249 | + $sql .= $mysqlbackend->setToSql($set)."\n"; |
|
250 | 250 | } |
251 | 251 | } |
252 | 252 | } |
@@ -277,7 +277,7 @@ discard block |
||
277 | 277 | |
278 | 278 | if (substr($method, 0, strlen('include')) === 'include' && substr($method, -strlen('Set')) === 'Set') { |
279 | 279 | $incl = $method; |
280 | - $classNameMethod = substr($method, strlen('include')) . 'ClassName'; |
|
280 | + $classNameMethod = substr($method, strlen('include')).'ClassName'; |
|
281 | 281 | |
282 | 282 | $classname = $this->$classNameMethod(); |
283 | 283 | |
@@ -291,7 +291,7 @@ discard block |
||
291 | 291 | |
292 | 292 | if (class_exists($classname) && method_exists($this, $call)) { |
293 | 293 | $set = $this->$call(); |
294 | - $sql .= $mysqlbackend->setToSql($set) . "\n"; |
|
294 | + $sql .= $mysqlbackend->setToSql($set)."\n"; |
|
295 | 295 | } |
296 | 296 | } |
297 | 297 | } |
@@ -305,7 +305,7 @@ discard block |
||
305 | 305 | |
306 | 306 | public function includeBase() |
307 | 307 | { |
308 | - require_once APP_PHP_PATH . 'base.class.php'; |
|
308 | + require_once APP_PHP_PATH.'base.class.php'; |
|
309 | 309 | } |
310 | 310 | |
311 | 311 | /** |
@@ -313,7 +313,7 @@ discard block |
||
313 | 313 | */ |
314 | 314 | public function includeRecordSet() |
315 | 315 | { |
316 | - require_once APP_SET_PATH . 'record.class.php'; |
|
316 | + require_once APP_SET_PATH.'record.class.php'; |
|
317 | 317 | } |
318 | 318 | |
319 | 319 | |
@@ -322,7 +322,7 @@ discard block |
||
322 | 322 | */ |
323 | 323 | public function includeTraceableRecordSet() |
324 | 324 | { |
325 | - require_once APP_SET_PATH . 'traceablerecord.class.php'; |
|
325 | + require_once APP_SET_PATH.'traceablerecord.class.php'; |
|
326 | 326 | } |
327 | 327 | |
328 | 328 | |
@@ -351,7 +351,7 @@ discard block |
||
351 | 351 | */ |
352 | 352 | public function includeLogSet() |
353 | 353 | { |
354 | - require_once APP_SET_PATH . 'log.class.php'; |
|
354 | + require_once APP_SET_PATH.'log.class.php'; |
|
355 | 355 | } |
356 | 356 | |
357 | 357 | /** |
@@ -367,7 +367,7 @@ discard block |
||
367 | 367 | */ |
368 | 368 | public function LogSetClassName() |
369 | 369 | { |
370 | - return $this->LogClassName() . 'Set'; |
|
370 | + return $this->LogClassName().'Set'; |
|
371 | 371 | } |
372 | 372 | |
373 | 373 | /** |
@@ -389,7 +389,7 @@ discard block |
||
389 | 389 | */ |
390 | 390 | public function includeLinkSet() |
391 | 391 | { |
392 | - require_once APP_SET_PATH . 'link.class.php'; |
|
392 | + require_once APP_SET_PATH.'link.class.php'; |
|
393 | 393 | } |
394 | 394 | |
395 | 395 | /** |
@@ -405,7 +405,7 @@ discard block |
||
405 | 405 | */ |
406 | 406 | public function LinkSetClassName() |
407 | 407 | { |
408 | - return $this->LinkClassName() . 'Set'; |
|
408 | + return $this->LinkClassName().'Set'; |
|
409 | 409 | } |
410 | 410 | |
411 | 411 | /** |
@@ -428,7 +428,7 @@ discard block |
||
428 | 428 | */ |
429 | 429 | public function getRecordSetByRef($recordClassname) |
430 | 430 | { |
431 | - $classSet = $recordClassname . 'Set'; |
|
431 | + $classSet = $recordClassname.'Set'; |
|
432 | 432 | $set = $this->$classSet(); |
433 | 433 | return $set; |
434 | 434 | } |
@@ -465,7 +465,7 @@ discard block |
||
465 | 465 | { |
466 | 466 | $fullClassName = get_class($record); |
467 | 467 | list(, $className) = explode('_', $fullClassName); |
468 | - return $className . ':' . $record->id; |
|
468 | + return $className.':'.$record->id; |
|
469 | 469 | } |
470 | 470 | |
471 | 471 | |
@@ -556,16 +556,16 @@ discard block |
||
556 | 556 | */ |
557 | 557 | public function mailTo($addr, $subject = null, $body = null) |
558 | 558 | { |
559 | - $mailTo = 'mailto:' . $addr; |
|
559 | + $mailTo = 'mailto:'.$addr; |
|
560 | 560 | $parameters = array(); |
561 | 561 | if (isset($subject)) { |
562 | - $parameters[] = 'subject=' . $subject; |
|
562 | + $parameters[] = 'subject='.$subject; |
|
563 | 563 | } |
564 | 564 | if (isset($body)) { |
565 | - $parameters[] = 'body=' . $body; |
|
565 | + $parameters[] = 'body='.$body; |
|
566 | 566 | } |
567 | 567 | if (!empty($parameters)) { |
568 | - $mailTo .= '?' . implode('&', $parameters); |
|
568 | + $mailTo .= '?'.implode('&', $parameters); |
|
569 | 569 | } |
570 | 570 | |
571 | 571 | return $mailTo; |
@@ -616,7 +616,7 @@ discard block |
||
616 | 616 | } |
617 | 617 | |
618 | 618 | $number = number_format($number, $decimals, ',', ' '); |
619 | - return str_replace(' ', bab_nbsp(), $number . ' ' . $prefix . $unitSymbol); |
|
619 | + return str_replace(' ', bab_nbsp(), $number.' '.$prefix.$unitSymbol); |
|
620 | 620 | } |
621 | 621 | |
622 | 622 | |
@@ -636,7 +636,7 @@ discard block |
||
636 | 636 | } |
637 | 637 | |
638 | 638 | if (!isset($format)) { |
639 | - $format = bab_registry::get('/' . $this->addonName . '/numberFormat', $PhoneNumber->getDefaultFormat()); |
|
639 | + $format = bab_registry::get('/'.$this->addonName.'/numberFormat', $PhoneNumber->getDefaultFormat()); |
|
640 | 640 | } |
641 | 641 | $phoneNumberUtil = $PhoneNumber->PhoneNumberUtil(); |
642 | 642 | |
@@ -657,7 +657,7 @@ discard block |
||
657 | 657 | */ |
658 | 658 | public function includeController() |
659 | 659 | { |
660 | - require_once APP_PHP_PATH . '/controller.class.php'; |
|
660 | + require_once APP_PHP_PATH.'/controller.class.php'; |
|
661 | 661 | } |
662 | 662 | |
663 | 663 | |
@@ -666,7 +666,7 @@ discard block |
||
666 | 666 | */ |
667 | 667 | public function includeRecordController() |
668 | 668 | { |
669 | - require_once APP_CTRL_PATH . '/record.ctrl.php'; |
|
669 | + require_once APP_CTRL_PATH.'/record.ctrl.php'; |
|
670 | 670 | } |
671 | 671 | |
672 | 672 | |
@@ -706,7 +706,7 @@ discard block |
||
706 | 706 | */ |
707 | 707 | public function includeUi() |
708 | 708 | { |
709 | - require_once APP_UI_PATH . 'ui.class.php'; |
|
709 | + require_once APP_UI_PATH.'ui.class.php'; |
|
710 | 710 | } |
711 | 711 | |
712 | 712 | |
@@ -718,7 +718,7 @@ discard block |
||
718 | 718 | public function Ui() |
719 | 719 | { |
720 | 720 | $this->includeUi(); |
721 | - return bab_getInstance($this->classPrefix . 'Ui');//->setApp($this); |
|
721 | + return bab_getInstance($this->classPrefix.'Ui'); //->setApp($this); |
|
722 | 722 | } |
723 | 723 | |
724 | 724 | /** |
@@ -746,29 +746,29 @@ discard block |
||
746 | 746 | |
747 | 747 | case substr($name, -strlen('SetClassName')) === 'SetClassName': |
748 | 748 | $setName = substr($name, 0, strlen($name) - strlen('ClassName')); |
749 | - return $this->classPrefix . $setName; |
|
749 | + return $this->classPrefix.$setName; |
|
750 | 750 | |
751 | 751 | case substr($name, -strlen('ClassName')) === 'ClassName': |
752 | 752 | $recordName = substr($name, 0, strlen($name) - strlen('ClassName')); |
753 | - return $this->classPrefix . $recordName; |
|
753 | + return $this->classPrefix.$recordName; |
|
754 | 754 | |
755 | 755 | case substr($name, 0, strlen('include')) === 'include' && substr($name, -strlen('Set')) === 'Set': |
756 | 756 | $fileNameBase = strtolower(substr(substr($name, 0, strlen($name) - strlen('Set')), strlen('include'))); |
757 | - require_once APP_SET_PATH . $fileNameBase . '.class.php'; |
|
757 | + require_once APP_SET_PATH.$fileNameBase.'.class.php'; |
|
758 | 758 | return; |
759 | 759 | |
760 | 760 | case substr($name, -strlen('Set')) === 'Set': |
761 | - $includeMethod = 'include' . $name; |
|
761 | + $includeMethod = 'include'.$name; |
|
762 | 762 | $this->$includeMethod(); |
763 | - $setClassNameMethod = $name . 'ClassName'; |
|
763 | + $setClassNameMethod = $name.'ClassName'; |
|
764 | 764 | $className = $this->$setClassNameMethod(); |
765 | 765 | $set = new $className($this); |
766 | 766 | return $set; |
767 | 767 | |
768 | 768 | //case method_exists($this, $name . 'Set'): |
769 | 769 | default: |
770 | - $setName = $name . 'Set'; |
|
771 | - $recordClassNameMethod = $name . 'ClassName'; |
|
770 | + $setName = $name.'Set'; |
|
771 | + $recordClassNameMethod = $name.'ClassName'; |
|
772 | 772 | $recordClassName = $this->$recordClassNameMethod(); |
773 | 773 | if (isset($arguments[0])) { |
774 | 774 | if ($arguments[0] instanceof $recordClassName) { |
@@ -94,7 +94,7 @@ |
||
94 | 94 | public function hasNoAccess(app_RecordSet $recordSet, $accessType, $user = null) |
95 | 95 | { |
96 | 96 | $criterion = $this->getAccessCriterion($recordSet, $accessType, $user); |
97 | - if (! $criterion instanceof ORM_FalseCriterion) { |
|
97 | + if (!$criterion instanceof ORM_FalseCriterion) { |
|
98 | 98 | return false; |
99 | 99 | } |
100 | 100 | return true; |
@@ -24,7 +24,7 @@ |
||
24 | 24 | |
25 | 25 | |
26 | 26 | |
27 | -require_once dirname(__FILE__). '/functions.php'; |
|
27 | +require_once dirname(__FILE__).'/functions.php'; |
|
28 | 28 | |
29 | 29 | |
30 | 30 | function LibApp_upgrade($sVersionBase, $sVersionIni) |