cadmium-org / cadmium-cms

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

Braces +3 added lines, -1 removed lines

@@ -20,7 +20,9 @@
 
 				$contents->getBlock('items')->addItem($item = View::get(static::$view_item));
 
-				foreach ($data as $property => $value) $item->$property = $value;
+				foreach ($data as $property => $value) {
+					$item->$property = $value;
+				}
 
 				# Process item
 

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/Auth/Handler/Register.php

Spacing +1 added lines, -1 removed lines

@@ -12,7 +12,7 @@
 
 		protected function handle() {
 
-			if (!Auth::initial()) Request::redirect(INSTALL_PATH . '/admin/login');
+			if (!Auth::initial()) Request::redirect(INSTALL_PATH.'/admin/login');
 
 			return (new Auth\Action\Register)->handle();
 		}

Braces +3 added lines, -1 removed lines

@@ -12,7 +12,9 @@
 
 		protected function handle() {
 
-			if (!Auth::initial()) Request::redirect(INSTALL_PATH . '/admin/login');
+			if (!Auth::initial()) {
+				Request::redirect(INSTALL_PATH . '/admin/login');
+			}
 
 			return (new Auth\Action\Register)->handle();
 		}

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

Spacing +1 added lines, -1 removed lines

@@ -12,7 +12,7 @@
 
 		protected function handle() {
 
-			if (Auth::initial()) Request::redirect(INSTALL_PATH . '/admin/register');
+			if (Auth::initial()) Request::redirect(INSTALL_PATH.'/admin/register');
 
 			return (new Auth\Action\Login)->handle();
 		}

Braces +3 added lines, -1 removed lines

@@ -12,7 +12,9 @@
 
 		protected function handle() {
 
-			if (Auth::initial()) Request::redirect(INSTALL_PATH . '/admin/register');
+			if (Auth::initial()) {
+				Request::redirect(INSTALL_PATH . '/admin/register');
+			}
 
 			return (new Auth\Action\Login)->handle();
 		}

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

Spacing +4 added lines, -4 removed lines

@@ -10,7 +10,7 @@ 
 
 		private static function send(Entitizer\Entity\User $user, string $view, string $subject, string $link) {
 
-			$message = View::get((Auth::admin() ? 'Blocks/Auth/Mail/' : 'Blocks/Profile/Auth/Mail/') . $view);
+			$message = View::get((Auth::admin() ? 'Blocks/Auth/Mail/' : 'Blocks/Profile/Auth/Mail/').$view);
 
 			$message->name = $user->name; $message->link = $link; $message->copyright = Date::getYear();
 
@@ -18,7 +18,7 @@ 
 
 			$to = $user->email; $sender = Settings::get('site_title'); $reply_to = Settings::get('system_email');
 
-			$from = ((false !== ($host = parse_url(Settings::get('system_url'), PHP_URL_HOST))) ? ('noreply@' . $host) : '');
+			$from = ((false !== ($host = parse_url(Settings::get('system_url'), PHP_URL_HOST))) ? ('noreply@'.$host) : '');
 
 			return Mailer::send($to, $sender, $from, $reply_to, $subject, $message->getContents(), true);
 		}
@@ -27,7 +27,7 @@ 
 
 		public static function reset(Entitizer\Entity\User $user, string $code) {
 
-			$link = (Settings::get('system_url') . (Auth::admin() ? '/admin' : '/profile') . '/recover?code=' . $code);
+			$link = (Settings::get('system_url').(Auth::admin() ? '/admin' : '/profile').'/recover?code='.$code);
 
 			return self::send($user, 'Reset', Language::get('MAIL_SUBJECT_RESET'), $link);
 		}
@@ -36,7 +36,7 @@ 
 
 		public static function register(Entitizer\Entity\User $user) {
 
-			$link = (Settings::get('system_url') . (Auth::admin() ? '/admin' : '/profile'));
+			$link = (Settings::get('system_url').(Auth::admin() ? '/admin' : '/profile'));
 
 			return self::send($user, 'Register', Language::get('MAIL_SUBJECT_REGISTER'), $link);
 		}

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/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();