X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=plugins%2Fadmin%2Ffai%2Fclass_askClassName.inc;h=13b923a8b0cbd45c1014b117e408b4058d9de4a3;hb=2c0515a09cbb244ec32757b8372f7e55830a67e3;hp=ae0d33657b0b5caf2cc31bb57deec70edd068be8;hpb=2e5c2c0d8a0200c27b6fe01d6197b1672eaeaed0;p=gosa.git

diff --git a/plugins/admin/fai/class_askClassName.inc b/plugins/admin/fai/class_askClassName.inc
index ae0d33657..13b923a8b 100644
--- a/plugins/admin/fai/class_askClassName.inc
+++ b/plugins/admin/fai/class_askClassName.inc
@@ -41,7 +41,11 @@ class askClassName extends plugin
     /* First search for every ou, in given fai base
      * With a second search detect all object that belong to the different ous. 
      */
+
     $base = "ou=fai,ou=configs,ou=systems,".$faifilter['base'];
+    if($faifilter['branch'] != "main"){
+      $base = $faifilter['branch'];
+    }
     $ldap = $this->config->get_ldap_link();
     $res  = get_list($this->ui->subtreeACL, "(objectClass=organizationalUnit)",FALSE, $base, array("cn","description","objectClass"),TRUE);
     $used = array();
@@ -59,7 +63,9 @@ class askClassName extends plugin
     
         /* Skip profiles */
         if(!in_array("FAIprofile",$object['objectClass'])){
-          $used[$object['cn'][0]]= $object['cn'][0];
+          if(isset($object['cn'])){
+            $used[$object['cn'][0]]= $object['cn'][0];
+          }
         }
       }
     }