cadmium-org / cadmium-cms

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

Braces +37 added lines, -15 removed lines

@@ -56,7 +56,9 @@ 
 
 		private function processSelector(Template\Block $selector) {
 
-			if ($this->create) return $selector->disable();
+			if ($this->create) {
+				return $selector->disable();
+			}
 
 			$selector->parent_id = $this->entity->parent_id;
 
@@ -81,25 +83,33 @@ 
 
 			# Set path / title
 
-			if (static::$nesting) $contents->path = $this->path;
-
-			else $contents->title = ($this->create ? Language::get(static::$naming_new) : $this->entity->get(static::$naming));
+			if (static::$nesting) {
+				$contents->path = $this->path;
+			} else {
+				$contents->title = ($this->create ? Language::get(static::$naming_new) : $this->entity->get(static::$naming));
+			}
 
 			# Process parent block
 
-			if (static::$nesting) $this->processParent($contents->getBlock('parent'));
+			if (static::$nesting) {
+				$this->processParent($contents->getBlock('parent'));
+			}
 
 			# 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 selector block
 
-			if (static::$nesting) $this->processSelector($contents->getBlock('selector'));
+			if (static::$nesting) {
+				$this->processSelector($contents->getBlock('selector'));
+			}
 
 			# Implement form
 
@@ -134,11 +144,15 @@ 
 
 				$parent_id = Number::forceInt(Request::post('parent_id'));
 
-				if (!$this->entity->move($parent_id)) return $ajax->setError(Language::get(static::$message_error_move));
+				if (!$this->entity->move($parent_id)) {
+					return $ajax->setError(Language::get(static::$message_error_move));
+				}
 
 			} else 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));
+				}
 			}
 
 			# ------------------------
