fernando/luos
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merged in julceslau/processmaker (pull request #565)

Browse Source 
Merge code from Github to Bitbucket 2014-06-30 10:45
This commit is contained in:
Julio Cesar Laura Avendaño
2014-06-30 10:48:34 -04:00
parent 7651eb58dc 4dd42b14a0
commit fb3fb08a02
2 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@@ -36,4 +36,3 @@ workflow/public_html/build-log.html
temp.txt temp.txt
update.sh update.sh
workflow/public_html/translations/ workflow/public_html/translations/

16
gulliver/system/class.rbac.php
View File

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