From: cajus <cajus@594d385d-05f5-0310-b6e9-bd551577e9d8>
Date: Thu, 5 Nov 2009 11:34:41 +0000 (+0000)
Subject: Moved filter to where it belongs
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=d073fbde6529cbcba4b18069461cd79069a1ae87;p=gosa.git

Moved filter to where it belongs
Fixed layout


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

diff --git a/gosa-core/include/class_filterGroupLDAP.inc b/gosa-core/include/class_filterGroupLDAP.inc
deleted file mode 100644
index 9be6f569e..000000000
--- a/gosa-core/include/class_filterGroupLDAP.inc
+++ /dev/null
@@ -1,52 +0,0 @@
-<?php
-
-class filterGroupLDAP {
-
-  static function query($base, $scope, $filter, $attributes, $category, $objectStorage= "")
-  {
-    $result= array();
-    $menu= array();
-    $dn2index= array();
-    $config= session::global_get('config');
-    $ldap= $config->get_ldap_link(TRUE);
-    $flag= ($scope == "sub")?GL_SUBSEARCH:0;
-    $tmp= filterGroupLDAP::get_list($base, $filter, $attributes, $category, $objectStorage, $flag | GL_SIZELIMIT);
-
-    // Sort out menu entries, but save info
-    $index= 0;
-    foreach ($tmp as $entry) {
-      if (in_array_ics("posixGroup", $entry['objectClass'])) {
-        $result[$index]= $entry;
-        $dn2index[$entry['dn']]= $index;
-        $index++;
-      } else {
-        foreach ($objectStorage as $storage) {
-          $group= preg_replace("/^.*,([^,]+),".preg_quote("$storage$base")."$/", '$1', $entry['dn']);
-          $group= "$group,$storage$base";
-
-          // The current group implementation has no multiple storage settings - so break here
-          break;
-        }
-        $menu[$group]= true;
-      }
-    }
-
-    // Move menu information to menu
-    foreach ($menu as $dn => $dummy) {
-      $result[$dn2index[$dn]]["objectClass"][]= "gotoMenuGroup";
-    }
-
-    return $result;
-  }
-
-
-  static function get_list($base, $filter, $attributes, $category, $objectStorage, $flags= GL_SUBSEARCH)
-  {
-    $filter= "(|(|(objectClass=gotoMenuEntry)(objectClass=gotoSubmenuEntry))$filter)";
-    return filterLDAP::get_list($base, $filter, $attributes, $category, $objectStorage, $flags);
-  }
-
-
-}
-
-?>
diff --git a/gosa-core/plugins/admin/groups/class_filterGroupLDAP.inc b/gosa-core/plugins/admin/groups/class_filterGroupLDAP.inc
new file mode 100644
index 000000000..9be6f569e
--- /dev/null
+++ b/gosa-core/plugins/admin/groups/class_filterGroupLDAP.inc
@@ -0,0 +1,52 @@
+<?php
+
+class filterGroupLDAP {
+
+  static function query($base, $scope, $filter, $attributes, $category, $objectStorage= "")
+  {
+    $result= array();
+    $menu= array();
+    $dn2index= array();
+    $config= session::global_get('config');
+    $ldap= $config->get_ldap_link(TRUE);
+    $flag= ($scope == "sub")?GL_SUBSEARCH:0;
+    $tmp= filterGroupLDAP::get_list($base, $filter, $attributes, $category, $objectStorage, $flag | GL_SIZELIMIT);
+
+    // Sort out menu entries, but save info
+    $index= 0;
+    foreach ($tmp as $entry) {
+      if (in_array_ics("posixGroup", $entry['objectClass'])) {
+        $result[$index]= $entry;
+        $dn2index[$entry['dn']]= $index;
+        $index++;
+      } else {
+        foreach ($objectStorage as $storage) {
+          $group= preg_replace("/^.*,([^,]+),".preg_quote("$storage$base")."$/", '$1', $entry['dn']);
+          $group= "$group,$storage$base";
+
+          // The current group implementation has no multiple storage settings - so break here
+          break;
+        }
+        $menu[$group]= true;
+      }
+    }
+
+    // Move menu information to menu
+    foreach ($menu as $dn => $dummy) {
+      $result[$dn2index[$dn]]["objectClass"][]= "gotoMenuGroup";
+    }
+
+    return $result;
+  }
+
+
+  static function get_list($base, $filter, $attributes, $category, $objectStorage, $flags= GL_SUBSEARCH)
+  {
+    $filter= "(|(|(objectClass=gotoMenuEntry)(objectClass=gotoSubmenuEntry))$filter)";
+    return filterLDAP::get_list($base, $filter, $attributes, $category, $objectStorage, $flags);
+  }
+
+
+}
+
+?>
diff --git a/gosa-core/plugins/admin/ogroups/ogroup-filter.tpl b/gosa-core/plugins/admin/ogroups/ogroup-filter.tpl
index f59cdb716..0c0434713 100644
--- a/gosa-core/plugins/admin/ogroups/ogroup-filter.tpl
+++ b/gosa-core/plugins/admin/ogroups/ogroup-filter.tpl
@@ -8,8 +8,6 @@
 
 <div style="border-top:1px solid #AAAAAA"></div>
 
- <div style="border-top:1px solid #AAAAAA"></div>
-
  {$USER}&nbsp;<LABEL for=''>{t}user groups{/t}</LABEL><br>
  {$GROUP}&nbsp;<LABEL for=''>{t}nested groups{/t}</LABEL><br>
  {$APPLICATION}&nbsp;<LABEL for=''>{t}application groups{/t}</LABEL><br>