cadmium-org / cadmium-cms

www/engine/System/Classes/Modules/Entitizer/Utils/Param/Type/Boolean.php

Braces +3 added lines, -1 removed lines

@@ -16,7 +16,9 @@
 
 			# Set field configuration
 
-			foreach (get_defined_vars() as $name => $value) $this->$name = $value;
+			foreach (get_defined_vars() as $name => $value) {
+				$this->$name = $value;
+			}
 		}
 
 		# Get field statement

Spacing +1 added lines, -1 removed lines

@@ -21,7 +21,7 @@
 
 		public function fieldStatement() {
 
-			return ("`" . $this->name . "` tinyint(1) unsigned NOT NULL DEFAULT '" . intval($this->default) . "'");
+			return ("`".$this->name."` tinyint(1) unsigned NOT NULL DEFAULT '".intval($this->default)."'");
 		}
 
 		# Cast value

www/engine/Framework/Classes/Template/Asset/Block.php

Braces +44 added lines, -20 removed lines

@@ -22,15 +22,19 @@ 
 
 				$type = $matches[2][$key]; $name = $matches[3][$key]; $contents = ($matches[4][$key] ?? '');
 
-				if (!preg_match(REGEX_TEMPLATE_ITEM_NAME, $name)) continue;
+				if (!preg_match(REGEX_TEMPLATE_ITEM_NAME, $name)) {
+					continue;
+				}
 
 				$this->contents = str_replace($match, ('{ ' . $type . ':' . $name . ' / }'), $this->contents);
 
-				if ($type === 'block') $this->blocks[$name] = (new Block($contents))->$toggle();
-
-				else if ($type === 'for') $this->loops[$name] = new Loop($contents);
-
-				else if ($type === 'widget') $this->widgets[] = $name;
+				if ($type === 'block') {
+					$this->blocks[$name] = (new Block($contents))->$toggle();
+				} else if ($type === 'for') {
+					$this->loops[$name] = new Loop($contents);
+				} else if ($type === 'widget') {
+					$this->widgets[] = $name;
+				}
 			}
 		}
 
@@ -48,7 +52,9 @@ 
 
 				foreach ($matches[1] as $index => $name) {
 
-					if (!preg_match(REGEX_TEMPLATE_ITEM_NAME, $name)) continue;
+					if (!preg_match(REGEX_TEMPLATE_ITEM_NAME, $name)) {
+						continue;
+					}
 
 					$elementaries['stack'][$name] = false;
 				}
