cadmium-org / cadmium-cms

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

Spacing +3 added lines, -3 removed lines

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

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

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

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

@@ -14,9 +14,13 @@
 
 			$this->addWorker('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/Utils/Entity/Modify.php

Braces +66 added lines, -22 removed lines

@@ -35,7 +35,9 @@ 
 
 			         ("WHERE rlb.ancestor = " . $this->id . " AND rlx.ancestor IS NULL");
 
-			if (!(DB::send($query) && DB::getLast()->status)) return false;
+			if (!(DB::send($query) && DB::getLast()->status)) {
+				return false;
+			}
 
 			# Set path
 
@@ -60,7 +62,9 @@ 
 
 			         ("WHERE sub.ancestor = " . $this->id . " AND sup.descendant = " . $parent_id);
 
-			if (!(DB::send($query) && (DB::getLast()->rows > 0))) return false;
+			if (!(DB::send($query) && (DB::getLast()->rows > 0))) {
+				return false;
+			}
 
 			# Set path
 
@@ -75,27 +79,37 @@ 
 
 		public function create(array $data) {
 
-			if (0 !== $this->id) return false;
+			if (0 !== $this->id) {
+				return false;
+			}
 
 			$data = $this->dataset->cast($data);
 
-			if (static::$auto_increment && isset($data['id'])) $data['id'] = 0;
+			if (static::$auto_increment && isset($data['id'])) {
+				$data['id'] = 0;
+			}
 
 			# Insert entity
 
 			DB::insert(static::$table, $data);
 
-			if (!(DB::getLast() && DB::getLast()->status)) return false;
+			if (!(DB::getLast() && DB::getLast()->status)) {
+				return false;
+			}
 
 			# Update data
 
-			if (static::$auto_increment) $data['id'] = DB::getLast()->id;
+			if (static::$auto_increment) {
+				$data['id'] = DB::getLast()->id;
+			}
 
 			$this->dataset->update($data);
 
 			# Init subtreee
 
-			if (static::$nesting) $this->initSubtree();
+			if (static::$nesting) {
+				$this->initSubtree();
+			}
 
 			# Cache entity
 
@@ -110,17 +124,23 @@ 
 
 		public function edit(array $data) {
 
-			if (0 === $this->id) return false;
+			if (0 === $this->id) {
+				return false;
+			}
 
 			$data = $this->dataset->cast($data);
 
-			if (isset($data['id'])) unset($data['id']);
+			if (isset($data['id'])) {
+				unset($data['id']);
+			}
 
 			# Update entity
 
 			DB::update(static::$table, $data, ['id' => $this->id]);
 
-			if (!(DB::getLast() && DB::getLast()->status)) return false;
+			if (!(DB::getLast() && DB::getLast()->status)) {
+				return false;
+			}
 
 			# Update data
 
@@ -128,7 +148,9 @@ 
 
 			# Init subtreee
 
-			if (static::$nesting) $this->initSubtree();
+			if (static::$nesting) {
+				$this->initSubtree();
+			}
 
 			# ------------------------
 
@@ -139,30 +161,44 @@ 
 
 		public function move(int $parent_id) {
 
-			if (0 === $this->id) return false;
+			if (0 === $this->id) {
+				return false;
+			}
 
 			# Re-connect entity if not in tree
 
-			if (!$this->initSubtree()) return false;
+			if (!$this->initSubtree()) {
+				return false;
+			}
 
 			# Create parent entity
 
 			if (0 !== ($parent = Entitizer::get(static::$table, $parent_id))->id) {
 
-				if (false === ($path = $parent->path())) return false;
+				if (false === ($path = $parent->path())) {
+					return false;
+				}
 
-				if (false === ($depth = $this->subtreeDepth())) return false;
+				if (false === ($depth = $this->subtreeDepth())) {
+					return false;
+				}
 
-				if ((count($path) + $depth + 1) > CONFIG_ENTITIZER_MAX_DEPTH) return false;
+				if ((count($path) + $depth + 1) > CONFIG_ENTITIZER_MAX_DEPTH) {
+					return false;
+				}
 			}
 
 			# Disconnect subtree from current position
 
-			if (!$this->disconnectSubtree()) return false;
+			if (!$this->disconnectSubtree()) {
+				return false;
+			}
 
 			# Connect subtree under new position
 
-		 	if (0 !== $parent->id) $this->connectSubtree($parent->id);
+		 	if (0 !== $parent->id) {
+		 		$this->connectSubtree($parent->id);
+		 	}
 
 			# ------------------------
 
@@ -173,19 +209,27 @@ 
 
 		public function remove() {
 
-			if (0 === $this->id) return false;
+			if (0 === $this->id) {
+				return false;
+			}
 
 			# Check if entity is removable
 
-			if (static::$super && ($this->id === 1)) return false;
+			if (static::$super && ($this->id === 1)) {
+				return false;
+			}
 
-			if (static::$nesting && (0 !== $this->subtreeCount())) return false;
+			if (static::$nesting && (0 !== $this->subtreeCount())) {
+				return false;
+			}
 
 			# Remove entity
 
 			DB::delete(static::$table, ['id' => $this->id]);
 
-			if (!(DB::getLast() && DB::getLast()->status)) return false;
+			if (!(DB::getLast() && DB::getLast()->status)) {
+				return false;
+			}
 
 			# Uncache entity
 

Indentation +8 added lines, -8 removed lines

@@ -27,13 +27,13 @@ 
 
 			$query = ("DELETE rla FROM " . static::$table_relations . " rla ") .
 
-			         ("JOIN "  . static::$table_relations . " rlb ON rlb.descendant = rla.descendant ") .
+					 ("JOIN "  . static::$table_relations . " rlb ON rlb.descendant = rla.descendant ") .
 
-			         ("LEFT JOIN " . static::$table_relations . " rlx ") .
+					 ("LEFT JOIN " . static::$table_relations . " rlx ") .
 
-			         ("ON rlx.ancestor = rlb.ancestor AND rlx.descendant = rla.ancestor ") .
+					 ("ON rlx.ancestor = rlb.ancestor AND rlx.descendant = rla.ancestor ") .
 
-			         ("WHERE rlb.ancestor = " . $this->id . " AND rlx.ancestor IS NULL");
+					 ("WHERE rlb.ancestor = " . $this->id . " AND rlx.ancestor IS NULL");
 
 			if (!(DB::send($query) && DB::getLast()->status)) return false;
 
@@ -52,13 +52,13 @@ 
 
 			$query = ("INSERT INTO " . static::$table_relations . " (ancestor, descendant, depth) ") .
 
-			         ("SELECT sup.ancestor, sub.descendant, sup.depth + sub.depth + 1 ") .
+					 ("SELECT sup.ancestor, sub.descendant, sup.depth + sub.depth + 1 ") .
 
-			         ("FROM " . static::$table_relations . " sup ") .
+					 ("FROM " . static::$table_relations . " sup ") .
 
-			         ("JOIN " . static::$table_relations . " sub ") .
+					 ("JOIN " . static::$table_relations . " sub ") .
 
-			         ("WHERE sub.ancestor = " . $this->id . " AND sup.descendant = " . $parent_id);
+					 ("WHERE sub.ancestor = " . $this->id . " AND sup.descendant = " . $parent_id);
 
 			if (!(DB::send($query) && (DB::getLast()->rows > 0))) return false;
 

Spacing +10 added lines, -10 removed lines

@@ -25,15 +25,15 @@ 
 
 		private function disconnectSubtree() {
 
-			$query = ("DELETE rla FROM " . static::$table_relations . " rla ") .
+			$query = ("DELETE rla FROM ".static::$table_relations." rla ").
 
-			         ("JOIN "  . static::$table_relations . " rlb ON rlb.descendant = rla.descendant ") .
+			         ("JOIN ".static::$table_relations." rlb ON rlb.descendant = rla.descendant ").
 
-			         ("LEFT JOIN " . static::$table_relations . " rlx ") .
+			         ("LEFT JOIN ".static::$table_relations." rlx ").
 
-			         ("ON rlx.ancestor = rlb.ancestor AND rlx.descendant = rla.ancestor ") .
+			         ("ON rlx.ancestor = rlb.ancestor AND rlx.descendant = rla.ancestor ").
 
-			         ("WHERE rlb.ancestor = " . $this->id . " AND rlx.ancestor IS NULL");
+			         ("WHERE rlb.ancestor = ".$this->id." AND rlx.ancestor IS NULL");
 
 			if (!(DB::send($query) && DB::getLast()->status)) return false;
 
@@ -50,15 +50,15 @@ 
 
 		private function connectSubtree(int $parent_id) {
 
-			$query = ("INSERT INTO " . static::$table_relations . " (ancestor, descendant, depth) ") .
+			$query = ("INSERT INTO ".static::$table_relations." (ancestor, descendant, depth) ").
 
-			         ("SELECT sup.ancestor, sub.descendant, sup.depth + sub.depth + 1 ") .
+			         ("SELECT sup.ancestor, sub.descendant, sup.depth + sub.depth + 1 ").
 
-			         ("FROM " . static::$table_relations . " sup ") .
+			         ("FROM ".static::$table_relations." sup ").
 
-			         ("JOIN " . static::$table_relations . " sub ") .
+			         ("JOIN ".static::$table_relations." sub ").
 
-			         ("WHERE sub.ancestor = " . $this->id . " AND sup.descendant = " . $parent_id);
+			         ("WHERE sub.ancestor = ".$this->id." AND sup.descendant = ".$parent_id);
 
 			if (!(DB::send($query) && (DB::getLast()->rows > 0))) return false;
 

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

Braces +21 added lines, -7 removed lines

@@ -12,7 +12,9 @@ 
 
 		protected function addWorker(string $name, callable $worker) {
 
-			if (isset($this->params[$name]) || isset($this->workers[$name])) return;
+			if (isset($this->params[$name]) || isset($this->workers[$name])) {
+				return;
+			}
 
 			$this->workers[$name] = $worker;
 		}
@@ -23,7 +25,9 @@ 
 
 			$this->params = Entitizer::definition(static::$table)->params();
 
-			if (static::$nesting) $this->params['parent_id'] = $this->params['id'];
+			if (static::$nesting) {
+				$this->params['parent_id'] = $this->params['id'];
+			}
 
 			$this->init(); $this->reset();
 		}
@@ -34,11 +38,15 @@ 
 
 			# Reset params
 
-			foreach ($this->params as $name => $param) $this->data[$name] = $param->cast(null);
+			foreach ($this->params as $name => $param) {
+				$this->data[$name] = $param->cast(null);
+			}
 
 			# Reset extras
 
-			foreach ($this->workers as $name => $worker) $this->data[$name] = $worker($this->data);
+			foreach ($this->workers as $name => $worker) {
+				$this->data[$name] = $worker($this->data);
+			}
 
 			# ------------------------
 
@@ -53,12 +61,16 @@ 
 
 			foreach ($data as $name => $value) {
 
-				if (isset($this->params[$name])) $this->data[$name] = $this->params[$name]->cast($value);
+				if (isset($this->params[$name])) {
+					$this->data[$name] = $this->params[$name]->cast($value);
+				}
 			}
 
 			# Update extras
 
-			foreach ($this->workers as $name => $worker) $this->data[$name] = $worker($this->data);
+			foreach ($this->workers as $name => $worker) {
+				$this->data[$name] = $worker($this->data);
+			}
 
 			# ------------------------
 
@@ -73,7 +85,9 @@ 
 
 			foreach ($data as $name => $value) {
 
-				if (isset($this->params[$name])) $cast[$name] = $this->params[$name]->cast($value);
+				if (isset($this->params[$name])) {
+					$cast[$name] = $this->params[$name]->cast($value);
+				}
 			}
 
 			# ------------------------

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

Braces +3 added lines, -3 removed lines

@@ -30,9 +30,9 @@
 
 		protected function processEntityParent(Template\Block $parent) {
 
-			if (0 !== $this->parent->id) $parent->getBlock('browse')->link = $this->parent->link;
-
-			else { $parent->getBlock('browse')->disable(); $parent->getBlock('browse_disabled')->enable(); }
+			if (0 !== $this->parent->id) {
+				$parent->getBlock('browse')->link = $this->parent->link;
+			} else { $parent->getBlock('browse')->disable(); $parent->getBlock('browse_disabled')->enable(); }
 		}
 
 		# Add item additional data

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

Braces +3 added lines, -3 removed lines

@@ -30,9 +30,9 @@
 
 		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 item additional data

www/engine/System/Classes/Modules/Tools/Handler/Captcha.php

Spacing +1 added lines, -1 removed lines

@@ -24,7 +24,7 @@
 
 			# Customize captcha
 
-			$font = (DIR_SYSTEM_DATA . CONFIG_CAPTCHA_FONT); $size = CONFIG_CAPTCHA_FONT_SIZE;
+			$font = (DIR_SYSTEM_DATA.CONFIG_CAPTCHA_FONT); $size = CONFIG_CAPTCHA_FONT_SIZE;
 
 			$indent = CONFIG_CAPTCHA_TEXT_INDENT; $step = CONFIG_CAPTCHA_TEXT_STEP;
 

www/engine/System/Classes/Modules/Tools/Handler/Sitemap.php

Spacing +1 added lines, -1 removed lines

@@ -44,7 +44,7 @@
 
 			# Load sitemap
 
-			$file_name = (DIR_SYSTEM_DATA . 'Sitemap.xml');
+			$file_name = (DIR_SYSTEM_DATA.'Sitemap.xml');
 
 			$modified = Explorer::getModified($file_name);
 

Braces +12 added lines, -4 removed lines

@@ -12,7 +12,9 @@ 
 
 			$selection = 'MAX(time_modified) as last_modified';
 
-			if (!(DB::select(TABLE_PAGES, $selection) && (DB::getLast()->rows === 1))) return 0;
+			if (!(DB::select(TABLE_PAGES, $selection) && (DB::getLast()->rows === 1))) {
+				return 0;
+			}
 
 			# ------------------------
 
@@ -27,11 +29,15 @@ 
 
 			$condition = ['visibility' => VISIBILITY_PUBLISHED, 'access' => ACCESS_PUBLIC, 'locked' => 0];
 
-			if (!(DB::select(TABLE_PAGES, $selection, $condition, 'slug') && DB::getLast()->status)) return;
+			if (!(DB::select(TABLE_PAGES, $selection, $condition, 'slug') && DB::getLast()->status)) {
+				return;
+			}
 
 			# ------------------------
 
-			while (null !== ($data = DB::getLast()->getRow())) yield Entitizer::dataset(TABLE_PAGES, $data);
+			while (null !== ($data = DB::getLast()->getRow())) {
+				yield Entitizer::dataset(TABLE_PAGES, $data);
+			}
 		}
 
 		# Handle request
@@ -50,7 +56,9 @@ 
 
 			if ((false !== $modified) && ($modified > $this->getLastModified())) {
 
-				if (false !== $sitemap->load($file_name)) return $sitemap;
+				if (false !== $sitemap->load($file_name)) {
+					return $sitemap;
+				}
 			}
 
 			# Fill sitemap