cadmium-org / cadmium-cms

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

Braces +12 added lines, -4 removed lines

@@ -47,13 +47,17 @@ 
 
 			# 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'));
+			}
 
 			# Remove item
 
 			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));
+				}
 			}
 
 			# ------------------------
@@ -84,7 +88,9 @@ 
 
 			# Handle ajax request
 
-			if (Request::isAjax()) return $this->handleAjax();
+			if (Request::isAjax()) {
+				return $this->handleAjax();
+			}
 
 			# Create form
 
@@ -101,7 +107,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));
+			}
 
 			# ------------------------
 

www/engine/System/Classes/Utils/Uploader.php

Braces +45 added lines, -15 removed lines

@@ -10,19 +10,33 @@ 
 
 		private static function translateError(int $error) {
 
-			if ($error === UPLOAD_ERR_INI_SIZE)         return 'UPLOADER_ERROR_INI_SIZE';
+			if ($error === UPLOAD_ERR_INI_SIZE) {
+				return 'UPLOADER_ERROR_INI_SIZE';
+			}
 
-			if ($error === UPLOAD_ERR_FORM_SIZE)        return 'UPLOADER_ERROR_FORM_SIZE';
+			if ($error === UPLOAD_ERR_FORM_SIZE) {
+				return 'UPLOADER_ERROR_FORM_SIZE';
+			}
 
-			if ($error === UPLOAD_ERR_PARTIAL)          return 'UPLOADER_ERROR_PARTIAL';
+			if ($error === UPLOAD_ERR_PARTIAL) {
+				return 'UPLOADER_ERROR_PARTIAL';
+			}
 
-			if ($error === UPLOAD_ERR_NO_FILE)          return 'UPLOADER_ERROR_NO_FILE';
+			if ($error === UPLOAD_ERR_NO_FILE) {
+				return 'UPLOADER_ERROR_NO_FILE';
+			}
 
-			if ($error === UPLOAD_ERR_NO_TMP_DIR)       return 'UPLOADER_ERROR_NO_TMP_DIR';
+			if ($error === UPLOAD_ERR_NO_TMP_DIR) {
+				return 'UPLOADER_ERROR_NO_TMP_DIR';
+			}
 
-			if ($error === UPLOAD_ERR_CANT_WRITE)       return 'UPLOADER_ERROR_CANT_WRITE';
+			if ($error === UPLOAD_ERR_CANT_WRITE) {
+				return 'UPLOADER_ERROR_CANT_WRITE';
+			}
 
-			if ($error === UPLOAD_ERR_EXTENSION)        return 'UPLOADER_ERROR_EXTENSION';
+			if ($error === UPLOAD_ERR_EXTENSION) {
+				return 'UPLOADER_ERROR_EXTENSION';
+			}
 
 			# ------------------------
 
@@ -33,39 +47,55 @@ 
 
 		public static function save(string $name, string $dir_name) {
 
-			if ((false === ($file = Request::file($name))) || !is_uploaded_file($file['tmp_name'])) return false;
+			if ((false === ($file = Request::file($name))) || !is_uploaded_file($file['tmp_name'])) {
+				return false;
+			}
 
 			# Check for demo mode
 
-			if (Informer::isDemoMode()) return 'DEMO_MODE_RESTRICTION';
+			if (Informer::isDemoMode()) {
+				return 'DEMO_MODE_RESTRICTION';
+			}
 
 			# Check for upload errors
 
-			if ($file['error'] !== UPLOAD_ERR_OK) return self::translateError($file['error']);
+			if ($file['error'] !== UPLOAD_ERR_OK) {
+				return self::translateError($file['error']);
+			}
 
 			# Check size
 
-			if ($file['size'] > CONFIG_UPLOADS_MAX_SIZE) return 'UPLOADER_ERROR_SIZE';
+			if ($file['size'] > CONFIG_UPLOADS_MAX_SIZE) {
+				return 'UPLOADER_ERROR_SIZE';
+			}
 
 			# Check file extension
 
 			$extensions = ['php', 'phtml', 'php3', 'php4', 'php5', 'phps'];
 
-			if (in_array(Explorer::extension($file['name'], false), $extensions)) return 'UPLOADER_ERROR_TYPE';
+			if (in_array(Explorer::extension($file['name'], false), $extensions)) {
+				return 'UPLOADER_ERROR_TYPE';
+			}
 
 			# Check target directory
 
-			if (!Explorer::isDir($dir_name)) return 'UPLOADER_ERROR_DIR';
+			if (!Explorer::isDir($dir_name)) {
+				return 'UPLOADER_ERROR_DIR';
+			}
 
 			# Check target file
 
 			$file_name = ($dir_name . '/' . basename($file['name']));
 
-			if (Explorer::isDir($file_name) || Explorer::isFile($file_name)) return 'UPLOADER_ERROR_EXISTS';
+			if (Explorer::isDir($file_name) || Explorer::isFile($file_name)) {
+				return 'UPLOADER_ERROR_EXISTS';
+			}
 
 			# Save uploaded file
 
-			if (!@move_uploaded_file($file['tmp_name'], $file_name)) return 'UPLOADER_ERROR_SAVE';
+			if (!@move_uploaded_file($file['tmp_name'], $file_name)) {
+				return 'UPLOADER_ERROR_SAVE';
+			}
 
 			# ------------------------
 

Unused Use Statements +5 added lines, -1 removed lines

@@ -2,7 +2,11 @@
 
 namespace Utils {
 
-	use Modules\Informer, Utils\Messages, Explorer, Language, Request;
+	use Modules\Informer;
+	use Utils\Messages;
+	use Explorer;
+	use Language;
+	use Request;
 
 	abstract class Uploader {
 

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

Unused Use Statements +7 added lines, -1 removed lines

@@ -2,7 +2,13 @@
 
 namespace Modules\Auth\Utils {
 
-	use Modules\Auth, Modules\Entitizer, Modules\Settings, Utils\View, Date, Language, Mailer;
+	use Modules\Auth;
+	use Modules\Entitizer;
+	use Modules\Settings;
+	use Utils\View;
+	use Date;
+	use Language;
+	use Mailer;
 
 	abstract class Mail {
 

www/engine/System/Classes/Modules/Entitizer/Form/Page.php

Unused Use Statements +3 added lines, -1 removed lines

@@ -2,7 +2,9 @@
 
 namespace Modules\Entitizer\Form {
 
-	use Modules\Entitizer, Utils\Form, Utils\Lister;
+	use Modules\Entitizer;
+	use Utils\Form;
+	use Utils\Lister;
 
 	class Page extends Form {
 

www/engine/System/Classes/Modules/Entitizer/Form/User.php

Unused Use Statements +7 added lines, -1 removed lines

@@ -2,7 +2,13 @@
 
 namespace Modules\Entitizer\Form {
 
-	use Modules\Auth, Modules\Entitizer, Utils\Form, Utils\Lister, Geo\Country, Geo\Timezone, Language;
+	use Modules\Auth;
+	use Modules\Entitizer;
+	use Utils\Form;
+	use Utils\Lister;
+	use Geo\Country;
+	use Geo\Timezone;
+	use Language;
 
 	class User extends Form {
 

www/engine/System/Classes/Modules/Entitizer/Form/Widget.php

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

@@ -2,7 +2,8 @@
 
 namespace Modules\Entitizer\Form {
 
-	use Modules\Entitizer, Utils\Form;
+	use Modules\Entitizer;
+	use Utils\Form;
 
 	class Widget extends Form {
 

www/engine/System/Classes/Modules/Entitizer/Listview/Variables.php

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

@@ -2,7 +2,8 @@
 
 namespace Modules\Entitizer\Listview {
 
-	use Modules\Entitizer, Template;
+	use Modules\Entitizer;
+	use Template;
 
 	class Variables extends Entitizer\Utils\Listview {
 

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

Unused Use Statements +3 added lines, -1 removed lines

@@ -2,7 +2,9 @@
 
 namespace Modules\Entitizer\Listview {
 
-	use Modules\Entitizer, Template, Language;
+	use Modules\Entitizer;
+	use Template;
+	use Language;
 
 	class Widgets extends Entitizer\Utils\Listview {
 

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

Unused Use Statements +3 added lines, -1 removed lines

@@ -2,7 +2,9 @@
 
 namespace Modules\Filemanager\Handler {
 
-	use Modules\Filemanager, Date, Template;
+	use Modules\Filemanager;
+	use Date;
+	use Template;
 
 	class Dir extends Filemanager\Utils\Handler {