cadmium-org / cadmium-cms

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;
 

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

@@ -25,9 +25,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
 
@@ -54,19 +56,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/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/Framework/Classes/Dataset/Dataset.php

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