@@ -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 | } |
@@ -22,7 +22,9 @@ discard block |
||
| 22 | 22 | |
| 23 | 23 | foreach ((Schema::get(static::$schema)->load() ?? []) as $item) { |
| 24 | 24 | |
| 25 | - if (isset($items[$item['name']])) $items[$item['name']]['installed'] = true; |
|
| 25 | + if (isset($items[$item['name']])) { |
|
| 26 | + $items[$item['name']]['installed'] = true; |
|
| 27 | + } |
|
| 26 | 28 | } |
| 27 | 29 | |
| 28 | 30 | # ------------------------ |
@@ -38,7 +40,9 @@ discard block |
||
| 38 | 40 | |
| 39 | 41 | foreach ((Schema::get(static::$schema)->load() ?? []) as $item) { |
| 40 | 42 | |
| 41 | - if (static::$extension_class::valid($item['name'])) $items[$item['name']] = $item; |
|
| 43 | + if (static::$extension_class::valid($item['name'])) { |
|
| 44 | + $items[$item['name']] = $item; |
|
| 45 | + } |
|
| 42 | 46 | } |
| 43 | 47 | |
| 44 | 48 | # ------------------------ |
@@ -59,18 +63,26 @@ discard block |
||
| 59 | 63 | |
| 60 | 64 | public function install(string $name, bool $value = true) { |
| 61 | 65 | |
| 62 | - if (!isset($this->items[$name])) return false; |
|
| 66 | + if (!isset($this->items[$name])) { |
|
| 67 | + return false; |
|
| 68 | + } |
|
| 63 | 69 | |
| 64 | 70 | $items = []; |
| 65 | 71 | |
| 66 | 72 | foreach ($this->items as $item) { |
| 67 | 73 | |
| 68 | - if ($value) { if ($item['installed'] || ($item['name'] === $name)) $items[] = $item; } |
|
| 69 | - |
|
| 70 | - else { if ($item['installed'] && ($item['name'] !== $name)) $items[] = $item; } |
|
| 74 | + if ($value) { if ($item['installed'] || ($item['name'] === $name)) { |
|
| 75 | + $items[] = $item; |
|
| 76 | + } |
|
| 77 | + } else { if ($item['installed'] && ($item['name'] !== $name)) { |
|
| 78 | + $items[] = $item; |
|
| 79 | + } |
|
| 80 | + } |
|
| 71 | 81 | } |
| 72 | 82 | |
| 73 | - if (!Schema::get(static::$schema)->save($items)) return false; |
|
| 83 | + if (!Schema::get(static::$schema)->save($items)) { |
|
| 84 | + return false; |
|
| 85 | + } |
|
| 74 | 86 | |
| 75 | 87 | $this->items[$name]['installed'] = $value; |
| 76 | 88 | |
@@ -20,7 +20,9 @@ |
||
| 20 | 20 | |
| 21 | 21 | $contents->getBlock('items')->addItem($item = View::get(static::$view_item)); |
| 22 | 22 | |
| 23 | - foreach ($data as $property => $value) $item->$property = $value; |
|
| 23 | + foreach ($data as $property => $value) { |
|
| 24 | + $item->$property = $value; |
|
| 25 | + } |
|
| 24 | 26 | |
| 25 | 27 | # Process item |
| 26 | 28 | |
@@ -24,7 +24,9 @@ |
||
| 24 | 24 | |
| 25 | 25 | public static function __callStatic($name, $arguments) { |
| 26 | 26 | |
| 27 | - if (null !== static::$loader) return static::$loader->$name(...$arguments); |
|
| 27 | + if (null !== static::$loader) { |
|
| 28 | + return static::$loader->$name(...$arguments); |
|
| 29 | + } |
|
| 28 | 30 | } |
| 29 | 31 | } |
| 30 | 32 | } |
@@ -21,7 +21,9 @@ discard block |
||
| 21 | 21 | |
| 22 | 22 | # Throw error if no extensions found |
| 23 | 23 | |
| 24 | - if (false === static::$loader->active()) throw new static::$exception_class; |
|
| 24 | + if (false === static::$loader->active()) { |
|
| 25 | + throw new static::$exception_class; |
|
| 26 | + } |
|
| 25 | 27 | |
| 26 | 28 | # Activate user defined extension |
| 27 | 29 | |
@@ -29,9 +31,10 @@ discard block |
||
| 29 | 31 | |
| 30 | 32 | $name = static::$name; $param = static::$param[static::$loader->section()]; |
| 31 | 33 | |
| 32 | - if (static::$loader->activate(Request::get($name)) || static::$loader->activate(Cookie::get($param))) |
|
| 33 | - |
|
| 34 | + if (static::$loader->activate(Request::get($name)) || static::$loader->activate(Cookie::get($param))) { |
|
| 35 | + |
|
| 34 | 36 | Cookie::set($param, static::$loader->data('name'), static::$cookie_expires); |
| 37 | + } |
|
| 35 | 38 | } |
| 36 | 39 | } |
| 37 | 40 | } |
@@ -12,7 +12,7 @@ |
||
| 12 | 12 | |
| 13 | 13 | protected function getItem(string $name) { |
| 14 | 14 | |
| 15 | - $file_name = ($this->dir_name . $name . '/Config.json'); |
|
| 15 | + $file_name = ($this->dir_name.$name.'/Config.json'); |
|
| 16 | 16 | |
| 17 | 17 | if (null === ($data = JSON::load($file_name))) return null; |
| 18 | 18 | |
@@ -14,11 +14,17 @@ |
||
| 14 | 14 | |
| 15 | 15 | $file_name = ($this->dir_name . $name . '/Config.json'); |
| 16 | 16 | |
| 17 | - if (null === ($data = JSON::load($file_name))) return null; |
|
| 17 | + if (null === ($data = JSON::load($file_name))) { |
|
| 18 | + return null; |
|
| 19 | + } |
|
| 18 | 20 | |
| 19 | - if (null === ($data = Schema::get(static::$schema_prototype)->validate($data))) return null; |
|
| 21 | + if (null === ($data = Schema::get(static::$schema_prototype)->validate($data))) { |
|
| 22 | + return null; |
|
| 23 | + } |
|
| 20 | 24 | |
| 21 | - if (!(static::$extension_class::valid($data['name']) && ($data['name'] === $name))) return null; |
|
| 25 | + if (!(static::$extension_class::valid($data['name']) && ($data['name'] === $name))) { |
|
| 26 | + return null; |
|
| 27 | + } |
|
| 22 | 28 | |
| 23 | 29 | # ------------------------ |
| 24 | 30 | |
@@ -12,7 +12,7 @@ |
||
| 12 | 12 | |
| 13 | 13 | protected function handle() { |
| 14 | 14 | |
| 15 | - if (!Auth::initial()) Request::redirect(INSTALL_PATH . '/admin/login'); |
|
| 15 | + if (!Auth::initial()) Request::redirect(INSTALL_PATH.'/admin/login'); |
|
| 16 | 16 | |
| 17 | 17 | return (new Auth\Action\Register)->handle(); |
| 18 | 18 | } |
@@ -12,7 +12,9 @@ |
||
| 12 | 12 | |
| 13 | 13 | protected function handle() { |
| 14 | 14 | |
| 15 | - if (!Auth::initial()) Request::redirect(INSTALL_PATH . '/admin/login'); |
|
| 15 | + if (!Auth::initial()) { |
|
| 16 | + Request::redirect(INSTALL_PATH . '/admin/login'); |
|
| 17 | + } |
|
| 16 | 18 | |
| 17 | 19 | return (new Auth\Action\Register)->handle(); |
| 18 | 20 | } |