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);
 

Spacing +1 added lines, -1 removed lines

@@ -59,7 +59,7 @@
 
 			# ------------------------
 
-			return ('/' . $path . ($query ? ('?' . $query) : ''));
+			return ('/'.$path.($query ? ('?'.$query) : ''));
 		}
 	}
 }

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/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', ', ') . ')');
 			}

Spacing +2 added lines, -2 removed lines

@@ -24,12 +24,12 @@
 
 				if (0 === $key) $names = $this->getString(array_keys($row), '$name', ', ');
 
-				$values[] = ('(' . $this->getString(array_values($row), '$value', ', ') . ')');
+				$values[] = ('('.$this->getString(array_values($row), '$value', ', ').')');
 			}
 
 			# Build query
 
-			$this->query = ('INSERT INTO ' . $table . ' (' . $names . ') VALUES ' . implode(', ', $values));
+			$this->query = ('INSERT INTO '.$table.' ('.$names.') VALUES '.implode(', ', $values));
 		}
 	}
 }

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

Spacing +1 added lines, -1 removed lines

@@ -17,7 +17,7 @@
 
 		protected function getValue(string $value) {
 
-			return ('\'' . addslashes($value) . '\'');
+			return ('\''.addslashes($value).'\'');
 		}
 
 		# Get field sort

www/engine/Framework/Classes/Headers/Headers.php

Braces +12 added lines, -4 removed lines

@@ -117,7 +117,9 @@ 
 
 		public static function status(string $code) {
 
-			if (self::isStatusCode($code)) header(getenv('SERVER_PROTOCOL') . ' ' . self::$status_codes[$code]);
+			if (self::isStatusCode($code)) {
+				header(getenv('SERVER_PROTOCOL') . ' ' . self::$status_codes[$code]);
+			}
 		}
 
 		# Send content header
