From e19e3d570fda8db305fb177f6ac217865ce6c714 Mon Sep 17 00:00:00 2001 From: hickert Date: Fri, 27 Apr 2007 11:00:41 +0000 Subject: [PATCH] Updated divlists to include the ldap base git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@6202 594d385d-05f5-0310-b6e9-bd551577e9d8 --- plugins/admin/acl/class_divListACL.inc | 3 +++ plugins/admin/applications/class_divListApplication.inc | 3 +++ plugins/admin/departments/class_divListDepartment.inc | 3 +++ plugins/admin/fai/class_divListFai.inc | 3 +++ plugins/admin/groups/class_divListGroup.inc | 3 +++ plugins/admin/mimetypes/class_divListMimeTypes.inc | 3 +++ plugins/admin/ogroups/class_divListOGroup.inc | 3 +++ plugins/admin/systems/class_divListSystem.inc | 3 +++ plugins/admin/users/class_divListUsers.inc | 5 ++++- plugins/gofax/blocklists/class_divListBlocklists.inc | 3 +++ plugins/gofon/conference/class_divListConferences.inc | 3 +++ plugins/gofon/macro/class_divListMacros.inc | 3 +++ 12 files changed, 37 insertions(+), 1 deletion(-) diff --git a/plugins/admin/acl/class_divListACL.inc b/plugins/admin/acl/class_divListACL.inc index 56fe9ae35..c44cdcdd2 100644 --- a/plugins/admin/acl/class_divListACL.inc +++ b/plugins/admin/acl/class_divListACL.inc @@ -77,6 +77,9 @@ class divListACL extends MultiSelectWindow $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']); + /* Load possible departments */ $ui = get_userinfo(); $tdeps = $ui->get_module_departments("acl"); diff --git a/plugins/admin/applications/class_divListApplication.inc b/plugins/admin/applications/class_divListApplication.inc index 19aa04b87..77e82f125 100755 --- a/plugins/admin/applications/class_divListApplication.inc +++ b/plugins/admin/applications/class_divListApplication.inc @@ -89,6 +89,9 @@ class divListApplication extends MultiSelectWindow $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']); + /* Load possible departments */ $ui= get_userinfo(); $tdeps= $ui->get_module_departments("application"); diff --git a/plugins/admin/departments/class_divListDepartment.inc b/plugins/admin/departments/class_divListDepartment.inc index f8e56b0fa..a5a0762bf 100755 --- a/plugins/admin/departments/class_divListDepartment.inc +++ b/plugins/admin/departments/class_divListDepartment.inc @@ -72,6 +72,9 @@ class divListDepartment extends MultiSelectWindow $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']); + /* Load possible departments */ $ui= get_userinfo(); $tdeps= $ui->get_module_departments("department"); diff --git a/plugins/admin/fai/class_divListFai.inc b/plugins/admin/fai/class_divListFai.inc index 95e193f1d..5fbd58d4b 100644 --- a/plugins/admin/fai/class_divListFai.inc +++ b/plugins/admin/fai/class_divListFai.inc @@ -113,6 +113,9 @@ class divListFai extends MultiSelectWindow $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']); + /* Load possible departments */ $ui= get_userinfo(); $tdeps= $ui->get_module_departments("fai"); diff --git a/plugins/admin/groups/class_divListGroup.inc b/plugins/admin/groups/class_divListGroup.inc index a5056b283..9b1802474 100644 --- a/plugins/admin/groups/class_divListGroup.inc +++ b/plugins/admin/groups/class_divListGroup.inc @@ -95,6 +95,9 @@ class divListGroup extends MultiSelectWindow $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']); + /* Load possible departments */ $ui= get_userinfo(); $tdeps= $ui->get_module_departments("groups"); diff --git a/plugins/admin/mimetypes/class_divListMimeTypes.inc b/plugins/admin/mimetypes/class_divListMimeTypes.inc index cbda3fee7..0d961ba4b 100755 --- a/plugins/admin/mimetypes/class_divListMimeTypes.inc +++ b/plugins/admin/mimetypes/class_divListMimeTypes.inc @@ -99,6 +99,9 @@ class divListMimeTypes extends MultiSelectWindow $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']); + /* Load possible departments */ $ui = get_userinfo(); $tdeps= $ui->get_module_departments($this->module); diff --git a/plugins/admin/ogroups/class_divListOGroup.inc b/plugins/admin/ogroups/class_divListOGroup.inc index ed0e70025..959dfaab7 100755 --- a/plugins/admin/ogroups/class_divListOGroup.inc +++ b/plugins/admin/ogroups/class_divListOGroup.inc @@ -99,6 +99,9 @@ class divListOGroup extends MultiSelectWindow $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']); + /* Load possible departments */ $ui= get_userinfo(); $tdeps= $ui->get_module_departments("ogroups"); diff --git a/plugins/admin/systems/class_divListSystem.inc b/plugins/admin/systems/class_divListSystem.inc index a5bc398d6..72870d701 100644 --- a/plugins/admin/systems/class_divListSystem.inc +++ b/plugins/admin/systems/class_divListSystem.inc @@ -98,6 +98,9 @@ class divListSystem extends MultiSelectWindow $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']); + $tmp =array(); foreach($deps as $dep){ $tmp[$dep['dn']] = $dep; diff --git a/plugins/admin/users/class_divListUsers.inc b/plugins/admin/users/class_divListUsers.inc index ed888b8a0..2565f0d8e 100644 --- a/plugins/admin/users/class_divListUsers.inc +++ b/plugins/admin/users/class_divListUsers.inc @@ -87,9 +87,12 @@ class divListUsers extends MultiSelectWindow /* Get all departments within this subtree */ $base = $this->config->current['BASE']; - $deps= get_list("(&(|(ou=*)(description=*))(objectClass=gosaDepartment))", $this->module, $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']); + /* Load possible departments */ $ui= get_userinfo(); $tdeps= $ui->get_module_departments("users"); diff --git a/plugins/gofax/blocklists/class_divListBlocklists.inc b/plugins/gofax/blocklists/class_divListBlocklists.inc index 27ff3d696..58722ecb9 100755 --- a/plugins/gofax/blocklists/class_divListBlocklists.inc +++ b/plugins/gofax/blocklists/class_divListBlocklists.inc @@ -81,6 +81,9 @@ class divListBlocklist extends MultiSelectWindow $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']); + /* Load possible departments */ $first = ""; $found = FALSE; diff --git a/plugins/gofon/conference/class_divListConferences.inc b/plugins/gofon/conference/class_divListConferences.inc index c16d99d4e..0dfd3dc80 100755 --- a/plugins/gofon/conference/class_divListConferences.inc +++ b/plugins/gofon/conference/class_divListConferences.inc @@ -79,6 +79,9 @@ class divListConference extends MultiSelectWindow $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']); + /* Load possible departments */ $ui = get_userinfo(); $first = ""; diff --git a/plugins/gofon/macro/class_divListMacros.inc b/plugins/gofon/macro/class_divListMacros.inc index c759479a4..0e3600bd4 100755 --- a/plugins/gofon/macro/class_divListMacros.inc +++ b/plugins/gofon/macro/class_divListMacros.inc @@ -79,6 +79,9 @@ class divListMacro extends MultiSelectWindow $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']); + /* Load possible departments */ $ui= get_userinfo(); $tdeps= $ui->get_module_departments("gofonmacro"); -- 2.30.2