cadmium-org / cadmium-cms

www/engine/System/Classes/Modules/Entitizer/Utils/Definition/Item/Param/Type/Textual.php

Indentation +1 added lines, -1 removed lines

@@ -23,7 +23,7 @@
 
 			return ("`" . $this->name . "` " . ($this->short ? ("varchar(" . $this->length . ")") : "text")) .
 
-			       (($this->binary ? " BINARY" : "") . " NOT NULL DEFAULT '" . $this->default . "'");
+				   (($this->binary ? " BINARY" : "") . " NOT NULL DEFAULT '" . $this->default . "'");
 		}
 
 		# Cast value

Spacing +2 added lines, -2 removed lines

@@ -21,9 +21,9 @@
 
 		public function statement() {
 
-			return ("`" . $this->name . "` " . ($this->short ? ("varchar(" . $this->length . ")") : "text")) .
+			return ("`".$this->name."` ".($this->short ? ("varchar(".$this->length.")") : "text")).
 
-			       (($this->binary ? " BINARY" : "") . " NOT NULL DEFAULT '" . $this->default . "'");
+			       (($this->binary ? " BINARY" : "")." NOT NULL DEFAULT '".$this->default."'");
 		}
 
 		# Cast value

Braces +3 added lines, -1 removed lines

@@ -16,7 +16,9 @@
 
 			# Set field configuration
 
-			foreach (get_defined_vars() as $name => $value) $this->$name = $value;
+			foreach (get_defined_vars() as $name => $value) {
+				$this->$name = $value;
+			}
 		}
 
 		# Get field statement

www/engine/System/Classes/Modules/Entitizer/Utils/Definition/Item/Param/Type/Boolean.php

Spacing +1 added lines, -1 removed lines

@@ -21,7 +21,7 @@
 
 		public function statement() {
 
-			return ("`" . $this->name . "` tinyint(1) UNSIGNED NOT NULL DEFAULT '" . intval($this->default) . "'");
+			return ("`".$this->name."` tinyint(1) UNSIGNED NOT NULL DEFAULT '".intval($this->default)."'");
 		}
 
 		# Cast value

Braces +3 added lines, -1 removed lines

@@ -16,7 +16,9 @@
 
 			# Set field configuration
 
-			foreach (get_defined_vars() as $name => $value) $this->$name = $value;
+			foreach (get_defined_vars() as $name => $value) {
+				$this->$name = $value;
+			}
 		}
 
 		# Get field statement

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

Indentation +2 added lines, -2 removed lines

@@ -30,9 +30,9 @@
 
 			$query = ("CREATE TABLE IF NOT EXISTS `" . static::$table . "` (") .
 
-			         implode(", ", $this->getStatements()) .
+					 implode(", ", $this->getStatements()) .
 
-			         (") ENGINE=InnoDB DEFAULT CHARSET=utf8");
+					 (") ENGINE=InnoDB DEFAULT CHARSET=utf8");
 
 			# ------------------------
 

Spacing +8 added lines, -8 removed lines

@@ -28,9 +28,9 @@ 
 
 		private function createMainTable() {
 
-			$query = ("CREATE TABLE IF NOT EXISTS `" . static::$table . "` (") .
+			$query = ("CREATE TABLE IF NOT EXISTS `".static::$table."` (").
 
-			         implode(", ", $this->getStatements()) .
+			         implode(", ", $this->getStatements()).
 
 			         (") ENGINE=InnoDB DEFAULT CHARSET=utf8");
 
@@ -43,17 +43,17 @@ 
 
 		private function createRelationsTable() {
 
-			$query = ("CREATE TABLE IF NOT EXISTS `" . static::$table_relations . "` (") .
+			$query = ("CREATE TABLE IF NOT EXISTS `".static::$table_relations."` (").
 
-					 ("`ancestor` int(10) UNSIGNED NOT NULL, `descendant` int(10) UNSIGNED NOT NULL, ") .
+					 ("`ancestor` int(10) UNSIGNED NOT NULL, `descendant` int(10) UNSIGNED NOT NULL, ").
 
-					 ("`depth` int(10) UNSIGNED NOT NULL, ") .
+					 ("`depth` int(10) UNSIGNED NOT NULL, ").
 
-					 ("PRIMARY KEY (`ancestor`, `descendant`), KEY (`ancestor`), KEY (`descendant`), KEY (`depth`), ") .
+					 ("PRIMARY KEY (`ancestor`, `descendant`), KEY (`ancestor`), KEY (`descendant`), KEY (`depth`), ").
 
-					 ("FOREIGN KEY (`ancestor`) REFERENCES `" . static::$table . "` (`id`) ON DELETE CASCADE, ") .
+					 ("FOREIGN KEY (`ancestor`) REFERENCES `".static::$table."` (`id`) ON DELETE CASCADE, ").
 
-					 ("FOREIGN KEY (`descendant`) REFERENCES `" . static::$table . "` (`id`) ON DELETE CASCADE ") .
+					 ("FOREIGN KEY (`descendant`) REFERENCES `".static::$table."` (`id`) ON DELETE CASCADE ").
 
 					 (") ENGINE=InnoDB DEFAULT CHARSET=utf8");
 

Braces +3 added lines, -1 removed lines

@@ -16,7 +16,9 @@
 
 			foreach ([$this->params, $this->indexes, $this->foreigns] as $group) {
 
-				foreach ($group->list() as $item) $statements[] = $item->statement();
+				foreach ($group->list() as $item) {
+					$statements[] = $item->statement();
+				}
 			}
 
 			# ------------------------

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

Indentation +9 added lines, -9 removed lines

@@ -12,13 +12,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)) : "");
 		}
 
 		# Get nesting select query
