cadmium-org / cadmium-cms

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

Spacing +1 added lines, -1 removed lines

@@ -87,7 +87,7 @@
 
 		public static function isInitial() : bool {
 
-			DB::send("SHOW TABLE STATUS WHERE name LIKE '" . TABLE_USERS . "'");
+			DB::send("SHOW TABLE STATUS WHERE name LIKE '".TABLE_USERS."'");
 
 			if (!(DB::getLast() && (null !== ($data = DB::getLast()->getRow())))) return false;
 

Braces +12 added lines, -4 removed lines

@@ -31,11 +31,15 @@ 
 
 			# Check session code
 
-			if (!is_string($code = Session::get('code'))) return false;
+			if (!is_string($code = Session::get('code'))) {
+				return false;
+			}
 
 			# Authorize
 
-			if (false === ($result = Auth\Utils\Connector\Session::authorize($code, self::$admin))) return false;
+			if (false === ($result = Auth\Utils\Connector\Session::authorize($code, self::$admin))) {
+				return false;
+			}
 
 			# Update auth
 
@@ -62,7 +66,9 @@ 
 
 		public static function logout() : bool {
 
-			if ((null === self::$user) || (0 === self::$user->id)) return false;
+			if ((null === self::$user) || (0 === self::$user->id)) {
+				return false;
+			}
 
 			# Remove auth entry from db
 
@@ -89,7 +95,9 @@ 
 
 			DB::send("SHOW TABLE STATUS WHERE name LIKE '" . TABLE_USERS . "'");
 
-			if (!(DB::getLast() && (null !== ($data = DB::getLast()->getRow())))) return false;
+			if (!(DB::getLast() && (null !== ($data = DB::getLast()->getRow())))) {
+				return false;
+			}
 
 			# ------------------------
 

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

Braces +9 added lines, -5 removed lines

@@ -44,13 +44,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
 
@@ -60,7 +62,9 @@ 
 
 			$data = ['auth_key' => $auth_key, 'password' => $password];
 
-			if (!$this->user->edit($data)) return 'USER_ERROR_AUTH_RECOVER';
+			if (!$this->user->edit($data)) {
+				return 'USER_ERROR_AUTH_RECOVER';
+			}
 
 			# Remove secret
 

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

Spacing +1 added lines, -1 removed lines

@@ -56,7 +56,7 @@
 
 			if ((!$this->user->init($$init_by, $init_by)) || (Auth::isAdmin() && ($this->user->rank < RANK_ADMINISTRATOR))) {
 
-				return ['name_email', ('USER_ERROR_' . strtoupper($init_by) .'_INCORRECT')];
+				return ['name_email', ('USER_ERROR_'.strtoupper($init_by).'_INCORRECT')];
 			}
 
 			# Check access

Braces +12 added lines, -4 removed lines

@@ -46,9 +46,13 @@ 
 
 			if ((false === ($name = Validate::userName($name_email))) &&
 
-				(false === ($email = Validate::userEmail($name_email)))) return ['name_email', 'USER_ERROR_NAME_INVALID'];
+				(false === ($email = Validate::userEmail($name_email)))) {
+				return ['name_email', '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'];
+			}
 
 			# Init user
 
@@ -61,7 +65,9 @@ 
 
 			# Check access
 
-			if (!Auth::isAdmin() && ($this->user->rank === RANK_GUEST)) return 'USER_ERROR_ACCESS';
+			if (!Auth::isAdmin() && ($this->user->rank === RANK_GUEST)) {
+				return 'USER_ERROR_ACCESS';
+			}
 
 			# Create secret
 
@@ -71,7 +77,9 @@ 
 
 			$data = ['id' => $this->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
 

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

Spacing +1 added lines, -1 removed lines

@@ -56,7 +56,7 @@
 
 			if ((!$this->user->init($$init_by, $init_by)) || (Auth::isAdmin() && ($this->user->rank < RANK_ADMINISTRATOR))) {
 
-				return ['name_email', ('USER_ERROR_' . strtoupper($init_by) .'_INCORRECT')];
+				return ['name_email', ('USER_ERROR_'.strtoupper($init_by).'_INCORRECT')];
 			}
 
 			# Check password

Braces +15 added lines, -5 removed lines

@@ -46,9 +46,13 @@ 
 
 			if ((false === ($name = Validate::userName($name_email))) &&
 
-				(false === ($email = Validate::userEmail($name_email)))) return ['name_email', 'USER_ERROR_NAME_INVALID'];
+				(false === ($email = Validate::userEmail($name_email)))) {
+				return ['name_email', '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'];
+			}
 
 			# Init user
 
@@ -63,11 +67,15 @@ 
 
 			$password = Str::encode($this->user->auth_key, $password);
 
-			if (0 !== strcmp($this->user->password, $password)) return ['password', 'USER_ERROR_PASSWORD_INCORRECT'];
+			if (0 !== strcmp($this->user->password, $password)) {
+				return ['password', 'USER_ERROR_PASSWORD_INCORRECT'];
+			}
 
 			# Check access
 
-			if (!Auth::isAdmin() && ($this->user->rank === RANK_GUEST)) return 'USER_ERROR_ACCESS';
+			if (!Auth::isAdmin() && ($this->user->rank === RANK_GUEST)) {
+				return 'USER_ERROR_ACCESS';
+			}
 
 			# Create session
 
@@ -77,7 +85,9 @@ 
 
 			$data = ['id' => $this->user->id, 'code' => $code, 'ip' => $ip, 'time' => $time];
 
-			if (!$session->create($data)) return 'USER_ERROR_AUTH_LOGIN';
+			if (!$session->create($data)) {
+				return 'USER_ERROR_AUTH_LOGIN';
+			}
 
 			# Set session variable
 

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

Braces +30 added lines, -10 removed lines

@@ -44,27 +44,45 @@ 
 
 			# 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'];
+			}
 
 			# Check name exists
 
