Reverted filter editor changes. will move the editor into the listing.

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

diff --git a/gosa-core/include/class_filter.inc b/gosa-core/include/class_filter.inc
index cb70fb4ab98fdbe9bd961f6f31a05da3bddb7efc..5f2d94ec64750d0cc840e3196c0dd76e033d5d05 100644 (file)
--- a/gosa-core/include/class_filter.inc
+++ b/gosa-core/include/class_filter.inc
@@ -25,9 +25,6 @@ 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= "";
@@ -39,16 +36,6 @@ 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)
   {
@@ -60,11 +47,6 @@ class filter {
     }
 
     $this->pid= preg_replace("/[^0-9]/", "", microtime(TRUE)); 
-
-    // Instantiate the filter editor.
-    if(class_available("filterEditor")){
-      $this->filterEditor = new filterEditor($config, $this);
-    }
   }
 
 
@@ -285,7 +267,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->categories, $this->objectStorage));
+      $result= array_merge($result, call_user_func(array($backend, 'query'), $this->base, $this->scope, $filter, $attributes, $this->category, $this->objectStorage));
     }
 
     return ($result);
@@ -335,7 +317,7 @@ class filter {
           $config["category"], $config["objectStorage"]);
     } else {
       $result= call_user_func(array($backend, 'query'), $this->base, $this->scope, $filter, $attributes,
-          $this->categories, $this->objectStorage);
+          $this->category, $this->objectStorage);
     }
 
     foreach ($result as $entry) {
@@ -416,7 +398,6 @@ 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
@@ -428,15 +409,6 @@ 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 d4f972d3da2c5357fdb2f11ed6fe0c502125e3f3..52b5cc0c06fbbcab5e8e9127b48d6c7f541a77a1 100644 (file)
--- a/gosa-core/include/class_listing.inc
+++ b/gosa-core/include/class_listing.inc
@@ -271,6 +271,10 @@ class listing {
       return($message);
     }
 
+    // Display filter editor
+    if(0) 
+    return($this->filter->filterEditor->execute());
+
     // Some browsers don't have the ability do do scrollable table bodies, filter them
     // here.
     $switch= false;