cadmium-org / cadmium-cms

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

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

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

@@ -2,7 +2,8 @@
 
 namespace Modules\Entitizer\Utils {
 
-	use Modules\Entitizer, DB;
+	use Modules\Entitizer;
+	use DB;
 
 	abstract class Entity extends Entitizer {
 

Indentation +3 added lines, -3 removed lines

@@ -24,11 +24,11 @@
 
 			$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." . $name . " = '" . addslashes($value) . "' LIMIT 1");
+					 ("WHERE ent." . $name . " = '" . addslashes($value) . "' LIMIT 1");
 
 			# ------------------------
 

Spacing +6 added lines, -6 removed lines

@@ -18,17 +18,17 @@ 
 
 			$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." . $name . " = '" . addslashes($value) . "' LIMIT 1");
+			         ("WHERE ent.".$name." = '".addslashes($value)."' LIMIT 1");
 
 			# ------------------------
 
@@ -133,7 +133,7 @@ 
 
 			# Select entity from DB
 
-			$condition = ($name . " = '" . addslashes($value) . "' AND id != " . $this->id);
+			$condition = ($name." = '".addslashes($value)."' AND id != ".$this->id);
 
 			DB::select(static::$table, 'id', $condition, null, 1);
 

Braces +23 added lines, -7 removed lines

@@ -27,7 +27,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
 
@@ -87,13 +89,19 @@ 
 
 		public function init($value, string $name = 'id') {
 
-			if (0 !== $this->id) return false;
+			if (0 !== $this->id) {
+				return false;
+			}
 
 			# Get initiation index
 
-			if (false === ($index = $this->definition->index($name))) return false;
+			if (false === ($index = $this->definition->index($name))) {
+				return false;
+			}
 
-			if (($index->type !== 'PRIMARY') && ($index->type !== 'UNIQUE')) return false;
+			if (($index->type !== 'PRIMARY') && ($index->type !== 'UNIQUE')) {
+				return false;
+			}
 
 			# Process name & value
 
@@ -101,7 +109,11 @@ 
 
 			# Select entity from DB
 
-			if (!static::$nesting) $this->selectDefault($name, $value); else $this->selectNesting($name, $value);
+			if (!static::$nesting) {
+				$this->selectDefault($name, $value);
+			} else {
+				$this->selectNesting($name, $value);
+			}
 
 			# ------------------------
 
@@ -114,9 +126,13 @@ 
 
 			# Get initiation index
 
-			if (false === ($index = $this->definition->index($name))) return false;
+			if (false === ($index = $this->definition->index($name))) {
+				return false;
+			}
 
-			if ($index->type !== 'UNIQUE') return false;
+			if ($index->type !== 'UNIQUE') {
+				return false;
+			}
 
 			# Process name & value
 

www/engine/System/Classes/Modules/Entitizer/Utils/Entity/Modify.php

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

@@ -2,7 +2,8 @@
 
 namespace Modules\Entitizer\Utils {
 
-	use Modules\Entitizer, DB;
+	use Modules\Entitizer;
+	use DB;
 
 	abstract class Entity extends Entitizer {
 

Indentation +8 added lines, -8 removed lines

@@ -27,13 +27,13 @@ 
 
 			$query = ("DELETE rla FROM " . static::$table_relations . " rla ") .
 
-			         ("JOIN "  . static::$table_relations . " rlb ON rlb.descendant = rla.descendant ") .
+					 ("JOIN "  . static::$table_relations . " rlb ON rlb.descendant = rla.descendant ") .
 
-			         ("LEFT JOIN " . static::$table_relations . " rlx ") .
+					 ("LEFT JOIN " . static::$table_relations . " rlx ") .
 
-			         ("ON rlx.ancestor = rlb.ancestor AND rlx.descendant = rla.ancestor ") .
+					 ("ON rlx.ancestor = rlb.ancestor AND rlx.descendant = rla.ancestor ") .
 
-			         ("WHERE rlb.ancestor = " . $this->id . " AND rlx.ancestor IS NULL");
+					 ("WHERE rlb.ancestor = " . $this->id . " AND rlx.ancestor IS NULL");
 
 			if (!(DB::send($query) && DB::last()->status)) return false;
 
@@ -52,13 +52,13 @@ 
 
 			$query = ("INSERT INTO " . static::$table_relations . " (ancestor, descendant, depth) ") .
 
-			         ("SELECT sup.ancestor, sub.descendant, sup.depth + sub.depth + 1 ") .
+					 ("SELECT sup.ancestor, sub.descendant, sup.depth + sub.depth + 1 ") .
 
-			         ("FROM " . static::$table_relations . " sup ") .
+					 ("FROM " . static::$table_relations . " sup ") .
 
-			         ("JOIN " . static::$table_relations . " sub ") .
+					 ("JOIN " . static::$table_relations . " sub ") .
 
-			         ("WHERE sub.ancestor = " . $this->id . " AND sup.descendant = " . $parent_id);
+					 ("WHERE sub.ancestor = " . $this->id . " AND sup.descendant = " . $parent_id);
 
 			if (!(DB::send($query) && DB::last()->status)) return false;
 

Spacing +10 added lines, -10 removed lines

@@ -25,15 +25,15 @@ 
 
 		private function disconnectSubtree() {
 
-			$query = ("DELETE rla FROM " . static::$table_relations . " rla ") .
+			$query = ("DELETE rla FROM ".static::$table_relations." rla ").
 
-			         ("JOIN "  . static::$table_relations . " rlb ON rlb.descendant = rla.descendant ") .
+			         ("JOIN ".static::$table_relations." rlb ON rlb.descendant = rla.descendant ").
 
-			         ("LEFT JOIN " . static::$table_relations . " rlx ") .
+			         ("LEFT JOIN ".static::$table_relations." rlx ").
 
-			         ("ON rlx.ancestor = rlb.ancestor AND rlx.descendant = rla.ancestor ") .
+			         ("ON rlx.ancestor = rlb.ancestor AND rlx.descendant = rla.ancestor ").
 
-			         ("WHERE rlb.ancestor = " . $this->id . " AND rlx.ancestor IS NULL");
+			         ("WHERE rlb.ancestor = ".$this->id." AND rlx.ancestor IS NULL");
 
 			if (!(DB::send($query) && DB::last()->status)) return false;
 
@@ -50,15 +50,15 @@ 
 
 		private function connectSubtree(int $parent_id) {
 
-			$query = ("INSERT INTO " . static::$table_relations . " (ancestor, descendant, depth) ") .
+			$query = ("INSERT INTO ".static::$table_relations." (ancestor, descendant, depth) ").
 
-			         ("SELECT sup.ancestor, sub.descendant, sup.depth + sub.depth + 1 ") .
+			         ("SELECT sup.ancestor, sub.descendant, sup.depth + sub.depth + 1 ").
 
-			         ("FROM " . static::$table_relations . " sup ") .
+			         ("FROM ".static::$table_relations." sup ").
 
-			         ("JOIN " . static::$table_relations . " sub ") .
+			         ("JOIN ".static::$table_relations." sub ").
 
-			         ("WHERE sub.ancestor = " . $this->id . " AND sup.descendant = " . $parent_id);
+			         ("WHERE sub.ancestor = ".$this->id." AND sup.descendant = ".$parent_id);
 
 			if (!(DB::send($query) && DB::last()->status)) return false;
 

Braces +66 added lines, -22 removed lines

@@ -35,7 +35,9 @@ 
 
 			         ("WHERE rlb.ancestor = " . $this->id . " AND rlx.ancestor IS NULL");
 
-			if (!(DB::send($query) && DB::getLast()->status)) return false;
+			if (!(DB::send($query) && DB::getLast()->status)) {
+				return false;
+			}
 
 			# Set path
 
@@ -60,7 +62,9 @@ 
 
 			         ("WHERE sub.ancestor = " . $this->id . " AND sup.descendant = " . $parent_id);
 
-			if (!(DB::send($query) && (DB::getLast()->rows > 0))) return false;
+			if (!(DB::send($query) && (DB::getLast()->rows > 0))) {
+				return false;
+			}
 
 			# Set path
 
@@ -75,27 +79,37 @@ 
 
 		public function create(array $data) {
 
-			if (0 !== $this->id) return false;
+			if (0 !== $this->id) {
+				return false;
+			}
 
 			$data = $this->dataset->cast($data);
 
-			if (static::$auto_increment && isset($data['id'])) $data['id'] = 0;
+			if (static::$auto_increment && isset($data['id'])) {
+				$data['id'] = 0;
+			}
 
 			# Insert entity
 
 			DB::insert(static::$table, $data);
 
-			if (!(DB::getLast() && DB::getLast()->status)) return false;
+			if (!(DB::getLast() && DB::getLast()->status)) {
+				return false;
+			}
 
 			# Update data
 
-			if (static::$auto_increment) $data['id'] = DB::getLast()->id;
+			if (static::$auto_increment) {
+				$data['id'] = DB::getLast()->id;
+			}
 
 			$this->dataset->update($data);
 
 			# Init subtreee
 
-			if (static::$nesting) $this->initSubtree();
+			if (static::$nesting) {
+				$this->initSubtree();
+			}
 
 			# Cache entity
 
@@ -110,17 +124,23 @@ 
 
 		public function edit(array $data) {
 
-			if (0 === $this->id) return false;
+			if (0 === $this->id) {
+				return false;
+			}
 
 			$data = $this->dataset->cast($data);
 
-			if (isset($data['id'])) unset($data['id']);
+			if (isset($data['id'])) {
+				unset($data['id']);
+			}
 
 			# Update entity
 
 			DB::update(static::$table, $data, ['id' => $this->id]);
 
-			if (!(DB::getLast() && DB::getLast()->status)) return false;
+			if (!(DB::getLast() && DB::getLast()->status)) {
+				return false;
+			}
 
 			# Update data
 
@@ -128,7 +148,9 @@ 
 
 			# Init subtreee
 
-			if (static::$nesting) $this->initSubtree();
+			if (static::$nesting) {
+				$this->initSubtree();
+			}
 
 			# ------------------------
 
@@ -139,30 +161,44 @@ 
 
 		public function move(int $parent_id) {
 
-			if (0 === $this->id) return false;
+			if (0 === $this->id) {
+				return false;
+			}
 
 			# Re-connect entity if not in tree
 
-			if (!$this->initSubtree()) return false;
+			if (!$this->initSubtree()) {
+				return false;
+			}
 
 			# Create parent entity
 
 			if (0 !== ($parent = Entitizer::get(static::$table, $parent_id))->id) {
 
-				if (false === ($path = $parent->path())) return false;
+				if (false === ($path = $parent->path())) {
+					return false;
+				}
 
-				if (false === ($depth = $this->subtreeDepth())) return false;
+				if (false === ($depth = $this->subtreeDepth())) {
+					return false;
+				}
 
-				if ((count($path) + $depth + 1) > CONFIG_ENTITIZER_MAX_DEPTH) return false;
+				if ((count($path) + $depth + 1) > CONFIG_ENTITIZER_MAX_DEPTH) {
+					return false;
+				}
 			}
 
 			# Disconnect subtree from current position
 
-			if (!$this->disconnectSubtree()) return false;
+			if (!$this->disconnectSubtree()) {
+				return false;
+			}
 
 			# Connect subtree under new position
 
-		 	if (0 !== $parent->id) $this->connectSubtree($parent->id);
+		 	if (0 !== $parent->id) {
+		 		$this->connectSubtree($parent->id);
+		 	}
 
 			# ------------------------
 
@@ -173,19 +209,27 @@ 
 
 		public function remove() {
 
-			if (0 === $this->id) return false;
+			if (0 === $this->id) {
+				return false;
+			}
 
 			# Check if entity is removable
 
-			if (static::$super && ($this->id === 1)) return false;
+			if (static::$super && ($this->id === 1)) {
+				return false;
+			}
 
-			if (static::$nesting && (0 !== $this->subtreeCount())) return false;
+			if (static::$nesting && (0 !== $this->subtreeCount())) {
+				return false;
+			}
 
 			# Remove entity
 
 			DB::delete(static::$table, ['id' => $this->id]);
 
-			if (!(DB::getLast() && DB::getLast()->status)) return false;
+			if (!(DB::getLast() && DB::getLast()->status)) {
+				return false;
+			}
 
 			# Uncache entity
 

www/engine/Framework/Classes/DB/Query/Insert.php

Spacing +3 added lines, -3 removed lines

@@ -24,14 +24,14 @@
 
 				if (0 === $key) $names = $this->getString(array_keys($row), '$name', ', ');
 
-				$values[] = ('(' . $this->getString(array_values($row), '$value', ', ') . ')');
+				$values[] = ('('.$this->getString(array_values($row), '$value', ', ').')');
 			}
 
 			# Build query
 
-			$this->query = ('INSERT ' . ($ignore ? 'IGNORE ' : '') .
+			$this->query = ('INSERT '.($ignore ? 'IGNORE ' : '').
 
-				'INTO ' . $table . ' (' . $names . ') VALUES ' . implode(', ', $values));
+				'INTO '.$table.' ('.$names.') VALUES '.implode(', ', $values));
 		}
 	}
 }

Braces +3 added lines, -1 removed lines

@@ -29,9 +29,11 @@
 
 			$names = ''; $values = [];
 
-			foreach ($set as $key => $row) if (is_array($row)) {
+			foreach ($set as $key => $row) {
+				if (is_array($row)) {
 
 				if (0 === $key) $names = $this->getString(array_keys($row), '$name', ', ');
+			}
 
 				$values[] = ('(' . $this->getString(array_values($row), '$value', ', ') . ')');
 			}

www/engine/System/Includes/Tables.php

Spacing +9 added lines, -9 removed lines

@@ -2,15 +2,15 @@
 
 # Database tables
 
-define('TABLE_PAGES',                               'pages');
-define('TABLE_PAGES_RELATIONS',                     'pages_relations');
+define('TABLE_PAGES', 'pages');
+define('TABLE_PAGES_RELATIONS', 'pages_relations');
 
-define('TABLE_MENU',                                'menu');
-define('TABLE_MENU_RELATIONS',                      'menu_relations');
+define('TABLE_MENU', 'menu');
+define('TABLE_MENU_RELATIONS', 'menu_relations');
 
-define('TABLE_VARIABLES',                           'variables');
-define('TABLE_WIDGETS',                             'widgets');
+define('TABLE_VARIABLES', 'variables');
+define('TABLE_WIDGETS', 'widgets');
 
-define('TABLE_USERS',                               'users');
-define('TABLE_USERS_SECRETS',                       'users_secrets');
-define('TABLE_USERS_SESSIONS',                      'users_sessions');
+define('TABLE_USERS', 'users');
+define('TABLE_USERS_SECRETS', 'users_secrets');
+define('TABLE_USERS_SESSIONS', 'users_sessions');

www/engine/System/Includes/Config.php

Spacing +61 added lines, -61 removed lines

@@ -2,126 +2,126 @@
 
 # Admin ip
 
-define('CONFIG_ADMIN_IP',                           '');
+define('CONFIG_ADMIN_IP', '');
 
 # Session
 
-define('CONFIG_SESSION_NAME',                       '_sessid');
-define('CONFIG_SESSION_LIFETIME',                   2592000);       # 30 days
+define('CONFIG_SESSION_NAME', '_sessid');
+define('CONFIG_SESSION_LIFETIME', 2592000); # 30 days
 
 # Language
 
-define('CONFIG_LANGUAGE_COOKIE_EXPIRES',            30758400);      # 356 days
+define('CONFIG_LANGUAGE_COOKIE_EXPIRES', 30758400); # 356 days
 
 # Template
 
-define('CONFIG_TEMPLATE_COOKIE_EXPIRES',            30758400);      # 356 days
+define('CONFIG_TEMPLATE_COOKIE_EXPIRES', 30758400); # 356 days
 
 # Entitizer
 
-define('CONFIG_ENTITIZER_MAX_DEPTH',                6);
+define('CONFIG_ENTITIZER_MAX_DEPTH', 6);
 
 # Page
 
-define('CONFIG_PAGE_TITLE_MAX_LENGTH',              255);
-define('CONFIG_PAGE_NAME_MAX_LENGTH',               40);
-define('CONFIG_PAGE_DESCRIPTION_MAX_LENGTH',        512);
-define('CONFIG_PAGE_KEYWORDS_MAX_LENGTH',           512);
+define('CONFIG_PAGE_TITLE_MAX_LENGTH', 255);
+define('CONFIG_PAGE_NAME_MAX_LENGTH', 40);
+define('CONFIG_PAGE_DESCRIPTION_MAX_LENGTH', 512);
+define('CONFIG_PAGE_KEYWORDS_MAX_LENGTH', 512);
 
 # Menuitem
 
-define('CONFIG_MENUITEM_TEXT_MAX_LENGTH',           255);
-define('CONFIG_MENUITEM_SLUG_MAX_LENGTH',           255);
-define('CONFIG_MENUITEM_POSITION_MAX_LENGTH',       2);
+define('CONFIG_MENUITEM_TEXT_MAX_LENGTH', 255);
+define('CONFIG_MENUITEM_SLUG_MAX_LENGTH', 255);
+define('CONFIG_MENUITEM_POSITION_MAX_LENGTH', 2);
 
 # Variables
 
-define('CONFIG_VARIABLE_TITLE_MAX_LENGTH',          64);
-define('CONFIG_VARIABLE_NAME_MAX_LENGTH',           32);
-define('CONFIG_VARIABLE_VALUE_MAX_LENGTH',          255);
+define('CONFIG_VARIABLE_TITLE_MAX_LENGTH', 64);
+define('CONFIG_VARIABLE_NAME_MAX_LENGTH', 32);
+define('CONFIG_VARIABLE_VALUE_MAX_LENGTH', 255);
 
 # Widgets
 
-define('CONFIG_WIDGET_TITLE_MAX_LENGTH',            64);
-define('CONFIG_WIDGET_NAME_MAX_LENGTH',             32);
+define('CONFIG_WIDGET_TITLE_MAX_LENGTH', 64);
+define('CONFIG_WIDGET_NAME_MAX_LENGTH', 32);
 
 # Filemanager
 
-define('CONFIG_FILEMANAGER_NAME_MAX_LENGTH',        128);
+define('CONFIG_FILEMANAGER_NAME_MAX_LENGTH', 128);
 
 # User
 
-define('CONFIG_USER_SESSION_LIFETIME',              604800);        # 7 days
-define('CONFIG_USER_SECRET_LIFETIME',               86400);         # 1 day
+define('CONFIG_USER_SESSION_LIFETIME', 604800); # 7 days
+define('CONFIG_USER_SECRET_LIFETIME', 86400); # 1 day
 
-define('CONFIG_USER_NAME_MIN_LENGTH',               4);
-define('CONFIG_USER_NAME_MAX_LENGTH',               16);
+define('CONFIG_USER_NAME_MIN_LENGTH', 4);
+define('CONFIG_USER_NAME_MAX_LENGTH', 16);
 
-define('CONFIG_USER_PASSWORD_MIN_LENGTH',           4);
-define('CONFIG_USER_PASSWORD_MAX_LENGTH',           32);
+define('CONFIG_USER_PASSWORD_MIN_LENGTH', 4);
+define('CONFIG_USER_PASSWORD_MAX_LENGTH', 32);
 
-define('CONFIG_USER_EMAIL_MAX_LENGTH',              128);
+define('CONFIG_USER_EMAIL_MAX_LENGTH', 128);
 
-define('CONFIG_USER_FIRST_NAME_MAX_LENGTH',         32);
-define('CONFIG_USER_LAST_NAME_MAX_LENGTH',          32);
+define('CONFIG_USER_FIRST_NAME_MAX_LENGTH', 32);
+define('CONFIG_USER_LAST_NAME_MAX_LENGTH', 32);
 
-define('CONFIG_USER_CITY_MAX_LENGTH',               32);
+define('CONFIG_USER_CITY_MAX_LENGTH', 32);
 
-define('CONFIG_USER_CAPTCHA_MAX_LENGTH',            16);
+define('CONFIG_USER_CAPTCHA_MAX_LENGTH', 16);
 
 # Captcha
 
-define('CONFIG_CAPTCHA_LENGTH',                     5);
+define('CONFIG_CAPTCHA_LENGTH', 5);
 
-define('CONFIG_CAPTCHA_WIDTH',                      150);
-define('CONFIG_CAPTCHA_HEIGHT',                     40);
+define('CONFIG_CAPTCHA_WIDTH', 150);
+define('CONFIG_CAPTCHA_HEIGHT', 40);
 
-define('CONFIG_CAPTCHA_FONT',                       'Fonts/airstrip.ttf');
-define('CONFIG_CAPTCHA_FONT_SIZE',                  20);
+define('CONFIG_CAPTCHA_FONT', 'Fonts/airstrip.ttf');
+define('CONFIG_CAPTCHA_FONT_SIZE', 20);
 
-define('CONFIG_CAPTCHA_TEXT_INDENT',                15);
-define('CONFIG_CAPTCHA_TEXT_STEP',                  25);
+define('CONFIG_CAPTCHA_TEXT_INDENT', 15);
+define('CONFIG_CAPTCHA_TEXT_STEP', 25);
 
 # Admin
 
-define('CONFIG_ADMIN_LANGUAGE_DEFAULT',             'en-US');
-define('CONFIG_ADMIN_TEMPLATE_DEFAULT',             'Default');
+define('CONFIG_ADMIN_LANGUAGE_DEFAULT', 'en-US');
+define('CONFIG_ADMIN_TEMPLATE_DEFAULT', 'Default');
 
-define('CONFIG_ADMIN_PAGES_DISPLAY',                50);
-define('CONFIG_ADMIN_MENUITEMS_DISPLAY',            50);
-define('CONFIG_ADMIN_VARIABLES_DISPLAY',            50);
-define('CONFIG_ADMIN_WIDGETS_DISPLAY',              50);
-define('CONFIG_ADMIN_USERS_DISPLAY',                50);
+define('CONFIG_ADMIN_PAGES_DISPLAY', 50);
+define('CONFIG_ADMIN_MENUITEMS_DISPLAY', 50);
+define('CONFIG_ADMIN_VARIABLES_DISPLAY', 50);
+define('CONFIG_ADMIN_WIDGETS_DISPLAY', 50);
+define('CONFIG_ADMIN_USERS_DISPLAY', 50);
 
-define('CONFIG_ADMIN_FILEMANAGER_ITEMS_DISPLAY',    50);
+define('CONFIG_ADMIN_FILEMANAGER_ITEMS_DISPLAY', 50);
 
 # Site
 
-define('CONFIG_SITE_LANGUAGE_DEFAULT',              'en-US');
-define('CONFIG_SITE_TEMPLATE_DEFAULT',              'Default');
+define('CONFIG_SITE_LANGUAGE_DEFAULT', 'en-US');
+define('CONFIG_SITE_TEMPLATE_DEFAULT', 'Default');
 
-define('CONFIG_SITE_TITLE_DEFAULT',                 'Demo Site');
-define('CONFIG_SITE_SLOGAN_DEFAULT',                'A place for site slogan');
+define('CONFIG_SITE_TITLE_DEFAULT', 'Demo Site');
+define('CONFIG_SITE_SLOGAN_DEFAULT', 'A place for site slogan');
 
-define('CONFIG_SITE_TITLE_MAX_LENGTH',              128);
-define('CONFIG_SITE_SLOGAN_MAX_LENGTH',             255);
-define('CONFIG_SITE_DESCRIPTION_MAX_LENGTH',        512);
-define('CONFIG_SITE_KEYWORDS_MAX_LENGTH',           512);
+define('CONFIG_SITE_TITLE_MAX_LENGTH', 128);
+define('CONFIG_SITE_SLOGAN_MAX_LENGTH', 255);
+define('CONFIG_SITE_DESCRIPTION_MAX_LENGTH', 512);
+define('CONFIG_SITE_KEYWORDS_MAX_LENGTH', 512);
 
 # System
 
-define('CONFIG_SYSTEM_URL_MAX_LENGTH',              128);
-define('CONFIG_SYSTEM_EMAIL_MAX_LENGTH',            128);
+define('CONFIG_SYSTEM_URL_MAX_LENGTH', 128);
+define('CONFIG_SYSTEM_EMAIL_MAX_LENGTH', 128);
 
-define('CONFIG_SYSTEM_TIMEZONE_DEFAULT',            'UTC');
+define('CONFIG_SYSTEM_TIMEZONE_DEFAULT', 'UTC');
 
 # Database
 
-define('CONFIG_DATABASE_SERVER_MAX_LENGTH',         128);
-define('CONFIG_DATABASE_USER_MAX_LENGTH',           64);
-define('CONFIG_DATABASE_PASSWORD_MAX_LENGTH',       64);
-define('CONFIG_DATABASE_NAME_MAX_LENGTH',           64);
+define('CONFIG_DATABASE_SERVER_MAX_LENGTH', 128);
+define('CONFIG_DATABASE_USER_MAX_LENGTH', 64);
+define('CONFIG_DATABASE_PASSWORD_MAX_LENGTH', 64);
+define('CONFIG_DATABASE_NAME_MAX_LENGTH', 64);
 
 # Other
 
-define('CONFIG_UPLOADS_MAX_SIZE',                   104857600);  # 100 MB
+define('CONFIG_UPLOADS_MAX_SIZE', 104857600); # 100 MB

www/engine/System/Classes/Modules/Auth/Controller/Recover.php

Braces +12 added lines, -6 removed lines

@@ -10,7 +10,9 @@ 
 
 		public function __invoke(array $post) {
 
-			if (!Auth::check()) return false;
+			if (!Auth::check()) {
+				return false;
+			}
 
 			# Declare variables
 
@@ -22,13 +24,15 @@ 
 
 			# Validate values
 
-			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'];
+			}
 
 			# Encode password
 
@@ -38,7 +42,9 @@ 
 
 			$data = ['auth_key' => $auth_key, 'password' => $password];
 
-			if (!Auth::user()->edit($data)) return 'USER_ERROR_AUTH_RECOVER';
+			if (!Auth::user()->edit($data)) {
+				return 'USER_ERROR_AUTH_RECOVER';
+			}
 
 			# Remove secret
 

www/engine/System/Classes/Modules/Auth/Controller/Register.php

Braces +33 added lines, -11 removed lines

@@ -10,7 +10,9 @@ 
 
 		public function __invoke(array $post) {
 
-			if (Auth::check()) return true;
+			if (Auth::check()) {
+				return true;
+			}
 
 			# Declare variables
 
@@ -22,15 +24,25 @@ 
 
 			# Validate values
 
-			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 === ($password = Validate::userPassword($password))) return ['password', 'USER_ERROR_PASSWORD_INVALID'];
+			if (false === ($password = Validate::userPassword($password))) {
+				return ['password', 'USER_ERROR_PASSWORD_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'];
+			}
 
-			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'];
+			}
 
-			if (false === Security::checkCaptcha($captcha)) return ['captcha', 'USER_ERROR_CAPTCHA_INCORRECT'];
+			if (false === Security::checkCaptcha($captcha)) {
+				return ['captcha', 'USER_ERROR_CAPTCHA_INCORRECT'];
+			}
 
 			# Create user object
 
@@ -38,15 +50,23 @@ 
 
 			# Check name exists
 
-			if (false === ($check_name = $user->check($name, 'name'))) return 'USER_ERROR_AUTH_REGISTER';
+			if (false === ($check_name = $user->check($name, 'name'))) {
+				return 'USER_ERROR_AUTH_REGISTER';
+			}
 
-			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 = $user->check($email, 'email'))) return 'USER_ERROR_AUTH_REGISTER';
+			if (false === ($check_email = $user->check($email, 'email'))) {
+				return 'USER_ERROR_AUTH_REGISTER';
+			}
 
-			if ($check_email === 1) return ['email', 'USER_ERROR_EMAIL_DUPLICATE'];
+			if ($check_email === 1) {
+				return ['email', 'USER_ERROR_EMAIL_DUPLICATE'];
+			}
 
 			# Encode password
 
@@ -69,7 +89,9 @@ 
 			$data['time_registered']    = REQUEST_TIME;
 			$data['time_logged']        = REQUEST_TIME;
 
-			if (!$user->create($data)) return 'USER_ERROR_AUTH_REGISTER';
+			if (!$user->create($data)) {
+				return 'USER_ERROR_AUTH_REGISTER';
+			}
 
 			# Send mail
 

www/engine/System/Classes/Modules/Auth/Controller/Reset.php

Braces +21 added lines, -7 removed lines

@@ -10,7 +10,9 @@ 
 
 		public function __invoke(array $post) {
 
-			if (Auth::check()) return true;
+			if (Auth::check()) {
+				return true;
+			}
 
 			# Declare variables
 
@@ -22,9 +24,13 @@ 
 
 			# Validate values
 
-			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 === Security::checkCaptcha($captcha)) return ['captcha', 'USER_ERROR_CAPTCHA_INCORRECT'];
+			if (false === Security::checkCaptcha($captcha)) {
+				return ['captcha', 'USER_ERROR_CAPTCHA_INCORRECT'];
+			}
 
 			# Create user object
 
@@ -32,13 +38,19 @@ 
 
 			# Init user
 
-			if (!$user->init($name, 'name')) return ['name', 'USER_ERROR_NAME_INCORRECT'];
+			if (!$user->init($name, 'name')) {
+				return ['name', 'USER_ERROR_NAME_INCORRECT'];
+			}
 
-			if (Auth::admin() && ($user->rank < RANK_ADMINISTRATOR)) return ['name', 'USER_ERROR_NAME_INCORRECT'];
+			if (Auth::admin() && ($user->rank < RANK_ADMINISTRATOR)) {
+				return ['name', 'USER_ERROR_NAME_INCORRECT'];
+			}
 
 			# Check access
 
-			if (!Auth::admin() && ($user->rank === RANK_GUEST)) return 'USER_ERROR_ACCESS';
+			if (!Auth::admin() && ($user->rank === RANK_GUEST)) {
+				return 'USER_ERROR_ACCESS';
+			}
 
 			# Create session
 
@@ -48,7 +60,9 @@ 
 
 			$data = ['id' => $user->id, 'code' => $code, 'ip' => $ip, 'time' => $time];
 
-			if (!$secret->create($data)) return 'USER_ERROR_AUTH_RESET';
+			if (!$secret->create($data)) {
+				return 'USER_ERROR_AUTH_RESET';
+			}
 
 			# Send mail