cadmium-org / cadmium-cms

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

Braces +45 added lines, -15 removed lines

@@ -12,19 +12,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';
+			}
 
 			# ------------------------
 
@@ -35,19 +49,27 @@ 
 
 		public static function save(string $name, string $dir_name) {
 
-			if (false === ($file = Request::file($name))) return false;
+			if (false === ($file = Request::file($name))) {
+				return false;
+			}
 
 			# 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 for secure upload
 
-			if (!is_uploaded_file($file['tmp_name'])) return 'UPLOADER_ERROR_SECURITY';
+			if (!is_uploaded_file($file['tmp_name'])) {
+				return 'UPLOADER_ERROR_SECURITY';
+			}
 
 			# 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
 
@@ -55,21 +77,29 @@ 
 
 			$extension = strtolower(Explorer::getExtension($file['name'], false));
 
-			if (in_array($extension, $extensions, true)) return 'UPLOADER_ERROR_TYPE';
+			if (in_array($extension, $extensions, true)) {
+				return 'UPLOADER_ERROR_TYPE';
+			}
 
 			# Check target directory
 
-			if (!Explorer::isDir($dir_name) && !Explorer::createDir($dir_name)) return 'UPLOADER_ERROR_DIR';
+			if (!Explorer::isDir($dir_name) && !Explorer::createDir($dir_name)) {
+				return 'UPLOADER_ERROR_DIR';
+			}
 
 			# Check target file
 
 			$base_name = basename($file['name']); $file_name = ($dir_name . '/' . $base_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';
+			}
 
 			# Set upload data
 

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

Braces +3 added lines, -1 removed lines

@@ -10,7 +10,9 @@
 
 		protected function handle() {
 
-			if (!Request::isAjax()) return false;
+			if (!Request::isAjax()) {
+				return false;
+			}
 
 			# Create response