Merge remote branch 'upstream/master'

This commit is contained in:
Julio Cesar Laura
2014-06-30 10:45:43 -04:00

View File

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