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

BUG 8532 Unable to import all users via LDAP Advanced SOLVED

Browse Source 
- The search option doesn't works when return big quantity of results, for each result a query was executed
- The search was optimized and now uses a array cache to store the PrccessMaker Users
This commit is contained in:
Julio Cesar Laura
2012-03-07 18:17:14 -04:00
parent 8a54d14903
commit 246cda388a
1 changed files with 24 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
workflow/engine/methods/authSources/authSources_Ajax.php
View File

@@ -32,8 +32,22 @@ try {
switch ($_REQUEST['action']) { switch ($_REQUEST['action']) {
case 'searchUsers': case 'searchUsers':
G::LoadThirdParty('pear/json','class.json');
require_once 'classes/model/Users.php'; require_once 'classes/model/Users.php';
$criteria = new Criteria('workflow');
$criteria->addSelectColumn(UsersPeer::USR_USERNAME);
$criteria->add(UsersPeer::USR_STATUS, array('CLOSED'), Criteria::NOT_IN);
$dataset = UsersPeer::DoSelectRs($criteria);
$dataset->setFetchmode (ResultSet::FETCHMODE_ASSOC);
$dataset->next();
$pmUsers = array();
while ($row = $dataset->getRow()) {
$pmUsers[] = $row['USR_USERNAME'];
$dataset->next();
}
$aFields = $RBAC->getAuthSource($_POST['sUID']);
G::LoadThirdParty('pear/json','class.json');
$oJSON = new Services_JSON(); $oJSON = new Services_JSON();
$i = 0; $i = 0;
$oUser = new Users(); $oUser = new Users();
@@ -49,7 +63,7 @@ try {
'Email' => 'char', 'Email' => 'char',
'DistinguishedName' => 'char'); 'DistinguishedName' => 'char');
foreach ($aAux as $aUser) { foreach ($aAux as $aUser) {
if (UsersPeer::doCount($oUser->loadByUsername($aUser['sUsername'])) == 0) { if (!in_array($aUser['sUsername'], $pmUsers)) {
// add replace to change D'Souza to D*Souza by krlos // add replace to change D'Souza to D*Souza by krlos
$sCheckbox = '<input type="checkbox" name="aUsers[' . $i . ']" id="aUsers[' . $i . ']" value=\'' . str_replace( "\'","*", addslashes($oJSON->encode($aUser)) ) . '\' />'; $sCheckbox = '<input type="checkbox" name="aUsers[' . $i . ']" id="aUsers[' . $i . ']" value=\'' . str_replace( "\'","*", addslashes($oJSON->encode($aUser)) ) . '\' />';
$i++; $i++;
@@ -65,7 +79,7 @@ try {
'FirstName' => $aUser['sFirstname'], 'FirstName' => $aUser['sFirstname'],
'LastName' => $aUser['sLastname'], 'LastName' => $aUser['sLastname'],
'Email' => $aUser['sEmail'], 'Email' => $aUser['sEmail'],
'DistinguishedName' => $aUser['sDN']); 'DistinguishedName' => $aUser['sDN']);
} }
global $_DBArray; global $_DBArray;
$_DBArray['users'] = $aUsers; $_DBArray['users'] = $aUsers;
@@ -74,8 +88,6 @@ try {
$oCriteria = new Criteria('dbarray'); $oCriteria = new Criteria('dbarray');
$oCriteria->setDBArrayTable('users'); $oCriteria->setDBArrayTable('users');
$aFields = $RBAC->getAuthSource($_POST['sUID']);
global $G_PUBLISH; global $G_PUBLISH;
$G_PUBLISH = new Publisher(); $G_PUBLISH = new Publisher();
if ($aFields['AUTH_SOURCE_PROVIDER'] != 'ldap') { if ($aFields['AUTH_SOURCE_PROVIDER'] != 'ldap') {
@@ -98,25 +110,25 @@ try {
$co = new Configurations(); $co = new Configurations();
$config = $co->getConfiguration('authSourcesList', 'pageSize','',$_SESSION['USER_LOGGED']); $config = $co->getConfiguration('authSourcesList', 'pageSize','',$_SESSION['USER_LOGGED']);
$limit_size = isset($config['pageSize']) ? $config['pageSize'] : 20; $limit_size = isset($config['pageSize']) ? $config['pageSize'] : 20;
$start = isset($_REQUEST['start']) ? $_REQUEST['start'] : 0; $start = isset($_REQUEST['start']) ? $_REQUEST['start'] : 0;
$limit = isset($_REQUEST['limit']) ? $_REQUEST['limit'] : $limit_size; $limit = isset($_REQUEST['limit']) ? $_REQUEST['limit'] : $limit_size;
$filter = isset($_REQUEST['textFilter']) ? $_REQUEST['textFilter'] : ''; $filter = isset($_REQUEST['textFilter']) ? $_REQUEST['textFilter'] : '';
$Criterias = $RBAC->getAuthenticationSources($start, $limit, $filter); $Criterias = $RBAC->getAuthenticationSources($start, $limit, $filter);
$Dat = AuthenticationSourcePeer::doSelectRS($Criterias['COUNTER']); $Dat = AuthenticationSourcePeer::doSelectRS($Criterias['COUNTER']);
$Dat->setFetchmode(ResultSet::FETCHMODE_ASSOC); $Dat->setFetchmode(ResultSet::FETCHMODE_ASSOC);
$Dat->next(); $Dat->next();
$row = $Dat->getRow(); $row = $Dat->getRow();
$total_sources = $row['CNT']; $total_sources = $row['CNT'];
$oDataset = AuthenticationSourcePeer::doSelectRS($Criterias['LIST']); $oDataset = AuthenticationSourcePeer::doSelectRS($Criterias['LIST']);
$oDataset->setFetchmode(ResultSet::FETCHMODE_ASSOC); $oDataset->setFetchmode(ResultSet::FETCHMODE_ASSOC);
global $RBAC; global $RBAC;
$auth = $RBAC->getAllUsersByAuthSource(); $auth = $RBAC->getAllUsersByAuthSource();
$aSources = Array(); $aSources = Array();
while ($oDataset->next()){ while ($oDataset->next()){
$aSources[] = $oDataset->getRow(); $aSources[] = $oDataset->getRow();
@@ -165,7 +177,7 @@ try {
break; break;
case 'loadauthSourceData': case 'loadauthSourceData':
global $RBAC; global $RBAC;
$fields = $RBAC->getAuthSource($_POST['sUID']); $fields = $RBAC->getAuthSource($_POST['sUID']);
if (is_array($fields['AUTH_SOURCE_DATA'])) { if (is_array($fields['AUTH_SOURCE_DATA'])) {
foreach($fields['AUTH_SOURCE_DATA'] as $field => $value) { foreach($fields['AUTH_SOURCE_DATA'] as $field => $value) {