cadmium-org / cadmium-cms

www/engine/System/Classes/Modules/Profile/Handler/Overview.php

Braces +8 added lines, -4 removed lines

@@ -41,14 +41,18 @@
 
 			foreach (['full_name', 'city'] as $name) {
 
-				if ('' === ($text = Auth::get($name))) $contents->getBlock($name)->disable();
-
-				else $contents->getBlock($name)->text = $text;
+				if ('' === ($text = Auth::get($name))) {
+					$contents->getBlock($name)->disable();
+				} else {
+					$contents->getBlock($name)->text = $text;
+				}
 			}
 
 			# Set country
 
-			if ('' === ($country = Auth::get('country'))) $contents->getBlock('country')->disable(); else {
+			if ('' === ($country = Auth::get('country'))) {
+				$contents->getBlock('country')->disable();
+			} else {
 
 				$contents->getBlock('country')->code = $country;
 

www/engine/System/Classes/Modules/Profile/Controller/Personal.php

Braces +12 added lines, -4 removed lines

@@ -33,13 +33,19 @@ 
 
 			# Validate values
 
-			if (false === ($email = Validate::userEmail($email))) return ['email', 'USER_ERROR_EMAIL_INVALID'];
+			if (false === ($email = Validate::userEmail($email))) {
+				return ['email', 'USER_ERROR_EMAIL_INVALID'];
+			}
 
 			# Check email exists
 
-			if (false === ($check_email = Auth::getUser()->check($email, 'email'))) return 'USER_ERROR_EDIT_PERSONAL';
+			if (false === ($check_email = Auth::getUser()->check($email, 'email'))) {
+				return 'USER_ERROR_EDIT_PERSONAL';
+			}
 
-			if ($check_email === 1) return ['email', 'USER_ERROR_EMAIL_DUPLICATE'];
+			if ($check_email === 1) {
+				return ['email', 'USER_ERROR_EMAIL_DUPLICATE'];
+			}
 
 			# Update user
 
@@ -53,7 +59,9 @@ 
 			$data['country']            = $country;
 			$data['timezone']           = $timezone;
 
-			if (!Auth::getUser()->edit($data)) return 'USER_ERROR_EDIT_PERSONAL';
+			if (!Auth::getUser()->edit($data)) {
+				return 'USER_ERROR_EDIT_PERSONAL';
+			}
 
 			# ------------------------
 

www/engine/System/Classes/Modules/Profile/Controller/Password.php

Braces +15 added lines, -8 removed lines

@@ -33,23 +33,28 @@ 
 
 			# Validate values
 
-			if (false === ($password = Validate::userPassword($password)))
-
+			if (false === ($password = Validate::userPassword($password))) {
+			
 				return ['password', 'USER_ERROR_PASSWORD_INVALID'];
+			}
 
-			if (false === ($password_new = Validate::userPassword($password_new)))
-
+			if (false === ($password_new = Validate::userPassword($password_new))) {
+			
 				return ['password_new', 'USER_ERROR_PASSWORD_NEW_INVALID'];
+			}
 
-			if (0 !== strcmp($password_new, $password_retype))
-
+			if (0 !== strcmp($password_new, $password_retype)) {
+			
 				return ['password_retype', 'USER_ERROR_PASSWORD_MISMATCH'];
+			}
 
 			# Check password
 
 			$password = Str::encode(Auth::get('auth_key'), $password);
 
-			if (0 !== strcmp(Auth::get('password'), $password)) return ['password', 'USER_ERROR_PASSWORD_INCORRECT'];
+			if (0 !== strcmp(Auth::get('password'), $password)) {
+				return ['password', 'USER_ERROR_PASSWORD_INCORRECT'];
+			}
 
 			# Encode password
 
@@ -62,7 +67,9 @@ 
 			$data['auth_key']           = $auth_key;
 			$data['password']           = $password;
 
-			if (!Auth::getUser()->edit($data)) return 'USER_ERROR_EDIT_PASSWORD';
+			if (!Auth::getUser()->edit($data)) {
+				return 'USER_ERROR_EDIT_PASSWORD';
+			}
 
 			# ------------------------
 

www/engine/System/Classes/Frames/Admin/Section.php

Spacing +2 added lines, -2 removed lines

@@ -33,7 +33,7 @@ 
 
 			# Check auth
 
-			if (($this instanceof Area\Auth) && Auth::isLogged()) Request::redirect(INSTALL_PATH . '/admin');
+			if (($this instanceof Area\Auth) && Auth::isLogged()) Request::redirect(INSTALL_PATH.'/admin');
 
 			# Handle request
 
@@ -54,7 +54,7 @@ 
 
 			if (!Auth::isLogged() || ((false !== Request::get('logout')) && Auth::logout())) {
 
-				Request::redirect(INSTALL_PATH . '/admin/login');
+				Request::redirect(INSTALL_PATH.'/admin/login');
 			}
 
 			# Handle request

Braces +21 added lines, -7 removed lines

@@ -33,11 +33,15 @@ 
 
 			# Check auth
 
-			if (($this instanceof Area\Auth) && Auth::isLogged()) Request::redirect(INSTALL_PATH . '/admin');
+			if (($this instanceof Area\Auth) && Auth::isLogged()) {
+				Request::redirect(INSTALL_PATH . '/admin');
+			}
 
 			# Handle request
 
-			if (Template::isBlock($result = $this->handle())) return (new View\Form($this->_title))->display($result);
+			if (Template::isBlock($result = $this->handle())) {
+				return (new View\Form($this->_title))->display($result);
+			}
 
 			# ------------------------
 
@@ -63,9 +67,13 @@ 
 
 			$result = $this->handle(Request::isAjax() && ($request === 'display'));
 
-			if (Template::isBlock($result)) return (new View\Panel($this->_title))->$request($result);
+			if (Template::isBlock($result)) {
+				return (new View\Panel($this->_title))->$request($result);
+			}
 
-			if (Ajax::isResponse($result)) return Ajax::output($result);
+			if (Ajax::isResponse($result)) {
+				return Ajax::output($result);
+			}
 
 			# ------------------------
 
@@ -84,14 +92,20 @@ 
 
 				$ips = preg_split('/ +/', CONFIG_ADMIN_IP, -1, PREG_SPLIT_NO_EMPTY);
 
-				if (!in_array(REQUEST_CLIENT_IP, $ips, true)) return Status::displayError404();
+				if (!in_array(REQUEST_CLIENT_IP, $ips, true)) {
+					return Status::displayError404();
+				}
 			}
 
 			# Handle request
 
-			if (($this instanceof Area\Auth) || ($this instanceof Area\Install)) return $this->handleFormArea();
+			if (($this instanceof Area\Auth) || ($this instanceof Area\Install)) {
+				return $this->handleFormArea();
+			}
 
-			if ($this instanceof Area\Panel) return $this->handlePanelArea();
+			if ($this instanceof Area\Panel) {
+				return $this->handlePanelArea();
+			}
 
 			# ------------------------
 

www/engine/System/Classes/Frames/Site/Section.php

Spacing +2 added lines, -2 removed lines

@@ -33,7 +33,7 @@ 
 
 			# Check auth
 
-			if (Auth::isLogged()) Request::redirect(INSTALL_PATH . '/profile');
+			if (Auth::isLogged()) Request::redirect(INSTALL_PATH.'/profile');
 
 			# ------------------------
 
@@ -50,7 +50,7 @@ 
 
 			if (!Auth::isLogged() || ((false !== Request::get('logout')) && Auth::logout())) {
 
-				Request::redirect(INSTALL_PATH . '/profile/login');
+				Request::redirect(INSTALL_PATH.'/profile/login');
 			}
 
 			# ------------------------

Braces +24 added lines, -8 removed lines

@@ -33,7 +33,9 @@ 
 
 			# Check auth
 
-			if (Auth::isLogged()) Request::redirect(INSTALL_PATH . '/profile');
+			if (Auth::isLogged()) {
+				Request::redirect(INSTALL_PATH . '/profile');
+			}
 
 			# ------------------------
 
@@ -68,9 +70,13 @@ 
 
 			$result = $this->handle(Request::isAjax());
 
-			if (Template::isBlock($result)) return (new View($this->_title, $this->_layout))->display($result);
+			if (Template::isBlock($result)) {
+				return (new View($this->_title, $this->_layout))->display($result);
+			}
 
-			if (Ajax::isResponse($result)) return Ajax::output($result);
+			if (Ajax::isResponse($result)) {
+				return Ajax::output($result);
+			}
 
 			# ------------------------
 
@@ -85,17 +91,27 @@ 
 
 			# Check site status
 
-			if (Settings::get('site_status') === STATUS_MAINTENANCE) return Status::displayMaintenance();
+			if (Settings::get('site_status') === STATUS_MAINTENANCE) {
+				return Status::displayMaintenance();
+			}
 
-			if (Settings::get('site_status') === STATUS_UPDATE) return Status::displayUpdate();
+			if (Settings::get('site_status') === STATUS_UPDATE) {
+				return Status::displayUpdate();
+			}
 
 			# Handle request
 
-			if ($this instanceof Area\Auth) return $this->handleAuthArea();
+			if ($this instanceof Area\Auth) {
+				return $this->handleAuthArea();
+			}
 
-			if ($this instanceof Area\Authorized) return $this->handleAuthorizedArea();
+			if ($this instanceof Area\Authorized) {
+				return $this->handleAuthorizedArea();
+			}
 
-			if ($this instanceof Area\Common) return $this->handleCommonArea();
+			if ($this instanceof Area\Common) {
+				return $this->handleCommonArea();
+			}
 
 			# ------------------------
 

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