From: cajus Date: Thu, 18 May 2006 13:06:57 +0000 (+0000) Subject: Fixed fai branch search X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=56815fbe62493b4d07232b73631c31c4ff92d396;p=gosa.git Fixed fai branch search git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@3430 594d385d-05f5-0310-b6e9-bd551577e9d8 --- diff --git a/plugins/admin/fai/class_faiManagement.inc b/plugins/admin/fai/class_faiManagement.inc index b171bf936..95907126a 100644 --- a/plugins/admin/fai/class_faiManagement.inc +++ b/plugins/admin/fai/class_faiManagement.inc @@ -555,20 +555,16 @@ class faiManagement extends plugin { $ret = array("main"=>"/"); $ldap = $this->config->get_ldap_link(); - $ldap->cd($this->config->current['BASE']); if(!$base){ - $base= "ou=fai,ou=configs,ou=systems,".$this->DivListFai->selectedBase; + $base= "ou=fai,ou=configs,ou=systems,".$_SESSION['CurrentMainBase']; } - $ldap->cd($base); - $ldap->ls("(objectClass=FAIbranch)",$base); + ldap->ls("(objectClass=FAIbranch)",$base); while($attrs = $ldap->fetch()){ if((isset($attrs['ou']))&&($attrs['dn']!=$base)){ $ret[$attrs['dn']]= $prefix.$attrs['ou'][0]; $ret = array_merge($ret,$this->getBranches($attrs['dn'],"".$prefix.$attrs['ou'][0]."/")); } } - return($ret); - } /* reload list of objects */