cadmium-org / cadmium-cms

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

Braces +9 added lines, -3 removed lines

@@ -12,7 +12,9 @@ 
 
 			# Check for demo mode
 
-			if (Informer::isDemoMode()) return 'DEMO_MODE_RESTRICTION';
+			if (Informer::isDemoMode()) {
+				return 'DEMO_MODE_RESTRICTION';
+			}
 
 			# Define errors list
 
@@ -25,12 +27,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/Settings.php

Braces +6 added lines, -2 removed lines

@@ -12,14 +12,18 @@
 
 		public static function __autoload() {
 
-			if (null === self::$settings) self::$settings = new Settings\Utils\Dataset;
+			if (null === self::$settings) {
+				self::$settings = new Settings\Utils\Dataset;
+			}
 		}
 
 		# Load settings
 
 		public static function load() {
 
-			if (null === ($data = Schema::get('Settings')->load())) return false;
+			if (null === ($data = Schema::get('Settings')->load())) {
+				return false;
+			}
 
 			self::$settings->setArray($data); self::$loaded = true;
 

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

Spacing +14 added lines, -14 removed lines

@@ -12,7 +12,7 @@ 
 
 			if (empty($host = getenv('HTTP_HOST'))) return;
 
-			return ((Request::isSecure() ? 'https://' : 'http://') . $host);
+			return ((Request::isSecure() ? 'https://' : 'http://').$host);
 		}
 
 		# Get system email
@@ -21,7 +21,7 @@ 
 
 			if (empty($host = getenv('HTTP_HOST'))) return;
 
-			return ('admin@' . $host);
+			return ('admin@'.$host);
 		}
 
 		# Constructor
@@ -30,84 +30,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,7 +10,9 @@ 
 
 		private function getSystemUrl() {
 
-			if (empty($host = getenv('HTTP_HOST'))) return;
+			if (empty($host = getenv('HTTP_HOST'))) {
+				return;
+			}
 
 			return ((Request::isSecure() ? 'https://' : 'http://') . $host);
 		}
@@ -19,7 +21,9 @@ 
 
 		private function getSystemEmail() {
 
-			if (empty($host = getenv('HTTP_HOST'))) return;
+			if (empty($host = getenv('HTTP_HOST'))) {
+				return;
+			}
 
 			return ('admin@' . $host);
 		}

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

Braces +6 added lines, -2 removed lines

@@ -37,11 +37,15 @@
 
 			# Check if install file exists
 
-			if (Informer::checkInstallFile()) Messages::set('error', Language::get('DASHBOARD_MESSAGE_INSTALL_FILE'));
+			if (Informer::checkInstallFile()) {
+				Messages::set('error', Language::get('DASHBOARD_MESSAGE_INSTALL_FILE'));
+			}
 
 			# Check if configuration file is loaded
 
-			if (!Settings::loaded()) Messages::set('warning', Language::get('DASHBOARD_MESSAGE_SETTINGS_FILE'));
+			if (!Settings::loaded()) {
+				Messages::set('warning', Language::get('DASHBOARD_MESSAGE_SETTINGS_FILE'));
+			}
 
 			# ------------------------
 

www/engine/System/Classes/Installer.php

Spacing +2 added lines, -2 removed lines

@@ -14,14 +14,14 @@
 
 			if (null !== ($data = Schema::get('System')->load())) {
 
-				Request::redirect(INSTALL_PATH . '/index.php');
+				Request::redirect(INSTALL_PATH.'/index.php');
 			}
 
 			# Determine handler class
 
 			$checked = (Install::status() && Validate::boolean(Request::get('checked')));
 
-			$class = ('Modules\Install\Handler\\' . (!$checked ? 'Check' : 'Database'));
+			$class = ('Modules\Install\Handler\\'.(!$checked ? 'Check' : 'Database'));
 
 			# ------------------------
 

www/engine/System/Exception.php

Spacing +6 added lines, -6 removed lines

@@ -4,42 +4,42 @@
 
 	# Captcha generate exception
 
