Removed subsearch from fai dialog

git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@3330 594d385d-05f5-0310-b6e9-bd551577e9d8

diff --git a/plugins/admin/fai/class_divListFai.inc b/plugins/admin/fai/class_divListFai.inc
index 00e9d895e01818138703f37694a5af587a04e79c..3acbb296ceb4094128fa824105325db20e0c02b2 100644 (file)
--- a/plugins/admin/fai/class_divListFai.inc
+++ b/plugins/admin/fai/class_divListFai.inc
@@ -68,8 +68,8 @@ class divListFai extends MultiSelectWindow
     $this->AddCheckBox("ShowPartitions" , _("Display FAI partitions")         ,_("Show partitions")   ,true);
 
     /* Add SubSearch checkbox */
-    $this->AddCheckBox(SEPERATOR);
-    $this->AddCheckBox("SubSearch",  _("Select to search within subtrees"), _("Ignore subtrees"), false);
+    //$this->AddCheckBox(SEPERATOR);
+    //$this->AddCheckBox("SubSearch",  _("Select to search within subtrees"), _("Ignore subtrees"), false);
 
     /*                  Name                 ,Text                              ,Default  , Connect with alphabet  */
     $this->AddRegex   ("Regex",     _("Display users matching"),"*" , true);

diff --git a/plugins/admin/fai/class_faiManagement.inc b/plugins/admin/fai/class_faiManagement.inc
index 9b7ff99df7c32e275c125a5a65479a5832b9406c..b171bf9364d83bfe849264d4322a36488eb0ae83 100644 (file)
--- a/plugins/admin/fai/class_faiManagement.inc
+++ b/plugins/admin/fai/class_faiManagement.inc
@@ -543,11 +543,7 @@ class faiManagement extends plugin
 
     /* Display dialog with system list */
     $this->DivListFai->execute();
-
-    /* Add departments if subsearch is disabled */
-    if(!$this->DivListFai->SubSearch){
-      $this->DivListFai->AddDepartments($this->DivListFai->selectedBase,4);
-    }
+    $this->DivListFai->AddDepartments($this->DivListFai->selectedBase,4);
     $this->reload();
     $this->DivListFai->setEntries($this->objects);
     return($this->DivListFai->Draw());
@@ -615,13 +611,8 @@ class faiManagement extends plugin
       }
 
       /* Fetch objects from fai sub department */
-      if($this->DivListFai->SubSearch){
-        $res= get_list("(&(objectClass=".$type.")(cn=$Regex))", $this->ui->subtreeACL, preg_replace("/^.*ou=fai,ou=configs,ou=systems,/","",$base),
-            array("cn","description","objectClass","FAIclass","FAIstate"), GL_SIZELIMIT | GL_SUBSEARCH);
-      }else{
-        $res= get_list("(&(objectClass=".$type.")(cn=$Regex))", $this->ui->subtreeACL, $obj['OU'].$base,
+      $res= get_list("(&(objectClass=".$type.")(cn=$Regex))", $this->ui->subtreeACL, $obj['OU'].$base,
             array("cn","description","objectClass","FAIclass","FAIstate"), GL_SIZELIMIT);
-      }
 
       /* Walk through objects */
                        foreach($res as $object){