cadmium-org / cadmium-cms

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/System/Classes/Frames/Site/View.php

Braces +12 added lines, -4 removed lines

@@ -38,7 +38,9 @@ 
 
 				$layout->getBlock('user')->name = Auth::get('name');
 
-				if (Auth::get('rank') === RANK_ADMINISTRATOR) $layout->getBlock('admin')->enable();
+				if (Auth::get('rank') === RANK_ADMINISTRATOR) {
+					$layout->getBlock('admin')->enable();
+				}
 			}
 
 			# Set title
@@ -82,7 +84,9 @@ 
 
 			# Set canonical
 
-			if (false !== SEO::canonical()) $page->getBlock('canonical')->enable()->link = SEO::canonical();
+			if (false !== SEO::canonical()) {
+				$page->getBlock('canonical')->enable()->link = SEO::canonical();
+			}
 
 			# Set layout
 
@@ -90,9 +94,13 @@ 
 
 			# Set global components
 
-			foreach (Variables::generate() as $name => $value) Template::setGlobal($name, $value);
+			foreach (Variables::generate() as $name => $value) {
+				Template::setGlobal($name, $value);
+			}
 
-			foreach (Widgets::generate() as $name => $block) Template::setWidget($name, $block);
+			foreach (Widgets::generate() as $name => $block) {
+				Template::setWidget($name, $block);
+			}
 
 			# ------------------------
 

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

Braces +6 added lines, -2 removed lines

@@ -32,10 +32,12 @@ 
 
 			$phrases = (static::PHRASES + array_keys(Extend\Addons::items() ?? []));
 
-			foreach (array_unique($languages) as $path) foreach ($phrases as $name) {
+			foreach (array_unique($languages) as $path) {
+				foreach ($phrases as $name) {
 
 				Language::load($path . 'Phrases/' . $name . '.php');
 			}
+			}
 		}
 
 		/**
@@ -86,7 +88,9 @@ 
 
 			# Set timezone
 
-			if (Auth::isLogged() && ('' !== ($timezone = Auth::get('timezone')))) date_default_timezone_set($timezone);
+			if (Auth::isLogged() && ('' !== ($timezone = Auth::get('timezone')))) {
+				date_default_timezone_set($timezone);
+			}
 
 			# Init utils
 

www/engine/Framework/Main.php

Spacing +16 added lines, -16 removed lines

@@ -9,26 +9,26 @@ 
 
 # Define directories
 
-define('DIR_FRAMEWORK',     (dirname(__FILE__) . '/'));
+define('DIR_FRAMEWORK', (dirname(__FILE__).'/'));
 
-define('DIR_CLASSES',       (DIR_FRAMEWORK . 'Classes/'));
-define('DIR_DATA',          (DIR_FRAMEWORK . 'Data/'));
-define('DIR_INCLUDES',      (DIR_FRAMEWORK . 'Includes/'));
-define('DIR_TEMPLATES',     (DIR_FRAMEWORK . 'Templates/'));
+define('DIR_CLASSES', (DIR_FRAMEWORK.'Classes/'));
+define('DIR_DATA', (DIR_FRAMEWORK.'Data/'));
+define('DIR_INCLUDES', (DIR_FRAMEWORK.'Includes/'));
+define('DIR_TEMPLATES', (DIR_FRAMEWORK.'Templates/'));
 
 # Require classes
 
-require_once (DIR_FRAMEWORK . 'Engine.php');
-require_once (DIR_FRAMEWORK . 'Exception.php');
-require_once (DIR_FRAMEWORK . 'Type.php');
+require_once (DIR_FRAMEWORK.'Engine.php');
+require_once (DIR_FRAMEWORK.'Exception.php');
+require_once (DIR_FRAMEWORK.'Type.php');
 
 # Require configuration
 
-require_once (DIR_INCLUDES . 'Constants.php');
-require_once (DIR_INCLUDES . 'Functions.php');
-require_once (DIR_INCLUDES . 'Regex.php');
-require_once (DIR_INCLUDES . 'Headers/Mime.php');
-require_once (DIR_INCLUDES . 'Headers/Status.php');
+require_once (DIR_INCLUDES.'Constants.php');
+require_once (DIR_INCLUDES.'Functions.php');
+require_once (DIR_INCLUDES.'Regex.php');
+require_once (DIR_INCLUDES.'Headers/Mime.php');
+require_once (DIR_INCLUDES.'Headers/Status.php');
 
 # Set defaults
 
@@ -38,10 +38,10 @@ 
 
 # Set request constants
 
-define('REQUEST_CLIENT_IP',     Engine::getIP());
+define('REQUEST_CLIENT_IP', Engine::getIP());
 
-define('REQUEST_TIME',          $_SERVER['REQUEST_TIME']);
-define('REQUEST_TIME_FLOAT',    $_SERVER['REQUEST_TIME_FLOAT']);
+define('REQUEST_TIME', $_SERVER['REQUEST_TIME']);
+define('REQUEST_TIME_FLOAT', $_SERVER['REQUEST_TIME_FLOAT']);
 
 # Set exception handler
 

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