cadmium-org / cadmium-cms

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

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

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

Spacing +1 added lines, -1 removed lines

@@ -86,7 +86,7 @@
 
 			$name = $param->name(); $value = $param->cast($value);
 
-			$condition = ($name . " = '" . addslashes($value) . "' AND id != " . $this->id);
+			$condition = ($name." = '".addslashes($value)."' AND id != ".$this->id);
 
 			DB::select(static::$table, 'id', $condition, null, 1);
 

Braces +18 added lines, -6 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);
 			}
@@ -44,7 +46,9 @@ 
 
 			# Preset path
 
-			if (static::$nesting) $this->data['path'] = [];
+			if (static::$nesting) {
+				$this->data['path'] = [];
+			}
 
 			# Implement entity
 
@@ -52,14 +56,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
 
@@ -80,7 +88,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;
+			}
 
 			# ------------------------
 
@@ -112,7 +122,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/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 {
 

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

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

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

www/engine/Main.php

Braces +12 added lines, -6 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
 
@@ -37,9 +39,11 @@ 
 
 	# 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
 
@@ -50,5 +54,7 @@ 
 
 	# Call autoload method
 
-	if (method_exists($class_name, '__autoload')) $class_name::__autoload();
-});
+	if (method_exists($class_name, '__autoload')) {
+		$class_name::__autoload();
+	}
+	});

Spacing +8 added lines, -8 removed lines

@@ -10,18 +10,18 @@ 
 
 # 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
 
-require_once(DIR_ENGINE . 'Framework/Main.php');
+require_once(DIR_ENGINE.'Framework/Main.php');
 
 # Require system main file
 
-require_once(DIR_ENGINE . 'System/Main.php');
+require_once(DIR_ENGINE.'System/Main.php');
 
 # Register classes autoloader
 
@@ -33,13 +33,13 @@ 
 
 	$system_classes = ['Frames', 'Handlers', 'Modules', 'Utils', 'Views', 'Dispatcher', 'Installer'];
 
-	$path = ((in_array($path[0], $system_classes) ? DIR_SYSTEM_CLASSES : DIR_CLASSES) . implode('/', $path));
+	$path = ((in_array($path[0], $system_classes) ? DIR_SYSTEM_CLASSES : DIR_CLASSES).implode('/', $path));
 
 	# Require class file
 
-	if (@file_exists($file_name = ($path . '.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;
+	else if (@file_exists($file_name = ($path.'/'.$last.'.php')) && @is_file($file_name)) require_once $file_name;
 
 	# Check if class exists
 

www/engine/System/Classes/Modules/Entitizer/Form/Menuitem.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/Variable.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/Utils/Template/Variables.php

Braces +6 added lines, -2 removed lines

@@ -23,11 +23,15 @@
 
 			$selection = ['name', 'value']; $order = ['name' => 'ASC'];
 
-			if (!(DB::select(TABLE_VARIABLES, $selection, null, $order) && DB::last()->status)) return;
+			if (!(DB::select(TABLE_VARIABLES, $selection, null, $order) && DB::last()->status)) {
+				return;
+			}
 
 			# Process results
 
-			while (null !== ($variable = DB::last()->row())) $this->addItem($variable['name'], $variable['value']);
+			while (null !== ($variable = DB::last()->row())) {
+				$this->addItem($variable['name'], $variable['value']);
+			}
 		}
 
 		# Return items

www/engine/System/Classes/Utils/Template/Widgets.php

Braces +6 added lines, -2 removed lines

@@ -23,11 +23,15 @@
 
 			$selection = ['name', 'contents']; $condition = ['display' => 1]; $order = ['name' => 'ASC'];
 
-			if (!(DB::select(TABLE_WIDGETS, $selection, $condition, $order) && DB::last()->status)) return;
+			if (!(DB::select(TABLE_WIDGETS, $selection, $condition, $order) && DB::last()->status)) {
+				return;
+			}
 
 			# Process results
 
-			while (null !== ($widget = DB::last()->row())) $this->addItem($widget['name'], $widget['contents']);
+			while (null !== ($widget = DB::last()->row())) {
+				$this->addItem($widget['name'], $widget['contents']);
+			}
 		}
 
 		# Return items

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

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

@@ -2,7 +2,9 @@
 
 namespace Modules\Entitizer\Controller {
 
-	use Modules\Auth, Modules\Entitizer, Utils\Validate, Str;
+	use Modules\Entitizer;
+	use Utils\Validate;
+	use Str;
 
 	class User {
 

Braces +27 added lines, -9 removed lines

@@ -31,30 +31,46 @@ 
 
 			# Validate name & email
 
-			if (false === ($name = Validate::userName($name))) return 'USER_ERROR_NAME_INVALID';
+			if (false === ($name = Validate::userName($name))) {
+				return 'USER_ERROR_NAME_INVALID';
+			}
 
-			if (false === ($email = Validate::userEmail($email))) return 'USER_ERROR_EMAIL_INVALID';
+			if (false === ($email = Validate::userEmail($email))) {
+				return 'USER_ERROR_EMAIL_INVALID';
+			}
 
 			# Validate password
 
 			if ((0 === $this->user->id) || ('' !== $password)) {
 
-				if (false === ($password = Validate::userPassword($password))) return 'USER_ERROR_PASSWORD_INVALID';
+				if (false === ($password = Validate::userPassword($password))) {
+					return 'USER_ERROR_PASSWORD_INVALID';
+				}
 
-				if (0 !== strcmp($password, $password_retype)) return 'USER_ERROR_PASSWORD_MISMATCH';
+				if (0 !== strcmp($password, $password_retype)) {
+					return 'USER_ERROR_PASSWORD_MISMATCH';
+				}
 			}
 
 			# Check name exists
 
-			if (false === ($check_name = $this->user->check('name', $name))) return 'USER_ERROR_MODIFY';
+			if (false === ($check_name = $this->user->check('name', $name))) {
+				return 'USER_ERROR_MODIFY';
+			}
 
-			if ($check_name === 1) return 'USER_ERROR_NAME_DUPLICATE';
+			if ($check_name === 1) {
+				return 'USER_ERROR_NAME_DUPLICATE';
+			}
 
 			# Check email exists
 
-			if (false === ($check_email = $this->user->check('email', $email))) return 'USER_ERROR_MODIFY';
+			if (false === ($check_email = $this->user->check('email', $email))) {
+				return 'USER_ERROR_MODIFY';
+			}
 
-			if ($check_email === 1) return 'USER_ERROR_EMAIL_DUPLICATE';
+			if ($check_email === 1) {
+				return 'USER_ERROR_EMAIL_DUPLICATE';
+			}
 
 			# Modify user
 
@@ -84,7 +100,9 @@ 
 
 			$modifier = ((0 === $this->user->id) ? 'create' : 'edit');
 
-			if (!$this->user->$modifier($data)) return 'USER_ERROR_MODIFY';
+			if (!$this->user->$modifier($data)) {
+				return 'USER_ERROR_MODIFY';
+			}
 
 			# ------------------------