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, -9 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,9 +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) {}
+				try { $this->$name($config[$name]);
+			}
+			} catch (\TypeError $e) {}
 			}
 		}
 
@@ -64,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);
 
@@ -98,7 +109,9 @@ 
 
 		public function disabled(bool $value = null) {
 
-			if (null === $value) return $this->disabled;
+			if (null === $value) {
+				return $this->disabled;
+			}
 
 			$this->disabled = $value;
 		}
@@ -107,7 +120,9 @@ 
 
 		public function required(bool $value = null) {
 
-			if (null === $value) return $this->required;
+			if (null === $value) {
+				return $this->required;
+			}
 
 			$this->required = $value;
 		}
@@ -116,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/Entity/Page.php

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

@@ -2,7 +2,10 @@
 
 namespace Modules\Entitizer\Entity {
 
-	use Modules\Auth, Modules\Entitizer, Modules\Settings, DB;
+	use Modules\Auth;
+	use Modules\Entitizer;
+	use Modules\Settings;
+	use DB;
 
 	class Page extends Entitizer\Utils\Entity {
 

Indentation +15 added lines, -15 removed lines

@@ -64,13 +64,13 @@ 
 
 			$query = ("SELECT " . implode(', ', $selection) .", rel.ancestor as parent_id ") .
 
-			         ("FROM " . static::$table . " ent ") .
+					 ("FROM " . static::$table . " ent ") .
 
-			         ("LEFT JOIN " . static::$table_relations . " rel ON rel.descendant = ent.id AND rel.depth = 1 ") .
+					 ("LEFT JOIN " . static::$table_relations . " rel ON rel.descendant = ent.id AND rel.depth = 1 ") .
 
-			         ("WHERE ent.visibility = " . VISIBILITY_PUBLISHED . " AND ent.access <= " . Auth::user()->rank . " AND ") .
+					 ("WHERE ent.visibility = " . VISIBILITY_PUBLISHED . " AND ent.access <= " . Auth::user()->rank . " AND ") .
 
-			         ("ent.locked = 0 AND ent.slug = '" . addslashes($slug) . "' LIMIT 1");
+					 ("ent.locked = 0 AND ent.slug = '" . addslashes($slug) . "' LIMIT 1");
 
 			# Select entity from DB
 
@@ -91,17 +91,17 @@ 
 
 			$query = ("UPDATE " . static::$table . " ent JOIN (") .
 
-			         ("SELECT rel.descendant as id, GROUP_CONCAT(ens.name ORDER BY rls.depth DESC SEPARATOR '/') slug ") .
+					 ("SELECT rel.descendant as id, GROUP_CONCAT(ens.name ORDER BY rls.depth DESC SEPARATOR '/') slug ") .
 
-			         ("FROM " . static::$table_relations . " rel ") .
+					 ("FROM " . static::$table_relations . " rel ") .
 
-			         ("JOIN " . static::$table_relations . " rls ON rls.descendant = rel.descendant ") .
+					 ("JOIN " . static::$table_relations . " rls ON rls.descendant = rel.descendant ") .
 
-			         ("JOIN " . static::$table . " ens ON ens.id = rls.ancestor ") .
+					 ("JOIN " . static::$table . " ens ON ens.id = rls.ancestor ") .
 
-			         ("WHERE rel.ancestor = " . $this->id . " GROUP BY rel.descendant") .
+					 ("WHERE rel.ancestor = " . $this->id . " GROUP BY rel.descendant") .
 
-			         (") slg ON slg.id = ent.id SET ent.locked = 1, ent.slug = slg.slug");
+					 (") slg ON slg.id = ent.id SET ent.locked = 1, ent.slug = slg.slug");
 
 			if (!(DB::send($query) && DB::last()->status)) return false;
 
@@ -109,15 +109,15 @@ 
 
 			$query = ("UPDATE " . static::$table . " ent JOIN (") .
 
-			         ("SELECT rel.descendant as id FROM " . static::$table_relations . " rel ") .
+					 ("SELECT rel.descendant as id FROM " . static::$table_relations . " rel ") .
 
-			         ("JOIN " . static::$table . " enc ON enc.id = rel.descendant AND enc.locked = 1 ") .
+					 ("JOIN " . static::$table . " enc ON enc.id = rel.descendant AND enc.locked = 1 ") .
 
-			         ("LEFT JOIN " . static::$table . " end ON end.id != enc.id AND end.slug = enc.slug ") .
+					 ("LEFT JOIN " . static::$table . " end ON end.id != enc.id AND end.slug = enc.slug ") .
 
-			         ("WHERE end.id IS NULL GROUP BY rel.descendant") .
+					 ("WHERE end.id IS NULL GROUP BY rel.descendant") .
 
-			         (") chk ON chk.id = ent.id SET ent.locked = 0");
+					 (") chk ON chk.id = ent.id SET ent.locked = 0");
 
 			if (!(DB::send($query) && DB::last()->status)) return false;
 

Spacing +19 added lines, -19 removed lines

@@ -21,7 +21,7 @@ 
 
 			if ('' === $this->data['slug']) return '';
 
-			return (INSTALL_PATH . '/' . $this->data['slug']);
+			return (INSTALL_PATH.'/'.$this->data['slug']);
 		}
 
 		# Get canonical
@@ -30,7 +30,7 @@ 
 
 			if ('' === $this->data['slug']) return '';
 
-			return (Settings::get('system_url') . (($this->id !== 1) ? ('/' . $this->data['slug']) : ''));
+			return (Settings::get('system_url').(($this->id !== 1) ? ('/'.$this->data['slug']) : ''));
 		}
 
 		# Implement entity
