cadmium-org / cadmium-cms

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])) return static::$cache[$table];
+			if (isset(static::$cache[$table])) {
+				return static::$cache[$table];
+			}
 
 			# ------------------------
 

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 rel.depth ASC, " . $this->getOrderBy($order_by));
+				   ("GROUP BY ent.id ORDER BY 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 rel.depth ASC, " . $this->getOrderBy($order_by));
+			       ("GROUP BY ent.id ORDER BY 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::create(static::$table, $data)->data();
+			while (null !== ($data = DB::last()->row())) {
+				$path[] = Entitizer::create(static::$table, $data)->data();
+			}
 
 			# ------------------------
 

www/engine/System/Classes/Modules/Entitizer/Definition/User/Session.php

Spacing +7 added lines, -7 removed lines

@@ -14,19 +14,19 @@
 
 			# Add params
 
-			$this->params->textual      ('code',                true, 40, true, '');
-			$this->params->textual      ('ip',                  true, 255, false, '');
-			$this->params->integer      ('time',                false, 10, true, 0);
+			$this->params->textual('code', true, 40, true, '');
+			$this->params->textual('ip', true, 255, false, '');
+			$this->params->integer('time', false, 10, true, 0);
 
 			# Add indexes
 
-			$this->indexes->add         ('code',                'UNIQUE');
-			$this->indexes->add         ('ip');
-			$this->indexes->add         ('time');
+			$this->indexes->add('code', 'UNIQUE');
+			$this->indexes->add('ip');
+			$this->indexes->add('time');
 
 			# Add foreign keys
 
-			$this->foreigns->add        ('id',                  TABLE_USERS, 'id', 'CASCADE', 'RESTRICT');
+			$this->foreigns->add('id', TABLE_USERS, 'id', 'CASCADE', 'RESTRICT');
 		}
 	}
 }

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

Spacing +20 added lines, -20 removed lines

@@ -14,29 +14,29 @@
 
 			# Add params
 
-			$this->params->integer      ('visibility',          true, 1, true, VISIBILITY_DRAFT);
-			$this->params->integer      ('access',              true, 1, true, ACCESS_PUBLIC);
-			$this->params->boolean      ('locked',              true);
-			$this->params->textual      ('slug',                true, 255, false, '');
-			$this->params->textual      ('name',                true, 255, false, '');
-			$this->params->textual      ('title',               true, 255, false, '');
-			$this->params->textual      ('contents',            false, 0, false, '');
-			$this->params->textual      ('description',         false, 0, false, '');
-			$this->params->textual      ('keywords',            false, 0, false, '');
-			$this->params->boolean      ('robots_index',        false);
-			$this->params->boolean      ('robots_follow',       false);
-			$this->params->integer      ('time_created',        false, 10, true, 0);
-			$this->params->integer      ('time_modified',       false, 10, true, 0);
+			$this->params->integer('visibility', true, 1, true, VISIBILITY_DRAFT);
+			$this->params->integer('access', true, 1, true, ACCESS_PUBLIC);
+			$this->params->boolean('locked', true);
+			$this->params->textual('slug', true, 255, false, '');
+			$this->params->textual('name', true, 255, false, '');
+			$this->params->textual('title', true, 255, false, '');
+			$this->params->textual('contents', false, 0, false, '');
+			$this->params->textual('description', false, 0, false, '');
+			$this->params->textual('keywords', false, 0, false, '');
+			$this->params->boolean('robots_index', false);
+			$this->params->boolean('robots_follow', false);
+			$this->params->integer('time_created', false, 10, true, 0);
+			$this->params->integer('time_modified', false, 10, true, 0);
 
 			# Add indexes
 
-			$this->indexes->add         ('visibility');
-			$this->indexes->add         ('access');
-			$this->indexes->add         ('slug');
-			$this->indexes->add         ('name');
-			$this->indexes->add         ('title');
-			$this->indexes->add         ('time_created');
-			$this->indexes->add         ('time_modified');
+			$this->indexes->add('visibility');
+			$this->indexes->add('access');
+			$this->indexes->add('slug');
+			$this->indexes->add('name');
+			$this->indexes->add('title');
+			$this->indexes->add('time_created');
+			$this->indexes->add('time_modified');
 		}
 	}
 }

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

Spacing +7 added lines, -7 removed lines

@@ -14,16 +14,16 @@
 
 			# Add params
 
-			$this->params->boolean      ('active',              false);
-			$this->params->textual      ('name',                true, 255, false, '');
-			$this->params->textual      ('title',               true, 255, false, '');
-			$this->params->textual      ('contents',            false, 0, false, '');
+			$this->params->boolean('active', false);
+			$this->params->textual('name', true, 255, false, '');
+			$this->params->textual('title', true, 255, false, '');
+			$this->params->textual('contents', false, 0, false, '');
 
 			# Add indexes
 
-			$this->indexes->add         ('active');
-			$this->indexes->add         ('name',                'UNIQUE');
-			$this->indexes->add         ('title');
+			$this->indexes->add('active');
+			$this->indexes->add('name', 'UNIQUE');
+			$this->indexes->add('title');
 		}
 	}
 }

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

