cadmium-org / cadmium-cms

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

Braces +26 added lines, -10 removed lines

@@ -23,11 +23,15 @@ 
 
 			$name = Settings::get(self::$param[$this->section]); $primary = self::$default[$this->section];
 
-			if (self::valid($name) && isset($items[$name])) $active = $name;
-
-			else if (self::valid($primary) && isset($items[$primary])) $active = $primary;
+			if (self::valid($name) && isset($items[$name])) {
+				$active = $name;
+			} else if (self::valid($primary) && isset($items[$primary])) {
+				$active = $primary;
+			}
 
-			foreach (array_keys($items) as $name) $items[$name]['active'] = ($name === $active);
+			foreach (array_keys($items) as $name) {
+				$items[$name]['active'] = ($name === $active);
+			}
 
 			# ------------------------
 
@@ -73,12 +77,16 @@ 
 
 				$items->add($item = View::get(self::$view_item));
 
-				foreach (self::$data as $name) $item->$name = $extension[$name];
+				foreach (self::$data as $name) {
+					$item->$name = $extension[$name];
+				}
 
 				$item->class = ($extension['active'] ? 'positive' : 'grey');
 			}
 
-			if ($items->count()) $contents->block('items', $items);
+			if ($items->count()) {
+				$contents->block('items', $items);
+			}
 
 			# ------------------------
 
@@ -93,15 +101,21 @@ 
 
 			# Check for demo mode
 
-			if (Informer::isDemoMode()) return $ajax->error(Language::get('DEMO_MODE_RESTRICTION'));
+			if (Informer::isDemoMode()) {
+				return $ajax->error(Language::get('DEMO_MODE_RESTRICTION'));
+			}
 
 			# Save configuration
 
 			$param = self::$param[$this->section]; $name = Request::post('name');
 
-			if (false === Settings::set($param, $name)) return $ajax->error(Language::get(self::$error_name));
+			if (false === Settings::set($param, $name)) {
+				return $ajax->error(Language::get(self::$error_name));
+			}
 
-			if (false === Settings::save()) return $ajax->error(Language::get(self::$error_save));
+			if (false === Settings::save()) {
+				return $ajax->error(Language::get(self::$error_save));
+			}
 
 			# ------------------------
 
@@ -116,7 +130,9 @@ 
 
 			$this->items = $this->getHandlerItems();
 
-			if (Request::isAjax()) return $this->handleAjax();
+			if (Request::isAjax()) {
+				return $this->handleAjax();
+			}
 
 			# ------------------------
 

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

Braces +6 added lines, -2 removed lines

@@ -32,10 +32,12 @@ 
 
 			$languages = [Extend\Languages::pathPrimary(), Extend\Languages::path()];
 
-			foreach (array_unique($languages) as $path) foreach (static::PHRASES as $name) {
+			foreach (array_unique($languages) as $path) {
+				foreach (static::PHRASES as $name) {
 
 				Language::load($path . 'Phrases/' . $name . '.php');
 			}
+			}
 
 			# Set template globals
 
@@ -57,7 +59,9 @@ 
 
 			# Set timezone
 
-			if (Auth::check() && ('' !== ($timezone = Auth::user()->timezone))) date_default_timezone_set($timezone);
+			if (Auth::check() && ('' !== ($timezone = Auth::user()->timezone))) {
+				date_default_timezone_set($timezone);
+			}
 
 			# ------------------------
 

Spacing +1 added lines, -1 removed lines

@@ -34,7 +34,7 @@
 
 			foreach (array_unique($languages) as $path) foreach (static::PHRASES as $name) {
 
-				Language::load($path . 'Phrases/' . $name . '.php');
+				Language::load($path.'Phrases/'.$name.'.php');
 			}
 
 			# Set template globals

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

Braces +21 added lines, -8 removed lines

@@ -147,20 +147,29 @@ 
 
 				if ($this instanceof Component\Install) {
 
-					if (Template::isBlock($result = $this->handle())) return $this->displayForm($result, STATUS_CODE_200);
+					if (Template::isBlock($result = $this->handle())) {
+						return $this->displayForm($result, STATUS_CODE_200);
+					}
 				}
 
 				# Handle auth component request
 
 				else if ($this instanceof Component\Auth) {
 
-					if (Auth::check()) Request::redirect(INSTALL_PATH . '/admin');
-
-					if ($this instanceof Component\Auth\Initial) { if (!Auth::initial()) Request::redirect(INSTALL_PATH . '/admin/login'); }
+					if (Auth::check()) {
+						Request::redirect(INSTALL_PATH . '/admin');
+					}
 
-					else if (Auth::initial()) Request::redirect(INSTALL_PATH . '/admin/register');
+					if ($this instanceof Component\Auth\Initial) { if (!Auth::initial()) {
+						Request::redirect(INSTALL_PATH . '/admin/login');
+					}
+					} else if (Auth::initial()) {
+						Request::redirect(INSTALL_PATH . '/admin/register');
+					}
 
-					if (Template::isBlock($result = $this->handle())) return $this->displayForm($result, STATUS_CODE_401);
+					if (Template::isBlock($result = $this->handle())) {
+						return $this->displayForm($result, STATUS_CODE_401);
+					}
 				}
 
 				# Handle panel component request
@@ -172,9 +181,13 @@ 
 						Request::redirect(INSTALL_PATH . '/admin/login');
 					}
 
