cadmium-org / cadmium-cms

www/engine/System/Main.php

Spacing +13 added lines, -13 removed lines

@@ -2,26 +2,26 @@
 
 # Define constants
 
-define('DIR_SYSTEM',                (dirname(__FILE__) . '/'));
+define('DIR_SYSTEM', (dirname(__FILE__).'/'));
 
-define('DIR_SYSTEM_CLASSES',        (DIR_SYSTEM . 'Classes/'));
-define('DIR_SYSTEM_DATA',           (DIR_SYSTEM . 'Data/'));
-define('DIR_SYSTEM_INCLUDES',       (DIR_SYSTEM . 'Includes/'));
-define('DIR_SYSTEM_LANGUAGES',      (DIR_SYSTEM . 'Languages/'));
-define('DIR_SYSTEM_PLUGINS',        (DIR_SYSTEM . 'Plugins/'));
-define('DIR_SYSTEM_TEMPLATES',      (DIR_SYSTEM . 'Templates/'));
+define('DIR_SYSTEM_CLASSES', (DIR_SYSTEM.'Classes/'));
+define('DIR_SYSTEM_DATA', (DIR_SYSTEM.'Data/'));
+define('DIR_SYSTEM_INCLUDES', (DIR_SYSTEM.'Includes/'));
+define('DIR_SYSTEM_LANGUAGES', (DIR_SYSTEM.'Languages/'));
+define('DIR_SYSTEM_PLUGINS', (DIR_SYSTEM.'Plugins/'));
+define('DIR_SYSTEM_TEMPLATES', (DIR_SYSTEM.'Templates/'));
 
 # Require classes
 
-require_once (DIR_SYSTEM . 'System.php');
-require_once (DIR_SYSTEM . 'Exception.php');
+require_once (DIR_SYSTEM.'System.php');
+require_once (DIR_SYSTEM.'Exception.php');
 
 # Require configuration
 
-require_once (DIR_SYSTEM_INCLUDES . 'Config.php');
-require_once (DIR_SYSTEM_INCLUDES . 'Constants.php');
-require_once (DIR_SYSTEM_INCLUDES . 'Regex.php');
-require_once (DIR_SYSTEM_INCLUDES . 'Tables.php');
+require_once (DIR_SYSTEM_INCLUDES.'Config.php');
+require_once (DIR_SYSTEM_INCLUDES.'Constants.php');
+require_once (DIR_SYSTEM_INCLUDES.'Regex.php');
+require_once (DIR_SYSTEM_INCLUDES.'Tables.php');
 
 # Process environment variables
 

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

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();
 			}

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)->string(); $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)->string();
+				if ($active === $extremum) { $block->disable(); $pagination->block($class . '_disabled')->enable(); } else {
+					$block->link = $url->set('index', $index)->string();
+				}
 			}
 		}
 
@@ -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
 

www/engine/System/Classes/Modules/Auth/Handler/Register.php

Spacing +1 added lines, -1 removed lines

@@ -20,7 +20,7 @@
 
 			if ($this->form->handle(new Auth\Controller\Register())) {
 
-				Request::redirect(INSTALL_PATH . (Auth::admin() ? '/admin' : '/profile') . '/login?submitted=register');
+				Request::redirect(INSTALL_PATH.(Auth::admin() ? '/admin' : '/profile').'/login?submitted=register');
 			}
 
 			# ------------------------

www/engine/System/Classes/Modules/Auth/Handler/Reset.php

Spacing +1 added lines, -1 removed lines

@@ -20,7 +20,7 @@
 
 			if ($this->form->handle(new Auth\Controller\Reset())) {
 
-				Request::redirect(INSTALL_PATH . (Auth::admin() ? '/admin' : '/profile') . '/login?submitted=reset');
+				Request::redirect(INSTALL_PATH.(Auth::admin() ? '/admin' : '/profile').'/login?submitted=reset');
 			}
 
 			# ------------------------

www/engine/System/Classes/Modules/Auth/Handler/Login.php

Spacing +1 added lines, -1 removed lines

@@ -20,7 +20,7 @@
 
 			if ($this->form->handle(new Auth\Controller\Login())) {
 
-				Request::redirect(INSTALL_PATH . (Auth::admin() ? '/admin' : '/profile'));
+				Request::redirect(INSTALL_PATH.(Auth::admin() ? '/admin' : '/profile'));
 			}
 
 			# Display success message

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

Spacing +4 added lines, -4 removed lines

@@ -88,9 +88,9 @@ 
 
 			if (!$this->entity->init(Request::get('name'))) {
 
-				$query = (('' !== $this->parent->path()) ? ('?parent=' . $this->parent->path()) : '');
+				$query = (('' !== $this->parent->path()) ? ('?parent='.$this->parent->path()) : '');
 
-				Request::redirect(INSTALL_PATH . '/admin/content/filemanager' . $query);
+				Request::redirect(INSTALL_PATH.'/admin/content/filemanager'.$query);
 			}
 
 			# Create form