Spacing +7 added lines, -7 removed lines

@@ -14,16 +14,16 @@
 
 			# Add params
 
-			$this->params->boolean      ('active',              false);
-			$this->params->integer      ('position',            true, 2, true, 0);
-			$this->params->textual      ('slug',                true, 255, false, '');
-			$this->params->textual      ('text',                true, 255, false, '');
-			$this->params->integer      ('target',              true, 1, true, TARGET_SELF);
+			$this->params->boolean('active', false);
+			$this->params->integer('position', true, 2, true, 0);
+			$this->params->textual('slug', true, 255, false, '');
+			$this->params->textual('text', true, 255, false, '');
+			$this->params->integer('target', true, 1, true, TARGET_SELF);
 
 			# Add indexes
 
-			$this->indexes->add         ('active');
-			$this->indexes->add         ('position');
+			$this->indexes->add('active');
+			$this->indexes->add('position');
 		}
 	}
 }

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

Spacing +5 added lines, -5 removed lines

@@ -14,14 +14,14 @@
 
 			# Add params
 
-			$this->params->textual      ('name',                true, 255, false, '');
-			$this->params->textual      ('title',               true, 255, false, '');
-			$this->params->textual      ('value',               true, 255, false, '');
+			$this->params->textual('name', true, 255, false, '');
+			$this->params->textual('title', true, 255, false, '');
+			$this->params->textual('value', true, 255, false, '');
 
 			# Add indexes
 
-			$this->indexes->add         ('name',                'UNIQUE');
-			$this->indexes->add         ('title');
+			$this->indexes->add('name', 'UNIQUE');
+			$this->indexes->add('title');
 		}
 	}
 }

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

Spacing +18 added lines, -18 removed lines

@@ -14,27 +14,27 @@
 
 			# Add params
 
-			$this->params->integer      ('rank',                true, 1, true, RANK_GUEST);
-			$this->params->textual      ('name',                true, 16, false, '');
-			$this->params->textual      ('email',               true, 128, false, '');
-			$this->params->textual      ('auth_key',            true, 40, true, '');
-			$this->params->textual      ('password',            true, 40, true, '');
-			$this->params->textual      ('first_name',          true, 255, false, '');
-			$this->params->textual      ('last_name',           true, 255, false, '');
-			$this->params->integer      ('sex',                 true, 1, true, SEX_NOT_SELECTED);
-			$this->params->textual      ('city',                true, 255, false, '');
-			$this->params->textual      ('country',             true, 2, false, '');
-			$this->params->textual      ('timezone',            true, 40, false, '');
-			$this->params->integer      ('time_registered',     false, 10, true, 0);
-			$this->params->integer      ('time_logged',         false, 10, true, 0);
+			$this->params->integer('rank', true, 1, true, RANK_GUEST);
+			$this->params->textual('name', true, 16, false, '');
+			$this->params->textual('email', true, 128, false, '');
+			$this->params->textual('auth_key', true, 40, true, '');
+			$this->params->textual('password', true, 40, true, '');
+			$this->params->textual('first_name', true, 255, false, '');
+			$this->params->textual('last_name', true, 255, false, '');
+			$this->params->integer('sex', true, 1, true, SEX_NOT_SELECTED);
+			$this->params->textual('city', true, 255, false, '');
+			$this->params->textual('country', true, 2, false, '');
+			$this->params->textual('timezone', true, 40, false, '');
+			$this->params->integer('time_registered', false, 10, true, 0);
+			$this->params->integer('time_logged', false, 10, true, 0);
 
 			# Add indexes
 
-			$this->indexes->add         ('rank');
-			$this->indexes->add         ('name',                'UNIQUE');
-			$this->indexes->add         ('email',               'UNIQUE');
-			$this->indexes->add         ('time_registered');
-			$this->indexes->add         ('time_logged');
+			$this->indexes->add('rank');
+			$this->indexes->add('name', 'UNIQUE');
+			$this->indexes->add('email', 'UNIQUE');
+			$this->indexes->add('time_registered');
+			$this->indexes->add('time_logged');
 		}
 	}
 }

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

Braces +9 added lines, -3 removed lines

@@ -25,9 +25,13 @@ 
 
 		public static function get(string $table, int $id = 0) {
 
-			if (!isset(self::$classes[$table])) throw new Exception\General(self::$error_message);
+			if (!isset(self::$classes[$table])) {
+				throw new Exception\General(self::$error_message);
+			}
 
-			if (isset(self::$cache[$table][$id])) return self::$cache[$table][$id];
+			if (isset(self::$cache[$table][$id])) {
+				return self::$cache[$table][$id];
+			}
 
 			$entity = new self::$classes[$table]; $entity->init($id);
 
@@ -40,7 +44,9 @@ 
 
 		public static function create(string $table, array $data = []) {
 
-			if (!isset(self::$classes[$table])) throw new Exception\General(self::$error_message);
+			if (!isset(self::$classes[$table])) {
+				throw new Exception\General(self::$error_message);
+			}
 
 			$entity = new self::$classes[$table]($data);