cadmium-org / cadmium-cms

www/engine/System/Classes/Frames/Site/Area/Auth.php

Spacing +1 added lines, -1 removed lines

@@ -12,7 +12,7 @@
 
 			# Check auth
 
-			if (Modules\Auth::check()) Request::redirect(INSTALL_PATH . '/profile');
+			if (Modules\Auth::check()) Request::redirect(INSTALL_PATH.'/profile');
 
 			# Handle request
 

Braces +6 added lines, -2 removed lines

@@ -12,11 +12,15 @@
 
 			# Check auth
 
-			if (Modules\Auth::check()) Request::redirect(INSTALL_PATH . '/profile');
+			if (Modules\Auth::check()) {
+				Request::redirect(INSTALL_PATH . '/profile');
+			}
 
 			# Handle request
 
-			if (Template::isBlock($result = $this->handle())) return $this->displayPage($result, STATUS_CODE_401);
+			if (Template::isBlock($result = $this->handle())) {
+				return $this->displayPage($result, STATUS_CODE_401);
+			}
 
 			# ------------------------
 

www/engine/System/Classes/Frames/Site/Area/Authorized.php

Spacing +1 added lines, -1 removed lines

@@ -14,7 +14,7 @@
 
 			if (!Modules\Auth::check() || ((false !== Request::get('logout')) && Modules\Auth::logout())) {
 
-				Request::redirect(INSTALL_PATH . '/profile/login');
+				Request::redirect(INSTALL_PATH.'/profile/login');
 			}
 
 			# Handle request

Braces +6 added lines, -2 removed lines

@@ -19,9 +19,13 @@
 
 			# Handle request
 
-			if (Template::isBlock($result = $this->handle())) return $this->displayPage($result, STATUS_CODE_200);
+			if (Template::isBlock($result = $this->handle())) {
+				return $this->displayPage($result, STATUS_CODE_200);
+			}
 
-			if (Ajax::isResponse($result)) return Ajax::output($result);
+			if (Ajax::isResponse($result)) {
+				return Ajax::output($result);
+			}
 
 			# ------------------------
 

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

Spacing +5 added lines, -9 removed lines

@@ -23,7 +23,7 @@ 
 
 		private function getLayout(Template\Block $contents) {
 
-			$layout = View::get('Layouts/' . $this->layout);
+			$layout = View::get('Layouts/'.$this->layout);
 
 			# Create layout components
 
@@ -39,7 +39,7 @@ 
 
 				$layout->getBlock('user')->enable();
 
-				$layout->getBlock('user')->gravatar = Auth::user()->gravatar;;
+				$layout->getBlock('user')->gravatar = Auth::user()->gravatar; ;
 
 				$layout->getBlock('user')->name = Auth::user()->name;
 
@@ -50,9 +50,7 @@ 
 
 			# Set title
 
-			$layout->title = (('' !== SEO::title()) ? SEO::title() :
-
-				(('' !== $this->title) ? Language::get($this->title) : Settings::get('site_title')));
+			$layout->title = (('' !== SEO::title()) ? SEO::title() : (('' !== $this->title) ? Language::get($this->title) : Settings::get('site_title')));
 
 			# Set slogan
 
@@ -95,13 +93,11 @@ 
 
 			$page->keywords = ('' !== SEO::keywords()) ? SEO::keywords() : Settings::get('site_keywords');
 
-			$page->robots = ((SEO::robotsIndex() ? 'INDEX' : 'NOINDEX') . ',' . (SEO::robotsFollow() ? 'FOLLOW' : 'NOFOLLOW'));
+			$page->robots = ((SEO::robotsIndex() ? 'INDEX' : 'NOINDEX').','.(SEO::robotsFollow() ? 'FOLLOW' : 'NOFOLLOW'));
 
 			# Set title
 
-			$page->title = (('' !== SEO::title()) ? SEO::title() :
-
-				((('' !== $this->title) ? (Language::get($this->title) . ' | ') : '') . Settings::get('site_title')));
+			$page->title = (('' !== SEO::title()) ? SEO::title() : ((('' !== $this->title) ? (Language::get($this->title).' | ') : '').Settings::get('site_title')));
 
 			# Set canonical
 

Braces +20 added lines, -8 removed lines

@@ -45,7 +45,9 @@ 
 
 				$layout->getBlock('auth')->disable();
 
-				if (Auth::user()->rank === RANK_ADMINISTRATOR) $layout->getBlock('admin')->enable();
+				if (Auth::user()->rank === RANK_ADMINISTRATOR) {
+					$layout->getBlock('admin')->enable();
+				}
 			}
 
 			# Set title
@@ -105,9 +107,11 @@ 
 
 			# Set canonical
 
-			if ('' === SEO::canonical()) $page->getBlock('canonical')->disable();
-
-			else $page->getBlock('canonical')->link = SEO::canonical();
+			if ('' === SEO::canonical()) {
+				$page->getBlock('canonical')->disable();
+			} else {
+				$page->getBlock('canonical')->link = SEO::canonical();
+			}
 
 			# Set layout
 
@@ -119,9 +123,13 @@ 
 
 			# Set global components
 
-			foreach (Variables::generate() as $name => $value) Template::setGlobal($name, $value);
+			foreach (Variables::generate() as $name => $value) {
+				Template::setGlobal($name, $value);
+			}
 
