cadmium-org / cadmium-cms

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

Spacing +1 added lines, -1 removed lines

@@ -12,7 +12,7 @@
 
 		protected function handle() {
 
-			if (!Auth::initial()) Request::redirect(INSTALL_PATH . '/admin/login');
+			if (!Auth::initial()) Request::redirect(INSTALL_PATH.'/admin/login');
 
 			return (new Auth\Action\Register)->handle();
 		}

Braces +3 added lines, -1 removed lines

@@ -12,7 +12,9 @@
 
 		protected function handle() {
 
-			if (!Auth::initial()) Request::redirect(INSTALL_PATH . '/admin/login');
+			if (!Auth::initial()) {
+				Request::redirect(INSTALL_PATH . '/admin/login');
+			}
 
 			return (new Auth\Action\Register)->handle();
 		}

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

Spacing +1 added lines, -1 removed lines

@@ -12,7 +12,7 @@
 
 		protected function handle() {
 
-			if (Auth::initial()) Request::redirect(INSTALL_PATH . '/admin/register');
+			if (Auth::initial()) Request::redirect(INSTALL_PATH.'/admin/register');
 
 			return (new Auth\Action\Login)->handle();
 		}

Braces +3 added lines, -1 removed lines

@@ -12,7 +12,9 @@
 
 		protected function handle() {
 
-			if (Auth::initial()) Request::redirect(INSTALL_PATH . '/admin/register');
+			if (Auth::initial()) {
+				Request::redirect(INSTALL_PATH . '/admin/register');
+			}
 
 			return (new Auth\Action\Login)->handle();
 		}

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

Braces +3 added lines, -1 removed lines

@@ -20,7 +20,9 @@
 
 			# Implement form
 
-			if (null !== $this->form) $this->form->implement($contents);
+			if (null !== $this->form) {
+				$this->form->implement($contents);
+			}
 
 			# ------------------------
 

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

Spacing +4 added lines, -4 removed lines

@@ -10,7 +10,7 @@ 
 
 		private static function send(Entitizer\Entity\User $user, string $view, string $subject, string $link) {
 
-			$message = View::get((Auth::admin() ? 'Blocks/Auth/Mail/' : 'Blocks/Profile/Auth/Mail/') . $view);
+			$message = View::get((Auth::admin() ? 'Blocks/Auth/Mail/' : 'Blocks/Profile/Auth/Mail/').$view);
 
 			$message->name = $user->name; $message->link = $link; $message->copyright = Date::getYear();
 
@@ -18,7 +18,7 @@ 
 
 			$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) : '');
 
 			return Mailer::send($to, $sender, $from, $reply_to, $subject, $message->getContents(), true);
 		}
@@ -27,7 +27,7 @@ 
 
 		public static function reset(Entitizer\Entity\User $user, string $code) {
 
-			$link = (Settings::get('system_url') . (Auth::admin() ? '/admin' : '/profile') . '/recover?code=' . $code);
+			$link = (Settings::get('system_url').(Auth::admin() ? '/admin' : '/profile').'/recover?code='.$code);
 
 			return self::send($user, 'Reset', Language::get('MAIL_SUBJECT_RESET'), $link);
 		}
@@ -36,7 +36,7 @@ 
 
 		public static function register(Entitizer\Entity\User $user) {
 
-			$link = (Settings::get('system_url') . (Auth::admin() ? '/admin' : '/profile'));
+			$link = (Settings::get('system_url').(Auth::admin() ? '/admin' : '/profile'));
 
 			return self::send($user, 'Register', Language::get('MAIL_SUBJECT_REGISTER'), $link);
 		}

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

Spacing +1 added lines, -1 removed lines

@@ -20,7 +20,7 @@
 
 			if ($this->form->handle(new Auth\Controller\Reset())) {
 
-				Request::redirect(INSTALL_PATH . (Auth::admin() ? '/admin' : '/profile') . '/login?submitted=reset');
+				Request::redirect(INSTALL_PATH.(Auth::admin() ? '/admin' : '/profile').'/login?submitted=reset');
 			}
 
 			# ------------------------

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

Spacing +1 added lines, -1 removed lines

@@ -20,7 +20,7 @@
 
 			if ($this->form->handle(new Auth\Controller\Register())) {
 
-				Request::redirect(INSTALL_PATH . (Auth::admin() ? '/admin' : '/profile') . '/login?submitted=register');
+				Request::redirect(INSTALL_PATH.(Auth::admin() ? '/admin' : '/profile').'/login?submitted=register');
 			}
 
 			# ------------------------

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

Spacing +2 added lines, -2 removed lines

@@ -16,7 +16,7 @@ 
 
 			if (false !== ($code = Auth::secret())) $this->code = $code;
 
-			else Request::redirect(INSTALL_PATH . (Auth::admin() ? '/admin' : '/profile') . '/reset');
+			else Request::redirect(INSTALL_PATH.(Auth::admin() ? '/admin' : '/profile').'/reset');
 
 			# Create form
 
