Updated dn display to not break at spaces

[gosa.git] / plugins / admin / fai / class_faiManagement.inc

diff --git a/plugins/admin/fai/class_faiManagement.inc b/plugins/admin/fai/class_faiManagement.inc
index 95907126a9116dcce95cde4b0b851afc83e7e1ed..b134623f088450d70d8a42dc6fe6c2309c3ba2c4 100644 (file)
--- a/plugins/admin/fai/class_faiManagement.inc
+++ b/plugins/admin/fai/class_faiManagement.inc
@@ -542,6 +542,7 @@ class faiManagement extends plugin
      ****************/
 
     /* Display dialog with system list */
+    $this->DivListFai->parent = $this;
     $this->DivListFai->execute();
     $this->DivListFai->AddDepartments($this->DivListFai->selectedBase,4);
     $this->reload();
@@ -558,7 +559,7 @@ class faiManagement extends plugin
     if(!$base){
       $base= "ou=fai,ou=configs,ou=systems,".$_SESSION['CurrentMainBase'];
     }
-    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];
@@ -566,6 +567,9 @@ class faiManagement extends plugin
       }
     }
 
+    return ($ret);
+  }
+
   
   /* reload list of objects */
        function reload()
@@ -702,7 +706,7 @@ class faiManagement extends plugin
       return(false);
     }elseif(empty($name)){
       return(false);
-    }elseif(in_array($name,array("fai","disk","packages","scripts","templates","hooks","variables","profiles","apps"))){
+    }elseif(is_department_name_reserved($name,$base)){
       return(false);
     }
     return(true);