@@ -58,6 +58,10 @@ |
||
58 | 58 | self::command('install', false, $path); |
59 | 59 | } |
60 | 60 | |
61 | + /** |
|
62 | + * @param string $command |
|
63 | + * @param string $path |
|
64 | + */ |
|
61 | 65 | static function command($command, $needOutput = true, $path = null) |
62 | 66 | { |
63 | 67 | include_once 'composer/vendor/autoload.php'; |
@@ -45,6 +45,10 @@ |
||
45 | 45 | return $modelCols; |
46 | 46 | } |
47 | 47 | |
48 | + /** |
|
49 | + * @param string $colPrefix |
|
50 | + * @param string $tableName |
|
51 | + */ |
|
48 | 52 | function parseColsForTable($cols, $colPrefix, $tableName) |
49 | 53 | { |
50 | 54 |
@@ -23,6 +23,9 @@ |
||
23 | 23 | public $attributes = []; |
24 | 24 | public $indexCol = null; |
25 | 25 | |
26 | + /** |
|
27 | + * @param string[] $cols |
|
28 | + */ |
|
26 | 29 | function setCols($cols) |
27 | 30 | { |
28 | 31 | $this->cols = $cols; |
@@ -147,6 +147,9 @@ discard block |
||
147 | 147 | return $result[1]; |
148 | 148 | } |
149 | 149 | |
150 | + /** |
|
151 | + * @param string $source |
|
152 | + */ |
|
150 | 153 | function parseSource($source) |
151 | 154 | { |
152 | 155 | $tags = $this->parseRaw($source); |
@@ -190,6 +193,9 @@ discard block |
||
190 | 193 | return substr($source, ( $pos + strlen($rawTag) + 2)); |
191 | 194 | } |
192 | 195 | |
196 | + /** |
|
197 | + * @param string $type |
|
198 | + */ |
|
193 | 199 | function getHref($type, $params) |
194 | 200 | { |
195 | 201 | $href = ''; |
@@ -531,6 +537,9 @@ discard block |
||
531 | 537 | echo round(( microtime(true) - INJI_TIME_START), 4); |
532 | 538 | } |
533 | 539 | |
540 | + /** |
|
541 | + * @param string $type |
|
542 | + */ |
|
534 | 543 | function customAsset($type, $asset, $lib = false) |
535 | 544 | { |
536 | 545 | if (!$lib) { |
@@ -549,6 +558,9 @@ discard block |
||
549 | 558 | } |
550 | 559 | } |
551 | 560 | |
561 | + /** |
|
562 | + * @param string $lineParams |
|
563 | + */ |
|
552 | 564 | function widget($_widgetName, $_params = [], $lineParams = null) |
553 | 565 | { |
554 | 566 | $_paths = $this->getWidgetPaths($_widgetName); |
@@ -140,8 +140,9 @@ discard block |
||
140 | 140 | |
141 | 141 | private function parseRaw($source) |
142 | 142 | { |
143 | - if (!$source) |
|
144 | - return []; |
|
143 | + if (!$source) { |
|
144 | + return []; |
|
145 | + } |
|
145 | 146 | |
146 | 147 | preg_match_all("|{([^}]+)}|", $source, $result); |
147 | 148 | return $result[1]; |
@@ -327,10 +328,11 @@ discard block |
||
327 | 328 | $this->ResolveCssHref($css, $type, $hrefs); |
328 | 329 | continue; |
329 | 330 | } |
330 | - if (strpos($css, '//') !== false) |
|
331 | - $href = $css; |
|
332 | - else |
|
333 | - $href = ($this->app->type != 'app' ? '/' . $this->app->name : '' ) . $css; |
|
331 | + if (strpos($css, '//') !== false) { |
|
332 | + $href = $css; |
|
333 | + } else { |
|
334 | + $href = ($this->app->type != 'app' ? '/' . $this->app->name : '' ) . $css; |
|
335 | + } |
|
334 | 336 | $hrefs[$href] = $href; |
335 | 337 | } |
336 | 338 | break; |
@@ -340,10 +342,11 @@ discard block |
||
340 | 342 | $this->ResolveCssHref($css, $type, $hrefs); |
341 | 343 | continue; |
342 | 344 | } |
343 | - if (strpos($css, '://') !== false) |
|
344 | - $href = $css; |
|
345 | - else |
|
346 | - $href = $this->app->templatesPath . "/{$this->template->name}/css/{$css}"; |
|
345 | + if (strpos($css, '://') !== false) { |
|
346 | + $href = $css; |
|
347 | + } else { |
|
348 | + $href = $this->app->templatesPath . "/{$this->template->name}/css/{$css}"; |
|
349 | + } |
|
347 | 350 | $hrefs[$href] = $href; |
348 | 351 | } |
349 | 352 | break; |
@@ -353,10 +356,11 @@ discard block |
||
353 | 356 | $this->ResolveCssHref($css, $type, $hrefs); |
354 | 357 | continue; |
355 | 358 | } |
356 | - if (strpos($css, '//') !== false) |
|
357 | - $href = $css; |
|
358 | - else |
|
359 | - $href = ($this->app->type != 'app' ? '/' . $this->app->name : '' ) . $css; |
|
359 | + if (strpos($css, '//') !== false) { |
|
360 | + $href = $css; |
|
361 | + } else { |
|
362 | + $href = ($this->app->type != 'app' ? '/' . $this->app->name : '' ) . $css; |
|
363 | + } |
|
360 | 364 | $hrefs[$href] = $href; |
361 | 365 | } |
362 | 366 | break; |
@@ -410,8 +414,9 @@ discard block |
||
410 | 414 | $noParsedScripts = []; |
411 | 415 | foreach ($scripts as $script) { |
412 | 416 | if (is_string($script)) { |
413 | - if (!empty($urls[$script])) |
|
414 | - continue; |
|
417 | + if (!empty($urls[$script])) { |
|
418 | + continue; |
|
419 | + } |
|
415 | 420 | |
416 | 421 | $path = $this->app->staticLoader->parsePath($script); |
417 | 422 | if (file_exists($path)) { |
@@ -422,8 +427,9 @@ discard block |
||
422 | 427 | $noParsedScripts[$script] = $script; |
423 | 428 | } |
424 | 429 | } elseif (!empty($script['file'])) { |
425 | - if (!empty($urls[$script['file']])) |
|
426 | - continue; |
|
430 | + if (!empty($urls[$script['file']])) { |
|
431 | + continue; |
|
432 | + } |
|
427 | 433 | |
428 | 434 | $path = $this->app->staticLoader->parsePath($script['file']); |
429 | 435 | if (file_exists($path)) { |
@@ -482,12 +488,14 @@ discard block |
||
482 | 488 | $this->genScriptArray($js, $type, $resultArray); |
483 | 489 | continue; |
484 | 490 | } |
485 | - if (strpos($js, '//') !== false) |
|
486 | - $href = $js; |
|
487 | - else |
|
488 | - $href = $this->getHref('js', $js); |
|
489 | - if (!$href) |
|
490 | - continue; |
|
491 | + if (strpos($js, '//') !== false) { |
|
492 | + $href = $js; |
|
493 | + } else { |
|
494 | + $href = $this->getHref('js', $js); |
|
495 | + } |
|
496 | + if (!$href) { |
|
497 | + continue; |
|
498 | + } |
|
491 | 499 | |
492 | 500 | $resultArray[] = $href; |
493 | 501 | } |
@@ -498,10 +506,11 @@ discard block |
||
498 | 506 | $this->genScriptArray($js, $type, $resultArray); |
499 | 507 | continue; |
500 | 508 | } |
501 | - if (strpos($js, '//') !== false) |
|
502 | - $href = $js; |
|
503 | - else |
|
504 | - $href = $this->app->templatesPath . "/{$this->template->name}/js/{$js}"; |
|
509 | + if (strpos($js, '//') !== false) { |
|
510 | + $href = $js; |
|
511 | + } else { |
|
512 | + $href = $this->app->templatesPath . "/{$this->template->name}/js/{$js}"; |
|
513 | + } |
|
505 | 514 | $resultArray[] = $href; |
506 | 515 | } |
507 | 516 | break; |
@@ -517,8 +526,9 @@ discard block |
||
517 | 526 | $asset = []; |
518 | 527 | } |
519 | 528 | $asset['file'] = $this->getHref('js', $js); |
520 | - if (!$asset['file']) |
|
521 | - continue; |
|
529 | + if (!$asset['file']) { |
|
530 | + continue; |
|
531 | + } |
|
522 | 532 | $resultArray[] = $asset; |
523 | 533 | } |
524 | 534 | break; |
@@ -568,8 +578,9 @@ discard block |
||
568 | 578 | $paramArray = true; |
569 | 579 | } |
570 | 580 | } |
571 | - if (!$paramArray) |
|
572 | - $lineParams = ':' . implode(':', $_params); |
|
581 | + if (!$paramArray) { |
|
582 | + $lineParams = ':' . implode(':', $_params); |
|
583 | + } |
|
573 | 584 | } |
574 | 585 | } |
575 | 586 | echo "<!--start:{WIDGET:{$_widgetName}{$lineParams}}-->\n"; |
@@ -31,6 +31,9 @@ |
||
31 | 31 | return $return; |
32 | 32 | } |
33 | 33 | |
34 | + /** |
|
35 | + * @param string $path |
|
36 | + */ |
|
34 | 37 | static function parseClass($path) |
35 | 38 | { |
36 | 39 | $code = file_get_contents($path); |
@@ -13,20 +13,22 @@ |
||
13 | 13 | static function genArray($data, $level = 0) |
14 | 14 | { |
15 | 15 | $return = ''; |
16 | - if ($level == 0) |
|
17 | - $return = "["; |
|
16 | + if ($level == 0) { |
|
17 | + $return = "["; |
|
18 | + } |
|
18 | 19 | foreach ($data as $key => $item) { |
19 | 20 | $return .= "\n" . str_repeat(' ', ( $level * 4 + 4)) . "'{$key}' => "; |
20 | - if (!is_array($item)) |
|
21 | - $return .= "'{$item}',"; |
|
22 | - else { |
|
21 | + if (!is_array($item)) { |
|
22 | + $return .= "'{$item}',"; |
|
23 | + } else { |
|
23 | 24 | $return .= "["; |
24 | 25 | $return .= rtrim(self::genArray($item, $level + 1), ','); |
25 | 26 | $return .= "\n" . str_repeat(' ', ( $level * 4 + 4)) . "],"; |
26 | 27 | } |
27 | 28 | } |
28 | - if ($level == 0) |
|
29 | - $return = rtrim($return, ',') . "\n];"; |
|
29 | + if ($level == 0) { |
|
30 | + $return = rtrim($return, ',') . "\n];"; |
|
31 | + } |
|
30 | 32 | |
31 | 33 | return $return; |
32 | 34 | } |
@@ -79,10 +79,12 @@ discard block |
||
79 | 79 | if (!empty($log['status'])) { |
80 | 80 | echo "<tr class = '{$log['status']}'><td>{$log['name']}</td><td>{$log['status']}</td></tr>"; |
81 | 81 | } else { |
82 | - if (empty($log['end'])) |
|
83 | - $log['end'] = microtime(true); |
|
84 | - if (empty($log['start'])) |
|
85 | - $log['start'] = microtime(true); |
|
82 | + if (empty($log['end'])) { |
|
83 | + $log['end'] = microtime(true); |
|
84 | + } |
|
85 | + if (empty($log['start'])) { |
|
86 | + $log['start'] = microtime(true); |
|
87 | + } |
|
86 | 88 | echo "<tr><td>{$log['name']}</td><td" . (round(($log['end'] - $log['start']), 5) > 0.1 ? ' class ="danger"' : '') . ">" . round(($log['end'] - $log['start']), 5) . "</td></tr>"; |
87 | 89 | } |
88 | 90 | } |
@@ -93,12 +95,13 @@ discard block |
||
93 | 95 | function convertSize($size) |
94 | 96 | { |
95 | 97 | |
96 | - if ($size < 1024) |
|
97 | - return $size . "B"; |
|
98 | - elseif ($size < 1048576) |
|
99 | - return round($size / 1024, 2) . "KB"; |
|
100 | - else |
|
101 | - return round($size / 1048576, 2) . "MB"; |
|
98 | + if ($size < 1024) { |
|
99 | + return $size . "B"; |
|
100 | + } elseif ($size < 1048576) { |
|
101 | + return round($size / 1024, 2) . "KB"; |
|
102 | + } else { |
|
103 | + return round($size / 1048576, 2) . "MB"; |
|
104 | + } |
|
102 | 105 | } |
103 | 106 | |
104 | 107 | function __destruct() |
@@ -52,8 +52,9 @@ |
||
52 | 52 | */ |
53 | 53 | static function get($clean = false) |
54 | 54 | { |
55 | - if (empty($_SESSION['_INJI_MSG'])) |
|
56 | - return []; |
|
55 | + if (empty($_SESSION['_INJI_MSG'])) { |
|
56 | + return []; |
|
57 | + } |
|
57 | 58 | $msgs = $_SESSION['_INJI_MSG']; |
58 | 59 | if ($clean) { |
59 | 60 | $_SESSION['_INJI_MSG'] = []; |
@@ -15,8 +15,9 @@ discard block |
||
15 | 15 | if (!$app) { |
16 | 16 | $app = $this->app->type; |
17 | 17 | } |
18 | - if (!empty($this->config['access']['accessTree'][$app]['deniedUrl'])) |
|
19 | - return $this->config['access']['accessTree'][$app]['deniedUrl']; |
|
18 | + if (!empty($this->config['access']['accessTree'][$app]['deniedUrl'])) { |
|
19 | + return $this->config['access']['accessTree'][$app]['deniedUrl']; |
|
20 | + } |
|
20 | 21 | |
21 | 22 | return '/'; |
22 | 23 | } |
@@ -50,8 +51,9 @@ discard block |
||
50 | 51 | return true; |
51 | 52 | } |
52 | 53 | |
53 | - if ((!$user->group_id && !empty($access)) || ($user->group_id && !empty($access) && !in_array($user->group_id, $access))) |
|
54 | - return false; |
|
54 | + if ((!$user->group_id && !empty($access)) || ($user->group_id && !empty($access) && !in_array($user->group_id, $access))) { |
|
55 | + return false; |
|
56 | + } |
|
55 | 57 | |
56 | 58 | return true; |
57 | 59 | } |
@@ -16,8 +16,9 @@ |
||
16 | 16 | $param = isset($this->config['default']) ? $this->config['default'] : 'local'; |
17 | 17 | } |
18 | 18 | if (!is_array($param)) { |
19 | - if (!($dbOption = Db\Options::get($param, 'connect_alias', ['array' => true]))) |
|
20 | - return false; |
|
19 | + if (!($dbOption = Db\Options::get($param, 'connect_alias', ['array' => true]))) { |
|
20 | + return false; |
|
21 | + } |
|
21 | 22 | |
22 | 23 | $db = $dbOption; |
23 | 24 | } else { |