cadmium-org / cadmium-cms

www/engine/System/Classes/Modules/Install/Utils/Tables.php

Braces +21 added lines, -7 removed lines

@@ -12,9 +12,13 @@ 
 
 			# Count pages
 
-			if (!(DB::select(TABLE_PAGES, 'COUNT(id) as count') && (DB::last()->rows === 1))) return false;
+			if (!(DB::select(TABLE_PAGES, 'COUNT(id) as count') && (DB::last()->rows === 1))) {
+				return false;
+			}
 
-			if (intval(DB::last()->row()['count']) > 0) return true;
+			if (intval(DB::last()->row()['count']) > 0) {
+				return true;
+			}
 
 			# Insert initial pages
 
@@ -30,7 +34,8 @@ 
 
 				'time_created' => REQUEST_TIME, 'time_modified' => REQUEST_TIME];
 
-			for ($i = 1; $i <= 3; $i++) $pages[] = ['visibility' => VISIBILITY_PUBLISHED,
+			for ($i = 1; $i <= 3; $i++) {
+				$pages[] = ['visibility' => VISIBILITY_PUBLISHED,
 
 				'hash' => Arr::encode([('page-' . $i), 0]),
 
@@ -39,6 +44,7 @@ 
 				'contents' => Template::block(Language::get('INSTALL_PAGE_DEMO_CONTENTS'))->contents(),
 
 				'time_created' => REQUEST_TIME, 'time_modified' => REQUEST_TIME];
+			}
 
 			# ------------------------
 
@@ -51,19 +57,25 @@ 
 
 			# Count menuitems
 
-			if (!(DB::select(TABLE_MENU, 'COUNT(id) as count') && (DB::last()->rows === 1))) return false;
+			if (!(DB::select(TABLE_MENU, 'COUNT(id) as count') && (DB::last()->rows === 1))) {
+				return false;
+			}
 
-			if (intval(DB::last()->row()['count']) > 0) return true;
+			if (intval(DB::last()->row()['count']) > 0) {
+				return true;
+			}
 
 			# Insert initial menuitems
 
 			$menu = [];
 
-			for ($i = 1; $i <= 3; $i++) $menu[] = [
+			for ($i = 1; $i <= 3; $i++) {
+				$menu[] = [
 
 				'position' => ($i - 1), 'slug' => ('page-' . $i),
 
 				'text' => (Language::get('INSTALL_PAGE_DEMO_TITLE') . ' ' . $i)];
+			}
 
 			# ------------------------
 
@@ -90,7 +102,9 @@ 
 
 			$definitions[] = Entitizer\Definition::get(ENTITY_TYPE_USER_SESSION);
 
-			foreach ($definitions as $definition) if (!$definition->createTable()) return false;
+			foreach ($definitions as $definition) {
+				if (!$definition->createTable()) return false;
+			}
 
 			# ------------------------
 

www/engine/System/Classes/Modules/Settings/Controller/General.php

Braces +9 added lines, -3 removed lines

@@ -12,7 +12,9 @@ 
 
 			# Check for demo mode
 
-			if (Informer::isDemoMode()) return 'DEMO_MODE_RESTRICTION';
+			if (Informer::isDemoMode()) {
+				return 'DEMO_MODE_RESTRICTION';
+			}
 
 			# Define errors list
 
@@ -25,12 +27,16 @@ 
 
 			foreach ($post as $name => $value) {
 
-				if (!Settings::set($name, $value)) return (isset($errors[$name]) ? $errors[$name] : false);
+				if (!Settings::set($name, $value)) {
+					return (isset($errors[$name]) ? $errors[$name] : false);
+				}
 			}
 
 			# Save settings
 
-			if (!Settings::save()) return 'SETTINGS_ERROR_SAVE';
+			if (!Settings::save()) {
+				return 'SETTINGS_ERROR_SAVE';
+			}
 
 			# ------------------------
 

www/engine/System/Classes/Modules/Settings/Handler/General.php

Braces +3 added lines, -1 removed lines

@@ -40,7 +40,9 @@
 
 			# Display success message
 
-			if (false !== Request::get('submitted')) Messages::success(Language::get('SETTINGS_SUCCESS'));
+			if (false !== Request::get('submitted')) {
+				Messages::success(Language::get('SETTINGS_SUCCESS'));
+			}
 
 			# ------------------------
 

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

Braces +36 added lines, -12 removed lines

@@ -41,7 +41,9 @@ 
 
 			self::$loaded = (false !== ($settings = Explorer::json($settings_file)));
 
-			if (self::$loaded) foreach ($settings as $name => $value) self::set($name, $value);
+			if (self::$loaded) {
+				foreach ($settings as $name => $value) self::set($name, $value);
+			}
 
 			# ------------------------
 
@@ -54,9 +56,13 @@ 
 
 			$settings_file = (DIR_SYSTEM_DATA . 'Settings.json');
 
-			if (false === ($settings = json_encode(self::$settings, JSON_PRETTY_PRINT))) return false;
+			if (false === ($settings = json_encode(self::$settings, JSON_PRETTY_PRINT))) {
+				return false;
+			}
 
-			if (false === Explorer::save($settings_file, $settings, true)) return false;
+			if (false === Explorer::save($settings_file, $settings, true)) {
+				return false;
+			}
 
 			# ------------------------
 
@@ -74,34 +80,44 @@ 
 
 		public static function set(string $name, $value) {
 
-			if (!isset(self::$settings[$name])) return false;
+			if (!isset(self::$settings[$name])) {
+				return false;
+			}
 
 			# Validate language
 
 			if (($name === 'admin_language') || ($name === 'site_language')) {
 
-				if (false === ($value = Extend\Languages::validate($value))) return false;
+				if (false === ($value = Extend\Languages::validate($value))) {
+					return false;
+				}
 			}
 
 			# Validate template
 
 			else if (($name === 'admin_template') || ($name === 'site_template')) {
 
-				if (false === ($value = Extend\Templates::validate($value))) return false;
+				if (false === ($value = Extend\Templates::validate($value))) {
+					return false;
+				}
 			}
 
 			# Validate site title
 
 			else if ($name === 'site_title') {
 
-				if ('' === ($value = (function(string $value) { return $value; })($value))) return false;
+				if ('' === ($value = (function(string $value) { return $value; })($value))) {
+					return false;
+				}
 			}
 
 			# Validate site status
 
 			else if ($name === 'site_status') {
 
-				if (false === ($value = Lister\Status::validate($value))) return false;
+				if (false === ($value = Lister\Status::validate($value))) {
+					return false;
+				}
 			}
 
 			# Validate site slogan/description/keywords
@@ -115,21 +131,27 @@ 
 
 			else if ($name === 'system_url') {
 
-				if (false === ($value = Validate::url($value))) return false;
+				if (false === ($value = Validate::url($value))) {
+					return false;
+				}
 			}
 
 			# Validate system email
 
 			else if ($name === 'system_email') {
 
-				if (false === ($value = Validate::email($value))) return false;
+				if (false === ($value = Validate::email($value))) {
+					return false;
+				}
 			}
 
 			# Validate system timezone
 
 			else if ($name === 'system_timezone') {
 
-				if (false === ($value = Timezone::validate($value))) return false;
+				if (false === ($value = Timezone::validate($value))) {
+					return false;
+				}
 			}
 
 			# Validate users registration
@@ -152,7 +174,9 @@ 
 
 		public static function get(string $name = null) {
 
-			if (null === $name) return self::$settings;
+			if (null === $name) {
+				return self::$settings;
+			}
 
 			return (isset(self::$settings[$name]) ? self::$settings[$name] : null);
 		}

www/engine/System/Classes/Modules/Profile/Controller/Personal.php

Braces +12 added lines, -4 removed lines

@@ -20,13 +20,19 @@ 
 
 			# Validate values
 
-			if (false === ($email = Validate::email($email))) return 'USER_ERROR_EMAIL_INVALID';
+			if (false === ($email = Validate::email($email))) {
+				return 'USER_ERROR_EMAIL_INVALID';
+			}
 
 			# Check email exists
 
-			if (false === ($check_email = Auth::user()->check('email', $email))) return 'USER_ERROR_EDIT_PERSONAL';
+			if (false === ($check_email = Auth::user()->check('email', $email))) {
+				return 'USER_ERROR_EDIT_PERSONAL';
+			}
 
-			if ($check_email === 1) return 'USER_ERROR_EMAIL_DUPLICATE';
+			if ($check_email === 1) {
+				return 'USER_ERROR_EMAIL_DUPLICATE';
+			}
 
 			# Update user
 
@@ -40,7 +46,9 @@ 
 			$data['country']            = $country;
 			$data['timezone']           = $timezone;
 
-			if (!Auth::user()->edit($data)) return 'USER_ERROR_EDIT_PERSONAL';
+			if (!Auth::user()->edit($data)) {
+				return 'USER_ERROR_EDIT_PERSONAL';
+			}
 
 			# ------------------------
 

www/engine/System/Classes/Modules/Profile/Controller/Password.php

Braces +15 added lines, -5 removed lines

@@ -20,17 +20,25 @@ 
 
 			# Validate values
 
-			if (false === ($password = Auth\Validate::userPassword($password))) return 'USER_ERROR_PASSWORD_INVALID';
+			if (false === ($password = Auth\Validate::userPassword($password))) {
+				return 'USER_ERROR_PASSWORD_INVALID';
+			}
 
-			if (false === ($password_new = Auth\Validate::userPassword($password_new))) return 'USER_ERROR_PASSWORD_NEW_INVALID';
+			if (false === ($password_new = Auth\Validate::userPassword($password_new))) {
+				return 'USER_ERROR_PASSWORD_NEW_INVALID';
+			}
 
-			if (0 !== strcmp($password_new, $password_retype)) return 'USER_ERROR_PASSWORD_MISMATCH';
+			if (0 !== strcmp($password_new, $password_retype)) {
+				return 'USER_ERROR_PASSWORD_MISMATCH';
+			}
 
 			# Check password
 
 			$password = Str::encode(Auth::user()->auth_key, $password);
 
-			if (0 !== strcmp(Auth::user()->password, $password)) return 'USER_ERROR_PASSWORD_INCORRECT';
+			if (0 !== strcmp(Auth::user()->password, $password)) {
+				return 'USER_ERROR_PASSWORD_INCORRECT';
+			}
 
 			# Encode password
 
@@ -43,7 +51,9 @@ 
 			$data['auth_key']           = $auth_key;
 			$data['password']           = $password;
 
-			if (!Auth::user()->edit($data)) return 'USER_ERROR_EDIT_PASSWORD';
+			if (!Auth::user()->edit($data)) {
+				return 'USER_ERROR_EDIT_PASSWORD';
+			}
 
 			# ------------------------
 

www/engine/System/Classes/Modules/Profile/Handler/Overview.php

Braces +8 added lines, -4 removed lines

@@ -30,14 +30,18 @@
 
 			foreach (['full_name', 'city'] as $name) {
 
-				if ('' === ($text = Auth::user()->$name)) $contents->block($name)->disable();
-
-				else $contents->block($name)->text = $text;
+				if ('' === ($text = Auth::user()->$name)) {
+					$contents->block($name)->disable();
+				} else {
+					$contents->block($name)->text = $text;
+				}
 			}
 
 			# Set country
 
-			if ('' === ($country = Auth::user()->country)) $contents->block('country')->disable(); else {
+			if ('' === ($country = Auth::user()->country)) {
+				$contents->block('country')->disable();
+			} else {
 
 				$contents->block('country')->code = $country;
 

www/engine/System/Classes/Modules/Profile/Handler/Edit.php

Braces +3 added lines, -1 removed lines

@@ -50,7 +50,9 @@
 
 			# Display success message
 
-			if (false !== Request::get('submitted')) Messages::success(Language::get('USER_SUCCESS_EDIT'));
+			if (false !== Request::get('submitted')) {
+				Messages::success(Language::get('USER_SUCCESS_EDIT'));
+			}
 
 			# ------------------------
 

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

Braces +24 added lines, -8 removed lines

@@ -10,7 +10,9 @@ 
 
 		public function __invoke(array $post) {
 
-			if (Auth::check()) return true;
+			if (Auth::check()) {
+				return true;
+			}
 
 			# Declare variables
 
@@ -22,9 +24,13 @@ 
 
 			# Validate values
 
-			if (false === ($name = Auth\Validate::userName($name))) return 'USER_ERROR_NAME_INVALID';
+			if (false === ($name = Auth\Validate::userName($name))) {
+				return 'USER_ERROR_NAME_INVALID';
+			}
 
-			if (false === ($password = Auth\Validate::userPassword($password))) return 'USER_ERROR_PASSWORD_INVALID';
+			if (false === ($password = Auth\Validate::userPassword($password))) {
+				return 'USER_ERROR_PASSWORD_INVALID';
+			}
 
 			# Create user object
 
@@ -32,19 +38,27 @@ 
 
 			# Init user
 
-			if (!$user->init($name, 'name')) return 'USER_ERROR_NAME_INCORRECT';
+			if (!$user->init($name, 'name')) {
+				return 'USER_ERROR_NAME_INCORRECT';
+			}
 
-			if (Auth::admin() && ($user->rank < RANK_ADMINISTRATOR)) return 'USER_ERROR_NAME_INCORRECT';
+			if (Auth::admin() && ($user->rank < RANK_ADMINISTRATOR)) {
+				return 'USER_ERROR_NAME_INCORRECT';
+			}
 
 			# Check password
 
 			$password = Str::encode($user->auth_key, $password);
 
-			if (0 !== strcmp($user->password, $password)) return 'USER_ERROR_PASSWORD_INCORRECT';
+			if (0 !== strcmp($user->password, $password)) {
+				return 'USER_ERROR_PASSWORD_INCORRECT';
+			}
 
 			# Check access
 
-			if (!Auth::admin() && ($user->rank === RANK_GUEST)) return 'USER_ERROR_ACCESS';
+			if (!Auth::admin() && ($user->rank === RANK_GUEST)) {
+				return 'USER_ERROR_ACCESS';
+			}
 
 			# Create session
 
@@ -54,7 +68,9 @@ 
 
 			$data = ['id' => $user->id, 'code' => $code, 'ip' => $ip, 'time' => $time];
 
-			if (!$session->create($data)) return 'USER_ERROR_AUTH_LOGIN';
+			if (!$session->create($data)) {
+				return 'USER_ERROR_AUTH_LOGIN';
+			}
 
 			# Set session variable