index 0db08e8660fcb20403e9dbc768eece4f294fd86e..42783ab3662382fb50359698ed31fe324baa4cc3 100644 (file)
if(isset($this->parent->by_object['workgeneric']->cn)){
$this->Classes[] = $this->parent->by_object['workgeneric']->cn;
}
-
+
$tmp = array_flip($tmp);
if(!isset($tmp[$this->Release])) {
$this->Release = "";
$ret = array("main"=>"/");
$ldap = $this->config->get_ldap_link();
$ldap->cd($this->config->current['BASE']);
- if(!$base){
- $base= "ou=fai,ou=configs,ou=systems,".$_SESSION['CurrentMainBase'];
- }
- $ldap->cd($base);
- $ldap->ls("(objectClass=FAIbranch)",$base);
+ $ldap->search("(objectClass=FAIbranch)",array("dn","cn","ou"));
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]."/"));
+ $name = convert_department_dn(preg_replace("/,ou=fai,.*$/","",$attrs['dn']));
+ $ret[$attrs['dn']] = $name;
+ $ret = array_merge($ret,$this->getBranches($attrs['dn'],$prefix.$attrs['ou'][0]."/"));
}
}
return($ret);