TASK-207 Merge for ldap and ldapAdvanced
This commit is contained in:
@@ -306,6 +306,7 @@ switch ($function) {
|
||||
// asign the FirstName and LastName variables
|
||||
// add replace to change D*Souza to D'Souza by krlos
|
||||
$aData['USR_FIRSTNAME'] = str_replace("*", "'", $aUser['sFirstname']);
|
||||
$aData['USR_FIRSTNAME'] = ($aData['USR_FIRSTNAME'] == '') ? $aData['USR_USERNAME'] : $aData['USR_FIRSTNAME'];
|
||||
$aData['USR_LASTNAME'] = str_replace("*", "'", $aUser['sLastname']);
|
||||
$aData['USR_EMAIL'] = $aUser['sEmail'];
|
||||
$aData['USR_DUE_DATE'] = date('Y-m-d', mktime(0, 0, 0, date('m'), date('d'), date('Y') + 2));
|
||||
@@ -325,16 +326,18 @@ switch ($function) {
|
||||
}
|
||||
$aData['USR_AUTH_USER_DN'] = $aUser['sDN'];
|
||||
|
||||
$usrRole = 'PROCESSMAKER_OPERATOR';
|
||||
$usrRole = 'LURANA_OPERATOR';
|
||||
if (!empty($aFields['AUTH_SOURCE_DATA']['USR_ROLE'])) {
|
||||
$usrRole = $aFields['AUTH_SOURCE_DATA']['USR_ROLE'];
|
||||
//$usrRole = $aFields['AUTH_SOURCE_DATA']['USR_ROLE'];
|
||||
}
|
||||
|
||||
try {
|
||||
//dd($aData, $usrRole, $aFields['AUTH_SOURCE_NAME']);
|
||||
$sUserUID = $RBAC->createUser($aData, $usrRole, $aFields['AUTH_SOURCE_NAME']);
|
||||
$usersCreated .= $aData['USR_USERNAME'] . ' ';
|
||||
$countUsers++;
|
||||
} catch (Exception $oError) {
|
||||
dd($oError);
|
||||
$G_PUBLISH = new Publisher();
|
||||
$G_PUBLISH->AddContent('xmlform', 'xmlform', 'login/showMessage', '', array('MESSAGE' => $oError->getMessage()));
|
||||
G::RenderPage("publish", "blank");
|
||||
@@ -397,7 +400,7 @@ switch ($function) {
|
||||
|
||||
$resultLDAPStartTLS = true;
|
||||
$ldapcnn = $ldapAdvanced->ldapConnection($arrayAuthenticationSourceData, $resultLDAPStartTLS);
|
||||
|
||||
|
||||
//Response
|
||||
$response["status"] = "OK";
|
||||
if ($resultLDAPStartTLS === false) {
|
||||
|
||||
Reference in New Issue
Block a user