@@ -21,7 +21,7 @@ |
||
21 | 21 | |
22 | 22 | if (false === ($path = Extend\Templates::path())) throw new Exception\View; |
23 | 23 | |
24 | - if (!isset(self::$cache[$file_name = ($path . $name . '.tpl')])) { |
|
24 | + if (!isset(self::$cache[$file_name = ($path.$name.'.tpl')])) { |
|
25 | 25 | |
26 | 26 | if (false === ($contents = Explorer::getContents($file_name))) throw new Exception\ViewFile($file_name); |
27 | 27 |
@@ -19,11 +19,15 @@ |
||
19 | 19 | |
20 | 20 | public static function get(string $name) { |
21 | 21 | |
22 | - if (false === ($path = Extend\Templates::path())) throw new Exception\View; |
|
22 | + if (false === ($path = Extend\Templates::path())) { |
|
23 | + throw new Exception\View; |
|
24 | + } |
|
23 | 25 | |
24 | 26 | if (!isset(self::$cache[$file_name = ($path . $name . '.tpl')])) { |
25 | 27 | |
26 | - if (false === ($contents = Explorer::getContents($file_name))) throw new Exception\ViewFile($file_name); |
|
28 | + if (false === ($contents = Explorer::getContents($file_name))) { |
|
29 | + throw new Exception\ViewFile($file_name); |
|
30 | + } |
|
27 | 31 | |
28 | 32 | self::$cache[$file_name] = Template::createBlock($contents); |
29 | 33 | } |
@@ -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 | # ------------------------ |
@@ -8,13 +8,17 @@ |
||
8 | 8 | |
9 | 9 | public function validate($data) { |
10 | 10 | |
11 | - if (!is_array($data)) return null; |
|
11 | + if (!is_array($data)) { |
|
12 | + return null; |
|
13 | + } |
|
12 | 14 | |
13 | 15 | $result = []; |
14 | 16 | |
15 | 17 | foreach ($data as $item) { |
16 | 18 | |
17 | - if (!is_array($item) || (null === ($item = parent::validate($item)))) return null; |
|
19 | + if (!is_array($item) || (null === ($item = parent::validate($item)))) { |
|
20 | + return null; |
|
21 | + } |
|
18 | 22 | |
19 | 23 | $result[] = $item; |
20 | 24 | } |
@@ -75,7 +75,7 @@ discard block |
||
75 | 75 | |
76 | 76 | if ('' === static::$file_name) return null; |
77 | 77 | |
78 | - $file_name = (DIR_SYSTEM_DATA . static::$file_name); |
|
78 | + $file_name = (DIR_SYSTEM_DATA.static::$file_name); |
|
79 | 79 | |
80 | 80 | if (null === ($data = JSON::load($file_name))) return null; |
81 | 81 | |
@@ -92,7 +92,7 @@ discard block |
||
92 | 92 | |
93 | 93 | if ('' === static::$file_name) return false; |
94 | 94 | |
95 | - $file_name = (DIR_SYSTEM_DATA . static::$file_name); |
|
95 | + $file_name = (DIR_SYSTEM_DATA.static::$file_name); |
|
96 | 96 | |
97 | 97 | if (null === ($data = $this->validate($data))) return false; |
98 | 98 |
@@ -18,48 +18,62 @@ discard block |
||
18 | 18 | |
19 | 19 | protected function addArray(string $name) { |
20 | 20 | |
21 | - if ('' !== $name) return $this->properties[$name] = new _Array; |
|
21 | + if ('' !== $name) { |
|
22 | + return $this->properties[$name] = new _Array; |
|
23 | + } |
|
22 | 24 | } |
23 | 25 | |
24 | 26 | # Add boolean property |
25 | 27 | |
26 | 28 | protected function addBoolean(string $name) { |
27 | 29 | |
28 | - if ('' !== $name) return $this->properties[$name] = new _Boolean; |
|
30 | + if ('' !== $name) { |
|
31 | + return $this->properties[$name] = new _Boolean; |
|
32 | + } |
|
29 | 33 | } |
30 | 34 | |
31 | 35 | # Add integer property |
32 | 36 | |
33 | 37 | protected function addInteger(string $name) { |
34 | 38 | |
35 | - if ('' !== $name) return $this->properties[$name] = new _Integer; |
|
39 | + if ('' !== $name) { |
|
40 | + return $this->properties[$name] = new _Integer; |
|
41 | + } |
|
36 | 42 | } |
37 | 43 | |
38 | 44 | # Add object property |
39 | 45 | |
40 | 46 | protected function addObject(string $name) { |
41 | 47 | |
42 | - if ('' !== $name) return $this->properties[$name] = new _Object; |
|
48 | + if ('' !== $name) { |
|
49 | + return $this->properties[$name] = new _Object; |
|
50 | + } |
|
43 | 51 | } |
44 | 52 | |
45 | 53 | # Add string property |
46 | 54 | |
47 | 55 | protected function addString(string $name) { |
48 | 56 | |
49 | - if ('' !== $name) return $this->properties[$name] = new _String; |
|
57 | + if ('' !== $name) { |
|
58 | + return $this->properties[$name] = new _String; |
|
59 | + } |
|
50 | 60 | } |
51 | 61 | |
52 | 62 | # Validate data |
53 | 63 | |
54 | 64 | public function validate($data) { |
55 | 65 | |
56 | - if (!is_array($data)) return null; |
|
66 | + if (!is_array($data)) { |
|
67 | + return null; |
|
68 | + } |
|
57 | 69 | |
58 | 70 | $result = []; |
59 | 71 | |
60 | 72 | foreach ($this->properties as $name => $property) { |
61 | 73 | |
62 | - if (!isset($data[$name]) || (null === ($value = $property->validate($data[$name])))) return null; |
|
74 | + if (!isset($data[$name]) || (null === ($value = $property->validate($data[$name])))) { |
|
75 | + return null; |
|
76 | + } |
|
63 | 77 | |
64 | 78 | $result[$name] = $value; |
65 | 79 | } |
@@ -73,13 +87,19 @@ discard block |
||
73 | 87 | |
74 | 88 | public function load() { |
75 | 89 | |
76 | - if ('' === static::$file_name) return null; |
|
90 | + if ('' === static::$file_name) { |
|
91 | + return null; |
|
92 | + } |
|
77 | 93 | |
78 | 94 | $file_name = (DIR_SYSTEM_DATA . static::$file_name); |
79 | 95 | |
80 | - if (null === ($data = JSON::load($file_name))) return null; |
|
96 | + if (null === ($data = JSON::load($file_name))) { |
|
97 | + return null; |
|
98 | + } |
|
81 | 99 | |
82 | - if (null === ($data = $this->validate($data))) return null; |
|
100 | + if (null === ($data = $this->validate($data))) { |
|
101 | + return null; |
|
102 | + } |
|
83 | 103 | |
84 | 104 | # ------------------------ |
85 | 105 | |
@@ -90,13 +110,19 @@ discard block |
||
90 | 110 | |
91 | 111 | public function save(array $data) { |
92 | 112 | |
93 | - if ('' === static::$file_name) return false; |
|
113 | + if ('' === static::$file_name) { |
|
114 | + return false; |
|
115 | + } |
|
94 | 116 | |
95 | 117 | $file_name = (DIR_SYSTEM_DATA . static::$file_name); |
96 | 118 | |
97 | - if (null === ($data = $this->validate($data))) return false; |
|
119 | + if (null === ($data = $this->validate($data))) { |
|
120 | + return false; |
|
121 | + } |
|
98 | 122 | |
99 | - if (false === JSON::save($file_name, $data)) return false; |
|
123 | + if (false === JSON::save($file_name, $data)) { |
|
124 | + return false; |
|
125 | + } |
|
100 | 126 | |
101 | 127 | # ------------------------ |
102 | 128 |
@@ -17,7 +17,9 @@ discard block |
||
17 | 17 | |
18 | 18 | public static function title(string $value = null) { |
19 | 19 | |
20 | - if (null === $value) return (self::$data['title'] ?? ''); |
|
20 | + if (null === $value) { |
|
21 | + return (self::$data['title'] ?? ''); |
|
22 | + } |
|
21 | 23 | |
22 | 24 | self::$data['title'] = $value; |
23 | 25 | } |
@@ -26,7 +28,9 @@ discard block |
||
26 | 28 | |
27 | 29 | public static function description(string $value = null) { |
28 | 30 | |
29 | - if (null === $value) return (self::$data['description'] ?? ''); |
|
31 | + if (null === $value) { |
|
32 | + return (self::$data['description'] ?? ''); |
|
33 | + } |
|
30 | 34 | |
31 | 35 | self::$data['description'] = $value; |
32 | 36 | } |
@@ -35,7 +39,9 @@ discard block |
||
35 | 39 | |
36 | 40 | public static function keywords(string $value = null) { |
37 | 41 | |
38 | - if (null === $value) return (self::$data['keywords'] ?? ''); |
|
42 | + if (null === $value) { |
|
43 | + return (self::$data['keywords'] ?? ''); |
|
44 | + } |
|
39 | 45 | |
40 | 46 | self::$data['keywords'] = $value; |
41 | 47 | } |
@@ -44,7 +50,9 @@ discard block |
||
44 | 50 | |
45 | 51 | public static function robotsIndex(bool $value = null) { |
46 | 52 | |
47 | - if (null === $value) return (self::$data['robots_index'] ?? false); |
|
53 | + if (null === $value) { |
|
54 | + return (self::$data['robots_index'] ?? false); |
|
55 | + } |
|
48 | 56 | |
49 | 57 | self::$data['robots_index'] = $value; |
50 | 58 | } |
@@ -53,7 +61,9 @@ discard block |
||
53 | 61 | |
54 | 62 | public static function robotsFollow(bool $value = null) { |
55 | 63 | |
56 | - if (null === $value) return (self::$data['robots_follow'] ?? false); |
|
64 | + if (null === $value) { |
|
65 | + return (self::$data['robots_follow'] ?? false); |
|
66 | + } |
|
57 | 67 | |
58 | 68 | self::$data['robots_follow'] = $value; |
59 | 69 | } |
@@ -62,7 +72,9 @@ discard block |
||
62 | 72 | |
63 | 73 | public static function canonical(string $value = null) { |
64 | 74 | |
65 | - if (null === $value) return (self::$data['canonical'] ?? ''); |
|
75 | + if (null === $value) { |
|
76 | + return (self::$data['canonical'] ?? ''); |
|
77 | + } |
|
66 | 78 | |
67 | 79 | self::$data['canonical'] = $value; |
68 | 80 | } |
@@ -10,7 +10,7 @@ |
||
10 | 10 | |
11 | 11 | protected static $loader_class = 'Modules\Extend\Loader\Addons'; |
12 | 12 | |
13 | - protected static $root_dir = (DIR_SYSTEM_CLASSES . 'Addons/'); |
|
13 | + protected static $root_dir = (DIR_SYSTEM_CLASSES.'Addons/'); |
|
14 | 14 | |
15 | 15 | protected static $schema_prototype = 'Prototype\Addon', $schema = 'Addons', $regex_name = REGEX_ADDON_NAME; |
16 | 16 |
@@ -10,7 +10,7 @@ |
||
10 | 10 | |
11 | 11 | protected static $loader_class = 'Modules\Extend\Loader\Templates', $exception_class = 'Exception\Template'; |
12 | 12 | |
13 | - protected static $root_dir = [SECTION_ADMIN => DIR_SYSTEM_TEMPLATES . 'Admin/', SECTION_SITE => DIR_SYSTEM_TEMPLATES . 'Site/']; |
|
13 | + protected static $root_dir = [SECTION_ADMIN => DIR_SYSTEM_TEMPLATES.'Admin/', SECTION_SITE => DIR_SYSTEM_TEMPLATES.'Site/']; |
|
14 | 14 | |
15 | 15 | protected static $schema_prototype = 'Prototype\Template', $regex_name = REGEX_TEMPLATE_NAME; |
16 | 16 |
@@ -35,13 +35,17 @@ discard block |
||
35 | 35 | |
36 | 36 | $name = Request::post('name'); |
37 | 37 | |
38 | - if (!$this->loader->install($name, true)) return $ajax->setError(Language::get(static::$error_install)); |
|
38 | + if (!$this->loader->install($name, true)) { |
|
39 | + return $ajax->setError(Language::get(static::$error_install)); |
|
40 | + } |
|
39 | 41 | |
40 | 42 | } else if (Request::post('action') === 'uninstall') { |
41 | 43 | |
42 | 44 | $name = Request::post('name'); |
43 | 45 | |
44 | - if (!$this->loader->install($name, false)) return $ajax->setError(Language::get(static::$error_uninstall)); |
|
46 | + if (!$this->loader->install($name, false)) { |
|
47 | + return $ajax->setError(Language::get(static::$error_uninstall)); |
|
48 | + } |
|
45 | 49 | } |
46 | 50 | |
47 | 51 | # ------------------------ |
@@ -55,7 +59,9 @@ discard block |
||
55 | 59 | |
56 | 60 | $this->loader = new static::$loader_class; |
57 | 61 | |
58 | - if (Request::isAjax()) return $this->handleAjax(); |
|
62 | + if (Request::isAjax()) { |
|
63 | + return $this->handleAjax(); |
|
64 | + } |
|
59 | 65 | |
60 | 66 | # ------------------------ |
61 | 67 |
@@ -130,7 +130,7 @@ discard block |
||
130 | 130 | |
131 | 131 | if (null === $this->primary) return false; |
132 | 132 | |
133 | - return ($this->dir_name . $this->primary['name'] . '/'); |
|
133 | + return ($this->dir_name.$this->primary['name'].'/'); |
|
134 | 134 | } |
135 | 135 | |
136 | 136 | # Get active extension path |
@@ -139,7 +139,7 @@ discard block |
||
139 | 139 | |
140 | 140 | if (null === $this->active) return false; |
141 | 141 | |
142 | - return ($this->dir_name . $this->active['name'] . '/'); |
|
142 | + return ($this->dir_name.$this->active['name'].'/'); |
|
143 | 143 | } |
144 | 144 | |
145 | 145 | # Get active extension data |
@@ -33,11 +33,15 @@ discard block |
||
33 | 33 | |
34 | 34 | protected function getFirst() { |
35 | 35 | |
36 | - if ($this->loaded) return ($this->items[key($this->items)] ?? null); |
|
36 | + if ($this->loaded) { |
|
37 | + return ($this->items[key($this->items)] ?? null); |
|
38 | + } |
|
37 | 39 | |
38 | 40 | foreach (Explorer::iterateDirs($this->dir_name) as $name) { |
39 | 41 | |
40 | - if (null !== ($data = $this->getItem($name))) return $data; |
|
42 | + if (null !== ($data = $this->getItem($name))) { |
|
43 | + return $data; |
|
44 | + } |
|
41 | 45 | } |
42 | 46 | |
43 | 47 | # ------------------------ |
@@ -53,7 +57,9 @@ discard block |
||
53 | 57 | |
54 | 58 | foreach (Explorer::iterateDirs($this->dir_name) as $name) { |
55 | 59 | |
56 | - if (null !== ($data = $this->getItem($name))) $items[$name] = $data; |
|
60 | + if (null !== ($data = $this->getItem($name))) { |
|
61 | + $items[$name] = $data; |
|
62 | + } |
|
57 | 63 | } |
58 | 64 | |
59 | 65 | # ------------------------ |
@@ -94,7 +100,9 @@ discard block |
||
94 | 100 | |
95 | 101 | public function activate(string $name) { |
96 | 102 | |
97 | - if (null === ($data = $this->getItem($name))) return false; |
|
103 | + if (null === ($data = $this->getItem($name))) { |
|
104 | + return false; |
|
105 | + } |
|
98 | 106 | |
99 | 107 | $this->active = $data; |
100 | 108 | |
@@ -128,7 +136,9 @@ discard block |
||
128 | 136 | |
129 | 137 | public function pathPrimary() { |
130 | 138 | |
131 | - if (null === $this->primary) return false; |
|
139 | + if (null === $this->primary) { |
|
140 | + return false; |
|
141 | + } |
|
132 | 142 | |
133 | 143 | return ($this->dir_name . $this->primary['name'] . '/'); |
134 | 144 | } |
@@ -137,7 +147,9 @@ discard block |
||
137 | 147 | |
138 | 148 | public function path() { |
139 | 149 | |
140 | - if (null === $this->active) return false; |
|
150 | + if (null === $this->active) { |
|
151 | + return false; |
|
152 | + } |
|
141 | 153 | |
142 | 154 | return ($this->dir_name . $this->active['name'] . '/'); |
143 | 155 | } |
@@ -146,7 +158,9 @@ discard block |
||
146 | 158 | |
147 | 159 | public function data(string $name = null) { |
148 | 160 | |
149 | - if (null === $name) return ($this->active ?? false); |
|
161 | + if (null === $name) { |
|
162 | + return ($this->active ?? false); |
|
163 | + } |
|
150 | 164 | |
151 | 165 | return ($this->active[$name] ?? false); |
152 | 166 | } |