cadmium-org / cadmium-cms

www/engine/System/Classes/Utils/Form.php

Braces +17 added lines, -5 removed lines

@@ -23,7 +23,11 @@ 
 
 			$text = Language::get($phrase);
 
-			if (!$popup) Messages::set('error', $text); else Popup::set('negative', $text);
+			if (!$popup) {
+				Messages::set('error', $text);
+			} else {
+				Popup::set('negative', $text);
+			}
 
 			# ------------------------
 
@@ -41,17 +45,25 @@ 
 
 		public function handle(callable $callback, bool $popup = false) : bool {
 
-			if (false === ($post = $this->post())) return false;
+			if (false === ($post = $this->post())) {
+				return false;
+			}
 
 			# Check form for errors
 
-			if ($this->hasErrors()) return $this->displayError('FORM_ERROR_REQUIRED', $popup);
+			if ($this->hasErrors()) {
+				return $this->displayError('FORM_ERROR_REQUIRED', $popup);
+			}
 
 			# Call controller method and display error
 
-			if (is_string($result = $callback($post))) return $this->displayError($result, $popup);
+			if (is_string($result = $callback($post))) {
+				return $this->displayError($result, $popup);
+			}
 
-			if (is_array($result)) return (($this->getField($result[0])->error = true) && $this->displayError($result[1], $popup));
+			if (is_array($result)) {
+				return (($this->getField($result[0])->error = true) && $this->displayError($result[1], $popup));
+			}
 
 			# ------------------------
 

www/engine/System/Classes/Utils/View.php

Spacing +1 added lines, -1 removed lines

@@ -32,7 +32,7 @@
 
 			if (false === ($path = Extend\Templates::get('path'))) throw new Exception\View;
 
-			if (!isset(self::$cache[$file_name = ($path . $name . '.ctp')])) {
+			if (!isset(self::$cache[$file_name = ($path.$name.'.ctp')])) {
 
 				if (false === ($contents = Explorer::getContents($file_name))) throw new Exception\ViewFile($file_name);
 

Braces +6 added lines, -2 removed lines

@@ -30,11 +30,15 @@
 
 		public static function get(string $name) : Template\Block {
 
-			if (false === ($path = Extend\Templates::get('path'))) throw new Exception\View;
+			if (false === ($path = Extend\Templates::get('path'))) {
+				throw new Exception\View;
+			}
 
 			if (!isset(self::$cache[$file_name = ($path . $name . '.ctp')])) {
 
-				if (false === ($contents = Explorer::getContents($file_name))) throw new Exception\ViewFile($file_name);
+				if (false === ($contents = Explorer::getContents($file_name))) {
+					throw new Exception\ViewFile($file_name);
+				}
 
 				self::$cache[$file_name] = Template::createBlock($contents);
 			}

www/engine/System/Classes/Utils/SEO.php

Spacing +1 added lines, -1 removed lines

@@ -60,7 +60,7 @@
 
 			if (null === self::$dataset) self::init();
 
-			return ((self::get('robots_index') ? 'INDEX' : 'NOINDEX') . ',' . (self::get('robots_follow') ? 'FOLLOW' : 'NOFOLLOW'));
+			return ((self::get('robots_index') ? 'INDEX' : 'NOINDEX').','.(self::get('robots_follow') ? 'FOLLOW' : 'NOFOLLOW'));
 		}
 	}
 }

Braces +9 added lines, -3 removed lines

@@ -34,7 +34,9 @@ 
 
 		public static function set(string $name, $value) : bool {
 
-			if (null === self::$dataset) self::init();
+			if (null === self::$dataset) {
+				self::init();
+			}
 
 			return (self::$dataset->set($name, $value) ?? false);
 		}
@@ -47,7 +49,9 @@ 
 
 		public static function get(string $name) {
 
-			if (null === self::$dataset) self::init();
+			if (null === self::$dataset) {
+				self::init();
+			}
 
 			return (self::$dataset->get($name) ?? false);
 		}
@@ -58,7 +62,9 @@ 
 
 		public static function getRobots() {
 
-			if (null === self::$dataset) self::init();
+			if (null === self::$dataset) {
+				self::init();
+			}
 
 			return ((self::get('robots_index') ? 'INDEX' : 'NOINDEX') . ',' . (self::get('robots_follow') ? 'FOLLOW' : 'NOFOLLOW'));
 		}

www/engine/System/Classes/Utils/Messages.php

Braces +6 added lines, -2 removed lines

@@ -34,7 +34,9 @@ 
 
 		public static function set(string $type, string $text, string $title = null) {
 
-			if (!in_array($type, static::$types, true) || isset(static::$items[$type]) || ('' === $text)) return;
+			if (!in_array($type, static::$types, true) || isset(static::$items[$type]) || ('' === $text)) {
+				return;
+			}
 
 			static::$items[$type] = ['text' => $text, 'title' => (('' !== $title) ? $title : null)];
 		}
@@ -64,7 +66,9 @@ 
 
 				$message->type = $type; $message->text = Template::createBlock($item['text']);
 
-				if (isset($item['title'])) $message->getBlock('title')->set('text', $item['title'])->enable();
+				if (isset($item['title'])) {
+					$message->getBlock('title')->set('text', $item['title'])->enable();
+				}
 			}
 
 			# ------------------------

