cadmium-org / cadmium-cms

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/Uploader.php

Doc Comments +1 added lines, -1 removed lines

@@ -60,7 +60,7 @@
 		/**
 		 * Save an uploaded file
 		 *
-		 * @return true|string|false : true on success, an error code on failure, or false if there are no uploaded files
+		 * @return string|boolean : true on success, an error code on failure, or false if there are no uploaded files
 		 */
 
 		public static function save(string $name, string $dir_name) {

Braces +53 added lines, -17 removed lines

@@ -21,19 +21,33 @@ 
 
 		private static function getErrorCode(int $error) : string {
 
-			if ($error === UPLOAD_ERR_INI_SIZE)         return 'UPLOADER_ERROR_INI_SIZE';
+			if ($error === UPLOAD_ERR_INI_SIZE) {
+				return 'UPLOADER_ERROR_INI_SIZE';
+			}
 
-			if ($error === UPLOAD_ERR_FORM_SIZE)        return 'UPLOADER_ERROR_FORM_SIZE';
+			if ($error === UPLOAD_ERR_FORM_SIZE) {
+				return 'UPLOADER_ERROR_FORM_SIZE';
+			}
 
-			if ($error === UPLOAD_ERR_PARTIAL)          return 'UPLOADER_ERROR_PARTIAL';
+			if ($error === UPLOAD_ERR_PARTIAL) {
+				return 'UPLOADER_ERROR_PARTIAL';
+			}
 
-			if ($error === UPLOAD_ERR_NO_FILE)          return 'UPLOADER_ERROR_NO_FILE';
+			if ($error === UPLOAD_ERR_NO_FILE) {
+				return 'UPLOADER_ERROR_NO_FILE';
+			}
 
-			if ($error === UPLOAD_ERR_NO_TMP_DIR)       return 'UPLOADER_ERROR_NO_TMP_DIR';
+			if ($error === UPLOAD_ERR_NO_TMP_DIR) {
+				return 'UPLOADER_ERROR_NO_TMP_DIR';
+			}
 
-			if ($error === UPLOAD_ERR_CANT_WRITE)       return 'UPLOADER_ERROR_CANT_WRITE';
+			if ($error === UPLOAD_ERR_CANT_WRITE) {
+				return 'UPLOADER_ERROR_CANT_WRITE';
+			}
 
-			if ($error === UPLOAD_ERR_EXTENSION)        return 'UPLOADER_ERROR_EXTENSION';
+			if ($error === UPLOAD_ERR_EXTENSION) {
+				return 'UPLOADER_ERROR_EXTENSION';
+			}
 
 			# ------------------------
 
@@ -50,7 +64,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);
+			}
 
 			# ------------------------
 
