cadmium-org / cadmium-cms

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

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

@@ -2,7 +2,8 @@
 
 namespace Modules\Entitizer\Controller {
 
-	use Modules\Entitizer, Utils\Validate;
+	use Modules\Entitizer;
+	use Utils\Validate;
 
 	class Variable {
 

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

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

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

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';
+			}
 
 			# ------------------------
 

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

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

@@ -2,7 +2,12 @@
 
 namespace Modules\Extend\Utils\Handler {
 
-	use Modules\Extend, Modules\Settings, Ajax, Arr, Language, Request, Template, JSON;
+	use Modules\Extend;
+	use Modules\Settings;
+	use Ajax;
+	use Language;
+	use Request;
+	use Template;
 
 	abstract class Basic extends Extend\Utils\Handler {
 

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/Utils/Uploader.php

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

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

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/Framework/Main.php

Spacing +14 added lines, -14 removed lines

@@ -2,24 +2,24 @@ 
 
 # Define constants
 
-define('DIR_FRAMEWORK',     (dirname(__FILE__) . '/'));
+define('DIR_FRAMEWORK', (dirname(__FILE__).'/'));
 
-define('DIR_CLASSES',       (DIR_FRAMEWORK . 'Classes/'));
-define('DIR_DATA',          (DIR_FRAMEWORK . 'Data/'));
-define('DIR_INCLUDES',      (DIR_FRAMEWORK . 'Includes/'));
-define('DIR_TEMPLATES',     (DIR_FRAMEWORK . 'Templates/'));
+define('DIR_CLASSES', (DIR_FRAMEWORK.'Classes/'));
+define('DIR_DATA', (DIR_FRAMEWORK.'Data/'));
+define('DIR_INCLUDES', (DIR_FRAMEWORK.'Includes/'));
+define('DIR_TEMPLATES', (DIR_FRAMEWORK.'Templates/'));
 
 # Require classes
 
-require_once (DIR_FRAMEWORK . 'Engine.php');
-require_once (DIR_FRAMEWORK . 'Exception.php');
+require_once (DIR_FRAMEWORK.'Engine.php');
+require_once (DIR_FRAMEWORK.'Exception.php');
 
 # Require configuration
 
-require_once (DIR_INCLUDES . 'Constants.php');
-require_once (DIR_INCLUDES . 'Regex.php');
-require_once (DIR_INCLUDES . 'Headers/Mime.php');
-require_once (DIR_INCLUDES . 'Headers/Status.php');
+require_once (DIR_INCLUDES.'Constants.php');
+require_once (DIR_INCLUDES.'Regex.php');
+require_once (DIR_INCLUDES.'Headers/Mime.php');
+require_once (DIR_INCLUDES.'Headers/Status.php');
 
 # Set defaults
 
@@ -29,10 +29,10 @@ 
 
 # Set request constants
 
-define('REQUEST_CLIENT_IP',     Engine::getIP());
+define('REQUEST_CLIENT_IP', Engine::getIP());
 
-define('REQUEST_TIME',          $_SERVER['REQUEST_TIME']);
-define('REQUEST_TIME_FLOAT',    $_SERVER['REQUEST_TIME_FLOAT']);
+define('REQUEST_TIME', $_SERVER['REQUEST_TIME']);
+define('REQUEST_TIME_FLOAT', $_SERVER['REQUEST_TIME_FLOAT']);
 
 # Set exception handler
 

www/engine/Framework/Classes/Url/Url.php

Spacing +3 added lines, -3 removed lines

@@ -72,7 +72,7 @@ 
 
 		public function getPath() : string {
 
-			return ('/' . implode('/', array_map('urlencode', $this->path)));
+			return ('/'.implode('/', array_map('urlencode', $this->path)));
 		}
 
 		/**
@@ -81,7 +81,7 @@ 
 
 		public function getQuery() : string {
 
-			return (($query = http_build_query($this->query)) ? ('?' . $query) : '');
+			return (($query = http_build_query($this->query)) ? ('?'.$query) : '');
 		}
 
 		/**
@@ -108,7 +108,7 @@ 
 
 		public function getString(bool $include_query = true) : string {
 
-			return ($this->getPath() . ($include_query ? $this->getQuery() : ''));
+			return ($this->getPath().($include_query ? $this->getQuery() : ''));
 		}
 	}
 }

www/engine/System/Main.php

Spacing +15 added lines, -15 removed lines

@@ -2,33 +2,33 @@
 
 # Define constants
 
-define('DIR_SYSTEM',                (dirname(__FILE__) . '/'));
+define('DIR_SYSTEM', (dirname(__FILE__).'/'));
 
-define('DIR_SYSTEM_CLASSES',        (DIR_SYSTEM . 'Classes/'));
-define('DIR_SYSTEM_DATA',           (DIR_SYSTEM . 'Data/'));
-define('DIR_SYSTEM_INCLUDES',       (DIR_SYSTEM . 'Includes/'));
-define('DIR_SYSTEM_LANGUAGES',      (DIR_SYSTEM . 'Languages/'));
-define('DIR_SYSTEM_TEMPLATES',      (DIR_SYSTEM . 'Templates/'));
+define('DIR_SYSTEM_CLASSES', (DIR_SYSTEM.'Classes/'));
+define('DIR_SYSTEM_DATA', (DIR_SYSTEM.'Data/'));
+define('DIR_SYSTEM_INCLUDES', (DIR_SYSTEM.'Includes/'));
+define('DIR_SYSTEM_LANGUAGES', (DIR_SYSTEM.'Languages/'));
+define('DIR_SYSTEM_TEMPLATES', (DIR_SYSTEM.'Templates/'));
 
 # Require classes
 
-require_once (DIR_SYSTEM . 'Exception.php');
+require_once (DIR_SYSTEM.'Exception.php');
 
 # Require configuration
 
-require_once (DIR_SYSTEM_INCLUDES . 'Config.php');
-require_once (DIR_SYSTEM_INCLUDES . 'Constants.php');
-require_once (DIR_SYSTEM_INCLUDES . 'Regex.php');
-require_once (DIR_SYSTEM_INCLUDES . 'Tables.php');
+require_once (DIR_SYSTEM_INCLUDES.'Config.php');
+require_once (DIR_SYSTEM_INCLUDES.'Constants.php');
+require_once (DIR_SYSTEM_INCLUDES.'Regex.php');
+require_once (DIR_SYSTEM_INCLUDES.'Tables.php');
 
 # Process environment variables
 
-define('HTTP_MOD_REWRITE',      (getenv('HTTP_MOD_REWRITE') === 'on'));
+define('HTTP_MOD_REWRITE', (getenv('HTTP_MOD_REWRITE') === 'on'));
 
-define('INSTALL_PATH',          rtrim(getenv('INSTALL_PATH'), '/'));
+define('INSTALL_PATH', rtrim(getenv('INSTALL_PATH'), '/'));
 
-define('MODE_DEBUG',            @file_exists(DIR_SYSTEM_DATA . '.debug'));
-define('MODE_DEMO',             @file_exists(DIR_SYSTEM_DATA . '.demo'));
+define('MODE_DEBUG', @file_exists(DIR_SYSTEM_DATA.'.debug'));
+define('MODE_DEMO', @file_exists(DIR_SYSTEM_DATA.'.demo'));
 
 // Add here a check for a debug mode and if enabled then set an error reporting to E_ALL (previously should be set to 0).
 // Till the CMS is in a beta stage an error reporting should be set to E_ALL by default.

www/engine/System/Classes/Modules/Informer/Informer.php

Spacing +1 added lines, -1 removed lines

@@ -24,7 +24,7 @@
 
 		public static function checkInstallFile() {
 
-			return Explorer::isFile(DIR_WWW . 'install.php');
+			return Explorer::isFile(DIR_WWW.'install.php');
 		}
 
 		# Get MySQL version

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));
+			}
 
 			# ------------------------