Test for isActive when getting saved session

kimden · Nov 25, 2018 · 04af978 · 04af978
1 parent c5c1a22
commit 04af978
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/include/ClientSession.class.php b/include/ClientSession.class.php
@@ -585,7 +585,8 @@ public function setOnline(bool $online = true)
      * @param int    $user_id    user id
      *
      * @return ClientSession
-     * @throws ClientSessionExpiredException|ClientSessionException when session does not exist
+     * @throws ClientSessionExpiredException|ClientSessionException|UserException
+               when session does not exist, or when account is not active
      */
     public static function get(string $session_id, int $user_id)
     {
@@ -615,7 +616,10 @@ public static function get(string $session_id, int $user_id)
         }
 
         // here an if statement will come for Guest and registered
-        return new static($session_info[0]["cid"], User::getFromID($user_id));
+        $user = User::getFromID($user_id);
+        if (!$user->isActive())
+            throw new UserException(_h("Your account is not active"), ErrorType::USER_INACTIVE_ACCOUNT);
+        return new static($session_info[0]["cid"], $user);
     }
 
     /**