@@ -65,19 +83,27 @@ 
 
 		public static function save(string $name, string $dir_name) {
 
-			if (false === ($file = Request::file($name))) return false;
+			if (false === ($file = Request::file($name))) {
+				return false;
+			}
 
 			# Check for upload errors
 
-			if ($file['error'] !== UPLOAD_ERR_OK) return self::getErrorCode($file['error']);
+			if ($file['error'] !== UPLOAD_ERR_OK) {
+				return self::getErrorCode($file['error']);
+			}
 
 			# Check for secure upload
 
-			if (!is_uploaded_file($file['tmp_name'])) return 'UPLOADER_ERROR_SECURITY';
+			if (!is_uploaded_file($file['tmp_name'])) {
+				return 'UPLOADER_ERROR_SECURITY';
+			}
 
 			# Check size
 
-			if ($file['size'] > CONFIG_UPLOADS_MAX_SIZE) return 'UPLOADER_ERROR_SIZE';
+			if ($file['size'] > CONFIG_UPLOADS_MAX_SIZE) {
+				return 'UPLOADER_ERROR_SIZE';
+			}
 
 			# Check file extension
 
@@ -85,21 +111,29 @@ 
 
 			$extension = strtolower(Explorer::getExtension($file['name'], false));
 
-			if (in_array($extension, $extensions, true)) return 'UPLOADER_ERROR_TYPE';
+			if (in_array($extension, $extensions, true)) {
+				return 'UPLOADER_ERROR_TYPE';
+			}
 
 			# Check target directory
 
-			if (!Explorer::isDir($dir_name) && !Explorer::createDir($dir_name)) return 'UPLOADER_ERROR_DIR';
+			if (!Explorer::isDir($dir_name) && !Explorer::createDir($dir_name)) {
+				return 'UPLOADER_ERROR_DIR';
+			}
 
 			# Check target file
 
 			$base_name = basename($file['name']); $file_name = ($dir_name . '/' . $base_name);
 
-			if (Explorer::isDir($file_name) || Explorer::isFile($file_name)) return 'UPLOADER_ERROR_EXISTS';
+			if (Explorer::isDir($file_name) || Explorer::isFile($file_name)) {
+				return 'UPLOADER_ERROR_EXISTS';
+			}
 
 			# Save uploaded file
 
-			if (!@move_uploaded_file($file['tmp_name'], $file_name)) return 'UPLOADER_ERROR_SAVE';
+			if (!@move_uploaded_file($file['tmp_name'], $file_name)) {
+				return 'UPLOADER_ERROR_SAVE';
+			}
 
 			# Set upload data
 
@@ -122,7 +156,9 @@ 
 
 			$result = self::save($name, $dir_name);
 
-			if (is_string($result)) return self::displayError($result, $popup);
+			if (is_string($result)) {
+				return self::displayError($result, $popup);
+			}
 
 			# ------------------------
 

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/Schema/_Object.php

Braces +42 added lines, -14 removed lines

@@ -27,7 +27,9 @@ 
 
 		protected function addArray(string $name) {
 
-			if ('' !== $name) return $this->properties[$name] = new _Array;
+			if ('' !== $name) {
+				return $this->properties[$name] = new _Array;
+			}
 		}
 
 		/**
@@ -36,7 +38,9 @@ 
 
 		protected function addBoolean(string $name) {
 
-			if ('' !== $name) return $this->properties[$name] = new _Boolean;
+			if ('' !== $name) {
+				return $this->properties[$name] = new _Boolean;
+			}
 		}
 
 		/**
@@ -45,7 +49,9 @@ 
 
 		protected function addInteger(string $name) {
 
-			if ('' !== $name) return $this->properties[$name] = new _Integer;
+			if ('' !== $name) {
+				return $this->properties[$name] = new _Integer;
+			}
 		}
 
 		/**
@@ -54,7 +60,9 @@ 
 
 		protected function addObject(string $name) {
 
-			if ('' !== $name) return $this->properties[$name] = new _Object;
+			if ('' !== $name) {
+				return $this->properties[$name] = new _Object;
+			}
 		}
 
 		/**
@@ -63,7 +71,9 @@ 
 
 		protected function addString(string $name) {
 
-			if ('' !== $name) return $this->properties[$name] = new _String;
+			if ('' !== $name) {
+				return $this->properties[$name] = new _String;
+			}
 		}
 
 		/**
@@ -74,13 +84,17 @@ 
 
 		public function validate($data) {
 
-			if (!is_array($data)) return null;
+			if (!is_array($data)) {
+				return null;
+			}
 
 			$result = [];
 
 			foreach ($this->properties as $name => $property) {
 
-				if (!isset($data[$name]) || (null === ($value = $property->validate($data[$name])))) return null;
+				if (!isset($data[$name]) || (null === ($value = $property->validate($data[$name])))) {
+					return null;
+				}
 
 				$result[$name] = $value;
 			}
@@ -98,13 +112,19 @@ 
 
 		public function load() {
 
-			if ('' === static::$file_name) return null;
+			if ('' === static::$file_name) {
+				return null;
+			}
 
 			$file_name = (DIR_SYSTEM_DATA . static::$file_name);
 
-			if (null === ($data = JSON::load($file_name))) return null;
+			if (null === ($data = JSON::load($file_name))) {
+				return null;
+			}
 
-			if (null === ($data = $this->validate($data))) return null;
+			if (null === ($data = $this->validate($data))) {
+				return null;
+			}
 
 			# ------------------------
 
@@ -119,13 +139,19 @@ 
 
 		public function save(array $data) : bool {
 
-			if ('' === static::$file_name) return false;
+			if ('' === static::$file_name) {
+				return false;
+			}
 
 			$file_name = (DIR_SYSTEM_DATA . static::$file_name);
 
-			if (null === ($data = $this->validate($data))) return false;
+			if (null === ($data = $this->validate($data))) {
+				return false;
+			}
 
-			if (false === JSON::save($file_name, $data)) return false;
+			if (false === JSON::save($file_name, $data)) {
+				return false;
+			}
 
 			# ------------------------
 
@@ -140,7 +166,9 @@ 
 
 		public function remove() : bool {
 
-			if ('' === static::$file_name) return false;
+			if ('' === static::$file_name) {
+				return false;
+			}
 
 			$file_name = (DIR_SYSTEM_DATA . static::$file_name);
 

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

Spacing +1 added lines, -1 removed lines

@@ -19,7 +19,7 @@
 
 		public static function get(string $name) : Schema\_Object {
 
-			$class_name = ('Schemas\\' . $name);
+			$class_name = ('Schemas\\'.$name);
 
 			if (!isset(self::$cache[$class_name])) self::$cache[$class_name] = new $class_name;
 

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/Pagination.php

Braces +15 added lines, -7 removed lines

@@ -23,7 +23,9 @@ 
 
 			for ($index = ($active - 2); $index <= ($active + 2); $index++) {
 
-				if (!($index > 0 && $index <= $count)) continue;
+				if (!($index > 0 && $index <= $count)) {
+					continue;
+				}
 
 				$class = (($index === $active) ? 'active item' : 'item');
 
@@ -52,7 +54,9 @@ 
 
 				$block->link = $url->setAttribute('index', $index)->getString(); $block->index = $index;
 
-				if ($closest) $block->getBlock('ellipsis')->disable();
+				if ($closest) {
+					$block->getBlock('ellipsis')->disable();
+				}
 			}
 		}
 
@@ -71,9 +75,9 @@ 
 
 				list ($extremum, $index) = $data; $block = $pagination->getBlock($class);
 
-				if ($active === $extremum) { $block->disable(); $pagination->getBlock($class . '_disabled')->enable(); }
-
-				else $block->link = $url->setAttribute('index', $index)->getString();
+				if ($active === $extremum) { $block->disable(); $pagination->getBlock($class . '_disabled')->enable(); } else {
+					$block->link = $url->setAttribute('index', $index)->getString();
+				}
 			}
 		}
 
@@ -90,9 +94,13 @@ 
 
 		public static function getBlock(int $index, int $display, int $total, Url $url) {
 
-			if (($index <= 0) || ($display <= 0) || ($total <= 0)) return false;
+			if (($index <= 0) || ($display <= 0) || ($total <= 0)) {
+				return false;
+			}
 
-			if (($display >= $total) || ($index > ($count = ceil($total / $display)))) return false;
+			if (($display >= $total) || ($index > ($count = ceil($total / $display)))) {
+				return false;
+			}
 
 			# Create block
 

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