cadmium-org / cadmium-cms

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

Spacing +7 added lines, -7 removed lines

@@ -23,19 +23,19 @@
 
 			# Add params
 
-			$this->params->addTextual       ('code',                true, 40, true, '');
-			$this->params->addTextual       ('ip',                  true, 255, false, '');
-			$this->params->addInteger       ('time',                false, 10, true, 0);
+			$this->params->addTextual('code', true, 40, true, '');
+			$this->params->addTextual('ip', true, 255, false, '');
+			$this->params->addInteger('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/Menuitem.php

Spacing +7 added lines, -7 removed lines

@@ -23,16 +23,16 @@
 
 			# Add params
 
-			$this->params->addBoolean       ('active',              false);
-			$this->params->addInteger       ('position',            true, 2, true, 0);
-			$this->params->addTextual       ('slug',                true, 255, false, '');
-			$this->params->addTextual       ('text',                true, 255, false, '');
-			$this->params->addInteger       ('target',              true, 1, true, TARGET_SELF);
+			$this->params->addBoolean('active', false);
+			$this->params->addInteger('position', true, 2, true, 0);
+			$this->params->addTextual('slug', true, 255, false, '');
+			$this->params->addTextual('text', true, 255, false, '');
+			$this->params->addInteger('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/Dataset/User.php

Spacing +3 added lines, -3 removed lines

@@ -21,14 +21,14 @@
 
 		protected function init() {
 
-			$this->addVirtual('gravatar', function (array $data) {
+			$this->addVirtual('gravatar', function(array $data) {
 
 				return md5(strtolower($data['email']));
 			});
 
-			$this->addVirtual('full_name', function (array $data) {
+			$this->addVirtual('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/Page.php

Spacing +5 added lines, -5 removed lines

@@ -21,23 +21,23 @@
 
 		protected function init() {
 
-			$this->addVirtual('active', function (array $data) {
+			$this->addVirtual('active', function(array $data) {
 
 				return (($data['visibility'] === VISIBILITY_PUBLISHED) && !$data['locked']);
 			});
 
-			$this->addVirtual('link', function (array $data) {
+			$this->addVirtual('link', function(array $data) {
 
 				if ('' === $data['slug']) return '';
 
-				return (INSTALL_PATH . '/' . $data['slug']);
+				return (INSTALL_PATH.'/'.$data['slug']);
 			});
 
-			$this->addVirtual('canonical', function (array $data) {
+			$this->addVirtual('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

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

Spacing +2 added lines, -2 removed lines

@@ -21,13 +21,13 @@
 
 		protected function init() {
 
-			$this->addVirtual('link', function (array $data) {
+			$this->addVirtual('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

@@ -23,9 +23,13 @@
 
 			$this->addVirtual('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/Entitizer.php

Braces +6 added lines, -2 removed lines

@@ -37,9 +37,13 @@
 
 		public static function get(string $table, int $id = 0) : Entitizer\Utils\Entity {
 
-			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);
 

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

Indentation +17 added lines, -17 removed lines

@@ -16,7 +16,7 @@ 
 		use Entitizer\Common\Page;
 
 		/**
- 		 * Initialize the page by a slug
+		 * Initialize the page by a slug
 		 *
 		 * @return bool : true on success or false on failure
 		 */
@@ -39,13 +39,13 @@ 
 
 			$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::get('rank') . " AND ") .
+					 ("WHERE ent.visibility = " . VISIBILITY_PUBLISHED . " AND ent.access <= " . Auth::get('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
 
@@ -57,7 +57,7 @@ 
 		}
 
 		/**
- 		 * Update slugs of the page descendants
+		 * Update slugs of the page descendants
 		 *
 		 * @return bool : true on success or false on failure
 		 */
@@ -70,17 +70,17 @@ 
 
 			$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");
+					 (") slg ON slg.id = ent.id SET ent.locked = 1, ent.slug = slg.slug");
 
 			if (!(DB::send($query) && DB::getLast()->status)) return false;
 
@@ -88,15 +88,15 @@ 
 
 			$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");
+					 (") chk ON chk.id = ent.id SET ent.locked = 0");
 
 			if (!(DB::send($query) && DB::getLast()->status)) return false;
 

Spacing +17 added lines, -17 removed lines

@@ -33,19 +33,19 @@ 
 
 			$selection = array_keys($this->definition->getParams());
 
-			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::get('rank') . " AND ") .
+			         ("WHERE ent.visibility = ".VISIBILITY_PUBLISHED." AND ent.access <= ".Auth::get('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
 
@@ -68,17 +68,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");
 
@@ -86,15 +86,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");
 

Braces +27 added lines, -9 removed lines

@@ -23,7 +23,9 @@ 
 
 		public function initBySlug(string $slug) : bool {
 
-			if (0 !== $this->id) return false;
+			if (0 !== $this->id) {
+				return false;
+			}
 
 			# Process value
 
@@ -33,7 +35,9 @@ 
 
 			$selection = array_keys($this->definition->getParams());
 
-			foreach ($selection as $key => $field) $selection[$key] = ('ent.' . $field);
+			foreach ($selection as $key => $field) {
+				$selection[$key] = ('ent.' . $field);
+			}
 
 			# Process query
 
@@ -49,7 +53,9 @@ 
 
 			# Select entity from DB
 
-			if (!(DB::send($query) && (DB::getLast()->rows === 1))) return false;
+			if (!(DB::send($query) && (DB::getLast()->rows === 1))) {
+				return false;
+			}
 
 			# ------------------------
 
@@ -64,7 +70,9 @@ 
 
 		public function updateSlugs() : bool {
 
-			if (0 === $this->id) return false;
+			if (0 === $this->id) {
+				return false;
+			}
 
 			# Send lock/update request
 
@@ -82,7 +90,9 @@ 
 
 			         (") slg ON slg.id = ent.id SET ent.locked = 1, ent.slug = slg.slug");
 
-			if (!(DB::send($query) && DB::getLast()->status)) return false;
+			if (!(DB::send($query) && DB::getLast()->status)) {
+				return false;
+			}
 
 			# Send unlock request
 
@@ -98,7 +108,9 @@ 
 
 			         (") chk ON chk.id = ent.id SET ent.locked = 0");
 
-			if (!(DB::send($query) && DB::getLast()->status)) return false;
+			if (!(DB::send($query) && DB::getLast()->status)) {
+				return false;
+			}
 
 			# ------------------------
 
@@ -113,7 +125,9 @@ 
 
 		public function create(array $data) : bool {
 
-			if (!parent::create($data)) return false;
+			if (!parent::create($data)) {
+				return false;
+			}
 
 			$this->updateSlugs();
 
@@ -130,7 +144,9 @@ 
 
 		public function edit(array $data) : bool {
 
-			if (!parent::edit($data)) return false;
+			if (!parent::edit($data)) {
+				return false;
+			}
 
 			$this->updateSlugs();
 
@@ -147,7 +163,9 @@ 
 
 		public function move(int $parent_id) : bool {
 
-			if (!parent::move($parent_id)) return false;
+			if (!parent::move($parent_id)) {
+				return false;
+			}
 
 			$this->updateSlugs();
 

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

Spacing +3 added lines, -3 removed lines

@@ -47,11 +47,11 @@
 
 		public function getStatement() : string {
 
-			return ("FOREIGN KEY (`" . $this->name . "`) REFERENCES `" . $this->table . "` (`" . $this->field . "`)") .
+			return ("FOREIGN KEY (`".$this->name."`) REFERENCES `".$this->table."` (`".$this->field."`)").
 
-				   ((null !== $this->delete) ? (" ON DELETE " . $this->delete) : "") .
+				   ((null !== $this->delete) ? (" ON DELETE ".$this->delete) : "").
 
-				   ((null !== $this->update) ? (" ON UPDATE " . $this->update) : "");
+				   ((null !== $this->update) ? (" ON UPDATE ".$this->update) : "");
 		}
 	}
 }

Braces +6 added lines, -2 removed lines

@@ -36,9 +36,13 @@
 
 			$this->name = $name; $this->table = $table; $this->field = $field;
 
-			if (null !== $delete) $this->delete = $this->validateAction($delete);
+			if (null !== $delete) {
+				$this->delete = $this->validateAction($delete);
+			}
 
-			if (null !== $update) $this->update = $this->validateAction($update);
+			if (null !== $update) {
+				$this->update = $this->validateAction($update);
+			}
 		}
 
 		/**

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

Indentation +1 added lines, -1 removed lines

@@ -32,7 +32,7 @@
 
 			return ("`" . $this->name . "` " . ($this->short ? "tiny" : "") . "int(" . $this->length . ")") .
 
-			       (($this->unsigned ? " UNSIGNED" : "") . " NOT NULL DEFAULT '" . $this->default . "'");
+				   (($this->unsigned ? " UNSIGNED" : "") . " NOT NULL DEFAULT '" . $this->default . "'");
 		}
 
 		/**

Spacing +2 added lines, -2 removed lines

@@ -30,9 +30,9 @@
 
 		public function getStatement() : string {
 
-			return ("`" . $this->name . "` " . ($this->short ? "tiny" : "") . "int(" . $this->length . ")") .
+			return ("`".$this->name."` ".($this->short ? "tiny" : "")."int(".$this->length.")").
 
-			       (($this->unsigned ? " UNSIGNED" : "") . " NOT NULL DEFAULT '" . $this->default . "'");
+			       (($this->unsigned ? " UNSIGNED" : "")." NOT NULL DEFAULT '".$this->default."'");
 		}
 
 		/**

Braces +3 added lines, -1 removed lines

@@ -21,7 +21,9 @@
 
 		public function __construct(string $name, bool $short = false, int $length = 0, bool $unsigned = false, int $default = 0) {
 
-			foreach (get_defined_vars() as $name => $value) $this->$name = $value;
+			foreach (get_defined_vars() as $name => $value) {
+				$this->$name = $value;
+			}
 		}
 
 		/**