cadmium-org / cadmium-cms

www/engine/System/Classes/Modules/Entitizer/Controller/Variable.php

Braces +15 added lines, -5 removed lines

@@ -29,17 +29,25 @@ 
 
 			# Validate name
 
-			if (false === ($name = Validate::templateComponentName($name))) return ['name', 'VARIABLE_ERROR_NAME_INVALID'];
+			if (false === ($name = Validate::templateComponentName($name))) {
+				return ['name', 'VARIABLE_ERROR_NAME_INVALID'];
+			}
 
 			# Check name reserved
 
-			if (false !== Template::getGlobal($name)) return ['name', 'VARIABLE_ERROR_NAME_RESERVED'];
+			if (false !== Template::getGlobal($name)) {
+				return ['name', 'VARIABLE_ERROR_NAME_RESERVED'];
+			}
 
 			# Check name exists
 
-			if (false === ($check_name = $this->variable->check($name, 'name'))) return 'VARIABLE_ERROR_MODIFY';
+			if (false === ($check_name = $this->variable->check($name, 'name'))) {
+				return 'VARIABLE_ERROR_MODIFY';
+			}
 
-			if ($check_name === 1) return ['name', 'VARIABLE_ERROR_NAME_DUPLICATE'];
+			if ($check_name === 1) {
+				return ['name', 'VARIABLE_ERROR_NAME_DUPLICATE'];
+			}
 
 			# Modify variable
 
@@ -51,7 +59,9 @@ 
 
 			$modifier = ((0 === $this->variable->id) ? 'create' : 'edit');
 