@@ -26,7 +26,7 @@ 
 
 			if ($this->form->handle(new Auth\Controller\Recover())) {
 
-				Request::redirect(INSTALL_PATH . (Auth::admin() ? '/admin' : '/profile') . '/login?submitted=recover');
+				Request::redirect(INSTALL_PATH.(Auth::admin() ? '/admin' : '/profile').'/login?submitted=recover');
 			}
 
 			# ------------------------

Braces +5 added lines, -3 removed lines

@@ -14,9 +14,11 @@
 
 			# Init user by secret code
 
-			if (false !== ($code = Auth::secret())) $this->code = $code;
-
-			else Request::redirect(INSTALL_PATH . (Auth::admin() ? '/admin' : '/profile') . '/reset');
+			if (false !== ($code = Auth::secret())) {
+				$this->code = $code;
+			} else {
+				Request::redirect(INSTALL_PATH . (Auth::admin() ? '/admin' : '/profile') . '/reset');
+			}
 
 			# Create form
 

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

Spacing +1 added lines, -1 removed lines

@@ -20,7 +20,7 @@
 
 			if ($this->form->handle(new Auth\Controller\Login())) {
 
-				Request::redirect(INSTALL_PATH . (Auth::admin() ? '/admin' : '/profile'));
+				Request::redirect(INSTALL_PATH.(Auth::admin() ? '/admin' : '/profile'));
 			}
 
 			# Display success message

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

Braces +36 added lines, -12 removed lines

@@ -12,9 +12,13 @@ 
 
 		private static function getAuth(string $code, string $type, int $lifetime) {
 
-			if (!($auth = Entitizer::get($type))->init($code, 'code')) return false;
+			if (!($auth = Entitizer::get($type))->init($code, 'code')) {
+				return false;
+			}
 
-			if (($auth->ip !== REQUEST_CLIENT_IP) || ($auth->time < (REQUEST_TIME - $lifetime))) return false;
+			if (($auth->ip !== REQUEST_CLIENT_IP) || ($auth->time < (REQUEST_TIME - $lifetime))) {
+				return false;
+			}
 
 			# ------------------------
 
@@ -25,9 +29,13 @@ 
 
 		private static function getUser(int $id) {
 
-			if (0 === ($user = Entitizer::get(TABLE_USERS, $id))->id) return false;
+			if (0 === ($user = Entitizer::get(TABLE_USERS, $id))->id) {
+				return false;
+			}
 
-			if ($user->rank < (self::$admin ? RANK_ADMINISTRATOR : RANK_USER)) return false;
+			if ($user->rank < (self::$admin ? RANK_ADMINISTRATOR : RANK_USER)) {
+				return false;
+			}
 
 			# ------------------------
 
@@ -42,17 +50,23 @@ 
 
 			# Check session code
 
-			if (false === ($code = Validate::authCode(Session::get('code') ?? ''))) return false;
+			if (false === ($code = Validate::authCode(Session::get('code') ?? ''))) {
+				return false;
+			}
 
 			# Get auth
 
 			$type = TABLE_USERS_SESSIONS; $lifetime = CONFIG_USER_SESSION_LIFETIME;
 
-			if (false === ($session = self::getAuth($code, $type, $lifetime))) return false;
+			if (false === ($session = self::getAuth($code, $type, $lifetime))) {
+				return false;
+			}
 
 			# Get user
 
-			if (false === ($user = self::getUser($session->id))) return false;
+			if (false === ($user = self::getUser($session->id))) {
+				return false;
+			}
 
 			# Update session
 
@@ -71,21 +85,29 @@ 
 
 		public static function secret() {
 
-			if ((null === self::$user) || (0 !== self::$user->id)) return false;
+			if ((null === self::$user) || (0 !== self::$user->id)) {
+				return false;
+			}
 
 			# Check secret code
 
-			if (false === ($code = Validate::authCode(Request::get('code')))) return false;
+			if (false === ($code = Validate::authCode(Request::get('code')))) {
+				return false;
+			}
 
 			# Get auth
 
 			$type = TABLE_USERS_SECRETS; $lifetime = CONFIG_USER_SECRET_LIFETIME;
 
-			if (false === ($secret = self::getAuth($code, $type, $lifetime))) return false;
+			if (false === ($secret = self::getAuth($code, $type, $lifetime))) {
+				return false;
+			}
 
 			# Get user
 
-			if (false === ($user = self::getUser($secret->id))) return false;
+			if (false === ($user = self::getUser($secret->id))) {
+				return false;
+			}
 
 			# ------------------------
 
@@ -96,7 +118,9 @@ 
 
 		public static function logout() {
 
-			if ((null === self::$user) || (0 === self::$user->id)) return false;
+			if ((null === self::$user) || (0 === self::$user->id)) {
+				return false;
+			}
 
 			# Remove session