@@ -139,9 +141,13 @@ 
 
 		public static function cache(string $limiter, int $expires) {
 
-			if (self::$cache_send) return;
+			if (self::$cache_send) {
+				return;
+			}
 
-			if (!in_array($limiter, [CACHE_LIMITER_PRIVATE, CACHE_LIMITER_PUBLIC], true)) return;
+			if (!in_array($limiter, [CACHE_LIMITER_PRIVATE, CACHE_LIMITER_PUBLIC], true)) {
+				return;
+			}
 
 			header('Expires: ' . gmdate('D, d M Y H:i:s', (REQUEST_TIME + $expires)) . ' GMT');
 
@@ -160,7 +166,9 @@ 
 
 		public static function nocache() {
 
-			if (self::$cache_send) return;
+			if (self::$cache_send) {
+				return;
+			}
 
 			header('Expires: ' . gmdate('D, d M Y H:i:s', strtotime('-1 day')) . ' GMT');
 

Spacing +9 added lines, -9 removed lines

@@ -117,7 +117,7 @@ 
 
 		public static function status(string $code) {
 
-			if (self::isStatusCode($code)) header(getenv('SERVER_PROTOCOL') . ' ' . self::$status_codes[$code]);
+			if (self::isStatusCode($code)) header(getenv('SERVER_PROTOCOL').' '.self::$status_codes[$code]);
 		}
 
 		# Send content header
@@ -126,12 +126,12 @@ 
 
 			if (self::isContentTypeText($type)) {
 
-				return header('Content-type: ' . self::$content_types_text[$type] . '; charset=UTF-8');
+				return header('Content-type: '.self::$content_types_text[$type].'; charset=UTF-8');
 			}
 
 			if (self::isContentTypeMedia($type)) {
 
-				return header('Content-type: ' . self::$content_types_media[$type]);
+				return header('Content-type: '.self::$content_types_media[$type]);
 			}
 		}
 
@@ -143,13 +143,13 @@ 
 
 			if (!in_array($limiter, [CACHE_LIMITER_PRIVATE, CACHE_LIMITER_PUBLIC], true)) return;
 
-			header('Expires: ' . gmdate('D, d M Y H:i:s', (REQUEST_TIME + $expires)) . ' GMT');
+			header('Expires: '.gmdate('D, d M Y H:i:s', (REQUEST_TIME + $expires)).' GMT');
 
-			header('Last-Modified: ' . gmdate('D, d M Y H:i:s', REQUEST_TIME) . ' GMT');
+			header('Last-Modified: '.gmdate('D, d M Y H:i:s', REQUEST_TIME).' GMT');
 
-			header('Cache-Control: ' . $limiter . ', max-age=' . $expires . ', pre-check=' . $expires);
+			header('Cache-Control: '.$limiter.', max-age='.$expires.', pre-check='.$expires);
 
-			header('Pragma: ' . $limiter);
+			header('Pragma: '.$limiter);
 
 			# ------------------------
 
@@ -162,9 +162,9 @@ 
 
 			if (self::$cache_send) return;
 
-			header('Expires: ' . gmdate('D, d M Y H:i:s', strtotime('-1 day')) . ' GMT');
+			header('Expires: '.gmdate('D, d M Y H:i:s', strtotime('-1 day')).' GMT');
 
-			header('Last-Modified: ' . gmdate('D, d M Y H:i:s', strtotime('-1 day')) . ' GMT');
+			header('Last-Modified: '.gmdate('D, d M Y H:i:s', strtotime('-1 day')).' GMT');
 
 			header('Cache-Control: no-store, no-cache, must-revalidate, max-age=0');
 

www/engine/Framework/Classes/Ajax/Utils/Response.php

Braces +3 added lines, -1 removed lines

@@ -19,7 +19,9 @@
 
 		public function error(string $value = null) {
 
-			if (null !== $value) $this->set('error', $value);
+			if (null !== $value) {
+				$this->set('error', $value);
+			}
 
 			$this->status = false;
 

www/engine/Framework/Classes/Str/Str.php

Braces +19 added lines, -9 removed lines

@@ -10,14 +10,18 @@ 
 
 			foreach (($string = explode("\n", $string)) as $key => $line) {
 
-				if ($multiline && $codestyle) $string[$key] = rtrim(preg_replace('/[\r\0\x0B]+/', '', $line));
-
-				else $string[$key] = trim(preg_replace(['/[ \t]+/', '/[\r\0\x0B]+/'], [' ', ''], $line));
+				if ($multiline && $codestyle) {
+					$string[$key] = rtrim(preg_replace('/[\r\0\x0B]+/', '', $line));
+				} else {
+					$string[$key] = trim(preg_replace(['/[ \t]+/', '/[\r\0\x0B]+/'], [' ', ''], $line));
+				}
 			}
 
-			if (!$multiline) $string = preg_replace('/ {2,}/', ' ', trim(implode(' ', $string), ' '));
-
-			else $string = preg_replace('/(\r\n){3,}/', "\r\n\r\n", trim(implode("\r\n", $string), "\r\n"));
+			if (!$multiline) {
+				$string = preg_replace('/ {2,}/', ' ', trim(implode(' ', $string), ' '));
+			} else {
+				$string = preg_replace('/(\r\n){3,}/', "\r\n\r\n", trim(implode("\r\n", $string), "\r\n"));
+			}
 
 			# ------------------------
 
@@ -136,7 +140,9 @@ 
 
 		public static function cut(string $string, int $maxlength, bool $ellipsis = false) {
 
-			if (($maxlength < 1) || (self::length($string = trim($string)) <= $maxlength)) return $string;
+			if (($maxlength < 1) || (self::length($string = trim($string)) <= $maxlength)) {
+				return $string;
+			}
 
 			$string = (rtrim(self::substr($string, 0, $maxlength)) . ($ellipsis ? '...' : ''));
 
@@ -149,9 +155,13 @@ 
 
 		public static function random(int $length, string $pool = STR_POOL_DEFAULT) {
 
-			if (($length < 1) || (0 === ($pool_length = self::length($pool)))) return '';
+			if (($length < 1) || (0 === ($pool_length = self::length($pool)))) {
+				return '';
+			}
 
-			$string = ''; for ($i = 0; $i < $length; $i++) $string .= self::substr($pool, random_int(0, ($pool_length - 1)), 1);
+			$string = ''; for ($i = 0; $i < $length; $i++) {
+				$string .= self::substr($pool, random_int(0, ($pool_length - 1)), 1);
+			}
 
 			# ------------------------
 

Spacing +21 added lines, -21 removed lines

@@ -53,25 +53,25 @@ 
 
 			$pattern = [
 
-				'А' => 'A',     'Б' => 'B',     'В' => 'V',     'Г' => 'G',
-				'Д' => 'D',     'Е' => 'E',     'Ж' => 'ZH',    'З' => 'Z',
-				'И' => 'I',     'Й' => 'J',     'К' => 'K',     'Л' => 'L',
-				'М' => 'M',     'Н' => 'N',     'О' => 'O',     'П' => 'P',
-				'Р' => 'R',     'С' => 'S',     'Т' => 'T',     'У' => 'U',
-				'Ф' => 'F',     'Х' => 'H',     'Ц' => 'C',     'Ч' => 'CH',
-				'Ш' => 'SH',    'Щ' => 'SCH',   'Ъ' => '',      'Ь' => '',
-				'Ы' => 'Y',     'Э' => 'E',     'Ю' => 'JU',    'Я' => 'JA',
-				'І' => 'I',     'Ї' => 'JI',    'Ё' => 'JO',
-
-				'а' => 'a',     'б' => 'b',     'в' => 'v',     'г' => 'g',
-				'д' => 'd',     'е' => 'e',     'ж' => 'zh',    'з' => 'z',
-				'и' => 'i',     'й' => 'j',     'к' => 'k',     'л' => 'l',
-				'м' => 'm',     'н' => 'n',     'о' => 'o',     'п' => 'p',
-				'р' => 'r',     'с' => 's',     'т' => 't',     'у' => 'u',
-				'ф' => 'f',     'х' => 'h',     'ц' => 'c',     'ч' => 'ch',
-				'ш' => 'sh',    'щ' => 'sch',   'ъ' => '',      'ь' => '',
-				'ы' => 'y',     'э' => 'e',     'ю' => 'ju',    'я' => 'ja',
-				'і' => 'i',     'ї' => 'ji',    'ё' => 'jo'
+				'А' => 'A', 'Б' => 'B', 'В' => 'V', 'Г' => 'G',
+				'Д' => 'D', 'Е' => 'E', 'Ж' => 'ZH', 'З' => 'Z',
+				'И' => 'I', 'Й' => 'J', 'К' => 'K', 'Л' => 'L',
+				'М' => 'M', 'Н' => 'N', 'О' => 'O', 'П' => 'P',
+				'Р' => 'R', 'С' => 'S', 'Т' => 'T', 'У' => 'U',
+				'Ф' => 'F', 'Х' => 'H', 'Ц' => 'C', 'Ч' => 'CH',
+				'Ш' => 'SH', 'Щ' => 'SCH', 'Ъ' => '', 'Ь' => '',
+				'Ы' => 'Y', 'Э' => 'E', 'Ю' => 'JU', 'Я' => 'JA',
+				'І' => 'I', 'Ї' => 'JI', 'Ё' => 'JO',
+
+				'а' => 'a', 'б' => 'b', 'в' => 'v', 'г' => 'g',
+				'д' => 'd', 'е' => 'e', 'ж' => 'zh', 'з' => 'z',
+				'и' => 'i', 'й' => 'j', 'к' => 'k', 'л' => 'l',
+				'м' => 'm', 'н' => 'n', 'о' => 'o', 'п' => 'p',
+				'р' => 'r', 'с' => 's', 'т' => 't', 'у' => 'u',
+				'ф' => 'f', 'х' => 'h', 'ц' => 'c', 'ч' => 'ch',
+				'ш' => 'sh', 'щ' => 'sch', 'ъ' => '', 'ь' => '',
+				'ы' => 'y', 'э' => 'e', 'ю' => 'ju', 'я' => 'ja',
+				'і' => 'i', 'ї' => 'ji', 'ё' => 'jo'
 			];
 
 			# ------------------------
@@ -138,7 +138,7 @@ 
 
 			if (($maxlength < 1) || (self::length($string = trim($string)) <= $maxlength)) return $string;
 
-			$string = (rtrim(self::substr($string, 0, $maxlength)) . ($ellipsis ? '...' : ''));
+			$string = (rtrim(self::substr($string, 0, $maxlength)).($ellipsis ? '...' : ''));
 
 			# ------------------------
 
@@ -162,7 +162,7 @@ 
 
 		public static function encode(string $key, string $string) {
 
-			return sha1($key . substr(sha1($string), 8, 32));
+			return sha1($key.substr(sha1($string), 8, 32));
 		}
 	}
 }

www/engine/Framework/Classes/Agent/Agent.php

Braces +12 added lines, -4 removed lines

@@ -10,9 +10,13 @@ 
 
 		private static function search(array &$list) {
 
-			if (empty($agent = getenv('HTTP_USER_AGENT'))) return false;
+			if (empty($agent = getenv('HTTP_USER_AGENT'))) {
+				return false;
+			}
 
-			foreach ($list as $item) if (false !== stripos($agent, $item)) return true;
+			foreach ($list as $item) {
+				if (false !== stripos($agent, $item)) return true;
+			}
 
 			# ------------------------
 
@@ -27,9 +31,13 @@ 
 
 			$file_robots = (DIR_DATA . 'Agent/Robots.php');
 
-			if (is_array($mobiles = Explorer::php($file_mobiles))) self::$mobiles = $mobiles;
+			if (is_array($mobiles = Explorer::php($file_mobiles))) {
+				self::$mobiles = $mobiles;
+			}
 
-			if (is_array($robots = Explorer::php($file_robots))) self::$robots = $robots;
+			if (is_array($robots = Explorer::php($file_robots))) {
+				self::$robots = $robots;
+			}
 		}
 
 		# Check if user agent is mobile

Spacing +2 added lines, -2 removed lines

@@ -23,9 +23,9 @@
 
 		public static function __autoload() {
 
-			$file_mobiles = (DIR_DATA . 'Agent/Mobiles.php');
+			$file_mobiles = (DIR_DATA.'Agent/Mobiles.php');
 
-			$file_robots = (DIR_DATA . 'Agent/Robots.php');
+			$file_robots = (DIR_DATA.'Agent/Robots.php');
 
 			if (is_array($mobiles = Explorer::php($file_mobiles))) self::$mobiles = $mobiles;