www/engine/System/Classes/Modules/Page.php

Spacing +5 added lines, -5 removed lines

@@ -68,11 +68,11 @@
 
 			if ($this->page->id !== 1) SEO::set('title', $this->page->title); else $this->_layout = 'Index';
 
-			SEO::set('description',         $this->page->description);
-			SEO::set('keywords',            $this->page->keywords);
-			SEO::set('robots_index',        $this->page->robots_index);
-			SEO::set('robots_follow',       $this->page->robots_follow);
-			SEO::set('canonical',           $this->page->canonical);
+			SEO::set('description', $this->page->description);
+			SEO::set('keywords', $this->page->keywords);
+			SEO::set('robots_index', $this->page->robots_index);
+			SEO::set('robots_follow', $this->page->robots_follow);
+			SEO::set('canonical', $this->page->canonical);
 
 			# ------------------------
 

Braces +21 added lines, -7 removed lines

@@ -25,9 +25,11 @@ 
 
 			# Set breadcrumbs
 
-			if (count($this->path) <= 1) $contents->getBlock('breadcrumbs')->disable();
-
-			else $contents->getBlock('breadcrumbs')->path = $this->path;
+			if (count($this->path) <= 1) {
+				$contents->getBlock('breadcrumbs')->disable();
+			} else {
+				$contents->getBlock('breadcrumbs')->path = $this->path;
+			}
 
 			# Set contents
 
@@ -54,19 +56,31 @@ 
 
 			$slug = $this->_url->getSlug();
 
-			if ('' !== $slug) $this->page->initBySlug($slug); else $this->page->init(1);
+			if ('' !== $slug) {
+				$this->page->initBySlug($slug);
+			} else {
+				$this->page->init(1);
+			}
 
 			# Display error if not found
 
-			if (0 === $this->page->id) return false;
+			if (0 === $this->page->id) {
+				return false;
+			}
 
 			# Get path
 
-			if (false !== ($path = $this->page->getPath())) $this->path = $path;
+			if (false !== ($path = $this->page->getPath())) {
+				$this->path = $path;
+			}
 
 			# Set data
 
-			if ($this->page->id !== 1) SEO::set('title', $this->page->title); else $this->_layout = 'Index';
+			if ($this->page->id !== 1) {
+				SEO::set('title', $this->page->title);
+			} else {
+				$this->_layout = 'Index';
+			}
 
 			SEO::set('description',         $this->page->description);
 			SEO::set('keywords',            $this->page->keywords);

www/engine/System/Classes/Modules/Extend/Utils/Handler/Basic.php

Braces +6 added lines, -2 removed lines

@@ -45,7 +45,9 @@ 
 
 				$name = Request::post('name');
 
