cadmium-org / cadmium-cms

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

Braces +12 added lines, -4 removed lines

@@ -10,7 +10,9 @@ 
 
 		public function __invoke(array $post) {
 
-			if (!Auth::check()) return false;
+			if (!Auth::check()) {
+				return false;
+			}
 
 			# Declare variables
 
@@ -22,9 +24,13 @@ 
 
 			# Validate values
 
-			if (false === ($password_new = Auth\Validate::userPassword($password_new))) return 'USER_ERROR_PASSWORD_NEW_INVALID';
+			if (false === ($password_new = Auth\Validate::userPassword($password_new))) {
+				return 'USER_ERROR_PASSWORD_NEW_INVALID';
+			}
 
-			if (0 !== strcmp($password_new, $password_retype)) return 'USER_ERROR_PASSWORD_MISMATCH';
+			if (0 !== strcmp($password_new, $password_retype)) {
+				return 'USER_ERROR_PASSWORD_MISMATCH';
+			}
 
 			# Encode password
 
@@ -34,7 +40,9 @@ 
 
 			$data = ['auth_key' => $auth_key, 'password' => $password];
 
-			if (!Auth::user()->edit($data)) return 'USER_ERROR_AUTH_RECOVER';
+			if (!Auth::user()->edit($data)) {
+				return 'USER_ERROR_AUTH_RECOVER';
+			}
 
 			# Remove secret
 

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 = Auth\Validate::userName($name))) return 'USER_ERROR_NAME_INVALID';
+			if (false === ($name = Auth\Validate::userName($name))) {
+				return 'USER_ERROR_NAME_INVALID';
+			}
 
-			if (false === Security::checkCaptcha($captcha)) return 'USER_ERROR_CAPTCHA_INCORRECT';
+			if (false === Security::checkCaptcha($captcha)) {
+				return 'USER_ERROR_CAPTCHA_INCORRECT';
+			}
 
 			# Create user object
 
@@ -32,13 +38,19 @@ 
 
 			# Init user
 
-			if (!$user->init($name, 'name')) return 'USER_ERROR_NAME_INCORRECT';
+			if (!$user->init($name, 'name')) {
+				return 'USER_ERROR_NAME_INCORRECT';
+			}
 
-			if (Auth::admin() && ($user->rank < RANK_ADMINISTRATOR)) return 'USER_ERROR_NAME_INCORRECT';
+			if (Auth::admin() && ($user->rank < RANK_ADMINISTRATOR)) {
+				return '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/Handler/Recover.php

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/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(ENTITY_TYPE_USER, $id))->id) return false;
+			if (0 === ($user = Entitizer::get(ENTITY_TYPE_USER, $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 = Auth\Validate::code(Session::get('code')))) return false;
+			if (false === ($code = Auth\Validate::code(Session::get('code')))) {
+				return false;
+			}
 
 			# Get auth
 
 			$type = ENTITY_TYPE_USER_SESSION; $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 = Auth\Validate::code(Request::get('code')))) return false;
+			if (false === ($code = Auth\Validate::code(Request::get('code')))) {
+				return false;
+			}
 
 			# Get auth
 
 			$type = ENTITY_TYPE_USER_SECRET; $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/Auth/Validate.php

Braces +3 added lines, -1 removed lines

@@ -10,7 +10,9 @@
 
 		private static function validate(string $string, string $regex, int $min, int $max) {
 
-			if (!preg_match($regex, $string)) return false;
+			if (!preg_match($regex, $string)) {
+				return false;
+			}
 
 			return ((Str::between($string, $min, $max)) ? $string : false);
 		}

www/engine/System/Classes/Modules/Auth/Utils/Handler.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/Filemanager/Handler/Listview.php

Braces +16 added lines, -8 removed lines

@@ -23,15 +23,19 @@ 
 
 				while (false !== ($name = readdir($handler))) {
 
-					if (in_array($name, ['.', '..', '.empty'], true)) continue;
+					if (in_array($name, ['.', '..', '.empty'], true)) {
+						continue;
+					}
 
 					$path = ($prefix . $name); $path_full = ($this->parent->pathFull() . $name);
 
 					$data = ['name' => $name, 'path' => $path, 'path_full' => $path_full];
 
-					if (@is_dir($path_full)) $dirs[] = array_merge($data, ['type' => FILEMANAGER_TYPE_DIR]);
-
-					else if (@is_file($path_full)) $files[] = array_merge($data, ['type' => FILEMANAGER_TYPE_FILE]);
+					if (@is_dir($path_full)) {
+						$dirs[] = array_merge($data, ['type' => FILEMANAGER_TYPE_DIR]);
+					} else if (@is_file($path_full)) {
+						$files[] = array_merge($data, ['type' => FILEMANAGER_TYPE_FILE]);
+					}
 				}
 
 				closedir($handler);
