cadmium-org / cadmium-cms

www/engine/System/Classes/Modules/Entitizer/Utils/Param/Type/Integer.php

Indentation +1 added lines, -1 removed lines

@@ -25,7 +25,7 @@
 
 			return ("`" . $this->name . "` " . ($this->short ? "tiny" : "") . "int(" . $this->maxlength . ") ") .
 
-			       ("unsigned NOT NULL DEFAULT '" . $this->default . "'");
+				   ("unsigned NOT NULL DEFAULT '" . $this->default . "'");
 		}
 
 		# Cast value

Braces +3 added lines, -1 removed lines

@@ -16,7 +16,9 @@
 
 			# Set field configuration
 
-			foreach (get_defined_vars() as $name => $value) $this->$name = $value;
+			foreach (get_defined_vars() as $name => $value) {
+				$this->$name = $value;
+			}
 		}
 
 		# Get field statement

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

Indentation +1 added lines, -1 removed lines

@@ -40,7 +40,7 @@
 
 			return ($this->index ? (($this->unique ? ($this->primary ? "PRIMARY " : "UNIQUE ") : "") .
 
-			       ("KEY `" . $this->name . "` (`" . $this->name . "`)")) : false);
+				   ("KEY `" . $this->name . "` (`" . $this->name . "`)")) : false);
 		}
 	}
 }

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

Braces +12 added lines, -4 removed lines

@@ -12,7 +12,9 @@ 
 
 		private function addParam(Param $param) {
 
-			if (('' === $param->name()) || isset($this->params[$param->name()])) return;
+			if (('' === $param->name()) || isset($this->params[$param->name()])) {
+				return;
+			}
 
 			$this->params[$param->name()] = $param;
 		}
@@ -26,7 +28,9 @@ 
 
 			foreach ($this->params as $param) {
 
-				if (false !== ($statement = $param->$method())) $statements[] = $statement;
+				if (false !== ($statement = $param->$method())) {
+					$statements[] = $statement;
+				}
 			}
 
 			# ------------------------
@@ -63,7 +67,9 @@ 
 
 		protected function addOrderer(string $name, bool $descending = false) {
 
-			if (!isset($this->params[$name]) || isset($this->orderers[$name])) return;
+			if (!isset($this->params[$name]) || isset($this->orderers[$name])) {
+				return;
+			}
 
 			$this->orderers[$name] = $descending;
 		}
@@ -128,10 +134,12 @@ 
 
 			$params = [];
 
