index 53084d28a2463c119143d842c47c24838d3ecf1e..34aff04a8e5652b6c00a9e61cb5bdb8df7dbb459 100644 (file)
class filterLDAP {
- static function query($base, $scope, $filter, $attributes, $category, $objectStorage= "")
+ static function query($base, $scope, $filter, $attributes, $category, $objectStorage= array(""))
{
$config= session::global_get('config');
$ldap= $config->get_ldap_link(TRUE);
static function get_list($base, $filter, $attributes, $category, $objectStorage, $flags= GL_SUBSEARCH)
{
- global $ui;
- global $config;
+ $ui= session::global_get('ui');
+ $config= session::global_get('config');
// Move to arrays for category and objectStorage
if (!is_array($category)) {
$category= array($category);
}
- if (!is_array($objectStorage)) {
- $objectStorage= array($objectStorage);
- }
+
+ // Store in base - i.e. is a rdn value empty?
+ $storeOnBase= count($objectStorage) == 1 && empty($objectStorage[0]);
+
+ $method= ($storeOnBase && !($flags & GL_SUBSEARCH))?"ls":"search";
// Initialize search bases
$bases= array();
// Get list of sub bases to search on
- foreach ($objectStorage as $oc) {
- $oc= preg_replace('/,$/', '', $oc);
- $tmp= split(',', $oc);
- if (count($tmp) == 1) {
- preg_match('/([^=]+)=(.*)$/', $oc, $m);
- if ($flags & GL_SUBSEARCH) {
- $bases[$base][]= $m[1].":dn:=".$m[2];
- } else {
- $bases["$oc,$base"][]= $m[1].":dn:=".$m[2];
- }
- } else {
- // No, there's no \, in pre defined RDN values
- preg_match('/^([^,]+),(.*)$/', $oc, $matches);
- preg_match('/([^=]+)=(.*)$/', $matches[1], $m);
- if ($flags & GL_SUBSEARCH) {
- $bases[$base][]= $m[1].":dn:=".$m[2];
+ if ($storeOnBase) {
+ $bases[$base]= "";
+ } else {
+ foreach ($objectStorage as $oc) {
+ $oc= preg_replace('/,$/', '', $oc);
+ $tmp= explode(',', $oc);
+ if (count($tmp) == 1) {
+ preg_match('/([^=]+)=(.*)$/', $oc, $m);
+ if ($flags & GL_SUBSEARCH) {
+ $bases[$base][]= $m[1].":dn:=".$m[2];
+ } else {
+ $bases["$oc,$base"][]= $m[1].":dn:=".$m[2];
+ }
} else {
- $bases[$matches[2].",$base"][]= $m[1].":dn:=".$m[2];
+ // No, there's no \, in pre defined RDN values
+ preg_match('/^([^,]+),(.*)$/', $oc, $matches);
+ preg_match('/([^=]+)=(.*)$/', $matches[1], $m);
+ if ($flags & GL_SUBSEARCH) {
+ $bases[$base][]= $m[1].":dn:=".$m[2];
+ } else {
+ $bases[$matches[2].",$base"][]= $m[1].":dn:=".$m[2];
+ }
}
}
}
}
// Switch to new base and search
+ if (is_array($dnFilters)){
+ $dnFilter= "(|";
+ foreach ($dnFilters as $df) {
+ $dnFilter.= "($df)";
+ }
+ $dnFilter.= ")";
+ } else {
+ $dnFilter= "";
+ }
$ldap->cd($base);
- $dnFilter= "(|";
- foreach ($dnFilters as $df) {
- $dnFilter.= "($df)";
+ if ($method == "ls") {
+ $ldap->ls("(&$filter$dnFilter)", $base, $attributes);
+ } else {
+ $ldap->search("(&$filter$dnFilter)", $attributes);
}
- $dnFilter.= ")";
- $ldap->search ("(&$filter$dnFilter)", $attributes);
// Check for size limit exceeded messages for GUI feedback
if (preg_match("/size limit/i", $ldap->get_error())){