-	class Captcha extends Exception  {
+	class Captcha extends Exception {
 
 		protected $message = 'Error generating captcha';
 	}
 
 	# Sitemap generate exception
 
-	class Sitemap extends Exception  {
+	class Sitemap extends Exception {
 
 		protected $message = 'Error generating sitemap';
 	}
 
 	# Language not found exception
 
-	class Language extends Exception  {
+	class Language extends Exception {
 
 		protected $message = 'Languages not found';
 	}
 
 	# Template not found exception
 
-	class Template extends Exception  {
+	class Template extends Exception {
 
 		protected $message = 'Templates not found';
 	}
 
 	# View not initialized exception
 
-	class View extends Exception  {
+	class View extends Exception {
 
 		protected $message = 'View is not initialized';
 	}
 
 	# View file not found exception
 
-	class ViewFile extends Exception  {
+	class ViewFile extends Exception {
 
 		protected $message = 'View file \'$value$\' not found';
 	}

www/engine/System/Languages/en-US/Phrases/Admin.php

Indentation +2 added lines, -2 removed lines

@@ -65,9 +65,9 @@
 	'DASHBOARD_GROUP_DATABASE'                  => 'Database',
 
 	'DASHBOARD_MESSAGE_INSTALL_FILE'            => 'Installation file <a href="$install_path$/install.php" target="_blank">install.php</a> ' .
-	                                               'still exists in the root of your site. It\'s necessary to remove it.',
+												   'still exists in the root of your site. It\'s necessary to remove it.',
 	'DASHBOARD_MESSAGE_SETTINGS_FILE'           => 'It seems you have not yet edited site settings. ' .
-	                                               'Go to <a href="$install_path$/admin/system/settings">settings page</a> to provide actual data.',
+												   'Go to <a href="$install_path$/admin/system/settings">settings page</a> to provide actual data.',
 
 	# Pages
 

Spacing +2 added lines, -2 removed lines

@@ -64,9 +64,9 @@
 	'DASHBOARD_GROUP_GENERAL'                   => 'General',
 	'DASHBOARD_GROUP_DATABASE'                  => 'Database',
 
-	'DASHBOARD_MESSAGE_INSTALL_FILE'            => 'Installation file <a href="$install_path$/install.php" target="_blank">install.php</a> ' .
+	'DASHBOARD_MESSAGE_INSTALL_FILE'            => 'Installation file <a href="$install_path$/install.php" target="_blank">install.php</a> '.
 	                                               'still exists in the root of your site. It\'s necessary to remove it.',
-	'DASHBOARD_MESSAGE_SETTINGS_FILE'           => 'It seems you have not yet edited site settings. ' .
+	'DASHBOARD_MESSAGE_SETTINGS_FILE'           => 'It seems you have not yet edited site settings. '.
 	                                               'Go to <a href="$install_path$/admin/system/settings">settings page</a> to provide actual data.',
 
 	# Pages

www/engine/System/Main.php

Spacing +11 added lines, -11 removed lines

@@ -2,24 +2,24 @@
 
 # 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
 

www/engine/Framework/Classes/Dataset/Dataset.php

Doc Comments +3 added lines, -3 removed lines

@@ -29,7 +29,7 @@ 
 		 * If a validator was not given, a default validator will be used to convert a given variable type to a default's type.
 		 * In a case the conversion fails an existing value will not be changed
 		 *
-		 * @return the current dataset object
+		 * @return Dataset current dataset object
 		 */
 
 		public function addParam(string $name, $default, callable $validator = null) : Dataset {
@@ -48,7 +48,7 @@ 
 		/**
 		 * Add multiple params
 		 *
-		 * @return the current dataset object
+		 * @return Dataset current dataset object
 		 */
 
 		public function addParams(array $data) : Dataset {
@@ -61,7 +61,7 @@ 
 		/**
 		 * Update a value
 		 *
-		 * @return true on success, false on error, or null if the param does not exist
+		 * @return null|boolean on success, false on error, or null if the param does not exist
 		 */
 
 		public function set(string $name, $value) {

Braces +28 added lines, -18 removed lines

@@ -34,7 +34,9 @@ 
 
 		public function addParam(string $name, $default, callable $validator = null) : Dataset {
 
-			if ('' === $name) return $this;
+			if ('' === $name) {
+				return $this;
+			}
 
 			$this->data[$name] = $default; $this->defaults[$name] = $default;
 
@@ -53,7 +55,9 @@ 
 
 		public function addParams(array $data) : Dataset {
 
-			foreach ($data as $name => $value) if (is_scalar($name)) $this->addParam($name, $value);
+			foreach ($data as $name => $value) {
+				if (is_scalar($name)) $this->addParam($name, $value);
+			}
 
 			return $this;
 		}
@@ -66,16 +70,16 @@ 
 
 		public function set(string $name, $value) {
 
-			if (!isset($this->validators[$name])) return null;
+			if (!isset($this->validators[$name])) {
+				return null;
+			}
 
 			try {
 
-				if (null === ($value = $this->validators[$name]($value))) return false;
-
-				else { $this->data[$name] = $value; return true; }
-			}
-
-			catch (TypeError $e) { return false; }
+				if (null === ($value = $this->validators[$name]($value))) {
+					return false;
+				} else { $this->data[$name] = $value; return true; }
+			} catch (TypeError $e) { return false; }
 		}
 
 		/**
@@ -90,7 +94,9 @@ 
 
 			foreach ($data as $name => $value) {
 
-				if (null !== ($value = $this->set($name, $value))) $setted[$name] = $value;
+				if (null !== ($value = $this->set($name, $value))) {
+					$setted[$name] = $value;
+				}
 			}
 
 			# ------------------------
@@ -106,16 +112,18 @@ 
 
 		public function cast(string $name, $value) {
 
-			if (!isset($this->validators[$name])) return null;
+			if (!isset($this->validators[$name])) {
+				return null;
+			}
 
 			try {
 
-				if (null !== ($value = $this->validators[$name]($value))) return $value;
-
-				else return $this->data[$name];
-			}
-
-			catch (TypeError $e) { return $this->data[$name]; }
+				if (null !== ($value = $this->validators[$name]($value))) {
+					return $value;
+				} else {
+					return $this->data[$name];
+				}
+			} catch (TypeError $e) { return $this->data[$name]; }
 		}
 
 		/**
@@ -130,7 +138,9 @@ 
 
 			foreach ($data as $name => $value) {
 
-				if (null !== ($value = $this->cast($name, $value))) $casted[$name] = $value;
+				if (null !== ($value = $this->cast($name, $value))) {
+					$casted[$name] = $value;
+				}
 			}
 
 			# ------------------------