cadmium-org / cadmium-cms

www/engine/System/Main.php

Braces +3 added lines, -1 removed lines

@@ -31,4 +31,6 @@
 
 # Set error reporting
 
-if (DEBUG_MODE) error_reporting(E_ALL);
+if (DEBUG_MODE) {
+	error_reporting(E_ALL);
+}

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

Braces +9 added lines, -3 removed lines

@@ -32,9 +32,13 @@ 
 
 				$param = static::$param[$this->loader->section()]; $name = Request::post('name');
 
-				if (false === Settings::set($param, $name)) return $ajax->setError(Language::get(static::$error_activate));
+				if (false === Settings::set($param, $name)) {
+					return $ajax->setError(Language::get(static::$error_activate));
+				}
 
-				if (false === Settings::save()) return $ajax->setError(Language::get(static::$error_save));
+				if (false === Settings::save()) {
+					return $ajax->setError(Language::get(static::$error_save));
+				}
 
 			} else if (Request::post('action') === 'list') {
 
@@ -52,7 +56,9 @@ 
 
 			$this->loader = new static::$loader_class(Request::get('list'));
 
-			if (Request::isAjax()) return $this->handleAjax();
+			if (Request::isAjax()) {
+				return $this->handleAjax();
+			}
 
 			# ------------------------
 

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

Braces +28 added lines, -8 removed lines

@@ -55,7 +55,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
 
@@ -69,7 +73,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)),
 
@@ -78,10 +83,13 @@ 
 				'contents' => Template::createBlock(Language::get('INSTALL_PAGE_DEMO_CONTENTS'))->getContents(),
 
 				'time_created' => REQUEST_TIME, 'time_modified' => REQUEST_TIME];
+			}
 
 			# Process insertion
 
-			if (!(DB::insert(TABLE_PAGES, $pages, true) && DB::getLast()->status)) return false;
+			if (!(DB::insert(TABLE_PAGES, $pages, true) && DB::getLast()->status)) {
+				return false;
+			}
 
 			self::fillRelationsTable(TABLE_PAGES_RELATIONS, 4);
 
@@ -98,21 +106,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::getLast()->status)) return false;
+			if (!(DB::insert(TABLE_MENU, $menu, true) && DB::getLast()->status)) {
+				return false;
+			}
 
 			self::fillRelationsTable(TABLE_MENU_RELATIONS, 3);
 
@@ -127,7 +143,9 @@ 
 
 			$definitions = self::getDefinitions(false);
 
-			foreach ($definitions as $definition) if (!$definition->createTables()) return false;
+			foreach ($definitions as $definition) {
+				if (!$definition->createTables()) return false;
+			}
 
 			# ------------------------
 
@@ -140,7 +158,9 @@ 
 
 			$definitions = self::getDefinitions(true);
 
-			foreach ($definitions as $definition) if (!$definition->removeTables()) return false;
+			foreach ($definitions as $definition) {
+				if (!$definition->removeTables()) return false;
+			}
 
 			# ------------------------
 

www/engine/System/Classes/Modules/Install/Controller/Database.php

Braces +10 added lines, -10 removed lines

@@ -20,21 +20,19 @@ 
 
 			# Connect to DB
 
-			try { DB::connect($server, $user, $password, $name); }
-
-			catch (Exception\DBConnect $error) { return 'INSTALL_ERROR_DATABASE_CONNECT'; }
-
-			catch (Exception\DBSelect $error) { return 'INSTALL_ERROR_DATABASE_SELECT'; }
-
-			catch (Exception\DBCharset $error) { return 'INSTALL_ERROR_DATABASE_CHARSET'; }
+			try { DB::connect($server, $user, $password, $name); } catch (Exception\DBConnect $error) { return 'INSTALL_ERROR_DATABASE_CONNECT'; } catch (Exception\DBSelect $error) { return 'INSTALL_ERROR_DATABASE_SELECT'; } catch (Exception\DBCharset $error) { return 'INSTALL_ERROR_DATABASE_CHARSET'; }
 
 			# Create tables
 
-			if (!Install\Utils\Tables::create()) return 'INSTALL_ERROR_DATABASE_TABLES_CREATE';
+			if (!Install\Utils\Tables::create()) {
+				return 'INSTALL_ERROR_DATABASE_TABLES_CREATE';
+			}
 
 			# Fill tables
 
-			if (!Install\Utils\Tables::fill()) return 'INSTALL_ERROR_DATABASE_TABLES_FILL';
+			if (!Install\Utils\Tables::fill()) {
+				return 'INSTALL_ERROR_DATABASE_TABLES_FILL';
+			}
 
 			# Save system file
 
@@ -47,7 +45,9 @@ 
 
 			$system['time'] = REQUEST_TIME;
 
-			if (!Schema::get('System')->save($system)) return 'INSTALL_ERROR_SYSTEM';
+			if (!Schema::get('System')->save($system)) {
+				return 'INSTALL_ERROR_SYSTEM';
+			}
 
 			# ------------------------
 

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

