cadmium-org / cadmium-cms

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::getDataset(TABLE_PAGES, $data);
+			while (null !== ($data = DB::getLast()->getRow())) {
+				yield Entitizer::getDataset(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/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;
+				}
 			}
 
 			# ------------------------

www/engine/Framework/Classes/Tag/Tag.php

Spacing +1 added lines, -1 removed lines

@@ -117,7 +117,7 @@
 
 			$block = clone (self::$block ?? (self::$block = Template::createBlock(
 
-				'<$name${ for:attributes } $name$="$value$"{ / for:attributes }>' .
+				'<$name${ for:attributes } $name$="$value$"{ / for:attributes }>'.
 
 				'{ block:contents / }$contents${ ! block:closing }</$name$>{ / block:closing }'
 			)));

Braces +6 added lines, -2 removed lines

@@ -58,7 +58,9 @@ 
 
 		public function setAttributes(array $attributes) : Tag {
 
-			foreach ($attributes as $name => $value) if (is_scalar($value)) $this->setAttribute($name, $value);
+			foreach ($attributes as $name => $value) {
+				if (is_scalar($value)) $this->setAttribute($name, $value);
+			}
 
 			return $this;
 		}
@@ -71,7 +73,9 @@ 
 
 		public function setContents($contents) : Tag {
 
-			if (Template::isBlock($contents) || is_scalar($contents) || is_null($contents)) $this->contents = $contents;
+			if (Template::isBlock($contents) || is_scalar($contents) || is_null($contents)) {
+				$this->contents = $contents;
+			}
 
 			return $this;
 		}

www/engine/Framework/Classes/Template/Group.php

Braces +9 added lines, -3 removed lines

@@ -28,7 +28,9 @@ 
 
 		public function __clone() {
 
-			foreach ($this->items as $name => $item) $this->items[$name] = clone $item;
+			foreach ($this->items as $name => $item) {
+				$this->items[$name] = clone $item;
+			}
 		}
 
 		/**
@@ -52,7 +54,9 @@ 
 
 		public function addItems(array $items) : Group {
 
- 			foreach ($items as $item) if ($item instanceof Block) $this->addItem($item);
+ 			foreach ($items as $item) {
+ 				if ($item instanceof Block) $this->addItem($item);
+ 			}
 
  			return $this;
  		}
@@ -111,7 +115,9 @@ 
 
 			# Process items
 
-			foreach ($this->items as $block) $contents .= $block->getContents();
+			foreach ($this->items as $block) {
+				$contents .= $block->getContents();
+			}
 
 			# ------------------------
 

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

Braces +12 added lines, -4 removed lines

@@ -29,13 +29,19 @@ 
 
 			# Validate name
 
-			if (false === ($name = Validate::templateComponentName($name))) return ['name', 'WIDGET_ERROR_NAME_INVALID'];
+			if (false === ($name = Validate::templateComponentName($name))) {
+				return ['name', 'WIDGET_ERROR_NAME_INVALID'];
+			}
 
 			# Check name exists
 
-			if (false === ($check_name = $this->widget->check($name, 'name'))) return 'WIDGET_ERROR_MODIFY';
+			if (false === ($check_name = $this->widget->check($name, 'name'))) {
+				return 'WIDGET_ERROR_MODIFY';
+			}
 
-			if ($check_name === 1) return ['name', 'WIDGET_ERROR_NAME_DUPLICATE'];
+			if ($check_name === 1) {
+				return ['name', 'WIDGET_ERROR_NAME_DUPLICATE'];
+			}
 
 			# Modify widget
 
@@ -48,7 +54,9 @@ 
 
 			$modifier = ((0 === $this->widget->id) ? 'create' : 'edit');
 
-			if (!$this->widget->$modifier($data)) return 'WIDGET_ERROR_MODIFY';
+			if (!$this->widget->$modifier($data)) {
+				return 'WIDGET_ERROR_MODIFY';
+			}
 
 			# ------------------------
 

www/engine/System/Classes/Utils/Map.php

Spacing +1 added lines, -1 removed lines

@@ -67,7 +67,7 @@
 
 			if (false === ($handler = self::parseString($route['handler'], REGEX_MAP_ITEM_HANDLER))) return;
 
-			self::$routes['/' . implode('/', $path)] = ('Addons\\' . $name . '\\' . implode('\\', $handler));
+			self::$routes['/'.implode('/', $path)] = ('Addons\\'.$name.'\\'.implode('\\', $handler));
 		}
 
 		# Parse item

Braces +15 added lines, -5 removed lines

@@ -52,7 +52,9 @@ 
 
 			$parts = preg_split('/\//', $string, 0, PREG_SPLIT_NO_EMPTY);
 
-			foreach ($parts as $name) if (!preg_match($regex, $name)) return false;
+			foreach ($parts as $name) {
+				if (!preg_match($regex, $name)) return false;
+			}
 
 			# ------------------------
 
@@ -63,9 +65,13 @@ 
 
 		private static function parseRoute(string $name, array $route) {
 
-			if (false === ($path = self::parseString($route['path'], REGEX_MAP_ITEM_PATH))) return;
+			if (false === ($path = self::parseString($route['path'], REGEX_MAP_ITEM_PATH))) {
+				return;
+			}
 
-			if (false === ($handler = self::parseString($route['handler'], REGEX_MAP_ITEM_HANDLER))) return;
+			if (false === ($handler = self::parseString($route['handler'], REGEX_MAP_ITEM_HANDLER))) {
+				return;
+			}
 
 			self::$routes['/' . implode('/', $path)] = ('Addons\\' . $name . '\\' . implode('\\', $handler));
 		}
@@ -74,14 +80,18 @@ 
 
 		private static function parseItem(array $item) {
 
-			foreach ($item['routes'] as $route) self::parseRoute($item['name'], $route);
+			foreach ($item['routes'] as $route) {
+				self::parseRoute($item['name'], $route);
+			}
 		}
 
 		# Autoloader
 
 		public static function __autoload() {
 
-			foreach (Extend\Addons::items() as $item) self::parseItem($item);
+			foreach (Extend\Addons::items() as $item) {
+				self::parseItem($item);
+			}
 		}
 
 		# Get handler by url