X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=plugins%2Fadmin%2Ffai%2Fclass_askClassName.inc;h=edb9d277dc404c33c9abab9b4a9de047268d0f54;hb=e51bd609d694c4708925f3ae3ca8556caabe7720;hp=a2b380e16594071213bce628309e3d13536e339b;hpb=1d9578d8ee2d5a59bd4f9777785ef8567ab8cef1;p=gosa.git

diff --git a/plugins/admin/fai/class_askClassName.inc b/plugins/admin/fai/class_askClassName.inc
index a2b380e16..edb9d277d 100644
--- a/plugins/admin/fai/class_askClassName.inc
+++ b/plugins/admin/fai/class_askClassName.inc
@@ -38,8 +38,9 @@ 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'];
     $ldap = $this->config->get_ldap_link();
-    $res  = get_list($this->ui->subtreeACL, "(objectClass=organizationalUnit)",FALSE, $faifilter['base'], array("cn","description","objectClass"),TRUE);
+    $res  = get_list($this->ui->subtreeACL, "(objectClass=organizationalUnit)",FALSE, $base, array("cn","description","objectClass"),TRUE);
     $used = array();
 
     $delete = array();
@@ -104,18 +105,19 @@ class askClassName extends plugin
    */ 
   function save_object()
   {
-    if(isset($_POST['UseNewClass'])){
+    if(isset($_POST['classSelector']) && $_POST['classSelector'] == 1 
+       && isset($_POST['edit_continue'])){
       $this->ClassName          = $_POST['UseTextInputName'];
       $this->ClassAlreadyExists = true;
     }
   
-    if(isset($_POST['UseSelectedClass'])){
+    if(isset($_POST['classSelector']) && $_POST['classSelector'] == 2 
+       && isset($_POST['edit_continue'])){
       $this->ClassAlreadyExists = false;
       $this->ClassName          = $_POST['SelectedClass'];
     }
   }
 
-
   /* Check given class name 
    */
   function check()