@@ -154,7 +168,9 @@ 
 
 		protected function handle(bool $ajax = false) {
 
-			if (!$this->create && $ajax) return $this->handleAjax();
+			if (!$this->create && $ajax) {
+				return $this->handleAjax();
+			}
 
 			# Create entity
 
@@ -162,7 +178,9 @@ 
 
 			$this->entity = Entitizer::get(static::$table, (!$this->create ? $id : 0));
 
-			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 parent entity
 
@@ -170,7 +188,9 @@ 
 
 			# Get path
 
-			if (false !== ($path = $this->parent->getPath())) $this->path = $path;
+			if (false !== ($path = $this->parent->getPath())) {
+				$this->path = $path;
+			}
 
 			# Create form
 
@@ -180,7 +200,9 @@ 
 
 			if ($this->form->handle(new static::$controller_class($this->entity), true)) {
 
-				if ($this->create && (0 !== $this->parent->id)) $this->entity->move($this->parent->id);
+				if ($this->create && (0 !== $this->parent->id)) {
+					$this->entity->move($this->parent->id);
+				}
 
 				Request::redirect(INSTALL_PATH . static::$link . '/edit?id=' . $this->entity->id . '&submitted');
 			}

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

Braces +36 added lines, -16 removed lines

@@ -29,15 +29,15 @@ 
 
 			# Set create button
 
-			if (count($this->path) < CONFIG_ENTITIZER_MAX_DEPTH) $parent->getBlock('create')->id = $this->parent->id;
-
-			else { $parent->getBlock('create')->disable(); $parent->getBlock('create_disabled')->enable(); }
+			if (count($this->path) < CONFIG_ENTITIZER_MAX_DEPTH) {
+				$parent->getBlock('create')->id = $this->parent->id;
+			} else { $parent->getBlock('create')->disable(); $parent->getBlock('create_disabled')->enable(); }
 
 			# Set edit button
 
-			if (0 !== $this->parent->id) $parent->getBlock('edit')->id = $this->parent->id;
-
-			else { $parent->getBlock('edit')->disable(); $parent->getBlock('edit_disabled')->enable(); }
+			if (0 !== $this->parent->id) {
+				$parent->getBlock('edit')->id = $this->parent->id;
+			} else { $parent->getBlock('edit')->disable(); $parent->getBlock('edit_disabled')->enable(); }
 
 			# Add parent additional data
 
@@ -52,7 +52,9 @@ 
 
 			foreach ($this->items['list'] as $item) {
 
-				if ((null !== $this->entity) && ($item['dataset']->id === $this->entity->id)) continue;
+				if ((null !== $this->entity) && ($item['dataset']->id === $this->entity->id)) {
+					continue;
+				}
 
 				$items->addItem($view = View::get(!$ajax ? static::$view_item : static::$view_ajax_item));
 
@@ -121,11 +123,15 @@ 
 
 			# Set path
 
-			if (static::$nesting) $contents->path = $this->path;
+			if (static::$nesting) {
+				$contents->path = $this->path;
+			}
 
 			# Process parent block
 
-			if (static::$nesting && !$ajax) $this->processParent($contents->getBlock('parent'));
+			if (static::$nesting && !$ajax) {
+				$this->processParent($contents->getBlock('parent'));
+			}
 
 			# Process items block
 
@@ -133,7 +139,9 @@ 
 
 			# Set pagination
 
-			if (!$ajax) $contents->pagination = $this->getPaginationBlock();
+			if (!$ajax) {
+				$contents->pagination = $this->getPaginationBlock();
+			}
 
 			# ------------------------
 
@@ -160,15 +168,21 @@ 
 
 			# Get path and depth
 
-			if (false !== ($path = $this->parent->getPath())) $this->path = $path;
+			if (false !== ($path = $this->parent->getPath())) {
+				$this->path = $path;
+			}
 
-			if ((0 !== $this->entity->id) && (false !== ($depth = $this->entity->getSubtreeDepth()))) $this->depth = $depth;
+			if ((0 !== $this->entity->id) && (false !== ($depth = $this->entity->getSubtreeDepth()))) {
+				$this->depth = $depth;
+			}
 
 			# Get items list
 
 			$lister = (static::$nesting ? 'getChildren' : 'getItems');
 
-			if (false !== ($items = $this->parent->$lister())) $this->items = $items;
+			if (false !== ($items = $this->parent->$lister())) {
+				$this->items = $items;
+			}
 
 			# ------------------------
 
@@ -183,7 +197,9 @@ 
 
 		protected function handle(bool $ajax = false) {
 
-			if ($ajax) return $this->handleAjax();
+			if ($ajax) {
+				return $this->handleAjax();
+			}
 
 			$this->index = Number::forceInt(Request::get('index'), 1, 999999);
 
@@ -195,13 +211,17 @@ 
 
 			# Get path
 
-			if (false !== ($path = $this->parent->getPath())) $this->path = $path;
+			if (false !== ($path = $this->parent->getPath())) {
+				$this->path = $path;
+			}
 
 			# Get items list
 
 			$lister = (static::$nesting ? 'getChildren' : 'getItems'); $display = Settings::get('admin_display_entities');
 
-			if (false !== ($items = $this->parent->$lister([], [], $this->index, $display))) $this->items = $items;
+			if (false !== ($items = $this->parent->$lister([], [], $this->index, $display))) {
+				$this->items = $items;
+			}
 
 			# ------------------------
 

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

Indentation +8 added lines, -8 removed lines

@@ -21,7 +21,7 @@ 
 
 			return (0 !== $parent_id) ? (("JOIN " . static::$table_relations . " rel ") .
 
-			       ("ON rel.ancestor = " . $parent_id . " AND rel.descendant = ent.id AND rel.depth >= 1")) :
+				   ("ON rel.ancestor = " . $parent_id . " AND rel.descendant = ent.id AND rel.depth >= 1")) :
 
 				   ("JOIN " . static::$table_relations . " rel ON rel.descendant = ent.id");
 		}
@@ -34,13 +34,13 @@ 
 
 			return ("SELECT " . $this->getSelection() . ", COALESCE(par.ancestor, 0) as parent_id ") .
 
-			       ("FROM " . static::$table . " ent " . $this->getQueryJoin($parent_id) . " ") .
+				   ("FROM " . static::$table . " ent " . $this->getQueryJoin($parent_id) . " ") .
 
-			       ("LEFT JOIN " . static::$table_relations . " par ON par.descendant = ent.id AND par.depth = 1 ") .
+				   ("LEFT JOIN " . static::$table_relations . " par ON par.descendant = ent.id AND par.depth = 1 ") .
 
-			       (('' !== ($condition = $this->getCondition($config))) ? ("WHERE " . $condition . " ") : "") .
+				   (('' !== ($condition = $this->getCondition($config))) ? ("WHERE " . $condition . " ") : "") .
 
-			       ("GROUP BY ent.id ORDER BY MAX(rel.depth) ASC, " . $this->getOrderBy($order_by));
+				   ("GROUP BY ent.id ORDER BY MAX(rel.depth) ASC, " . $this->getOrderBy($order_by));
 		}
 
 		/**
@@ -51,7 +51,7 @@ 
 
 			return ("SELECT COUNT(DISTINCT ent.id) as count FROM " . static::$table . " ent ") .
 
-			       $this->getQueryJoin($parent_id);
+				   $this->getQueryJoin($parent_id);
 		}
 
 		/**
@@ -62,7 +62,7 @@ 
 
 			$query = ("SELECT COUNT(DISTINCT rel.depth) as depth FROM " . static::$table . " ent ") .
 
-			         $this->getQueryJoin($parent_id);
+					 $this->getQueryJoin($parent_id);
 
 			# ------------------------
 
@@ -169,7 +169,7 @@ 
 
 			$query = ("SELECT " . $this->getSelection() . " FROM " . static::$table . " ent ") .
 
-			         ("JOIN " . static::$table_relations . " rel ON rel.ancestor = ent.id ") .
+					 ("JOIN " . static::$table_relations . " rel ON rel.ancestor = ent.id ") .
 
 					 ("WHERE rel.descendant = " . $parent_id . " ORDER BY rel.depth DESC");
 

Spacing +12 added lines, -14 removed lines

@@ -19,11 +19,9 @@ 
 
 		protected function getQueryJoin(int $parent_id) : string {
 
-			return (0 !== $parent_id) ? (("JOIN " . static::$table_relations . " rel ") .
+			return (0 !== $parent_id) ? (("JOIN ".static::$table_relations." rel ").
 
-			       ("ON rel.ancestor = " . $parent_id . " AND rel.descendant = ent.id AND rel.depth >= 1")) :
-
-				   ("JOIN " . static::$table_relations . " rel ON rel.descendant = ent.id");
+			       ("ON rel.ancestor = ".$parent_id." AND rel.descendant = ent.id AND rel.depth >= 1")) : ("JOIN ".static::$table_relations." rel ON rel.descendant = ent.id");
 		}
 
 		/**
@@ -32,15 +30,15 @@ 
 
 		private function getSelectQuery(int $parent_id, array $config, array $order_by) : string {
 
-			return ("SELECT " . $this->getSelection() . ", COALESCE(par.ancestor, 0) as parent_id ") .
+			return ("SELECT ".$this->getSelection().", COALESCE(par.ancestor, 0) as parent_id ").
 
-			       ("FROM " . static::$table . " ent " . $this->getQueryJoin($parent_id) . " ") .
+			       ("FROM ".static::$table." ent ".$this->getQueryJoin($parent_id)." ").
 
-			       ("LEFT JOIN " . static::$table_relations . " par ON par.descendant = ent.id AND par.depth = 1 ") .
+			       ("LEFT JOIN ".static::$table_relations." par ON par.descendant = ent.id AND par.depth = 1 ").
 
-			       (('' !== ($condition = $this->getCondition($config))) ? ("WHERE " . $condition . " ") : "") .
+			       (('' !== ($condition = $this->getCondition($config))) ? ("WHERE ".$condition." ") : "").
 
-			       ("GROUP BY ent.id ORDER BY MAX(rel.depth) ASC, " . $this->getOrderBy($order_by));
+			       ("GROUP BY ent.id ORDER BY MAX(rel.depth) ASC, ".$this->getOrderBy($order_by));
 		}
 
 		/**
@@ -49,7 +47,7 @@ 
 
 		private function getCountQuery(int $parent_id) : string {
 
-			return ("SELECT COUNT(DISTINCT ent.id) as count FROM " . static::$table . " ent ") .
+			return ("SELECT COUNT(DISTINCT ent.id) as count FROM ".static::$table." ent ").
 
 			       $this->getQueryJoin($parent_id);
 		}
@@ -60,7 +58,7 @@ 
 
 		private function getDepthQuery(int $parent_id) : string {
 
-			$query = ("SELECT COUNT(DISTINCT rel.depth) as depth FROM " . static::$table . " ent ") .
+			$query = ("SELECT COUNT(DISTINCT rel.depth) as depth FROM ".static::$table." ent ").
 
 			         $this->getQueryJoin($parent_id);
 
@@ -167,11 +165,11 @@ 
 
 			# Process query
 
-			$query = ("SELECT " . $this->getSelection() . " FROM " . static::$table . " ent ") .
+			$query = ("SELECT ".$this->getSelection()." FROM ".static::$table." ent ").
 
-			         ("JOIN " . static::$table_relations . " rel ON rel.ancestor = ent.id ") .
+			         ("JOIN ".static::$table_relations." rel ON rel.ancestor = ent.id ").
 
-					 ("WHERE rel.descendant = " . $parent_id . " ORDER BY rel.depth DESC");
+					 ("WHERE rel.descendant = ".$parent_id." ORDER BY rel.depth DESC");
 
 			# Select path
 

Braces +27 added lines, -9 removed lines

@@ -81,13 +81,17 @@ 
 
 		public function getSubtree(int $parent_id = 0, array $config = [], array $order_by = []) {
 
-			if (!(static::$nesting && ($parent_id >= 0))) return false;
+			if (!(static::$nesting && ($parent_id >= 0))) {
+				return false;
+			}
 
 			# Select entities
 
 			$query = $this->getSelectQuery($parent_id, $config, $order_by);
 
-			if (!(DB::send($query) && DB::getLast()->status)) return false;
+			if (!(DB::send($query) && DB::getLast()->status)) {
+				return false;
+			}
 
 			# Process results
 
@@ -117,13 +121,17 @@ 
 
 		public function getSubtreeCount(int $parent_id = 0) {
 
-			if (!(static::$nesting && ($parent_id >= 0))) return false;
+			if (!(static::$nesting && ($parent_id >= 0))) {
+				return false;
+			}
 
 			# Get count
 
 			$query = $this->getCountQuery($parent_id);
 
-			if (!(DB::send($query) && DB::getLast()->status)) return false;
+			if (!(DB::send($query) && DB::getLast()->status)) {
+				return false;
+			}
 
 			# ------------------------
 
@@ -140,13 +148,17 @@ 
 
 		public function getSubtreeDepth(int $parent_id = 0) {
 
-			if (!(static::$nesting && ($parent_id >= 0))) return false;
+			if (!(static::$nesting && ($parent_id >= 0))) {
+				return false;
+			}
 
 			# Get depth
 
 			$query = $this->getDepthQuery($parent_id);
 
-			if (!(DB::send($query) && DB::getLast()->status)) return false;
+			if (!(DB::send($query) && DB::getLast()->status)) {
+				return false;
+			}
 
 			# ------------------------
 
@@ -163,7 +175,9 @@ 
 
 		public function getPath(int $parent_id = 0) {
 
-			if (!(static::$nesting && ($parent_id >= 0))) return false;
+			if (!(static::$nesting && ($parent_id >= 0))) {
+				return false;
+			}
 
 			# Process query
 
@@ -175,13 +189,17 @@ 
 
 			# Select path
 
-			if (!(DB::send($query) && DB::getLast()->status)) return false;
+			if (!(DB::send($query) && DB::getLast()->status)) {
+				return false;
+			}
 
 			# Process results
 
 			$path = [];
 
-			while (null !== ($data = DB::getLast()->getRow())) $path[] = Entitizer::getDataset(static::$table, $data)->getData();
+			while (null !== ($data = DB::getLast()->getRow())) {
+				$path[] = Entitizer::getDataset(static::$table, $data)->getData();
+			}
 
 			# ------------------------
 

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

Spacing +10 added lines, -10 removed lines

@@ -40,15 +40,15 @@ 
 
 		private function disconnectSubtree() : bool {
 
-			$query = ("DELETE rla FROM " . static::$table_relations . " rla ") .
+			$query = ("DELETE rla FROM ".static::$table_relations." rla ").
 
-			         ("JOIN "  . static::$table_relations . " rlb ON rlb.descendant = rla.descendant ") .
+			         ("JOIN ".static::$table_relations." rlb ON rlb.descendant = rla.descendant ").
 
-			         ("LEFT JOIN " . static::$table_relations . " rlx ") .
+			         ("LEFT JOIN ".static::$table_relations." rlx ").
 
-			         ("ON rlx.ancestor = rlb.ancestor AND rlx.descendant = rla.ancestor ") .
+			         ("ON rlx.ancestor = rlb.ancestor AND rlx.descendant = rla.ancestor ").
 
-			         ("WHERE rlb.ancestor = " . $this->id . " AND rlx.ancestor IS NULL");
+			         ("WHERE rlb.ancestor = ".$this->id." AND rlx.ancestor IS NULL");
 
 			if (!(DB::send($query) && DB::getLast()->status)) return false;
 
@@ -69,15 +69,15 @@ 
 
 		private function connectSubtree(int $parent_id) : bool {
 
-			$query = ("INSERT INTO " . static::$table_relations . " (ancestor, descendant, depth) ") .
+			$query = ("INSERT INTO ".static::$table_relations." (ancestor, descendant, depth) ").
 
-			         ("SELECT sup.ancestor, sub.descendant, sup.depth + sub.depth + 1 ") .
+			         ("SELECT sup.ancestor, sub.descendant, sup.depth + sub.depth + 1 ").
 
-			         ("FROM " . static::$table_relations . " sup ") .
+			         ("FROM ".static::$table_relations." sup ").
 
-			         ("JOIN " . static::$table_relations . " sub ") .
+			         ("JOIN ".static::$table_relations." sub ").
 
-			         ("WHERE sub.ancestor = " . $this->id . " AND sup.descendant = " . $parent_id);
+			         ("WHERE sub.ancestor = ".$this->id." AND sup.descendant = ".$parent_id);
 
 			if (!(DB::send($query) && (DB::getLast()->rows > 0))) return false;
 

Braces +66 added lines, -22 removed lines

@@ -50,7 +50,9 @@ 
 
 			         ("WHERE rlb.ancestor = " . $this->id . " AND rlx.ancestor IS NULL");
 
-			if (!(DB::send($query) && DB::getLast()->status)) return false;
+			if (!(DB::send($query) && DB::getLast()->status)) {
+				return false;
+			}
 
 			# Set path
 
@@ -79,7 +81,9 @@ 
 
 			         ("WHERE sub.ancestor = " . $this->id . " AND sup.descendant = " . $parent_id);
 
-			if (!(DB::send($query) && (DB::getLast()->rows > 0))) return false;
+			if (!(DB::send($query) && (DB::getLast()->rows > 0))) {
+				return false;
+			}
 
 			# Set path
 
@@ -98,27 +102,37 @@ 
 
 		public function create(array $data) : bool {
 
-			if (0 !== $this->id) return false;
+			if (0 !== $this->id) {
+				return false;
+			}
 
 			$data = $this->dataset->cast($data);
 
-			if (static::$auto_increment && isset($data['id'])) $data['id'] = 0;
+			if (static::$auto_increment && isset($data['id'])) {
+				$data['id'] = 0;
+			}
 
 			# Insert entity
 
 			DB::insert(static::$table, $data);
 
-			if (!(DB::getLast() && DB::getLast()->status)) return false;
+			if (!(DB::getLast() && DB::getLast()->status)) {
+				return false;
+			}
 
 			# Update data
 
-			if (static::$auto_increment) $data['id'] = DB::getLast()->id;
+			if (static::$auto_increment) {
+				$data['id'] = DB::getLast()->id;
+			}
 
 			$this->dataset->update($data);
 
 			# Init subtreee
 
-			if (static::$nesting) $this->initSubtree();
+			if (static::$nesting) {
+				$this->initSubtree();
+			}
 
 			# Cache entity
 
@@ -137,17 +151,23 @@ 
 
 		public function edit(array $data) : bool {
 
-			if (0 === $this->id) return false;
+			if (0 === $this->id) {
+				return false;
+			}
 
 			$data = $this->dataset->cast($data);
 
-			if (isset($data['id'])) unset($data['id']);
+			if (isset($data['id'])) {
+				unset($data['id']);
+			}
 
 			# Update entity
 
 			DB::update(static::$table, $data, ['id' => $this->id]);
 
-			if (!(DB::getLast() && DB::getLast()->status)) return false;
+			if (!(DB::getLast() && DB::getLast()->status)) {
+				return false;
+			}
 
 			# Update data
 
@@ -155,7 +175,9 @@ 
 
 			# Init subtreee
 
-			if (static::$nesting) $this->initSubtree();
+			if (static::$nesting) {
+				$this->initSubtree();
+			}
 
 			# ------------------------
 
@@ -170,30 +192,44 @@ 
 
 		public function move(int $parent_id) : bool {
 
-			if (0 === $this->id) return false;
+			if (0 === $this->id) {
+				return false;
+			}
 
 			# Re-connect entity if not in tree
 
-			if (!$this->initSubtree()) return false;
+			if (!$this->initSubtree()) {
+				return false;
+			}
 
 			# Get parent entity
 
 			if (0 !== ($parent = Entitizer::get(static::$table, $parent_id))->id) {
 
-				if (false === ($path = $parent->getPath())) return false;
+				if (false === ($path = $parent->getPath())) {
+					return false;
+				}
 
-				if (false === ($depth = $this->getSubtreeDepth())) return false;
+				if (false === ($depth = $this->getSubtreeDepth())) {
+					return false;
+				}
 
-				if ((count($path) + $depth + 1) > CONFIG_ENTITIZER_MAX_DEPTH) return false;
+				if ((count($path) + $depth + 1) > CONFIG_ENTITIZER_MAX_DEPTH) {
+					return false;
+				}
 			}
 
 			# Disconnect subtree from current position
 
-			if (!$this->disconnectSubtree()) return false;
+			if (!$this->disconnectSubtree()) {
+				return false;
+			}
 
 			# Connect subtree under new position
 
-		 	if (0 !== $parent->id) $this->connectSubtree($parent->id);
+		 	if (0 !== $parent->id) {
+		 		$this->connectSubtree($parent->id);
+		 	}
 
 			# ------------------------
 
@@ -208,19 +244,27 @@ 
 
 		public function remove() : bool {
 
-			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->getSubtreeCount())) return false;
+			if (static::$nesting && (0 !== $this->getSubtreeCount())) {
+				return false;
+			}
 
 			# Remove entity
 
 			DB::delete(static::$table, ['id' => $this->id]);
 
-			if (!(DB::getLast() && DB::getLast()->status)) return false;
+			if (!(DB::getLast() && DB::getLast()->status)) {
+				return false;
+			}
 
 			# Uncache entity
 

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

Indentation +9 added lines, -9 removed lines

@@ -21,13 +21,13 @@ 
 
 			return ("SELECT SQL_CALC_FOUND_ROWS " . $this->getSelection() . " ") .
 
-			       ("FROM " . static::$table . " ent ") .
+				   ("FROM " . static::$table . " ent ") .
 
 				   (('' !== ($condition = $this->getCondition($config))) ? ("WHERE " . $condition . " ") : "") .
 
 				   ("ORDER BY " . $this->getOrderBy($order_by) . " ") .
 
-			       (($index > 0) ? ("LIMIT " . ((($index - 1) * $display) . ", " . $display)) : "");
+				   (($index > 0) ? ("LIMIT " . ((($index - 1) * $display) . ", " . $display)) : "");
 		}
 
 		/**
@@ -38,9 +38,9 @@ 
 
 			return ("SELECT SQL_CALC_FOUND_ROWS " . $this->getSelection() . ", COUNT(chd.descendant) as children ") .
 
-			       ("FROM " . static::$table . " ent ") .
+				   ("FROM " . static::$table . " ent ") .
 
-			       ("LEFT JOIN " . static::$table_relations . " chd ON chd.ancestor = ent.id AND chd.depth = 1 ") .
+				   ("LEFT JOIN " . static::$table_relations . " chd ON chd.ancestor = ent.id AND chd.depth = 1 ") .
 
 				   ("LEFT JOIN " . static::$table_relations . " rel ON rel.descendant = ent.id AND rel.depth = 1 ") .
 
@@ -50,7 +50,7 @@ 
 
 				   ("GROUP BY ent.id ORDER BY " . $this->getOrderBy($order_by) . " ") .
 
-			       (($index > 0) ? ("LIMIT " . ((($index - 1) * $display) . ", " . $display)) : "");
+				   (($index > 0) ? ("LIMIT " . ((($index - 1) * $display) . ", " . $display)) : "");
 		}
 
 		/**
@@ -61,7 +61,7 @@ 
 
 			return ("SELECT COUNT(ent.id) as count FROM " . static::$table . " ent ") .
 
-			       (('' !== ($condition = $this->getCondition($config))) ? ("WHERE " . $condition) : "");
+				   (('' !== ($condition = $this->getCondition($config))) ? ("WHERE " . $condition) : "");
 		}
 
 		/**
@@ -72,11 +72,11 @@ 
 
 			return ("SELECT COUNT(ent.id) as count FROM " . static::$table . " ent ") .
 
-			       ("LEFT JOIN " . static::$table_relations . " rel ON rel.descendant = ent.id AND rel.depth = 1 ") .
+				   ("LEFT JOIN " . static::$table_relations . " rel ON rel.descendant = ent.id AND rel.depth = 1 ") .
 
-			       ("WHERE COALESCE(rel.ancestor, 0) = " . $parent_id . " ") .
+				   ("WHERE COALESCE(rel.ancestor, 0) = " . $parent_id . " ") .
 
-			       (('' !== ($condition = $this->getCondition($config))) ? ("AND " . $condition) : "");
+				   (('' !== ($condition = $this->getCondition($config))) ? ("AND " . $condition) : "");
 		}
 
 		/**

Spacing +21 added lines, -25 removed lines

@@ -19,15 +19,15 @@ 
 
 		private function getBasicSelectQuery(array $config, array $order_by, int $index, int $display) : string {
 
-			return ("SELECT SQL_CALC_FOUND_ROWS " . $this->getSelection() . " ") .
+			return ("SELECT SQL_CALC_FOUND_ROWS ".$this->getSelection()." ").
 
-			       ("FROM " . static::$table . " ent ") .
+			       ("FROM ".static::$table." ent ").
 
-				   (('' !== ($condition = $this->getCondition($config))) ? ("WHERE " . $condition . " ") : "") .
+				   (('' !== ($condition = $this->getCondition($config))) ? ("WHERE ".$condition." ") : "").
 
-				   ("ORDER BY " . $this->getOrderBy($order_by) . " ") .
+				   ("ORDER BY ".$this->getOrderBy($order_by)." ").
 
-			       (($index > 0) ? ("LIMIT " . ((($index - 1) * $display) . ", " . $display)) : "");
+			       (($index > 0) ? ("LIMIT ".((($index - 1) * $display).", ".$display)) : "");
 		}
 
 		/**
@@ -36,21 +36,21 @@ 
 
 		private function getNestingSelectQuery(int $parent_id, array $config, array $order_by, int $index, int $display) : string {
 
-			return ("SELECT SQL_CALC_FOUND_ROWS " . $this->getSelection() . ", COUNT(chd.descendant) as children ") .
+			return ("SELECT SQL_CALC_FOUND_ROWS ".$this->getSelection().", COUNT(chd.descendant) as children ").
 
-			       ("FROM " . static::$table . " ent ") .
+			       ("FROM ".static::$table." ent ").
 
-			       ("LEFT JOIN " . static::$table_relations . " chd ON chd.ancestor = ent.id AND chd.depth = 1 ") .
+			       ("LEFT JOIN ".static::$table_relations." chd ON chd.ancestor = ent.id AND chd.depth = 1 ").
 
-				   ("LEFT JOIN " . static::$table_relations . " rel ON rel.descendant = ent.id AND rel.depth = 1 ") .
+				   ("LEFT JOIN ".static::$table_relations." rel ON rel.descendant = ent.id AND rel.depth = 1 ").
 
-				   ("WHERE COALESCE(rel.ancestor, 0) = " . $parent_id . " ") .
+				   ("WHERE COALESCE(rel.ancestor, 0) = ".$parent_id." ").
 
-				   (('' !== ($condition = $this->getCondition($config))) ? ("AND " . $condition . " ") : "") .
+				   (('' !== ($condition = $this->getCondition($config))) ? ("AND ".$condition." ") : "").
 
-				   ("GROUP BY ent.id ORDER BY " . $this->getOrderBy($order_by) . " ") .
+				   ("GROUP BY ent.id ORDER BY ".$this->getOrderBy($order_by)." ").
 
-			       (($index > 0) ? ("LIMIT " . ((($index - 1) * $display) . ", " . $display)) : "");
+			       (($index > 0) ? ("LIMIT ".((($index - 1) * $display).", ".$display)) : "");
 		}
 
 		/**
@@ -59,9 +59,9 @@ 
 
 		private function getBasicCountQuery(array $config) : string {
 
-			return ("SELECT COUNT(ent.id) as count FROM " . static::$table . " ent ") .
+			return ("SELECT COUNT(ent.id) as count FROM ".static::$table." ent ").
 
-			       (('' !== ($condition = $this->getCondition($config))) ? ("WHERE " . $condition) : "");
+			       (('' !== ($condition = $this->getCondition($config))) ? ("WHERE ".$condition) : "");
 		}
 
 		/**
@@ -70,13 +70,13 @@ 
 
 		private function getNestingCountQuery(int $parent_id, array $config) : string {
 
-			return ("SELECT COUNT(ent.id) as count FROM " . static::$table . " ent ") .
+			return ("SELECT COUNT(ent.id) as count FROM ".static::$table." ent ").
 
-			       ("LEFT JOIN " . static::$table_relations . " rel ON rel.descendant = ent.id AND rel.depth = 1 ") .
+			       ("LEFT JOIN ".static::$table_relations." rel ON rel.descendant = ent.id AND rel.depth = 1 ").
 
-			       ("WHERE COALESCE(rel.ancestor, 0) = " . $parent_id . " ") .
+			       ("WHERE COALESCE(rel.ancestor, 0) = ".$parent_id." ").
 
-			       (('' !== ($condition = $this->getCondition($config))) ? ("AND " . $condition) : "");
+			       (('' !== ($condition = $this->getCondition($config))) ? ("AND ".$condition) : "");
 		}
 
 		/**
@@ -93,9 +93,7 @@ 
 
 			# Select entities
 
-			$query = ((null === $parent_id) ? $this->getBasicSelectQuery($config, $order_by, $index, $display) :
-
-				$this->getNestingSelectQuery($parent_id, $config, $order_by, $index, $display));
+			$query = ((null === $parent_id) ? $this->getBasicSelectQuery($config, $order_by, $index, $display) : $this->getNestingSelectQuery($parent_id, $config, $order_by, $index, $display));
 
 			if (!(DB::send($query) && DB::getLast()->status)) return false;
 
@@ -136,9 +134,7 @@ 
 
 			# Count entities
 
-			$query = ((null === $parent_id) ? $this->getBasicCountQuery($config) :
-
-				$this->getNestingCountQuery($parent_id, $config));
+			$query = ((null === $parent_id) ? $this->getBasicCountQuery($config) : $this->getNestingCountQuery($parent_id, $config));
 
 			if (!(DB::send($query) && DB::getLast()->status)) return false;
 

Braces +24 added lines, -8 removed lines

@@ -87,9 +87,13 @@ 
 
 		private function select(int $parent_id = null, array $config = [], array $order_by = [], int $index = 0, int $display = 0) {
 
-			if (!((null === $parent_id) || ($parent_id >= 0))) return false;
+			if (!((null === $parent_id) || ($parent_id >= 0))) {
+				return false;
+			}
 
-			if (!(($index >= 0) && ($display >= 0))) return false;
+			if (!(($index >= 0) && ($display >= 0))) {
+				return false;
+			}
 
 			# Select entities
 
@@ -97,7 +101,9 @@ 
 
 				$this->getNestingSelectQuery($parent_id, $config, $order_by, $index, $display));
 
-			if (!(DB::send($query) && DB::getLast()->status)) return false;
+			if (!(DB::send($query) && DB::getLast()->status)) {
+				return false;
+			}
 
 			# Process results
 
@@ -109,7 +115,9 @@ 
 
 				$items['list'][$dataset->id]['dataset'] = $dataset;
 
-				if (null !== $parent_id) $items['list'][$dataset->id]['children'] = intval($data['children']);
+				if (null !== $parent_id) {
+					$items['list'][$dataset->id]['children'] = intval($data['children']);
+				}
 			}
 
 			# Count total
@@ -132,7 +140,9 @@ 
 
 		private function count(int $parent_id = null, array $config = []) {
 
-			if (!((null === $parent_id) || ($parent_id >= 0))) return false;
+			if (!((null === $parent_id) || ($parent_id >= 0))) {
+				return false;
+			}
 
 			# Count entities
 
@@ -140,7 +150,9 @@ 
 
 				$this->getNestingCountQuery($parent_id, $config));
 
-			if (!(DB::send($query) && DB::getLast()->status)) return false;
+			if (!(DB::send($query) && DB::getLast()->status)) {
+				return false;
+			}
 
 			# ------------------------
 
@@ -190,7 +202,9 @@ 
 
 		public function getChildren(int $parent_id = 0, array $config = [], array $order_by = [], int $index = 0, int $display = 0) {
 
-			if (!static::$nesting) return false;
+			if (!static::$nesting) {
+				return false;
+			}
 
 			return $this->select($parent_id, $config, $order_by, $index, $display);
 		}
@@ -206,7 +220,9 @@ 
 
 		public function getChildrenCount(int $parent_id = 0, array $config = []) {
 
-			if (!static::$nesting) return false;
+			if (!static::$nesting) {
+				return false;
+			}
 
 			return $this->count($parent_id, $config);
 		}

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

Braces +3 added lines, -3 removed lines

@@ -37,9 +37,9 @@
 
 		protected function processEntityParent(Template\Block $parent) {
 
-			if ((0 !== $this->parent->id) && $this->parent->active) $parent->getBlock('browse')->link = $this->parent->link;
-
-			else { $parent->getBlock('browse')->disable(); $parent->getBlock('browse_disabled')->enable(); }
+			if ((0 !== $this->parent->id) && $this->parent->active) {
+				$parent->getBlock('browse')->link = $this->parent->link;
+			} else { $parent->getBlock('browse')->disable(); $parent->getBlock('browse_disabled')->enable(); }
 		}
 
 		/**

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

Braces +3 added lines, -3 removed lines

@@ -37,9 +37,9 @@
 
 		protected function processEntityParent(Template\Block $parent) {
 
-			if (0 !== $this->parent->id) $parent->getBlock('browse')->link = $this->parent->link;
-
-			else { $parent->getBlock('browse')->disable(); $parent->getBlock('browse_disabled')->enable(); }
+			if (0 !== $this->parent->id) {
+				$parent->getBlock('browse')->link = $this->parent->link;
+			} else { $parent->getBlock('browse')->disable(); $parent->getBlock('browse_disabled')->enable(); }
 		}
 
 		/**

www/engine/System/Classes/Modules/Entitizer/Handler/Edit/Page.php

Braces +6 added lines, -4 removed lines

@@ -41,9 +41,9 @@ 
 
 		protected function processEntityParent(Template\Block $parent) {
 
-			if ((0 !== $this->parent->id) && $this->parent->active) $parent->getBlock('browse')->link = $this->parent->link;
-
-			else { $parent->getBlock('browse')->disable(); $parent->getBlock('browse_disabled')->enable(); }
+			if ((0 !== $this->parent->id) && $this->parent->active) {
+				$parent->getBlock('browse')->link = $this->parent->link;
+			} else { $parent->getBlock('browse')->disable(); $parent->getBlock('browse_disabled')->enable(); }
 		}
 
 		/**
@@ -52,7 +52,9 @@ 
 
 		protected function processEntity(Template\Block $contents) {
 
-			if (!$this->create && $this->parent->locked) $contents->getBlock('locked')->enable();
+			if (!$this->create && $this->parent->locked) {
+				$contents->getBlock('locked')->enable();
+			}
 		}
 	}
 }

www/engine/System/Classes/Modules/Entitizer/Handler/Edit/Menuitem.php

Braces +3 added lines, -3 removed lines

@@ -41,9 +41,9 @@
 
 		protected function processEntityParent(Template\Block $parent) {
 
-			if (0 !== $this->parent->id) $parent->getBlock('browse')->link = $this->parent->link;
-
-			else { $parent->getBlock('browse')->disable(); $parent->getBlock('browse_disabled')->enable(); }
+			if (0 !== $this->parent->id) {
+				$parent->getBlock('browse')->link = $this->parent->link;
+			} else { $parent->getBlock('browse')->disable(); $parent->getBlock('browse_disabled')->enable(); }
 		}
 
 		/**