@@ -27,9 +27,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 ") .
 
@@ -39,7 +39,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)) : "");
 		}
 
 		# Get default count query
@@ -48,7 +48,7 @@ 
 
 			return ("SELECT COUNT(ent.id) as count FROM " . static::$table . " ent ") .
 
-			       (('' !== ($condition = $this->getCondition($config))) ? ("WHERE " . $condition) : "");
+				   (('' !== ($condition = $this->getCondition($config))) ? ("WHERE " . $condition) : "");
 		}
 
 		# Get nesting count query
@@ -57,11 +57,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) : "");
 		}
 
 		# Select entries from DB

Spacing +21 added lines, -25 removed lines

@@ -10,58 +10,58 @@ 
 
 		private function getDefaultSelectQuery(array $config, array $order_by, int $index, int $display) {
 
-			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)) : "");
 		}
 
 		# Get nesting select query
 
 		private function getNestingSelectQuery(int $parent_id, array $config, array $order_by, int $index, int $display) {
 
-			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)) : "");
 		}
 
 		# Get default count query
 
 		private function getDefaultCountQuery(array $config) {
 
-			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) : "");
 		}
 
 		# Get nesting count query
 
 		private function getNestingCountQuery(int $parent_id, array $config) {
 
-			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) : "");
 		}
 
 		# Select entries from DB
@@ -74,9 +74,7 @@ 
 
 			# Select entities
 
-			$query = ((null === $parent_id) ? $this->getDefaultSelectQuery($config, $order_by, $index, $display) :
-
-				$this->getNestingSelectQuery($parent_id, $config, $order_by, $index, $display));
+			$query = ((null === $parent_id) ? $this->getDefaultSelectQuery($config, $order_by, $index, $display) : $this->getNestingSelectQuery($parent_id, $config, $order_by, $index, $display));
 
 			if (!(DB::send($query) && DB::last()->status)) return false;
 
@@ -113,9 +111,7 @@ 
 
 			# Count entities
 
-			$query = ((null === $parent_id) ? $this->getDefaultCountQuery($config) :
-
-				$this->getNestingCountQuery($parent_id, $config));
+			$query = ((null === $parent_id) ? $this->getDefaultCountQuery($config) : $this->getNestingCountQuery($parent_id, $config));
 
 			if (!(DB::send($query) && DB::last()->status)) return false;
 

Braces +24 added lines, -8 removed lines

@@ -68,9 +68,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
 
@@ -78,7 +82,9 @@ 
 
 				$this->getNestingSelectQuery($parent_id, $config, $order_by, $index, $display));
 
-			if (!(DB::send($query) && DB::last()->status)) return false;
+			if (!(DB::send($query) && DB::last()->status)) {
+				return false;
+			}
 
 			# Process results
 
@@ -90,7 +96,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
@@ -109,7 +117,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
 
@@ -117,7 +127,9 @@ 
 
 				$this->getNestingCountQuery($parent_id, $config));
 
-			if (!(DB::send($query) && DB::last()->status)) return false;
+			if (!(DB::send($query) && DB::last()->status)) {
+				return false;
+			}
 
 			# ------------------------
 
@@ -142,7 +154,9 @@ 
 
 		public function children(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);
 		}
@@ -151,7 +165,9 @@ 
 
 		public function childrenCount(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/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');
 		}
 	}
 }