cadmium-org / cadmium-cms

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

Braces +6 added lines, -4 removed lines

@@ -32,16 +32,18 @@
 
 		protected function processEntityParent(Template\Block $parent) {
 
-			if ((0 !== $this->parent->id) && $this->parent->active) $parent->getBlock('browse')->link = $this->parent->link;
-
-			else { $parent->getBlock('browse')->disable(); $parent->getBlock('browse_disabled')->enable(); }
+			if ((0 !== $this->parent->id) && $this->parent->active) {
+				$parent->getBlock('browse')->link = $this->parent->link;
+			} else { $parent->getBlock('browse')->disable(); $parent->getBlock('browse_disabled')->enable(); }
 		}
 
 		# Add additional parent data for specific entity
 
 		protected function processEntity(Template\Block $contents) {
 
-			if (!$this->create && $this->parent->locked) $contents->getBlock('locked')->enable();
+			if (!$this->create && $this->parent->locked) {
+				$contents->getBlock('locked')->enable();
+			}
 		}
 	}
 }

Unused Use Statements +2 added lines, -1 removed lines

@@ -2,7 +2,8 @@
 
 namespace Modules\Entitizer\Listview {
 
-	use Modules\Entitizer, Template;
+	use Modules\Entitizer;
+	use Template;
 
 	class Variables extends Entitizer\Utils\Listview {
 

www/engine/System/Classes/Modules/Entitizer/Dataset/User.php

Spacing +3 added lines, -3 removed lines

@@ -12,14 +12,14 @@
 
 		protected function init() {
 
-			$this->addWorker('gravatar', function (array $data) {
+			$this->addWorker('gravatar', function(array $data) {
 
 				return md5(strtolower($data['email']));
 			});
 
-			$this->addWorker('full_name', function (array $data) {
+			$this->addWorker('full_name', function(array $data) {
 
-				return trim($data['first_name'] . ' ' . $data['last_name']);
+				return trim($data['first_name'].' '.$data['last_name']);
 			});
 		}
 	}

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

Braces +21 added lines, -7 removed lines

@@ -12,7 +12,9 @@ 
 
 		protected function addWorker(string $name, callable $worker) {
 
-			if (isset($this->params[$name]) || isset($this->workers[$name])) return;
+			if (isset($this->params[$name]) || isset($this->workers[$name])) {
+				return;
+			}
 
 			$this->workers[$name] = $worker;
 		}
@@ -23,7 +25,9 @@ 
 
 			$this->params = Entitizer::definition(static::$table)->params();
 
-			if (static::$nesting) $this->params['parent_id'] = $this->params['id'];
+			if (static::$nesting) {
+				$this->params['parent_id'] = $this->params['id'];
+			}
 
 			$this->init(); $this->reset();
 		}
@@ -34,11 +38,15 @@ 
 
 			# Reset params
 
-			foreach ($this->params as $name => $param) $this->data[$name] = $param->cast(null);
+			foreach ($this->params as $name => $param) {
+				$this->data[$name] = $param->cast(null);
+			}
 
 			# Reset extras
 
-			foreach ($this->workers as $name => $worker) $this->data[$name] = $worker($this->data);
+			foreach ($this->workers as $name => $worker) {
+				$this->data[$name] = $worker($this->data);
+			}
 
 			# ------------------------
 
@@ -53,12 +61,16 @@ 
 
 			foreach ($data as $name => $value) {
 
-				if (isset($this->params[$name])) $this->data[$name] = $this->params[$name]->cast($value);
+				if (isset($this->params[$name])) {
+					$this->data[$name] = $this->params[$name]->cast($value);
+				}
 			}
 
 			# Update extras
 
-			foreach ($this->workers as $name => $worker) $this->data[$name] = $worker($this->data);
+			foreach ($this->workers as $name => $worker) {
+				$this->data[$name] = $worker($this->data);
+			}
 
 			# ------------------------
 
@@ -73,7 +85,9 @@ 
 
 			foreach ($data as $name => $value) {
 
-				if (isset($this->params[$name])) $cast[$name] = $this->params[$name]->cast($value);
+				if (isset($this->params[$name])) {
+					$cast[$name] = $this->params[$name]->cast($value);
+				}
 			}
 
 			# ------------------------

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

Spacing +1 added lines, -1 removed lines

@@ -30,7 +30,7 @@
 
 		public function __construct() {
 
-			$system_file = (DIR_SYSTEM_DATA . 'System.json');
+			$system_file = (DIR_SYSTEM_DATA.'System.json');
 
 			if (false !== ($data = Explorer::json($system_file))) $this->parse($data);
 		}

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
 
@@ -49,7 +47,9 @@ 
 
 			$system_file = (DIR_SYSTEM_DATA . 'System.json');
 
-			if (false === JSON::save($system_file, $system)) return 'INSTALL_ERROR_SYSTEM';
+			if (false === JSON::save($system_file, $system)) {
+				return 'INSTALL_ERROR_SYSTEM';
+			}
 
 			# ------------------------
 

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

Spacing +1 added lines, -1 removed lines

@@ -24,7 +24,7 @@
 
 			# Customize captcha
 
-			$font = (DIR_SYSTEM_DATA . CONFIG_CAPTCHA_FONT); $size = CONFIG_CAPTCHA_FONT_SIZE;
+			$font = (DIR_SYSTEM_DATA.CONFIG_CAPTCHA_FONT); $size = CONFIG_CAPTCHA_FONT_SIZE;
 
 			$indent = CONFIG_CAPTCHA_TEXT_INDENT; $step = CONFIG_CAPTCHA_TEXT_STEP;
 

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

Spacing +1 added lines, -1 removed lines

@@ -44,7 +44,7 @@
 
 			# Load sitemap
 
-			$file_name = (DIR_SYSTEM_DATA . 'Sitemap.xml');
+			$file_name = (DIR_SYSTEM_DATA.'Sitemap.xml');
 
 			$modified = Explorer::getModified($file_name);
 

Braces +12 added lines, -4 removed lines

@@ -12,7 +12,9 @@ 
 
 			$selection = 'MAX(time_modified) as last_modified';
 
-			if (!(DB::select(TABLE_PAGES, $selection) && (DB::getLast()->rows === 1))) return 0;
+			if (!(DB::select(TABLE_PAGES, $selection) && (DB::getLast()->rows === 1))) {
+				return 0;
+			}
 
 			# ------------------------
 
@@ -27,11 +29,15 @@ 
 
 			$condition = ['visibility' => VISIBILITY_PUBLISHED, 'access' => ACCESS_PUBLIC, 'locked' => 0];
 
-			if (!(DB::select(TABLE_PAGES, $selection, $condition, 'slug') && DB::getLast()->status)) return;
+			if (!(DB::select(TABLE_PAGES, $selection, $condition, 'slug') && DB::getLast()->status)) {
+				return;
+			}
 
 			# ------------------------
 
-			while (null !== ($data = DB::getLast()->getRow())) yield Entitizer::dataset(TABLE_PAGES, $data);
+			while (null !== ($data = DB::getLast()->getRow())) {
+				yield Entitizer::dataset(TABLE_PAGES, $data);
+			}
 		}
 
 		# Handle request
@@ -50,7 +56,9 @@ 
 
 			if ((false !== $modified) && ($modified > $this->getLastModified())) {
 
-				if (false !== $sitemap->load($file_name)) return $sitemap;
+				if (false !== $sitemap->load($file_name)) {
+					return $sitemap;
+				}
 			}
 
 			# Fill sitemap

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;