-					if (Template::isBlock($result = $this->handle())) return $this->displayPage($result);
+					if (Template::isBlock($result = $this->handle())) {
+						return $this->displayPage($result);
+					}
 
-					if (Ajax::isResponse($result)) return Ajax::output($result);
+					if (Ajax::isResponse($result)) {
+						return Ajax::output($result);
+					}
 				}
 			}
 

Spacing +6 added lines, -6 removed lines

@@ -31,7 +31,7 @@ 
 
 			# Set title
 
-			$form->title = ((('' !== $this->title) ? ($this->title . ' | ') : '') . CADMIUM_NAME);
+			$form->title = ((('' !== $this->title) ? ($this->title.' | ') : '').CADMIUM_NAME);
 
 			# Create layout
 
@@ -72,7 +72,7 @@ 
 
 			# Set title
 
-			$page->title = ((('' !== $this->title) ? ($this->title . ' | ') : '') . CADMIUM_NAME);
+			$page->title = ((('' !== $this->title) ? ($this->title.' | ') : '').CADMIUM_NAME);
 
 			# Create layout
 
@@ -153,11 +153,11 @@ 
 
 				else if ($this instanceof Component\Auth) {
 
-					if (Auth::check()) Request::redirect(INSTALL_PATH . '/admin');
+					if (Auth::check()) Request::redirect(INSTALL_PATH.'/admin');
 
-					if ($this instanceof Component\Auth\Initial) { if (!Auth::initial()) Request::redirect(INSTALL_PATH . '/admin/login'); }
+					if ($this instanceof Component\Auth\Initial) { if (!Auth::initial()) Request::redirect(INSTALL_PATH.'/admin/login'); }
 
-					else if (Auth::initial()) Request::redirect(INSTALL_PATH . '/admin/register');
+					else if (Auth::initial()) Request::redirect(INSTALL_PATH.'/admin/register');
 
 					if (Template::isBlock($result = $this->handle())) return $this->displayForm($result, STATUS_CODE_401);
 				}
@@ -168,7 +168,7 @@ 
 
 					if (!Auth::check() || ((false !== Request::get('logout')) && Auth::logout())) {
 
-						Request::redirect(INSTALL_PATH . '/admin/login');
+						Request::redirect(INSTALL_PATH.'/admin/login');
 					}
 
 					if (Template::isBlock($result = $this->handle())) return $this->displayPage($result);

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

Braces +29 added lines, -11 removed lines

