From: hickert Date: Thu, 29 Jul 2010 10:15:36 +0000 (+0000) Subject: Updated post handling X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=91e8835aea88c99cf5ba1bc9668bfb97ff49006e;p=gosa.git Updated post handling git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@19206 594d385d-05f5-0310-b6e9-bd551577e9d8 --- diff --git a/gosa-core/plugins/admin/groups/class_filterGroupLDAP.inc b/gosa-core/plugins/admin/groups/class_filterGroupLDAP.inc index 2176ca9a1..d5c396b94 100644 --- a/gosa-core/plugins/admin/groups/class_filterGroupLDAP.inc +++ b/gosa-core/plugins/admin/groups/class_filterGroupLDAP.inc @@ -2,51 +2,51 @@ class filterGroupLDAP { - static function query($base, $scope, $filter, $attributes, $category, $objectStorage= "") - { - $result= array(); - $menu= array(); - $dn2index= array(); - $config= session::global_get('config'); - $ldap= $config->get_ldap_link(TRUE); - $flag= ($scope == "sub")?GL_SUBSEARCH:0; - $tmp= filterGroupLDAP::get_list($base, $filter, $attributes, $category, $objectStorage, $flag | GL_SIZELIMIT); - - // Sort out menu entries, but save info - $index= 0; - foreach ($tmp as $entry) { - if (in_array_ics("posixGroup", $entry['objectClass'])) { - $result[$index]= $entry; - $dn2index[$entry['dn']]= $index; - $index++; - } else { - foreach ($objectStorage as $storage) { - $group= preg_replace("/^.*,([^,]+),".preg_quote("$storage$base")."$/", '$1', $entry['dn']); - $group= "$group,$storage$base"; - - // The current group implementation has no multiple storage settings - so break here - break; + static function query($base, $scope, $filter, $attributes, $category, $objectStorage= "") + { + $result= array(); + $menu= array(); + $dn2index= array(); + $config= session::global_get('config'); + $ldap= $config->get_ldap_link(TRUE); + $flag= ($scope == "sub")?GL_SUBSEARCH:0; + $tmp= filterGroupLDAP::get_list($base, $filter, $attributes, $category, $objectStorage, $flag | GL_SIZELIMIT); + + // Sort out menu entries, but save info + $index= 0; + foreach ($tmp as $entry) { + if (in_array_ics("posixGroup", $entry['objectClass'])) { + $result[$index]= $entry; + $dn2index[$entry['dn']]= $index; + $index++; + } else { + foreach ($objectStorage as $storage) { + $group= preg_replace("/^.*,([^,]+),".preg_quote("$storage$base")."$/", '$1', $entry['dn']); + $group= "$group,$storage$base"; + + // The current group implementation has no multiple storage settings - so break here + break; + } + $menu[$group]= true; + } } - $menu[$group]= true; - } - } - // Move menu information to menu - foreach ($menu as $dn => $dummy) { - if(isset($dn2index[$dn])){ - $result[$dn2index[$dn]]["objectClass"][]= "gotoMenuGroup"; - } - } + // Move menu information to menu + foreach ($menu as $dn => $dummy) { + if(isset($dn2index[$dn])){ + $result[$dn2index[$dn]]["objectClass"][]= "gotoMenuGroup"; + } + } - return $result; - } + return $result; + } - static function get_list($base, $filter, $attributes, $category, $objectStorage, $flags= GL_SUBSEARCH) - { - $filter= "(|(|(objectClass=gotoMenuEntry)(objectClass=gotoSubmenuEntry))$filter)"; - return filterLDAP::get_list($base, $filter, $attributes, $category, $objectStorage, $flags); - } + static function get_list($base, $filter, $attributes, $category, $objectStorage, $flags= GL_SUBSEARCH) + { + $filter= "(|(|(objectClass=gotoMenuEntry)(objectClass=gotoSubmenuEntry))$filter)"; + return filterLDAP::get_list($base, $filter, $attributes, $category, $objectStorage, $flags); + } }