-			if (false === ($check_name = $this->user->check($name, 'name'))) return 'USER_ERROR_AUTH_REGISTER';
+			if (false === ($check_name = $this->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 = $this->user->check($email, 'email'))) return 'USER_ERROR_AUTH_REGISTER';
+			if (false === ($check_email = $this->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
 
@@ -87,7 +105,9 @@ 
 			$data['time_registered']    = REQUEST_TIME;
 			$data['time_logged']        = REQUEST_TIME;
 
-			if (!$this->user->create($data)) return 'USER_ERROR_AUTH_REGISTER';
+			if (!$this->user->create($data)) {
+				return 'USER_ERROR_AUTH_REGISTER';
+			}
 
 			# Send mail
 

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

Braces +3 added lines, -1 removed lines

@@ -38,7 +38,9 @@
 
 			# Set remove button
 
-			if ($user->id === Auth::get('id')) $view->getBlock('remove')->class = 'disabled';
+			if ($user->id === Auth::get('id')) {
+				$view->getBlock('remove')->class = 'disabled';
+			}
 		}
 	}
 }

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

Indentation +15 added lines, -15 removed lines

@@ -28,13 +28,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::get('rank') . " AND ") .
+					 ("WHERE ent.visibility = " . VISIBILITY_PUBLISHED . " AND ent.access <= " . Auth::get('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
 
@@ -55,17 +55,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::getLast()->status)) return false;
 
@@ -73,15 +73,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::getLast()->status)) return false;
 

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::get('rank') . " AND ") .
+			         ("WHERE ent.visibility = ".VISIBILITY_PUBLISHED." AND ent.access <= ".Auth::get('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");
 

www/engine/System/Classes/Modules/Profile/Handler/Overview.php

Braces +8 added lines, -4 removed lines

@@ -41,14 +41,18 @@
 
 			foreach (['full_name', 'city'] as $name) {
 
-				if ('' === ($text = Auth::get($name))) $contents->getBlock($name)->disable();
-
-				else $contents->getBlock($name)->text = $text;
+				if ('' === ($text = Auth::get($name))) {
+					$contents->getBlock($name)->disable();
+				} else {
+					$contents->getBlock($name)->text = $text;
+				}
 			}
 
 			# Set country
 
-			if ('' === ($country = Auth::get('country'))) $contents->getBlock('country')->disable(); else {
+			if ('' === ($country = Auth::get('country'))) {
+				$contents->getBlock('country')->disable();
+			} else {
 
 				$contents->getBlock('country')->code = $country;
 

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

Braces +12 added lines, -4 removed lines

@@ -33,13 +33,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::getUser()->check($email, 'email'))) return 'USER_ERROR_EDIT_PERSONAL';
+			if (false === ($check_email = Auth::getUser()->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
 
@@ -53,7 +59,9 @@ 
 			$data['country']            = $country;
 			$data['timezone']           = $timezone;
 
-			if (!Auth::getUser()->edit($data)) return 'USER_ERROR_EDIT_PERSONAL';
+			if (!Auth::getUser()->edit($data)) {
+				return 'USER_ERROR_EDIT_PERSONAL';
+			}
 
 			# ------------------------