@@ -40,7 +40,9 @@ 
 
 			if (Settings::get('users_registration')) {
 
-				if (!Auth::check()) $layout->block('auth')->enable(); else {
+				if (!Auth::check()) {
+					$layout->block('auth')->enable();
+				} else {
 
 					$layout->block('user')->enable();
 
@@ -48,7 +50,9 @@ 
 
 					$layout->block('user')->name = Auth::user()->name;
 
-					if (Auth::user()->rank === RANK_ADMINISTRATOR) $layout->block('user')->block('admin')->enable();
+					if (Auth::user()->rank === RANK_ADMINISTRATOR) {
+						$layout->block('user')->block('admin')->enable();
+					}
 				}
 			}
 
@@ -109,9 +113,11 @@ 
 
 			# Set canonical
 
-			if ('' === $this->canonical) $page->block('canonical')->disable();
-
-			else $page->block('canonical')->link = $this->canonical;
+			if ('' === $this->canonical) {
+				$page->block('canonical')->disable();
+			} else {
+				$page->block('canonical')->link = $this->canonical;
+			}
 
 			# Set layout
 
@@ -128,19 +134,27 @@ 
 
 			# Check site status
 
-			if (Settings::get('site_status') === STATUS_MAINTENANCE) return Status::maintenance();
+			if (Settings::get('site_status') === STATUS_MAINTENANCE) {
+				return Status::maintenance();
+			}
 
-			if (Settings::get('site_status') === STATUS_UPDATE) return Status::update();
+			if (Settings::get('site_status') === STATUS_UPDATE) {
+				return Status::update();
+			}
 
 			# Check access rights
 
 			if ($this instanceof Component\Profile) {
 
-				if (!Settings::get('users_registration')) return Status::error404();
+				if (!Settings::get('users_registration')) {
+					return Status::error404();
+				}
 
 				if (($this instanceof Component\Profile\Auth)) {
 
-					if (Auth::check()) Request::redirect(INSTALL_PATH . '/profile');
+					if (Auth::check()) {
+						Request::redirect(INSTALL_PATH . '/profile');
+					}
 
 				} else if (!Auth::check() || ((false !== Request::get('logout')) && Auth::logout())) {
 
@@ -156,9 +170,13 @@ 
 
 				$variables = new Variables(); $widgets = new Widgets();
 
-				foreach ($variables->items() as $name => $value) Template::global($name, $value);
+				foreach ($variables->items() as $name => $value) {
+					Template::global($name, $value);
+				}
 
-				foreach ($widgets->items() as $name => $block) Template::widget($name, $block);
+				foreach ($widgets->items() as $name => $block) {
+					Template::widget($name, $block);
+				}
 
 				# Display page
 

Spacing +5 added lines, -5 removed lines

@@ -25,7 +25,7 @@ 
 
 		private function getLayout(Template\Asset\Block $contents) {
 
-			$layout = View::get('Layouts\\' . $this->layout);
+			$layout = View::get('Layouts\\'.$this->layout);
 
 			# Create layout components
 
@@ -100,11 +100,11 @@ 
 
 			$page->keywords = ('' !== $this->keywords) ? $this->keywords : Settings::get('site_keywords');
 
-			$page->robots = (($this->robots_index ? 'INDEX' : 'NOINDEX') . ',' . ($this->robots_follow ? 'FOLLOW' : 'NOFOLLOW'));
+			$page->robots = (($this->robots_index ? 'INDEX' : 'NOINDEX').','.($this->robots_follow ? 'FOLLOW' : 'NOFOLLOW'));
 
 			# Set title
 
-			$page->title = ((('' !== $this->title) ? ($this->title . ' | ') : '') . Settings::get('site_title'));
+			$page->title = ((('' !== $this->title) ? ($this->title.' | ') : '').Settings::get('site_title'));
 
 			# Set canonical
 
@@ -139,11 +139,11 @@ 
 
 				if (($this instanceof Component\Profile\Auth)) {
 
-					if (Auth::check()) Request::redirect(INSTALL_PATH . '/profile');
+					if (Auth::check()) Request::redirect(INSTALL_PATH.'/profile');
 
 				} else if (!Auth::check() || ((false !== Request::get('logout')) && Auth::logout())) {
 
-					Request::redirect(INSTALL_PATH . '/profile/login');
+					Request::redirect(INSTALL_PATH.'/profile/login');
 				}
 			}
 

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

Braces +15 added lines, -7 removed lines

@@ -14,7 +14,9 @@ 
 
 			for ($index = ($active - 2); $index <= ($active + 2); $index++) {
 
-				if (!($index > 0 && $index <= $count)) continue;
+				if (!($index > 0 && $index <= $count)) {
+					continue;
+				}
 
 				$class = (($index === $active) ? 'active item' : 'item');
 
@@ -41,7 +43,9 @@ 
 
 				$block->link = $url->set('index', $index)->get(); $block->index = $index;
 
-				if ($closest) $block->block('ellipsis')->disable();
+				if ($closest) {
+					$block->block('ellipsis')->disable();
+				}
 			}
 		}
 
@@ -58,9 +62,9 @@ 
 
 				list ($extremum, $index) = $data; $block = $pagination->block($class);
 
-				if ($active === $extremum) { $block->disable(); $pagination->block($class . '_disabled')->enable(); }
-
-				else $block->link = $url->set('index', $index)->get();
+				if ($active === $extremum) { $block->disable(); $pagination->block($class . '_disabled')->enable(); } else {
+					$block->link = $url->set('index', $index)->get();
+				}
 			}
 		}
 
