cadmium-org / cadmium-cms

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

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

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

www/engine/System/Classes/Modules/Entitizer/Utils/Entity/Entity.php

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

@@ -2,7 +2,8 @@
 
 namespace System\Modules\Entitizer\Utils {
 
-	use System\Modules\Entitizer, DB;
+	use System\Modules\Entitizer;
+	use DB;
 
 	abstract class Entity extends Entitizer {
 

Braces +24 added lines, -8 removed lines

@@ -20,7 +20,9 @@ 
 
 				$entity = self::get(static::$type, $entity->data['parent_id']);
 
-				if (0 === $entity->id) return [];
+				if (0 === $entity->id) {
+					return [];
+				}
 
 				$path[] = array_merge(['id' => $entity->id], $entity->data);
 			}
@@ -43,7 +45,9 @@ 
 
 			foreach ($this->definition->params() as $name => $param) {
 
-				if (isset($data[$name])) $set[$name] = $param->cast($data[$name]);
+				if (isset($data[$name])) {
+					$set[$name] = $param->cast($data[$name]);
+				}
 			}
 
 			# ------------------------
@@ -61,11 +65,15 @@ 
 
 			# Preset data array
 
-			foreach ($this->definition->params() as $name => $param) $this->data[$name] = $param->cast(null);
+			foreach ($this->definition->params() as $name => $param) {
+				$this->data[$name] = $param->cast(null);
+			}
 
 			# Preset path
 
-			if (static::$nesting) $this->data['path'] = [];
+			if (static::$nesting) {
+				$this->data['path'] = [];
+			}
 
 			# Implement entity
 
@@ -73,14 +81,18 @@ 
 
 			# Init entity
 
-			if ($id > 0) $this->init($id);
+			if ($id > 0) {
+				$this->init($id);
+			}
 		}
 
 		# Check if unique param value exists
 
 		public function check(string $name, $value) {
 
-			if ((false === ($param = $this->definition->get($name))) || !$param->unique()) return false;
+			if ((false === ($param = $this->definition->get($name))) || !$param->unique()) {
+				return false;
+			}
 
 			# Select entity from DB
 
@@ -101,7 +113,9 @@ 
 
 			DB::select(static::$table, 'COUNT(id) as count', ['parent_id' => $this->id]);
 
-			if (!(DB::last() && DB::last()->status)) return false;
+			if (!(DB::last() && DB::last()->status)) {
+				return false;
+			}
 
 			# ------------------------
 
@@ -133,7 +147,9 @@ 
 
 		public function __get(string $name) {
 
-			if ($name === 'id') return $this->id;
+			if ($name === 'id') {
+				return $this->id;
+			}
 
 			return (isset($this->data[$name]) ? $this->data[$name] : null);
 		}

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

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

@@ -2,7 +2,14 @@
 
 namespace System\Modules\Entitizer\Utils {
 
-	use System\Modules\Entitizer, System\Utils\Messages, System\Utils\View, Ajax, Language, Number, Request, Template;
+	use System\Modules\Entitizer;
+	use System\Utils\Messages;
+	use System\Utils\View;
+	use Ajax;
+	use Language;
+	use Number;
+	use Request;
+	use Template;
 
 	abstract class Handler {
 

Braces +37 added lines, -15 removed lines

@@ -24,7 +24,9 @@ 
 
 			# Set edit button
 
-			if (0 === $this->parent->id) $parent->block('edit')->disable(); else {
+			if (0 === $this->parent->id) {
+				$parent->block('edit')->disable();
+			} else {
 
 				$parent->block('edit')->class = (!$this->create ? 'active item' : 'item');
 
@@ -36,7 +38,9 @@ 
 
 		private function processSelector(Template\Asset\Block $selector) {
 
-			if ($this->create) return $selector->disable();
+			if ($this->create) {
+				return $selector->disable();
+			}
 
 			$parent = Entitizer::get(static::$type, $this->entity->parent_id);
 
@@ -55,25 +59,33 @@ 
 
 			# Set path / title
 
-			if (static::$nesting) $contents->path = $this->parent->path;
-
-			else $contents->title = ($this->create ? Language::get(static::$naming_new) : $this->entity->__get(static::$naming));
+			if (static::$nesting) {
+				$contents->path = $this->parent->path;
+			} else {
+				$contents->title = ($this->create ? Language::get(static::$naming_new) : $this->entity->__get(static::$naming));
+			}
 
 			# Set link
 
 			$link = (INSTALL_PATH . static::$link . '/');
 
-			if (static::$nesting) $contents->link = ($link . ($this->create ? 'create' : 'edit') . '?id=' . $this->parent->id);
-
-			else $contents->link = ($link . ($this->create ? 'create' : ('edit?id=' . $this->entity->id)));
+			if (static::$nesting) {
+				$contents->link = ($link . ($this->create ? 'create' : 'edit') . '?id=' . $this->parent->id);
+			} else {
+				$contents->link = ($link . ($this->create ? 'create' : ('edit?id=' . $this->entity->id)));
+			}
 
 			# Process parent block
 
-			if (static::$nesting) $this->processParent($contents->block('parent'));
+			if (static::$nesting) {
+				$this->processParent($contents->block('parent'));
+			}
 
 			# Process selector block
 
-			if (static::$nesting) $this->processSelector($contents->block('selector'));
+			if (static::$nesting) {
+				$this->processSelector($contents->block('selector'));
+			}
 
 			# Implement form
 
@@ -102,7 +114,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));
+				}
 			}
 
 			# ------------------------
@@ -114,23 +128,31 @@ 
 
 		public function handle(bool $create = false) {
 
-			if (!($this->create = $create) && Request::isAjax()) return $this->handleAjax();
+			if (!($this->create = $create) && Request::isAjax()) {
+				return $this->handleAjax();
+			}
 
 			# Create entity
 
-			if (static::$nesting) $this->parent = Entitizer::get(static::$type, Number::format(Request::get('id')));
+			if (static::$nesting) {
+				$this->parent = Entitizer::get(static::$type, Number::format(Request::get('id')));
+			}
 
 			$this->entity = Entitizer::get(static::$type, (!$this->create ? Number::format(Request::get('id')) : 0));
 
 			# Redirect if entity not found
 
-			if (!$this->create && (0 === $this->entity->id)) return Request::redirect(INSTALL_PATH . static::$link);
+			if (!$this->create && (0 === $this->entity->id)) {
+				return Request::redirect(INSTALL_PATH . static::$link);
+			}
 
 			# Create form
 
 			$this->form = new static::$form_class($this->entity);
 
-			if (static::$nesting && $this->create) $this->form->get('parent_id')->set($this->parent->id);
+			if (static::$nesting && $this->create) {
+				$this->form->get('parent_id')->set($this->parent->id);
+			}
 
 			# Handle form
 

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

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

@@ -2,7 +2,14 @@
 
 namespace System\Modules\Entitizer\Utils {
 
-	use System\Modules\Entitizer, System\Utils\Pagination, System\Utils\View, Ajax, Number, Request, Template, Url;
+	use System\Modules\Entitizer;
+	use System\Utils\Pagination;
+	use System\Utils\View;
+	use Ajax;
+	use Number;
+	use Request;
+	use Template;
+	use Url;
 
 	abstract class Listview {
 

Braces +26 added lines, -10 removed lines

@@ -22,9 +22,11 @@ 
 
 			# Set edit button
 
-			if (0 === $this->parent->id) $parent->block('edit')->disable();
-
-			else $parent->block('edit')->id = $this->parent->id;
+			if (0 === $this->parent->id) {
+				$parent->block('edit')->disable();
+			} else {
+				$parent->block('edit')->id = $this->parent->id;
+			}
 		}
 
 		# Get items block
@@ -82,21 +84,29 @@ 
 
 			# Set path
 
-			if (static::$nesting) $contents->path = $this->parent->path;
+			if (static::$nesting) {
+				$contents->path = $this->parent->path;
+			}
 
 			# Process parent block
 
-			if (static::$nesting && !$ajax) $this->processParent($contents->block('parent'));
+			if (static::$nesting && !$ajax) {
+				$this->processParent($contents->block('parent'));
+			}
 
 			# Set items
 
 			$items = $this->getItemsBlock($ajax);
 
-			if ($items->count() > 0) $contents->items = $items;
+			if ($items->count() > 0) {
+				$contents->items = $items;
+			}
 
 			# Set pagination
 
-			if (!$ajax) $contents->pagination = $this->getPaginationBlock();
+			if (!$ajax) {
+				$contents->pagination = $this->getPaginationBlock();
+			}
 
 			# Add additional data for specific entity
 
@@ -115,7 +125,9 @@ 
 
 			# Create parent entity
 
-			if (static::$nesting) $this->parent = Entitizer::get(static::$type, Number::format(Request::get('parent_id')));
+			if (static::$nesting) {
+				$this->parent = Entitizer::get(static::$type, Number::format(Request::get('parent_id')));
+			}
 
 			# Get children items
 
@@ -132,13 +144,17 @@ 
 
 		public function handle() {
 
-			if (Request::isAjax()) return $this->handleAjax();
+			if (Request::isAjax()) {
+				return $this->handleAjax();
+			}
 
 			$this->index = Number::format(Request::get('index'), 1, 999999);
 
 			# Create parent entity
 
-			if (static::$nesting) $this->parent = Entitizer::get(static::$type, Number::format(Request::get('parent_id')));
+			if (static::$nesting) {
+				$this->parent = Entitizer::get(static::$type, Number::format(Request::get('parent_id')));
+			}
 
 			# Get children items
 

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

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

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

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

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

@@ -2,7 +2,12 @@
 
 namespace System\Modules\Filemanager\Handler {
 
-	use System\Modules\Filemanager, Date, Explorer, Mime, Number, Template;
+	use System\Modules\Filemanager;
+	use Date;
+	use Explorer;
+	use Mime;
+	use Number;
+	use Template;
 
 	class File extends Filemanager\Utils\Handler {
 

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

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

@@ -2,8 +2,15 @@
 
 namespace System\Modules\Filemanager\Handler {
 
-	use System\Modules\Filemanager, System\Utils\Messages, System\Utils\Pagination, System\Utils\Uploader, System\Utils\View;
-	use Ajax, Arr, Explorer, Language, Number, Request, Template, Url;
+	use System\Modules\Filemanager;
+	use System\Utils\Pagination;
+	use System\Utils\Uploader;
+	use System\Utils\View;
+	use Arr;
+	use Number;
+	use Request;
+	use Template;
+	use Url;
 
 	class Listview {
 

Braces +16 added lines, -8 removed lines

@@ -23,15 +23,19 @@ 
 
 				while (false !== ($name = readdir($handler))) {
 
-					if (in_array($name, ['.', '..', '.empty'], true)) continue;
+					if (in_array($name, ['.', '..', '.empty'], true)) {
+						continue;
+					}
 
 					$path = ($prefix . $name); $path_full = ($this->parent->pathFull() . $name);
 
 					$data = ['name' => $name, 'path' => $path, 'path_full' => $path_full];
 
-					if (@is_dir($path_full)) $dirs[] = array_merge($data, ['type' => FILEMANAGER_TYPE_DIR]);
-
-					else if (@is_file($path_full)) $files[] = array_merge($data, ['type' => FILEMANAGER_TYPE_FILE]);
+					if (@is_dir($path_full)) {
+						$dirs[] = array_merge($data, ['type' => FILEMANAGER_TYPE_DIR]);
+					} else if (@is_file($path_full)) {
+						$files[] = array_merge($data, ['type' => FILEMANAGER_TYPE_FILE]);
+					}
 				}
 
 				closedir($handler);
@@ -98,9 +102,11 @@ 
 
 			foreach ($this->items['list'] as $item) {
 
-				if ($item['type'] === FILEMANAGER_TYPE_DIR) $items->add($this->getDirItemBlock($item));
-
-				else if ($item['type'] === FILEMANAGER_TYPE_FILE) $items->add($this->getFileItemBlock($item));
+				if ($item['type'] === FILEMANAGER_TYPE_DIR) {
+					$items->add($this->getDirItemBlock($item));
+				} else if ($item['type'] === FILEMANAGER_TYPE_FILE) {
+					$items->add($this->getFileItemBlock($item));
+				}
 			}
 
 			# ------------------------
@@ -149,7 +155,9 @@ 
 
 			$items = $this->getItemsBlock();
 
-			if ($items->count() > 0) $contents->items = $items;
+			if ($items->count() > 0) {
+				$contents->items = $items;
+			}
 
 			# Set pagination
 

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

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

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

Braces +42 added lines, -14 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,35 +47,49 @@ 
 
 		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 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';
+			}
 
 			# ------------------------
 

www/engine/Main.php

Spacing +3 added lines, -3 removed lines

@@ -10,10 +10,10 @@
 
 # Define constants
 
-define('DIR_ENGINE',        (dirname(__FILE__) . '/'));
+define('DIR_ENGINE', (dirname(__FILE__) . '/'));
 
-define('DIR_WWW',           (DIR_ENGINE . '../'));
-define('DIR_UPLOADS',       (DIR_ENGINE . '../uploads/'));
+define('DIR_WWW', (DIR_ENGINE . '../'));
+define('DIR_UPLOADS', (DIR_ENGINE . '../uploads/'));
 
 # Require framework main file
 

Braces +22 added lines, -12 removed lines

@@ -2,7 +2,9 @@ 
 
 # Check PHP version
 
-if (version_compare(PHP_VERSION, '7.0.0') < 0) exit('PHP version 7 or higher is required.');
+if (version_compare(PHP_VERSION, '7.0.0') < 0) {
+	exit('PHP version 7 or higher is required.');
+}
 
 # Set error reporting
 
@@ -31,23 +33,31 @@ 
 
 	# Determine class path
 
-	if ($path[0] === 'System') $path = (DIR_SYSTEM_CLASSES . implode('/', array_slice($path, 1)));
-
-	else if ($path[0] === 'Plugins') $path = (DIR_SYSTEM_PLUGINS . implode('/', array_slice($path, 1)));
-
-	else $path = (DIR_CLASSES . implode('/', $path));
+	if ($path[0] === 'System') {
+		$path = (DIR_SYSTEM_CLASSES . implode('/', array_slice($path, 1)));
+	} else if ($path[0] === 'Plugins') {
+		$path = (DIR_SYSTEM_PLUGINS . implode('/', array_slice($path, 1)));
+	} else {
+		$path = (DIR_CLASSES . implode('/', $path));
+	}
 
 	# Require class file
 
-	if (@file_exists($file_name = ($path . '.php')) && @is_file($file_name)) require_once $file_name;
-
-	else if (@file_exists($file_name = ($path . '/' . $last . '.php')) && @is_file($file_name)) require_once $file_name;
+	if (@file_exists($file_name = ($path . '.php')) && @is_file($file_name)) {
+		require_once $file_name;
+	} else if (@file_exists($file_name = ($path . '/' . $last . '.php')) && @is_file($file_name)) {
+		require_once $file_name;
+	}
 
 	# Check if class exists
 
-	if (!class_exists($class_name) && !interface_exists($class_name) && !trait_exists($class_name)) throw new Exception\ClassLoad($class_name);
+	if (!class_exists($class_name) && !interface_exists($class_name) && !trait_exists($class_name)) {
+		throw new Exception\ClassLoad($class_name);
+	}
 
 	# Call autoload method
 
-	if (method_exists($class_name, '__autoload')) $class_name::__autoload();
-});
+	if (method_exists($class_name, '__autoload')) {
+		$class_name::__autoload();
+	}
+	});