@@ -58,19 +58,19 @@ 
 
 			$selection = array_keys($this->definition->params());
 
-			foreach ($selection as $key => $field) $selection[$key] = ('ent.' . $field);
+			foreach ($selection as $key => $field) $selection[$key] = ('ent.'.$field);
 
 			# Process query
 
-			$query = ("SELECT " . implode(', ', $selection) .", rel.ancestor as parent_id ") .
+			$query = ("SELECT ".implode(', ', $selection).", rel.ancestor as parent_id ").
 
-			         ("FROM " . static::$table . " ent ") .
+			         ("FROM ".static::$table." ent ").
 
-			         ("LEFT JOIN " . static::$table_relations . " rel ON rel.descendant = ent.id AND rel.depth = 1 ") .
+			         ("LEFT JOIN ".static::$table_relations." rel ON rel.descendant = ent.id AND rel.depth = 1 ").
 
-			         ("WHERE ent.visibility = " . VISIBILITY_PUBLISHED . " AND ent.access <= " . Auth::user()->rank . " AND ") .
+			         ("WHERE ent.visibility = ".VISIBILITY_PUBLISHED." AND ent.access <= ".Auth::user()->rank." AND ").
 
-			         ("ent.locked = 0 AND ent.slug = '" . addslashes($slug) . "' LIMIT 1");
+			         ("ent.locked = 0 AND ent.slug = '".addslashes($slug)."' LIMIT 1");
 
 			# Select entity from DB
 
@@ -89,17 +89,17 @@ 
 
 			# Send lock/update request
 
-			$query = ("UPDATE " . static::$table . " ent JOIN (") .
+			$query = ("UPDATE ".static::$table." ent JOIN (").
 
-			         ("SELECT rel.descendant as id, GROUP_CONCAT(ens.name ORDER BY rls.depth DESC SEPARATOR '/') slug ") .
+			         ("SELECT rel.descendant as id, GROUP_CONCAT(ens.name ORDER BY rls.depth DESC SEPARATOR '/') slug ").
 
-			         ("FROM " . static::$table_relations . " rel ") .
+			         ("FROM ".static::$table_relations." rel ").
 
-			         ("JOIN " . static::$table_relations . " rls ON rls.descendant = rel.descendant ") .
+			         ("JOIN ".static::$table_relations." rls ON rls.descendant = rel.descendant ").
 
-			         ("JOIN " . static::$table . " ens ON ens.id = rls.ancestor ") .
+			         ("JOIN ".static::$table." ens ON ens.id = rls.ancestor ").
 
-			         ("WHERE rel.ancestor = " . $this->id . " GROUP BY rel.descendant") .
+			         ("WHERE rel.ancestor = ".$this->id." GROUP BY rel.descendant").
 
 			         (") slg ON slg.id = ent.id SET ent.locked = 1, ent.slug = slg.slug");
 
@@ -107,15 +107,15 @@ 
 
 			# Send unlock request
 
-			$query = ("UPDATE " . static::$table . " ent JOIN (") .
+			$query = ("UPDATE ".static::$table." ent JOIN (").
 