-			if (!$this->variable->$modifier($data)) return 'VARIABLE_ERROR_MODIFY';
+			if (!$this->variable->$modifier($data)) {
+				return 'VARIABLE_ERROR_MODIFY';
+			}
 
 			# ------------------------
 

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(bool $ajax = false) {
 
-			if (!$this->create && $ajax) return $this->handleAjax();
+			if (!$this->create && $ajax) {
+				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/Lister.php

Braces +36 added lines, -16 removed lines

@@ -20,15 +20,15 @@ 
 
 			# Set create button
 
-			if (count($this->path) < CONFIG_ENTITIZER_MAX_DEPTH) $parent->getBlock('create')->id = $this->parent->id;
-
-			else { $parent->getBlock('create')->disable(); $parent->getBlock('create_disabled')->enable(); }
+			if (count($this->path) < CONFIG_ENTITIZER_MAX_DEPTH) {
+				$parent->getBlock('create')->id = $this->parent->id;
+			} else { $parent->getBlock('create')->disable(); $parent->getBlock('create_disabled')->enable(); }
 
 			# Set edit button
 
-			if (0 !== $this->parent->id) $parent->getBlock('edit')->id = $this->parent->id;
-
-			else { $parent->getBlock('edit')->disable(); $parent->getBlock('edit_disabled')->enable(); }
+			if (0 !== $this->parent->id) {
+				$parent->getBlock('edit')->id = $this->parent->id;
+			} else { $parent->getBlock('edit')->disable(); $parent->getBlock('edit_disabled')->enable(); }
 
 			# Add parent additional data
 
@@ -41,7 +41,9 @@ 
 
 			foreach ($this->items['list'] as $item) {
 
-				if ((null !== $this->entity) && ($item['dataset']->id === $this->entity->id)) continue;
+				if ((null !== $this->entity) && ($item['dataset']->id === $this->entity->id)) {
+					continue;
+				}
 
 				$items->addItem($view = View::get(!$ajax ? static::$view_item : static::$view_ajax_item));
 
@@ -104,11 +106,15 @@ 
 
 			# Set path
 
-			if (static::$nesting) $contents->path = $this->path;
+			if (static::$nesting) {
+				$contents->path = $this->path;
+			}
 
 			# Process parent block
 
-			if (static::$nesting && !$ajax) $this->processParent($contents->getBlock('parent'));
+			if (static::$nesting && !$ajax) {
+				$this->processParent($contents->getBlock('parent'));
+			}
 
 			# Process items block
 
@@ -116,7 +122,9 @@ 
 
 			# Set pagination
 
-			if (!$ajax) $contents->pagination = $this->getPaginationBlock();
+			if (!$ajax) {
+				$contents->pagination = $this->getPaginationBlock();
+			}
 
 			# ------------------------
 
@@ -141,15 +149,21 @@ 
 
 			# Get path and depth
 
-			if (false !== ($path = $this->parent->path())) $this->path = $path;
+			if (false !== ($path = $this->parent->path())) {
+				$this->path = $path;
+			}
 
-			if ((0 !== $this->entity->id) && (false !== ($depth = $this->entity->subtreeDepth()))) $this->depth = $depth;
+			if ((0 !== $this->entity->id) && (false !== ($depth = $this->entity->subtreeDepth()))) {
+				$this->depth = $depth;
+			}
 
 			# Get items list
 
 			$lister = (static::$nesting ? 'children' : 'items');
 
-			if (false !== ($items = $this->parent->$lister())) $this->items = $items;
+			if (false !== ($items = $this->parent->$lister())) {
+				$this->items = $items;
+			}
 
 			# ------------------------
 
@@ -160,7 +174,9 @@ 
 
 		protected function handle(bool $ajax = false) {
 
-			if ($ajax) return $this->handleAjax();
+			if ($ajax) {
+				return $this->handleAjax();
+			}
 
 			$this->index = Number::forceInt(Request::get('index'), 1, 999999);
 
@@ -172,13 +188,17 @@ 
 
 			# Get path
 
-			if (false !== ($path = $this->parent->path())) $this->path = $path;
+			if (false !== ($path = $this->parent->path())) {
+				$this->path = $path;
+			}
 
 			# Get items list
 
 			$lister = (static::$nesting ? 'children' : 'items'); $display = Settings::get('admin_display_entities');
 
-			if (false !== ($items = $this->parent->$lister([], [], $this->index, $display))) $this->items = $items;
+			if (false !== ($items = $this->parent->$lister([], [], $this->index, $display))) {
+				$this->items = $items;
+			}
 
 			# ------------------------
 

www/engine/System/Classes/Utils/Template/Variables.php

Braces +3 added lines, -1 removed lines

@@ -14,7 +14,9 @@
 
 			DB::select(TABLE_VARIABLES, ['name', 'value'], null, ['name' => 'ASC']);
 
-			if (!(DB::getLast() && DB::getLast()->status)) return;
+			if (!(DB::getLast() && DB::getLast()->status)) {
+				return;
+			}
 
 			# Process results
 

www/engine/System/Classes/Utils/Template/Widgets.php

Braces +6 added lines, -2 removed lines

@@ -12,11 +12,15 @@
 
 			# Process selection
 
-			if (0 === count($name = array_keys(Template::getWidgets()))) return;
+			if (0 === count($name = array_keys(Template::getWidgets()))) {
+				return;
+			}
 
 			DB::select(TABLE_WIDGETS, ['name', 'contents'], ['active' => 1, 'name' => $name], ['name' => 'ASC']);
 
-			if (!(DB::getLast() && DB::getLast()->status)) return;
+			if (!(DB::getLast() && DB::getLast()->status)) {
+				return;
+			}
 
 			# Process results
 

www/engine/System/Classes/Utils/SEO.php

Spacing +1 added lines, -1 removed lines

@@ -71,7 +71,7 @@
 
 		public static function robots() {
 
-			return ((self::robotsIndex() ? 'INDEX' : 'NOINDEX') . ',' . (self::robotsFollow() ? 'FOLLOW' : 'NOFOLLOW'));
+			return ((self::robotsIndex() ? 'INDEX' : 'NOINDEX').','.(self::robotsFollow() ? 'FOLLOW' : 'NOFOLLOW'));
 		}
 	}
 }

Braces +18 added lines, -6 removed lines

@@ -17,7 +17,9 @@ 
 
 		public static function title(string $value = null) {
 
-			if (null === $value) return (self::$data['title'] ?? false);
+			if (null === $value) {
+				return (self::$data['title'] ?? false);
+			}
 
 			self::$data['title'] = $value;
 		}
@@ -26,7 +28,9 @@ 
 
 		public static function description(string $value = null) {
 
-			if (null === $value) return (self::$data['description'] ?? false);
+			if (null === $value) {
+				return (self::$data['description'] ?? false);
+			}
 
 			self::$data['description'] = $value;
 		}
@@ -35,7 +39,9 @@ 
 
 		public static function keywords(string $value = null) {
 
-			if (null === $value) return (self::$data['keywords'] ?? false);
+			if (null === $value) {
+				return (self::$data['keywords'] ?? false);
+			}
 
 			self::$data['keywords'] = $value;
 		}
@@ -44,7 +50,9 @@ 
 
 		public static function robotsIndex(bool $value = null) {
 
-			if (null === $value) return (self::$data['robots_index'] ?? false);
+			if (null === $value) {
+				return (self::$data['robots_index'] ?? false);
+			}
 
 			self::$data['robots_index'] = $value;
 		}
@@ -53,7 +61,9 @@ 
 
 		public static function robotsFollow(bool $value = null) {
 
-			if (null === $value) return (self::$data['robots_follow'] ?? false);
+			if (null === $value) {
+				return (self::$data['robots_follow'] ?? false);
+			}
 
 			self::$data['robots_follow'] = $value;
 		}
@@ -62,7 +72,9 @@ 
 
 		public static function canonical(string $value = null) {
 
-			if (null === $value) return (self::$data['canonical'] ?? false);
+			if (null === $value) {
+				return (self::$data['canonical'] ?? false);
+			}
 
 			self::$data['canonical'] = $value;
 		}

www/engine/System/Classes/Frames/Admin/Section.php

Spacing +2 added lines, -2 removed lines

@@ -33,7 +33,7 @@ 
 
 			# Check auth
 
-			if (($this instanceof Area\Auth) && Auth::check()) Request::redirect(INSTALL_PATH . '/admin');
+			if (($this instanceof Area\Auth) && Auth::check()) Request::redirect(INSTALL_PATH.'/admin');
 
 			# Handle request
 
@@ -54,7 +54,7 @@ 
 
 			if (!Auth::check() || ((false !== Request::get('logout')) && Auth::logout())) {
 
-				Request::redirect(INSTALL_PATH . '/admin/login');
+				Request::redirect(INSTALL_PATH.'/admin/login');
 			}
 
 			# Handle request

Braces +21 added lines, -7 removed lines

@@ -33,11 +33,15 @@ 
 
 			# Check auth
 
-			if (($this instanceof Area\Auth) && Auth::check()) Request::redirect(INSTALL_PATH . '/admin');
+			if (($this instanceof Area\Auth) && Auth::check()) {
+				Request::redirect(INSTALL_PATH . '/admin');
+			}
 
 			# Handle request
 
-			if (Template::isBlock($result = $this->handle())) return (new View\Form($this->_title))->display($result);
+			if (Template::isBlock($result = $this->handle())) {
+				return (new View\Form($this->_title))->display($result);
+			}
 
 			# ------------------------
 
@@ -63,9 +67,13 @@ 
 
 			$result = $this->handle(Request::isAjax() && ($request === 'display'));
 
-			if (Template::isBlock($result)) return (new View\Panel($this->_title))->$request($result);
+			if (Template::isBlock($result)) {
+				return (new View\Panel($this->_title))->$request($result);
+			}
 
-			if (Ajax::isResponse($result)) return Ajax::output($result);
+			if (Ajax::isResponse($result)) {
+				return Ajax::output($result);
+			}
 
 			# ------------------------
 
@@ -84,14 +92,20 @@ 
 
 				$ips = preg_split('/ +/', CONFIG_ADMIN_IP, -1, PREG_SPLIT_NO_EMPTY);
 
-				if (!in_array(REQUEST_CLIENT_IP, $ips, true)) return Status::displayError404();
+				if (!in_array(REQUEST_CLIENT_IP, $ips, true)) {
+					return Status::displayError404();
+				}
 			}
 
 			# Handle request
 
-			if (($this instanceof Area\Auth) || ($this instanceof Area\Install)) return $this->handleFormArea();
+			if (($this instanceof Area\Auth) || ($this instanceof Area\Install)) {
+				return $this->handleFormArea();
+			}
 
-			if ($this instanceof Area\Panel) return $this->handlePanelArea();
+			if ($this instanceof Area\Panel) {
+				return $this->handlePanelArea();
+			}
 
 			# ------------------------
 

www/engine/System/Classes/Frames/Admin/View.php

Spacing +2 added lines, -2 removed lines

@@ -21,7 +21,7 @@ 
 
 		private function getTitle() : string {
 
-			return ((('' !== $this->title) ? (Language::get($this->title) . ' | ') : '') . CADMIUM_NAME);
+			return ((('' !== $this->title) ? (Language::get($this->title).' | ') : '').CADMIUM_NAME);
 		}
 
 		/**
@@ -30,7 +30,7 @@ 
 
 		protected function _display(Template\Block $layout) {
 
-			$view = View::get('Main/' . $this->view);
+			$view = View::get('Main/'.$this->view);
 
 			# Set language
 

www/engine/System/Classes/Frames/Section.php

Spacing +13 added lines, -13 removed lines

@@ -34,7 +34,7 @@ 
 
 			foreach (array_unique($languages) as $path) foreach ($phrases as $name) {
 
-				Language::load($path . 'Phrases/' . $name . '.php');
+				Language::load($path.'Phrases/'.$name.'.php');
 			}
 		}
 
@@ -44,24 +44,24 @@ 
 
 		private function setGlobals() {
 
-			Template::setGlobal('cadmium_home',         CADMIUM_HOME);
-			Template::setGlobal('cadmium_copy',         CADMIUM_COPY);
-			Template::setGlobal('cadmium_name',         CADMIUM_NAME);
-			Template::setGlobal('cadmium_version',      CADMIUM_VERSION);
+			Template::setGlobal('cadmium_home', CADMIUM_HOME);
+			Template::setGlobal('cadmium_copy', CADMIUM_COPY);
+			Template::setGlobal('cadmium_name', CADMIUM_NAME);
+			Template::setGlobal('cadmium_version', CADMIUM_VERSION);
 
-			Template::setGlobal('template_name',        strtolower(Extend\Templates::active()));
+			Template::setGlobal('template_name', strtolower(Extend\Templates::active()));
 
-			Template::setGlobal('site_title',           Settings::get('site_title'));
-			Template::setGlobal('site_slogan',          Settings::get('site_slogan'));
+			Template::setGlobal('site_title', Settings::get('site_title'));
+			Template::setGlobal('site_slogan', Settings::get('site_slogan'));
 
-			Template::setGlobal('system_url',           Settings::get('system_url'));
-			Template::setGlobal('system_email',         Settings::get('system_email'));
+			Template::setGlobal('system_url', Settings::get('system_url'));
+			Template::setGlobal('system_email', Settings::get('system_email'));
 
-			Template::setGlobal('install_path',         INSTALL_PATH);
+			Template::setGlobal('install_path', INSTALL_PATH);
 
-			Template::setGlobal('index_page',           (('' !== INSTALL_PATH) ? INSTALL_PATH : '/'));
+			Template::setGlobal('index_page', (('' !== INSTALL_PATH) ? INSTALL_PATH : '/'));
 
-			Template::setGlobal('current_year',         Date::getYear());
+			Template::setGlobal('current_year', Date::getYear());
 		}
 
 		/**