@@ -68,9 +72,13 @@ 
 
 		public static function block(int $index, int $display, int $total, Url $url) {
 
-			if (($index <= 0) || ($display <= 0) || ($total <= 0)) return false;
+			if (($index <= 0) || ($display <= 0) || ($total <= 0)) {
+				return false;
+			}
 
-			if (($display >= $total) || ($index > ($count = ceil($total / $display)))) return false;
+			if (($display >= $total) || ($index > ($count = ceil($total / $display)))) {
+				return false;
+			}
 
 			# Create block
 

Spacing +1 added lines, -1 removed lines

@@ -58,7 +58,7 @@
 
 				list ($extremum, $index) = $data; $block = $pagination->block($class);
 
-				if ($active === $extremum) { $block->disable(); $pagination->block($class . '_disabled')->enable(); }
+				if ($active === $extremum) { $block->disable(); $pagination->block($class.'_disabled')->enable(); }
 
 				else $block->link = $url->set('index', $index)->get();
 			}

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

Braces +23 added lines, -7 removed lines

@@ -12,11 +12,15 @@ 
 
 		private static function setMessage(string $type, string $text, string $header = null) {
 
-			if (('' === $text) || isset(self::$messages[$type])) return;
+			if (('' === $text) || isset(self::$messages[$type])) {
+				return;
+			}
 
 			self::$messages[$type] = ['text' => $text, 'header' => null];
 
-			if ((null !== $header) && ('' !== $header)) self::$messages[$type]['header'] = $header;
+			if ((null !== $header) && ('' !== $header)) {
+				self::$messages[$type]['header'] = $header;
+			}
 		}
 
 		# Init messages
@@ -30,7 +34,9 @@ 
 
 		public static function info(string $text = null, string $header = null) {
 
-			if (null === $text) return (self::$messages['info'] ?? false);
+			if (null === $text) {
+				return (self::$messages['info'] ?? false);
+			}
 
 			self::setMessage('info', $text, $header);
 		}
@@ -39,7 +45,9 @@ 
 
 		public static function warning(string $text = null, string $header = null) {
 
-			if (null === $text) return (self::$messages['warning'] ?? false);
+			if (null === $text) {
+				return (self::$messages['warning'] ?? false);
+			}
 
 			self::setMessage('warning', $text, $header);
 		}
@@ -48,7 +56,9 @@ 
 
 		public static function error(string $text = null, string $header = null) {
 
-			if (null === $text) return (self::$messages['error'] ?? false);
+			if (null === $text) {
+				return (self::$messages['error'] ?? false);
+			}
 
 			self::setMessage('error', $text, $header);
 		}
@@ -57,7 +67,9 @@ 
 
 		public static function success(string $text = null, string $header = null) {
 
-			if (null === $text) return (self::$messages['success'] ?? false);
+			if (null === $text) {
+				return (self::$messages['success'] ?? false);
+			}
 
 			self::setMessage('success', $text, $header);
 		}
