@@ -12,7 +12,7 @@ |
||
12 | 12 | |
13 | 13 | # Check auth |
14 | 14 | |
15 | - if (Modules\Auth::check()) Request::redirect(INSTALL_PATH . '/profile'); |
|
15 | + if (Modules\Auth::check()) Request::redirect(INSTALL_PATH.'/profile'); |
|
16 | 16 | |
17 | 17 | # Handle request |
18 | 18 |
@@ -12,11 +12,15 @@ |
||
12 | 12 | |
13 | 13 | # Check auth |
14 | 14 | |
15 | - if (Modules\Auth::check()) Request::redirect(INSTALL_PATH . '/profile'); |
|
15 | + if (Modules\Auth::check()) { |
|
16 | + Request::redirect(INSTALL_PATH . '/profile'); |
|
17 | + } |
|
16 | 18 | |
17 | 19 | # Handle request |
18 | 20 | |
19 | - if (Template::isBlock($result = $this->handle())) return $this->displayPage($result, STATUS_CODE_401); |
|
21 | + if (Template::isBlock($result = $this->handle())) { |
|
22 | + return $this->displayPage($result, STATUS_CODE_401); |
|
23 | + } |
|
20 | 24 | |
21 | 25 | # ------------------------ |
22 | 26 |
@@ -14,7 +14,7 @@ |
||
14 | 14 | |
15 | 15 | if (!Modules\Auth::check() || ((false !== Request::get('logout')) && Modules\Auth::logout())) { |
16 | 16 | |
17 | - Request::redirect(INSTALL_PATH . '/profile/login'); |
|
17 | + Request::redirect(INSTALL_PATH.'/profile/login'); |
|
18 | 18 | } |
19 | 19 | |
20 | 20 | # Handle request |
@@ -19,9 +19,13 @@ |
||
19 | 19 | |
20 | 20 | # Handle request |
21 | 21 | |
22 | - if (Template::isBlock($result = $this->handle())) return $this->displayPage($result, STATUS_CODE_200); |
|
22 | + if (Template::isBlock($result = $this->handle())) { |
|
23 | + return $this->displayPage($result, STATUS_CODE_200); |
|
24 | + } |
|
23 | 25 | |
24 | - if (Ajax::isResponse($result)) return Ajax::output($result); |
|
26 | + if (Ajax::isResponse($result)) { |
|
27 | + return Ajax::output($result); |
|
28 | + } |
|
25 | 29 | |
26 | 30 | # ------------------------ |
27 | 31 |
@@ -12,7 +12,11 @@ discard block |
||
12 | 12 | |
13 | 13 | $text = Language::get($code); |
14 | 14 | |
15 | - if (!$popup) Messages::set('error', $text); else Popup::set('negative', $text); |
|
15 | + if (!$popup) { |
|
16 | + Messages::set('error', $text); |
|
17 | + } else { |
|
18 | + Popup::set('negative', $text); |
|
19 | + } |
|
16 | 20 | |
17 | 21 | # ------------------------ |
18 | 22 | |
@@ -23,15 +27,21 @@ discard block |
||
23 | 27 | |
24 | 28 | public function handle(callable $callback, bool $popup = false) { |
25 | 29 | |
26 | - if (false === ($post = $this->post())) return false; |
|
30 | + if (false === ($post = $this->post())) { |
|
31 | + return false; |
|
32 | + } |
|
27 | 33 | |
28 | 34 | # Check form for errors |
29 | 35 | |
30 | - if ($this->hasErrors()) return $this->displayError('FORM_ERROR_REQUIRED', $popup); |
|
36 | + if ($this->hasErrors()) { |
|
37 | + return $this->displayError('FORM_ERROR_REQUIRED', $popup); |
|
38 | + } |
|
31 | 39 | |
32 | 40 | # Call controller method |
33 | 41 | |
34 | - if (is_string($result = $callback($post))) return $this->displayError($result, $popup); |
|
42 | + if (is_string($result = $callback($post))) { |
|
43 | + return $this->displayError($result, $popup); |
|
44 | + } |
|
35 | 45 | |
36 | 46 | if (is_array($result)) { $this->getField($result[0])->error = true; return $this->displayError($result[1], $popup); } |
37 | 47 |
@@ -10,7 +10,7 @@ |
||
10 | 10 | |
11 | 11 | public static function get(string $name) { |
12 | 12 | |
13 | - $class_name = ('Schemas\\' . $name); |
|
13 | + $class_name = ('Schemas\\'.$name); |
|
14 | 14 | |
15 | 15 | if (!isset(self::$cache[$class_name])) self::$cache[$class_name] = new $class_name; |
16 | 16 |
@@ -12,7 +12,9 @@ |
||
12 | 12 | |
13 | 13 | $class_name = ('Schemas\\' . $name); |
14 | 14 | |
15 | - if (!isset(self::$cache[$class_name])) self::$cache[$class_name] = new $class_name; |
|
15 | + if (!isset(self::$cache[$class_name])) { |
|
16 | + self::$cache[$class_name] = new $class_name; |
|
17 | + } |
|
16 | 18 | |
17 | 19 | # ------------------------ |
18 | 20 |
@@ -14,7 +14,9 @@ |
||
14 | 14 | |
15 | 15 | $selection = ['name', 'value']; $order = ['name' => 'ASC']; |
16 | 16 | |
17 | - if (!(DB::select(TABLE_VARIABLES, $selection, null, $order) && DB::getLast()->status)) return; |
|
17 | + if (!(DB::select(TABLE_VARIABLES, $selection, null, $order) && DB::getLast()->status)) { |
|
18 | + return; |
|
19 | + } |
|
18 | 20 | |
19 | 21 | # Process results |
20 | 22 |
@@ -14,7 +14,9 @@ |
||
14 | 14 | |
15 | 15 | $selection = ['name', 'contents']; $condition = ['active' => 1]; $order = ['name' => 'ASC']; |
16 | 16 | |
17 | - if (!(DB::select(TABLE_WIDGETS, $selection, $condition, $order) && DB::getLast()->status)) return; |
|
17 | + if (!(DB::select(TABLE_WIDGETS, $selection, $condition, $order) && DB::getLast()->status)) { |
|
18 | + return; |
|
19 | + } |
|
18 | 20 | |
19 | 21 | # Process results |
20 | 22 |
@@ -20,7 +20,9 @@ discard block |
||
20 | 20 | |
21 | 21 | $item->children = ($children = Template::createBlock()); |
22 | 22 | |
23 | - foreach ($this->menu[$id]['children'] as $child) $children->addItem($this->parseItem($child)); |
|
23 | + foreach ($this->menu[$id]['children'] as $child) { |
|
24 | + $children->addItem($this->parseItem($child)); |
|
25 | + } |
|
24 | 26 | |
25 | 27 | } else { |
26 | 28 | |
@@ -44,7 +46,9 @@ discard block |
||
44 | 46 | |
45 | 47 | $menu = Entitizer::treeview(TABLE_MENU)->subtree(0, ['active' => true]); |
46 | 48 | |
47 | - if (false !== $menu) $this->menu = $menu; |
|
49 | + if (false !== $menu) { |
|
50 | + $this->menu = $menu; |
|
51 | + } |
|
48 | 52 | } |
49 | 53 | |
50 | 54 | # Get block |
@@ -53,7 +57,9 @@ discard block |
||
53 | 57 | |
54 | 58 | $menu = Template::createBlock(); |
55 | 59 | |
56 | - foreach ($this->menu[0]['children'] as $id) $menu->addItem($this->parseItem($id)); |
|
60 | + foreach ($this->menu[0]['children'] as $id) { |
|
61 | + $menu->addItem($this->parseItem($id)); |
|
62 | + } |
|
57 | 63 | |
58 | 64 | # ------------------------ |
59 | 65 |
@@ -58,7 +58,7 @@ |
||
58 | 58 | |
59 | 59 | list ($extremum, $index) = $data; $block = $pagination->getBlock($class); |
60 | 60 | |
61 | - if ($active === $extremum) { $block->disable(); $pagination->getBlock($class . '_disabled')->enable(); } |
|
61 | + if ($active === $extremum) { $block->disable(); $pagination->getBlock($class.'_disabled')->enable(); } |
|
62 | 62 | |
63 | 63 | else $block->link = $url->setAttribute('index', $index)->getString(); |
64 | 64 | } |
@@ -14,7 +14,9 @@ discard block |
||
14 | 14 | |
15 | 15 | for ($index = ($active - 2); $index <= ($active + 2); $index++) { |
16 | 16 | |
17 | - if (!($index > 0 && $index <= $count)) continue; |
|
17 | + if (!($index > 0 && $index <= $count)) { |
|
18 | + continue; |
|
19 | + } |
|
18 | 20 | |
19 | 21 | $class = (($index === $active) ? 'active item' : 'item'); |
20 | 22 | |
@@ -41,7 +43,9 @@ discard block |
||
41 | 43 | |
42 | 44 | $block->link = $url->setAttribute('index', $index)->getString(); $block->index = $index; |
43 | 45 | |
44 | - if ($closest) $block->getBlock('ellipsis')->disable(); |
|
46 | + if ($closest) { |
|
47 | + $block->getBlock('ellipsis')->disable(); |
|
48 | + } |
|
45 | 49 | } |
46 | 50 | } |
47 | 51 | |
@@ -58,9 +62,9 @@ discard block |
||
58 | 62 | |
59 | 63 | list ($extremum, $index) = $data; $block = $pagination->getBlock($class); |
60 | 64 | |
61 | - if ($active === $extremum) { $block->disable(); $pagination->getBlock($class . '_disabled')->enable(); } |
|
62 | - |
|
63 | - else $block->link = $url->setAttribute('index', $index)->getString(); |
|
65 | + if ($active === $extremum) { $block->disable(); $pagination->getBlock($class . '_disabled')->enable(); } else { |
|
66 | + $block->link = $url->setAttribute('index', $index)->getString(); |
|
67 | + } |
|
64 | 68 | } |
65 | 69 | } |
66 | 70 | |
@@ -68,9 +72,13 @@ discard block |
||
68 | 72 | |
69 | 73 | public static function block(int $index, int $display, int $total, Url $url) { |
70 | 74 | |
71 | - if (($index <= 0) || ($display <= 0) || ($total <= 0)) return false; |
|
75 | + if (($index <= 0) || ($display <= 0) || ($total <= 0)) { |
|
76 | + return false; |
|
77 | + } |
|
72 | 78 | |
73 | - if (($display >= $total) || ($index > ($count = ceil($total / $display)))) return false; |
|
79 | + if (($display >= $total) || ($index > ($count = ceil($total / $display)))) { |
|
80 | + return false; |
|
81 | + } |
|
74 | 82 | |
75 | 83 | # Create block |
76 | 84 |
@@ -21,7 +21,9 @@ discard block |
||
21 | 21 | |
22 | 22 | public static function set(string $type, string $text, string $title = null) { |
23 | 23 | |
24 | - if (!in_array($type, static::$types, true) || isset(static::$items[$type]) || ('' === $text)) return; |
|
24 | + if (!in_array($type, static::$types, true) || isset(static::$items[$type]) || ('' === $text)) { |
|
25 | + return; |
|
26 | + } |
|
25 | 27 | |
26 | 28 | static::$items[$type] = ['text' => $text, 'title' => (('' !== $title) ? $title : null)]; |
27 | 29 | } |
@@ -45,7 +47,9 @@ discard block |
||
45 | 47 | |
46 | 48 | $block->type = $type; $block->text = Template::createBlock($item['text']); |
47 | 49 | |
48 | - if (isset($item['title'])) $block->getBlock('title')->set('text', $item['title'])->enable(); |
|
50 | + if (isset($item['title'])) { |
|
51 | + $block->getBlock('title')->set('text', $item['title'])->enable(); |
|
52 | + } |
|
49 | 53 | } |
50 | 54 | |
51 | 55 | # ------------------------ |