From e185cfe3858fbd8a85ea29a084535af25928dcfa Mon Sep 17 00:00:00 2001 From: hickert Date: Thu, 3 May 2007 09:22:53 +0000 Subject: [PATCH] Fixed base in management divLists. The base was shown as last element in the dropdown box git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@6245 594d385d-05f5-0310-b6e9-bd551577e9d8 --- plugins/admin/acl/class_divListACL.inc | 4 ++-- plugins/admin/applications/class_divListApplication.inc | 4 ++-- plugins/admin/departments/class_divListDepartment.inc | 4 ++-- plugins/admin/fai/class_divListFai.inc | 4 ++-- plugins/admin/groups/class_divListGroup.inc | 4 ++-- plugins/admin/mimetypes/class_divListMimeTypes.inc | 4 ++-- plugins/admin/ogroups/class_divListOGroup.inc | 4 ++-- plugins/admin/systems/class_divListSystem.inc | 4 ++-- plugins/admin/users/class_divListUsers.inc | 4 ++-- plugins/gofax/blocklists/class_divListBlocklists.inc | 4 ++-- plugins/gofon/conference/class_divListConferences.inc | 4 ++-- plugins/gofon/macro/class_divListMacros.inc | 4 ++-- 12 files changed, 24 insertions(+), 24 deletions(-) diff --git a/plugins/admin/acl/class_divListACL.inc b/plugins/admin/acl/class_divListACL.inc index 3324d970f..59020e392 100644 --- a/plugins/admin/acl/class_divListACL.inc +++ b/plugins/admin/acl/class_divListACL.inc @@ -74,11 +74,11 @@ class divListACL extends MultiSelectWindow $first = ""; $found = FALSE; $base = $this->config->current['BASE']; - $deps= get_list("(&(|(ou=*)(description=*))(objectClass=gosaDepartment))", "acl", $base, - array("ou", "description"), GL_SIZELIMIT | GL_SUBSEARCH); /* Add base */ $deps[] = array("dn"=>$this->config->current['BASE']); + $deps= array_merge($deps,get_list("(&(|(ou=*)(description=*))(objectClass=gosaDepartment))", $this->module, $base, + array("ou", "description"), GL_SIZELIMIT | GL_SUBSEARCH)); /* Load possible departments */ $ui = get_userinfo(); diff --git a/plugins/admin/applications/class_divListApplication.inc b/plugins/admin/applications/class_divListApplication.inc index 71ef2ad71..b43500a87 100755 --- a/plugins/admin/applications/class_divListApplication.inc +++ b/plugins/admin/applications/class_divListApplication.inc @@ -86,11 +86,11 @@ class divListApplication extends MultiSelectWindow /* Get all departments within this subtree */ $base = $this->config->current['BASE']; - $deps= get_list("(&(|(ou=*)(description=*))(objectClass=gosaDepartment))", $this->module, $base, - array("ou", "description"), GL_SIZELIMIT | GL_SUBSEARCH); /* Add base */ $deps[] = array("dn"=>$this->config->current['BASE']); + $deps= array_merge($deps,get_list("(&(|(ou=*)(description=*))(objectClass=gosaDepartment))", $this->module, $base, + array("ou", "description"), GL_SIZELIMIT | GL_SUBSEARCH)); /* Load possible departments */ $ui= get_userinfo(); diff --git a/plugins/admin/departments/class_divListDepartment.inc b/plugins/admin/departments/class_divListDepartment.inc index d1107a570..356fc8dbc 100755 --- a/plugins/admin/departments/class_divListDepartment.inc +++ b/plugins/admin/departments/class_divListDepartment.inc @@ -69,11 +69,11 @@ class divListDepartment extends MultiSelectWindow $first = ""; $found = FALSE; $base = $this->config->current['BASE']; - $deps= get_list("(&(|(ou=*)(description=*))(objectClass=gosaDepartment))", $this->module, $base, - array("ou", "description"), GL_SIZELIMIT | GL_SUBSEARCH); /* Add base */ $deps[] = array("dn"=>$this->config->current['BASE']); + $deps= array_merge($deps,get_list("(&(|(ou=*)(description=*))(objectClass=gosaDepartment))", $this->module, $base, + array("ou", "description"), GL_SIZELIMIT | GL_SUBSEARCH)); /* Load possible departments */ $ui= get_userinfo(); diff --git a/plugins/admin/fai/class_divListFai.inc b/plugins/admin/fai/class_divListFai.inc index 122f08912..4a68f3ecb 100644 --- a/plugins/admin/fai/class_divListFai.inc +++ b/plugins/admin/fai/class_divListFai.inc @@ -110,11 +110,11 @@ class divListFai extends MultiSelectWindow $first = ""; $found = FALSE; $base = $this->config->current['BASE']; - $deps= get_list("(&(|(ou=*)(description=*))(objectClass=gosaDepartment))", $this->module, $base, - array("ou", "description"), GL_SIZELIMIT | GL_SUBSEARCH); /* Add base */ $deps[] = array("dn"=>$this->config->current['BASE']); + $deps= array_merge($deps,get_list("(&(|(ou=*)(description=*))(objectClass=gosaDepartment))", $this->module, $base, + array("ou", "description"), GL_SIZELIMIT | GL_SUBSEARCH)); /* Load possible departments */ $ui= get_userinfo(); diff --git a/plugins/admin/groups/class_divListGroup.inc b/plugins/admin/groups/class_divListGroup.inc index 8e31b350d..09d3ffa02 100644 --- a/plugins/admin/groups/class_divListGroup.inc +++ b/plugins/admin/groups/class_divListGroup.inc @@ -92,11 +92,11 @@ class divListGroup extends MultiSelectWindow $first = ""; $found = FALSE; $base = $this->config->current['BASE']; - $deps= get_list("(&(|(ou=*)(description=*))(objectClass=gosaDepartment))", $this->module, $base, - array("ou", "description"), GL_SIZELIMIT | GL_SUBSEARCH); /* Add base */ $deps[] = array("dn"=>$this->config->current['BASE']); + $deps= array_merge($deps,get_list("(&(|(ou=*)(description=*))(objectClass=gosaDepartment))", $this->module, $base, + array("ou", "description"), GL_SIZELIMIT | GL_SUBSEARCH)); /* Load possible departments */ $ui= get_userinfo(); diff --git a/plugins/admin/mimetypes/class_divListMimeTypes.inc b/plugins/admin/mimetypes/class_divListMimeTypes.inc index ce907fa3b..243bff57e 100755 --- a/plugins/admin/mimetypes/class_divListMimeTypes.inc +++ b/plugins/admin/mimetypes/class_divListMimeTypes.inc @@ -96,11 +96,11 @@ class divListMimeTypes extends MultiSelectWindow $first = ""; $found = FALSE; $base = $this->config->current['BASE']; - $deps= get_list("(&(|(ou=*)(description=*))(objectClass=gosaDepartment))", $this->module, $base, - array("ou", "description"), GL_SIZELIMIT | GL_SUBSEARCH); /* Add base */ $deps[] = array("dn"=>$this->config->current['BASE']); + $deps= array_merge($deps,get_list("(&(|(ou=*)(description=*))(objectClass=gosaDepartment))", $this->module, $base, + array("ou", "description"), GL_SIZELIMIT | GL_SUBSEARCH)); /* Load possible departments */ $ui = get_userinfo(); diff --git a/plugins/admin/ogroups/class_divListOGroup.inc b/plugins/admin/ogroups/class_divListOGroup.inc index 7b4e81e67..878c9d326 100755 --- a/plugins/admin/ogroups/class_divListOGroup.inc +++ b/plugins/admin/ogroups/class_divListOGroup.inc @@ -96,11 +96,11 @@ class divListOGroup extends MultiSelectWindow $first = ""; $found = FALSE; $base = $this->config->current['BASE']; - $deps= get_list("(&(|(ou=*)(description=*))(objectClass=gosaDepartment))", $this->module, $base, - array("ou", "description"), GL_SIZELIMIT | GL_SUBSEARCH); /* Add base */ $deps[] = array("dn"=>$this->config->current['BASE']); + $deps= array_merge($deps,get_list("(&(|(ou=*)(description=*))(objectClass=gosaDepartment))", $this->module, $base, + array("ou", "description"), GL_SIZELIMIT | GL_SUBSEARCH)); /* Load possible departments */ $ui= get_userinfo(); diff --git a/plugins/admin/systems/class_divListSystem.inc b/plugins/admin/systems/class_divListSystem.inc index 882805955..b2f297e4b 100644 --- a/plugins/admin/systems/class_divListSystem.inc +++ b/plugins/admin/systems/class_divListSystem.inc @@ -95,11 +95,11 @@ class divListSystem extends MultiSelectWindow /* Get all departments within this subtree */ $base = $this->config->current['BASE']; - $deps= get_list("(&(|(ou=*)(description=*))(objectClass=gosaDepartment))", $this->module, $base, - array("ou", "description"), GL_SIZELIMIT | GL_SUBSEARCH); /* Add base */ $deps[] = array("dn"=>$this->config->current['BASE']); + $deps= array_merge($deps,get_list("(&(|(ou=*)(description=*))(objectClass=gosaDepartment))", $this->module, $base, + array("ou", "description"), GL_SIZELIMIT | GL_SUBSEARCH)); $tmp =array(); foreach($deps as $dep){ diff --git a/plugins/admin/users/class_divListUsers.inc b/plugins/admin/users/class_divListUsers.inc index 2565f0d8e..4aa5b410c 100644 --- a/plugins/admin/users/class_divListUsers.inc +++ b/plugins/admin/users/class_divListUsers.inc @@ -87,11 +87,11 @@ class divListUsers extends MultiSelectWindow /* Get all departments within this subtree */ $base = $this->config->current['BASE']; - $deps= get_list("(objectClass=gosaDepartment)", $this->module, $base, - array("ou", "description"), GL_SIZELIMIT | GL_SUBSEARCH); /* Add base */ $deps[] = array("dn"=>$this->config->current['BASE']); + $deps= array_merge($deps,get_list("(&(|(ou=*)(description=*))(objectClass=gosaDepartment))", $this->module, $base, + array("ou", "description"), GL_SIZELIMIT | GL_SUBSEARCH)); /* Load possible departments */ $ui= get_userinfo(); diff --git a/plugins/gofax/blocklists/class_divListBlocklists.inc b/plugins/gofax/blocklists/class_divListBlocklists.inc index 42bd1f549..d96120e50 100755 --- a/plugins/gofax/blocklists/class_divListBlocklists.inc +++ b/plugins/gofax/blocklists/class_divListBlocklists.inc @@ -78,11 +78,11 @@ class divListBlocklist extends MultiSelectWindow /* Get all departments within this subtree */ $base = $this->config->current['BASE']; - $deps= get_list("(&(|(ou=*)(description=*))(objectClass=gosaDepartment))", $this->module, $base, - array("ou", "description"), GL_SIZELIMIT | GL_SUBSEARCH); /* Add base */ $deps[] = array("dn"=>$this->config->current['BASE']); + $deps= array_merge($deps,get_list("(&(|(ou=*)(description=*))(objectClass=gosaDepartment))", $this->module, $base, + array("ou", "description"), GL_SIZELIMIT | GL_SUBSEARCH)); /* Load possible departments */ $first = ""; diff --git a/plugins/gofon/conference/class_divListConferences.inc b/plugins/gofon/conference/class_divListConferences.inc index aeb111f78..d1afa402f 100755 --- a/plugins/gofon/conference/class_divListConferences.inc +++ b/plugins/gofon/conference/class_divListConferences.inc @@ -76,11 +76,11 @@ class divListConference extends MultiSelectWindow /* Get all departments within this subtree */ $base = $this->config->current['BASE']; - $deps= get_list("(&(|(ou=*)(description=*))(objectClass=gosaDepartment))", $this->module, $base, - array("ou", "description"), GL_SIZELIMIT | GL_SUBSEARCH); /* Add base */ $deps[] = array("dn"=>$this->config->current['BASE']); + $deps= array_merge($deps,get_list("(&(|(ou=*)(description=*))(objectClass=gosaDepartment))", $this->module, $base, + array("ou", "description"), GL_SIZELIMIT | GL_SUBSEARCH)); /* Load possible departments */ $ui = get_userinfo(); diff --git a/plugins/gofon/macro/class_divListMacros.inc b/plugins/gofon/macro/class_divListMacros.inc index f3c13d969..6d8284c5b 100755 --- a/plugins/gofon/macro/class_divListMacros.inc +++ b/plugins/gofon/macro/class_divListMacros.inc @@ -76,11 +76,11 @@ class divListMacro extends MultiSelectWindow $base = $this->config->current['BASE']; $first = ""; $found = FALSE; - $deps= get_list("(&(|(ou=*)(description=*))(objectClass=gosaDepartment))", $this->module, $base, - array("ou", "description"), GL_SIZELIMIT | GL_SUBSEARCH); /* Add base */ $deps[] = array("dn"=>$this->config->current['BASE']); + $deps= array_merge($deps,get_list("(&(|(ou=*)(description=*))(objectClass=gosaDepartment))", $this->module, $base, + array("ou", "description"), GL_SIZELIMIT | GL_SUBSEARCH)); /* Load possible departments */ $ui= get_userinfo(); -- 2.30.2