@@ -74,7 +86,11 @@ 
 
 				$block->type = $type; $block->text = Template::block($message['text']); $header = $block->block('header');
 
-				if (isset($message['header'])) $header->text = $message['header']; else $header->disable();
+				if (isset($message['header'])) {
+					$header->text = $message['header'];
+				} else {
+					$header->disable();
+				}
 			}
 
 			# ------------------------

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

Braces +15 added lines, -5 removed lines

@@ -20,7 +20,9 @@ 
 
 				$item->children = ($children = Template::group());
 
-				foreach ($this->items[$id]['children'] as $child) $children->add($this->parseItem($child));
+				foreach ($this->items[$id]['children'] as $child) {
+					$children->add($this->parseItem($child));
+				}
 
 			} else {
 
@@ -46,7 +48,9 @@ 
 
 					 ("FROM " . TABLE_MENU . " men ORDER BY men.parent_id ASC, men.position ASC, men.id ASC");
 
-			if (!(DB::send($query) && DB::last()->status)) return;
+			if (!(DB::send($query) && DB::last()->status)) {
+				return;
+			}
 
 			# Process results
 
@@ -57,9 +61,13 @@ 
 				$this->items[$entity->id()] = $entity->data();
 			}
 
-			foreach ($this->items as $id => $item) if (0 === $item['parent_id']) $this->menu[] = $id;
+			foreach ($this->items as $id => $item) {
+				if (0 === $item['parent_id']) $this->menu[] = $id;
+			}
 
-			else if (isset($this->items[$item['parent_id']])) $this->items[$item['parent_id']]['children'][] = $id;
+			else if (isset($this->items[$item['parent_id']])) {
+				$this->items[$item['parent_id']]['children'][] = $id;
+			}
 		}
 
 		# Get block
@@ -68,7 +76,9 @@ 
 
 			$menu = Template::group();
 
-			foreach ($this->menu as $id) $menu->add($this->parseItem($id));
+			foreach ($this->menu as $id) {
+				$menu->add($this->parseItem($id));
+			}
 
 			# ------------------------
 

Spacing +2 added lines, -2 removed lines

@@ -42,9 +42,9 @@
 
 			# Process selection
 
-			$query = ("SELECT men.id, men.parent_id, men.slug, men.text, men.target ") .
+			$query = ("SELECT men.id, men.parent_id, men.slug, men.text, men.target ").
 
-					 ("FROM " . TABLE_MENU . " men ORDER BY men.parent_id ASC, men.position ASC, men.id ASC");
+					 ("FROM ".TABLE_MENU." men ORDER BY men.parent_id ASC, men.position ASC, men.id ASC");
 
 			if (!(DB::send($query) && DB::last()->status)) return;
 

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

Braces +3 added lines, -1 removed lines

@@ -10,7 +10,9 @@
 
 		public function handle(callable $callback) {
 
-			if (false === ($post = $this->post())) return false;
+			if (false === ($post = $this->post())) {
+				return false;
+			}
 
 			# Check form for errors
 

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

Braces +8 added lines, -4 removed lines

@@ -19,13 +19,17 @@
 
 		public static function get(string $name) {
 
-			if ('' === self::$section) throw new Exception\View();
+			if ('' === self::$section) {
+				throw new Exception\View();
+			}
 
 			$class_name = ('System\Views\\' . self::$section . '\\' . $name);
 
-			if (isset(self::$cache[$class_name])) $view = clone self::$cache[$class_name];
-
-			else $view = (self::$cache[$class_name] = new $class_name());
+			if (isset(self::$cache[$class_name])) {
+				$view = clone self::$cache[$class_name];
+			} else {
+				$view = (self::$cache[$class_name] = new $class_name());
+			}
 
 			# ------------------------
 

Spacing +1 added lines, -1 removed lines

@@ -21,7 +21,7 @@
 
 			if ('' === self::$section) throw new Exception\View();
 
-			$class_name = ('Views\\' . self::$section . '\\' . $name);
+			$class_name = ('Views\\'.self::$section.'\\'.$name);
 
 			if (isset(self::$cache[$class_name])) $view = clone self::$cache[$class_name];