Updated class filter and listing.

- Forward categories from listing to filter, to allow to use the correct categories not those defined in the filter.xml (single value).
  This may be done in another way, when the filter is redesigned.

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

diff --git a/gosa-core/include/class_filter.inc b/gosa-core/include/class_filter.inc
index 5f2d94ec64750d0cc840e3196c0dd76e033d5d05..2afa3fe60685fe2e85029debd50dcb29552e9c1c 100644 (file)
--- a/gosa-core/include/class_filter.inc
+++ b/gosa-core/include/class_filter.inc
@@ -25,6 +25,9 @@ class filter {
   var $xmlData;
   var $searches= array();
   var $search;
+
+  #FIXME - Seems to be obsolete. Categories are defined in the listing.xml <objectType> 
+  #         and not in the filter.xml anymore.
   var $category= "";
   var $objectStorage= array();
   var $base= "";
@@ -36,6 +39,16 @@ class filter {
   var $converter= null;
   var $pid;
 
+  /* An editor which allows to create user defined ldap-filter.
+   * Due to the fact that it requires additional ldap schemata 
+   *  (objectClasses=gosaProperties) this is currently optional.
+   */
+  var $filterEditor = NULL;
+
+  /* The categories this filter is made for (e.g. ['users'] or. ['server','workstation']). 
+   * Since this is set we are able to create user defined filters.
+   */
+  var $categories   = array();
 
   function filter($filename)
   {
@@ -267,7 +280,7 @@ class filter {
         $filter= preg_replace("/\\$/", "*".normalizeLdap($this->value)."*", $filter);
       }
 
-      $result= array_merge($result, call_user_func(array($backend, 'query'), $this->base, $this->scope, $filter, $attributes, $this->category, $this->objectStorage));
+      $result= array_merge($result, call_user_func(array($backend, 'query'), $this->base, $this->scope, $filter, $attributes, $this->categories, $this->objectStorage));
     }
 
     return ($result);
@@ -317,7 +330,7 @@ class filter {
           $config["category"], $config["objectStorage"]);
     } else {
       $result= call_user_func(array($backend, 'query'), $this->base, $this->scope, $filter, $attributes,
-          $this->category, $this->objectStorage);
+          $this->categories, $this->objectStorage);
     }
 
     foreach ($result as $entry) {
@@ -398,6 +411,7 @@ class filter {
     // Build ul/li list
     $result.= "<ul class='level2'>";
     $result.= "<li><a href='#'>Dummy placeholder</a></li>";
+    $result.= "<li><a href='#'>Dummy placeholder</a></li>";
 #$result.= "<li$separator><a href='#' onClick='document.getElementById(\"actionmenu\").value= \"".$action['name']."\";mainform.submit();'>$img"._($action['label'])."</a></li>";
 
 # AUTOCOMPLETER and getTextbox
@@ -409,6 +423,15 @@ class filter {
     return "<div id='filtermenu'>".$result."</li></ul><div>$script";
   }
 
+
+  
+  function setCategories($categories)
+  {
+    if(!is_array($categories) && !empty($categories)){
+      $categories = array($categories)  ;
+    }
+    $this->categories = $categories;
+  }
 }
 
 

diff --git a/gosa-core/include/class_listing.inc b/gosa-core/include/class_listing.inc
index 38842dfb2ba762d670e1a7140e7b7e14a487a3d9..d4f972d3da2c5357fdb2f11ed6fe0c502125e3f3 100644 (file)
--- a/gosa-core/include/class_listing.inc
+++ b/gosa-core/include/class_listing.inc
@@ -123,6 +123,7 @@ class listing {
 
   function setFilter($filter)
   {
+    $filter->setCategories($this->categories);
     $this->filter= &$filter;
     if ($this->departmentBrowser){
       $this->departments= $this->getDepartments();