From 500dda0636095b97e3e537a8a08a72cc8d68474e Mon Sep 17 00:00:00 2001 From: Roly Rudy Gutierrez Pinto Date: Fri, 29 Jan 2021 17:44:46 -0400 Subject: [PATCH] PMCORE-2809 LDAP user imported counter is adding +1 when the user logged in ProcessMaker first time --- rbac/engine/classes/model/RbacUsers.php | 1 + workflow/engine/classes/LdapAdvanced.php | 1 + 2 files changed, 2 insertions(+) diff --git a/rbac/engine/classes/model/RbacUsers.php b/rbac/engine/classes/model/RbacUsers.php index 6895d2ef0..65c1811ba 100644 --- a/rbac/engine/classes/model/RbacUsers.php +++ b/rbac/engine/classes/model/RbacUsers.php @@ -307,6 +307,7 @@ class RbacUsers extends BaseRbacUsers $criteria->addSelectColumn(RbacUsersPeer::UID_AUTH_SOURCE); $criteria->addSelectColumn('COUNT(*) AS CNT'); $criteria->add(RbacUsersPeer::USR_STATUS, 'CLOSED', Criteria::NOT_EQUAL); + $criteria->add(RbacUsersPeer::USR_USERNAME, '', Criteria::NOT_EQUAL); $criteria->addGroupByColumn(RbacUsersPeer::UID_AUTH_SOURCE); $dataset = RbacUsersPeer::doSelectRS($criteria, Propel::getDbConnection('rbac_ro')); $dataset->setFetchmode(ResultSet::FETCHMODE_ASSOC); diff --git a/workflow/engine/classes/LdapAdvanced.php b/workflow/engine/classes/LdapAdvanced.php index 94691ea15..32c625c6a 100644 --- a/workflow/engine/classes/LdapAdvanced.php +++ b/workflow/engine/classes/LdapAdvanced.php @@ -1273,6 +1273,7 @@ class LdapAdvanced $c1 = new Criteria("rbac"); $c1->add(RbacUsersPeer::UID_AUTH_SOURCE, $arrayAuthSource["AUTH_SOURCE_UID"]); $c1->add(RbacUsersPeer::USR_AUTH_USER_DN, $strUser); + $c1->add(RbacUsersPeer::USR_STATUS, 1); // update set $c2 = new Criteria("rbac"); $c2->add(RbacUsersPeer::USR_AUTH_USER_DN, $userDn);