Merge remote branch 'upstream/master'

gulliver/system/class.rbac.php

@@ -266,6 +266,7 @@ class RBAC
      */
     public function VerifyWithOtherAuthenticationSource ($sAuthType, $aUserFields, $strPass)
     {
+        if ($sAuthType == '' || $sAuthType == 'MYSQL') {
             //check if the user is active
             if ($aUserFields['USR_STATUS'] != 1) {
                 return - 3; //inactive user
@@ -275,6 +276,7 @@ class RBAC
             if ($aUserFields['USR_DUE_DATE'] < date( 'Y-m-d' )) {
                 return - 4; //due date
             }
+        }
 
         foreach ($this->aRbacPlugins as $sClassName) {
             if (strtolower( $sClassName ) == strtolower( $sAuthType )) {