@@ -68,29 +74,39 @@ 
 
 		public function __clone() {
 
-			foreach ($this->blocks as $name => $block) $this->blocks[$name] = clone $block;
+			foreach ($this->blocks as $name => $block) {
+				$this->blocks[$name] = clone $block;
+			}
 
-			foreach ($this->loops as $name => $loop) $this->loops[$name] = clone $loop;
+			foreach ($this->loops as $name => $loop) {
+				$this->loops[$name] = clone $loop;
+			}
 		}
 
 		# Setter
 
 		public function __set(string $name, $value) {
 
-			if ($value instanceof Block) $this->block($name, $value);
-
-			else if (is_array($value)) $this->loop($name, $value);
-
-			else if (is_scalar($value)) $this->set($name, $value);
+			if ($value instanceof Block) {
+				$this->block($name, $value);
+			} else if (is_array($value)) {
+				$this->loop($name, $value);
+			} else if (is_scalar($value)) {
+				$this->set($name, $value);
+			}
 		}
 
 		# Set block
 
 		public function block(string $name, Block $block = null) {
 
-			if (!isset($this->blocks[$name])) return ((null === $block) ? new Block() : $this);
+			if (!isset($this->blocks[$name])) {
+				return ((null === $block) ? new Block() : $this);
+			}
 
-			if (null === $block) return $this->blocks[$name];
+			if (null === $block) {
+				return $this->blocks[$name];
+			}
 
 			$this->blocks[$name] = $block;
 
@@ -103,9 +119,13 @@ 
 
 		public function loop(string $name, array $range = null) {
 
-			if (!isset($this->loops[$name])) return ((null === $range) ? new Loop() : $this);
+			if (!isset($this->loops[$name])) {
+				return ((null === $range) ? new Loop() : $this);
+			}
 
-			if (null === $range) return $this->loops[$name];
+			if (null === $range) {
+				return $this->loops[$name];
+			}
 
 			$this->loops[$name]->range($range);
 
@@ -118,7 +138,9 @@ 
 
 		public function set(string $name, string $value) {
 
-			if (isset($this->variables[$name])) $this->variables[$name] = $value;
+			if (isset($this->variables[$name])) {
+				$this->variables[$name] = $value;
+			}
 
 			return $this;
 		}
@@ -127,7 +149,9 @@ 
 
 		public function contents() {
 
-			if (!$this->enabled) return '';
+			if (!$this->enabled) {
+				return '';
+			}
 
 			$this->enabled = false; $insertions = [];
 

Spacing +6 added lines, -6 removed lines

@@ -24,7 +24,7 @@ 
 
 				if (!preg_match(REGEX_TEMPLATE_ITEM_NAME, $name)) continue;
 
-				$this->contents = str_replace($match, ('{ ' . $type . ':' . $name . ' / }'), $this->contents);
+				$this->contents = str_replace($match, ('{ '.$type.':'.$name.' / }'), $this->contents);
 
 				if ($type === 'block') $this->blocks[$name] = (new Block($contents))->$toggle();
 
@@ -135,14 +135,14 @@ 
 
 			foreach ($this->blocks as $name => $block) {
 
-				$insertions['{ block:' . $name . ' / }'] = $block->contents();
+				$insertions['{ block:'.$name.' / }'] = $block->contents();
 			}
 
 			# Process loops
 
 			foreach ($this->loops as $name => $loop) {
 
-				$insertions['{ for:' . $name . ' / }'] = $loop->contents();
+				$insertions['{ for:'.$name.' / }'] = $loop->contents();
 			}
 
 			# Process widgets
@@ -153,7 +153,7 @@ 
 
 				$contents = ((false !== $widget) ? $widget->contents() : '');
 
-				$insertions['{ widget:' . $name . ' / }'] = $contents;
+				$insertions['{ widget:'.$name.' / }'] = $contents;
 			}
 
 			# Process variables
@@ -162,7 +162,7 @@ 
 
 				$value = ((false === $value) ? Template::global($name) : $value);
 
-				$insertions['$' . $name . '$'] = Str::output($value);
+				$insertions['$'.$name.'$'] = Str::output($value);
 			}
 
 			# Process phrases
@@ -171,7 +171,7 @@ 
 
 				$value = Language::get($name);
 
-				$insertions['%' . $name . '%'] = Str::output($value);
+				$insertions['%'.$name.'%'] = Str::output($value);
 			}
 
 			# Unlock and process insertions

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

Braces +12 added lines, -4 removed lines

@@ -47,13 +47,17 @@ 
 
 			# 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'));
+			}
 
 			# Remove item
 
 			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));
+				}
 			}
 
 			# ------------------------
@@ -84,7 +88,9 @@ 
 
 			# Handle ajax request
 
-			if (Request::isAjax()) return $this->handleAjax();
+			if (Request::isAjax()) {
+				return $this->handleAjax();
+			}
 
 			# Create form
 
@@ -101,7 +107,9 @@ 
 
 			# Display success message
 
-			if (false !== Request::get('submitted')) Messages::success(Language::get(static::$message_success_rename));
+			if (false !== Request::get('submitted')) {
+				Messages::success(Language::get(static::$message_success_rename));
+			}
 
 			# ------------------------
 

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

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

Braces +45 added lines, -15 removed lines

