cadmium-org / cadmium-cms

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/Controller/Create.php

Braces +9 added lines, -3 removed lines

@@ -29,19 +29,25 @@
 
 			# Validate name
 
-			if (false === ($name = Filemanager\Validate::name($name))) return 'FILEMANAGER_ERROR_NAME_INVALID';
+			if (false === ($name = Filemanager\Validate::name($name))) {
+				return 'FILEMANAGER_ERROR_NAME_INVALID';
+			}
 
 			# Check if item exists
 
-			if (@file_exists($this->parent->pathFull() . $name)) return 'FILEMANAGER_ERROR_EXISTS';
+			if (@file_exists($this->parent->pathFull() . $name)) {
+				return '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/Filemanager/Controller/Rename.php

Braces +9 added lines, -3 removed lines

@@ -29,19 +29,25 @@
 
 			# Validate name
 
-			if (false === ($name = Filemanager\Validate::name($name))) return 'FILEMANAGER_ERROR_NAME_INVALID';
+			if (false === ($name = Filemanager\Validate::name($name))) {
+				return 'FILEMANAGER_ERROR_NAME_INVALID';
+			}
 
 			# Check if item exists
 
 			if ((0 !== strcasecmp($this->entity->name(), $name)) &&
 
-				@file_exists($this->entity->parent()->pathFull() . $name)) return 'FILEMANAGER_ERROR_EXISTS';
+				@file_exists($this->entity->parent()->pathFull() . $name)) {
+				return '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/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 = '';
 

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

Braces +21 added lines, -7 removed lines

@@ -12,19 +12,33 @@
 
 			$extension = strtolower(Explorer::extension($file_name, false));
 
-			if (self::isImage($extension)) return 'image';
+			if (self::isImage($extension)) {
+				return 'image';
+			}
 
-			if (self::isAudio($extension)) return 'audio';
+			if (self::isAudio($extension)) {
+				return 'audio';
+			}
 
-			if (self::isVideo($extension)) return 'video';
+			if (self::isVideo($extension)) {
+				return 'video';
+			}
 
-			if (in_array($extension, ['doc', 'docx'], true)) return 'word';
+			if (in_array($extension, ['doc', 'docx'], true)) {
+				return 'word';
+			}
 
-			if (in_array($extension, ['xls', 'xlsx'], true)) return 'excel';
+			if (in_array($extension, ['xls', 'xlsx'], true)) {
+				return 'excel';
+			}
 
-			if (in_array($extension, ['ppt', 'pptx'], true)) return 'powerpoint';
+			if (in_array($extension, ['ppt', 'pptx'], true)) {
+				return 'powerpoint';
+			}
 
-			if ($extension === 'pdf') return 'pdf';
+			if ($extension === 'pdf') {
+				return 'pdf';
+			}
 
 			# ------------------------
 

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

Braces +9 added lines, -3 removed lines

@@ -49,7 +49,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));
+				}
 			}
 
 			# ------------------------
@@ -80,7 +82,9 @@ 
 
 			# Handle ajax request
 
-			if (Request::isAjax()) return $this->handleAjax();
+			if (Request::isAjax()) {
+				return $this->handleAjax();
+			}
 
 			# Create form
 
@@ -97,7 +101,9 @@ 
 
 			# Display success message
 
-			if (false !== Request::get('submitted')) Messages::success(Language::get(static::$message_success_rename));
+			if (false !== Request::get('submitted')) {
+				Messages::success(Language::get(static::$message_success_rename));
+			}
 
 			# ------------------------