Skip to content

Commit 1cf0427

Browse files
committed
Support the finding of multiple 'group' objects (could be nisObject etc).
1 parent 890e4f4 commit 1cf0427

File tree

1 file changed

+21
-5
lines changed

1 file changed

+21
-5
lines changed

user_del.php

Lines changed: 21 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -73,11 +73,27 @@
7373
foreach($_SESSION["BASE_DN"] as $dn) {
7474
$filter = '(cn='.$results[pql_get_define("PQL_ATTR_UID")].')';
7575
$results = $_pql->search($dn, $filter);
76-
if(@$results["dn"] && $_pql->delete($results["dn"])) {
77-
$msg = $LANG->_('Successfully removed group').'<br>';
78-
$DNs[] = $results["dn"];
79-
} else
80-
$msg = $LANG->_('Failed to removed group').'<br>';
76+
if(@$results["dn"]) {
77+
// Flat object - only one hit
78+
if($_pql->delete($results["dn"])) {
79+
$msg = pql_complete_constant($LANG->_('Successfully removed group %dn%'),
80+
array('dn' => $results["dn"])).'<br>';
81+
$DNs[] = $results["dn"];
82+
} else
83+
$msg = pql_complete_constant($LANG->_('Failed to remove group %dn%'),
84+
array('dn' => $results["dn"])).'<br>';
85+
} elseif(@$results[0]["dn"]) {
86+
// Multiple objects
87+
for($i=0; $results[$i]["dn"]; $i++) {
88+
if($_pql->delete($results[$i]["dn"])) {
89+
$msg = pql_complete_constant($LANG->_('Successfully removed group %dn%'),
90+
array('dn' => $results[$i]["dn"])).'<br>';
91+
$DNs[] = $results[$i]["dn"];
92+
} else
93+
$msg = pql_complete_constant($LANG->_('Failed to remove group %dn%'),
94+
array('dn' => $results[$i]["dn"])).'<br>';
95+
}
96+
}
8197
}
8298
}
8399
// }}}

0 commit comments

Comments
 (0)