-				if (!$this->loader->activate($name, true)) return $ajax->setError(Language::get(static::$error_activate));
+				if (!$this->loader->activate($name, true)) {
+					return $ajax->setError(Language::get(static::$error_activate));
+				}
 
 			} else if (Request::post('action') === 'list') {
 
@@ -67,7 +69,9 @@ 
 
 			$this->loader = new static::$loader_class(Request::get('list'));
 
-			if ($ajax) return $this->handleAjax();
+			if ($ajax) {
+				return $this->handleAjax();
+			}
 
 			# ------------------------
 

www/engine/System/Classes/Modules/Extend/Utils/Loader.php

Spacing +2 added lines, -2 removed lines

@@ -41,9 +41,9 @@
 
 		protected function loadItem(string $name) {
 
-			$path = ($this->dir_name . $name . '/');
+			$path = ($this->dir_name.$name.'/');
 
-			if (null === ($data = JSON::load($path . '.Config.json'))) return null;
+			if (null === ($data = JSON::load($path.'.Config.json'))) return null;
 
 			if (null === ($data = Schema::get(static::$schema_prototype)->validate($data))) return null;
 

Braces +12 added lines, -4 removed lines

@@ -25,7 +25,9 @@ 
 
 			foreach (Explorer::iterateDirs($this->dir_name) as $name) {
 
-				if (null !== ($data = $this->loadItem($name))) $items[$name] = ($pattern + $data);
+				if (null !== ($data = $this->loadItem($name))) {
+					$items[$name] = ($pattern + $data);
+				}
 			}
 
 			# ------------------------
@@ -43,11 +45,17 @@ 
 
 			$path = ($this->dir_name . $name . '/');
 
-			if (null === ($data = JSON::load($path . '.Config.json'))) return null;
+			if (null === ($data = JSON::load($path . '.Config.json'))) {
+				return null;
+			}
 
-			if (null === ($data = Schema::get(static::$schema_prototype)->validate($data))) return null;
+			if (null === ($data = Schema::get(static::$schema_prototype)->validate($data))) {
+				return null;
+			}
 
-			if (!(static::$extension_class::isValid($data['name']) && ($data['name'] === $name))) return null;
+			if (!(static::$extension_class::isValid($data['name']) && ($data['name'] === $name))) {
+				return null;
+			}
 
 			# ------------------------
 

www/engine/System/Classes/Modules/Extend/Utils/Extension.php

Indentation +4 added lines, -4 removed lines

@@ -23,10 +23,10 @@
 		}
 
 		/**
- 		 * Validate an item name
- 		 *
- 		 * @return string|false : the name or false on failure
- 		 */
+		 * Validate an item name
+		 *
+		 * @return string|false : the name or false on failure
+		 */
 
 		public static function validate(string $name) {
 

Spacing +1 added lines, -1 removed lines

@@ -41,7 +41,7 @@
 
 			if (null !== static::$loader) return static::$loader->$name(...$arguments);
 
-			throw new \BadMethodCallException('Call to undefined method ' . get_called_class() . '::' . $name . '()');
+			throw new \BadMethodCallException('Call to undefined method '.get_called_class().'::'.$name.'()');
 		}
 	}
 }

Braces +3 added lines, -1 removed lines

@@ -39,7 +39,9 @@
 
 		public static function __callStatic($name, $arguments) {
 
-			if (null !== static::$loader) return static::$loader->$name(...$arguments);
+			if (null !== static::$loader) {
+				return static::$loader->$name(...$arguments);
+			}
 
 			throw new \BadMethodCallException('Call to undefined method ' . get_called_class() . '::' . $name . '()');
 		}

www/engine/System/Classes/Modules/Extend/Utils/Loader/Addons.php

Braces +19 added lines, -7 removed lines

@@ -23,7 +23,9 @@ 
 
 			foreach ((Schema::get(static::$schema)->load() ?? []) as $item) {
 
-				if (isset($items[$item['name']])) $items[$item['name']]['installed'] = true;
+				if (isset($items[$item['name']])) {
+					$items[$item['name']]['installed'] = true;
+				}
 			}
 
 			# ------------------------
@@ -41,7 +43,9 @@ 
 
 			foreach ((Schema::get(static::$schema)->load() ?? []) as $item) {
 
-				if (static::$extension_class::isValid($item['name'])) $items[$item['name']] = $item;
+				if (static::$extension_class::isValid($item['name'])) {
+					$items[$item['name']] = $item;
+				}
 			}
 
 			# ------------------------
@@ -70,18 +74,26 @@ 
 
 		public function install(string $name, bool $value = true) : bool {
 
-			if (!isset($this->items[$name])) return false;
+			if (!isset($this->items[$name])) {
+				return false;
+			}
 
 			$items = [];
 
 			foreach ($this->items as $item) {
 
-				if ($value) { if ($item['installed'] || ($item['name'] === $name)) $items[] = $item; }
-
-				else { if ($item['installed'] && ($item['name'] !== $name)) $items[] = $item; }
+				if ($value) { if ($item['installed'] || ($item['name'] === $name)) {
+					$items[] = $item;
+				}
+				} else { if ($item['installed'] && ($item['name'] !== $name)) {
+					$items[] = $item;
+				}
+				}
 			}
 
-			if (!Schema::get(static::$schema)->save($items)) return false;
+			if (!Schema::get(static::$schema)->save($items)) {
+				return false;
+			}
 
 			$this->items[$name]['installed'] = $value;