cadmium-org / cadmium-cms

www/engine/System/Classes/Modules/Auth/Action/Recover.php

Spacing +1 added lines, -1 removed lines

@@ -37,7 +37,7 @@
 
 			if (false === ($result = Auth\Utils\Connector\Secret::authorize($code, $admin))) {
 
-				Request::redirect(INSTALL_PATH . ($admin ? '/admin' : '/profile') . '/reset');
+				Request::redirect(INSTALL_PATH.($admin ? '/admin' : '/profile').'/reset');
 			}
 
 			# Set recovery data

www/engine/System/Classes/Modules/Auth/Utils/Connector.php

Braces +15 added lines, -5 removed lines

@@ -29,19 +29,29 @@
 
 			# Check code
 
-			if (false === ($code = Validate::authCode($code))) return false;
+			if (false === ($code = Validate::authCode($code))) {
+				return false;
+			}
 
 			# Get auth
 
-			if (!($auth = Entitizer::get(static::$type))->init($code, 'code')) return false;
+			if (!($auth = Entitizer::get(static::$type))->init($code, 'code')) {
+				return false;
+			}
 
-			if (($auth->ip !== REQUEST_CLIENT_IP) || ($auth->time < (REQUEST_TIME - static::$lifetime))) return false;
+			if (($auth->ip !== REQUEST_CLIENT_IP) || ($auth->time < (REQUEST_TIME - static::$lifetime))) {
+				return false;
+			}
 
 			# Get user
 
-			if (0 === ($user = Entitizer::get(TABLE_USERS, $auth->id))->id) return false;
+			if (0 === ($user = Entitizer::get(TABLE_USERS, $auth->id))->id) {
+				return false;
+			}
 
-			if ($user->rank < ($admin ? RANK_ADMINISTRATOR : RANK_USER)) return false;
+			if ($user->rank < ($admin ? RANK_ADMINISTRATOR : RANK_USER)) {
+				return false;
+			}
 
 			# ------------------------
 

www/engine/System/Classes/Modules/Auth/Utils/Action.php

Spacing +2 added lines, -2 removed lines

