cadmium-org / cadmium-cms

www/engine/System/Classes/Modules/Extend/Utils/Extension.php

Braces +3 added lines, -1 removed lines

@@ -24,7 +24,9 @@
 
 		public static function __callStatic($name, $arguments) {
 
-			if (null !== static::$loader) return static::$loader->$name(...$arguments);
+			if (null !== static::$loader) {
+				return static::$loader->$name(...$arguments);
+			}
 		}
 	}
 }

www/engine/System/Classes/Modules/Extend/Utils/Extension/Basic.php

Braces +6 added lines, -3 removed lines

@@ -21,7 +21,9 @@ 
 
 			# Throw error if no extensions found
 
-			if (false === static::$loader->active()) throw new static::$exception_class;
+			if (false === static::$loader->active()) {
+				throw new static::$exception_class;
+			}
 
 			# Activate user defined extension
 
@@ -29,9 +31,10 @@ 
 
 				$name = static::$name; $param = static::$param[static::$loader->section()];
 
-				if (static::$loader->activate(Request::get($name)) || static::$loader->activate(Cookie::get($param)))
-
+				if (static::$loader->activate(Request::get($name)) || static::$loader->activate(Cookie::get($param))) {
+				
 					Cookie::set($param, static::$loader->data('name'), static::$cookie_expires);
+				}
 			}
 		}
 	}

www/engine/System/Classes/Modules/Extend/Utils/Loader.php

Spacing +1 added lines, -1 removed lines

