From f62f7792261734fedb32d8e13731cabf10eea500 Mon Sep 17 00:00:00 2001 From: Andreas Date: Fri, 20 Sep 2019 16:44:15 +0200 Subject: [PATCH] Got rid of redundant function --- dev_mvc/controller/db/DBUser.php | 9 --------- dev_mvc/model/actions/model_login.php | 5 +++-- 2 files changed, 3 insertions(+), 11 deletions(-) diff --git a/dev_mvc/controller/db/DBUser.php b/dev_mvc/controller/db/DBUser.php index b2663e3..45ba636 100644 --- a/dev_mvc/controller/db/DBUser.php +++ b/dev_mvc/controller/db/DBUser.php @@ -2,15 +2,6 @@ require_once('./model/forum/User.php'); class DBUser extends Database { - static function isUserActive($uid){ - $user = self::getUserByUID($uid); - if($user->active){ - return true; - } - else{ - return false; - } - } static function getUserByUID($uid){ $con = self::connectToDB(); $query = $con->prepare("SELECT * FROM users WHERE ID = :uid"); diff --git a/dev_mvc/model/actions/model_login.php b/dev_mvc/model/actions/model_login.php index c2f7798..36fd985 100644 --- a/dev_mvc/model/actions/model_login.php +++ b/dev_mvc/model/actions/model_login.php @@ -8,10 +8,11 @@ $skipoverride = false; if(!UserSession::isUserSignedIn()){ if(HUtils::issetPost(['email','password'])){ if(DBUser::isLoginValid($_POST['email'], $_POST['password'])){ - //obtain UID + //obtain UID $uid = DBUser::getUID($_POST['email'], $_POST['password']); if($uid != -1){ - if(DBUser::isUserActive($uid)){ + //check if user account has been activated + if(DBUser::getUserByUID($uid)->getActive()){ //obtain username //$username = DBUser::getUsername($uid); //gen unique session token