cadmium-org / cadmium-cms

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

Braces +14 added lines, -4 removed lines

@@ -12,7 +12,11 @@ 
 
 			$text = Language::get($code);
 
-			if (!$popup) Messages::set('error', $text); else Popup::set('negative', $text);
+			if (!$popup) {
+				Messages::set('error', $text);
+			} else {
+				Popup::set('negative', $text);
+			}
 
 			# ------------------------
 
@@ -23,15 +27,21 @@ 
 
 		public function handle(callable $callback, bool $popup = false) {
 
-			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
 
-			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)) { $this->getField($result[0])->error = true; return $this->displayError($result[1], $popup); }
 

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

Spacing +1 added lines, -1 removed lines

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

Braces +3 added lines, -1 removed lines

@@ -12,7 +12,9 @@
 
 			$class_name = ('Schemas\\' . $name);
 
-			if (!isset(self::$cache[$class_name])) self::$cache[$class_name] = new $class_name;
+			if (!isset(self::$cache[$class_name])) {
+				self::$cache[$class_name] = new $class_name;
+			}
 
 			# ------------------------
 

www/engine/System/Classes/Utils/Template/Variables.php

Braces +3 added lines, -1 removed lines

@@ -14,7 +14,9 @@
 
 			$selection = ['name', 'value']; $order = ['name' => 'ASC'];
 
-			if (!(DB::select(TABLE_VARIABLES, $selection, null, $order) && DB::getLast()->status)) return;
+			if (!(DB::select(TABLE_VARIABLES, $selection, null, $order) && DB::getLast()->status)) {
+				return;
+			}
 
 			# Process results
 

www/engine/System/Classes/Utils/Template/Widgets.php

Braces +3 added lines, -1 removed lines

@@ -14,7 +14,9 @@
 
 			$selection = ['name', 'contents']; $condition = ['active' => 1]; $order = ['name' => 'ASC'];
 
-			if (!(DB::select(TABLE_WIDGETS, $selection, $condition, $order) && DB::getLast()->status)) return;
+			if (!(DB::select(TABLE_WIDGETS, $selection, $condition, $order) && DB::getLast()->status)) {
+				return;
+			}
 
 			# Process results
 

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

Braces +9 added lines, -3 removed lines

@@ -20,7 +20,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 {
 
@@ -44,7 +46,9 @@ 
 
 			$menu = Entitizer::treeview(TABLE_MENU)->subtree(0, ['active' => true]);
 
-			if (false !== $menu) $this->menu = $menu;
+			if (false !== $menu) {
+				$this->menu = $menu;
+			}
 		}
 
 		# Get block
@@ -53,7 +57,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/Pagination.php

Spacing +1 added lines, -1 removed lines

@@ -58,7 +58,7 @@
 
 				list ($extremum, $index) = $data; $block = $pagination->getBlock($class);
 
-				if ($active === $extremum) { $block->disable(); $pagination->getBlock($class . '_disabled')->enable(); }
+				if ($active === $extremum) { $block->disable(); $pagination->getBlock($class.'_disabled')->enable(); }
 
 				else $block->link = $url->setAttribute('index', $index)->getString();
 			}

Braces +15 added lines, -7 removed lines

@@ -14,7 +14,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');
 
@@ -41,7 +43,9 @@ 
 
 				$block->link = $url->setAttribute('index', $index)->getString(); $block->index = $index;
 
-				if ($closest) $block->getBlock('ellipsis')->disable();
+				if ($closest) {
+					$block->getBlock('ellipsis')->disable();
+				}
 			}
 		}
 
@@ -58,9 +62,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();
+				}
 			}
 		}
 
@@ -68,9 +72,13 @@ 
 
 		public static function block(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
 

Unused Use Statements +2 added lines, -1 removed lines

@@ -2,7 +2,8 @@
 
 namespace Utils {
 
-	use Template, Url;
+	use Template;
+	use Url;
 
 	abstract class Pagination {
 

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

Braces +6 added lines, -2 removed lines

@@ -21,7 +21,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)];
 		}
@@ -45,7 +47,9 @@ 
 
 				$block->type = $type; $block->text = Template::createBlock($item['text']);
 
-				if (isset($item['title'])) $block->getBlock('title')->set('text', $item['title'])->enable();
+				if (isset($item['title'])) {
+					$block->getBlock('title')->set('text', $item['title'])->enable();
+				}
 			}
 
 			# ------------------------

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

Braces +6 added lines, -2 removed lines

@@ -8,13 +8,17 @@
 
 		public function validate($data) {
 
-			if (!is_array($data)) return null;
+			if (!is_array($data)) {
+				return null;
+			}
 
 			$result = [];
 
 			foreach ($data as $item) {
 
-				if (!is_array($item) || (null === ($item = parent::validate($item)))) return null;
+				if (!is_array($item) || (null === ($item = parent::validate($item)))) {
+					return null;
+				}
 
 				$result[] = $item;
 			}

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

Spacing +2 added lines, -2 removed lines

@@ -75,7 +75,7 @@ 
 
 			if ('' === static::$file_name) return null;
 
-			$file_name = (DIR_SYSTEM_DATA . static::$file_name);
+			$file_name = (DIR_SYSTEM_DATA.static::$file_name);
 
 			if (null === ($data = JSON::load($file_name))) return null;
 
@@ -92,7 +92,7 @@ 
 
 			if ('' === static::$file_name) return false;
 
-			$file_name = (DIR_SYSTEM_DATA . static::$file_name);
+			$file_name = (DIR_SYSTEM_DATA.static::$file_name);
 
 			if (null === ($data = $this->validate($data))) return false;
 

Braces +39 added lines, -13 removed lines

@@ -18,48 +18,62 @@ 
 
 		protected function addArray(string $name) {
 
-			if ('' !== $name) return $this->properties[$name] = new _Array;
+			if ('' !== $name) {
+				return $this->properties[$name] = new _Array;
+			}
 		}
 
 		# Add boolean property
 
 		protected function addBoolean(string $name) {
 
-			if ('' !== $name) return $this->properties[$name] = new _Boolean;
+			if ('' !== $name) {
+				return $this->properties[$name] = new _Boolean;
+			}
 		}
 
 		# Add integer property
 
 		protected function addInteger(string $name) {
 
-			if ('' !== $name) return $this->properties[$name] = new _Integer;
+			if ('' !== $name) {
+				return $this->properties[$name] = new _Integer;
+			}
 		}
 
 		# Add object property
 
 		protected function addObject(string $name) {
 
-			if ('' !== $name) return $this->properties[$name] = new _Object;
+			if ('' !== $name) {
+				return $this->properties[$name] = new _Object;
+			}
 		}
 
 		# Add string property
 
 		protected function addString(string $name) {
 
-			if ('' !== $name) return $this->properties[$name] = new _String;
+			if ('' !== $name) {
+				return $this->properties[$name] = new _String;
+			}
 		}
 
 		# Validate data
 
 		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;
 			}
@@ -73,13 +87,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;
+			}
 
 			# ------------------------
 
@@ -90,13 +110,19 @@ 
 
 		public function save(array $data) {
 
-			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;
+			}
 
 			# ------------------------