gtoriadotnet
/
fobe-web
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

activation class static changes

This commit is contained in:
Austin 2021-11-22 01:25:58 -05:00
parent dd4cd6d6ae
commit 81f2b2dbb9
5 changed files with 13 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
globals/Dependencies/Users/Activation.php
View File

@ -10,7 +10,7 @@ namespace Alphaland\Users {
class Activation class Activation
{ {
private function generateActivationCode() private static function generateActivationCode()
{ {
$hash = ""; $hash = "";
while (true) { while (true) {
@ -26,7 +26,7 @@ namespace Alphaland\Users {
return $hash; 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 = $GLOBALS['pdo']->prepare("SELECT * FROM `alphaland_verification` WHERE `uid` = :uid");
$query->bindParam(":uid", $userid, PDO::PARAM_INT); $query->bindParam(":uid", $userid, PDO::PARAM_INT);
@ -37,7 +37,7 @@ namespace Alphaland\Users {
return false; 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 = $GLOBALS['pdo']->prepare("SELECT * FROM `alphaland_verification` WHERE `isactivated` = 1 AND `uid` = :uid");
$query->bindParam(":uid", $userid, PDO::PARAM_INT); $query->bindParam(":uid", $userid, PDO::PARAM_INT);
@ -46,12 +46,12 @@ namespace Alphaland\Users {
return true; return true;
} }
return false; 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)) { if (!Activation::isUserActivated($userid)) {
$activationcode = $this->generateActivationCode(); $activationcode = Activation::generateActivationCode();
$n = $GLOBALS['pdo']->prepare("INSERT INTO `alphaland_verification`(`activationcode`,`uid`) VALUES(:ac, :userid)"); $n = $GLOBALS['pdo']->prepare("INSERT INTO `alphaland_verification`(`activationcode`,`uid`) VALUES(:ac, :userid)");
$n->bindParam(":ac", $activationcode, PDO::PARAM_STR); $n->bindParam(":ac", $activationcode, PDO::PARAM_STR);

5
globals/config.php
View File

@ -128,7 +128,7 @@ try
} }
$activated = new Alphaland\Users\Activation(); $activated = new Alphaland\Users\Activation();
$activated = $activated->isUserActivated($GLOBALS['user']->id); $activated = $activated::isUserActivated($GLOBALS['user']->id);
$maintenance = checkIfUnderMaintenance(); $maintenance = checkIfUnderMaintenance();
$banned = checkIfBanned($GLOBALS['user']->id); $banned = checkIfBanned($GLOBALS['user']->id);
$twofactor = isSession2FAUnlocked(); $twofactor = isSession2FAUnlocked();
@ -183,8 +183,7 @@ try
} }
} }
else if ($accesseddomain == "api.".$domain) { //api else if ($accesseddomain == "api.".$domain) { //api
if ($accesseddirectory != "/logo.php" && if ($accesseddirectory != "/logo.php") {
$accesseddirectory != "/moderation/v2/filtertext.php") {
redirect($url); redirect($url);
} }
} }

2
globals/userauth.php
View File

@ -68,7 +68,7 @@ class user {
//activation stuff //activation stuff
$activated = new Alphaland\Users\Activation(); $activated = new Alphaland\Users\Activation();
$activated = $activated->isUserActivated($this->id); $activated = $activated::isUserActivated($this->id);
if (!banned($this->id)) if (!banned($this->id))
{ {

4
html/activate.php
View File

@ -1,11 +1,11 @@
<?php <?php
$activation = new Alphaland\Users\Activation(); $activation = new Alphaland\Users\Activation();
if ($activation->isUserActivated($user->id)) { if ($activation::isUserActivated($user->id)) {
redirect("/"); redirect("/");
} }
$activationcode = $activation->getUserActivationCode($user->id); $activationcode = $activation::getUserActivationCode($user->id);
$body = ' $body = '
<div class="container-fluid" style="display: flex;justify-content: center;align-items: center;text-align: center;min-height: 100vh;"> <div class="container-fluid" style="display: flex;justify-content: center;align-items: center;text-align: center;min-height: 100vh;">

2
html/register.php
View File

@ -131,7 +131,7 @@ else
//setup the activation system //setup the activation system
$activation = new Alphaland\Users\Activation(); $activation = new Alphaland\Users\Activation();
$activation->setupUserActivation($userID); $activation::setupUserActivation($userID);
//create new session //create new session
createSession($userID); createSession($userID);