refactor
This commit is contained in:
@@ -5,36 +5,36 @@ use Random\RandomException;
|
||||
function isLoggedIn(): bool
|
||||
{
|
||||
global $routerConfig;
|
||||
return $_SESSION["ID"] > 0 && !empty($_SESSION["email"]) && $_SESSION["privilege_level"] >= $routerConfig["logged_in_default_permission_level"];
|
||||
return $_SESSION["ID"] > 0 && !empty($_SESSION["email"]) && $_SESSION["privilege_level"] >= $routerConfig["permissions"]["logged_in_default"];
|
||||
}
|
||||
function isVerified(): bool
|
||||
{
|
||||
global $routerConfig;
|
||||
return isLoggedIn() && $_SESSION["privilege_level"] >= $routerConfig["verified_permission_level"];
|
||||
return isLoggedIn() && $_SESSION["privilege_level"] >= $routerConfig["permissions"]["verified"];
|
||||
}
|
||||
|
||||
function isTrustWorthy(): bool
|
||||
{
|
||||
global $routerConfig;
|
||||
return isLoggedIn() && $_SESSION["privilege_level"] >= $routerConfig["trustworthy_permission_level"];
|
||||
return isLoggedIn() && $_SESSION["privilege_level"] >= $routerConfig["permissions"]["trustworthy"];
|
||||
}
|
||||
|
||||
function isModerator(): bool
|
||||
{
|
||||
global $routerConfig;
|
||||
return isLoggedIn() && $_SESSION["privilege_level"] >= $routerConfig["moderator_permission_level"];
|
||||
return isLoggedIn() && $_SESSION["privilege_level"] >= $routerConfig["permissions"]["moderator"];
|
||||
}
|
||||
|
||||
function isUserAdmin(): bool
|
||||
{
|
||||
global $routerConfig;
|
||||
return isLoggedIn() && $_SESSION["privilege_level"] >= $routerConfig["user_admin_permission_level"];
|
||||
return isLoggedIn() && $_SESSION["privilege_level"] >= $routerConfig["permissions"]["user_admin"];
|
||||
}
|
||||
|
||||
function isAdmin(): bool
|
||||
{
|
||||
global $routerConfig;
|
||||
return isLoggedIn() && $_SESSION["privilege_level"] >= $routerConfig["admin_permission_level"];
|
||||
return isLoggedIn() && $_SESSION["privilege_level"] >= $routerConfig["permissions"]["admin"];
|
||||
}
|
||||
|
||||
|
||||
@@ -69,7 +69,7 @@ function setDefaultSessionData(): void
|
||||
$_SESSION["nickname"] = "";
|
||||
$_SESSION["email"] = "";
|
||||
$_SESSION["minecraft_nickname"] = "";
|
||||
$_SESSION["privilege_level"] = $routerConfig["logged_out_permission_level"];
|
||||
$_SESSION["privilege_level"] = $routerConfig["permissions"]["logged_out"];
|
||||
}
|
||||
|
||||
function verifyPassword($userID, $password): bool
|
||||
@@ -86,17 +86,16 @@ function verifyPassword($userID, $password): bool
|
||||
return !empty($password_hash) && !empty($password) && password_verify($password, $password_hash);
|
||||
}
|
||||
|
||||
function UpdateSession(){
|
||||
function UpdateSession(): void
|
||||
{
|
||||
global $mysqli;
|
||||
$stmt = $mysqli->prepare("SELECT FirstName, LastName, Nickname, Email, MinecraftNick, PrivilegeLevel, LastLoginAt, LoginCount, ClassID, FavoriteColor FROM Users WHERE ID = ? AND isActivated = 1");
|
||||
$stmt->bind_param("i", $_SESSION["ID"]);
|
||||
$stmt->execute();
|
||||
|
||||
$uid = 0;
|
||||
$first_name = "";
|
||||
$last_name = "";
|
||||
$nickname = "";
|
||||
$password_hash = "";
|
||||
$email = "";
|
||||
$minecraft_nickname = "";
|
||||
$privilege_level = 0;
|
||||
@@ -123,7 +122,7 @@ function UpdateSession(){
|
||||
|
||||
function doLogin($email, $password): array
|
||||
{
|
||||
global $mysqli, $routerConfig;
|
||||
global $mysqli;
|
||||
$found = false;
|
||||
if (!empty($email) && !empty($password)) {
|
||||
$stmt = $mysqli->prepare("SELECT ID, PasswordHash FROM Users WHERE Email = ? AND isActivated = 1");
|
||||
@@ -171,7 +170,7 @@ function doRegister($firstname, $lastname, $email, $password, $activation_token)
|
||||
$passwordHash = password_hash($password, PASSWORD_DEFAULT);
|
||||
|
||||
$stmt = $mysqli->prepare("UPDATE Users SET FirstName=?, LastName=?, Email=?, PasswordHash=?, PrivilegeLevel=?, isActivated=1, ActivationToken='', RegisteredAt=NOW() WHERE ActivationToken = ?");
|
||||
$privilege_level = $routerConfig["logged_in_default_permission_level"];
|
||||
$privilege_level = $routerConfig["permissions"]["logged_in_default"];
|
||||
|
||||
/** @noinspection SpellCheckingInspection */
|
||||
$stmt->bind_param("ssssis", $firstname, $lastname, $email, $passwordHash, $privilege_level, $activation_token);
|
||||
@@ -315,7 +314,7 @@ function getUserInfo(): array
|
||||
|
||||
function addActivationCodes($count): array
|
||||
{
|
||||
global $mysqli, $routerConfig;
|
||||
global $mysqli;
|
||||
$activationCodes = [];
|
||||
|
||||
$output = ["Status" => "Fail"]; // Default Status is "Fail"
|
||||
@@ -347,7 +346,7 @@ function addActivationCodes($count): array
|
||||
|
||||
function listUsers(): array
|
||||
{
|
||||
global $mysqli, $routerConfig;
|
||||
global $mysqli;
|
||||
$output = ["Status" => "Fail"]; // Default Status is "Fail"
|
||||
|
||||
if (isUserAdmin()) {
|
||||
@@ -369,7 +368,7 @@ function listUsers(): array
|
||||
|
||||
function listActivationCodes(): array
|
||||
{
|
||||
global $mysqli, $routerConfig;
|
||||
global $mysqli;
|
||||
$output = ["Status" => "Fail"]; // Default Status is "Fail"
|
||||
|
||||
if (isUserAdmin()) {
|
||||
@@ -414,7 +413,7 @@ function listActivationCodes(): array
|
||||
|
||||
function deleteUser($userID): array
|
||||
{
|
||||
global $mysqli, $routerConfig;
|
||||
global $mysqli;
|
||||
$status = ["Status" => "Fail"];
|
||||
if (!empty($userID) && isUserAdmin()) {
|
||||
$stmt = $mysqli->prepare("DELETE FROM Users WHERE ID = ?");
|
||||
@@ -430,7 +429,7 @@ function deleteUser($userID): array
|
||||
|
||||
function deleteActivationCode($activationCode): array
|
||||
{
|
||||
global $mysqli, $routerConfig;
|
||||
global $mysqli;
|
||||
$status = ["Status" => "Fail"];
|
||||
if (!empty($activationCode) && isUserAdmin()) {
|
||||
$stmt = $mysqli->prepare("DELETE FROM Users WHERE ActivationToken = ?");
|
||||
|
Reference in New Issue
Block a user