cadmium-org / cadmium-cms

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

Braces +12 added lines, -4 removed lines

@@ -29,13 +29,19 @@ 
 
 			# Validate name
 
-			if (false === ($name = Validate::templateComponentName($name))) return ['name', 'VARIABLE_ERROR_NAME_INVALID'];
+			if (false === ($name = Validate::templateComponentName($name))) {
+				return ['name', 'VARIABLE_ERROR_NAME_INVALID'];
+			}
 
 			# Check name exists
 
-			if (false === ($check_name = $this->variable->check($name, 'name'))) return 'VARIABLE_ERROR_MODIFY';
+			if (false === ($check_name = $this->variable->check($name, 'name'))) {
+				return 'VARIABLE_ERROR_MODIFY';
+			}
 
-			if ($check_name === 1) return ['name', 'VARIABLE_ERROR_NAME_DUPLICATE'];
+			if ($check_name === 1) {
+				return ['name', 'VARIABLE_ERROR_NAME_DUPLICATE'];
+			}
 
 			# Modify variable
 
@@ -47,7 +53,9 @@ 
 
 			$modifier = ((0 === $this->variable->id) ? 'create' : 'edit');
 
-			if (!$this->variable->$modifier($data)) return 'VARIABLE_ERROR_MODIFY';
+			if (!$this->variable->$modifier($data)) {
+				return 'VARIABLE_ERROR_MODIFY';
+			}
 
 			# ------------------------
 

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

Spacing +14 added lines, -14 removed lines

@@ -2,32 +2,32 @@
 
 # Define constants
 
-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 . 'Config.php');
-require_once (DIR_SYSTEM_INCLUDES . 'Constants.php');
-require_once (DIR_SYSTEM_INCLUDES . 'Regex.php');
-require_once (DIR_SYSTEM_INCLUDES . 'Tables.php');
+require_once (DIR_SYSTEM_INCLUDES.'Config.php');
+require_once (DIR_SYSTEM_INCLUDES.'Constants.php');
+require_once (DIR_SYSTEM_INCLUDES.'Regex.php');
+require_once (DIR_SYSTEM_INCLUDES.'Tables.php');
 
 # Process environment variables
 
-define('HTTP_MOD_REWRITE',      (getenv('HTTP_MOD_REWRITE') === 'on'));
+define('HTTP_MOD_REWRITE', (getenv('HTTP_MOD_REWRITE') === 'on'));
 
-define('INSTALL_PATH',          rtrim(getenv('INSTALL_PATH'), '/'));
+define('INSTALL_PATH', rtrim(getenv('INSTALL_PATH'), '/'));
 
-define('DEBUG_MODE',            @file_exists(DIR_SYSTEM_DATA . '.debug'));
+define('DEBUG_MODE', @file_exists(DIR_SYSTEM_DATA.'.debug'));
 
 # Set error reporting
 

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

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

Braces +9 added lines, -3 removed lines

@@ -32,9 +32,13 @@ 
 
 				$param = static::$param[$this->loader->section()]; $name = Request::post('name');
 
-				if (false === Settings::set($param, $name)) return $ajax->setError(Language::get(static::$error_activate));
+				if (false === Settings::set($param, $name)) {
+					return $ajax->setError(Language::get(static::$error_activate));
+				}
 
