cadmium-org / cadmium-cms

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')) Popup::set('positive', Language::get('SETTINGS_SUCCESS'));
+			if (false !== Request::get('submitted')) {
+				Popup::set('positive', Language::get('SETTINGS_SUCCESS'));
+			}
 
 			# ------------------------
 

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

Braces +15 added lines, -8 removed lines

@@ -20,23 +20,28 @@ 
 
 			# Validate values
 
-			if (false === ($password = Validate::userPassword($password)))
-
+			if (false === ($password = Validate::userPassword($password))) {
+			
 				return ['password', 'USER_ERROR_PASSWORD_INVALID'];
+			}
 
-			if (false === ($password_new = Validate::userPassword($password_new)))
-
+			if (false === ($password_new = Validate::userPassword($password_new))) {
+			
 				return ['password_new', 'USER_ERROR_PASSWORD_NEW_INVALID'];
+			}
 
-			if (0 !== strcmp($password_new, $password_retype))
-
+			if (0 !== strcmp($password_new, $password_retype)) {
+			
 				return ['password_retype', 'USER_ERROR_PASSWORD_MISMATCH'];
+			}
 
 			# Check password
 
 			$password = Str::encode(Auth::user()->auth_key, $password);
 
-			if (0 !== strcmp(Auth::user()->password, $password)) return ['password', 'USER_ERROR_PASSWORD_INCORRECT'];
+			if (0 !== strcmp(Auth::user()->password, $password)) {
+				return ['password', 'USER_ERROR_PASSWORD_INCORRECT'];
+			}
 
 			# Encode password
 
@@ -49,7 +54,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/Controller/Personal.php

Braces +12 added lines, -4 removed lines

@@ -20,13 +20,19 @@ 
 
 			# Validate values
 
