Make isDisabled and isVerified functions in User

Author: carlbennett

src/controllers/User/Login.php

@@ -76,9 +76,9 @@ protected function tryLogin(Router &$router, UserLoginModel &$model) {
 
     if (!$user) {
       $model->error = "USER_NOT_FOUND";
-    } else if ($user->getOptionsBitmask() & User::OPTION_DISABLED) {
+    } else if ($user->isDisabled()) {
       $model->error = "USER_DISABLED";
-    } else if (!$user->getOptionsBitmask() & User::OPTION_VERIFIED) {
+    } else if (!$user->isVerified()) {
       $model->error = "USER_NOT_VERIFIED";
     } else if (!$user->checkPassword($password)) {
       $model->error = "PASSWORD_INCORRECT";

src/controllers/User/ResetPassword.php

@@ -224,7 +224,7 @@ protected function doPasswordReset( UserResetPasswordModel &$model, &$data ) {
     $model->user->invalidateVerificationToken();
     // --
 
-    if ( $model->user->getAcl( User::OPTION_DISABLED )) {
+    if ( $model->user->isDisabled() ) {
       $model->error = 'USER_DISABLED';
       return self::RET_FAILURE;
     }

src/libraries/User.php

@@ -534,6 +534,10 @@ public function invalidateVerificationToken() {
     return Common::$cache->delete($key);
   }
 
+  public function isDisabled() {
+    return ($this->options_bitmask & self::OPTION_DISABLED);
+  }
+
   public function isStaff() {
     return ($this->options_bitmask & (
       self::OPTION_ACL_DOCUMENT_CREATE  |
@@ -560,6 +564,10 @@ public function isStaff() {
     ));
   }
 
+  public function isVerified() {
+    return ($this->options_bitmask & self::OPTION_VERIFIED);
+  }
+
   public function jsonSerialize() {
     $created_datetime = $this->getCreatedDateTime();
     if (!is_null($created_datetime)) $created_datetime = [