BUG 8532 Unable to import all users via LDAP Advanced SOLVED

- 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

View File

@@ -32,8 +32,22 @@ try {
switch ($_REQUEST['action']) {
case 'searchUsers':
G::LoadThirdParty('pear/json','class.json');
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();
$i = 0;
$oUser = new Users();
@@ -49,7 +63,7 @@ try {
'Email' => 'char',
'DistinguishedName' => 'char');
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
$sCheckbox = '<input type="checkbox" name="aUsers[' . $i . ']" id="aUsers[' . $i . ']" value=\'' . str_replace( "\'","*", addslashes($oJSON->encode($aUser)) ) . '\' />';
$i++;
@@ -74,8 +88,6 @@ try {
$oCriteria = new Criteria('dbarray');
$oCriteria->setDBArrayTable('users');
$aFields = $RBAC->getAuthSource($_POST['sUID']);
global $G_PUBLISH;
$G_PUBLISH = new Publisher();
if ($aFields['AUTH_SOURCE_PROVIDER'] != 'ldap') {