@@ -98,9 +102,11 @@ 
 
 			foreach ($this->items['list'] as $item) {
 
-				if ($item['type'] === FILEMANAGER_TYPE_DIR) $items->add($this->getDirItemBlock($item));
-
-				else if ($item['type'] === FILEMANAGER_TYPE_FILE) $items->add($this->getFileItemBlock($item));
+				if ($item['type'] === FILEMANAGER_TYPE_DIR) {
+					$items->add($this->getDirItemBlock($item));
+				} else if ($item['type'] === FILEMANAGER_TYPE_FILE) {
+					$items->add($this->getFileItemBlock($item));
+				}
 			}
 
 			# ------------------------
@@ -149,7 +155,9 @@ 
 
 			$items = $this->getItemsBlock();
 
-			if ($items->count() > 0) $contents->items = $items;
+			if ($items->count() > 0) {
+				$contents->items = $items;
+			}
 
 			# Set pagination
 

Unused Use Statements +9 added lines, -2 removed lines

@@ -2,8 +2,15 @@
 
 namespace Modules\Filemanager\Handler {
 
-	use Modules\Filemanager, Utils\Messages, Utils\Pagination, Utils\Uploader, Utils\View;
-	use Ajax, Arr, Explorer, Language, Number, Request, Template, Url;
+	use Modules\Filemanager;
+	use Utils\Pagination;
+	use Utils\Uploader;
+	use Utils\View;
+	use Arr;
+	use Number;
+	use Request;
+	use Template;
+	use Url;
 
 	class Listview {
 

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

Braces +8 added lines, -3 removed lines

@@ -16,7 +16,9 @@ 
 
 			$path = implode('/', $scheme); $path_full = (DIR_UPLOADS . (('' !== $path) ? ($path . '/') : ''));
 
-			if (!Explorer::isDir($path_full)) return;
+			if (!Explorer::isDir($path_full)) {
+				return;
+			}
 
 			$this->scheme = $scheme; $this->path = $path; $this->path_full = $path_full;
 		}
@@ -27,9 +29,12 @@ 
 
 			$scheme = []; $breadcrumbs = [];
 
-			if ([] !== $this->scheme) foreach ($this->scheme as $name) {
+			if ([] !== $this->scheme) {
+				foreach ($this->scheme as $name) {
 
-				$scheme[] = $name; $breadcrumbs[] = ['path' => implode('/', $scheme), 'name' => $name];
+				$scheme[] = $name;
+			}
+			$breadcrumbs[] = ['path' => implode('/', $scheme), 'name' => $name];
 			}
 
 			# ------------------------

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

Braces +36 added lines, -12 removed lines

@@ -12,7 +12,9 @@ 
 
 		private function getPrototype(string $name) {
 
-			if (preg_match('/[\/\\\\]/', $name)) return false;
+			if (preg_match('/[\/\\\\]/', $name)) {
+				return false;
+			}
 
 			$path = (($this->parent->path() ? ($this->parent->path() . '/') : '') . $name);
 
@@ -34,11 +36,17 @@ 
 
 		public function init(string $name) {
 
-			if (false === ($prototype = $this->getPrototype($name))) return false;
+			if (false === ($prototype = $this->getPrototype($name))) {
+				return false;
+			}
 
-			if (!Explorer::{static::$checker}($prototype['path_full'])) return false;
+			if (!Explorer::{static::$checker}($prototype['path_full'])) {
+				return false;
+			}
 
-			foreach ($prototype as $var => $value) $this->$var = $value;
+			foreach ($prototype as $var => $value) {
+				$this->$var = $value;
+			}
 
 			# ------------------------
 
@@ -49,11 +57,17 @@ 
 
 		public function create(string $name) {
 
-			if (('' !== $this->name) || (false === ($prototype = $this->getPrototype($name)))) return false;
+			if (('' !== $this->name) || (false === ($prototype = $this->getPrototype($name)))) {
+				return false;
+			}
 
-			if (!Explorer::{static::$creator}($prototype['path_full'])) return false;
+			if (!Explorer::{static::$creator}($prototype['path_full'])) {
+				return false;
+			}
 
-			foreach ($prototype as $var => $value) $this->$var = $value;
+			foreach ($prototype as $var => $value) {
+				$this->$var = $value;
+			}
 
 			# ------------------------
 
@@ -64,11 +78,17 @@ 
 
 		public function rename(string $name) {
 
-			if (('' === $this->name) || (false === ($prototype = $this->getPrototype($name)))) return false;
+			if (('' === $this->name) || (false === ($prototype = $this->getPrototype($name)))) {
+				return false;
+			}
 
-			if (!@rename($this->path_full, $prototype['path_full'])) return false;
+			if (!@rename($this->path_full, $prototype['path_full'])) {
+				return false;
+			}
 
-			foreach ($prototype as $var => $value) $this->$var = $value;
+			foreach ($prototype as $var => $value) {
+				$this->$var = $value;
+			}
 
 			# ------------------------
 
@@ -79,9 +99,13 @@ 
 
 		public function remove() {
 
-			if ('' === $this->name) return false;
+			if ('' === $this->name) {
+				return false;
+			}
 
-			if (!Explorer::{static::$remover}($this->path_full, true)) return false;
+			if (!Explorer::{static::$remover}($this->path_full, true)) {
+				return false;
+			}
 
 			$this->name = ''; $this->path = ''; $this->path_full = '';