cadmium-org / cadmium-cms

www/engine/Framework/Classes/Explorer/Explorer.php

Spacing +2 added lines, -2 removed lines

@@ -23,7 +23,7 @@ 
 
 					if (($name === '.') || ($name === '..')) continue;
 
-					if ((null === $type) || (@filetype($dir_name . $name) === $type)) yield $name;
+					if ((null === $type) || (@filetype($dir_name.$name) === $type)) yield $name;
 				}
 
 				closedir($handler);
@@ -115,7 +115,7 @@ 
 
 				foreach (array_diff($list, ['.', '..']) as $name) {
 
-					$name = ($dir_name . '/' . $name);
+					$name = ($dir_name.'/'.$name);
 
 					if (@is_dir($name)) self::removeDir($name, true);
 

Braces +26 added lines, -10 removed lines

@@ -21,9 +21,13 @@ 
 
 				while (false !== ($name = readdir($handler))) {
 
-					if (($name === '.') || ($name === '..')) continue;
+					if (($name === '.') || ($name === '..')) {
+						continue;
+					}
 
-					if ((null === $type) || (@filetype($dir_name . $name) === $type)) yield $name;
+					if ((null === $type) || (@filetype($dir_name . $name) === $type)) {
+						yield $name;
+					}
 				}
 
 				closedir($handler);
@@ -38,7 +42,9 @@ 
 
 		private static function getInfo(string $file_name, int $param, bool $check_exists = true) {
 
-			if ($check_exists && !self::isFile($file_name)) return false;
+			if ($check_exists && !self::isFile($file_name)) {
+				return false;
+			}
 
 			return pathinfo($file_name, $param);
 		}
@@ -117,9 +123,11 @@ 
 
 					$name = ($dir_name . '/' . $name);
 
-					if (@is_dir($name)) self::removeDir($name, true);
-
-					else if (@is_file($name)) self::removeFile($name);
+					if (@is_dir($name)) {
+						self::removeDir($name, true);
+					} else if (@is_file($name)) {
+						self::removeFile($name);
+					}
 				}
 			}
 
