cadmium-org / cadmium-cms

www/engine/Framework/Classes/Url/Url.php

Braces +12 added lines, -4 removed lines

@@ -10,18 +10,24 @@ 
 
 		public function __construct(string $url = '') {
 
-			if (false === ($url = parse_url($url))) return;
+			if (false === ($url = parse_url($url))) {
+				return;
+			}
 
 			# Parse path
 
-			if (isset($url['path'])) foreach (explode('/', $url['path']) as $part) {
+			if (isset($url['path'])) {
+				foreach (explode('/', $url['path']) as $part) {
 
 				if ('' !== $part) $this->path[] = urldecode($part);
 			}
+			}
 
 			# Parse query
 
-			if (isset($url['query'])) parse_str($url['query'], $this->query);
+			if (isset($url['query'])) {
+				parse_str($url['query'], $this->query);
+			}
 		}
 
 		# Return path
@@ -53,7 +59,9 @@ 
 
 			$path = [];
 
-			foreach ($this->path as $value) $path[] = urlencode($value);
+			foreach ($this->path as $value) {
+				$path[] = urlencode($value);
+			}
 
 			$path = implode('/', $path); $query = http_build_query($this->query);
 

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 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;
 		}
@@ -155,7 +165,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);
 		}
@@ -164,7 +176,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);
 		}
@@ -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);
 		}

www/engine/Framework/Classes/DB/DB.php

Braces +18 added lines, -6 removed lines

@@ -12,19 +12,29 @@ 
 
 			# Establish connection
 
-			if (false === ($link = @mysqli_connect($server, $user, $password))) throw new Exception\DBConnect();
+			if (false === ($link = @mysqli_connect($server, $user, $password))) {
+				throw new Exception\DBConnect();
+			}
 
 			# Select database
 
-			if (!@mysqli_select_db($link, $name)) throw new Exception\DBSelect();
+			if (!@mysqli_select_db($link, $name)) {
+				throw new Exception\DBSelect();
+			}
 
 			# Set encoding
 
-			if (!@mysqli_query($link, "SET character_set_client = 'utf8'")) throw new Exception\DBCharset();
+			if (!@mysqli_query($link, "SET character_set_client = 'utf8'")) {
+				throw new Exception\DBCharset();
+			}
 
-			if (!@mysqli_query($link, "SET character_set_results = 'utf8'")) throw new Exception\DBCharset();
+			if (!@mysqli_query($link, "SET character_set_results = 'utf8'")) {
+				throw new Exception\DBCharset();
+			}
 
-			if (!@mysqli_query($link, "SET collation_connection = 'utf8_general_ci'")) throw new Exception\DBCharset();
+			if (!@mysqli_query($link, "SET collation_connection = 'utf8_general_ci'")) {
+				throw new Exception\DBCharset();
+			}
 
 			# ------------------------
 
@@ -35,7 +45,9 @@ 
 
 		public static function send(string $query) {
 
-			if (null === self::$link) return (self::$last = false);
+			if (null === self::$link) {
+				return (self::$last = false);
+			}
 
 			$time = microtime(true); $result = mysqli_query(self::$link, $query); $time = (microtime(true) - $time);
 

www/engine/Framework/Classes/DB/Query/Select.php

Spacing +2 added lines, -2 removed lines

@@ -22,9 +22,9 @@
 
 			# Build query
 
-			$this->query = ('SELECT ' . $selection . ' FROM ' . $table . ($condition ? (' WHERE (' .  $condition . ')') : '') .
+			$this->query = ('SELECT ' . $selection . ' FROM ' . $table . ($condition ? (' WHERE (' . $condition . ')') : '') .
 
-				($order ? (' ORDER BY ' .  $order) : '') . ($limit ? (' LIMIT ' .  $limit) : ''));
+				($order ? (' ORDER BY ' . $order) : '') . ($limit ? (' LIMIT ' . $limit) : ''));
 		}
 	}
 }

