cadmium-org / cadmium-cms

www/engine/Framework/Classes/Explorer/Explorer.php

Braces +28 added lines, -10 removed lines

@@ -12,9 +12,13 @@ 
 
 				while (false !== ($name = readdir($handler))) {
 
-					if (($name === '.') || ($name === '..')) continue;
+					if (($name === '.') || ($name === '..')) {
+						continue;
+					}
 
-					if ($dirs ? @is_dir($dir_name . $name) : @is_file($dir_name . $name)) yield $name;
+					if ($dirs ? @is_dir($dir_name . $name) : @is_file($dir_name . $name)) {
+						yield $name;
+					}
 				}
 
 				closedir($handler);
@@ -25,7 +29,9 @@ 
 
 		private static function getInfo(string $file_name, int $param, bool $check_exists = true) {
 
-			if ($check_exists && !self::isFile($file_name)) return false;
+			if ($check_exists && !self::isFile($file_name)) {
+				return false;
+			}
 
 			return pathinfo($file_name, $param);
 		}
@@ -68,9 +74,11 @@ 
 
 					$name = ($dir_name . '/' . $name);
 
-					if (@is_file($name)) self::removeFile($name);
-
-					else if (@is_dir($name)) self::removeDir($name, true);
+					if (@is_file($name)) {
+						self::removeFile($name);
+					} else if (@is_dir($name)) {
+						self::removeDir($name, true);
+					}
 				}
 			}
 
@@ -146,7 +154,9 @@ 
 
 		public static function json(string $file_name) {
 
-			if ((strtolower(self::extension($file_name)) !== 'json')) return false;
+			if ((strtolower(self::extension($file_name)) !== 'json')) {
+				return false;
+			}
 
 			return (json_decode(@file_get_contents($file_name), true) ?? false);
 		}
@@ -155,7 +165,9 @@ 
 
 		public static function php(string $file_name) {
 
-			if ((strtolower(self::extension($file_name)) !== 'php')) return false;
+			if ((strtolower(self::extension($file_name)) !== 'php')) {
+				return false;
+			}
 
 			return include $file_name;
 		}
@@ -164,7 +176,9 @@ 
 
 		public static function xml(string $file_name) {
 
-			if ((strtolower(self::extension($file_name)) !== 'xml')) return false;
+			if ((strtolower(self::extension($file_name)) !== 'xml')) {
+				return false;
+			}
 
 			return @simplexml_load_file($file_name);
 		}
@@ -173,7 +187,11 @@ 
 
 		public static function save(string $file_name, string $contents, bool $force = false) {
 
-			if (self::isFile($file_name)) if (!$force) return false; else if (!@unlink($file_name)) return false;
+			if (self::isFile($file_name)) {
+				if (!$force) return false;
+			} else if (!@unlink($file_name)) {
+				return false;
+			}
 
 			return @file_put_contents($file_name, $contents);
 		}

Spacing +2 added lines, -2 removed lines

@@ -14,7 +14,7 @@ 
 
 					if (($name === '.') || ($name === '..')) continue;
 
-					if ($dirs ? @is_dir($dir_name . $name) : @is_file($dir_name . $name)) yield $name;
+					if ($dirs ? @is_dir($dir_name.$name) : @is_file($dir_name.$name)) yield $name;
 				}
 
 				closedir($handler);
