cadmium-org / cadmium-cms

www/engine/System/Classes/Modules/Profile/Controller/Password.php

Braces +15 added lines, -8 removed lines

@@ -20,23 +20,28 @@ 
 
 			# Validate values
 
-			if (false === ($password = Validate::userPassword($password)))
-
+			if (false === ($password = Validate::userPassword($password))) {
+			
 				return ['password', 'USER_ERROR_PASSWORD_INVALID'];
+			}
 
-			if (false === ($password_new = Validate::userPassword($password_new)))
-
+			if (false === ($password_new = Validate::userPassword($password_new))) {
+			
 				return ['password_new', 'USER_ERROR_PASSWORD_NEW_INVALID'];
+			}
 
-			if (0 !== strcmp($password_new, $password_retype))
-
+			if (0 !== strcmp($password_new, $password_retype)) {
+			
 				return ['password_retype', 'USER_ERROR_PASSWORD_MISMATCH'];
+			}
 
 			# Check password
 
 			$password = Str::encode(Auth::user()->auth_key, $password);
 
-			if (0 !== strcmp(Auth::user()->password, $password)) return ['password', 'USER_ERROR_PASSWORD_INCORRECT'];
+			if (0 !== strcmp(Auth::user()->password, $password)) {
+				return ['password', 'USER_ERROR_PASSWORD_INCORRECT'];
+			}
 
 			# Encode password
 
@@ -49,7 +54,9 @@ 
 			$data['auth_key']           = $auth_key;
 			$data['password']           = $password;
 
-			if (!Auth::user()->edit($data)) return 'USER_ERROR_EDIT_PASSWORD';
+			if (!Auth::user()->edit($data)) {
+				return 'USER_ERROR_EDIT_PASSWORD';
+			}
 
 			# ------------------------
 

www/engine/System/Classes/Modules/Profile/Controller/Personal.php

Braces +12 added lines, -4 removed lines

@@ -20,13 +20,19 @@ 
 
 			# Validate values
 
-			if (false === ($email = Validate::userEmail($email))) return ['email', 'USER_ERROR_EMAIL_INVALID'];
+			if (false === ($email = Validate::userEmail($email))) {
+				return ['email', 'USER_ERROR_EMAIL_INVALID'];
+			}
 
 			# Check email exists
 
-			if (false === ($check_email = Auth::user()->check($email, 'email'))) return 'USER_ERROR_EDIT_PERSONAL';
+			if (false === ($check_email = Auth::user()->check($email, 'email'))) {
+				return 'USER_ERROR_EDIT_PERSONAL';
+			}
 
-			if ($check_email === 1) return ['email', 'USER_ERROR_EMAIL_DUPLICATE'];
+			if ($check_email === 1) {
+				return ['email', 'USER_ERROR_EMAIL_DUPLICATE'];
+			}
 
 			# Update user
 
@@ -40,7 +46,9 @@ 
 			$data['country']            = $country;
 			$data['timezone']           = $timezone;
 
-			if (!Auth::user()->edit($data)) return 'USER_ERROR_EDIT_PERSONAL';
+			if (!Auth::user()->edit($data)) {
+				return 'USER_ERROR_EDIT_PERSONAL';
+			}
 
 			# ------------------------
 

www/engine/System/Classes/Modules/Install/Utils/Tables.php

Spacing +4 added lines, -4 removed lines