@@ -101,9 +101,9 @@ 
 
 			if ($this->form->handle(new Filemanager\Controller\Rename($this->entity))) {
 
-				$query = ('?parent=' . $this->parent->path() . '&name=' . $this->entity->name() . '&submitted');
+				$query = ('?parent='.$this->parent->path().'&name='.$this->entity->name().'&submitted');
 
-				Request::redirect(INSTALL_PATH . '/admin/content/filemanager/' . static::$type . $query);
+				Request::redirect(INSTALL_PATH.'/admin/content/filemanager/'.static::$type.$query);
 			}
 
 			# Display success message

Braces +12 added lines, -4 removed lines

@@ -47,7 +47,9 @@ 
 
 			# 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'));
+			}
 
 			# Init entity
 
@@ -60,7 +62,9 @@ 
 
 			if (Request::post('action') === 'remove') {
 
-				if (!$this->entity->remove()) return $ajax->error(Language::get(static::$message_error_remove));
+				if (!$this->entity->remove()) {
+					return $ajax->error(Language::get(static::$message_error_remove));
+				}
 			}
 
 			# ------------------------
@@ -82,7 +86,9 @@ 
 
 			# Handle ajax request
 
-			if (Request::isAjax()) return $this->handleAjax();
+			if (Request::isAjax()) {
+				return $this->handleAjax();
+			}
 
 			# Init entity
 
@@ -108,7 +114,9 @@ 
 
 			# Display success message
 
-			if (false !== Request::get('submitted')) Popup::set('positive', Language::get(static::$message_success_rename));
+			if (false !== Request::get('submitted')) {
+				Popup::set('positive', Language::get(static::$message_success_rename));
+			}
 
 			# ------------------------
 

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

Spacing +5 added lines, -5 removed lines

@@ -61,11 +61,11 @@ 
 
 			# Set link
 
-			$link = (INSTALL_PATH . static::$link . '/');
+			$link = (INSTALL_PATH.static::$link.'/');
 
-			if (static::$nesting) $contents->link = ($link . ($this->create ? 'create' : 'edit') . '?id=' . $this->parent->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)));
+			else $contents->link = ($link.($this->create ? 'create' : ('edit?id='.$this->entity->id)));
 
 			# Process parent block
 
@@ -124,7 +124,7 @@ 
 
 			# Redirect if entity not found
 
-			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 form
 
@@ -136,7 +136,7 @@ 
 
 			if ($this->form->handle(new static::$controller($this->entity))) {
 
-				Request::redirect(INSTALL_PATH . static::$link . '/edit?id=' . $this->entity->id . '&submitted');
+				Request::redirect(INSTALL_PATH.static::$link.'/edit?id='.$this->entity->id.'&submitted');
 			}
 
 			# Display success message

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