@@ -27,7 +27,7 @@ 
 
 		private function getContents() : Template\Block {
 
-			$contents = View::get((Auth::isAdmin() ? 'Blocks/Auth/' : 'Blocks/Profile/Auth/') . static::$view);
+			$contents = View::get((Auth::isAdmin() ? 'Blocks/Auth/' : 'Blocks/Profile/Auth/').static::$view);
 
 			# Set code
 
@@ -56,7 +56,7 @@ 
 
 			if ($this->form->handle(new static::$controller_class($this->user))) {
 
-				Request::redirect(INSTALL_PATH . (Auth::isAdmin() ? '/admin' : '/profile') . static::$redirect);
+				Request::redirect(INSTALL_PATH.(Auth::isAdmin() ? '/admin' : '/profile').static::$redirect);
 			}
 
 			# Display success message

Braces +9 added lines, -3 removed lines

@@ -31,11 +31,15 @@ 
 
 			# Set code
 
-			if (null !== $this->code) $contents->code = $this->code;
+			if (null !== $this->code) {
+				$contents->code = $this->code;
+			}
 
 			# Implement form
 
-			if (null !== $this->form) $this->form->implement($contents);
+			if (null !== $this->form) {
+				$this->form->implement($contents);
+			}
 
 			# ------------------------
 
@@ -61,10 +65,12 @@ 
 
 			# Display success message
 
-			foreach (static::$messages as $key => $message) if (Request::get('submitted') === $key) {
+			foreach (static::$messages as $key => $message) {
+				if (Request::get('submitted') === $key) {
 
 				Messages::set('success', Language::get($message['text']), Language::get($message['title']));
 			}
+			}
 
 			# ------------------------
 

www/engine/System/Classes/Modules/Auth/Utils/Mail.php

Spacing +4 added lines, -4 removed lines

@@ -19,13 +19,13 @@ 
 
 		private static function send(Entitizer\Entity\User $user, string $view, string $subject, string $link) : bool {
 
-			$message = View::get((Auth::isAdmin() ? 'Blocks/Auth/Mail/' : 'Blocks/Profile/Auth/Mail/') . $view);
+			$message = View::get((Auth::isAdmin() ? 'Blocks/Auth/Mail/' : 'Blocks/Profile/Auth/Mail/').$view);
 
 			$message->name = $user->name; $message->link = $link; $message->copyright = Date::getYear();
 
 			$to = $user->email; $sender = Settings::get('site_title'); $reply_to = Settings::get('system_email');
 
-			$from = ((false !== ($host = parse_url(Settings::get('system_url'), PHP_URL_HOST))) ? ('noreply@' . $host) : '');
+			$from = ((false !== ($host = parse_url(Settings::get('system_url'), PHP_URL_HOST))) ? ('noreply@'.$host) : '');
 
 			# ------------------------
 
@@ -38,7 +38,7 @@ 
 
 		public static function sendPasswordMessage(Entitizer\Entity\User $user, string $code) : bool {
 
-			$link = (Settings::get('system_url') . (Auth::isAdmin() ? '/admin' : '/profile') . '/recover?code=' . $code);
+			$link = (Settings::get('system_url').(Auth::isAdmin() ? '/admin' : '/profile').'/recover?code='.$code);
 
 			return self::send($user, 'Reset', Language::get('MAIL_SUBJECT_RESET'), $link);
 		}
@@ -49,7 +49,7 @@ 
 
 		public static function sendRegistrationMessage(Entitizer\Entity\User $user) : bool {
 
-			$link = (Settings::get('system_url') . (Auth::isAdmin() ? '/admin' : '/profile'));
+			$link = (Settings::get('system_url').(Auth::isAdmin() ? '/admin' : '/profile'));
 
 			return self::send($user, 'Register', Language::get('MAIL_SUBJECT_REGISTER'), $link);
 		}

www/engine/System/Classes/Modules/Auth/Auth.php

Spacing +1 added lines, -1 removed lines

@@ -87,7 +87,7 @@
 
 		public static function isInitial() : bool {
 
-			DB::send("SHOW TABLE STATUS WHERE name LIKE '" . TABLE_USERS . "'");
+			DB::send("SHOW TABLE STATUS WHERE name LIKE '".TABLE_USERS."'");
 
 			if (!(DB::getLast() && (null !== ($data = DB::getLast()->getRow())))) return false;
 

Braces +12 added lines, -4 removed lines

@@ -31,11 +31,15 @@ 
 
 			# Check session code
 
-			if (!is_string($code = Session::get('code'))) return false;
+			if (!is_string($code = Session::get('code'))) {
+				return false;
+			}
 
 			# Authorize
 
-			if (false === ($result = Auth\Utils\Connector\Session::authorize($code, self::$admin))) return false;
+			if (false === ($result = Auth\Utils\Connector\Session::authorize($code, self::$admin))) {
+				return false;
+			}
 
 			# Update auth
 
@@ -62,7 +66,9 @@ 
 
 		public static function logout() : bool {
 
-			if ((null === self::$user) || (0 === self::$user->id)) return false;
+			if ((null === self::$user) || (0 === self::$user->id)) {
+				return false;
+			}
 
 			# Remove auth entry from db
 
@@ -89,7 +95,9 @@ 
 
 			DB::send("SHOW TABLE STATUS WHERE name LIKE '" . TABLE_USERS . "'");
 
-			if (!(DB::getLast() && (null !== ($data = DB::getLast()->getRow())))) return false;
+			if (!(DB::getLast() && (null !== ($data = DB::getLast()->getRow())))) {
+				return false;
+			}
 
 			# ------------------------
 

www/engine/System/Classes/Modules/Auth/Controller/Recover.php

Braces +9 added lines, -5 removed lines

@@ -44,13 +44,15 @@ 
 
 			# Validate values
 
-			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'];
+			}
 
 			# Encode password
 
@@ -60,7 +62,9 @@ 
 
 			$data = ['auth_key' => $auth_key, 'password' => $password];
 
-			if (!$this->user->edit($data)) return 'USER_ERROR_AUTH_RECOVER';
+			if (!$this->user->edit($data)) {
+				return 'USER_ERROR_AUTH_RECOVER';
+			}
 
 			# Remove secret
 

www/engine/System/Classes/Modules/Auth/Controller/Reset.php

Spacing +1 added lines, -1 removed lines

@@ -56,7 +56,7 @@
 
 			if ((!$this->user->init($$init_by, $init_by)) || (Auth::isAdmin() && ($this->user->rank < RANK_ADMINISTRATOR))) {
 
-				return ['name_email', ('USER_ERROR_' . strtoupper($init_by) .'_INCORRECT')];
+				return ['name_email', ('USER_ERROR_'.strtoupper($init_by).'_INCORRECT')];
 			}
 
 			# Check access

Braces +12 added lines, -4 removed lines

@@ -46,9 +46,13 @@ 
 
 			if ((false === ($name = Validate::userName($name_email))) &&
 
-				(false === ($email = Validate::userEmail($name_email)))) return ['name_email', 'USER_ERROR_NAME_INVALID'];
+				(false === ($email = Validate::userEmail($name_email)))) {
+				return ['name_email', 'USER_ERROR_NAME_INVALID'];
+			}
 
-			if (false === Security::checkCaptcha($captcha)) return ['captcha', 'USER_ERROR_CAPTCHA_INCORRECT'];
+			if (false === Security::checkCaptcha($captcha)) {
+				return ['captcha', 'USER_ERROR_CAPTCHA_INCORRECT'];
+			}
 
 			# Init user
 
@@ -61,7 +65,9 @@ 
 
 			# Check access
 
-			if (!Auth::isAdmin() && ($this->user->rank === RANK_GUEST)) return 'USER_ERROR_ACCESS';
+			if (!Auth::isAdmin() && ($this->user->rank === RANK_GUEST)) {
+				return 'USER_ERROR_ACCESS';
+			}
 
 			# Create secret
 
@@ -71,7 +77,9 @@ 
 
 			$data = ['id' => $this->user->id, 'code' => $code, 'ip' => $ip, 'time' => $time];
 
-			if (!$secret->create($data)) return 'USER_ERROR_AUTH_RESET';
+			if (!$secret->create($data)) {
+				return 'USER_ERROR_AUTH_RESET';
+			}
 
 			# Send mail
 

www/engine/System/Classes/Modules/Auth/Controller/Login.php

Spacing +1 added lines, -1 removed lines

@@ -56,7 +56,7 @@
 
 			if ((!$this->user->init($$init_by, $init_by)) || (Auth::isAdmin() && ($this->user->rank < RANK_ADMINISTRATOR))) {
 
-				return ['name_email', ('USER_ERROR_' . strtoupper($init_by) .'_INCORRECT')];
+				return ['name_email', ('USER_ERROR_'.strtoupper($init_by).'_INCORRECT')];
 			}
 
 			# Check password

Braces +15 added lines, -5 removed lines

@@ -46,9 +46,13 @@ 
 
 			if ((false === ($name = Validate::userName($name_email))) &&
 
-				(false === ($email = Validate::userEmail($name_email)))) return ['name_email', 'USER_ERROR_NAME_INVALID'];
+				(false === ($email = Validate::userEmail($name_email)))) {
+				return ['name_email', 'USER_ERROR_NAME_INVALID'];
+			}
 
-			if (false === ($password = Validate::userPassword($password))) return ['password', 'USER_ERROR_PASSWORD_INVALID'];
+			if (false === ($password = Validate::userPassword($password))) {
+				return ['password', 'USER_ERROR_PASSWORD_INVALID'];
+			}
 
 			# Init user
 
@@ -63,11 +67,15 @@ 
 
 			$password = Str::encode($this->user->auth_key, $password);
 
-			if (0 !== strcmp($this->user->password, $password)) return ['password', 'USER_ERROR_PASSWORD_INCORRECT'];
+			if (0 !== strcmp($this->user->password, $password)) {
+				return ['password', 'USER_ERROR_PASSWORD_INCORRECT'];
+			}
 
 			# Check access
 
-			if (!Auth::isAdmin() && ($this->user->rank === RANK_GUEST)) return 'USER_ERROR_ACCESS';
+			if (!Auth::isAdmin() && ($this->user->rank === RANK_GUEST)) {
+				return 'USER_ERROR_ACCESS';
+			}
 
 			# Create session
 
@@ -77,7 +85,9 @@ 
 
 			$data = ['id' => $this->user->id, 'code' => $code, 'ip' => $ip, 'time' => $time];
 
-			if (!$session->create($data)) return 'USER_ERROR_AUTH_LOGIN';
+			if (!$session->create($data)) {
+				return 'USER_ERROR_AUTH_LOGIN';
+			}
 
 			# Set session variable
 

www/engine/System/Classes/Modules/Auth/Controller/Register.php

Braces +30 added lines, -10 removed lines

@@ -44,27 +44,45 @@ 
 
 			# Validate values
 
-			if (false === ($name = Validate::userName($name))) return ['name', 'USER_ERROR_NAME_INVALID'];
+			if (false === ($name = Validate::userName($name))) {
+				return ['name', 'USER_ERROR_NAME_INVALID'];
+			}
 
-			if (false === ($password = Validate::userPassword($password))) return ['password', 'USER_ERROR_PASSWORD_INVALID'];
+			if (false === ($password = Validate::userPassword($password))) {
+				return ['password', 'USER_ERROR_PASSWORD_INVALID'];
+			}
 
-			if (false === ($email = Validate::userEmail($email))) return ['email', 'USER_ERROR_EMAIL_INVALID'];
+			if (false === ($email = Validate::userEmail($email))) {
+				return ['email', 'USER_ERROR_EMAIL_INVALID'];
+			}
 
-			if (0 !== strcmp($password, $password_retype)) return ['password_retype', 'USER_ERROR_PASSWORD_MISMATCH'];
+			if (0 !== strcmp($password, $password_retype)) {
+				return ['password_retype', 'USER_ERROR_PASSWORD_MISMATCH'];
+			}
 
-			if (false === Security::checkCaptcha($captcha)) return ['captcha', 'USER_ERROR_CAPTCHA_INCORRECT'];
+			if (false === Security::checkCaptcha($captcha)) {
+				return ['captcha', 'USER_ERROR_CAPTCHA_INCORRECT'];
+			}
 
 			# Check name exists
 
-			if (false === ($check_name = $this->user->check($name, 'name'))) return 'USER_ERROR_AUTH_REGISTER';
+			if (false === ($check_name = $this->user->check($name, 'name'))) {
+				return 'USER_ERROR_AUTH_REGISTER';
+			}
 
-			if ($check_name === 1) return ['name', 'USER_ERROR_NAME_DUPLICATE'];
+			if ($check_name === 1) {
+				return ['name', 'USER_ERROR_NAME_DUPLICATE'];
+			}
 
 			# Check email exists
 
-			if (false === ($check_email = $this->user->check($email, 'email'))) return 'USER_ERROR_AUTH_REGISTER';
+			if (false === ($check_email = $this->user->check($email, 'email'))) {
+				return 'USER_ERROR_AUTH_REGISTER';
+			}
 
-			if ($check_email === 1) return ['email', 'USER_ERROR_EMAIL_DUPLICATE'];
+			if ($check_email === 1) {
+				return ['email', 'USER_ERROR_EMAIL_DUPLICATE'];
+			}
 
 			# Encode password
 
@@ -87,7 +105,9 @@ 
 			$data['time_registered']    = REQUEST_TIME;
 			$data['time_logged']        = REQUEST_TIME;
 
-			if (!$this->user->create($data)) return 'USER_ERROR_AUTH_REGISTER';
+			if (!$this->user->create($data)) {
+				return 'USER_ERROR_AUTH_REGISTER';
+			}
 
 			# Send mail