cadmium-org / cadmium-cms

www/engine/System/Exception.php

Spacing +6 added lines, -6 removed lines

@@ -9,32 +9,32 @@
 
 namespace Exception {
 
-	class Captcha extends Exception  {
+	class Captcha extends Exception {
 
 		protected $message = 'Error generating captcha';
 	}
 
-	class Sitemap extends Exception  {
+	class Sitemap extends Exception {
 
 		protected $message = 'Error generating sitemap';
 	}
 
-	class Language extends Exception  {
+	class Language extends Exception {
 
 		protected $message = 'Languages not found';
 	}
 
-	class Template extends Exception  {
+	class Template extends Exception {
 
 		protected $message = 'Templates not found';
 	}
 
-	class View extends Exception  {
+	class View extends Exception {
 
 		protected $message = 'View is not initialized';
 	}
 
-	class ViewFile extends Exception  {
+	class ViewFile extends Exception {
 
 		protected $message = 'View file \'$value$\' not found';
 	}

www/engine/Framework/Classes/Session/Session.php

Braces +9 added lines, -3 removed lines

@@ -19,7 +19,9 @@ 
 
 		public static function start(string $name, int $lifetime) : bool {
 
-			if (session_id()) return true;
+			if (session_id()) {
+				return true;
+			}
 
 			ini_set('session.gc_maxlifetime', $lifetime);
 
@@ -47,7 +49,9 @@ 
 
 		public static function set(string $name, $value) {
 
-			if (session_id()) $_SESSION[$name] = $value;
+			if (session_id()) {
+				$_SESSION[$name] = $value;
+			}
 		}
 
 		/**
@@ -76,7 +80,9 @@ 
 
 		public static function delete(string $name) {
 
-			if (isset($_SESSION[$name])) unset($_SESSION[$name]);
+			if (isset($_SESSION[$name])) {
+				unset($_SESSION[$name]);
+			}
 		}
 	}
 }

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

Spacing +21 added lines, -21 removed lines

@@ -73,25 +73,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'
 			];
 
 			# ------------------------
@@ -176,7 +176,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 ? '...' : ''));
 
 			# ------------------------
 
@@ -204,7 +204,7 @@ 
 
 		public static function encode(string $salt, string $string) : string {
 
-			return sha1($salt . substr(sha1($string), 8, 32));
+			return sha1($salt.substr(sha1($string), 8, 32));
 		}
 	}
 }

Braces +19 added lines, -9 removed lines

@@ -22,14 +22,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"));
+			}
 
 			# ------------------------
 
@@ -174,7 +178,9 @@ 
 
 		public static function cut(string $string, int $maxlength, bool $ellipsis = false) : string {
 
-			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 ? '...' : ''));
 
@@ -189,9 +195,13 @@ 
 
 		public static function random(int $length, string $pool = STR_POOL_DEFAULT) : string {
 
-			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);
+			}
 
 			# ------------------------
 

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

Spacing +10 added lines, -10 removed lines

@@ -30,7 +30,7 @@ 
 
 		protected function getValue(string $value) : string {
 
-			return ('\'' . addslashes($value) . '\'');
+			return ('\''.addslashes($value).'\'');
 		}
 
 		/**
@@ -41,7 +41,7 @@ 
 
 			$parser = function($value) { if (is_scalar($value)) return $this->getValue($value); };
 
-			return ('(' . implode(', ', array_filter(array_map($parser, $value))) . ')');
+			return ('('.implode(', ', array_filter(array_map($parser, $value))).')');
 		}
 
 		/**
@@ -50,21 +50,21 @@ 
 
 		protected function getOperatable($value) {
 
-			if (is_scalar($value)) return ('= ' . $this->getValue($value));
+			if (is_scalar($value)) return ('= '.$this->getValue($value));
 
-			if (is_array($value)) return ('IN ' . $this->getRange($value));
+			if (is_array($value)) return ('IN '.$this->getRange($value));
 
-			if ($value instanceof Type\Not) return ('NOT ' . $this->getValue($value->get()));
+			if ($value instanceof Type\Not) return ('NOT '.$this->getValue($value->get()));
 
-			if ($value instanceof Type\Like) return ('LIKE ' . $this->getValue($value->get()));
+			if ($value instanceof Type\Like) return ('LIKE '.$this->getValue($value->get()));
 
-			if ($value instanceof Type\LessThan) return ('< ' . $value->get());
+			if ($value instanceof Type\LessThan) return ('< '.$value->get());
 
-			if ($value instanceof Type\GreaterThan) return ('> ' . $value->get());
+			if ($value instanceof Type\GreaterThan) return ('> '.$value->get());
 
-			if ($value instanceof Type\LessThanOrEqual) return ('<= ' . $value->get());
+			if ($value instanceof Type\LessThanOrEqual) return ('<= '.$value->get());
 
-			if ($value instanceof Type\GreaterThanOrEqual) return ('>= ' . $value->get());
+			if ($value instanceof Type\GreaterThanOrEqual) return ('>= '.$value->get());
 
 			# ------------------------
 

Braces +39 added lines, -13 removed lines

@@ -39,7 +39,10 @@ 
 
 		protected function getRange(array $value) : string {
 
-			$parser = function($value) { if (is_scalar($value)) return $this->getValue($value); };
+			$parser = function($value) { if (is_scalar($value)) {
+				return $this->getValue($value);
+			}
+			};
 
 			return ('(' . implode(', ', array_filter(array_map($parser, $value))) . ')');
 		}
@@ -50,21 +53,37 @@ 
 
 		protected function getOperatable($value) {
 
-			if (is_scalar($value)) return ('= ' . $this->getValue($value));
+			if (is_scalar($value)) {
+				return ('= ' . $this->getValue($value));
+			}
 
-			if (is_array($value)) return ('IN ' . $this->getRange($value));
+			if (is_array($value)) {
+				return ('IN ' . $this->getRange($value));
+			}
 
-			if ($value instanceof Type\Not) return ('NOT ' . $this->getValue($value->get()));
+			if ($value instanceof Type\Not) {
+				return ('NOT ' . $this->getValue($value->get()));
+			}
 
-			if ($value instanceof Type\Like) return ('LIKE ' . $this->getValue($value->get()));
+			if ($value instanceof Type\Like) {
+				return ('LIKE ' . $this->getValue($value->get()));
+			}
 
-			if ($value instanceof Type\LessThan) return ('< ' . $value->get());
+			if ($value instanceof Type\LessThan) {
+				return ('< ' . $value->get());
+			}
 
-			if ($value instanceof Type\GreaterThan) return ('> ' . $value->get());
+			if ($value instanceof Type\GreaterThan) {
+				return ('> ' . $value->get());
+			}
 
-			if ($value instanceof Type\LessThanOrEqual) return ('<= ' . $value->get());
+			if ($value instanceof Type\LessThanOrEqual) {
+				return ('<= ' . $value->get());
+			}
 
-			if ($value instanceof Type\GreaterThanOrEqual) return ('>= ' . $value->get());
+			if ($value instanceof Type\GreaterThanOrEqual) {
+				return ('>= ' . $value->get());
+			}
 
 			# ------------------------
 
@@ -86,7 +105,9 @@ 
 
 		protected function getString($source = null, string $pattern = '', string $separator = '') : string {
 
-			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' => []];
 
@@ -98,7 +119,9 @@ 
 
 			# 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
 
@@ -106,9 +129,12 @@ 
 
 				$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]])) {
 
-					try { $replace = [$this, $parsers[$match[1]]]($$name); } catch (\TypeError $e) { $replace = ''; }
+					try { $replace = [$this, $parsers[$match[1]]]($$name);
+				}
+				} catch (\TypeError $e) { $replace = ''; }
 
 					$item = str_replace($match[0], $replace, $item);
 				}

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

Spacing +3 added lines, -3 removed lines

@@ -23,15 +23,15 @@
 
 			$table = $this->getName($table);
 
-			if ($column !== '*') $column = (($distinct ? 'DISTINCT ' : '') . $this->getName($column));
+			if ($column !== '*') $column = (($distinct ? 'DISTINCT ' : '').$this->getName($column));
 
 			$condition = $this->getString($condition, '^name $operatable', ' AND ');
 
 			# Build query
 
-			$this->query = ('SELECT COUNT(' . $column . ') as count ' .
+			$this->query = ('SELECT COUNT('.$column.') as count '.
 
-				'FROM ' . $table . ($condition ? (' WHERE (' .  $condition . ')') : ''));
+				'FROM '.$table.($condition ? (' WHERE ('.$condition.')') : ''));
 		}
 	}
 }

Braces +3 added lines, -1 removed lines

@@ -23,7 +23,9 @@
 
 			$table = $this->getName($table);
 
-			if ($column !== '*') $column = (($distinct ? 'DISTINCT ' : '') . $this->getName($column));
+			if ($column !== '*') {
+				$column = (($distinct ? 'DISTINCT ' : '') . $this->getName($column));
+			}
 
 			$condition = $this->getString($condition, '^name $operatable', ' AND ');
 

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

Braces +9 added lines, -3 removed lines

@@ -58,7 +58,9 @@ 
 
 		public function getRow() {
 
-			if (!is_object($this->result)) return null;
+			if (!is_object($this->result)) {
+				return null;
+			}
 
 			return mysqli_fetch_assoc($this->result);
 		}
@@ -69,9 +71,13 @@ 
 
 		public function getRows() : array {
 
-			if (!is_object($this->result)) return [];
+			if (!is_object($this->result)) {
+				return [];
+			}
 
-			$rows = []; while (null !== ($row = $this->getRow())) $rows[] = $row;
+			$rows = []; while (null !== ($row = $this->getRow())) {
+				$rows[] = $row;
+			}
 
 			# ------------------------
 

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

Braces +3 added lines, -1 removed lines

@@ -52,7 +52,9 @@
 
 		public function addItems(array $items) : Loop {
 
-			foreach ($items as $item) if (is_array($item)) $this->addItem($item);
+			foreach ($items as $item) {
+				if (is_array($item)) $this->addItem($item);
+			}
 
 			return $this;
 		}

www/engine/Framework/Classes/Mime/Mime.php

Spacing +2 added lines, -2 removed lines

@@ -21,7 +21,7 @@ 
 
 			if (false === ($mime = self::get($extension))) return false;
 
-			return (preg_match(('/^' . $type . '\//'), $mime) ? true : false);
+			return (preg_match(('/^'.$type.'\//'), $mime) ? true : false);
 		}
 
 		/**
@@ -30,7 +30,7 @@ 
 
 		public static function __autoload() {
 
-			self::init(DIR_DATA . 'Mime.php');
+			self::init(DIR_DATA.'Mime.php');
 		}
 
 		/**

Braces +3 added lines, -1 removed lines

@@ -19,7 +19,9 @@
 
 		private static function checkType(string $extension, string $type) : bool {
 
-			if (false === ($mime = self::get($extension))) return false;
+			if (false === ($mime = self::get($extension))) {
+				return false;
+			}
 
 			return (preg_match(('/^' . $type . '\//'), $mime) ? true : false);
 		}

www/engine/Framework/Classes/Language/Language.php

Braces +9 added lines, -3 removed lines

@@ -19,7 +19,9 @@ 
 
 		private static function addPhrase(string $name, string $value) {
 
-			if (preg_match(REGEX_LANGUAGE_PHRASE_NAME, $name)) self::$phrases[$name] = $value;
+			if (preg_match(REGEX_LANGUAGE_PHRASE_NAME, $name)) {
+				self::$phrases[$name] = $value;
+			}
 		}
 
 		/**
@@ -30,9 +32,13 @@ 
 
 		public static function load(string $file_name) : bool {
 
-			if (!is_array($phrases = Explorer::include($file_name))) return false;
+			if (!is_array($phrases = Explorer::include($file_name))) {
+				return false;
+			}
 
-			foreach ($phrases as $name => $value) if (is_scalar($value)) self::addPhrase($name, $value);
+			foreach ($phrases as $name => $value) {
+				if (is_scalar($value)) self::addPhrase($name, $value);
+			}
 
 			# ------------------------