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

Revert "Update Activation Dependencies" 

This reverts commit 45c36bdc7d.
This commit is contained in:
Austin 2021-10-31 21:46:34 -04:00
parent f88a8edb64
commit 989ded8868
3 changed files with 7 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
globals/config.php
View File

@ -8,8 +8,6 @@
Fuck you too Austin :) Fuck you too Austin :)
*/ */
use Alphaland\Users\Activation;
try try
{ {
//php config //php config
@ -128,8 +126,8 @@ try
forceHttpsCloudflare(); forceHttpsCloudflare();
} }
// TODO: WebContextManager::CurrentUser instead of $GLOBALS['user']!! $activated = new Alphaland\Users\Activation();
$activated = Activation::IsUserActivated($GLOBALS['user']->id); $activated = $activated->isUserActivated($GLOBALS['user']->id);
$maintenance = checkIfUnderMaintenance(); $maintenance = checkIfUnderMaintenance();
$banned = checkIfBanned($GLOBALS['user']->id); $banned = checkIfBanned($GLOBALS['user']->id);

5
globals/userauth.php
View File

@ -5,8 +5,6 @@
User class User class
*/ */
use Alphaland\Users\Activation;
class user { class user {
public $id = -1; public $id = -1;
public $name = ""; public $name = "";
@ -67,7 +65,8 @@ class user {
// .. // ..
//activation stuff //activation stuff
$activated = Activation::IsUserActivated($this->id); $activated = new Alphaland\Users\Activation();
$activated = $activated->isUserActivated($this->id);
if (!banned($this->id)) if (!banned($this->id))
{ {

7
html/activate.php
View File

@ -1,12 +1,11 @@
<?php <?php
$activation = new Alphaland\Users\Activation();
use 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;">