Cleanup Activation.php

Make it look better
This commit is contained in:
petko@mfdlabs.com 2021-10-31 14:55:53 +00:00 committed by Github Enterprise
parent ba9fec9d36
commit c38db907ba
1 changed files with 24 additions and 21 deletions

View File

@ -6,54 +6,57 @@
namespace Alphaland\Users { namespace Alphaland\Users {
use Alphaland\Common\HashingUtiltity;
use PDO; use PDO;
class Activation class Activation
{ {
private function generateActivationCode()
private static PDO $pdo = $GLOBALS['pdo'];
private static function GenerateActivationCode(): string
{ {
$hash = ""; $hash = "";
while (true) { do {
$hash = genHash(32); $hash = HashingUtiltity::GenerateByteHash(32);
$keycheck = $GLOBALS['pdo']->prepare("SELECT * FROM `alphaland_verification` WHERE `activationcode` = :ac"); $query = Activation::$pdo->prepare("SELECT COUNT(*) FROM `alphaland_verification` WHERE `activationcode` = :ac");
$keycheck->bindParam(":ac", $hash, PDO::PARAM_STR); $query->bindParam(":ac", $hash, PDO::PARAM_STR);
$keycheck->execute(); $query->execute();
if ($keycheck->rowCount() == 0) { } while ($query->fetchColumn(0) != 0);
break;
}
}
return $hash; return $hash;
} }
public function getUserActivationCode(int $userid) public static function GetUserActivationCode(int $userid): string
{ {
$query = $GLOBALS['pdo']->prepare("SELECT * FROM `alphaland_verification` WHERE `uid` = :uid"); $query = Activation::$pdo->prepare("SELECT `activationcode` FROM `alphaland_verification` WHERE `uid` = :uid");
$query->bindParam(":uid", $userid, PDO::PARAM_INT); $query->bindParam(":uid", $userid, PDO::PARAM_INT);
$query->execute(); $query->execute();
if ($query->rowCount() == 1) { if ($query->rowCount() == 1) {
return $query->fetch(PDO::FETCH_OBJ)->activationcode; return (string)$query->fetch(PDO::FETCH_OBJ)->activationcode;
} }
return false; return null;
} }
public function isUserActivated(int $userid) public static function IsUserActivated(int $userid): bool
{ {
$query = $GLOBALS['pdo']->prepare("SELECT * FROM `alphaland_verification` WHERE `isactivated` = 1 AND `uid` = :uid"); $query = Activation::$pdo->prepare("SELECT COUNT(*) FROM `alphaland_verification` WHERE `isactivated` = 1 AND `uid` = :uid");
$query->bindParam(":uid", $userid, PDO::PARAM_INT); $query->bindParam(":uid", $userid, PDO::PARAM_INT);
$query->execute(); $query->execute();
if ($query->rowCount() > 0) { if ($query->fetchColumn(0) > 0) {
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): bool //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 = Activation::$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);
$n->bindParam(":userid", $userid, PDO::PARAM_INT); $n->bindParam(":userid", $userid, PDO::PARAM_INT);
$n->execute(); $n->execute();