[tokkee]

tokkee.org

Code

projects / gosa.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 31391b1)
Fixed base in management divLists.
authorhickert <hickert@594d385d-05f5-0310-b6e9-bd551577e9d8>
Thu, 3 May 2007 09:22:53 +0000 (09:22 +0000)
committerhickert <hickert@594d385d-05f5-0310-b6e9-bd551577e9d8>
Thu, 3 May 2007 09:22:53 +0000 (09:22 +0000)
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

12 files changed:
plugins/admin/acl/class_divListACL.inc patch | blob | history
plugins/admin/applications/class_divListApplication.inc patch | blob | history
plugins/admin/departments/class_divListDepartment.inc patch | blob | history
plugins/admin/fai/class_divListFai.inc patch | blob | history
plugins/admin/groups/class_divListGroup.inc patch | blob | history
plugins/admin/mimetypes/class_divListMimeTypes.inc patch | blob | history
plugins/admin/ogroups/class_divListOGroup.inc patch | blob | history
plugins/admin/systems/class_divListSystem.inc patch | blob | history
plugins/admin/users/class_divListUsers.inc patch | blob | history
plugins/gofax/blocklists/class_divListBlocklists.inc patch | blob | history
plugins/gofon/conference/class_divListConferences.inc patch | blob | history
plugins/gofon/macro/class_divListMacros.inc patch | blob | history

diff --git a/plugins/admin/acl/class_divListACL.inc b/plugins/admin/acl/class_divListACL.inc
index 3324d970f26ce59e1a9845ac2203d32ea3bc4576..59020e39288d745818919cf8c8487b750291f0b8 100644 (file)
--- 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 71ef2ad71ed9f03cd70bc0517ad968c64becb4c9..b43500a87c81a7457422c17c2cef53756012378d 100755 (executable)
--- 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 d1107a570d53df6042c1125c6e453c6e4b896200..356fc8dbcd9e7f3b835fb69114c829bb9e6b44e4 100755 (executable)
--- 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 122f089126aa38c652105e4e83427eb606b1a96f..4a68f3ecbf90c6458d60a5a55a432c3b4efedd5c 100644 (file)
--- 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 8e31b350d513160ea583ad907d767fd90a2ce47d..09d3ffa02cd0e92bafd72c57fb842566a159e81b 100644 (file)
--- 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 ce907fa3b79fbc35fac01e329767c7d711ab1636..243bff57e92918d9c60bf56c381786f9dac8542b 100755 (executable)
--- 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 7b4e81e67a96bf452cac89412dd2882b82e5d7ea..878c9d326549eae53577df4d707d29a13986d6ec 100755 (executable)
--- 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 882805955156323da232ea7d1436fd9171cecada..b2f297e4bd5e6b9844086b20b0df19e9cecbefb4 100644 (file)
--- 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 2565f0d8ec4acfb7a33239223eaacf18a09c43ac..4aa5b410c44b5f22963c637f081727edfeef14ff 100644 (file)
--- 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 42bd1f549bf9ce2e718da5d4cf5581f3ce77b613..d96120e501306e17728c2bbd8f8446356525e95a 100755 (executable)
--- 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 aeb111f78c0b52545210af523f66cfc8c23e491b..d1afa402fa6747cc95b4692db1561c2ecdbd8f09 100755 (executable)
--- 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 f3c13d969448c8c8706a585fa616a15505252b0b..6d8284c5bab73375a50510c04aa3ff1784f22eab 100755 (executable)
--- 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();
GONICUS system administrator (SVN clone)