@@ -46,9 +46,9 @@ 
 
 			for ($id = 2; $id <= 4; $id++) $pages[] = ['id' => $id, 'visibility' => VISIBILITY_PUBLISHED,
 
-				'locked' => false, 'slug' => ('page-' . ($id - 1)), 'name' => ('page-' . ($id - 1)),
+				'locked' => false, 'slug' => ('page-'.($id - 1)), 'name' => ('page-'.($id - 1)),
 
-				'title' => (Language::get('INSTALL_PAGE_DEMO_TITLE') . ' ' . ($id - 1)),
+				'title' => (Language::get('INSTALL_PAGE_DEMO_TITLE').' '.($id - 1)),
 
 				'contents' => Template::block(Language::get('INSTALL_PAGE_DEMO_CONTENTS'))->contents(),
 
@@ -81,9 +81,9 @@ 
 
 			for ($id = 1; $id <= 3; $id++) $menu[] = [
 
-				'id' => $id, 'active' => true, 'position' => ($id - 1), 'slug' => ('page-' . $id),
+				'id' => $id, 'active' => true, 'position' => ($id - 1), 'slug' => ('page-'.$id),
 
-				'text' => (Language::get('INSTALL_PAGE_DEMO_TITLE') . ' ' . $id)];
+				'text' => (Language::get('INSTALL_PAGE_DEMO_TITLE').' '.$id)];
 
 			# Process insertion
 

Braces +25 added lines, -7 removed lines

@@ -30,7 +30,11 @@ 
 
 			$count = Informer::countEntries(TABLE_PAGES, true);
 
-			if (false === $count) return false; else if ($count > 0) return true;
+			if (false === $count) {
+				return false;
+			} else if ($count > 0) {
+				return true;
+			}
 
 			# Process dataset
 
@@ -44,7 +48,8 @@ 
 
 				'time_created' => REQUEST_TIME, 'time_modified' => REQUEST_TIME]];
 