@@ -12,7 +12,7 @@
 
 		protected function getItem(string $name) {
 
-			$file_name = ($this->dir_name . $name . '/Config.json');
+			$file_name = ($this->dir_name.$name.'/Config.json');
 
 			if (null === ($data = JSON::load($file_name))) return null;
 

Braces +9 added lines, -3 removed lines

@@ -14,11 +14,17 @@
 
 			$file_name = ($this->dir_name . $name . '/Config.json');
 
-			if (null === ($data = JSON::load($file_name))) return null;
+			if (null === ($data = JSON::load($file_name))) {
+				return null;
+			}
 
-			if (null === ($data = Schema::get(static::$schema_prototype)->validate($data))) return null;
+			if (null === ($data = Schema::get(static::$schema_prototype)->validate($data))) {
+				return null;
+			}
 
-			if (!(static::$extension_class::valid($data['name']) && ($data['name'] === $name))) return null;
+			if (!(static::$extension_class::valid($data['name']) && ($data['name'] === $name))) {
+				return null;
+			}
 
 			# ------------------------
 

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

Braces +27 added lines, -9 removed lines

@@ -12,7 +12,9 @@ 
 
 		public function initBySlug(string $slug) {
 
-			if (0 !== $this->id) return false;
+			if (0 !== $this->id) {
+				return false;
+			}
 
 			# Process value
 
@@ -22,7 +24,9 @@ 
 
 			$selection = array_keys($this->definition->params());
 
-			foreach ($selection as $key => $field) $selection[$key] = ('ent.' . $field);
+			foreach ($selection as $key => $field) {
+				$selection[$key] = ('ent.' . $field);
+			}
 
 			# Process query
 
@@ -38,7 +42,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;
+			}
 
 			# ------------------------
 
@@ -49,7 +55,9 @@ 
 
 		public function updateSlugs() {
 
-			if (0 === $this->id) return false;
+			if (0 === $this->id) {
+				return false;
+			}
 
 			# Send lock/update request
 
@@ -67,7 +75,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
 
@@ -83,7 +93,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;
+			}
 
 			# ------------------------
 
@@ -94,7 +106,9 @@ 
 
 		public function create(array $data) {
 
-			if (!parent::create($data)) return false;
+			if (!parent::create($data)) {
+				return false;
+			}
 
 			$this->updateSlugs();
 
@@ -107,7 +121,9 @@ 
 
 		public function edit(array $data) {
 
-			if (!parent::edit($data)) return false;
+			if (!parent::edit($data)) {
+				return false;
+			}
 
 			$this->updateSlugs();
 
@@ -120,7 +136,9 @@ 
 
 		public function move(int $parent_id) {
 
-			if (!parent::move($parent_id)) return false;
+			if (!parent::move($parent_id)) {
+				return false;
+			}
 
 			$this->updateSlugs();
 

Indentation +15 added lines, -15 removed lines

@@ -28,13 +28,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
 
@@ -55,17 +55,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;
 
@@ -73,15 +73,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

@@ -22,19 +22,19 @@ 
 
 			$selection = array_keys($this->definition->params());
 
-			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
 
@@ -53,17 +53,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");
 
@@ -71,15 +71,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");
 

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

Spacing +1 added lines, -1 removed lines

@@ -12,7 +12,7 @@
 
 		protected function init() {
 
-			$this->config->addParam('active', '', function (bool $active) {
+			$this->config->addParam('active', '', function(bool $active) {
 
 				return ($active ? "ent.active = 1" : '');
 			});

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

Spacing +16 added lines, -16 removed lines

@@ -12,44 +12,44 @@
 
 		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('slug', '', function (string $slug) {
+			$this->config->addParam('slug', '', function(string $slug) {
 
-				return (('' !== $slug) ? ("ent.slug = '" . addslashes($slug) . "'") : '');
+				return (('' !== $slug) ? ("ent.slug = '".addslashes($slug)."'") : '');
 			});
 
-			$this->config->addParam('name', '', function (string $name) {
+			$this->config->addParam('name', '', function(string $name) {
 
-				return (('' !== $name) ? ("ent.name = '" . addslashes($name) . "'") : '');
+				return (('' !== $name) ? ("ent.name = '".addslashes($name)."'") : '');
 			});
 
-			$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/Collection/Users.php

Spacing +10 added lines, -10 removed lines

@@ -12,29 +12,29 @@
 
 		protected function init() {
 
-			$this->config->addParam('rank', '', function (int $rank = null) {
+			$this->config->addParam('rank', '', function(int $rank = null) {
 
-				return ((null !== $rank) ? ("ent.rank >= " . $rank) : '');
+				return ((null !== $rank) ? ("ent.rank >= ".$rank) : '');
 			});
 
-			$this->config->addParam('time_registered >=', '', function (int $time) {
+			$this->config->addParam('time_registered >=', '', function(int $time) {
 
-				return ((0 < $time) ? ("ent.time_registered >= " . $time) : '');
+				return ((0 < $time) ? ("ent.time_registered >= ".$time) : '');
 			});
 
-			$this->config->addParam('time_registered <=', '', function (int $time) {
+			$this->config->addParam('time_registered <=', '', function(int $time) {
 
-				return ((0 < $time) ? ("ent.time_registered <= " . $time) : '');
+				return ((0 < $time) ? ("ent.time_registered <= ".$time) : '');
 			});
 
-			$this->config->addParam('time_logged >=', '', function (int $time) {
+			$this->config->addParam('time_logged >=', '', function(int $time) {
 
-				return ((0 < $time) ? ("ent.time_logged >= " . $time) : '');
+				return ((0 < $time) ? ("ent.time_logged >= ".$time) : '');
 			});
 
-			$this->config->addParam('time_logged <=', '', function (int $time) {
+			$this->config->addParam('time_logged <=', '', function(int $time) {
 
-				return ((0 < $time) ? ("ent.time_logged <= " . $time) : '');
+				return ((0 < $time) ? ("ent.time_logged <= ".$time) : '');
 			});
 		}
 	}

www/engine/System/Classes/Modules/Entitizer/Handler/Edit/User.php

Braces +3 added lines, -1 removed lines

@@ -30,7 +30,9 @@
 
 		protected function processEntity(Template\Block $contents) {
 
-			if ($this->create) $contents->getBlock('info')->disable(); else {
+			if ($this->create) {
+				$contents->getBlock('info')->disable();
+			} else {
 
 				$contents->getBlock('info')->time_registered = Date::get(DATE_FORMAT_DATETIME, $this->entity->time_registered);
 

www/engine/System/Classes/Modules/Entitizer/Handler/Edit/Page.php

Braces +6 added lines, -4 removed lines

@@ -32,16 +32,18 @@
 
 		protected function processEntityParent(Template\Block $parent) {
 
-			if ((0 !== $this->parent->id) && $this->parent->active) $parent->getBlock('browse')->link = $this->parent->link;
-
-			else { $parent->getBlock('browse')->disable(); $parent->getBlock('browse_disabled')->enable(); }
+			if ((0 !== $this->parent->id) && $this->parent->active) {
+				$parent->getBlock('browse')->link = $this->parent->link;
+			} else { $parent->getBlock('browse')->disable(); $parent->getBlock('browse_disabled')->enable(); }
 		}
 
 		# Add additional parent data for specific entity
 
 		protected function processEntity(Template\Block $contents) {
 
-			if (!$this->create && $this->parent->locked) $contents->getBlock('locked')->enable();
+			if (!$this->create && $this->parent->locked) {
+				$contents->getBlock('locked')->enable();
+			}
 		}
 	}
 }