cadmium-org / cadmium-cms

www/engine/System/Classes/Handlers/Tools/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::last()->rows === 1))) return 0;
+			if (!(DB::select(TABLE_PAGES, $selection) && (DB::last()->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::last()->status)) return;
+			if (!(DB::select(TABLE_PAGES, $selection, $condition, 'slug') && DB::last()->status)) {
+				return;
+			}
 
 			# ------------------------
 
-			while (null !== ($page = DB::last()->row())) yield Entitizer::dataset(TABLE_PAGES, $page);
+			while (null !== ($page = DB::last()->row())) {
+				yield Entitizer::dataset(TABLE_PAGES, $page);
+			}
 		}
 
 		# Handle request
@@ -44,7 +50,9 @@ 
 
 			# Get last modification time
 
-			if ($sitemap->load($this->getLastModified())) return $sitemap;
+			if ($sitemap->load($this->getLastModified())) {
+				return $sitemap;
+			}
 
 			# Fill sitemap
 

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']) : ''));
 			});
 		}
 	}

Braces +6 added lines, -2 removed lines

@@ -19,14 +19,18 @@
 
 			$this->addHandler('link', function (array $data) {
 
-				if ('' === $data['slug']) return '';
+				if ('' === $data['slug']) {
+					return '';
+				}
 
 				return (INSTALL_PATH . '/' . $data['slug']);
 			});
 
 			$this->addHandler('canonical', function (array $data) {
 
-				if ('' === $data['slug']) return '';
+				if ('' === $data['slug']) {
+					return '';
+				}
 
 				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']);
 			});
 		}
 	}

Braces +6 added lines, -2 removed lines

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

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

Braces +39 added lines, -17 removed lines

@@ -20,15 +20,15 @@ 
 
 			# Set create button
 
-			if (count($this->path) < CONFIG_ENTITIZER_MAX_DEPTH) $parent->block('create')->id = $this->parent->id;
-
-			else { $parent->block('create')->disable(); $parent->block('create_disabled')->enable(); }
+			if (count($this->path) < CONFIG_ENTITIZER_MAX_DEPTH) {
+				$parent->block('create')->id = $this->parent->id;
+			} else { $parent->block('create')->disable(); $parent->block('create_disabled')->enable(); }
 
 			# Set edit button
 
-			if (0 !== $this->parent->id) $parent->block('edit')->id = $this->parent->id;
-
-			else { $parent->block('edit')->disable(); $parent->block('edit_disabled')->enable(); }
+			if (0 !== $this->parent->id) {
+				$parent->block('edit')->id = $this->parent->id;
+			} else { $parent->block('edit')->disable(); $parent->block('edit_disabled')->enable(); }
 
 			# Add parent additional data
 
@@ -43,7 +43,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->add($view = View::get(!$ajax ? static::$view_item : static::$view_ajax_item));
 
@@ -101,21 +103,29 @@ 
 
 			# 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->block('parent'));
+			if (static::$nesting && !$ajax) {
+				$this->processParent($contents->block('parent'));
+			}
 
 			# Set items
 
 			$items = $this->getItemsBlock($ajax);
 
-			if ($items->count() > 0) $contents->items = $items;
+			if ($items->count() > 0) {
+				$contents->items = $items;
+			}
 
 			# Set pagination
 
-			if (!$ajax) $contents->pagination = $this->getPaginationBlock();
+			if (!$ajax) {
+				$contents->pagination = $this->getPaginationBlock();
+			}
 
 			# ------------------------
 
@@ -140,15 +150,21 @@ 
 
 			# Get path and depth
 
-			if (false !== ($path = $this->parent->path())) $this->path = $path;
+			if (false !== ($path = $this->parent->path())) {
+				$this->path = $path;
+			}
 
-			if ((0 !== $this->entity->id) && (false !== ($depth = $this->entity->subtreeDepth()))) $this->depth = $depth;
+			if ((0 !== $this->entity->id) && (false !== ($depth = $this->entity->subtreeDepth()))) {
+				$this->depth = $depth;
+			}
 
 			# Get items list
 
 			$lister = (static::$nesting ? 'children' : 'items');
 
-			if (false !== ($items = $this->parent->$lister())) $this->items = $items;
+			if (false !== ($items = $this->parent->$lister())) {
+				$this->items = $items;
+			}
 
 			# ------------------------
 
