cadmium-org / cadmium-cms

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

Doc Comments +1 added lines, -1 removed lines

@@ -27,7 +27,7 @@
 		/**
 		 * Invoker
 		 *
-		 * @return true|string : true on success or an error code on failure
+		 * @return string|boolean : true on success or an error code on failure
 		 */
 
 		public function __invoke(array $post) {

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

Doc Comments +1 added lines, -1 removed lines

@@ -27,7 +27,7 @@
 		/**
 		 * Invoker
 		 *
-		 * @return true|string : true on success or an error code on failure
+		 * @return string|boolean : true on success or an error code on failure
 		 */
 
 		public function __invoke(array $post) {

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

Doc Comments +2 added lines, -1 removed lines

@@ -62,7 +62,7 @@ 
 		/**
 		 * Update the entity dataset with a selected data. Also updates every entity object having an identical id
 		 *
-		 * @return true : always true ;)
+		 * @return boolean : always true ;)
 		 */
 
 		protected function setData(array $data) : bool {
@@ -137,6 +137,7 @@ 
 		 * Check whether another entity with a given unique param value exists.
 		 * The method helps you to find out the possibility of changing the entity's unique param value to the given one
 		 *
+		 * @param string $value
 		 * @return int|false : the number of entities found (0 or 1) or false on error
 		 */
 

Indentation +3 added lines, -3 removed lines

@@ -48,11 +48,11 @@
 
 			$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." . $name . " = '" . addslashes($value) . "' LIMIT 1");
+					 ("WHERE ent." . $name . " = '" . addslashes($value) . "' LIMIT 1");
 
 			# ------------------------
 

Spacing +6 added lines, -6 removed lines

@@ -42,17 +42,17 @@ 
 
 			$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." . $name . " = '" . addslashes($value) . "' LIMIT 1");
+			         ("WHERE ent.".$name." = '".addslashes($value)."' LIMIT 1");
 
 			# ------------------------
 
@@ -154,7 +154,7 @@ 
 
 			# Select entity from DB
 
-			$condition = ($name . " = '" . addslashes($value) . "' AND id != " . $this->id);
+			$condition = ($name." = '".addslashes($value)."' AND id != ".$this->id);
 
 			DB::select(static::$table, 'id', $condition, null, 1);
 

Braces +23 added lines, -7 removed lines

@@ -42,7 +42,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
 
@@ -112,13 +114,19 @@ 
 
 		public function init($value, string $name = 'id') : bool {
 
-			if (0 !== $this->id) return false;
+			if (0 !== $this->id) {
+				return false;
+			}
 
 			# Get initiation index
 
-			if (false === ($index = $this->definition->getIndex($name))) return false;
+			if (false === ($index = $this->definition->getIndex($name))) {
+				return false;
+			}
 
-			if (($index->type !== 'PRIMARY') && ($index->type !== 'UNIQUE')) return false;
+			if (($index->type !== 'PRIMARY') && ($index->type !== 'UNIQUE')) {
+				return false;
+			}
 
 			# Process name & value
 
@@ -126,7 +134,11 @@ 
 
 			# Select entity from DB
 
-			if (!static::$nesting) $this->selectBasic($name, $value); else $this->selectNesting($name, $value);
+			if (!static::$nesting) {
+				$this->selectBasic($name, $value);
+			} else {
+				$this->selectNesting($name, $value);
+			}
 
 			# ------------------------
 
@@ -144,9 +156,13 @@ 
 
 			# Get initiation index
 
-			if (false === ($index = $this->definition->getIndex($name))) return false;
+			if (false === ($index = $this->definition->getIndex($name))) {
+				return false;
+			}
 
-			if ($index->type !== 'UNIQUE') return false;
+			if ($index->type !== 'UNIQUE') {
+				return false;
+			}
 
 			# Process name & value
 

www/engine/System/Classes/Utils/Menu.php

Braces +9 added lines, -3 removed lines

@@ -20,7 +20,9 @@ 
 
 				$item->children = ($children = Template::createBlock());
 
-				foreach ($this->menu[$id]['children'] as $child) $children->addItem($this->parseItem($child));
+				foreach ($this->menu[$id]['children'] as $child) {
+					$children->addItem($this->parseItem($child));
+				}
 
 			} else {
 
@@ -44,7 +46,9 @@ 
 
 			$menu = Entitizer::getTreeview(TABLE_MENU)->getSubtree(0, ['active' => true]);
 
-			if (false !== $menu) $this->menu = $menu;
+			if (false !== $menu) {
+				$this->menu = $menu;
+			}
 		}
 
 		# Get block
@@ -53,7 +57,9 @@ 
 
 			$menu = Template::createBlock();
 
-			foreach ($this->menu[0]['children'] as $id) $menu->addItem($this->parseItem($id));
+			foreach ($this->menu[0]['children'] as $id) {
+				$menu->addItem($this->parseItem($id));
+			}
 
 			# ------------------------
 

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

Braces +21 added lines, -7 removed lines

@@ -25,9 +25,11 @@ 
 
 			# Set breadcrumbs
 
-			if (count($this->path) <= 1) $contents->getBlock('breadcrumbs')->disable();
-
-			else $contents->getBlock('breadcrumbs')->path = $this->path;
+			if (count($this->path) <= 1) {
+				$contents->getBlock('breadcrumbs')->disable();
+			} else {
+				$contents->getBlock('breadcrumbs')->path = $this->path;
+			}
 
 			# Set contents
 
@@ -54,19 +56,31 @@ 
 
 			$slug = $this->_url->getSlug();
 
-			if ('' !== $slug) $this->page->initBySlug($slug); else $this->page->init(1);
+			if ('' !== $slug) {
+				$this->page->initBySlug($slug);
+			} else {
+				$this->page->init(1);
+			}
 
 			# Display error if not found
 
-			if (0 === $this->page->id) return false;
+			if (0 === $this->page->id) {
+				return false;
+			}
 
 			# Get path
 
-			if (false !== ($path = $this->page->getPath())) $this->path = $path;
+			if (false !== ($path = $this->page->getPath())) {
+				$this->path = $path;
+			}
 
 			# Set data
 
-			if ($this->page->id !== 1) SEO::title($this->page->title); else $this->_layout = 'Index';
+			if ($this->page->id !== 1) {
+				SEO::title($this->page->title);
+			} else {
+				$this->_layout = 'Index';
+			}
 
 			SEO::description        ($this->page->description);
 			SEO::keywords           ($this->page->keywords);

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

Spacing +12 added lines, -12 removed lines

@@ -23,34 +23,34 @@
 
 		protected function init() {
 
-			$this->config->addParam('active', '', function (bool $active) {
+			$this->config->addParam('active', '', function(bool $active) {
 
-				return ($active ? ("ent.visibility = " . VISIBILITY_PUBLISHED . " AND ent.locked = 0") : '');
+				return ($active ? ("ent.visibility = ".VISIBILITY_PUBLISHED." AND ent.locked = 0") : '');
 			});
 
-			$this->config->addParam('rank', '', function (int $rank = null) {
+			$this->config->addParam('rank', '', function(int $rank = null) {
 
-				return ((null !== $rank) ? ("ent.access <= " . $rank) : '');
+				return ((null !== $rank) ? ("ent.access <= ".$rank) : '');
 			});
 
-			$this->config->addParam('time_created >=', '', function (int $time) {
+			$this->config->addParam('time_created >=', '', function(int $time) {
 
-				return ((0 < $time) ? ("ent.time_created >= " . $time) : '');
+				return ((0 < $time) ? ("ent.time_created >= ".$time) : '');
 			});
 
-			$this->config->addParam('time_created <=', '', function (int $time) {
+			$this->config->addParam('time_created <=', '', function(int $time) {
 
-				return ((0 < $time) ? ("ent.time_created <= " . $time) : '');
+				return ((0 < $time) ? ("ent.time_created <= ".$time) : '');
 			});
 
-			$this->config->addParam('time_modified >=', '', function (int $time) {
+			$this->config->addParam('time_modified >=', '', function(int $time) {
 
-				return ((0 < $time) ? ("ent.time_modified >= " . $time) : '');
+				return ((0 < $time) ? ("ent.time_modified >= ".$time) : '');
 			});
 
-			$this->config->addParam('time_modified <=', '', function (int $time) {
+			$this->config->addParam('time_modified <=', '', function(int $time) {
 
-				return ((0 < $time) ? ("ent.time_modified <= " . $time) : '');
+				return ((0 < $time) ? ("ent.time_modified <= ".$time) : '');
 			});
 		}
 	}

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

Spacing +5 added lines, -5 removed lines

@@ -23,14 +23,14 @@
 
 			# Add params
 
-			$this->params->addTextual       ('name',                true, 255, false, '');
-			$this->params->addTextual       ('title',               true, 255, false, '');
-			$this->params->addTextual       ('value',               true, 255, false, '');
+			$this->params->addTextual('name', true, 255, false, '');
+			$this->params->addTextual('title', true, 255, false, '');
+			$this->params->addTextual('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/Widget.php

Spacing +7 added lines, -7 removed lines

@@ -23,16 +23,16 @@
 
 			# Add params
 
-			$this->params->addBoolean       ('active',              false);
-			$this->params->addTextual       ('name',                true, 255, false, '');
-			$this->params->addTextual       ('title',               true, 255, false, '');
-			$this->params->addTextual       ('contents',            false, 0, false, '');
+			$this->params->addBoolean('active', false);
+			$this->params->addTextual('name', true, 255, false, '');
+			$this->params->addTextual('title', true, 255, false, '');
+			$this->params->addTextual('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/User.php

Spacing +18 added lines, -18 removed lines

@@ -23,27 +23,27 @@
 
 			# Add params
 
-			$this->params->addInteger       ('rank',                true, 1, true, RANK_GUEST);
-			$this->params->addTextual       ('name',                true, 16, false, '');
-			$this->params->addTextual       ('email',               true, 128, false, '');
-			$this->params->addTextual       ('auth_key',            true, 40, true, '');
-			$this->params->addTextual       ('password',            true, 40, true, '');
-			$this->params->addTextual       ('first_name',          true, 255, false, '');
-			$this->params->addTextual       ('last_name',           true, 255, false, '');
-			$this->params->addInteger       ('sex',                 true, 1, true, SEX_NOT_SELECTED);
-			$this->params->addTextual       ('city',                true, 255, false, '');
-			$this->params->addTextual       ('country',             true, 2, false, '');
-			$this->params->addTextual       ('timezone',            true, 40, false, '');
-			$this->params->addInteger       ('time_registered',     false, 10, true, 0);
-			$this->params->addInteger       ('time_logged',         false, 10, true, 0);
+			$this->params->addInteger('rank', true, 1, true, RANK_GUEST);
+			$this->params->addTextual('name', true, 16, false, '');
+			$this->params->addTextual('email', true, 128, false, '');
+			$this->params->addTextual('auth_key', true, 40, true, '');
+			$this->params->addTextual('password', true, 40, true, '');
+			$this->params->addTextual('first_name', true, 255, false, '');
+			$this->params->addTextual('last_name', true, 255, false, '');
+			$this->params->addInteger('sex', true, 1, true, SEX_NOT_SELECTED);
+			$this->params->addTextual('city', true, 255, false, '');
+			$this->params->addTextual('country', true, 2, false, '');
+			$this->params->addTextual('timezone', true, 40, false, '');
+			$this->params->addInteger('time_registered', false, 10, true, 0);
+			$this->params->addInteger('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');
 		}
 	}
 }