@@ -108,7 +108,9 @@ |
||
108 | 108 | break; |
109 | 109 | } |
110 | 110 | } |
111 | - if ($posy != 0 ) $poscursor['y'] = $posy; |
|
111 | + if ($posy != 0 ) { |
|
112 | + $poscursor['y'] = $posy; |
|
113 | + } |
|
112 | 114 | } |
113 | 115 | |
114 | 116 | // Define some properties |
@@ -441,8 +441,10 @@ |
||
441 | 441 | ); |
442 | 442 | if ($result > 0) { |
443 | 443 | $lineid = $result; |
444 | - if (!empty($createbills_onebythird)) //increment rang to keep sending |
|
444 | + if (!empty($createbills_onebythird)) { |
|
445 | + //increment rang to keep sending |
|
445 | 446 | $TFactThirdNbLines[$expd->socid]++; |
447 | + } |
|
446 | 448 | } else { |
447 | 449 | $lineid = 0; |
448 | 450 | $error++; |
@@ -1429,7 +1429,9 @@ |
||
1429 | 1429 | $deliverableQty = min($quantityToBeDelivered, $batchStock); |
1430 | 1430 | } |
1431 | 1431 | |
1432 | - if ($deliverableQty < 0) $deliverableQty = 0; |
|
1432 | + if ($deliverableQty < 0) { |
|
1433 | + $deliverableQty = 0; |
|
1434 | + } |
|
1433 | 1435 | |
1434 | 1436 | $inputName = 'qtyl'.$indiceAsked.'_'.$subj; |
1435 | 1437 | if (GETPOSTISSET($inputName)) { |
@@ -97,8 +97,9 @@ |
||
97 | 97 | $main_data_dir = $argv[4]; // override when executing the script in command line |
98 | 98 | } |
99 | 99 | // In mode 3 the main_url is custom |
100 | - if ($force_install_noedit != 3) |
|
101 | - $main_url = detect_dolibarr_main_url_root(); |
|
100 | + if ($force_install_noedit != 3) { |
|
101 | + $main_url = detect_dolibarr_main_url_root(); |
|
102 | + } |
|
102 | 103 | if (!empty($argv[5])) { |
103 | 104 | $main_url = $argv[5]; // override when executing the script in command line |
104 | 105 | } |
@@ -52,9 +52,11 @@ discard block |
||
52 | 52 | */ |
53 | 53 | public static function addPath($path) |
54 | 54 | { |
55 | - if (false === $path = stream_resolve_include_path($path)) |
|
56 | - return false; |
|
57 | - else set_include_path($path.PATH_SEPARATOR.get_include_path()); |
|
55 | + if (false === $path = stream_resolve_include_path($path)) { |
|
56 | + return false; |
|
57 | + } else { |
|
58 | + set_include_path($path.PATH_SEPARATOR.get_include_path()); |
|
59 | + } |
|
58 | 60 | return $path; |
59 | 61 | } |
60 | 62 | |
@@ -67,16 +69,19 @@ discard block |
||
67 | 69 | */ |
68 | 70 | public static function thereCanBeOnlyOne() |
69 | 71 | { |
70 | - if (static::$perfectLoaders === spl_autoload_functions()) |
|
71 | - return static::$instance; |
|
72 | + if (static::$perfectLoaders === spl_autoload_functions()) { |
|
73 | + return static::$instance; |
|
74 | + } |
|
72 | 75 | |
73 | - if (false !== $loaders = spl_autoload_functions()) |
|
74 | - if (0 < $count = count($loaders)) |
|
76 | + if (false !== $loaders = spl_autoload_functions()) { |
|
77 | + if (0 < $count = count($loaders)) |
|
75 | 78 | for ($i = 0, static::$rogueLoaders += $loaders; |
79 | + } |
|
76 | 80 | $i < $count && false != ($loader = $loaders[$i]); |
77 | - $i++) |
|
78 | - if ($loader !== static::$perfectLoaders[0]) |
|
81 | + $i++) { |
|
82 | + if ($loader !== static::$perfectLoaders[0]) |
|
79 | 83 | spl_autoload_unregister($loader); |
84 | + } |
|
80 | 85 | |
81 | 86 | return static::$instance; |
82 | 87 | } |
@@ -105,12 +110,14 @@ discard block |
||
105 | 110 | return false; |
106 | 111 | } |
107 | 112 | |
108 | - if (empty(static::$classMap[$key])) |
|
109 | - static::$classMap[$key] = $value; |
|
113 | + if (empty(static::$classMap[$key])) { |
|
114 | + static::$classMap[$key] = $value; |
|
115 | + } |
|
110 | 116 | |
111 | - if (is_string($alias = static::$classMap[$key])) |
|
112 | - if (isset(static::$classMap[$alias])) |
|
117 | + if (is_string($alias = static::$classMap[$key])) { |
|
118 | + if (isset(static::$classMap[$alias])) |
|
113 | 119 | return static::$classMap[$alias]; |
120 | + } |
|
114 | 121 | |
115 | 122 | return static::$classMap[$key]; |
116 | 123 | } |
@@ -138,8 +145,8 @@ discard block |
||
138 | 145 | array($dir, 'vendor', 'composer'), |
139 | 146 | array($dir, '..', '..', '..', 'php'), |
140 | 147 | array($dir, 'vendor', 'php')) |
141 | - as $includePath) |
|
142 | - if (false !== $path = stream_resolve_include_path( |
|
148 | + as $includePath) { |
|
149 | + if (false !== $path = stream_resolve_include_path( |
|
143 | 150 | implode($slash, $includePath) |
144 | 151 | )) |
145 | 152 | if ('composer' == end($includePath) && |
@@ -150,18 +157,22 @@ discard block |
||
150 | 157 | static::seen(static::loadFile( |
151 | 158 | $classmapPath |
152 | 159 | )); |
160 | + } |
|
153 | 161 | $paths = array_merge( |
154 | 162 | $paths, |
155 | 163 | array_values(static::loadFile( |
156 | 164 | "$path{$slash}autoload_namespaces.php" |
157 | 165 | )) |
158 | 166 | ); |
159 | - } else $paths[] = $path; |
|
167 | + } else { |
|
168 | + $paths[] = $path; |
|
169 | + } |
|
160 | 170 | |
161 | 171 | $paths = array_filter(array_map( |
162 | 172 | function ($path) { |
163 | - if (false == $realPath = @realpath($path)) |
|
164 | - return null; |
|
173 | + if (false == $realPath = @realpath($path)) { |
|
174 | + return null; |
|
175 | + } |
|
165 | 176 | return $realPath . DIRECTORY_SEPARATOR; |
166 | 177 | }, |
167 | 178 | $paths |
@@ -200,9 +211,11 @@ discard block |
||
200 | 211 | private function loadPrefixes($className) |
201 | 212 | { |
202 | 213 | $currentClass = $className; |
203 | - if (false !== $pos = strrpos($className, '\\')) |
|
204 | - $className = substr($className, $pos); |
|
205 | - else $className = "\\$className"; |
|
214 | + if (false !== $pos = strrpos($className, '\\')) { |
|
215 | + $className = substr($className, $pos); |
|
216 | + } else { |
|
217 | + $className = "\\$className"; |
|
218 | + } |
|
206 | 219 | |
207 | 220 | for ( |
208 | 221 | $i = 0, |
@@ -231,12 +244,13 @@ discard block |
||
231 | 244 | private function loadAliases($className) |
232 | 245 | { |
233 | 246 | $file = false; |
234 | - if (preg_match('/(.+)(\\\\\w+$)/U', $className, $parts)) |
|
235 | - for ( |
|
247 | + if (preg_match('/(.+)(\\\\\w+$)/U', $className, $parts)) { |
|
248 | + for ( |
|
236 | 249 | $i = 0, |
237 | 250 | $aliases = isset(static::$aliases[$parts[1]]) |
238 | 251 | ? static::$aliases[$parts[1]] : array(), |
239 | 252 | $count = count($aliases); |
253 | + } |
|
240 | 254 | $i < $count && false === $file; |
241 | 255 | $file = $this->discover( |
242 | 256 | "{$aliases[$i++]}$parts[2]", |
@@ -263,13 +277,15 @@ discard block |
||
263 | 277 | { |
264 | 278 | $loaders = array_unique(static::$rogueLoaders, SORT_REGULAR); |
265 | 279 | if (isset($loader)) { |
266 | - if (false === array_search($loader, $loaders)) |
|
267 | - static::$rogueLoaders[] = $loader; |
|
280 | + if (false === array_search($loader, $loaders)) { |
|
281 | + static::$rogueLoaders[] = $loader; |
|
282 | + } |
|
268 | 283 | return $this->loadThisLoader($className, $loader); |
269 | 284 | } |
270 | - foreach ($loaders as $loader) |
|
271 | - if (false !== $file = $this->loadThisLoader($className, $loader)) |
|
285 | + foreach ($loaders as $loader) { |
|
286 | + if (false !== $file = $this->loadThisLoader($className, $loader)) |
|
272 | 287 | return $file; |
288 | + } |
|
273 | 289 | |
274 | 290 | return false; |
275 | 291 | } |
@@ -342,13 +358,18 @@ discard block |
||
342 | 358 | */ |
343 | 359 | private function alias($className, $currentClass) |
344 | 360 | { |
345 | - if ($className == 'Luracast\Restler\string') return; |
|
346 | - if ($className == 'Luracast\Restler\mixed') return; |
|
361 | + if ($className == 'Luracast\Restler\string') { |
|
362 | + return; |
|
363 | + } |
|
364 | + if ($className == 'Luracast\Restler\mixed') { |
|
365 | + return; |
|
366 | + } |
|
347 | 367 | if ($className != $currentClass |
348 | - && false !== strpos($className, $currentClass)) |
|
349 | - if (!class_exists($currentClass, false) |
|
368 | + && false !== strpos($className, $currentClass)) { |
|
369 | + if (!class_exists($currentClass, false) |
|
350 | 370 | && class_alias($className, $currentClass)) |
351 | 371 | static::seen($currentClass, $className); |
372 | + } |
|
352 | 373 | } |
353 | 374 | |
354 | 375 | /** |
@@ -366,11 +387,12 @@ discard block |
||
366 | 387 | |
367 | 388 | /** The short version we've done this before and found it in cache */ |
368 | 389 | if (false !== $file = static::seen($className)) { |
369 | - if (!$this->exists($className)) |
|
370 | - if (is_callable($file)) |
|
390 | + if (!$this->exists($className)) { |
|
391 | + if (is_callable($file)) |
|
371 | 392 | $file = $this->loadLastResort($className, $file); |
372 | - elseif ($file = stream_resolve_include_path($file)) |
|
373 | - $file = static::loadFile($file); |
|
393 | + } elseif ($file = stream_resolve_include_path($file)) { |
|
394 | + $file = static::loadFile($file); |
|
395 | + } |
|
374 | 396 | |
375 | 397 | $this->alias($className, $currentClass); |
376 | 398 | return $file; |
@@ -380,15 +402,17 @@ discard block |
||
380 | 402 | |
381 | 403 | /** replace \ with / and _ in CLASS NAME with / = PSR-0 in 3 lines */ |
382 | 404 | $file = preg_replace("/\\\|_(?=\w+$)/", DIRECTORY_SEPARATOR, $className); |
383 | - if (false === $file = stream_resolve_include_path("$file.php")) |
|
384 | - return false; |
|
405 | + if (false === $file = stream_resolve_include_path("$file.php")) { |
|
406 | + return false; |
|
407 | + } |
|
385 | 408 | |
386 | 409 | /** have we loaded this file before could this be an alias */ |
387 | 410 | if (in_array($file, get_included_files())) { |
388 | - if (false !== $sameFile = array_search($file, static::$classMap)) |
|
389 | - if (!$this->exists($className, $file)) |
|
411 | + if (false !== $sameFile = array_search($file, static::$classMap)) { |
|
412 | + if (!$this->exists($className, $file)) |
|
390 | 413 | if (false !== strpos($sameFile, $className)) |
391 | 414 | $this->alias($sameFile, $className); |
415 | + } |
|
392 | 416 | |
393 | 417 | return $file; |
394 | 418 | } |
@@ -396,17 +420,19 @@ discard block |
||
396 | 420 | $state = array_merge(get_declared_classes(), get_declared_interfaces()); |
397 | 421 | |
398 | 422 | if (false !== $result = static::loadFile($file)) { |
399 | - if ($this->exists($className, $file)) |
|
400 | - $this->alias($className, $currentClass); |
|
401 | - elseif (false != $diff = array_diff( |
|
402 | - array_merge(get_declared_classes(), get_declared_interfaces()), $state)) |
|
403 | - foreach ($diff as $autoLoaded) |
|
423 | + if ($this->exists($className, $file)) { |
|
424 | + $this->alias($className, $currentClass); |
|
425 | + } elseif (false != $diff = array_diff( |
|
426 | + array_merge(get_declared_classes(), get_declared_interfaces()), $state)) { |
|
427 | + foreach ($diff as $autoLoaded) |
|
404 | 428 | if ($this->exists($autoLoaded, $file)) |
405 | 429 | if (false !== strpos($autoLoaded, $className)) |
406 | 430 | $this->alias($autoLoaded, $className); |
431 | + } |
|
407 | 432 | |
408 | - if (!$this->exists($currentClass)) |
|
409 | - $result = false; |
|
433 | + if (!$this->exists($currentClass)) { |
|
434 | + $result = false; |
|
435 | + } |
|
410 | 436 | } |
411 | 437 | |
412 | 438 | return $result; |
@@ -424,10 +450,12 @@ discard block |
||
424 | 450 | private function exists($className, $mapping = null) |
425 | 451 | { |
426 | 452 | if (class_exists($className, false) |
427 | - || interface_exists($className, false)) |
|
428 | - if (isset($mapping)) |
|
453 | + || interface_exists($className, false)) { |
|
454 | + if (isset($mapping)) |
|
429 | 455 | return static::seen($className, $mapping); |
430 | - else return true; |
|
456 | + } else { |
|
457 | + return true; |
|
458 | + } |
|
431 | 459 | return false; |
432 | 460 | } |
433 | 461 | |
@@ -440,23 +468,28 @@ discard block |
||
440 | 468 | */ |
441 | 469 | public function __invoke($className) |
442 | 470 | { |
443 | - if (empty($className)) |
|
444 | - return false; |
|
471 | + if (empty($className)) { |
|
472 | + return false; |
|
473 | + } |
|
445 | 474 | |
446 | - if (false !== $includeReference = $this->discover($className)) |
|
447 | - return $includeReference; |
|
475 | + if (false !== $includeReference = $this->discover($className)) { |
|
476 | + return $includeReference; |
|
477 | + } |
|
448 | 478 | |
449 | 479 | // @CHANGE LDR Reduce cases of conflicts with the messy autoload |
450 | 480 | //static::thereCanBeOnlyOne(); |
451 | 481 | |
452 | - if (false !== $includeReference = $this->loadAliases($className)) |
|
453 | - return $includeReference; |
|
482 | + if (false !== $includeReference = $this->loadAliases($className)) { |
|
483 | + return $includeReference; |
|
484 | + } |
|
454 | 485 | |
455 | - if (false !== $includeReference = $this->loadPrefixes($className)) |
|
456 | - return $includeReference; |
|
486 | + if (false !== $includeReference = $this->loadPrefixes($className)) { |
|
487 | + return $includeReference; |
|
488 | + } |
|
457 | 489 | |
458 | - if (false !== $includeReference = $this->loadLastResort($className)) |
|
459 | - return $includeReference; |
|
490 | + if (false !== $includeReference = $this->loadLastResort($className)) { |
|
491 | + return $includeReference; |
|
492 | + } |
|
460 | 493 | |
461 | 494 | static::seen($className, true); |
462 | 495 | return null; |
@@ -31,7 +31,9 @@ |
||
31 | 31 | $langs->load("admin"); |
32 | 32 | $langs->load("openidconnect"); |
33 | 33 | |
34 | -if (!$user->admin) accessforbidden(); |
|
34 | +if (!$user->admin) { |
|
35 | + accessforbidden(); |
|
36 | +} |
|
35 | 37 | |
36 | 38 | $action = GETPOST('action', 'alpha'); |
37 | 39 |
@@ -585,19 +585,23 @@ |
||
585 | 585 | $duration = $obj->duree; |
586 | 586 | $event['location'] = ($obj->socname ? $obj->socname : ""); |
587 | 587 | $event['summary'] = $obj->ref." - ". $obj->description; |
588 | - if ($obj->ref_client) |
|
589 | - $event['summary'].= " (".$obj->ref_client.")"; |
|
588 | + if ($obj->ref_client) { |
|
589 | + $event['summary'].= " (".$obj->ref_client.")"; |
|
590 | + } |
|
590 | 591 | |
591 | 592 | $event['desc'] = $obj->description; |
592 | 593 | |
593 | - if ($obj->ref_project) |
|
594 | - $event['desc'] .= " - ".$obj->ref_project; |
|
594 | + if ($obj->ref_project) { |
|
595 | + $event['desc'] .= " - ".$obj->ref_project; |
|
596 | + } |
|
595 | 597 | |
596 | - if ($obj->ref_contract) |
|
597 | - $event['desc'] .= " - ".$obj->ref_contract; |
|
598 | + if ($obj->ref_contract) { |
|
599 | + $event['desc'] .= " - ".$obj->ref_contract; |
|
600 | + } |
|
598 | 601 | |
599 | - if ($obj->note_public) |
|
600 | - $event['desc'].= " - ".$obj->note_public; |
|
602 | + if ($obj->note_public) { |
|
603 | + $event['desc'].= " - ".$obj->note_public; |
|
604 | + } |
|
601 | 605 | |
602 | 606 | $event['startdate'] = $datestart; |
603 | 607 | $event['enddate'] = ''; // $dateend; // Not required with type 'journal' |