@@ -66,7 +66,7 @@ 
 
 				foreach (array_diff($list, ['.', '..']) as $name) {
 
-					$name = ($dir_name . '/' . $name);
+					$name = ($dir_name.'/'.$name);
 
 					if (@is_file($name)) self::removeFile($name);
 

www/engine/Framework/Classes/Arr/Arr.php

Braces +20 added lines, -5 removed lines

@@ -10,7 +10,12 @@ 
 
 			$value = false;
 
-			foreach ($path as $item) if (isset($array[$item])) $value = ($array = $array[$item]); else return false;
+			foreach ($path as $item) {
+				if (isset($array[$item])) $value = ($array = $array[$item]);
+			}
+			else {
+				return false;
+			}
 
 			# ------------------------
 
@@ -23,10 +28,12 @@ 
 
 			$result = [];
 
-			foreach ($keys as $key) if (is_scalar($key)) {
+			foreach ($keys as $key) {
+				if (is_scalar($key)) {
 
 				$result[$key] = ((isset($array[$key]) && is_scalar($array[$key])) ? $array[$key] : false);
 			}
+			}
 
 			# ------------------------
 
@@ -39,7 +46,9 @@ 
 
 			$result = [];
 
-			foreach ($array as $key => $value) $result[] = [$key_name => $key, $value_name => $value];
+			foreach ($array as $key => $value) {
+				$result[] = [$key_name => $key, $value_name => $value];
+			}
 
 			# ------------------------
 
@@ -57,9 +66,15 @@ 
 
 			$column = array_map($select_key, $array);
 
-			if (!$descending) asort($column); else arsort($column);
+			if (!$descending) {
+				asort($column);
+			} else {
+				arsort($column);
+			}
 
-			$result = []; foreach (array_keys($column) as $key) $result[$key] = $array[$key];
+			$result = []; foreach (array_keys($column) as $key) {
+				$result[$key] = $array[$key];
+			}
 
 			# ------------------------
 

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

Braces +24 added lines, -8 removed lines

@@ -14,7 +14,9 @@ 
 
 			$urlset = '<urlset xmlns="http://www.sitemaps.org/schemas/sitemap/0.9" />';
 
-			if (false !== ($xml = XML::create($urlset))) $this->xml = $xml;
+			if (false !== ($xml = XML::create($urlset))) {
+				$this->xml = $xml;
+			}
 		}
 
 		# Load sitemap
@@ -25,9 +27,13 @@ 
 
 			$modified = Explorer::modified($file_name);
 
-			if ((false === $modified) || ($modified <= $time)) return false;
+			if ((false === $modified) || ($modified <= $time)) {
+				return false;
+			}
 
-			if (false === ($xml = Explorer::xml($file_name))) return false;
+			if (false === ($xml = Explorer::xml($file_name))) {
+				return false;
+			}
 
 			$this->xml = $xml; $this->loaded = true;
 
@@ -40,11 +46,15 @@ 
 
 		public function save() {
 
-			if ((null === $this->xml) || $this->loaded) return false;
+			if ((null === $this->xml) || $this->loaded) {
+				return false;
+			}
 
 			$file_name = (DIR_SYSTEM_DATA . 'Sitemap.xml');
 
-			if (false === Explorer::save($file_name, XML::string($this->xml), true)) return false;
+			if (false === Explorer::save($file_name, XML::string($this->xml), true)) {
+				return false;
+			}
 
 			# ------------------------
 
@@ -55,9 +65,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
 
@@ -79,7 +93,9 @@ 
 
 			# Set priority
 
-			if (null !== $priority) $url->addChild('priority', Number::formatFloat($priority, 0, 1, 1));
+			if (null !== $priority) {
+				$url->addChild('priority', Number::formatFloat($priority, 0, 1, 1));
+			}
 
 			# ------------------------
 

Spacing +2 added lines, -2 removed lines

@@ -21,7 +21,7 @@ 
 
 		public function load(int $time) {
 
-			$file_name = (DIR_SYSTEM_DATA . 'Sitemap.xml');
+			$file_name = (DIR_SYSTEM_DATA.'Sitemap.xml');
 
 			$modified = Explorer::modified($file_name);
 
@@ -42,7 +42,7 @@ 
 
 			if ((null === $this->xml) || $this->loaded) return false;
 
-			$file_name = (DIR_SYSTEM_DATA . 'Sitemap.xml');
+			$file_name = (DIR_SYSTEM_DATA.'Sitemap.xml');
 
 			if (false === Explorer::save($file_name, XML::string($this->xml), true)) return false;
 

www/engine/System/Classes/Utils/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::format($value, 0, 255);
+			foreach (array_values($color) as $key => $value) {
+				$color[$key] = Number::format($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/Framework/Classes/XML/XML.php

Braces +3 added lines, -1 removed lines

@@ -17,7 +17,9 @@
 
 		public static function string(SimpleXMLElement $xml) {
 
-			if (false === ($xml = dom_import_simplexml($xml))) return '';
+			if (false === ($xml = dom_import_simplexml($xml))) {
+				return '';
+			}
 
 			$dom = $xml->ownerDocument; $dom->formatOutput = true;
 

Spacing +1 added lines, -1 removed lines

@@ -8,7 +8,7 @@
 
 		public static function create(string $data) {
 
-			$data = ('<?xml version="1.0" encoding="UTF-8" ?>' . $data);
+			$data = ('<?xml version="1.0" encoding="UTF-8" ?>'.$data);
 
 			return @simplexml_load_string($data);
 		}

www/engine/Framework/Classes/Geo/Country.php

Spacing +1 added lines, -1 removed lines

@@ -12,7 +12,7 @@
 
 		public static function __autoload() {
 
-			self::init(DIR_DATA . 'Geo/Countries.php');
+			self::init(DIR_DATA.'Geo/Countries.php');
 		}
 	}
 }

www/engine/Framework/Classes/Geo/Timezone.php

Spacing +1 added lines, -1 removed lines

@@ -12,7 +12,7 @@
 
 		public static function __autoload() {
 
-			self::init(DIR_DATA . 'Geo/Timezones.php');
+			self::init(DIR_DATA.'Geo/Timezones.php');
 		}
 	}
 }

www/engine/Framework/Classes/Request/Request.php

Spacing +1 added lines, -1 removed lines

@@ -45,7 +45,7 @@
 
 		public static function redirect(string $url) {
 
-			header("Location: " . $url); exit();
+			header("Location: ".$url); exit();
 		}
 	}
 }

www/engine/Framework/Classes/Mailer/Mailer.php

Spacing +4 added lines, -4 removed lines

@@ -12,13 +12,13 @@
 
 			# Set headers
 
-			$headers  = ('MIME-Version: 1.0' . "\r\n");
+			$headers  = ('MIME-Version: 1.0'."\r\n");
 
-			$headers .= ('Content-Type: ' . ($is_html ? 'text/html' : 'text/plain') . '; charset=UTF-8' . "\r\n");
+			$headers .= ('Content-Type: '.($is_html ? 'text/html' : 'text/plain').'; charset=UTF-8'."\r\n");
 
-			$headers .= ('From: ' . $sender . ' <' . $from . '>' . "\r\n" . 'Reply-To: ' . $reply_to . "\r\n");
+			$headers .= ('From: '.$sender.' <'.$from.'>'."\r\n".'Reply-To: '.$reply_to."\r\n");
 
-			$headers .= ('X-Mailer: PHP/' . phpversion() . "\r\n");
+			$headers .= ('X-Mailer: PHP/'.phpversion()."\r\n");
 
 			# Send message