cadmium-org / cadmium-cms

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

Braces +21 added lines, -7 removed lines

@@ -10,7 +10,9 @@ 
 
 		public function __invoke(array $post) {
 
-			if (Auth::check()) return true;
+			if (Auth::check()) {
+				return true;
+			}
 
 			# Declare variables
 
@@ -22,9 +24,13 @@ 
 
 			# 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 === Security::checkCaptcha($captcha)) return ['captcha', 'USER_ERROR_CAPTCHA_INCORRECT'];
+			if (false === Security::checkCaptcha($captcha)) {
+				return ['captcha', 'USER_ERROR_CAPTCHA_INCORRECT'];
+			}
 
 			# Create user object
 
@@ -32,13 +38,19 @@ 
 
 			# Init user
 
-			if (!$user->init($name, 'name')) return ['name', 'USER_ERROR_NAME_INCORRECT'];
+			if (!$user->init($name, 'name')) {
+				return ['name', 'USER_ERROR_NAME_INCORRECT'];
+			}
 
-			if (Auth::admin() && ($user->rank < RANK_ADMINISTRATOR)) return ['name', 'USER_ERROR_NAME_INCORRECT'];
+			if (Auth::admin() && ($user->rank < RANK_ADMINISTRATOR)) {
+				return ['name', 'USER_ERROR_NAME_INCORRECT'];
+			}
 
 			# Check access
 
-			if (!Auth::admin() && ($user->rank === RANK_GUEST)) return 'USER_ERROR_ACCESS';
+			if (!Auth::admin() && ($user->rank === RANK_GUEST)) {
+				return 'USER_ERROR_ACCESS';
+			}
 
 			# Create session
 
@@ -48,7 +60,9 @@ 
 
 			$data = ['id' => $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

Braces +24 added lines, -8 removed lines

@@ -10,7 +10,9 @@ 
 
 		public function __invoke(array $post) {
 
-			if (Auth::check()) return true;
+			if (Auth::check()) {
+				return true;
+			}
 
 			# Declare variables
 
@@ -22,9 +24,13 @@ 
 
 			# 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'];
+			}
 
 			# Create user object
 
@@ -32,19 +38,27 @@ 
 
 			# Init user
 
-			if (!$user->init($name, 'name')) return ['name', 'USER_ERROR_NAME_INCORRECT'];
+			if (!$user->init($name, 'name')) {
+				return ['name', 'USER_ERROR_NAME_INCORRECT'];
+			}
 
-			if (Auth::admin() && ($user->rank < RANK_ADMINISTRATOR)) return ['name', 'USER_ERROR_NAME_INCORRECT'];
+			if (Auth::admin() && ($user->rank < RANK_ADMINISTRATOR)) {
+				return ['name', 'USER_ERROR_NAME_INCORRECT'];
+			}
 
 			# Check password
 
 			$password = Str::encode($user->auth_key, $password);
 
-			if (0 !== strcmp($user->password, $password)) return ['password', 'USER_ERROR_PASSWORD_INCORRECT'];
+			if (0 !== strcmp($user->password, $password)) {
+				return ['password', 'USER_ERROR_PASSWORD_INCORRECT'];
+			}
 
 			# Check access
 
-			if (!Auth::admin() && ($user->rank === RANK_GUEST)) return 'USER_ERROR_ACCESS';
+			if (!Auth::admin() && ($user->rank === RANK_GUEST)) {
+				return 'USER_ERROR_ACCESS';
+			}
 
 			# Create session
 
@@ -54,7 +68,9 @@ 
 
 			$data = ['id' => $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/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/Informer/Handler/Dashboard.php

Braces +6 added lines, -2 removed lines

@@ -35,11 +35,15 @@
 
 			# Check if install file exists
 
-			if (Informer::checkInstallFile()) Messages::set('error', Language::get('DASHBOARD_MESSAGE_INSTALL_FILE'));
+			if (Informer::checkInstallFile()) {
+				Messages::set('error', Language::get('DASHBOARD_MESSAGE_INSTALL_FILE'));
+			}
 
 			# Check if configuration file is loaded
 
-			if (!Settings::loaded()) Messages::set('warning', Language::get('DASHBOARD_MESSAGE_CONFIG_FILE'));
+			if (!Settings::loaded()) {
+				Messages::set('warning', Language::get('DASHBOARD_MESSAGE_CONFIG_FILE'));
+			}
 
 			# ------------------------
 

www/engine/System/Classes/Modules/Filemanager/Utils/Handler.php

Braces +12 added lines, -4 removed lines

@@ -47,7 +47,9 @@ 
 
 			# Check for demo mode
 
-			if (Informer::isDemoMode()) return $ajax->error(Language::get('DEMO_MODE_RESTRICTION'));
+			if (Informer::isDemoMode()) {
+				return $ajax->error(Language::get('DEMO_MODE_RESTRICTION'));
+			}
 
 			# Init entity
 
@@ -60,7 +62,9 @@ 
 
 			if (Request::post('action') === 'remove') {
 
-				if (!$this->entity->remove()) return $ajax->error(Language::get(static::$message_error_remove));
+				if (!$this->entity->remove()) {
+					return $ajax->error(Language::get(static::$message_error_remove));
+				}
 			}
 
 			# ------------------------
@@ -82,7 +86,9 @@ 
 
 			# Handle ajax request
 
-			if (Request::isAjax()) return $this->handleAjax();
+			if (Request::isAjax()) {
+				return $this->handleAjax();
+			}
 
 			# Init entity
 
@@ -108,7 +114,9 @@ 
 
 			# Display success message
 
-			if (false !== Request::get('submitted')) Popup::set('positive', Language::get(static::$message_success_rename));
+			if (false !== Request::get('submitted')) {
+				Popup::set('positive', Language::get(static::$message_success_rename));
+			}
 
 			# ------------------------
 

www/engine/System/Classes/Modules/Filemanager/Controller/Rename.php

Spacing +1 added lines, -1 removed lines

@@ -39,7 +39,7 @@
 
 			if ((0 !== strcasecmp($this->entity->name(), $name)) &&
 
-				@file_exists($this->entity->parent()->pathFull() . $name)) return ['name', 'FILEMANAGER_ERROR_EXISTS'];
+				@file_exists($this->entity->parent()->pathFull().$name)) return ['name', 'FILEMANAGER_ERROR_EXISTS'];
 
 			# Rename item
 

Braces +12 added lines, -4 removed lines

@@ -29,23 +29,31 @@
 
 			# Check for demo mode
 
-			if (Informer::isDemoMode()) return 'DEMO_MODE_RESTRICTION';
+			if (Informer::isDemoMode()) {
+				return 'DEMO_MODE_RESTRICTION';
+			}
 
 			# Validate name
 
-			if (false === ($name = Validate::fileName($name))) return ['name', 'FILEMANAGER_ERROR_NAME_INVALID'];
+			if (false === ($name = Validate::fileName($name))) {
+				return ['name', 'FILEMANAGER_ERROR_NAME_INVALID'];
+			}
 
 			# Check if item exists
 
 			if ((0 !== strcasecmp($this->entity->name(), $name)) &&
 
-				@file_exists($this->entity->parent()->pathFull() . $name)) return ['name', 'FILEMANAGER_ERROR_EXISTS'];
+				@file_exists($this->entity->parent()->pathFull() . $name)) {
+				return ['name', 'FILEMANAGER_ERROR_EXISTS'];
+			}
 
 			# Rename item
 
-			if (!$this->entity->rename($name)) return (($this->entity->type() === FILEMANAGER_TYPE_DIR) ?
+			if (!$this->entity->rename($name)) {
+				return (($this->entity->type() === FILEMANAGER_TYPE_DIR) ?
 
 				'FILEMANAGER_ERROR_DIR_RENAME' : 'FILEMANAGER_ERROR_FILE_RENAME');
+			}
 
 			# ------------------------
 

www/engine/System/Classes/Modules/Filemanager/Controller/Create.php

Spacing +1 added lines, -1 removed lines

@@ -37,7 +37,7 @@
 
 			# Check if item exists
 
-			if (@file_exists($this->parent->pathFull() . $name)) return ['name', 'FILEMANAGER_ERROR_EXISTS'];
+			if (@file_exists($this->parent->pathFull().$name)) return ['name', 'FILEMANAGER_ERROR_EXISTS'];
 
 			# Create item
 

Braces +12 added lines, -4 removed lines

@@ -29,23 +29,31 @@
 
 			# Check for demo mode
 
-			if (Informer::isDemoMode()) return 'DEMO_MODE_RESTRICTION';
+			if (Informer::isDemoMode()) {
+				return 'DEMO_MODE_RESTRICTION';
+			}
 
 			# Validate name
 
-			if (false === ($name = Validate::fileName($name))) return ['name', 'FILEMANAGER_ERROR_NAME_INVALID'];
+			if (false === ($name = Validate::fileName($name))) {
+				return ['name', 'FILEMANAGER_ERROR_NAME_INVALID'];
+			}
 
 			# Check if item exists
 
-			if (@file_exists($this->parent->pathFull() . $name)) return ['name', 'FILEMANAGER_ERROR_EXISTS'];
+			if (@file_exists($this->parent->pathFull() . $name)) {
+				return ['name', 'FILEMANAGER_ERROR_EXISTS'];
+			}
 
 			# Create item
 
 			$entity = Filemanager::get($type, $this->parent);
 
-			if (!$entity->create($name)) return (($entity->type() === FILEMANAGER_TYPE_DIR) ?
+			if (!$entity->create($name)) {
+				return (($entity->type() === FILEMANAGER_TYPE_DIR) ?
 
 				'FILEMANAGER_ERROR_DIR_CREATE' : 'FILEMANAGER_ERROR_FILE_CREATE');
+			}
 
 			# ------------------------
 

www/engine/System/Classes/Modules/Entitizer/Utils/Definition/Group/Foreigns.php

Braces +3 added lines, -1 removed lines

@@ -10,7 +10,9 @@
 
 		public function add(string $name, string $table, string $field, string $delete = null, string $update = null) {
 
-			if (!isset($this->definition->params()[$name]) || isset($this->list[$name])) return;
+			if (!isset($this->definition->params()[$name]) || isset($this->list[$name])) {
+				return;
+			}
 
 			$this->list[$name] = new Definition\Item\Foreign($name, $table, $field, $delete, $update);
 		}

www/engine/System/Classes/Modules/Entitizer/Utils/Definition/Group/Indexes.php

Braces +3 added lines, -1 removed lines

@@ -19,7 +19,9 @@
 
 		public function add(string $name, string $type = null) {
 
-			if (!isset($this->definition->params()[$name]) || isset($this->list[$name])) return;
+			if (!isset($this->definition->params()[$name]) || isset($this->list[$name])) {
+				return;
+			}
 
 			$this->list[$name] = new Definition\Item\Index($name, $type);
 		}