@@ -159,7 +175,9 @@ 
 
 		public function handle() {
 
-			if (Request::isAjax()) return $this->handleAjax();
+			if (Request::isAjax()) {
+				return $this->handleAjax();
+			}
 
 			$this->index = Number::format(Request::get('index'), 1, 999999);
 
@@ -171,13 +189,17 @@ 
 
 			# Get path
 
-			if (false !== ($path = $this->parent->path())) $this->path = $path;
+			if (false !== ($path = $this->parent->path())) {
+				$this->path = $path;
+			}
 
 			# Get items list
 
 			$lister = (static::$nesting ? 'children' : 'items'); $index = $this->index; $display = static::$display;
 
-			if (false !== ($items = $this->parent->$lister([], [], $index, $display))) $this->items = $items;
+			if (false !== ($items = $this->parent->$lister([], [], $index, $display))) {
+				$this->items = $items;
+			}
 
 			# ------------------------
 

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

Braces +21 added lines, -7 removed lines

@@ -12,7 +12,9 @@ 
 
 		protected function addHandler(string $name, callable $handler) {
 
-			if ((false !== $this->definition->param($name)) || isset($this->handlers[$name])) return;
+			if ((false !== $this->definition->param($name)) || isset($this->handlers[$name])) {
+				return;
+			}
 
 			$this->handlers[$name] = $handler;
 		}
@@ -32,15 +34,21 @@ 
 
 			# Reset params
 
-			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 extras
 
-			foreach ($this->handlers as $name => $handler) $this->data[$name] = $handler($this->data);
+			foreach ($this->handlers as $name => $handler) {
+				$this->data[$name] = $handler($this->data);
+			}
 
 			# Reset parent id
 
-			if (static::$nesting) $this->data['parent_id'] = 0;
+			if (static::$nesting) {
+				$this->data['parent_id'] = 0;
+			}
 
 			# ------------------------
 
@@ -55,14 +63,18 @@ 
 
 			foreach ($data as $name => $value) {
 
-				if (false === ($param = $this->definition->param($name))) continue;
+				if (false === ($param = $this->definition->param($name))) {
+					continue;
+				}
 
 				$this->data[$name] = $param->cast($value);
 			}
 
 			# Update extras
 
-			foreach ($this->handlers as $name => $handler) $this->data[$name] = $handler($this->data);
+			foreach ($this->handlers as $name => $handler) {
+				$this->data[$name] = $handler($this->data);
+			}
 
 			# Update parent id
 
@@ -84,7 +96,9 @@ 
 
 			foreach ($data as $name => $value) {
 
-				if (false === ($param = $this->definition->param($name))) continue;
+				if (false === ($param = $this->definition->param($name))) {
+					continue;
+				}
 
 				$cast[$name] = $param->cast($value);
 			}

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

Indentation +8 added lines, -8 removed lines

@@ -12,7 +12,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");
 		}
@@ -23,13 +23,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));
 		}
 
 		# Get count query
@@ -38,7 +38,7 @@ 
 
 			return ("SELECT COUNT(DISTINCT ent.id) as count FROM " . static::$table . " ent ") .
 
-			       $this->getQueryJoin($parent_id);
+				   $this->getQueryJoin($parent_id);
 		}
 
 		# Get depth query
@@ -47,7 +47,7 @@ 
 
 			$query = ("SELECT COUNT(DISTINCT rel.depth) as depth FROM " . static::$table . " ent ") .
 
-			         $this->getQueryJoin($parent_id);
+					 $this->getQueryJoin($parent_id);
 
 			# ------------------------
 
@@ -128,7 +128,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

@@ -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
 

Braces +27 added lines, -9 removed lines

@@ -58,13 +58,17 @@ 
 
 		public function subtree(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::last()->status)) return false;
+			if (!(DB::send($query) && DB::last()->status)) {
+				return false;
+			}
 
 			# Process results
 
@@ -88,13 +92,17 @@ 
 
 		public function subtreeCount(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::last()->status)) return false;
+			if (!(DB::send($query) && DB::last()->status)) {
+				return false;
+			}
 
 			# ------------------------
 
@@ -105,13 +113,17 @@ 
 
 		public function subtreeDepth(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::last()->status)) return false;
+			if (!(DB::send($query) && DB::last()->status)) {
+				return false;
+			}
 
 			# ------------------------
 
@@ -122,7 +134,9 @@ 
 
 		public function path(int $parent_id = 0) {
 
-			if (!(static::$nesting && ($parent_id >= 0))) return false;
+			if (!(static::$nesting && ($parent_id >= 0))) {
+				return false;
+			}
 
 			# Process query
 
@@ -134,13 +148,17 @@ 
 
 			# Select path
 
-			if (!(DB::send($query) && DB::last()->status)) return false;
+			if (!(DB::send($query) && DB::last()->status)) {
+				return false;
+			}
 
 			# Process results
 
 			$path = [];
 
-			while (null !== ($data = DB::last()->row())) $path[] = Entitizer::dataset(static::$table, $data)->data();
+			while (null !== ($data = DB::last()->row())) {
+				$path[] = Entitizer::dataset(static::$table, $data)->data();
+			}
 
 			# ------------------------
 

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

Braces +3 added lines, -1 removed lines

@@ -10,7 +10,9 @@
 
 		public function add(string $name, string $table, string $field, string $delete = null, string $update = null) {
 
-			if ((false === $this->definition->param($name)) || isset($this->list[$name])) return;
+			if ((false === $this->definition->param($name)) || isset($this->list[$name])) {
+				return;
+			}
 
 			$this->list[$name] = new Definition\Item\Foreign($name, $table, $field, $delete, $update);
 		}

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

Braces +6 added lines, -2 removed lines

@@ -12,9 +12,13 @@
 
 		public static function get(string $table) {
 
-			if (!isset(static::$classes[$table])) throw new Exception\General(static::$error_message);
+			if (!isset(static::$classes[$table])) {
+				throw new Exception\General(static::$error_message);
+			}
 
-			if (!isset(static::$cache[$table])) static::$cache[$table] = new static::$classes[$table];
+			if (!isset(static::$cache[$table])) {
+				static::$cache[$table] = new static::$classes[$table];
+			}
 
 			# ------------------------