cadmium-org / cadmium-cms

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,19 +47,27 @@ 
 
 		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 (MODE_DEMO) return 'DEMO_MODE_RESTRICTION';
+			if (MODE_DEMO) {
+				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
 
@@ -53,21 +75,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)) 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';
+			}
 
 			# ------------------------
 

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 (MODE_DEMO) return $ajax->setError(Language::get('DEMO_MODE_RESTRICTION'));
+			if (MODE_DEMO) {
+				return $ajax->setError(Language::get('DEMO_MODE_RESTRICTION'));
+			}
 
 			# Init entity
 
@@ -60,7 +62,9 @@ 
 
 			if (Request::post('action') === 'remove') {
 
-				if (!$this->entity->remove()) return $ajax->setError(Language::get(static::$message_error_remove));
+				if (!$this->entity->remove()) {
+					return $ajax->setError(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/Create.php

Braces +12 added lines, -4 removed lines

@@ -29,23 +29,31 @@
 
 			# Check for demo mode
 
-			if (MODE_DEMO) return 'DEMO_MODE_RESTRICTION';
+			if (MODE_DEMO) {
+				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/Filemanager/Controller/Rename.php

Braces +12 added lines, -4 removed lines

@@ -29,23 +29,31 @@
 
 			# Check for demo mode
 
-			if (MODE_DEMO) return 'DEMO_MODE_RESTRICTION';
+			if (MODE_DEMO) {
+				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/Settings/Controller/General.php

Braces +9 added lines, -3 removed lines

@@ -12,7 +12,9 @@ 
 
 			# Check for demo mode
 
-			if (MODE_DEMO) return 'DEMO_MODE_RESTRICTION';
+			if (MODE_DEMO) {
+				return 'DEMO_MODE_RESTRICTION';
+			}
 
 			# Define errors list
 
@@ -25,12 +27,16 @@ 
 
 			foreach (Settings::setArray($post) as $name => $result) {
 
-				if (!$result) return (isset($errors[$name]) ? [$name, $errors[$name]] : false);
+				if (!$result) {
+					return (isset($errors[$name]) ? [$name, $errors[$name]] : false);
+				}
 			}
 
 			# Save settings
 
-			if (!Settings::save()) return 'SETTINGS_ERROR_SAVE';
+			if (!Settings::save()) {
+				return 'SETTINGS_ERROR_SAVE';
+			}
 
 			# ------------------------
 

www/engine/System/Classes/Modules/Extend/Utils/Handler/Basic.php

Braces +12 added lines, -4 removed lines

@@ -30,13 +30,19 @@ 
 
 			if (Request::post('action') === 'activate') {
 
-				if (MODE_DEMO) return $ajax->setError(Language::get('DEMO_MODE_RESTRICTION'));
+				if (MODE_DEMO) {
+					return $ajax->setError(Language::get('DEMO_MODE_RESTRICTION'));
+				}
 
 				$param = static::$param[$this->loader->section()]; $name = Request::post('name');
 
-				if (false === Settings::set($param, $name)) return $ajax->setError(Language::get(static::$error_activate));
+				if (false === Settings::set($param, $name)) {
+					return $ajax->setError(Language::get(static::$error_activate));
+				}
 
-				if (false === Settings::save()) return $ajax->setError(Language::get(static::$error_save));
+				if (false === Settings::save()) {
+					return $ajax->setError(Language::get(static::$error_save));
+				}
 
 			} else if (Request::post('action') === 'list') {
 
@@ -54,7 +60,9 @@ 
 
 			$this->loader = new static::$loader_class(Request::get('list'));
 
-			if (Request::isAjax()) return $this->handleAjax();
+			if (Request::isAjax()) {
+				return $this->handleAjax();
+			}
 
 			# ------------------------
 

www/engine/System/Classes/Modules/Entitizer/Controller/Variable.php

Braces +12 added lines, -4 removed lines

@@ -29,13 +29,19 @@ 
 
 			# Validate name
 
-			if (false === ($name = Validate::templateComponentName($name))) return ['name', 'VARIABLE_ERROR_NAME_INVALID'];
+			if (false === ($name = Validate::templateComponentName($name))) {
+				return ['name', 'VARIABLE_ERROR_NAME_INVALID'];
+			}
 
 			# Check name exists
 
-			if (false === ($check_name = $this->variable->check($name, 'name'))) return 'VARIABLE_ERROR_MODIFY';
+			if (false === ($check_name = $this->variable->check($name, 'name'))) {
+				return 'VARIABLE_ERROR_MODIFY';
+			}
 
-			if ($check_name === 1) return ['name', 'VARIABLE_ERROR_NAME_DUPLICATE'];
+			if ($check_name === 1) {
+				return ['name', 'VARIABLE_ERROR_NAME_DUPLICATE'];
+			}
 
 			# Modify variable
 
@@ -47,7 +53,9 @@ 
 
 			$modifier = ((0 === $this->variable->id) ? 'create' : 'edit');
 
-			if (!$this->variable->$modifier($data)) return 'VARIABLE_ERROR_MODIFY';
+			if (!$this->variable->$modifier($data)) {
+				return 'VARIABLE_ERROR_MODIFY';
+			}
 
 			# ------------------------
 

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

Braces +12 added lines, -4 removed lines

@@ -29,13 +29,19 @@ 
 
 			# Validate name
 
-			if (false === ($name = Validate::templateComponentName($name))) return ['name', 'WIDGET_ERROR_NAME_INVALID'];
+			if (false === ($name = Validate::templateComponentName($name))) {
+				return ['name', 'WIDGET_ERROR_NAME_INVALID'];
+			}
 
 			# Check name exists
 
-			if (false === ($check_name = $this->widget->check($name, 'name'))) return 'WIDGET_ERROR_MODIFY';
+			if (false === ($check_name = $this->widget->check($name, 'name'))) {
+				return 'WIDGET_ERROR_MODIFY';
+			}
 
-			if ($check_name === 1) return ['name', 'WIDGET_ERROR_NAME_DUPLICATE'];
+			if ($check_name === 1) {
+				return ['name', 'WIDGET_ERROR_NAME_DUPLICATE'];
+			}
 
 			# Modify widget
 
@@ -48,7 +54,9 @@ 
 
 			$modifier = ((0 === $this->widget->id) ? 'create' : 'edit');
 
-			if (!$this->widget->$modifier($data)) return 'WIDGET_ERROR_MODIFY';
+			if (!$this->widget->$modifier($data)) {
+				return 'WIDGET_ERROR_MODIFY';
+			}
 
 			# ------------------------