cadmium-org / cadmium-cms

www/engine/System/Classes/Modules/Auth/Handler/Recover.php

Spacing +1 added lines, -1 removed lines

@@ -12,7 +12,7 @@
 
 		protected function handle() {
 
-			if (Auth::initial()) Request::redirect(INSTALL_PATH . '/admin/register');
+			if (Auth::initial()) Request::redirect(INSTALL_PATH.'/admin/register');
 
 			return (new Auth\Action\Login)->handle();
 		}

Braces +3 added lines, -1 removed lines

@@ -12,7 +12,9 @@
 
 		protected function handle() {
 
-			if (Auth::initial()) Request::redirect(INSTALL_PATH . '/admin/register');
+			if (Auth::initial()) {
+				Request::redirect(INSTALL_PATH . '/admin/register');
+			}
 
 			return (new Auth\Action\Login)->handle();
 		}

www/engine/System/Classes/Modules/Entitizer/Collection/Menuitems.php

Spacing +1 added lines, -1 removed lines

@@ -12,7 +12,7 @@
 
 		protected function init() {
 
-			$this->config->addParam('active', '', function (bool $active) {
+			$this->config->addParam('active', '', function(bool $active) {
 
 				return ($active ? "ent.active = 1" : '');
 			});

www/engine/System/Classes/Modules/Entitizer/Handler/Edit/Menuitem.php

Braces +3 added lines, -3 removed lines

@@ -30,9 +30,9 @@
 
 		protected function processEntityParent(Template\Block $parent) {
 
-			if (0 !== $this->parent->id) $parent->getBlock('browse')->link = $this->parent->link;
-
-			else { $parent->getBlock('browse')->disable(); $parent->getBlock('browse_disabled')->enable(); }
+			if (0 !== $this->parent->id) {
+				$parent->getBlock('browse')->link = $this->parent->link;
+			} else { $parent->getBlock('browse')->disable(); $parent->getBlock('browse_disabled')->enable(); }
 		}
 
 		# Add item additional data

www/engine/Framework/Classes/Tag/Tag.php

Spacing +1 added lines, -1 removed lines

@@ -117,7 +117,7 @@
 
 			$block = clone (self::$block ?? (self::$block = Template::createBlock(
 
-				'<$name${ for:attributes } $name$="$value$"{ / for:attributes }>' .
+				'<$name${ for:attributes } $name$="$value$"{ / for:attributes }>'.
 
 				'{ block:contents / }$contents${ ! block:closing }</$name$>{ / block:closing }'
 			)));

Braces +6 added lines, -2 removed lines

@@ -58,7 +58,9 @@ 
 
 		public function setAttributes(array $attributes) : Tag {
 
-			foreach ($attributes as $name => $value) if (is_scalar($value)) $this->setAttribute($name, $value);
+			foreach ($attributes as $name => $value) {
+				if (is_scalar($value)) $this->setAttribute($name, $value);
+			}
 
 			return $this;
 		}
@@ -71,7 +73,9 @@ 
 
 		public function setContents($contents) : Tag {
 
-			if (Template::isBlock($contents) || is_scalar($contents) || is_null($contents)) $this->contents = $contents;
+			if (Template::isBlock($contents) || is_scalar($contents) || is_null($contents)) {
+				$this->contents = $contents;
+			}
 
 			return $this;
 		}

www/engine/Framework/Classes/Template/Group.php

Braces +9 added lines, -3 removed lines

@@ -28,7 +28,9 @@ 
 
 		public function __clone() {
 
-			foreach ($this->items as $name => $item) $this->items[$name] = clone $item;
+			foreach ($this->items as $name => $item) {
+				$this->items[$name] = clone $item;
+			}
 		}
 
 		/**
@@ -52,7 +54,9 @@ 
 
 		public function addItems(array $items) : Group {
 
- 			foreach ($items as $item) if ($item instanceof Block) $this->addItem($item);
+ 			foreach ($items as $item) {
+ 				if ($item instanceof Block) $this->addItem($item);
+ 			}
 
  			return $this;
  		}
@@ -111,7 +115,9 @@ 
 
 			# Process items
 
-			foreach ($this->items as $block) $contents .= $block->getContents();
+			foreach ($this->items as $block) {
+				$contents .= $block->getContents();
+			}
 
 			# ------------------------
 

www/engine/System/Classes/Modules/Entitizer/Controller/Widget.php

Braces +12 added lines, -4 removed lines

@@ -29,13 +29,19 @@ 
 
 			# Validate name
 
-			if (false === ($name = Validate::templateComponentName($name))) return ['name', 'WIDGET_ERROR_NAME_INVALID'];
+			if (false === ($name = Validate::templateComponentName($name))) {
+				return ['name', 'WIDGET_ERROR_NAME_INVALID'];
+			}
 
 			# Check name exists
 
-			if (false === ($check_name = $this->widget->check($name, 'name'))) return 'WIDGET_ERROR_MODIFY';
+			if (false === ($check_name = $this->widget->check($name, 'name'))) {
+				return 'WIDGET_ERROR_MODIFY';
+			}
 
-			if ($check_name === 1) return ['name', 'WIDGET_ERROR_NAME_DUPLICATE'];
+			if ($check_name === 1) {
+				return ['name', 'WIDGET_ERROR_NAME_DUPLICATE'];
+			}
 
 			# Modify widget
 
@@ -48,7 +54,9 @@ 
 
 			$modifier = ((0 === $this->widget->id) ? 'create' : 'edit');
 
-			if (!$this->widget->$modifier($data)) return 'WIDGET_ERROR_MODIFY';
+			if (!$this->widget->$modifier($data)) {
+				return 'WIDGET_ERROR_MODIFY';
+			}
 
 			# ------------------------
 

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

Spacing +1 added lines, -1 removed lines

@@ -67,7 +67,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));
 		}
 
 		# Parse item

Braces +15 added lines, -5 removed lines

@@ -52,7 +52,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;
+			}
 
 			# ------------------------
 
@@ -63,9 +65,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));
 		}
@@ -74,14 +80,18 @@ 
 
 		private static function parseItem(array $item) {
 
-			foreach ($item['routes'] as $route) self::parseRoute($item['name'], $route);
+			foreach ($item['routes'] as $route) {
+				self::parseRoute($item['name'], $route);
+			}
 		}
 
 		# Autoloader
 
 		public static function __autoload() {
 
-			foreach (Extend\Addons::items() as $item) self::parseItem($item);
+			foreach (Extend\Addons::items() as $item) {
+				self::parseItem($item);
+			}
 		}
 
 		# Get handler by url

www/engine/System/Main.php

Braces +3 added lines, -1 removed lines

@@ -31,4 +31,6 @@
 
 # Set error reporting
 
-if (DEBUG_MODE) error_reporting(E_ALL);
+if (DEBUG_MODE) {
+	error_reporting(E_ALL);
+}

Spacing +14 added lines, -14 removed lines

@@ -9,32 +9,32 @@
 
 # Define directories
 
-define('DIR_SYSTEM',                (dirname(__FILE__) . '/'));
+define('DIR_SYSTEM', (dirname(__FILE__).'/'));
 
-define('DIR_SYSTEM_CLASSES',        (DIR_SYSTEM . 'Classes/'));
-define('DIR_SYSTEM_DATA',           (DIR_SYSTEM . 'Data/'));
-define('DIR_SYSTEM_INCLUDES',       (DIR_SYSTEM . 'Includes/'));
-define('DIR_SYSTEM_LANGUAGES',      (DIR_SYSTEM . 'Languages/'));
-define('DIR_SYSTEM_TEMPLATES',      (DIR_SYSTEM . 'Templates/'));
+define('DIR_SYSTEM_CLASSES', (DIR_SYSTEM.'Classes/'));
+define('DIR_SYSTEM_DATA', (DIR_SYSTEM.'Data/'));
+define('DIR_SYSTEM_INCLUDES', (DIR_SYSTEM.'Includes/'));
+define('DIR_SYSTEM_LANGUAGES', (DIR_SYSTEM.'Languages/'));
+define('DIR_SYSTEM_TEMPLATES', (DIR_SYSTEM.'Templates/'));
 
 # Require classes
 
-require_once (DIR_SYSTEM . 'Exception.php');
+require_once (DIR_SYSTEM.'Exception.php');
 
 # Require configuration
 
-require_once (DIR_SYSTEM_INCLUDES . 'Constants.php');
-require_once (DIR_SYSTEM_INCLUDES . 'Config.php');
-require_once (DIR_SYSTEM_INCLUDES . 'Regex.php');
-require_once (DIR_SYSTEM_INCLUDES . 'Tables.php');
+require_once (DIR_SYSTEM_INCLUDES.'Constants.php');
+require_once (DIR_SYSTEM_INCLUDES.'Config.php');
+require_once (DIR_SYSTEM_INCLUDES.'Regex.php');
+require_once (DIR_SYSTEM_INCLUDES.'Tables.php');
 
 # Set environment constants
 
-define('HTTP_MOD_REWRITE',      ($_SERVER['HTTP_MOD_REWRITE'] === 'on'));
+define('HTTP_MOD_REWRITE', ($_SERVER['HTTP_MOD_REWRITE'] === 'on'));
 
-define('INSTALL_PATH',          rtrim($_SERVER['INSTALL_PATH'], '/'));
+define('INSTALL_PATH', rtrim($_SERVER['INSTALL_PATH'], '/'));
 
-define('DEBUG_MODE',            @file_exists(DIR_SYSTEM_DATA . '.debug'));
+define('DEBUG_MODE', @file_exists(DIR_SYSTEM_DATA.'.debug'));
 
 # Set error reporting
 

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

Spacing +3 added lines, -3 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;
 
@@ -109,7 +109,7 @@ 
 
 			if ('' === static::$file_name) return false;
 
-			$file_name = (DIR_SYSTEM_DATA . static::$file_name);
+			$file_name = (DIR_SYSTEM_DATA.static::$file_name);
 
 			return (!Explorer::isFile($file_name) || Explorer::removeFile($file_name));
 		}

Braces +42 added lines, -14 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;
+			}
 
 			# ------------------------
 
@@ -107,7 +133,9 @@ 
 
 		public function remove() {
 
-			if ('' === static::$file_name) return false;
+			if ('' === static::$file_name) {
+				return false;
+			}
 
 			$file_name = (DIR_SYSTEM_DATA . static::$file_name);