-			for ($id = 2; $id <= 4; $id++) $pages[] = ['id' => $id, 'visibility' => VISIBILITY_PUBLISHED,
+			for ($id = 2; $id <= 4; $id++) {
+				$pages[] = ['id' => $id, 'visibility' => VISIBILITY_PUBLISHED,
 
 				'locked' => false, 'slug' => ('page-' . ($id - 1)), 'name' => ('page-' . ($id - 1)),
 
@@ -53,10 +58,13 @@ 
 				'contents' => Template::createBlock(Language::get('INSTALL_PAGE_DEMO_CONTENTS'))->getContents(),
 
 				'time_created' => REQUEST_TIME, 'time_modified' => REQUEST_TIME];
+			}
 
 			# Process insertion
 
-			if (!(DB::insert(TABLE_PAGES, $pages, true) && DB::getLast()->status)) return false;
+			if (!(DB::insert(TABLE_PAGES, $pages, true) && DB::getLast()->status)) {
+				return false;
+			}
 
 			self::fillRelationsTable(TABLE_PAGES_RELATIONS, 4);
 
@@ -73,21 +81,29 @@ 
 
 			$count = Informer::countEntries(TABLE_MENU, true);
 
-			if (false === $count) return false; else if ($count > 0) return true;
+			if (false === $count) {
+				return false;
+			} else if ($count > 0) {
+				return true;
+			}
 
 			# Process dataset
 
 			$menu = [];
 
-			for ($id = 1; $id <= 3; $id++) $menu[] = [
+			for ($id = 1; $id <= 3; $id++) {
+				$menu[] = [
 
 				'id' => $id, 'active' => true, 'position' => ($id - 1), 'slug' => ('page-' . $id),
 
 				'text' => (Language::get('INSTALL_PAGE_DEMO_TITLE') . ' ' . $id)];
+			}
 
 			# Process insertion
 
-			if (!(DB::insert(TABLE_MENU, $menu, true) && DB::getLast()->status)) return false;
+			if (!(DB::insert(TABLE_MENU, $menu, true) && DB::getLast()->status)) {
+				return false;
+			}
 
 			self::fillRelationsTable(TABLE_MENU_RELATIONS, 3);
 
@@ -116,7 +132,9 @@ 
 
 			$definitions[] = Entitizer::definition(TABLE_USERS_SESSIONS);
 
-			foreach ($definitions as $definition) if (!$definition->createTable()) return false;
+			foreach ($definitions as $definition) {
+				if (!$definition->createTable()) return false;
+			}
 
 			# ------------------------
 

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

@@ -2,7 +2,11 @@
 
 namespace Modules\Install\Utils {
 
-	use Modules\Entitizer, Modules\Informer, DB, Language, Template;
+	use Modules\Entitizer;
+	use Modules\Informer;
+	use DB;
+	use Language;
+	use Template;
 
 	abstract class Tables {
 

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 Page extends Form {
 

www/engine/System/Classes/Modules/Entitizer/Definition/User/Secret.php

Spacing +7 added lines, -7 removed lines

@@ -14,19 +14,19 @@
 
 			# Add params
 
-			$this->params->textual      ('code',                true, 40, true, '');
-			$this->params->textual      ('ip',                  true, 255, false, '');
-			$this->params->integer      ('time',                false, 10, true, 0);
+			$this->params->textual('code', true, 40, true, '');
+			$this->params->textual('ip', true, 255, false, '');
+			$this->params->integer('time', false, 10, true, 0);
 
 			# Add indexes
 
-			$this->indexes->add         ('code',                'UNIQUE');
-			$this->indexes->add         ('ip');
-			$this->indexes->add         ('time');
+			$this->indexes->add('code', 'UNIQUE');
+			$this->indexes->add('ip');
+			$this->indexes->add('time');
 
 			# Add foreign keys
 
-			$this->foreigns->add        ('id',                  TABLE_USERS, 'id', 'CASCADE', 'RESTRICT');
+			$this->foreigns->add('id', TABLE_USERS, 'id', 'CASCADE', 'RESTRICT');
 		}
 	}
 }

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

Braces +6 added lines, -2 removed lines

@@ -19,14 +19,18 @@
 
 			$this->addHandler('link', function (array $data) {
 
-				if ('' === $data['slug']) return '';
+				if ('' === $data['slug']) {
+					return '';
+				}
 
 				return (INSTALL_PATH . '/' . $data['slug']);
 			});
 
 			$this->addHandler('canonical', function (array $data) {
 
-				if ('' === $data['slug']) return '';
+				if ('' === $data['slug']) {
+					return '';
+				}
 
 				return (Settings::get('system_url') . (($data['id'] !== 1) ? ('/' . $data['slug']) : ''));
 			});

Spacing +5 added lines, -5 removed lines

@@ -12,23 +12,23 @@
 
 		protected function init() {
 
-			$this->addWorker('active', function (array $data) {
+			$this->addWorker('active', function(array $data) {
 
 				return (($data['visibility'] === VISIBILITY_PUBLISHED) && !$data['locked']);
 			});
 
-			$this->addWorker('link', function (array $data) {
+			$this->addWorker('link', function(array $data) {
 
 				if ('' === $data['slug']) return '';
 
-				return (INSTALL_PATH . '/' . $data['slug']);
+				return (INSTALL_PATH.'/'.$data['slug']);
 			});
 
-			$this->addWorker('canonical', function (array $data) {
+			$this->addWorker('canonical', function(array $data) {
 
 				if ('' === $data['slug']) return '';
 
-				return (Settings::get('system_url') . (($data['id'] !== 1) ? ('/' . $data['slug']) : ''));
+				return (Settings::get('system_url').(($data['id'] !== 1) ? ('/'.$data['slug']) : ''));
 			});
 		}
 	}

www/engine/System/Classes/Modules/Entitizer/Dataset/Menuitem.php

Braces +6 added lines, -2 removed lines

@@ -14,9 +14,13 @@
 
 			$this->addHandler('link', function (array $data) {
 
-				if ('' === $data['slug']) return '';
+				if ('' === $data['slug']) {
+					return '';
+				}
 
-				if (false !== Validate::url($data['slug'])) return $data['slug'];
+				if (false !== Validate::url($data['slug'])) {
+					return $data['slug'];
+				}
 
 				return (INSTALL_PATH . '/' . $data['slug']);
 			});

Spacing +2 added lines, -2 removed lines

@@ -12,13 +12,13 @@
 
 		protected function init() {
 
-			$this->addWorker('link', function (array $data) {
+			$this->addWorker('link', function(array $data) {
 
 				if ('' === $data['slug']) return '';
 
 				if (false !== Validate::url($data['slug'])) return $data['slug'];
 
-				return (INSTALL_PATH . '/' . $data['slug']);
+				return (INSTALL_PATH.'/'.$data['slug']);
 			});
 		}
 	}

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

Spacing +2 added lines, -2 removed lines

@@ -32,7 +32,7 @@ 
 
 			$selection = [];
 
-			foreach ($this->definition->paramsSecure() as $field) $selection[] = ('ent.' . $field);
+			foreach ($this->definition->paramsSecure() as $field) $selection[] = ('ent.'.$field);
 
 			# ------------------------
 
@@ -45,7 +45,7 @@ 
 
 			$order_by = [];
 
-			foreach ($this->castOrderBy($data) as $field => $direction) $order_by[] = ('ent.' . $field . ' ' . $direction);
+			foreach ($this->castOrderBy($data) as $field => $direction) $order_by[] = ('ent.'.$field.' '.$direction);
 
 			# ------------------------
 

Braces +9 added lines, -3 removed lines

@@ -16,7 +16,9 @@ 
 
 			foreach ($data as $field => $direction) {
 
-				if (false === ($param = $this->definition->param($field))) continue;
+				if (false === ($param = $this->definition->param($field))) {
+					continue;
+				}
 
 				$order_by[$param->name] = ((strtoupper($direction) !== 'DESC') ? 'ASC' : 'DESC');
 			}
@@ -32,7 +34,9 @@ 
 
 			$selection = [];
 
-			foreach ($this->definition->paramsSecure() as $field) $selection[] = ('ent.' . $field);
+			foreach ($this->definition->paramsSecure() as $field) {
+				$selection[] = ('ent.' . $field);
+			}
 
 			# ------------------------
 
@@ -45,7 +49,9 @@ 
 
 			$order_by = [];
 
-			foreach ($this->castOrderBy($data) as $field => $direction) $order_by[] = ('ent.' . $field . ' ' . $direction);
+			foreach ($this->castOrderBy($data) as $field => $direction) {
+				$order_by[] = ('ent.' . $field . ' ' . $direction);
+			}
 
 			# ------------------------
 

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

@@ -2,7 +2,8 @@
 
 namespace Modules\Entitizer\Utils {
 
-	use Modules\Entitizer, Dataset as Config;
+	use Modules\Entitizer;
+	use Dataset as Config;
 
 	abstract class Collection {
 

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

Indentation +8 added lines, -8 removed lines

@@ -12,7 +12,7 @@ 
 
 			return (0 !== $parent_id) ? (("JOIN " . static::$table_relations . " rel ") .
 
-			       ("ON rel.ancestor = " . $parent_id . " AND rel.descendant = ent.id AND rel.depth >= 1")) :
+				   ("ON rel.ancestor = " . $parent_id . " AND rel.descendant = ent.id AND rel.depth >= 1")) :
 
 				   ("JOIN " . static::$table_relations . " rel ON rel.descendant = ent.id");
 		}
@@ -23,13 +23,13 @@ 
 
 			return ("SELECT " . $this->getSelection() . ", COALESCE(par.ancestor, 0) as parent_id ") .
 
-			       ("FROM " . static::$table . " ent " . $this->getQueryJoin($parent_id) . " ") .
+				   ("FROM " . static::$table . " ent " . $this->getQueryJoin($parent_id) . " ") .
 
-			       ("LEFT JOIN " . static::$table_relations . " par ON par.descendant = ent.id AND par.depth = 1 ") .
+				   ("LEFT JOIN " . static::$table_relations . " par ON par.descendant = ent.id AND par.depth = 1 ") .
 
-			       (('' !== ($condition = $this->getCondition($config))) ? ("WHERE " . $condition . " ") : "") .
+				   (('' !== ($condition = $this->getCondition($config))) ? ("WHERE " . $condition . " ") : "") .
 
-			       ("GROUP BY ent.id ORDER BY MAX(rel.depth) ASC, " . $this->getOrderBy($order_by));
+				   ("GROUP BY ent.id ORDER BY MAX(rel.depth) ASC, " . $this->getOrderBy($order_by));
 		}
 
 		# Get count query
@@ -38,7 +38,7 @@ 
 
 			return ("SELECT COUNT(DISTINCT ent.id) as count FROM " . static::$table . " ent ") .
 
-			       $this->getQueryJoin($parent_id);
+				   $this->getQueryJoin($parent_id);
 		}
 
 		# Get depth query
@@ -47,7 +47,7 @@ 
 
 			$query = ("SELECT COUNT(DISTINCT rel.depth) as depth FROM " . static::$table . " ent ") .
 
-			         $this->getQueryJoin($parent_id);
+					 $this->getQueryJoin($parent_id);
 
 			# ------------------------
 
@@ -128,7 +128,7 @@ 
 
 			$query = ("SELECT " . $this->getSelection() . " FROM " . static::$table . " ent ") .
 
-			         ("JOIN " . static::$table_relations . " rel ON rel.ancestor = ent.id ") .
+					 ("JOIN " . static::$table_relations . " rel ON rel.ancestor = ent.id ") .
 
 					 ("WHERE rel.descendant = " . $parent_id . " ORDER BY rel.depth DESC");
 

Spacing +12 added lines, -14 removed lines

@@ -10,33 +10,31 @@ 
 
 		protected function getQueryJoin(int $parent_id) {
 
-			return (0 !== $parent_id) ? (("JOIN " . static::$table_relations . " rel ") .
+			return (0 !== $parent_id) ? (("JOIN ".static::$table_relations." rel ").
 
-			       ("ON rel.ancestor = " . $parent_id . " AND rel.descendant = ent.id AND rel.depth >= 1")) :
-
-				   ("JOIN " . static::$table_relations . " rel ON rel.descendant = ent.id");
+			       ("ON rel.ancestor = ".$parent_id." AND rel.descendant = ent.id AND rel.depth >= 1")) : ("JOIN ".static::$table_relations." rel ON rel.descendant = ent.id");
 		}
 
 		# Get select query
 
 		private function getSelectQuery(int $parent_id, array $config, array $order_by) {
 
-			return ("SELECT " . $this->getSelection() . ", COALESCE(par.ancestor, 0) as parent_id ") .
+			return ("SELECT ".$this->getSelection().", COALESCE(par.ancestor, 0) as parent_id ").
 
-			       ("FROM " . static::$table . " ent " . $this->getQueryJoin($parent_id) . " ") .
+			       ("FROM ".static::$table." ent ".$this->getQueryJoin($parent_id)." ").
 
-			       ("LEFT JOIN " . static::$table_relations . " par ON par.descendant = ent.id AND par.depth = 1 ") .
+			       ("LEFT JOIN ".static::$table_relations." par ON par.descendant = ent.id AND par.depth = 1 ").
 
-			       (('' !== ($condition = $this->getCondition($config))) ? ("WHERE " . $condition . " ") : "") .
+			       (('' !== ($condition = $this->getCondition($config))) ? ("WHERE ".$condition." ") : "").
 
-			       ("GROUP BY ent.id ORDER BY MAX(rel.depth) ASC, " . $this->getOrderBy($order_by));
+			       ("GROUP BY ent.id ORDER BY MAX(rel.depth) ASC, ".$this->getOrderBy($order_by));
 		}
 
 		# Get count query
 
 		private function getCountQuery(int $parent_id) {
 
-			return ("SELECT COUNT(DISTINCT ent.id) as count FROM " . static::$table . " ent ") .
+			return ("SELECT COUNT(DISTINCT ent.id) as count FROM ".static::$table." ent ").
 
 			       $this->getQueryJoin($parent_id);
 		}
@@ -45,7 +43,7 @@ 
 
 		private function getDepthQuery(int $parent_id) {
 
-			$query = ("SELECT COUNT(DISTINCT rel.depth) as depth FROM " . static::$table . " ent ") .
+			$query = ("SELECT COUNT(DISTINCT rel.depth) as depth FROM ".static::$table." ent ").
 
 			         $this->getQueryJoin($parent_id);
 
@@ -126,11 +124,11 @@ 
 
 			# Process query
 
-			$query = ("SELECT " . $this->getSelection() . " FROM " . static::$table . " ent ") .
+			$query = ("SELECT ".$this->getSelection()." FROM ".static::$table." ent ").
 
-			         ("JOIN " . static::$table_relations . " rel ON rel.ancestor = ent.id ") .
+			         ("JOIN ".static::$table_relations." rel ON rel.ancestor = ent.id ").
 
-					 ("WHERE rel.descendant = " . $parent_id . " ORDER BY rel.depth DESC");
+					 ("WHERE rel.descendant = ".$parent_id." ORDER BY rel.depth DESC");
 
 			# Select path
 

Braces +27 added lines, -9 removed lines

@@ -58,13 +58,17 @@ 
 
 		public function subtree(int $parent_id = 0, array $config = [], array $order_by = []) {
 
-			if (!(static::$nesting && ($parent_id >= 0))) return false;
+			if (!(static::$nesting && ($parent_id >= 0))) {
+				return false;
+			}
 
 			# Select entities
 
 			$query = $this->getSelectQuery($parent_id, $config, $order_by);
 
-			if (!(DB::send($query) && DB::getLast()->status)) return false;
+			if (!(DB::send($query) && DB::getLast()->status)) {
+				return false;
+			}
 
 			# Process results
 
@@ -88,13 +92,17 @@ 
 
 		public function subtreeCount(int $parent_id = 0) {
 
-			if (!(static::$nesting && ($parent_id >= 0))) return false;
+			if (!(static::$nesting && ($parent_id >= 0))) {
+				return false;
+			}
 
 			# Get count
 
 			$query = $this->getCountQuery($parent_id);
 
-			if (!(DB::send($query) && DB::getLast()->status)) return false;
+			if (!(DB::send($query) && DB::getLast()->status)) {
+				return false;
+			}
 
 			# ------------------------
 
@@ -105,13 +113,17 @@ 
 
 		public function subtreeDepth(int $parent_id = 0) {
 
-			if (!(static::$nesting && ($parent_id >= 0))) return false;
+			if (!(static::$nesting && ($parent_id >= 0))) {
+				return false;
+			}
 
 			# Get depth
 
 			$query = $this->getDepthQuery($parent_id);
 
-			if (!(DB::send($query) && DB::getLast()->status)) return false;
+			if (!(DB::send($query) && DB::getLast()->status)) {
+				return false;
+			}
 
 			# ------------------------
 
@@ -122,7 +134,9 @@ 
 
 		public function path(int $parent_id = 0) {
 
-			if (!(static::$nesting && ($parent_id >= 0))) return false;
+			if (!(static::$nesting && ($parent_id >= 0))) {
+				return false;
+			}
 
 			# Process query
 
@@ -134,13 +148,17 @@ 
 
 			# Select path
 
-			if (!(DB::send($query) && DB::getLast()->status)) return false;
+			if (!(DB::send($query) && DB::getLast()->status)) {
+				return false;
+			}
 
 			# Process results
 
 			$path = [];
 
-			while (null !== ($data = DB::getLast()->getRow())) $path[] = Entitizer::dataset(static::$table, $data)->data();
+			while (null !== ($data = DB::getLast()->getRow())) {
+				$path[] = Entitizer::dataset(static::$table, $data)->data();
+			}
 
 			# ------------------------