cadmium-org / cadmium-cms

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

Braces +37 added lines, -15 removed lines

@@ -45,7 +45,9 @@ 
 
 		private function processSelector(Template\Block $selector) {
 
-			if ($this->create) return $selector->disable();
+			if ($this->create) {
+				return $selector->disable();
+			}
 
 			$selector->parent_id = $this->entity->parent_id;
 
@@ -68,25 +70,33 @@ 
 
 			# Set path / title
 
-			if (static::$nesting) $contents->path = $this->path;
-
-			else $contents->title = ($this->create ? Language::get(static::$naming_new) : $this->entity->get(static::$naming));
+			if (static::$nesting) {
+				$contents->path = $this->path;
+			} else {
+				$contents->title = ($this->create ? Language::get(static::$naming_new) : $this->entity->get(static::$naming));
+			}
 
 			# Process parent block
 
-			if (static::$nesting) $this->processParent($contents->getBlock('parent'));
+			if (static::$nesting) {
+				$this->processParent($contents->getBlock('parent'));
+			}
 
 			# Set link
 
 			$link = (INSTALL_PATH . static::$link . '/');
 
-			if (static::$nesting) $contents->link = ($link . ($this->create ? 'create' : 'edit') . '?id=' . $this->parent->id);
-
-			else $contents->link = ($link . ($this->create ? 'create' : ('edit?id=' . $this->entity->id)));
+			if (static::$nesting) {
+				$contents->link = ($link . ($this->create ? 'create' : 'edit') . '?id=' . $this->parent->id);
+			} else {
+				$contents->link = ($link . ($this->create ? 'create' : ('edit?id=' . $this->entity->id)));
+			}
 
 			# Process selector block
 
-			if (static::$nesting) $this->processSelector($contents->getBlock('selector'));
+			if (static::$nesting) {
+				$this->processSelector($contents->getBlock('selector'));
+			}
 
 			# Implement form
 
@@ -119,11 +129,15 @@ 
 
 				$parent_id = Number::forceInt(Request::post('parent_id'));
 
-				if (!$this->entity->move($parent_id)) return $ajax->setError(Language::get(static::$message_error_move));
+				if (!$this->entity->move($parent_id)) {
+					return $ajax->setError(Language::get(static::$message_error_move));
+				}
 
 			} else 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));
+				}
 			}
 
 			# ------------------------
@@ -135,7 +149,9 @@ 
 
 		protected function handle() {
 
-			if (!$this->create && Request::isAjax()) return $this->handleAjax();
+			if (!$this->create && Request::isAjax()) {
+				return $this->handleAjax();
+			}
 
 			# Create entity
 
@@ -143,7 +159,9 @@ 
 
 			$this->entity = Entitizer::get(static::$table, (!$this->create ? $id : 0));
 
-			if (!$this->create && (0 === $this->entity->id)) return Request::redirect(INSTALL_PATH . static::$link);
+			if (!$this->create && (0 === $this->entity->id)) {
+				return Request::redirect(INSTALL_PATH . static::$link);
+			}
 
 			# Create parent entity
 
@@ -151,7 +169,9 @@ 
 
 			# Get path
 
-			if (false !== ($path = $this->parent->path())) $this->path = $path;
+			if (false !== ($path = $this->parent->path())) {
+				$this->path = $path;
+			}
 
 			# Create form
 
@@ -161,7 +181,9 @@ 
 
 			if ($this->form->handle(new static::$controller($this->entity), true)) {
 
-				if ($this->create && (0 !== $this->parent->id)) $this->entity->move($this->parent->id);
+				if ($this->create && (0 !== $this->parent->id)) {
+					$this->entity->move($this->parent->id);
+				}
 
 				Request::redirect(INSTALL_PATH . static::$link . '/edit?id=' . $this->entity->id . '&submitted');
 			}

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/Utils/Listview.php

Braces +24 added lines, -8 removed lines

@@ -68,9 +68,13 @@ 
 
 		private function select(int $parent_id = null, array $config = [], array $order_by = [], int $index = 0, int $display = 0) {
 
-			if (!((null === $parent_id) || ($parent_id >= 0))) return false;
+			if (!((null === $parent_id) || ($parent_id >= 0))) {
+				return false;
+			}
 
-			if (!(($index >= 0) && ($display >= 0))) return false;
+			if (!(($index >= 0) && ($display >= 0))) {
+				return false;
+			}
 
 			# Select entities
 
@@ -78,7 +82,9 @@ 
 
 				$this->getNestingSelectQuery($parent_id, $config, $order_by, $index, $display));
 
-			if (!(DB::send($query) && DB::getLast()->status)) return false;
+			if (!(DB::send($query) && DB::getLast()->status)) {
+				return false;
+			}
 
 			# Process results
 
@@ -90,7 +96,9 @@ 
 
 				$items['list'][$dataset->id]['dataset'] = $dataset;
 
-				if (null !== $parent_id) $items['list'][$dataset->id]['children'] = intval($data['children']);
+				if (null !== $parent_id) {
+					$items['list'][$dataset->id]['children'] = intval($data['children']);
+				}
 			}
 
 			# Count total
