cadmium-org / cadmium-cms

www/engine/System/Classes/Modules/Tools/Captcha.php

Braces +42 added lines, -13 removed lines

@@ -12,11 +12,19 @@ 
 
 		private function allocateColor(array $color = null) {
 
-			if (null === $this->image) return false;
+			if (null === $this->image) {
+				return false;
+			}
 
-			if (null === $color) $color = [0, 0, 0]; else if (count($color) !== 3) return false;
+			if (null === $color) {
+				$color = [0, 0, 0];
+			} else if (count($color) !== 3) {
+				return false;
+			}
 
-			foreach (array_values($color) as $key => $value) $color[$key] = Number::forceInt($value, 0, 255);
+			foreach (array_values($color) as $key => $value) {
+				$color[$key] = Number::forceInt($value, 0, 255);
+			}
 
 			# ------------------------
 
@@ -27,7 +35,9 @@ 
 
 		public function __construct(int $width, int $height, array $bg_color = null) {
 
-			if (false === ($image = imagecreatetruecolor($width, $height))) return;
+			if (false === ($image = imagecreatetruecolor($width, $height))) {
+				return;
+			}
 
 			$this->image = $image; $this->width = $width; $this->height = $height;
 
@@ -41,11 +51,17 @@ 
 
 		public function text(string $font, int $size, int $indent, int $step, string $text, array $color = null) {
 
-			if (null === $this->image) return false;
+			if (null === $this->image) {
+				return false;
+			}
 
-			if (!Explorer::isFile($font)) return false;
+			if (!Explorer::isFile($font)) {
+				return false;
+			}
 
-			if (false === ($color = $this->allocateColor($color))) return false;
+			if (false === ($color = $this->allocateColor($color))) {
+				return false;
+			}
 
 			$base = (floor(($this->height - $size) / 2) + $size);
 
@@ -65,13 +81,22 @@ 
 
 		public function noise(int $rate, array $color = null) {
 
-			if (null === $this->image) return false;
+			if (null === $this->image) {
+				return false;
+			}
 
-			if (false === ($color = $this->allocateColor($color))) return false;
+			if (false === ($color = $this->allocateColor($color))) {
+				return false;
+			}
 
-			for ($x = 0; $x < $this->width; $x++) for ($y = 0; $y < $this->height; $y++) {
+			for ($x = 0; $x < $this->width; $x++) {
+				for ($y = 0;
+			}
+			$y < $this->height; $y++) {
 
-				if (random_int(1, $rate) === 1) imagesetpixel($this->image, $x, $y, $color);
+				if (random_int(1, $rate) === 1) {
+					imagesetpixel($this->image, $x, $y, $color);
+				}
 			}
 
 			# ------------------------
@@ -83,9 +108,13 @@ 
 
 		public function lines(int $count, array $color = null) {
 
-			if (null === $this->image) return false;
+			if (null === $this->image) {
+				return false;
+			}
 
-			if (false === ($color = $this->allocateColor($color))) return false;
+			if (false === ($color = $this->allocateColor($color))) {
+				return false;
+			}
 
 			for ($i = 0; $i < $count; $i++) {
 

www/engine/System/Classes/Modules/Tools/Sitemap.php

Spacing +1 added lines, -1 removed lines

@@ -12,7 +12,7 @@
 
 		public function __construct() {
 
-			$urlset = '<?xml version="1.0" encoding="UTF-8" ?>' .
+			$urlset = '<?xml version="1.0" encoding="UTF-8" ?>'.
 
 					  '<urlset xmlns="http://www.sitemaps.org/schemas/sitemap/0.9" />';
 

Braces +21 added lines, -7 removed lines

@@ -16,14 +16,18 @@ 
 
 					  '<urlset xmlns="http://www.sitemaps.org/schemas/sitemap/0.9" />';
 
-			if (false !== ($xml = XML::parse($urlset))) $this->xml = $xml;
+			if (false !== ($xml = XML::parse($urlset))) {
+				$this->xml = $xml;
+			}
 		}
 
 		# Load sitemap
 
 		public function load(string $file_name) {
 
-			if (false === ($xml = XML::load($file_name))) return false;
+			if (false === ($xml = XML::load($file_name))) {
+				return false;
+			}
 
 			$this->xml = $xml; $this->loaded = true;
 
@@ -36,9 +40,13 @@ 
 
 		public function save(string $file_name) {
 
-			if ((null === $this->xml) || $this->loaded) return false;
+			if ((null === $this->xml) || $this->loaded) {
+				return false;
+			}
 
-			if (false === XML::save($file_name, $this->xml)) return false;
+			if (false === XML::save($file_name, $this->xml)) {
+				return false;
+			}
 
 			# ------------------------
 
@@ -49,9 +57,13 @@ 
 
 		public function add(string $loc, string $lastmod = null, string $changefreq = null, float $priority = null) {
 
-			if ((null === $this->xml) || $this->loaded) return false;
+			if ((null === $this->xml) || $this->loaded) {
+				return false;
+			}
 
-			if (false === ($loc = Validate::url($loc))) return false;
+			if (false === ($loc = Validate::url($loc))) {
+				return false;
+			}
 
 			# Create url object
 
@@ -73,7 +85,9 @@ 
 
 			# Set priority
 
-			if (null !== $priority) $url->addChild('priority', Number::forceFloat($priority, 0, 1, 1));
+			if (null !== $priority) {
+				$url->addChild('priority', Number::forceFloat($priority, 0, 1, 1));
+			}
 
 			# ------------------------
 

www/engine/System/Classes/Modules/Profile/Handler/Overview.php

Braces +8 added lines, -4 removed lines

@@ -32,14 +32,18 @@
 
 			foreach (['full_name', 'city'] as $name) {
 
-				if ('' === ($text = Auth::user()->$name)) $contents->getBlock($name)->disable();
-
-				else $contents->getBlock($name)->text = $text;
+				if ('' === ($text = Auth::user()->$name)) {
+					$contents->getBlock($name)->disable();
+				} else {
+					$contents->getBlock($name)->text = $text;
+				}
 			}
 
 			# Set country
 
-			if ('' === ($country = Auth::user()->country)) $contents->getBlock('country')->disable(); else {
+			if ('' === ($country = Auth::user()->country)) {
+				$contents->getBlock('country')->disable();
+			} else {
 
 				$contents->getBlock('country')->code = $country;
 

www/engine/System/Classes/Modules/Page.php

Spacing +5 added lines, -5 removed lines

@@ -55,11 +55,11 @@
 
 			if ($this->page->id !== 1) SEO::title($this->page->title); else $this->layout = 'Index';
 
-			SEO::description        ($this->page->description);
-			SEO::keywords           ($this->page->keywords);
-			SEO::robotsIndex        ($this->page->robots_index);
-			SEO::robotsFollow       ($this->page->robots_follow);
-			SEO::canonical          ($this->page->canonical);
+			SEO::description($this->page->description);
+			SEO::keywords($this->page->keywords);
+			SEO::robotsIndex($this->page->robots_index);
+			SEO::robotsFollow($this->page->robots_follow);
+			SEO::canonical($this->page->canonical);
 
 			# ------------------------
 

Braces +21 added lines, -7 removed lines

@@ -16,9 +16,11 @@ 
 
 			# Set breadcrumbs
 
-			if (count($this->path) <= 1) $contents->getBlock('breadcrumbs')->disable();
-
-			else $contents->getBlock('breadcrumbs')->path = $this->path;
+			if (count($this->path) <= 1) {
+				$contents->getBlock('breadcrumbs')->disable();
+			} else {
+				$contents->getBlock('breadcrumbs')->path = $this->path;
+			}
 
 			# Set contents
 
@@ -41,19 +43,31 @@ 
 
 			$slug = $this->url->getSlug();
 
-			if ('' !== $slug) $this->page->initBySlug($slug); else $this->page->init(1);
+			if ('' !== $slug) {
+				$this->page->initBySlug($slug);
+			} else {
+				$this->page->init(1);
+			}
 
 			# Display error if not found
 
-			if (0 === $this->page->id) return false;
+			if (0 === $this->page->id) {
+				return false;
+			}
 
 			# Get path
 
-			if (false !== ($path = $this->page->path())) $this->path = $path;
+			if (false !== ($path = $this->page->path())) {
+				$this->path = $path;
+			}
 
 			# Set data
 
-			if ($this->page->id !== 1) SEO::title($this->page->title); else $this->layout = 'Index';
+			if ($this->page->id !== 1) {
+				SEO::title($this->page->title);
+			} else {
+				$this->layout = 'Index';
+			}
 
 			SEO::description        ($this->page->description);
 			SEO::keywords           ($this->page->keywords);

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/Modules/Informer/Informer.php

Braces +3 added lines, -1 removed lines

@@ -45,7 +45,9 @@
 
 		public static function mysqlVersion() {
 
-			if (!(DB::send("SELECT VERSION() as version") && DB::getLast()->status)) return false;
+			if (!(DB::send("SELECT VERSION() as version") && DB::getLast()->status)) {
+				return false;
+			}
 
 			return strval(DB::getLast()->getRow()['version']);
 		}

Spacing +1 added lines, -1 removed lines

@@ -24,7 +24,7 @@
 
 		public static function checkInstallFile() {
 
-			return Explorer::isFile(DIR_WWW . 'install.php');
+			return Explorer::isFile(DIR_WWW.'install.php');
 		}
 
 		# Get MySQL version

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'));
 
 			# ------------------------