cadmium-org / cadmium-cms

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

Braces +36 added lines, -12 removed lines

@@ -12,9 +12,13 @@ 
 
 		private static function getAuth(string $code, string $type, int $lifetime) {
 
-			if (!($auth = Entitizer::get($type))->init($code, 'code')) return false;
+			if (!($auth = Entitizer::get($type))->init($code, 'code')) {
+				return false;
+			}
 
-			if (($auth->ip !== REQUEST_CLIENT_IP) || ($auth->time < (REQUEST_TIME - $lifetime))) return false;
+			if (($auth->ip !== REQUEST_CLIENT_IP) || ($auth->time < (REQUEST_TIME - $lifetime))) {
+				return false;
+			}
 
 			# ------------------------
 
@@ -25,9 +29,13 @@ 
 
 		private static function getUser(int $id) {
 
-			if (0 === ($user = Entitizer::get(TABLE_USERS, $id))->id) return false;
+			if (0 === ($user = Entitizer::get(TABLE_USERS, $id))->id) {
+				return false;
+			}
 
-			if ($user->rank < (self::$admin ? RANK_ADMINISTRATOR : RANK_USER)) return false;
+			if ($user->rank < (self::$admin ? RANK_ADMINISTRATOR : RANK_USER)) {
+				return false;
+			}
 
 			# ------------------------
 
@@ -42,17 +50,23 @@ 
 
 			# Check session code
 
-			if (false === ($code = Validate::authCode(Session::get('code') ?? ''))) return false;
+			if (false === ($code = Validate::authCode(Session::get('code') ?? ''))) {
+				return false;
+			}
 
 			# Get auth
 
 			$type = TABLE_USERS_SESSIONS; $lifetime = CONFIG_USER_SESSION_LIFETIME;
 
-			if (false === ($session = self::getAuth($code, $type, $lifetime))) return false;
+			if (false === ($session = self::getAuth($code, $type, $lifetime))) {
+				return false;
+			}
 
 			# Get user
 
-			if (false === ($user = self::getUser($session->id))) return false;
+			if (false === ($user = self::getUser($session->id))) {
+				return false;
+			}
 
 			# Update session
 
@@ -71,21 +85,29 @@ 
 
 		public static function secret() {
 
-			if ((null === self::$user) || (0 !== self::$user->id)) return false;
+			if ((null === self::$user) || (0 !== self::$user->id)) {
+				return false;
+			}
 
 			# Check secret code
 
-			if (false === ($code = Validate::authCode(Request::get('code')))) return false;
+			if (false === ($code = Validate::authCode(Request::get('code')))) {
+				return false;
+			}
 
 			# Get auth
 
 			$type = TABLE_USERS_SECRETS; $lifetime = CONFIG_USER_SECRET_LIFETIME;
 
-			if (false === ($secret = self::getAuth($code, $type, $lifetime))) return false;
+			if (false === ($secret = self::getAuth($code, $type, $lifetime))) {
+				return false;
+			}
 
 			# Get user
 
-			if (false === ($user = self::getUser($secret->id))) return false;
+			if (false === ($user = self::getUser($secret->id))) {
+				return false;
+			}
 
 			# ------------------------
 
@@ -96,7 +118,9 @@ 
 
 		public static function logout() {
 
-			if ((null === self::$user) || (0 === self::$user->id)) return false;
+			if ((null === self::$user) || (0 === self::$user->id)) {
+				return false;
+			}
 
 			# Remove session
 

www/engine/System/Classes/Modules/Entitizer/Collection/Widgets.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();
+			}
 		}
 	}
 }

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/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