cadmium-org / cadmium-cms

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

Braces +9 added lines, -3 removed lines

@@ -35,13 +35,17 @@ 
 
 				$name = Request::post('name');
 
-				if (!$this->loader->install($name, true)) return $ajax->setError(Language::get(static::$error_install));
+				if (!$this->loader->install($name, true)) {
+					return $ajax->setError(Language::get(static::$error_install));
+				}
 
 			} else if (Request::post('action') === 'uninstall') {
 
 				$name = Request::post('name');
 
-				if (!$this->loader->install($name, false)) return $ajax->setError(Language::get(static::$error_uninstall));
+				if (!$this->loader->install($name, false)) {
+					return $ajax->setError(Language::get(static::$error_uninstall));
+				}
 			}
 
 			# ------------------------
@@ -55,7 +59,9 @@ 
 
 			$this->loader = new static::$loader_class;
 
-			if ($ajax) return $this->handleAjax();
+			if ($ajax) {
+				return $this->handleAjax();
+			}
 
 			# ------------------------
 

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

Spacing +1 added lines, -1 removed lines

@@ -48,7 +48,7 @@
 
 			if ($this->form->handle(new static::$controller_class, true)) {
 
-				Request::redirect(INSTALL_PATH . (static::$url . '?submitted'));
+				Request::redirect(INSTALL_PATH.(static::$url.'?submitted'));
 			}
 
 			# Display success message

Braces +3 added lines, -1 removed lines

@@ -40,7 +40,9 @@
 
 			# Display success message
 
-			if (false !== Request::get('submitted')) Popup::set('positive', Language::get('SETTINGS_SUCCESS'));
+			if (false !== Request::get('submitted')) {
+				Popup::set('positive', Language::get('SETTINGS_SUCCESS'));
+			}
 
 			# ------------------------
 

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

Braces +6 added lines, -2 removed lines

@@ -21,12 +21,16 @@
 
 			foreach (Settings::setArray($post) as $name => $result) {
 
-				if (!$result) return (isset($errors[$name]) ? [$name, $errors[$name]] : false);
+				if (!$result) {
+					return (isset($errors[$name]) ? [$name, $errors[$name]] : false);
+				}
 			}
 
 			# Save settings
 
-			if (!Settings::save()) return 'SETTINGS_ERROR_SAVE';
+			if (!Settings::save()) {
+				return 'SETTINGS_ERROR_SAVE';
+			}
 
 			# ------------------------
 

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

Spacing +16 added lines, -16 removed lines

@@ -21,7 +21,7 @@ 
 
 			if (empty($_SERVER['HTTP_HOST'])) return CONFIG_SYSTEM_URL;
 
