cadmium-org / cadmium-cms

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/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
 

www/engine/System/Classes/Modules/Entitizer/Collection/Widgets.php

Spacing +1 added lines, -1 removed lines

@@ -12,7 +12,7 @@
 
 		protected function init() {
 
-			$this->config->addParam('active', '', function (bool $active) {
+			$this->config->addParam('active', '', function(bool $active) {
 
 				return ($active ? "ent.active = 1" : '');
 			});

www/engine/System/Classes/Modules/Entitizer/Collection/Pages.php

Spacing +16 added lines, -16 removed lines

@@ -12,44 +12,44 @@
 
 		protected function init() {
 
-			$this->config->addParam('active', '', function (bool $active) {
+			$this->config->addParam('active', '', function(bool $active) {
 
-				return ($active ? ("ent.visibility = " . VISIBILITY_PUBLISHED . " AND ent.locked = 0") : '');
+				return ($active ? ("ent.visibility = ".VISIBILITY_PUBLISHED." AND ent.locked = 0") : '');
 			});
 
-			$this->config->addParam('rank', '', function (int $rank = null) {
+			$this->config->addParam('rank', '', function(int $rank = null) {
 
-				return ((null !== $rank) ? ("ent.access <= " . $rank) : '');
+				return ((null !== $rank) ? ("ent.access <= ".$rank) : '');
 			});
 
-			$this->config->addParam('slug', '', function (string $slug) {
+			$this->config->addParam('slug', '', function(string $slug) {
 
-				return (('' !== $slug) ? ("ent.slug = '" . addslashes($slug) . "'") : '');
+				return (('' !== $slug) ? ("ent.slug = '".addslashes($slug)."'") : '');
 			});
 
-			$this->config->addParam('name', '', function (string $name) {
+			$this->config->addParam('name', '', function(string $name) {
 
-				return (('' !== $name) ? ("ent.name = '" . addslashes($name) . "'") : '');
+				return (('' !== $name) ? ("ent.name = '".addslashes($name)."'") : '');
 			});
 
-			$this->config->addParam('time_created >=', '', function (int $time) {
+			$this->config->addParam('time_created >=', '', function(int $time) {
 
-				return ((0 < $time) ? ("ent.time_created >= " . $time) : '');
+				return ((0 < $time) ? ("ent.time_created >= ".$time) : '');
 			});
 
-			$this->config->addParam('time_created <=', '', function (int $time) {
+			$this->config->addParam('time_created <=', '', function(int $time) {
 
-				return ((0 < $time) ? ("ent.time_created <= " . $time) : '');
+				return ((0 < $time) ? ("ent.time_created <= ".$time) : '');
 			});
 
-			$this->config->addParam('time_modified >=', '', function (int $time) {
+			$this->config->addParam('time_modified >=', '', function(int $time) {
 
-				return ((0 < $time) ? ("ent.time_modified >= " . $time) : '');
+				return ((0 < $time) ? ("ent.time_modified >= ".$time) : '');
 			});
 
-			$this->config->addParam('time_modified <=', '', function (int $time) {
+			$this->config->addParam('time_modified <=', '', function(int $time) {
 
-				return ((0 < $time) ? ("ent.time_modified <= " . $time) : '');
+				return ((0 < $time) ? ("ent.time_modified <= ".$time) : '');
 			});
 		}
 	}

www/engine/System/Classes/Modules/Entitizer/Collection/Users.php

Spacing +10 added lines, -10 removed lines

@@ -12,29 +12,29 @@
 
 		protected function init() {
 
-			$this->config->addParam('rank', '', function (int $rank = null) {
+			$this->config->addParam('rank', '', function(int $rank = null) {
 
-				return ((null !== $rank) ? ("ent.rank >= " . $rank) : '');
+				return ((null !== $rank) ? ("ent.rank >= ".$rank) : '');
 			});
 
-			$this->config->addParam('time_registered >=', '', function (int $time) {
+			$this->config->addParam('time_registered >=', '', function(int $time) {
 
-				return ((0 < $time) ? ("ent.time_registered >= " . $time) : '');
+				return ((0 < $time) ? ("ent.time_registered >= ".$time) : '');
 			});
 
-			$this->config->addParam('time_registered <=', '', function (int $time) {
+			$this->config->addParam('time_registered <=', '', function(int $time) {
 
-				return ((0 < $time) ? ("ent.time_registered <= " . $time) : '');
+				return ((0 < $time) ? ("ent.time_registered <= ".$time) : '');
 			});
 
-			$this->config->addParam('time_logged >=', '', function (int $time) {
+			$this->config->addParam('time_logged >=', '', function(int $time) {
 
-				return ((0 < $time) ? ("ent.time_logged >= " . $time) : '');
+				return ((0 < $time) ? ("ent.time_logged >= ".$time) : '');
 			});
 
-			$this->config->addParam('time_logged <=', '', function (int $time) {
+			$this->config->addParam('time_logged <=', '', function(int $time) {
 
-				return ((0 < $time) ? ("ent.time_logged <= " . $time) : '');
+				return ((0 < $time) ? ("ent.time_logged <= ".$time) : '');
 			});
 		}
 	}