Got rid of redundant function

This commit is contained in:
Andreas 2019-09-20 16:44:15 +02:00
parent 78f9711096
commit f62f779226
2 changed files with 3 additions and 11 deletions

View File

@ -2,15 +2,6 @@
require_once('./model/forum/User.php'); require_once('./model/forum/User.php');
class DBUser extends Database class DBUser extends Database
{ {
static function isUserActive($uid){
$user = self::getUserByUID($uid);
if($user->active){
return true;
}
else{
return false;
}
}
static function getUserByUID($uid){ static function getUserByUID($uid){
$con = self::connectToDB(); $con = self::connectToDB();
$query = $con->prepare("SELECT * FROM users WHERE ID = :uid"); $query = $con->prepare("SELECT * FROM users WHERE ID = :uid");

View File

@ -8,10 +8,11 @@ $skipoverride = false;
if(!UserSession::isUserSignedIn()){ if(!UserSession::isUserSignedIn()){
if(HUtils::issetPost(['email','password'])){ if(HUtils::issetPost(['email','password'])){
if(DBUser::isLoginValid($_POST['email'], $_POST['password'])){ if(DBUser::isLoginValid($_POST['email'], $_POST['password'])){
//obtain UID //obtain UID
$uid = DBUser::getUID($_POST['email'], $_POST['password']); $uid = DBUser::getUID($_POST['email'], $_POST['password']);
if($uid != -1){ if($uid != -1){
if(DBUser::isUserActive($uid)){ //check if user account has been activated
if(DBUser::getUserByUID($uid)->getActive()){
//obtain username //obtain username
//$username = DBUser::getUsername($uid); //$username = DBUser::getUsername($uid);
//gen unique session token //gen unique session token