cadmium-org / cadmium-cms

www/engine/Framework/Classes/Form/Utils/Field.php

Doc Comments +3 added lines

@@ -14,6 +14,9 @@
 
 		# Get tag
 
+		/**
+		 * @param string $contents
+		 */
 		protected function getTag(string $name, array $attributes = [], $contents = null) {
 
 			$tag = new Tag($name, $attributes, $contents);

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

@@ -2,7 +2,9 @@
 
 namespace Form\Utils {
 
-	use Form, Request, Tag;
+	use Form;
+	use Request;
+	use Tag;
 
 	abstract class Field {
 

Braces +26 added lines, -11 removed lines

@@ -24,11 +24,17 @@ 
 
 			# Set config
 
-			if ($this->disabled) $tag->set('disabled', 'disabled');
+			if ($this->disabled) {
+				$tag->set('disabled', 'disabled');
+			}
 
-			if ($this->required) $tag->set('data-required', 'required');
+			if ($this->required) {
+				$tag->set('data-required', 'required');
+			}
 
-			if ($this->error) $tag->set('data-error', 'error');
+			if ($this->error) {
+				$tag->set('data-error', 'error');
+			}
 
 			# ------------------------
 
@@ -54,11 +60,12 @@ 
 
 			$params = array_merge(['disabled' => false, 'required' => false], $this->config);
 
-			foreach ($params as $name => $default) if (isset($config[$name])) {
+			foreach ($params as $name => $default) {
+				if (isset($config[$name])) {
 
-				try { $this->$name($config[$name]); }
-
-				catch (\TypeError $e) { /* Ignore setting value of illegal type */ }
+				try { $this->$name($config[$name]);
+			}
+			} catch (\TypeError $e) { /* Ignore setting value of illegal type */ }
 			}
 		}
 
@@ -66,7 +73,9 @@ 
 
 		public function post() {
 
-			if ($this->posted || $this->disabled || ('' === $this->key)) return false;
+			if ($this->posted || $this->disabled || ('' === $this->key)) {
+				return false;
+			}
 
 			$this->error = (!$this->set(Request::post($this->name)) && $this->required);
 
@@ -100,7 +109,9 @@ 
 
 		public function disabled(bool $value = null) {
 
-			if (null === $value) return $this->disabled;
+			if (null === $value) {
+				return $this->disabled;
+			}
 
 			$this->disabled = $value;
 		}
@@ -109,7 +120,9 @@ 
 
 		public function required(bool $value = null) {
 
-			if (null === $value) return $this->required;
+			if (null === $value) {
+				return $this->required;
+			}
 
 			$this->required = $value;
 		}
@@ -118,7 +131,9 @@ 
 
 		public function error(bool $value = null) {
 
-			if (null === $value) return $this->error;
+			if (null === $value) {
+				return $this->error;
+			}
 
 			$this->error = $value;
 		}

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

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

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

Braces +29 added lines, -11 removed lines

@@ -39,7 +39,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();
 
@@ -47,7 +49,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();
+					}
 				}
 			}
 
@@ -104,9 +108,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
 
@@ -127,19 +133,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())) {
 
@@ -153,9 +167,13 @@ 
 
 				# Set global components
 
-				foreach (Variables::generate() as $name => $value) Template::global($name, $value);
+				foreach (Variables::generate() as $name => $value) {
+					Template::global($name, $value);
+				}
 
-				foreach (Widgets::generate() as $name => $block) Template::widget($name, $block);
+				foreach (Widgets::generate() as $name => $block) {
+					Template::widget($name, $block);
+				}
 
 				# Display page
 

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

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

@@ -2,7 +2,9 @@
 
 namespace Modules\Entitizer\Controller {
 
-	use Modules\Entitizer, Utils\Validate, Str;
+	use Modules\Entitizer;
+	use Utils\Validate;
+	use Str;
 
 	class User {
 

Braces +27 added lines, -9 removed lines

@@ -31,30 +31,46 @@ 
 
 			# Validate name & email
 
-			if (false === ($name = Validate::userName($name))) return ['name', 'USER_ERROR_NAME_INVALID'];
+			if (false === ($name = Validate::userName($name))) {
+				return ['name', 'USER_ERROR_NAME_INVALID'];
+			}
 
-			if (false === ($email = Validate::userEmail($email))) return ['email', 'USER_ERROR_EMAIL_INVALID'];
+			if (false === ($email = Validate::userEmail($email))) {
+				return ['email', 'USER_ERROR_EMAIL_INVALID'];
+			}
 
 			# Validate password
 
 			if ((0 === $this->user->id) || ('' !== $password)) {
 
-				if (false === ($password = Validate::userPassword($password))) return ['password', 'USER_ERROR_PASSWORD_INVALID'];
+				if (false === ($password = Validate::userPassword($password))) {
+					return ['password', 'USER_ERROR_PASSWORD_INVALID'];
+				}
 
-				if (0 !== strcmp($password, $password_retype)) return ['password_retype', 'USER_ERROR_PASSWORD_MISMATCH'];
+				if (0 !== strcmp($password, $password_retype)) {
+					return ['password_retype', 'USER_ERROR_PASSWORD_MISMATCH'];
+				}
 			}
 
 			# Check name exists
 
-			if (false === ($check_name = $this->user->check($name, 'name'))) return 'USER_ERROR_MODIFY';
+			if (false === ($check_name = $this->user->check($name, 'name'))) {
+				return 'USER_ERROR_MODIFY';
+			}
 
-			if ($check_name === 1) return ['name', 'USER_ERROR_NAME_DUPLICATE'];
+			if ($check_name === 1) {
+				return ['name', 'USER_ERROR_NAME_DUPLICATE'];
+			}
 
 			# Check email exists
 
-			if (false === ($check_email = $this->user->check($email, 'email'))) return 'USER_ERROR_MODIFY';
+			if (false === ($check_email = $this->user->check($email, 'email'))) {
+				return 'USER_ERROR_MODIFY';
+			}
 
-			if ($check_email === 1) return ['email', 'USER_ERROR_EMAIL_DUPLICATE'];
+			if ($check_email === 1) {
+				return ['email', 'USER_ERROR_EMAIL_DUPLICATE'];
+			}
 
 			# Modify user
 
@@ -84,7 +100,9 @@ 
 
 			$modifier = ((0 === $this->user->id) ? 'create' : 'edit');
 
-			if (!$this->user->$modifier($data)) return 'USER_ERROR_MODIFY';
+			if (!$this->user->$modifier($data)) {
+				return 'USER_ERROR_MODIFY';
+			}
 
 			# ------------------------
 

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\Range;
+	use Modules\Entitizer;
+	use Utils\Form;
+	use Utils\Range;
 
 	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\Range, Geo\Country, Geo\Timezone, Language;
+	use Modules\Auth;
+	use Modules\Entitizer;
+	use Utils\Form;
+	use Utils\Range;
+	use Geo\Country;
+	use Geo\Timezone;
+	use Language;
 
 	class User extends Form {
 

www/engine/System/Classes/Modules/Entitizer/Lister/Pages.php

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

@@ -2,7 +2,9 @@
 
 namespace Modules\Entitizer\Lister {
 
-	use Modules\Entitizer, Utils\Range, Template;
+	use Modules\Entitizer;
+	use Utils\Range;
+	use Template;
 
 	class Pages extends Entitizer\Utils\Lister {
 

Braces +3 added lines, -1 removed lines

@@ -32,7 +32,9 @@
 
 				$parent->block('browse')->disable(); $parent->block('browse_disabled')->enable();
 
-			} else $parent->block('browse')->link = $this->parent->link;
+			} else {
+				$parent->block('browse')->link = $this->parent->link;
+			}
 		}
 
 		# Add item additional data

www/engine/System/Classes/Modules/Entitizer/Lister/Users.php

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

@@ -2,7 +2,10 @@
 
 namespace Modules\Entitizer\Lister {
 
-	use Modules\Auth, Modules\Entitizer, Utils\Range, Template;
+	use Modules\Auth;
+	use Modules\Entitizer;
+	use Utils\Range;
+	use Template;
 
 	class Users extends Entitizer\Utils\Lister {
 

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

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/Framework/Classes/Range/Range.php

Braces +3 added lines, -1 removed lines

@@ -10,7 +10,9 @@
 
 		protected static function init(string $file_name) {
 
-			if (is_array($range = Explorer::php($file_name))) static::$range = $range;
+			if (is_array($range = Explorer::php($file_name))) {
+				static::$range = $range;
+			}
 		}
 
 		# Check if item exists