@@ -2,7 +2,14 @@
 
 namespace Modules\Entitizer\Utils {
 
-	use Modules\Entitizer, Utils\Popup, Utils\View, Ajax, Language, Number, Request, Template;
+	use Modules\Entitizer;
+	use Utils\Popup;
+	use Utils\View;
+	use Ajax;
+	use Language;
+	use Number;
+	use Request;
+	use Template;
 
 	abstract class Handler {
 

Braces +37 added lines, -15 removed lines

@@ -45,7 +45,9 @@ 
 
 		private function processSelector(Template\Asset\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->block('parent'));
+			if (static::$nesting) {
+				$this->processParent($contents->block('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->block('selector'));
+			if (static::$nesting) {
+				$this->processSelector($contents->block('selector'));
+			}
 
 			# Implement form
 
@@ -119,11 +129,15 @@ 
 
 				$parent_id = Number::format(Request::post('parent_id'));
 
-				if (!$this->entity->move($parent_id)) return $ajax->error(Language::get(static::$message_error_move));
+				if (!$this->entity->move($parent_id)) {
+					return $ajax->error(Language::get(static::$message_error_move));
+				}
 
 			} else if (Request::post('action') === 'remove') {
 
-				if (!$this->entity->remove()) return $ajax->error(Language::get(static::$message_error_remove));
+				if (!$this->entity->remove()) {
+					return $ajax->error(Language::get(static::$message_error_remove));
+				}
 			}
 
 			# ------------------------
@@ -135,7 +149,9 @@ 
 
 		public function handle(bool $create = false) {
 
-			if (!($this->create = $create) && Request::isAjax()) return $this->handleAjax();
+			if (!($this->create = $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/Entity/User.php

Spacing +1 added lines, -1 removed lines

@@ -12,7 +12,7 @@
 
 		private function getFullName() {
 
-			return trim($this->data['first_name'] . ' ' . $this->data['last_name']);
+			return trim($this->data['first_name'].' '.$this->data['last_name']);
 		}
 
 		# Implement entity

www/engine/System/Classes/Modules/Settings/Settings.php

Spacing +4 added lines, -4 removed lines

@@ -39,16 +39,16 @@ 
 
 			if (self::$loaded || empty($host = getenv('HTTP_HOST'))) return;
 
-			self::$settings['system_url'] = ((Request::isSecure() ? 'https://' : 'http://') . $host);
+			self::$settings['system_url'] = ((Request::isSecure() ? 'https://' : 'http://').$host);
 
-			self::$settings['system_email'] = ('admin@' . $host);
+			self::$settings['system_email'] = ('admin@'.$host);
 		}
 
 		# Init settings
 
 		public static function init() {
 
-			$settings_file = (DIR_SYSTEM_DATA . 'Settings.json');
+			$settings_file = (DIR_SYSTEM_DATA.'Settings.json');
 
 			self::$loaded = (false !== ($settings = Explorer::json($settings_file)));
 
@@ -63,7 +63,7 @@ 
 
 		public static function save() {
 
-			$settings_file = (DIR_SYSTEM_DATA . 'Settings.json');
+			$settings_file = (DIR_SYSTEM_DATA.'Settings.json');
 
 			if (false === ($settings = json_encode(self::$settings, JSON_PRETTY_PRINT))) return false;
 

Braces +39 added lines, -13 removed lines

@@ -37,7 +37,9 @@ 
 
 		public static function __autoload() {
 
-			if (self::$loaded || empty($host = getenv('HTTP_HOST'))) return;
+			if (self::$loaded || empty($host = getenv('HTTP_HOST'))) {
+				return;
+			}
 
 			self::$settings['system_url'] = ((Request::isSecure() ? 'https://' : 'http://') . $host);
 
@@ -52,7 +54,9 @@ 
 
 			self::$loaded = (false !== ($settings = Explorer::json($settings_file)));
 
-			if (self::$loaded) foreach ($settings as $name => $value) self::set($name, $value);
+			if (self::$loaded) {
+				foreach ($settings as $name => $value) self::set($name, $value);
+			}
 
 			# ------------------------
 
@@ -65,9 +69,13 @@ 
 
 			$settings_file = (DIR_SYSTEM_DATA . 'Settings.json');
 
-			if (false === ($settings = json_encode(self::$settings, JSON_PRETTY_PRINT))) return false;
+			if (false === ($settings = json_encode(self::$settings, JSON_PRETTY_PRINT))) {
+				return false;
+			}
 
-			if (false === Explorer::save($settings_file, $settings, true)) return false;
+			if (false === Explorer::save($settings_file, $settings, true)) {
+				return false;
+			}
 
 			# ------------------------
 
@@ -85,34 +93,44 @@ 
 
 		public static function set(string $name, $value) {
 
-			if (!isset(self::$settings[$name]) || !is_scalar($value)) return false;
+			if (!isset(self::$settings[$name]) || !is_scalar($value)) {
+				return false;
+			}
 
 			# Validate language
 
 			if (($name === 'admin_language') || ($name === 'site_language')) {
 
-				if (false === ($value = Extend\Languages::validate($value))) return false;
+				if (false === ($value = Extend\Languages::validate($value))) {
+					return false;
+				}
 			}
 
 			# Validate template
 
 			else if (($name === 'admin_template') || ($name === 'site_template')) {
 
-				if (false === ($value = Extend\Templates::validate($value))) return false;
+				if (false === ($value = Extend\Templates::validate($value))) {
+					return false;
+				}
 			}
 
 			# Validate site title
 
 			else if ($name === 'site_title') {
 
-				if ('' === ($value = strval($value))) return false;
+				if ('' === ($value = strval($value))) {
+					return false;
+				}
 			}
 
 			# Validate site status
 
 			else if ($name === 'site_status') {
 
-				if (false === ($value = Range\Status::validate($value))) return false;
+				if (false === ($value = Range\Status::validate($value))) {
+					return false;
+				}
 			}
 
 			# Validate site slogan/description/keywords
@@ -126,21 +144,27 @@ 
 
 			else if ($name === 'system_url') {
 
-				if (false === ($value = Validate::url($value))) return false;
+				if (false === ($value = Validate::url($value))) {
+					return false;
+				}
 			}
 
 			# Validate system email
 
 			else if ($name === 'system_email') {
 
-				if (false === ($value = Validate::email($value))) return false;
+				if (false === ($value = Validate::email($value))) {
+					return false;
+				}
 			}
 
 			# Validate system timezone
 
 			else if ($name === 'system_timezone') {
 
-				if (false === ($value = Timezone::validate($value))) return false;
+				if (false === ($value = Timezone::validate($value))) {
+					return false;
+				}
 			}
 
 			# Validate users registration
@@ -163,7 +187,9 @@ 
 
 		public static function get(string $name = null) {
 
-			if (null === $name) return self::$settings;
+			if (null === $name) {
+				return self::$settings;
+			}
 
 			return (isset(self::$settings[$name]) ? self::$settings[$name] : null);
 		}