-			foreach ($data as $name => $value) if (isset($this->params[$name])) {
+			foreach ($data as $name => $value) {
+				if (isset($this->params[$name])) {
 
 				$params[$name] = $this->params[$name]->cast($value);
 			}
+			}
 
 			# ------------------------
 

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

Indentation +6 added lines, -6 removed lines

@@ -36,17 +36,17 @@
 
 			$query = ("SELECT SQL_CALC_FOUND_ROWS ent.id, " . implode(', ', $selection)) .
 
-			         (static::$nesting ? ", COUNT(chd.id) as children " : " ") .
+					 (static::$nesting ? ", COUNT(chd.id) as children " : " ") .
 
-			         ("FROM " . static::$table . " ent ") .
+					 ("FROM " . static::$table . " ent ") .
 
-			         (static::$nesting ? ("LEFT JOIN " . static::$table . " chd ON chd.parent_id = ent.id ") : "") .
+					 (static::$nesting ? ("LEFT JOIN " . static::$table . " chd ON chd.parent_id = ent.id ") : "") .
 
-			         ("WHERE ent.id != " . $disable_id . " ") .
+					 ("WHERE ent.id != " . $disable_id . " ") .
 
-			         (static::$nesting ? ("AND ent.parent_id = " . $parent_id . " GROUP BY ent.id ") : "") .
+					 (static::$nesting ? ("AND ent.parent_id = " . $parent_id . " GROUP BY ent.id ") : "") .
 
-			         ("ORDER BY " . implode(', ', $order_by) . ", ent.id ASC" . ($limit ? (" LIMIT " . $limit) : ""));
+					 ("ORDER BY " . implode(', ', $order_by) . ", ent.id ASC" . ($limit ? (" LIMIT " . $limit) : ""));
 
 			# ------------------------
 

Braces +6 added lines, -2 removed lines

@@ -66,13 +66,17 @@
 
 			$items = ['list' => [], 'total' => 0];
 
-			if (!(($index >= 0) && ($display >= 0) && ($parent_id >= 0) && ($disable_id >= 0))) return $items;
+			if (!(($index >= 0) && ($display >= 0) && ($parent_id >= 0) && ($disable_id >= 0))) {
+				return $items;
+			}
 
 			# Select entities
 
 			$query = $this->getQuery($index, $display, $parent_id, $disable_id);
 
-			if (!(DB::send($query) && DB::last()->status)) return $items;
+			if (!(DB::send($query) && DB::last()->status)) {
+				return $items;
+			}
 
 			# Process results
 

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

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
 

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

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

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

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

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 {
 

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

Braces +15 added lines, -5 removed lines

@@ -12,25 +12,35 @@
 
 		public function create(array $data) {
 
-			if (0 !== $this->id) return false;
+			if (0 !== $this->id) {
+				return false;
+			}
 
 			$set = $this->getDataset($data, true);
 
-			if (isset($set['id']) && !($set['id'] > 0)) return false;
+			if (isset($set['id']) && !($set['id'] > 0)) {
+				return false;
+			}
 
 			# Insert entity
 
 			DB::insert(static::$table, $set);
 
-			if (!(DB::last() && DB::last()->status)) return false;
+			if (!(DB::last() && DB::last()->status)) {
+				return false;
+			}
 
 			# Re-init entity
 
 			$this->error = false; $this->id = DB::last()->id;
 
-			foreach ($set as $name => $value) if ($name !== 'id') $this->data[$name] = $value;
+			foreach ($set as $name => $value) {
+				if ($name !== 'id') $this->data[$name] = $value;
+			}
 
-			if (static::$nesting) $this->data['path'] = $this->getPath();
+			if (static::$nesting) {
+				$this->data['path'] = $this->getPath();
+			}
 
 			# Implement entity
 

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

Braces +24 added lines, -8 removed lines

@@ -12,13 +12,19 @@ 
 
 		public function remove() {
 
-			if (0 === $this->id) return false;
+			if (0 === $this->id) {
+				return false;
+			}
 
 			# Check if entity is removable
 
-			if (static::$super && ($this->id === 1)) return false;
+			if (static::$super && ($this->id === 1)) {
+				return false;
+			}
 
-			if (static::$nesting && (0 !== $this->children())) return false;
+			if (static::$nesting && (0 !== $this->children())) {
+				return false;
+			}
 
 			# Remove extension entries
 
@@ -26,18 +32,24 @@ 
 
 				$entity = self::get($extension, $this->id);
 
-				if ($entity->error() || ((0 !== $entity->id) && !$entity->remove())) return false;
+				if ($entity->error() || ((0 !== $entity->id) && !$entity->remove())) {
+					return false;
+				}
 			}
 
 			# Remove entity
 
 			DB::delete(static::$table, ['id' => $this->id]);
 
-			if (!(DB::last() && DB::last()->status)) return false;
+			if (!(DB::last() && DB::last()->status)) {
+				return false;
+			}
 
 			# Uncache entity
 
-			if (self::$cache[static::$type][$this->id] === $this) unset(self::$cache[static::$type][$this->id]);
+			if (self::$cache[static::$type][$this->id] === $this) {
+				unset(self::$cache[static::$type][$this->id]);
+			}
 
 			# Reset id
 
@@ -45,11 +57,15 @@ 
 
 			# Reset 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);
+			}
 
 			# Reset path
 
-			if (static::$nesting) $this->data['path'] = [];
+			if (static::$nesting) {
+				$this->data['path'] = [];
+			}
 
 			# Implement entity
 

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

Braces +17 added lines, -7 removed lines

@@ -12,13 +12,17 @@ 
 
 		public function init($value, string $name = 'id') {
 
-			if (0 !== $this->id) return false;
+			if (0 !== $this->id) {
+				return false;
+			}
 
 			# Check param name
 
-			if ($name === 'id') $param = $this->definition->id();
-
-			else if ((false === ($param = $this->definition->get($name))) || !$param->unique()) return false;
+			if ($name === 'id') {
+				$param = $this->definition->id();
+			} else if ((false === ($param = $this->definition->get($name))) || !$param->unique()) {
+				return false;
+			}
 
 			# Select entity from DB
 
@@ -28,7 +32,9 @@ 
 
 			DB::select(static::$table, $selection, [$name => $value], null, 1);
 
-			if (($this->error = !(DB::last() && DB::last()->status)) || (DB::last()->rows !== 1)) return false;
+			if (($this->error = !(DB::last() && DB::last()->status)) || (DB::last()->rows !== 1)) {
+				return false;
+			}
 
 			$data = DB::last()->row();
 
@@ -36,11 +42,15 @@ 
 
 			$this->id = $this->definition->id()->cast($data['id']);
 
-			foreach ($this->definition->params() as $name => $param) $this->data[$name] = $param->cast($data[$name]);
+			foreach ($this->definition->params() as $name => $param) {
+				$this->data[$name] = $param->cast($data[$name]);
+			}
 
 			# Init path
 
-			if (static::$nesting) $this->data['path'] = $this->getPath();
+			if (static::$nesting) {
+				$this->data['path'] = $this->getPath();
+			}
 
 			# Implement entity