-			foreach (Widgets::generate() as $name => $block) Template::setWidget($name, $block);
+			foreach (Widgets::generate() as $name => $block) {
+				Template::setWidget($name, $block);
+			}
 
 			# ------------------------
 
@@ -134,9 +142,13 @@ 
 
 			# 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();
+			}
 
 			# ------------------------
 

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

Spacing +7 added lines, -7 removed lines

@@ -36,22 +36,22 @@
 
 			foreach (array_unique($languages) as $path) foreach ($phrases as $name) {
 
-				Language::load($path . 'Phrases/' . $name . '.php');
+				Language::load($path.'Phrases/'.$name.'.php');
 			}
 
 			# Set template globals
 
-			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_title', Settings::get('site_title'));
 
-			Template::setGlobal('system_url',       Settings::get('system_url'));
+			Template::setGlobal('system_url', Settings::get('system_url'));
 
-			Template::setGlobal('system_email',     Settings::get('system_email'));
+			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 : '/'));
 
 			# Init utils
 

Braces +6 added lines, -2 removed lines

@@ -34,10 +34,12 @@ 
 
 			$phrases = array_merge(static::PHRASES, array_keys(Extend\Addons::items() ?? []));
 
-			foreach (array_unique($languages) as $path) foreach ($phrases as $name) {
+			foreach (array_unique($languages) as $path) {
+				foreach ($phrases as $name) {
 
 				Language::load($path . 'Phrases/' . $name . '.php');
 			}
+			}
 
 			# Set template globals
 
@@ -59,7 +61,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);
+			}
 
 			# ------------------------
 

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

Braces +14 added lines, -4 removed lines

@@ -12,7 +12,11 @@ 
 
 			$text = Language::get($code);
 
-			if (!$popup) Messages::set('error', $text); else Popup::set('negative', $text);
+			if (!$popup) {
+				Messages::set('error', $text);
+			} else {
+				Popup::set('negative', $text);
+			}
 
 			# ------------------------
 
@@ -23,15 +27,21 @@ 
 
 		public function handle(callable $callback, bool $popup = false) {
 
-			if (false === ($post = $this->post())) return false;
+			if (false === ($post = $this->post())) {
+				return false;
+			}
 
 			# Check form for errors
 
-			if ($this->hasErrors()) return $this->displayError('FORM_ERROR_REQUIRED', $popup);
+			if ($this->hasErrors()) {
+				return $this->displayError('FORM_ERROR_REQUIRED', $popup);
+			}
 
 			# Call controller method
 
-			if (is_string($result = $callback($post))) return $this->displayError($result, $popup);
+			if (is_string($result = $callback($post))) {
+				return $this->displayError($result, $popup);
+			}
 
 			if (is_array($result)) { $this->getField($result[0])->error = true; return $this->displayError($result[1], $popup); }
 

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

Spacing +1 added lines, -1 removed lines

@@ -10,7 +10,7 @@
 
 		public static function get(string $name) {
 
-			$class_name = ('Schemas\\' . $name);
+			$class_name = ('Schemas\\'.$name);
 
 			if (!isset(self::$cache[$class_name])) self::$cache[$class_name] = new $class_name;
 

Braces +3 added lines, -1 removed lines

@@ -12,7 +12,9 @@
 
 			$class_name = ('Schemas\\' . $name);
 
-			if (!isset(self::$cache[$class_name])) self::$cache[$class_name] = new $class_name;
+			if (!isset(self::$cache[$class_name])) {
+				self::$cache[$class_name] = new $class_name;
+			}
 
 			# ------------------------
 

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

Braces +3 added lines, -1 removed lines

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

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

Braces +3 added lines, -1 removed lines

@@ -14,7 +14,9 @@
 
 			$selection = ['name', 'contents']; $condition = ['active' => 1]; $order = ['name' => 'ASC'];
 
-			if (!(DB::select(TABLE_WIDGETS, $selection, $condition, $order) && DB::getLast()->status)) return;
+			if (!(DB::select(TABLE_WIDGETS, $selection, $condition, $order) && DB::getLast()->status)) {
+				return;
+			}
 
 			# Process results
 

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

Braces +9 added lines, -3 removed lines

@@ -20,7 +20,9 @@ 
 
 				$item->children = ($children = Template::createBlock());
 
-				foreach ($this->menu[$id]['children'] as $child) $children->addItem($this->parseItem($child));
+				foreach ($this->menu[$id]['children'] as $child) {
+					$children->addItem($this->parseItem($child));
+				}
 
 			} else {
 
@@ -44,7 +46,9 @@ 
 
 			$menu = Entitizer::treeview(TABLE_MENU)->subtree(0, ['active' => true]);
 
-			if (false !== $menu) $this->menu = $menu;
+			if (false !== $menu) {
+				$this->menu = $menu;
+			}
 		}
 
 		# Get block
@@ -53,7 +57,9 @@ 
 
 			$menu = Template::createBlock();
 
-			foreach ($this->menu[0]['children'] as $id) $menu->addItem($this->parseItem($id));
+			foreach ($this->menu[0]['children'] as $id) {
+				$menu->addItem($this->parseItem($id));
+			}
 
 			# ------------------------