-			if (false === ($email = Validate::userEmail($email))) return ['email', 'USER_ERROR_EMAIL_INVALID'];
+			if (false === ($email = Validate::userEmail($email))) {
+				return ['email', '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 ['email', 'USER_ERROR_EMAIL_DUPLICATE'];
+			if ($check_email === 1) {
+				return ['email', '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/Handler/Edit.php

Braces +3 added lines, -1 removed lines

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

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

Spacing +4 added lines, -4 removed lines

@@ -46,9 +46,9 @@ 
 
 			for ($id = 2; $id <= 4; $id++) $pages[] = ['id' => $id, 'visibility' => VISIBILITY_PUBLISHED,
 
-				'locked' => false, 'slug' => ('page-' . ($id - 1)), 'name' => ('page-' . ($id - 1)),
+				'locked' => false, 'slug' => ('page-'.($id - 1)), 'name' => ('page-'.($id - 1)),
 
-				'title' => (Language::get('INSTALL_PAGE_DEMO_TITLE') . ' ' . ($id - 1)),
+				'title' => (Language::get('INSTALL_PAGE_DEMO_TITLE').' '.($id - 1)),
 
 				'contents' => Template::block(Language::get('INSTALL_PAGE_DEMO_CONTENTS'))->contents(),
 
@@ -81,9 +81,9 @@ 
 
 			for ($id = 1; $id <= 3; $id++) $menu[] = [
 
-				'id' => $id, 'active' => true, 'position' => ($id - 1), 'slug' => ('page-' . $id),
+				'id' => $id, 'active' => true, 'position' => ($id - 1), 'slug' => ('page-'.$id),
 
-				'text' => (Language::get('INSTALL_PAGE_DEMO_TITLE') . ' ' . $id)];
+				'text' => (Language::get('INSTALL_PAGE_DEMO_TITLE').' '.$id)];
 
 			# Process insertion
 

Braces +25 added lines, -7 removed lines

@@ -30,7 +30,11 @@ 
 
 			$count = Informer::countEntries(TABLE_PAGES, true);
 
-			if (false === $count) return false; else if ($count > 0) return true;
+			if (false === $count) {
+				return false;
+			} else if ($count > 0) {
+				return true;
+			}
 
 			# Process dataset
 
@@ -44,7 +48,8 @@ 
 
 				'time_created' => REQUEST_TIME, 'time_modified' => REQUEST_TIME]];
 
-			for ($id = 2; $id <= 4; $id++) $pages[] = ['id' => $id, 'visibility' => VISIBILITY_PUBLISHED,
+			for ($id = 2; $id <= 4; $id++) {
+				$pages[] = ['id' => $id, 'visibility' => VISIBILITY_PUBLISHED,
 
 				'locked' => false, 'slug' => ('page-' . ($id - 1)), 'name' => ('page-' . ($id - 1)),
 
@@ -53,10 +58,13 @@ 
 				'contents' => Template::block(Language::get('INSTALL_PAGE_DEMO_CONTENTS'))->contents(),
 
 				'time_created' => REQUEST_TIME, 'time_modified' => REQUEST_TIME];
+			}
 
 			# Process insertion
 
-			if (!(DB::insert(TABLE_PAGES, $pages, true) && DB::last()->status)) return false;
+			if (!(DB::insert(TABLE_PAGES, $pages, true) && DB::last()->status)) {
+				return false;
+			}
 
 			self::fillRelationsTable(TABLE_PAGES_RELATIONS, 4);
 
@@ -73,21 +81,29 @@ 
 
 			$count = Informer::countEntries(TABLE_MENU, true);
 
-			if (false === $count) return false; else if ($count > 0) return true;
+			if (false === $count) {
+				return false;
+			} else if ($count > 0) {
+				return true;
+			}
 
 			# Process dataset
 
 			$menu = [];
 
-			for ($id = 1; $id <= 3; $id++) $menu[] = [
+			for ($id = 1; $id <= 3; $id++) {
+				$menu[] = [
 
 				'id' => $id, 'active' => true, 'position' => ($id - 1), 'slug' => ('page-' . $id),
 
 				'text' => (Language::get('INSTALL_PAGE_DEMO_TITLE') . ' ' . $id)];
+			}
 
 			# Process insertion
 
-			if (!(DB::insert(TABLE_MENU, $menu, true) && DB::last()->status)) return false;
+			if (!(DB::insert(TABLE_MENU, $menu, true) && DB::last()->status)) {
+				return false;
+			}
 
 			self::fillRelationsTable(TABLE_MENU_RELATIONS, 3);
 
@@ -116,7 +132,9 @@ 
 
 			$definitions[] = Entitizer::definition(TABLE_USERS_SESSIONS);
 
-			foreach ($definitions as $definition) if (!$definition->createTable()) return false;
+			foreach ($definitions as $definition) {
+				if (!$definition->createTable()) return false;
+			}
 
 			# ------------------------
 

www/engine/System/Classes/Handlers/Site/Page.php

Braces +21 added lines, -7 removed lines

@@ -16,9 +16,11 @@ 
 
 			# Set breadcrumbs
 
-			if (count($this->path) <= 1) $contents->block('breadcrumbs')->disable();
-
-			else $contents->block('breadcrumbs')->path = $this->path;
+			if (count($this->path) <= 1) {
+				$contents->block('breadcrumbs')->disable();
+			} else {
+				$contents->block('breadcrumbs')->path = $this->path;
+			}
 
 			# Set contents
 
@@ -41,19 +43,31 @@ 
 
 			$slug = implode('/', $this->url->path());
 
-			if ('' !== $slug) $this->page->initBySlug($slug); else $this->page->init(1);
+			if ('' !== $slug) {
+				$this->page->initBySlug($slug);
+			} else {
+				$this->page->init(1);
+			}
 
 			# Display error if not found
 
-			if (0 === $this->page->id) return false;
+			if (0 === $this->page->id) {
+				return false;
+			}
 
 			# Get path
 
-			if (false !== ($path = $this->page->path())) $this->path = $path;
+			if (false !== ($path = $this->page->path())) {
+				$this->path = $path;
+			}
 
 			# Set data
 
-			if ($this->page->id !== 1) $this->title = $this->page->title; else $this->layout = 'Index';
+			if ($this->page->id !== 1) {
+				$this->title = $this->page->title;
+			} else {
+				$this->layout = 'Index';
+			}
 
 			$this->description      = $this->page->description;
 			$this->keywords         = $this->page->keywords;

www/engine/System/Classes/Handlers/Tools/Sitemap.php

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::last()->rows === 1))) return 0;
+			if (!(DB::select(TABLE_PAGES, $selection) && (DB::last()->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::last()->status)) return;
+			if (!(DB::select(TABLE_PAGES, $selection, $condition, 'slug') && DB::last()->status)) {
+				return;
+			}
 
 			# ------------------------
 
-			while (null !== ($page = DB::last()->row())) yield Entitizer::create(TABLE_PAGES, $page);
+			while (null !== ($page = DB::last()->row())) {
+				yield Entitizer::create(TABLE_PAGES, $page);
+			}
 		}
 
 		# Handle request
@@ -44,7 +50,9 @@ 
 
 			# Get last modification time
 
-			if ($sitemap->load($this->getLastModified())) return $sitemap;
+			if ($sitemap->load($this->getLastModified())) {
+				return $sitemap;
+			}
 
 			# Fill sitemap
 

www/engine/System/Classes/Modules/Entitizer/Form/Menuitem.php

Unused Use Statements +3 added lines, -1 removed lines

@@ -2,7 +2,9 @@
 
 namespace Modules\Entitizer\Form {
 
-	use Modules\Entitizer, Utils\Form, Utils\Range;
+	use Modules\Entitizer;
+	use Utils\Form;
+	use Utils\Range;
 
 	class Page extends Form {
 

www/engine/System/Classes/Modules/Entitizer/View/Widgets.php

Spacing +1 added lines, -1 removed lines

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