-				if (false === Settings::save()) return $ajax->setError(Language::get(static::$error_save));
+				if (false === Settings::save()) {
+					return $ajax->setError(Language::get(static::$error_save));
+				}
 
 			} else if (Request::post('action') === 'list') {
 
@@ -52,7 +56,9 @@ 
 
 			$this->loader = new static::$loader_class(Request::get('list'));
 
-			if (Request::isAjax()) return $this->handleAjax();
+			if (Request::isAjax()) {
+				return $this->handleAjax();
+			}
 
 			# ------------------------
 

www/engine/System/Classes/Modules/Informer/Handler/Information.php

Spacing +1 added lines, -1 removed lines

@@ -42,7 +42,7 @@
 
 			# Set system entries
 
-			$contents->system_version       = CADMIUM_VERSION;
+			$contents->system_version = CADMIUM_VERSION;
 
 			# Set external entries
 

www/engine/System/Classes/Modules/Install/Controller/Database.php

Braces +10 added lines, -10 removed lines

@@ -20,21 +20,19 @@ 
 
 			# Connect to DB
 
-			try { DB::connect($server, $user, $password, $name); }
-
-			catch (Exception\DBConnect $error) { return 'INSTALL_ERROR_DATABASE_CONNECT'; }
-
-			catch (Exception\DBSelect $error) { return 'INSTALL_ERROR_DATABASE_SELECT'; }
-
-			catch (Exception\DBCharset $error) { return 'INSTALL_ERROR_DATABASE_CHARSET'; }
+			try { DB::connect($server, $user, $password, $name); } catch (Exception\DBConnect $error) { return 'INSTALL_ERROR_DATABASE_CONNECT'; } catch (Exception\DBSelect $error) { return 'INSTALL_ERROR_DATABASE_SELECT'; } catch (Exception\DBCharset $error) { return 'INSTALL_ERROR_DATABASE_CHARSET'; }
 
 			# Create tables
 
-			if (!Install\Utils\Tables::create()) return 'INSTALL_ERROR_DATABASE_TABLES_CREATE';
+			if (!Install\Utils\Tables::create()) {
+				return 'INSTALL_ERROR_DATABASE_TABLES_CREATE';
+			}
 
 			# Fill tables
 
-			if (!Install\Utils\Tables::fill()) return 'INSTALL_ERROR_DATABASE_TABLES_FILL';
+			if (!Install\Utils\Tables::fill()) {
+				return 'INSTALL_ERROR_DATABASE_TABLES_FILL';
+			}
 
 			# Save system file
 
@@ -47,7 +45,9 @@ 
 
 			$system['time'] = REQUEST_TIME;
 
-			if (!Schema::get('System')->save($system)) return 'INSTALL_ERROR_SYSTEM';
+			if (!Schema::get('System')->save($system)) {
+				return 'INSTALL_ERROR_SYSTEM';
+			}
 
 			# ------------------------
 

www/engine/System/Classes/Modules/Settings/Utils/Dataset.php

Spacing +14 added lines, -14 removed lines

@@ -10,14 +10,14 @@ 
 
 		private function getSystemUrl() {
 
-			if (!empty($_SERVER['HTTP_HOST'])) return ((Request::isSecure() ? 'https://' : 'http://') . $_SERVER['HTTP_HOST']);
+			if (!empty($_SERVER['HTTP_HOST'])) return ((Request::isSecure() ? 'https://' : 'http://').$_SERVER['HTTP_HOST']);
 		}
 
 		# Get system email
 
 		private function getSystemEmail() {
 
-			if (!empty($_SERVER['HTTP_HOST'])) return ('admin@' . $_SERVER['HTTP_HOST']);
+			if (!empty($_SERVER['HTTP_HOST'])) return ('admin@'.$_SERVER['HTTP_HOST']);
 		}
 
 		# Constructor
@@ -26,84 +26,84 @@ 
 
 			# Admin language
 
-			$this->addParam('admin_language', CONFIG_ADMIN_LANGUAGE_DEFAULT, function (string $name) {
+			$this->addParam('admin_language', CONFIG_ADMIN_LANGUAGE_DEFAULT, function(string $name) {
 
 				return ((false !== ($name = Extend\Languages::validate($name))) ? $name : null);
 			});
 
 			# Admin template
 
-			$this->addParam('admin_template', CONFIG_ADMIN_TEMPLATE_DEFAULT, function (string $name) {
+			$this->addParam('admin_template', CONFIG_ADMIN_TEMPLATE_DEFAULT, function(string $name) {
 
 				return ((false !== ($name = Extend\Templates::validate($name))) ? $name : null);
 			});
 
 			# Site language
 
-			$this->addParam('site_language', CONFIG_SITE_LANGUAGE_DEFAULT, function (string $name) {
+			$this->addParam('site_language', CONFIG_SITE_LANGUAGE_DEFAULT, function(string $name) {
 
 				return ((false !== ($name = Extend\Languages::validate($name))) ? $name : null);
 			});
 
 			# Site template
 
-			$this->addParam('site_template', CONFIG_SITE_TEMPLATE_DEFAULT, function (string $name) {
+			$this->addParam('site_template', CONFIG_SITE_TEMPLATE_DEFAULT, function(string $name) {
 
 				return ((false !== ($name = Extend\Templates::validate($name))) ? $name : null);
 			});
 
 			# Site title
 
-			$this->addParam('site_title', CONFIG_SITE_TITLE_DEFAULT, function (string $title) {
+			$this->addParam('site_title', CONFIG_SITE_TITLE_DEFAULT, function(string $title) {
 
 				return (('' !== $title) ? $title : null);
 			});
 
 			# Site slogan
 
-			$this->addParam('site_slogan', CONFIG_SITE_SLOGAN_DEFAULT, function (string $slogan) {
+			$this->addParam('site_slogan', CONFIG_SITE_SLOGAN_DEFAULT, function(string $slogan) {
 
 				return $slogan;
 			});
 
 			# Site status
 
-			$this->addParam('site_status', STATUS_ONLINE, function (string $status) {
+			$this->addParam('site_status', STATUS_ONLINE, function(string $status) {
 
 				return ((false !== ($status = Range\Status::validate($status))) ? $status : null);
 			});
 
 			# Site description
 
-			$this->addParam('site_description', '', function (string $description) {
+			$this->addParam('site_description', '', function(string $description) {
 
 				return $description;
 			});
 
 			# Site keywords
 
-			$this->addParam('site_keywords', '', function (string $keywords) {
+			$this->addParam('site_keywords', '', function(string $keywords) {
 
 				return $keywords;
 			});
 
 			# System url
 
-			$this->addParam('system_url', $this->getSystemUrl(), function (string $url) {
+			$this->addParam('system_url', $this->getSystemUrl(), function(string $url) {
 
 				return ((false !== ($url = Validate::url($url))) ? $url : null);
 			});
 
 			# System email
 
-			$this->addParam('system_email', $this->getSystemEmail(), function (string $email) {
+			$this->addParam('system_email', $this->getSystemEmail(), function(string $email) {
 
 				return ((false !== ($email = Validate::email($email))) ? $email : null);
 			});
 
 			# System timezone
 
-			$this->addParam('system_timezone', CONFIG_SYSTEM_TIMEZONE_DEFAULT, function (string $timezone) {
+			$this->addParam('system_timezone', CONFIG_SYSTEM_TIMEZONE_DEFAULT, function(string $timezone) {
 
 				return ((false !== ($timezone = Timezone::validate($timezone))) ? $timezone : null);
 			});

Braces +6 added lines, -2 removed lines

@@ -10,14 +10,18 @@
 
 		private function getSystemUrl() {
 
-			if (!empty($_SERVER['HTTP_HOST'])) return ((Request::isSecure() ? 'https://' : 'http://') . $_SERVER['HTTP_HOST']);
+			if (!empty($_SERVER['HTTP_HOST'])) {
+				return ((Request::isSecure() ? 'https://' : 'http://') . $_SERVER['HTTP_HOST']);
+			}
 		}
 
 		# Get system email
 
 		private function getSystemEmail() {
 
-			if (!empty($_SERVER['HTTP_HOST'])) return ('admin@' . $_SERVER['HTTP_HOST']);
+			if (!empty($_SERVER['HTTP_HOST'])) {
+				return ('admin@' . $_SERVER['HTTP_HOST']);
+			}
 		}
 
 		# Constructor