Braces +6 added lines, -2 removed lines

@@ -10,14 +10,18 @@
 
 		private function getSystemUrl() {
 
-			if (!empty($_SERVER['HTTP_HOST'])) return ((Request::isSecure() ? 'https://' : 'http://') . $_SERVER['HTTP_HOST']);
+			if (!empty($_SERVER['HTTP_HOST'])) {
+				return ((Request::isSecure() ? 'https://' : 'http://') . $_SERVER['HTTP_HOST']);
+			}
 		}
 
 		# Get system email
 
 		private function getSystemEmail() {
 
-			if (!empty($_SERVER['HTTP_HOST'])) return ('admin@' . $_SERVER['HTTP_HOST']);
+			if (!empty($_SERVER['HTTP_HOST'])) {
+				return ('admin@' . $_SERVER['HTTP_HOST']);
+			}
 		}
 
 		# Constructor

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

Braces +6 added lines, -2 removed lines

@@ -21,12 +21,16 @@
 
 			foreach (Settings::setArray($post) as $name => $result) {
 
-				if (!$result) return (isset($errors[$name]) ? [$name, $errors[$name]] : false);
+				if (!$result) {
+					return (isset($errors[$name]) ? [$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/Filemanager/Utils/Handler.php

Braces +9 added lines, -3 removed lines

@@ -56,7 +56,9 @@ 
 
 			if (Request::post('action') === 'remove') {
 
-				if (!$this->entity->remove()) return $ajax->setError(Language::get(static::$message_error_remove));
+				if (!$this->entity->remove()) {
+					return $ajax->setError(Language::get(static::$message_error_remove));
+				}
 			}
 
 			# ------------------------
@@ -78,7 +80,9 @@ 
 
 			# Handle ajax request
 
-			if (Request::isAjax()) return $this->handleAjax();
+			if (Request::isAjax()) {
+				return $this->handleAjax();
+			}
 
 			# Init entity
 
@@ -104,7 +108,9 @@ 
 
 			# Display success message
 
-			if (false !== Request::get('submitted')) Popup::set('positive', Language::get(static::$message_success_rename));
+			if (false !== Request::get('submitted')) {
+				Popup::set('positive', Language::get(static::$message_success_rename));
+			}
 
 			# ------------------------
 

www/engine/System/Classes/Modules/Filemanager/Controller/Create.php

Braces +9 added lines, -3 removed lines

@@ -29,19 +29,25 @@
 
 			# Validate name
 
-			if (false === ($name = Validate::fileName($name))) return ['name', 'FILEMANAGER_ERROR_NAME_INVALID'];
+			if (false === ($name = Validate::fileName($name))) {
+				return ['name', 'FILEMANAGER_ERROR_NAME_INVALID'];
+			}
 
 			# Check if item exists
 
-			if (@file_exists($this->parent->pathFull() . $name)) return ['name', 'FILEMANAGER_ERROR_EXISTS'];
+			if (@file_exists($this->parent->pathFull() . $name)) {
+				return ['name', 'FILEMANAGER_ERROR_EXISTS'];
+			}
 
 			# Create item
 
 			$entity = Filemanager::get($type, $this->parent);
 
-			if (!$entity->create($name)) return (($entity->type() === FILEMANAGER_TYPE_DIR) ?
+			if (!$entity->create($name)) {
+				return (($entity->type() === FILEMANAGER_TYPE_DIR) ?
 
 				'FILEMANAGER_ERROR_DIR_CREATE' : 'FILEMANAGER_ERROR_FILE_CREATE');
+			}
 
 			# ------------------------
 

www/engine/System/Classes/Modules/Filemanager/Controller/Rename.php

Braces +9 added lines, -3 removed lines

@@ -29,19 +29,25 @@
 
 			# Validate name
 
-			if (false === ($name = Validate::fileName($name))) return ['name', 'FILEMANAGER_ERROR_NAME_INVALID'];
+			if (false === ($name = Validate::fileName($name))) {
+				return ['name', 'FILEMANAGER_ERROR_NAME_INVALID'];
+			}
 
 			# Check if item exists
 
 			if ((0 !== strcasecmp($this->entity->name(), $name)) &&
 
-				@file_exists($this->entity->parent()->pathFull() . $name)) return ['name', 'FILEMANAGER_ERROR_EXISTS'];
+				@file_exists($this->entity->parent()->pathFull() . $name)) {
+				return ['name', 'FILEMANAGER_ERROR_EXISTS'];
+			}
 
 			# Rename item
 
-			if (!$this->entity->rename($name)) return (($this->entity->type() === FILEMANAGER_TYPE_DIR) ?
+			if (!$this->entity->rename($name)) {
+				return (($this->entity->type() === FILEMANAGER_TYPE_DIR) ?
 
 				'FILEMANAGER_ERROR_DIR_RENAME' : 'FILEMANAGER_ERROR_FILE_RENAME');
+			}
 
 			# ------------------------