From e6bf5c94f98924d880ae6911dece6cf1e6942763 Mon Sep 17 00:00:00 2001
From: norahmollo <norah@colosa.com>
Date: Thu, 26 Jun 2014 17:13:26 -0400
Subject: [PATCH 1/2] BUG-14302 Problemas en la sincronizacion de estados entre
 AD y PM.

Los cambios realizados en cuanto al estado del usuario no se ven reflejados en ProcessMaker en forma correcta.
---
 gulliver/system/class.rbac.php | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/gulliver/system/class.rbac.php b/gulliver/system/class.rbac.php
index 9be2ba784..d487006b8 100755
--- a/gulliver/system/class.rbac.php
+++ b/gulliver/system/class.rbac.php
@@ -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) {

From 4dd42b14a0304eb00953ed0b988897b6fa7332eb Mon Sep 17 00:00:00 2001
From: Julio Cesar Laura <juliocesar@colosa.com>
Date: Mon, 30 Jun 2014 10:46:52 -0400
Subject: [PATCH 2/2] Merge code from Github to Bitbucket 2014-06-30 10:45

---
 .gitignore | 1 -
 1 file changed, 1 deletion(-)

diff --git a/.gitignore b/.gitignore
index 976524a46..b951fad8a 100755
--- a/.gitignore
+++ b/.gitignore
@@ -36,4 +36,3 @@ workflow/public_html/build-log.html
 temp.txt
 update.sh
 workflow/public_html/translations/
-