cadmium-org / cadmium-cms

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

Braces +9 added lines, -3 removed lines

@@ -29,9 +29,13 @@ 
 
 			# Check name exists
 
-			if (false === ($check_name = $this->widget->check($name, 'name'))) return 'WIDGET_ERROR_MODIFY';
+			if (false === ($check_name = $this->widget->check($name, 'name'))) {
+				return 'WIDGET_ERROR_MODIFY';
+			}
 
-			if ($check_name === 1) return ['name', 'WIDGET_ERROR_NAME_DUPLICATE'];
+			if ($check_name === 1) {
+				return ['name', 'WIDGET_ERROR_NAME_DUPLICATE'];
+			}
 
 			# Modify widget
 
@@ -44,7 +48,9 @@ 
 
 			$modifier = ((0 === $this->widget->id) ? 'create' : 'edit');
 
-			if (!$this->widget->$modifier($data)) return 'WIDGET_ERROR_MODIFY';
+			if (!$this->widget->$modifier($data)) {
+				return 'WIDGET_ERROR_MODIFY';
+			}
 
 			# ------------------------
 

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

Braces +9 added lines, -3 removed lines

@@ -29,9 +29,13 @@ 
 
 			# Check name exists
 
-			if (false === ($check_name = $this->variable->check($name, 'name'))) return 'VARIABLE_ERROR_MODIFY';
+			if (false === ($check_name = $this->variable->check($name, 'name'))) {
+				return 'VARIABLE_ERROR_MODIFY';
+			}
 
-			if ($check_name === 1) return ['name', 'VARIABLE_ERROR_NAME_DUPLICATE'];
+			if ($check_name === 1) {
+				return ['name', 'VARIABLE_ERROR_NAME_DUPLICATE'];
+			}
 
 			# Modify variable
 
@@ -43,7 +47,9 @@ 
 
 			$modifier = ((0 === $this->variable->id) ? 'create' : 'edit');
 
-			if (!$this->variable->$modifier($data)) return 'VARIABLE_ERROR_MODIFY';
+			if (!$this->variable->$modifier($data)) {
+				return 'VARIABLE_ERROR_MODIFY';
+			}
 
 			# ------------------------
 

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

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;
 

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

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

Spacing +17 added lines, -17 removed lines

@@ -22,19 +22,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
 
@@ -53,17 +53,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");
 
@@ -71,15 +71,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 +27 added lines, -9 removed lines

@@ -12,7 +12,9 @@ 
 
 		public function initBySlug(string $slug) {
 
-			if (0 !== $this->id) return false;
+			if (0 !== $this->id) {
+				return false;
+			}
 
 			# Process value
 
@@ -22,7 +24,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
 
@@ -38,7 +42,9 @@ 
 
 			# Select entity from DB
 
-			if (!(DB::send($query) && (DB::getLast()->rows === 1))) return false;
+			if (!(DB::send($query) && (DB::getLast()->rows === 1))) {
+				return false;
+			}
 
 			# ------------------------
 
@@ -49,7 +55,9 @@ 
 
 		public function updateSlugs() {
 
-			if (0 === $this->id) return false;
+			if (0 === $this->id) {
+				return false;
+			}
 
 			# Send lock/update request
 
@@ -67,7 +75,9 @@ 
 
 			         (") slg ON slg.id = ent.id SET ent.locked = 1, ent.slug = slg.slug");
 
-			if (!(DB::send($query) && DB::getLast()->status)) return false;
+			if (!(DB::send($query) && DB::getLast()->status)) {
+				return false;
+			}
 
 			# Send unlock request
 
@@ -83,7 +93,9 @@ 
 
 			         (") chk ON chk.id = ent.id SET ent.locked = 0");
 
-			if (!(DB::send($query) && DB::getLast()->status)) return false;
+			if (!(DB::send($query) && DB::getLast()->status)) {
+				return false;
+			}
 
 			# ------------------------
 
@@ -94,7 +106,9 @@ 
 
 		public function create(array $data) {
 
-			if (!parent::create($data)) return false;
+			if (!parent::create($data)) {
+				return false;
+			}
 
 			$this->updateSlugs();
 
@@ -107,7 +121,9 @@ 
 
 		public function edit(array $data) {
 
-			if (!parent::edit($data)) return false;
+			if (!parent::edit($data)) {
+				return false;
+			}
 
 			$this->updateSlugs();
 
@@ -120,7 +136,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/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;
+			}
 
 			# ------------------------
 

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']) : ''));
 			});
 		}
 	}