diff --git a/globals/Dependencies/Users/Activation.php b/globals/Dependencies/Users/Activation.php index ea125d9..27757f0 100644 --- a/globals/Dependencies/Users/Activation.php +++ b/globals/Dependencies/Users/Activation.php @@ -10,7 +10,7 @@ namespace Alphaland\Users { class Activation { - private function generateActivationCode() + private static function generateActivationCode() { $hash = ""; while (true) { @@ -26,7 +26,7 @@ namespace Alphaland\Users { return $hash; } - public function getUserActivationCode(int $userid) + public static function getUserActivationCode(int $userid) { $query = $GLOBALS['pdo']->prepare("SELECT * FROM `alphaland_verification` WHERE `uid` = :uid"); $query->bindParam(":uid", $userid, PDO::PARAM_INT); @@ -37,7 +37,7 @@ namespace Alphaland\Users { return false; } - public function isUserActivated(int $userid) + public static function isUserActivated(int $userid) { $query = $GLOBALS['pdo']->prepare("SELECT * FROM `alphaland_verification` WHERE `isactivated` = 1 AND `uid` = :uid"); $query->bindParam(":uid", $userid, PDO::PARAM_INT); @@ -46,12 +46,12 @@ namespace Alphaland\Users { return true; } return false; - } + } - public function setupUserActivation(int $userid) //this should be ran when the user first signs up + public static function setupUserActivation(int $userid) //this should be ran when the user first signs up { - if (!$this->isUserActivated($userid)) { - $activationcode = $this->generateActivationCode(); + if (!Activation::isUserActivated($userid)) { + $activationcode = Activation::generateActivationCode(); $n = $GLOBALS['pdo']->prepare("INSERT INTO `alphaland_verification`(`activationcode`,`uid`) VALUES(:ac, :userid)"); $n->bindParam(":ac", $activationcode, PDO::PARAM_STR); diff --git a/globals/config.php b/globals/config.php index d5a6b3a..abb9e74 100644 --- a/globals/config.php +++ b/globals/config.php @@ -128,7 +128,7 @@ try } $activated = new Alphaland\Users\Activation(); - $activated = $activated->isUserActivated($GLOBALS['user']->id); + $activated = $activated::isUserActivated($GLOBALS['user']->id); $maintenance = checkIfUnderMaintenance(); $banned = checkIfBanned($GLOBALS['user']->id); $twofactor = isSession2FAUnlocked(); @@ -183,8 +183,7 @@ try } } else if ($accesseddomain == "api.".$domain) { //api - if ($accesseddirectory != "/logo.php" && - $accesseddirectory != "/moderation/v2/filtertext.php") { + if ($accesseddirectory != "/logo.php") { redirect($url); } } diff --git a/globals/userauth.php b/globals/userauth.php index ee786d5..81627a0 100644 --- a/globals/userauth.php +++ b/globals/userauth.php @@ -68,7 +68,7 @@ class user { //activation stuff $activated = new Alphaland\Users\Activation(); - $activated = $activated->isUserActivated($this->id); + $activated = $activated::isUserActivated($this->id); if (!banned($this->id)) { diff --git a/html/activate.php b/html/activate.php index 62ff85a..54567ff 100644 --- a/html/activate.php +++ b/html/activate.php @@ -1,11 +1,11 @@ isUserActivated($user->id)) { +if ($activation::isUserActivated($user->id)) { redirect("/"); } -$activationcode = $activation->getUserActivationCode($user->id); +$activationcode = $activation::getUserActivationCode($user->id); $body = '
diff --git a/html/register.php b/html/register.php index 48e3e62..ae316a2 100644 --- a/html/register.php +++ b/html/register.php @@ -131,7 +131,7 @@ else //setup the activation system $activation = new Alphaland\Users\Activation(); - $activation->setupUserActivation($userID); + $activation::setupUserActivation($userID); //create new session createSession($userID);