Updated divlists to include the ldap base

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

diff --git a/plugins/admin/acl/class_divListACL.inc b/plugins/admin/acl/class_divListACL.inc
index 56fe9ae35a6626d23a1953af9f66c9060801248a..c44cdcdd2ca1d98a1dbc3d1f4294824cfdbd1c62 100644 (file)
--- 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 19aa04b87fcb0101d7fb30818ae1e72c01be905a..77e82f12526ee3c53f965f29861cf80aa70b9241 100755 (executable)
--- 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 f8e56b0fa631b25a8511e0d42a91599a0d043313..a5a0762bf469b585d87f938e6d4978b1b2db839e 100755 (executable)
--- 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 95e193f1dcb5805a76cefcb5ec537f56530e2c43..5fbd58d4bd0856038bcbf302d5fb6191dd88f18e 100644 (file)
--- 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 a5056b283e7a6c6878f6ab9a0137f0c15550ca15..9b1802474d332b8fdccb42786be1afbc96c2cf5e 100644 (file)
--- 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 cbda3fee7961756da002f92eb441d5d48498f6fe..0d961ba4b1cdcdc0a71be48f67e0a8e0845dab54 100755 (executable)
--- 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 ed0e70025dce798bf04f3fb18ea1bc4573bad500..959dfaab7a3b4e1d792c017ae2d13127529d5002 100755 (executable)
--- 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 a5bc398d632a2cb10f82c370f22dc1d46124d6e4..72870d701538b356052c28f878f88e61a4c5cb2f 100644 (file)
--- 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 ed888b8a0fe796e9488a63d44193b5252c8b1b0e..2565f0d8ec4acfb7a33239223eaacf18a09c43ac 100644 (file)
--- 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 27ff3d696a476087cada001da344b067fd4527b4..58722ecb96f5f460c929e6b6e7dbeedac8809659 100755 (executable)
--- 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 c16d99d4ef0e4bf3c953402512f158264f29cddf..0dfd3dc80ce6584786333d31bb315e51f90b0aa4 100755 (executable)
--- 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 c759479a48a33f98785355a041c9c9526f17f049..0e3600bd4f8af8f3ec101d5bd65ad0827a1813a5 100755 (executable)
--- 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");