cadmium-org / cadmium-cms

www/engine/System/Classes/Dispatcher.php

Unused Use Statements +3 added lines, -1 removed lines

@@ -2,7 +2,9 @@
 
 namespace {
 
-	use Modules\Extend, Utils\Map, Utils\Schema;
+	use Modules\Extend;
+	use Utils\Map;
+	use Utils\Schema;
 
 	class Dispatcher {
 

Spacing +1 added lines, -1 removed lines

@@ -14,7 +14,7 @@
 
 			if (null === ($data = Schema::get('System')->load())) {
 
-				Request::redirect(INSTALL_PATH . '/install.php');
+				Request::redirect(INSTALL_PATH.'/install.php');
 			}
 
 			# Connect to database

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

Unused Use Statements +6 added lines, -1 removed lines

@@ -2,7 +2,12 @@
 
 namespace Frames\Admin\Area {
 
-	use Frames, Frames\Status, Modules, Ajax, Request, Template;
+	use Frames;
+	use Frames\Status;
+	use Modules;
+	use Ajax;
+	use Request;
+	use Template;
 
 	abstract class Authorized extends Frames\Admin\Section {
 

Spacing +1 added lines, -1 removed lines

@@ -16,7 +16,7 @@
 
 			if (!Modules\Auth::check() || ((false !== Request::get('logout')) && Modules\Auth::logout())) {
 
-				Request::redirect(INSTALL_PATH . '/admin/login');
+				Request::redirect(INSTALL_PATH.'/admin/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/Admin/Section.php

Unused Use Statements +11 added lines, -2 removed lines

@@ -2,8 +2,17 @@
 
 namespace Frames\Admin {
 
-	use Frames, Frames\Status, Modules\Auth, Modules\Extend, Utils\Messages, Utils\Popup, Utils\View;
-	use DB, Debug, Language, Template;
+	use Frames;
+	use Frames\Status;
+	use Modules\Auth;
+	use Modules\Extend;
+	use Utils\Messages;
+	use Utils\Popup;
+	use Utils\View;
+	use DB;
+	use Debug;
+	use Language;
+	use Template;
 
 	abstract class Section extends Frames\Section {
 

Spacing +3 added lines, -3 removed lines

@@ -23,7 +23,7 @@ 
 
 		private function getLayout(Template\Block $contents) {
 
-			$layout = View::get('Layouts/' . $this->layout);
+			$layout = View::get('Layouts/'.$this->layout);
 
 			# Set menu and user
 
@@ -82,7 +82,7 @@ 
 
 		protected function displayPage(Template\Block $contents, int $status = STATUS_CODE_200) {
 
-			$page = View::get('Main/' . $this->layout);
+			$page = View::get('Main/'.$this->layout);
 
 			# Set language
 
@@ -90,7 +90,7 @@ 
 
 			# Set title
 
-			$page->title = ((('' !== $this->title) ? (Language::get($this->title) . ' | ') : '') . CADMIUM_NAME);
+			$page->title = ((('' !== $this->title) ? (Language::get($this->title).' | ') : '').CADMIUM_NAME);
 
 			# Set layout
 

Braces +3 added lines, -1 removed lines

@@ -111,7 +111,9 @@
 
 				$ips = preg_split('/ +/', CONFIG_ADMIN_IP, -1, PREG_SPLIT_NO_EMPTY);
 
-				if (!in_array(REQUEST_CLIENT_IP, $ips, true)) return Status::error404();
+				if (!in_array(REQUEST_CLIENT_IP, $ips, true)) {
+					return Status::error404();
+				}
 			}
 
 			# ------------------------

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

Unused Use Statements +9 added lines, -1 removed lines

@@ -2,7 +2,15 @@
 
 namespace Frames {
 
-	use Modules\Auth, Modules\Extend, Modules\Settings, Utils\Messages, Utils\Popup, Utils\SEO, Utils\View, Language, Template;
+	use Modules\Auth;
+	use Modules\Extend;
+	use Modules\Settings;
+	use Utils\Messages;
+	use Utils\Popup;
+	use Utils\SEO;
+	use Utils\View;
+	use Language;
+	use Template;
 
 	abstract class Section extends Main {
 

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/Frames/Site/Section.php

Unused Use Statements +14 added lines, -2 removed lines

@@ -2,8 +2,20 @@
 
 namespace Frames\Site {
 
-	use Frames, Frames\Status, Modules\Auth, Modules\Extend, Modules\Settings, Utils\Menu, Utils\Messages;
-	use Utils\SEO, Utils\Template\Variables, Utils\Template\Widgets, Utils\View, Date, Language, Template;
+	use Frames;
+	use Frames\Status;
+	use Modules\Auth;
+	use Modules\Extend;
+	use Modules\Settings;
+	use Utils\Menu;
+	use Utils\Messages;
+	use Utils\SEO;
+	use Utils\Template\Variables;
+	use Utils\Template\Widgets;
+	use Utils\View;
+	use Date;
+	use Language;
+	use Template;
 
 	abstract class Section extends Frames\Section {
 

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/Status.php

Unused Use Statements +5 added lines, -1 removed lines

@@ -2,7 +2,11 @@
 
 namespace Frames {
 
-	use Modules\Extend, Modules\Settings, Utils\View, Date, Language, Template;
+	use Modules\Extend;
+	use Utils\View;
+	use Date;
+	use Language;
+	use Template;
 
 	abstract class Status {
 

www/engine/System/Classes/Modules/Entitizer/Handler/Edit/Menuitem.php

Unused Use Statements +2 added lines, -1 removed lines

@@ -2,7 +2,8 @@
 
 namespace Modules\Entitizer\Listview {
 
-	use Modules\Entitizer, Template;
+	use Modules\Entitizer;
+	use Template;
 
 	class Variables extends Entitizer\Utils\Listview {
 

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/Extend/Utils/Handler/Addons.php

Unused Use Statements +5 added lines, -1 removed lines

@@ -2,7 +2,11 @@
 
 namespace Modules\Extend\Utils\Handler {
 
-	use Modules\Extend, Modules\Informer, Ajax, Arr, Language, Request, Template;
+	use Modules\Extend;
+	use Ajax;
+	use Language;
+	use Request;
+	use Template;
 
 	abstract class Addons extends Extend\Utils\Handler {
 

Braces +9 added lines, -3 removed lines

@@ -35,13 +35,17 @@ 
 
 				$name = Request::post('name');
 
-				if (!$this->loader->install($name, true)) return $ajax->setError(Language::get(static::$error_install));
+				if (!$this->loader->install($name, true)) {
+					return $ajax->setError(Language::get(static::$error_install));
+				}
 
 			} else if (Request::post('action') === 'uninstall') {
 
 				$name = Request::post('name');
 
-				if (!$this->loader->install($name, false)) return $ajax->setError(Language::get(static::$error_uninstall));
+				if (!$this->loader->install($name, false)) {
+					return $ajax->setError(Language::get(static::$error_uninstall));
+				}
 			}
 
 			# ------------------------
@@ -55,7 +59,9 @@ 
 
 			$this->loader = new static::$loader_class;
 
-			if (Request::isAjax()) return $this->handleAjax();
+			if (Request::isAjax()) {
+				return $this->handleAjax();
+			}
 
 			# ------------------------
 

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

Unused Use Statements +7 added lines, -1 removed lines

@@ -2,7 +2,13 @@
 
 namespace Modules\Extend\Utils\Handler {
 
-	use Modules\Extend, Modules\Informer, Modules\Settings, Ajax, Arr, Language, Request, Template, JSON;
+	use Modules\Extend;
+	use Modules\Informer;
+	use Modules\Settings;
+	use Ajax;
+	use Language;
+	use Request;
+	use Template;
 
 	abstract class Basic extends Extend\Utils\Handler {
 

Braces +12 added lines, -4 removed lines

@@ -30,13 +30,19 @@ 
 
 			if (Request::post('action') === 'activate') {
 
-				if (Informer::isDemoMode()) return $ajax->setError(Language::get('DEMO_MODE_RESTRICTION'));
+				if (Informer::isDemoMode()) {
+					return $ajax->setError(Language::get('DEMO_MODE_RESTRICTION'));
+				}
 
 				$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') {
 
@@ -54,7 +60,9 @@ 
 
 			$this->loader = new static::$loader_class(Request::get('list'));
 
-			if (Request::isAjax()) return $this->handleAjax();
+			if (Request::isAjax()) {
+				return $this->handleAjax();
+			}
 
 			# ------------------------