www/engine/Framework/Classes/DB/Query/Insert.php

Braces +3 added lines, -1 removed lines

@@ -20,9 +20,11 @@
 
 			$names = ''; $values = [];
 
-			foreach ($dataset as $key => $row) if (is_array($row)) {
+			foreach ($dataset as $key => $row) {
+				if (is_array($row)) {
 
 				if (0 === $key) $names = $this->getString(array_keys($row), '$name', ', ');
+			}
 
 				$values[] = ('(' . $this->getString(array_values($row), '$value', ', ') . ')');
 			}

www/engine/Framework/Classes/DB/Query/Update.php

Spacing +1 added lines, -1 removed lines

@@ -20,7 +20,7 @@
 
 			# Build query
 
-			$this->query = ('UPDATE ' . $table . ' SET ' . $dataset . ($condition ? (' WHERE (' .  $condition . ')') : ''));
+			$this->query = ('UPDATE ' . $table . ' SET ' . $dataset . ($condition ? (' WHERE (' . $condition . ')') : ''));
 		}
 	}
 }

www/engine/Framework/Classes/DB/Query/Delete.php

Spacing +1 added lines, -1 removed lines

@@ -18,7 +18,7 @@
 
 			# Build query
 
-			$this->query = ('DELETE FROM ' . $table . ($condition ? (' WHERE (' .  $condition . ')') : ''));
+			$this->query = ('DELETE FROM ' . $table . ($condition ? (' WHERE (' . $condition . ')') : ''));
 		}
 	}
 }

www/engine/Framework/Classes/DB/Utils/Result.php

Braces +9 added lines, -3 removed lines

@@ -40,7 +40,9 @@ 
 
 		public function row() {
 
-			if (!is_object($this->result)) return null;
+			if (!is_object($this->result)) {
+				return null;
+			}
 
 			return mysqli_fetch_assoc($this->result);
 		}
@@ -49,9 +51,13 @@ 
 
 		public function rows() {
 
-			if (!is_object($this->result)) return [];
+			if (!is_object($this->result)) {
+				return [];
+			}
 
-			$rows = []; while (null !== ($row = $this->row())) $rows[] = $row;
+			$rows = []; while (null !== ($row = $this->row())) {
+				$rows[] = $row;
+			}
 
 			# ------------------------
 

www/engine/Framework/Classes/DB/Utils/Query.php

Braces +14 added lines, -5 removed lines

@@ -31,7 +31,9 @@ 
 
 		protected function getString($source = null, string $pattern = '', string $separator = '') {
 
-			if (!is_array($source)) return (is_scalar($source) ? strval($source) : '');
+			if (!is_array($source)) {
+				return (is_scalar($source) ? strval($source) : '');
+			}
 
 			$regexs = ['key' => '/\^([a-z]+)/', 'value' => '/\$([a-z]+)/']; $matches = ['key' => [], 'value' => []];
 
@@ -39,18 +41,25 @@ 
 
 			# Parse pattern
 
-			foreach ($regexs as $name => $regex) preg_match($regex, $pattern, $matches[$name]);
+			foreach ($regexs as $name => $regex) {
+				preg_match($regex, $pattern, $matches[$name]);
+			}
 
 			# Process replacements
 
-			foreach ($source as $key => $value) if (is_scalar($value)) {
+			foreach ($source as $key => $value) {
+				if (is_scalar($value)) {
 
-				$output[$count] = $pattern; $item = &$output[$count++];
+				$output[$count] = $pattern;
+			}
+			$item = &$output[$count++];
 
-				foreach ($matches as $name => $match) if (isset($match[1]) && isset($parsers[$match[1]])) {
+				foreach ($matches as $name => $match) {
+					if (isset($match[1]) && isset($parsers[$match[1]])) {
 
 					$item = str_replace($match[0], [$this, $parsers[$match[1]]]($$name), $item);
 				}
+				}
 			};
 
 			# ------------------------