From fec3d5150a5281994245ac5b4712004b4cd8428e Mon Sep 17 00:00:00 2001 From: hickert Date: Mon, 15 May 2006 08:00:54 +0000 Subject: [PATCH] Removed subsearch from fai dialog git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@3330 594d385d-05f5-0310-b6e9-bd551577e9d8 --- plugins/admin/fai/class_divListFai.inc | 4 ++-- plugins/admin/fai/class_faiManagement.inc | 13 ++----------- 2 files changed, 4 insertions(+), 13 deletions(-) diff --git a/plugins/admin/fai/class_divListFai.inc b/plugins/admin/fai/class_divListFai.inc index 00e9d895e..3acbb296c 100644 --- 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 9b7ff99df..b171bf936 100644 --- 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){ -- 2.30.2