@@ -109,7 +117,9 @@ 
 
 		private function count(int $parent_id = null, array $config = []) {
 
-			if (!((null === $parent_id) || ($parent_id >= 0))) return false;
+			if (!((null === $parent_id) || ($parent_id >= 0))) {
+				return false;
+			}
 
 			# Count entities
 
@@ -117,7 +127,9 @@ 
 
 				$this->getNestingCountQuery($parent_id, $config));
 
-			if (!(DB::send($query) && DB::getLast()->status)) return false;
+			if (!(DB::send($query) && DB::getLast()->status)) {
+				return false;
+			}
 
 			# ------------------------
 
@@ -142,7 +154,9 @@ 
 
 		public function children(int $parent_id = 0, array $config = [], array $order_by = [], int $index = 0, int $display = 0) {
 
-			if (!static::$nesting) return false;
+			if (!static::$nesting) {
+				return false;
+			}
 
 			return $this->select($parent_id, $config, $order_by, $index, $display);
 		}
@@ -151,7 +165,9 @@ 
 
 		public function childrenCount(int $parent_id = 0, array $config = []) {
 
-			if (!static::$nesting) return false;
+			if (!static::$nesting) {
+				return false;
+			}
 
 			return $this->count($parent_id, $config);
 		}

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

www/engine/System/Classes/Modules/Entitizer/Lister/Pages.php

Braces +3 added lines, -3 removed lines

@@ -30,9 +30,9 @@
 
 		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 item additional data

www/engine/System/Classes/Modules/Entitizer/Lister/Users.php

Braces +3 added lines, -1 removed lines

@@ -40,7 +40,9 @@
 
 			# Set remove button
 
-			if ($user->id === Auth::user()->id) $view->getBlock('remove')->class = 'disabled';
+			if ($user->id === Auth::user()->id) {
+				$view->getBlock('remove')->class = 'disabled';
+			}
 		}
 	}
 }

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
 
@@ -49,7 +47,9 @@ 
 
 			$system_file = (DIR_SYSTEM_DATA . 'System.json');
 
-			if (false === JSON::save($system_file, $system)) return 'INSTALL_ERROR_SYSTEM';
+			if (false === JSON::save($system_file, $system)) {
+				return 'INSTALL_ERROR_SYSTEM';
+			}
 
 			# ------------------------
 

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

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::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);
 
@@ -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::getLast()->status)) return false;
+			if (!(DB::insert(TABLE_MENU, $menu, true) && DB::getLast()->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/Modules/Tools/Handler/Sitemap.php

Spacing +1 added lines, -1 removed lines

@@ -44,7 +44,7 @@
 
 			# Load sitemap
 
-			$file_name = (DIR_SYSTEM_DATA . 'Sitemap.xml');
+			$file_name = (DIR_SYSTEM_DATA.'Sitemap.xml');
 
 			$modified = Explorer::getModified($file_name);
 

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::getLast()->rows === 1))) return 0;
+			if (!(DB::select(TABLE_PAGES, $selection) && (DB::getLast()->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::getLast()->status)) return;
+			if (!(DB::select(TABLE_PAGES, $selection, $condition, 'slug') && DB::getLast()->status)) {
+				return;
+			}
 
 			# ------------------------
 
-			while (null !== ($data = DB::getLast()->getRow())) yield Entitizer::dataset(TABLE_PAGES, $data);
+			while (null !== ($data = DB::getLast()->getRow())) {
+				yield Entitizer::dataset(TABLE_PAGES, $data);
+			}
 		}
 
 		# Handle request
@@ -50,7 +56,9 @@ 
 
 			if ((false !== $modified) && ($modified > $this->getLastModified())) {
 
-				if (false !== $sitemap->load($file_name)) return $sitemap;
+				if (false !== $sitemap->load($file_name)) {
+					return $sitemap;
+				}
 			}
 
 			# Fill sitemap