cadmium-org / cadmium-cms

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/Tools/Handler/Sitemap.php

Braces +12 added lines, -4 removed lines

@@ -12,7 +12,9 @@ 
 
 			$selection = 'MAX(time_modified) as last_modified';
 
-			if (!(DB::select(TABLE_PAGES, $selection) && (DB::getLast()->rows === 1))) return 0;
+			if (!(DB::select(TABLE_PAGES, $selection) && (DB::getLast()->rows === 1))) {
+				return 0;
+			}
 
 			# ------------------------
 
@@ -27,11 +29,15 @@ 
 
 			$condition = ['visibility' => VISIBILITY_PUBLISHED, 'access' => ACCESS_PUBLIC, 'locked' => 0];
 
-			if (!(DB::select(TABLE_PAGES, $selection, $condition, 'slug') && DB::getLast()->status)) return;
+			if (!(DB::select(TABLE_PAGES, $selection, $condition, 'slug') && DB::getLast()->status)) {
+				return;
+			}
 
 			# ------------------------
 
-			while (null !== ($data = DB::getLast()->getRow())) yield Entitizer::getDataset(TABLE_PAGES, $data);
+			while (null !== ($data = DB::getLast()->getRow())) {
+				yield Entitizer::getDataset(TABLE_PAGES, $data);
+			}
 		}
 
 		# Handle request
@@ -50,7 +56,9 @@ 
 
 			if ((false !== $modified) && ($modified > $this->getLastModified())) {
 
-				if (false !== $sitemap->load($file_name)) return $sitemap;
+				if (false !== $sitemap->load($file_name)) {
+					return $sitemap;
+				}
 			}
 
 			# Fill sitemap

www/engine/System/Includes/Constants.php

Spacing +34 added lines, -34 removed lines

@@ -9,68 +9,68 @@
 
 # Cadmium
 
-define('CADMIUM_NAME',                              'Cadmium CMS');
-define('CADMIUM_HOME',                              'http://cadmium-cms.com');
+define('CADMIUM_NAME', 'Cadmium CMS');
+define('CADMIUM_HOME', 'http://cadmium-cms.com');
 
-define('CADMIUM_VERSION',                           '0.4.5');
-define('CADMIUM_COPY',                              '2017');
+define('CADMIUM_VERSION', '0.4.5');
+define('CADMIUM_COPY', '2017');
 
 # Third-party
 
-define('JQUERY_VERSION',                            '3.2.0');
-define('SEMANTIC_UI_VERSION',                       '2.2.9');
-define('CKEDITOR_VERSION',                          '4.6.2');
+define('JQUERY_VERSION', '3.2.0');
+define('SEMANTIC_UI_VERSION', '2.2.9');
+define('CKEDITOR_VERSION', '4.6.2');
 
 # Sections
 
-define('SECTION_SITE',                              'site');
-define('SECTION_ADMIN',                             'admin');
+define('SECTION_SITE', 'site');
+define('SECTION_ADMIN', 'admin');
 
 # Filemanager types
 
-define('FILEMANAGER_TYPE_DIR',                      'dir');
-define('FILEMANAGER_TYPE_FILE',                     'file');
+define('FILEMANAGER_TYPE_DIR', 'dir');
+define('FILEMANAGER_TYPE_FILE', 'file');
 
 # Access
 
-define('ACCESS_PUBLIC',                             0);
-define('ACCESS_REGISTERED',                         1);
-define('ACCESS_ADMINISTRATOR',                      2);
+define('ACCESS_PUBLIC', 0);
+define('ACCESS_REGISTERED', 1);
+define('ACCESS_ADMINISTRATOR', 2);
 
 # Frequency
 
-define('FREQUENCY_ALWAYS',                          'always');
-define('FREQUENCY_HOURLY',                          'hourly');
-define('FREQUENCY_DAILY',                           'daily');
-define('FREQUENCY_WEEKLY',                          'weekly');
-define('FREQUENCY_MONTHLY',                         'monthly');
-define('FREQUENCY_YEARLY',                          'yearly');
-define('FREQUENCY_NEVER',                           'never');
+define('FREQUENCY_ALWAYS', 'always');
+define('FREQUENCY_HOURLY', 'hourly');
+define('FREQUENCY_DAILY', 'daily');
+define('FREQUENCY_WEEKLY', 'weekly');
+define('FREQUENCY_MONTHLY', 'monthly');
+define('FREQUENCY_YEARLY', 'yearly');
+define('FREQUENCY_NEVER', 'never');
 
 # Rank
 
-define('RANK_GUEST',                                0);
-define('RANK_USER',                                 1);
-define('RANK_ADMINISTRATOR',                        2);
+define('RANK_GUEST', 0);
+define('RANK_USER', 1);
+define('RANK_ADMINISTRATOR', 2);
 
 # Sex
 
-define('SEX_NOT_SELECTED',                          0);
-define('SEX_MALE',                                  1);
-define('SEX_FEMALE',                                2);
+define('SEX_NOT_SELECTED', 0);
+define('SEX_MALE', 1);
+define('SEX_FEMALE', 2);
 
 # Status
 
-define('STATUS_ONLINE',                             0);
-define('STATUS_MAINTENANCE',                        1);
-define('STATUS_UPDATE',                             2);
+define('STATUS_ONLINE', 0);
+define('STATUS_MAINTENANCE', 1);
+define('STATUS_UPDATE', 2);
 
 # Target
 
-define('TARGET_SELF',                               0);
-define('TARGET_BLANK',                              1);
+define('TARGET_SELF', 0);
+define('TARGET_BLANK', 1);
 
 # Visibility
 
-define('VISIBILITY_DRAFT',                          0);
-define('VISIBILITY_PUBLISHED',                      1);
+define('VISIBILITY_DRAFT', 0);
+define('VISIBILITY_PUBLISHED', 1);

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

Doc Comments +1 added lines, -1 removed lines

@@ -27,7 +27,7 @@
 		/**
 		 * Invoker
 		 *
-		 * @return true|string : true on success or an error code on failure
+		 * @return string|boolean : true on success or an error code on failure
 		 */
 
 		public function __invoke(array $post) {