cadmium-org / cadmium-cms

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

Spacing +5 added lines, -5 removed lines

@@ -12,23 +12,23 @@
 
 		protected function init() {
 
-			$this->addHandler('active', function (array $data) {
+			$this->addHandler('active', function(array $data) {
 
 				return (($data['visibility'] === VISIBILITY_PUBLISHED) && !$data['locked']);
 			});
 
-			$this->addHandler('link', function (array $data) {
+			$this->addHandler('link', function(array $data) {
 
 				if ('' === $data['slug']) return '';
 
-				return (INSTALL_PATH . '/' . $data['slug']);
+				return (INSTALL_PATH.'/'.$data['slug']);
 			});
 
-			$this->addHandler('canonical', function (array $data) {
+			$this->addHandler('canonical', function(array $data) {
 
 				if ('' === $data['slug']) return '';
 
-				return (Settings::get('system_url') . (($data['id'] !== 1) ? ('/' . $data['slug']) : ''));
+				return (Settings::get('system_url').(($data['id'] !== 1) ? ('/'.$data['slug']) : ''));
 			});
 		}
 	}

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

Spacing +2 added lines, -2 removed lines

@@ -12,9 +12,9 @@
 
 		protected function init() {
 
-			$this->addHandler('full_name', function (array $data) {
+			$this->addHandler('full_name', function(array $data) {
 
-				return trim($data['first_name'] . ' ' . $data['last_name']);
+				return trim($data['first_name'].' '.$data['last_name']);
 			});
 		}
 	}

www/engine/System/Classes/Modules/Entitizer/Dataset/Menuitem.php

Spacing +2 added lines, -2 removed lines

@@ -12,13 +12,13 @@
 
 		protected function init() {
 
-			$this->addHandler('link', function (array $data) {
+			$this->addHandler('link', function(array $data) {
 
 				if ('' === $data['slug']) return '';
 
 				if (false !== Validate::url($data['slug'])) return $data['slug'];
 
-				return (INSTALL_PATH . '/' . $data['slug']);
+				return (INSTALL_PATH.'/'.$data['slug']);
 			});
 		}
 	}

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

Spacing +12 added lines, -14 removed lines

@@ -10,33 +10,31 @@ 
 
 		protected function getQueryJoin(int $parent_id) {
 
-			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");
 		}
 
 		# Get select query
 
 		private function getSelectQuery(int $parent_id, array $config, array $order_by) {
 
-			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));
 		}
 
 		# Get count query
 
 		private function getCountQuery(int $parent_id) {
 
-			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);
 		}
@@ -45,7 +43,7 @@ 
 
 		private function getDepthQuery(int $parent_id) {
 
-			$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);
 
@@ -126,11 +124,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
 

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

Spacing +17 added lines, -17 removed lines

@@ -22,19 +22,19 @@ 
 
 			$selection = array_keys($this->definition->params());
 
-			foreach ($selection as $key => $field) $selection[$key] = ('ent.' . $field);
+			foreach ($selection as $key => $field) $selection[$key] = ('ent.'.$field);
 
 			# Process query
 
-			$query = ("SELECT " . implode(', ', $selection) .", rel.ancestor as parent_id ") .
+			$query = ("SELECT ".implode(', ', $selection).", rel.ancestor as parent_id ").
 
-			         ("FROM " . static::$table . " ent ") .
+			         ("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 ent.visibility = " . VISIBILITY_PUBLISHED . " AND ent.access <= " . Auth::user()->rank . " AND ") .
+			         ("WHERE ent.visibility = ".VISIBILITY_PUBLISHED." AND ent.access <= ".Auth::user()->rank." AND ").
 
-			         ("ent.locked = 0 AND ent.slug = '" . addslashes($slug) . "' LIMIT 1");
+			         ("ent.locked = 0 AND ent.slug = '".addslashes($slug)."' LIMIT 1");
 
 			# Select entity from DB
 
@@ -53,17 +53,17 @@ 
 
 			# Send lock/update request
 
-			$query = ("UPDATE " . static::$table . " ent JOIN (") .
+			$query = ("UPDATE ".static::$table." ent JOIN (").
 
-			         ("SELECT rel.descendant as id, GROUP_CONCAT(ens.name ORDER BY rls.depth DESC SEPARATOR '/') slug ") .
+			         ("SELECT rel.descendant as id, GROUP_CONCAT(ens.name ORDER BY rls.depth DESC SEPARATOR '/') slug ").
 
-			         ("FROM " . static::$table_relations . " rel ") .
+			         ("FROM ".static::$table_relations." rel ").
 
-			         ("JOIN " . static::$table_relations . " rls ON rls.descendant = rel.descendant ") .
+			         ("JOIN ".static::$table_relations." rls ON rls.descendant = rel.descendant ").
 
-			         ("JOIN " . static::$table . " ens ON ens.id = rls.ancestor ") .
+			         ("JOIN ".static::$table." ens ON ens.id = rls.ancestor ").
 
-			         ("WHERE rel.ancestor = " . $this->id . " GROUP BY rel.descendant") .
+			         ("WHERE rel.ancestor = ".$this->id." GROUP BY rel.descendant").
 
 			         (") slg ON slg.id = ent.id SET ent.locked = 1, ent.slug = slg.slug");
 
@@ -71,15 +71,15 @@ 
 
 			# Send unlock request
 
-			$query = ("UPDATE " . static::$table . " ent JOIN (") .
+			$query = ("UPDATE ".static::$table." ent JOIN (").
 
-			         ("SELECT rel.descendant as id FROM " . static::$table_relations . " rel ") .
+			         ("SELECT rel.descendant as id FROM ".static::$table_relations." rel ").
 
-			         ("JOIN " . static::$table . " enc ON enc.id = rel.descendant AND enc.locked = 1 ") .
+			         ("JOIN ".static::$table." enc ON enc.id = rel.descendant AND enc.locked = 1 ").
 
-			         ("LEFT JOIN " . static::$table . " end ON end.id != enc.id AND end.slug = enc.slug ") .
+			         ("LEFT JOIN ".static::$table." end ON end.id != enc.id AND end.slug = enc.slug ").
 
-			         ("WHERE end.id IS NULL GROUP BY rel.descendant") .
+			         ("WHERE end.id IS NULL GROUP BY rel.descendant").
 
 			         (") chk ON chk.id = ent.id SET ent.locked = 0");