@@ -10,19 +10,33 @@ 
 
 		private static function translateError(int $error) {
 
-			if ($error === UPLOAD_ERR_INI_SIZE)         return 'UPLOADER_ERROR_INI_SIZE';
+			if ($error === UPLOAD_ERR_INI_SIZE) {
+				return 'UPLOADER_ERROR_INI_SIZE';
+			}
 
-			if ($error === UPLOAD_ERR_FORM_SIZE)        return 'UPLOADER_ERROR_FORM_SIZE';
+			if ($error === UPLOAD_ERR_FORM_SIZE) {
+				return 'UPLOADER_ERROR_FORM_SIZE';
+			}
 
-			if ($error === UPLOAD_ERR_PARTIAL)          return 'UPLOADER_ERROR_PARTIAL';
+			if ($error === UPLOAD_ERR_PARTIAL) {
+				return 'UPLOADER_ERROR_PARTIAL';
+			}
 
-			if ($error === UPLOAD_ERR_NO_FILE)          return 'UPLOADER_ERROR_NO_FILE';
+			if ($error === UPLOAD_ERR_NO_FILE) {
+				return 'UPLOADER_ERROR_NO_FILE';
+			}
 
-			if ($error === UPLOAD_ERR_NO_TMP_DIR)       return 'UPLOADER_ERROR_NO_TMP_DIR';
+			if ($error === UPLOAD_ERR_NO_TMP_DIR) {
+				return 'UPLOADER_ERROR_NO_TMP_DIR';
+			}
 
-			if ($error === UPLOAD_ERR_CANT_WRITE)       return 'UPLOADER_ERROR_CANT_WRITE';
+			if ($error === UPLOAD_ERR_CANT_WRITE) {
+				return 'UPLOADER_ERROR_CANT_WRITE';
+			}
 
-			if ($error === UPLOAD_ERR_EXTENSION)        return 'UPLOADER_ERROR_EXTENSION';
+			if ($error === UPLOAD_ERR_EXTENSION) {
+				return 'UPLOADER_ERROR_EXTENSION';
+			}
 
 			# ------------------------
 
@@ -33,39 +47,55 @@ 
 
 		public static function save(string $name, string $dir_name) {
 
-			if ((false === ($file = Request::file($name))) || !is_uploaded_file($file['tmp_name'])) return false;
+			if ((false === ($file = Request::file($name))) || !is_uploaded_file($file['tmp_name'])) {
+				return false;
+			}
 
 			# Check for demo mode
 
-			if (Informer::isDemoMode()) return 'DEMO_MODE_RESTRICTION';
+			if (Informer::isDemoMode()) {
+				return 'DEMO_MODE_RESTRICTION';
+			}
 
 			# Check for upload errors
 
-			if ($file['error'] !== UPLOAD_ERR_OK) return self::translateError($file['error']);
+			if ($file['error'] !== UPLOAD_ERR_OK) {
+				return self::translateError($file['error']);
+			}
 
 			# Check size
 
-			if ($file['size'] > CONFIG_UPLOADS_MAX_SIZE) return 'UPLOADER_ERROR_SIZE';
+			if ($file['size'] > CONFIG_UPLOADS_MAX_SIZE) {
+				return 'UPLOADER_ERROR_SIZE';
+			}
 
 			# Check file extension
 
 			$extensions = ['php', 'phtml', 'php3', 'php4', 'php5', 'phps'];
 
-			if (in_array(Explorer::extension($file['name'], false), $extensions)) return 'UPLOADER_ERROR_TYPE';
+			if (in_array(Explorer::extension($file['name'], false), $extensions)) {
+				return 'UPLOADER_ERROR_TYPE';
+			}
 
 			# Check target directory
 
-			if (!Explorer::isDir($dir_name)) return 'UPLOADER_ERROR_DIR';
+			if (!Explorer::isDir($dir_name)) {
+				return 'UPLOADER_ERROR_DIR';
+			}
 
 			# Check target file
 
 			$file_name = ($dir_name . '/' . basename($file['name']));
 
-			if (Explorer::isDir($file_name) || Explorer::isFile($file_name)) return 'UPLOADER_ERROR_EXISTS';
+			if (Explorer::isDir($file_name) || Explorer::isFile($file_name)) {
+				return 'UPLOADER_ERROR_EXISTS';
+			}
 
 			# Save uploaded file
 
-			if (!@move_uploaded_file($file['tmp_name'], $file_name)) return 'UPLOADER_ERROR_SAVE';
+			if (!@move_uploaded_file($file['tmp_name'], $file_name)) {
+				return 'UPLOADER_ERROR_SAVE';
+			}
 
 			# ------------------------
 

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

@@ -2,7 +2,11 @@
 
 namespace Utils {
 
-	use Modules\Informer, Utils\Messages, Explorer, Language, Request;
+	use Modules\Informer;
+	use Utils\Messages;
+	use Explorer;
+	use Language;
+	use Request;
 
 	abstract class Uploader {
 

Spacing +1 added lines, -1 removed lines

@@ -59,7 +59,7 @@
 
 			# Check target file
 
-			$file_name = ($dir_name . '/' . basename($file['name']));
+			$file_name = ($dir_name.'/'.basename($file['name']));
 
 			if (Explorer::isDir($file_name) || Explorer::isFile($file_name)) return 'UPLOADER_ERROR_EXISTS';
 

www/engine/System/Classes/Modules/Auth/Utils/Mail.php

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

@@ -2,7 +2,13 @@
 
 namespace Modules\Auth\Utils {
 
-	use Modules\Auth, Modules\Entitizer, Modules\Settings, Utils\View, Date, Language, Mailer;
+	use Modules\Auth;
+	use Modules\Entitizer;
+	use Modules\Settings;
+	use Utils\View;
+	use Date;
+	use Language;
+	use Mailer;
 
 	abstract class Mail {
 

Spacing +3 added lines, -3 removed lines

@@ -18,7 +18,7 @@ 
 
 			$to = $user->email; $sender = Settings::get('site_title'); $reply_to = Settings::get('system_email');
 
-			$from = ((false !== ($host = parse_url(Settings::get('system_url'), PHP_URL_HOST))) ? ('noreply@' . $host) : '');
+			$from = ((false !== ($host = parse_url(Settings::get('system_url'), PHP_URL_HOST))) ? ('noreply@'.$host) : '');
 
 			return Mailer::send($to, $sender, $from, $reply_to, $subject, $message->contents(true), true);
 		}
@@ -27,7 +27,7 @@ 
 
 		public static function reset(Entitizer\Entity\User $user, string $code) {
 
-			$link = (Settings::get('system_url') . (Auth::admin() ? '/admin' : '/profile') . '/recover?code=' . $code);
+			$link = (Settings::get('system_url').(Auth::admin() ? '/admin' : '/profile').'/recover?code='.$code);
 
 			return self::send($user, 'Blocks\Auth\Mail\Reset', Language::get('MAIL_SUBJECT_RESET'), $link);
 		}
@@ -36,7 +36,7 @@ 
 
 		public static function register(Entitizer\Entity\User $user) {
 
-			$link = (Settings::get('system_url') . (Auth::admin() ? '/admin' : '/profile'));
+			$link = (Settings::get('system_url').(Auth::admin() ? '/admin' : '/profile'));
 
 			return self::send($user, 'Blocks\Auth\Mail\Register', Language::get('MAIL_SUBJECT_REGISTER'), $link);
 		}

www/engine/System/Classes/Modules/Entitizer/Form/Page.php

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

@@ -2,7 +2,9 @@
 
 namespace Modules\Entitizer\Form {
 
-	use Modules\Entitizer, Utils\Form, Utils\Lister;
+	use Modules\Entitizer;
+	use Utils\Form;
+	use Utils\Lister;
 
 	class Page extends Form {
 

www/engine/System/Classes/Modules/Entitizer/Form/User.php

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

@@ -2,7 +2,13 @@
 
 namespace Modules\Entitizer\Form {
 
-	use Modules\Auth, Modules\Entitizer, Utils\Form, Utils\Lister, Geo\Country, Geo\Timezone, Language;
+	use Modules\Auth;
+	use Modules\Entitizer;
+	use Utils\Form;
+	use Utils\Lister;
+	use Geo\Country;
+	use Geo\Timezone;
+	use Language;
 
 	class User extends Form {
 

www/engine/System/Classes/Modules/Entitizer/Form/Widget.php

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

@@ -2,7 +2,8 @@
 
 namespace Modules\Entitizer\Form {
 
-	use Modules\Entitizer, Utils\Form;
+	use Modules\Entitizer;
+	use Utils\Form;
 
 	class Widget extends Form {
 

www/engine/System/Classes/Modules/Entitizer/Listview/Variables.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 {