@@ -145,7 +153,9 @@ 
 
 		public static function iterate(string $dir_name) : Generator {
 
- 			foreach (self::getList($dir_name) as $name) yield $name;
+ 			foreach (self::getList($dir_name) as $name) {
+ 				yield $name;
+ 			}
  		}
 
 		/**
@@ -154,7 +164,9 @@ 
 
 		public static function iterateDirs(string $dir_name) : Generator {
 
-			foreach (self::getList($dir_name, 'dir') as $name) yield $name;
+			foreach (self::getList($dir_name, 'dir') as $name) {
+				yield $name;
+			}
 		}
 
 		/**
@@ -163,7 +175,9 @@ 
 
 		public static function iterateFiles(string $dir_name) : Generator {
 
-			foreach (self::getList($dir_name, 'file') as $name) yield $name;
+			foreach (self::getList($dir_name, 'file') as $name) {
+				yield $name;
+			}
 		}
 
 		/**
@@ -334,7 +348,9 @@ 
 
 		public static function include(string $file_name) {
 
-			if ((strtolower(self::getExtension($file_name)) !== 'php')) return false;
+			if ((strtolower(self::getExtension($file_name)) !== 'php')) {
+				return false;
+			}
 
 			return @include $file_name;
 		}

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

Doc Comments +1 added lines, -1 removed lines

@@ -133,7 +133,7 @@
 		/**
 		 * Get the active item data or a specific param value
 		 *
-		 * @return array|mixed|false : the data array, the param value, or false if the active item was not loaded
+		 * @return string : the data array, the param value, or false if the active item was not loaded
 		 */
 
 		public function get(string $param = null) {

Braces +18 added lines, -6 removed lines

@@ -34,11 +34,15 @@ 
 
 		protected function loadFirst() {
 
-			if ($this->loaded) return ($this->items[key($this->items)] ?? null);
+			if ($this->loaded) {
+				return ($this->items[key($this->items)] ?? null);
+			}
 
 			foreach (Explorer::iterateDirs($this->dir_name) as $name) {
 
-				if (null !== ($data = $this->loadItem($name))) return $data;
+				if (null !== ($data = $this->loadItem($name))) {
+					return $data;
+				}
 			}
 
 			# ------------------------
@@ -97,9 +101,13 @@ 
 
 		public function activate(string $name, bool $save = false) : bool {
 
-			if (null === ($data = $this->loadItem($name))) return false;
+			if (null === ($data = $this->loadItem($name))) {
+				return false;
+			}
 
-			if ($save && ((!Settings::set(static::$param[$this->section], $name)) || !Settings::save())) return false;
+			if ($save && ((!Settings::set(static::$param[$this->section], $name)) || !Settings::save())) {
+				return false;
+			}
 
 			$this->active = $data;
 
@@ -125,7 +133,9 @@ 
 
 		public function getPrimary(string $param = null) {
 
-			if (null !== $param) return ($this->primary[$param] ?? false);
+			if (null !== $param) {
+				return ($this->primary[$param] ?? false);
+			}
 
 			return ($this->primary ?? false);
 		}
@@ -138,7 +148,9 @@ 
 
 		public function get(string $param = null) {
 
-			if (null !== $param) return ($this->active[$param] ?? false);
+			if (null !== $param) {
+				return ($this->active[$param] ?? false);
+			}
 
 			return ($this->active ?? false);
 		}

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

Spacing +1 added lines, -1 removed lines

@@ -92,7 +92,7 @@
 
 			if (false === ($handler = self::parseString($route['handler'], REGEX_MAP_ITEM_HANDLER))) return;
 
-			self::$routes['/' . implode('/', $path)] = ('Addons\\' . $name . '\\' . implode('\\', $handler));
+			self::$routes['/'.implode('/', $path)] = ('Addons\\'.$name.'\\'.implode('\\', $handler));
 		}
 
 		/**

Braces +12 added lines, -4 removed lines

@@ -75,7 +75,9 @@ 
 
 			$parts = preg_split('/\//', $string, 0, PREG_SPLIT_NO_EMPTY);
 
-			foreach ($parts as $name) if (!preg_match($regex, $name)) return false;
+			foreach ($parts as $name) {
+				if (!preg_match($regex, $name)) return false;
+			}
 
 			# ------------------------
 
@@ -88,9 +90,13 @@ 
 
 		private static function parseRoute(string $name, array $route) {
 
-			if (false === ($path = self::parseString($route['path'], REGEX_MAP_ITEM_PATH))) return;
+			if (false === ($path = self::parseString($route['path'], REGEX_MAP_ITEM_PATH))) {
+				return;
+			}
 
-			if (false === ($handler = self::parseString($route['handler'], REGEX_MAP_ITEM_HANDLER))) return;
+			if (false === ($handler = self::parseString($route['handler'], REGEX_MAP_ITEM_HANDLER))) {
+				return;
+			}
 
 			self::$routes['/' . implode('/', $path)] = ('Addons\\' . $name . '\\' . implode('\\', $handler));
 		}
@@ -103,7 +109,9 @@ 
 
 			foreach (Extend\Addons::getItems() as $item) {
 
-				foreach ($item['routes'] as $route) self::parseRoute($item['name'], $route);
+				foreach ($item['routes'] as $route) {
+					self::parseRoute($item['name'], $route);
+				}
 			}
 		}
 

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

Braces +9 added lines, -3 removed lines

@@ -29,7 +29,9 @@ 
 
 				$item->children = ($children = Template::createBlock());
 
-				foreach ($this->menu[$id]['children'] as $child) $children->addItem($this->parseItem($child));
+				foreach ($this->menu[$id]['children'] as $child) {
+					$children->addItem($this->parseItem($child));
+				}
 
 			} else {
 
@@ -55,7 +57,9 @@ 
 
 			$menu = Entitizer::getTreeview(TABLE_MENU)->getSubtree(0, ['active' => true]);
 
-			if (false !== $menu) $this->menu = $menu;
+			if (false !== $menu) {
+				$this->menu = $menu;
+			}
 		}
 
 		/**
@@ -66,7 +70,9 @@ 
 
 			$menu = Template::createBlock();
 
-			foreach ($this->menu[0]['children'] as $id) $menu->addItem($this->parseItem($id));
+			foreach ($this->menu[0]['children'] as $id) {
+				$menu->addItem($this->parseItem($id));
+			}
 
 			# ------------------------
 

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);