-			return ((Request::isSecure() ? 'https://' : 'http://') . $_SERVER['HTTP_HOST']);
+			return ((Request::isSecure() ? 'https://' : 'http://').$_SERVER['HTTP_HOST']);
 		}
 
 		/**
@@ -32,7 +32,7 @@ 
 
 			if (empty($_SERVER['HTTP_HOST'])) return CONFIG_SYSTEM_EMAIL;
 
-			return ('admin@' . $_SERVER['HTTP_HOST']);
+			return ('admin@'.$_SERVER['HTTP_HOST']);
 		}
 
 		/**
@@ -43,98 +43,98 @@ 
 
 			# Site language
 
-			$this->addParam('site_language', CONFIG_SITE_LANGUAGE, function (string $name) {
+			$this->addParam('site_language', CONFIG_SITE_LANGUAGE, function(string $name) {
 
 				return ((false !== ($name = Extend\Languages::validate($name))) ? $name : null);
 			});
 
 			# Site template
 
-			$this->addParam('site_template', CONFIG_SITE_TEMPLATE, function (string $name) {
+			$this->addParam('site_template', CONFIG_SITE_TEMPLATE, function(string $name) {
 
 				return ((false !== ($name = Extend\Templates::validate($name))) ? $name : null);
 			});
 
 			# Site title
 
-			$this->addParam('site_title', CONFIG_SITE_TITLE, function (string $title) {
+			$this->addParam('site_title', CONFIG_SITE_TITLE, function(string $title) {
 
 				return (('' !== $title) ? $title : null);
 			});
 
 			# Site slogan
 
-			$this->addParam('site_slogan', CONFIG_SITE_SLOGAN, function (string $slogan) {
+			$this->addParam('site_slogan', CONFIG_SITE_SLOGAN, function(string $slogan) {
 
 				return $slogan;
 			});
 
 			# Site status
 
-			$this->addParam('site_status', CONFIG_SITE_STATUS, function (int $status) {
+			$this->addParam('site_status', CONFIG_SITE_STATUS, function(int $status) {
 
 				return ((false !== ($status = Range\Status::validate($status))) ? $status : null);
 			});
 
 			# Site description
 
-			$this->addParam('site_description', CONFIG_SITE_DESCRIPTION, function (string $description) {
+			$this->addParam('site_description', CONFIG_SITE_DESCRIPTION, function(string $description) {
 
 				return $description;
 			});
 
 			# Site keywords
 
-			$this->addParam('site_keywords', CONFIG_SITE_KEYWORDS, function (string $keywords) {
+			$this->addParam('site_keywords', CONFIG_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, function (string $timezone) {
+			$this->addParam('system_timezone', CONFIG_SYSTEM_TIMEZONE, function(string $timezone) {
 
 				return ((false !== ($timezone = Timezone::validate($timezone))) ? $timezone : null);
 			});
 
 			# Admin language
 
-			$this->addParam('admin_language', CONFIG_ADMIN_LANGUAGE, function (string $name) {
+			$this->addParam('admin_language', CONFIG_ADMIN_LANGUAGE, function(string $name) {
 
 				return ((false !== ($name = Extend\Languages::validate($name))) ? $name : null);
 			});
 
 			# Admin template
 
-			$this->addParam('admin_template', CONFIG_ADMIN_TEMPLATE, function (string $name) {
+			$this->addParam('admin_template', CONFIG_ADMIN_TEMPLATE, function(string $name) {
 
 				return ((false !== ($name = Extend\Templates::validate($name))) ? $name : null);
 			});
 
 			# Admin display entities
 
-			$this->addParam('admin_display_entities', CONFIG_ADMIN_DISPLAY_ENTITIES, function (int $display) {
+			$this->addParam('admin_display_entities', CONFIG_ADMIN_DISPLAY_ENTITIES, function(int $display) {
 
 				return ((false !== ($display = Range\Display\Entities::validate($display))) ? $display : null);
 			});
 
 			# Admin display files
 
-			$this->addParam('admin_display_files', CONFIG_ADMIN_DISPLAY_FILES, function (int $display) {
+			$this->addParam('admin_display_files', CONFIG_ADMIN_DISPLAY_FILES, function(int $display) {
 
 				return ((false !== ($display = Range\Display\Files::validate($display))) ? $display : null);
 			});

Braces +6 added lines, -2 removed lines

@@ -19,7 +19,9 @@ 
 
 		private function getSystemUrl() : string {
 
-			if (empty($_SERVER['HTTP_HOST'])) return CONFIG_SYSTEM_URL;
+			if (empty($_SERVER['HTTP_HOST'])) {
+				return CONFIG_SYSTEM_URL;
+			}
 
 			return ((Request::isSecure() ? 'https://' : 'http://') . $_SERVER['HTTP_HOST']);
 		}
@@ -30,7 +32,9 @@ 
 
 		private function getSystemEmail() : string {
 
-			if (empty($_SERVER['HTTP_HOST'])) return CONFIG_SYSTEM_EMAIL;
+			if (empty($_SERVER['HTTP_HOST'])) {
+				return CONFIG_SYSTEM_EMAIL;
+			}
 
 			return ('admin@' . $_SERVER['HTTP_HOST']);
 		}

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

Braces +10 added lines, -10 removed lines

@@ -31,21 +31,19 @@ 
 
 			# Connect to DB
 
-			try { DB::connect($server, $user, $password, $name); }
-
-			catch (Exception\DBConnect $error) { return 'INSTALL_ERROR_DATABASE_CONNECT'; }
-
-			catch (Exception\DBCharset $error) { return 'INSTALL_ERROR_DATABASE_CHARSET'; }
-
-			catch (Exception\DBSelect $error) { return 'INSTALL_ERROR_DATABASE_SELECT'; }
+			try { DB::connect($server, $user, $password, $name); } catch (Exception\DBConnect $error) { return 'INSTALL_ERROR_DATABASE_CONNECT'; } catch (Exception\DBCharset $error) { return 'INSTALL_ERROR_DATABASE_CHARSET'; } catch (Exception\DBSelect $error) { return 'INSTALL_ERROR_DATABASE_SELECT'; }
 
 			# 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
 
@@ -58,7 +56,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/Install/Handler/Check.php

Spacing +1 added lines, -1 removed lines

@@ -29,7 +29,7 @@
 
 				$class = ($status ? 'positive' : 'negative'); $icon = ($status ? 'check circle' : 'warning circle');
 
-				$text = Language::get('INSTALL_REQUIREMENT_' . strtoupper($name) . '_' . ($status ? 'SUCCESS' : 'FAIL'));
+				$text = Language::get('INSTALL_REQUIREMENT_'.strtoupper($name).'_'.($status ? 'SUCCESS' : 'FAIL'));
 
 				$requirements[] = ['class' => $class, 'icon' => $icon, 'text' => $text];
 			}

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

Spacing +9 added lines, -9 removed lines

@@ -23,7 +23,7 @@ 
 
 			# Set server entries
 
-			$contents->os_version           = (php_uname('s') . ', ' . php_uname('v'));
+			$contents->os_version           = (php_uname('s').', '.php_uname('v'));
 
 			$contents->php_version          = phpversion();
 
@@ -35,7 +35,7 @@ 
 
 			$contents->debug_mode_class     = (DEBUG_MODE ? 'red' : 'grey');
 
-			$contents->debug_mode_value     = Language::get('INFORMATION_VALUE_DEBUG_MODE_' . (DEBUG_MODE ? 'ON' : 'OFF'));
+			$contents->debug_mode_value     = Language::get('INFORMATION_VALUE_DEBUG_MODE_'.(DEBUG_MODE ? 'ON' : 'OFF'));
 
 			# Set third-party entries
 
@@ -52,7 +52,7 @@ 
 
 		private function setPhpEntries(Template\Block $contents) {
 
-			$status_value = function (string $value) { return (Validate::boolean($value) ? 'On' : 'Off'); };
+			$status_value = function(string $value) { return (Validate::boolean($value) ? 'On' : 'Off'); };
 
 			# Set errors entries
 
@@ -81,14 +81,14 @@ 
 
 		private function setDiagnosticsEntries(Template\Block $contents) {
 
-			$extension_value = function (bool $value) {
+			$extension_value = function(bool $value) {
 
-				return Language::get('INFORMATION_VALUE_EXTENSION_' . (!$value ? 'NOT_' : '') . 'LOADED' );
+				return Language::get('INFORMATION_VALUE_EXTENSION_'.(!$value ? 'NOT_' : '').'LOADED');
 			};
 
-			$dir_value = function (bool $value) {
+			$dir_value = function(bool $value) {
 
-				return Language::get('INFORMATION_VALUE_DIR_' . (!$value ? 'NOT_' : '') . 'WRITABLE' );
+				return Language::get('INFORMATION_VALUE_DIR_'.(!$value ? 'NOT_' : '').'WRITABLE');
 			};
 
 			# Get loops
@@ -99,7 +99,7 @@ 
 
 			foreach (Install::getExtensions() as $name => $status) {
 
-				$name = Language::get('INFORMATION_ROW_EXTENSION_' . strtoupper($name));
+				$name = Language::get('INFORMATION_ROW_EXTENSION_'.strtoupper($name));
 
 				$class = ($status ? 'green' : 'red'); $value = $extension_value($status);
 
@@ -110,7 +110,7 @@ 
 
 			foreach (Install::getDirs() as $name => $status) {
 
-				$name = Language::get('INFORMATION_ROW_DIR_' . strtoupper($name));
+				$name = Language::get('INFORMATION_ROW_DIR_'.strtoupper($name));
 
 				$class = ($status ? 'green' : 'red'); $value = $dir_value($status);
 

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

Spacing +1 added lines, -1 removed lines

@@ -33,7 +33,7 @@
 
 			# Set server entries
 
-			$contents->os_version           = (php_uname('s') . ', ' . php_uname('v'));
+			$contents->os_version           = (php_uname('s').', '.php_uname('v'));
 
 			$contents->php_version          = phpversion();
 

Braces +9 added lines, -3 removed lines

@@ -52,15 +52,21 @@
 
 			# Check if server meets system requirements
 
-			if (!Install::checkRequirements()) Messages::set('error', Language::get('DASHBOARD_MESSAGE_INSTALL_REQUIREMENTS'));
+			if (!Install::checkRequirements()) {
+				Messages::set('error', Language::get('DASHBOARD_MESSAGE_INSTALL_REQUIREMENTS'));
+			}
 
 			# Check if install file exists
 
-			if (Install::checkFile()) Messages::set('warning', Language::get('DASHBOARD_MESSAGE_INSTALL_FILE'));
+			if (Install::checkFile()) {
+				Messages::set('warning', Language::get('DASHBOARD_MESSAGE_INSTALL_FILE'));
+			}
 
 			# Check if settings file is loaded
 
-			if (!Settings::areLoaded()) Messages::set('info', Language::get('DASHBOARD_MESSAGE_SETTINGS_FILE'));
+			if (!Settings::areLoaded()) {
+				Messages::set('info', Language::get('DASHBOARD_MESSAGE_SETTINGS_FILE'));
+			}
 
 			# ------------------------
 

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

Braces +15 added lines, -5 removed lines

@@ -29,17 +29,25 @@ 
 
 			# 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 reserved
 
-			if (false !== Template::getGlobal($name)) return ['name', 'VARIABLE_ERROR_NAME_RESERVED'];
+			if (false !== Template::getGlobal($name)) {
+				return ['name', 'VARIABLE_ERROR_NAME_RESERVED'];
+			}
 
 			# 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
 
@@ -51,7 +59,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';
+			}
 
 			# ------------------------