-			         ("SELECT rel.descendant as id FROM " . static::$table_relations . " rel ") .
+			         ("SELECT rel.descendant as id FROM ".static::$table_relations." rel ").
 
-			         ("JOIN " . static::$table . " enc ON enc.id = rel.descendant AND enc.locked = 1 ") .
+			         ("JOIN ".static::$table." enc ON enc.id = rel.descendant AND enc.locked = 1 ").
 
-			         ("LEFT JOIN " . static::$table . " end ON end.id != enc.id AND end.slug = enc.slug ") .
+			         ("LEFT JOIN ".static::$table." end ON end.id != enc.id AND end.slug = enc.slug ").
 
-			         ("WHERE end.id IS NULL GROUP BY rel.descendant") .
+			         ("WHERE end.id IS NULL GROUP BY rel.descendant").
 
 			         (") chk ON chk.id = ent.id SET ent.locked = 0");
 

Braces +33 added lines, -11 removed lines

@@ -19,7 +19,9 @@ 
 
 		private function getLink() {
 
-			if ('' === $this->data['slug']) return '';
+			if ('' === $this->data['slug']) {
+				return '';
+			}
 
 			return (INSTALL_PATH . '/' . $this->data['slug']);
 		}
@@ -28,7 +30,9 @@ 
 
 		private function getCanonical() {
 
-			if ('' === $this->data['slug']) return '';
+			if ('' === $this->data['slug']) {
+				return '';
+			}
 
 			return (Settings::get('system_url') . (($this->id !== 1) ? ('/' . $this->data['slug']) : ''));
 		}
@@ -48,7 +52,9 @@ 
 
 		public function initBySlug(string $slug) {
 
-			if (!$this->modifiable || (0 !== $this->id)) return false;
+			if (!$this->modifiable || (0 !== $this->id)) {
+				return false;
+			}
 
 			# Process value
 
@@ -58,7 +64,9 @@ 
 
 			$selection = array_keys($this->definition->params());
 
-			foreach ($selection as $key => $field) $selection[$key] = ('ent.' . $field);
+			foreach ($selection as $key => $field) {
+				$selection[$key] = ('ent.' . $field);
+			}
 
 			# Process query
 
@@ -74,7 +82,9 @@ 
 
 			# Select entity from DB
 
-			if (($this->error = !(DB::send($query) && DB::last()->status)) || (DB::last()->rows !== 1)) return false;
+			if (($this->error = !(DB::send($query) && DB::last()->status)) || (DB::last()->rows !== 1)) {
+				return false;
+			}
 
 			# ------------------------
 
@@ -85,7 +95,9 @@ 
 
 		public function updateSlugs() {
 
-			if (!$this->modifiable || (0 === $this->id)) return false;
+			if (!$this->modifiable || (0 === $this->id)) {
+				return false;
+			}
 
 			# Send lock/update request
 
@@ -103,7 +115,9 @@ 
 
 			         (") slg ON slg.id = ent.id SET ent.locked = 1, ent.slug = slg.slug");
 
-			if (!(DB::send($query) && DB::last()->status)) return false;
+			if (!(DB::send($query) && DB::last()->status)) {
+				return false;
+			}
 
 			# Send unlock request
 
@@ -119,7 +133,9 @@ 
 
 			         (") chk ON chk.id = ent.id SET ent.locked = 0");
 
-			if (!(DB::send($query) && DB::last()->status)) return false;
+			if (!(DB::send($query) && DB::last()->status)) {
+				return false;
+			}
 
 			# ------------------------
 
@@ -130,7 +146,9 @@ 
 
 		public function create(array $data) {
 
-			if (!parent::create($data)) return false;
+			if (!parent::create($data)) {
+				return false;
+			}
 
 			$this->updateSlugs();
 
@@ -143,7 +161,9 @@ 
 
 		public function edit(array $data) {
 
-			if (!parent::edit($data)) return false;
+			if (!parent::edit($data)) {
+				return false;
+			}
 
 			$this->updateSlugs();
 
@@ -156,7 +176,9 @@ 
 
 		public function move(int $parent_id) {
 
-			if (!parent::move($parent_id)) return false;
+			if (!parent::move($parent_id)) {
+				return false;
+			}
 
 			$this->updateSlugs();
 

www/engine/System/Classes/Modules/Entitizer/Form/Menuitem.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 Menuitem extends Form {
 

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 {