Allow to set multiple queries for a user filter.

[gosa.git] / gosa-core / include / class_userFilter.inc

diff --git a/gosa-core/include/class_userFilter.inc b/gosa-core/include/class_userFilter.inc
index c188e981257e630c1755e7904e6806e544a993e0..a96e1b877347184d76cb14eb71f2d1cb4cc16fb0 100644 (file)
--- a/gosa-core/include/class_userFilter.inc
+++ b/gosa-core/include/class_userFilter.inc
@@ -2,7 +2,9 @@
 
 class userFilter extends plugin 
 {
-  protected $filters = array();
+  public $pathTitle= "Filter";
+
+  public $filters = array();
   protected $availableCategories = array();
   
   public $objectclasses = array('gosaProperties');
@@ -52,7 +54,7 @@ class userFilter extends plugin
     }
 
     // Create the filter list
-    $this->filterWidget= new sortableListing();
+    $this->filterWidget= new sortableListing($this->filters, $this->convertFilterList());
     $this->filterWidget->setDeleteable(true);
     $this->filterWidget->setEditable(true);
     $this->filterWidget->setWidth("100%");
@@ -60,15 +62,14 @@ class userFilter extends plugin
     $this->filterWidget->setHeader(array(_("Parent filter"),_("Name"),_("Description"),_("Category"),_("Options"),""));
     $this->filterWidget->setColspecs(array('80px', '100px', '200px', '120px','150px'));
     $this->filterWidget->setAcl($ui->get_permissions($ui->dn,'users/user','gosaUserDefinedFilter'));
-    $this->filterWidget->setListData($this->filters, $this->convertFilterList());
   }
 
   
   /*! \brief    Parses a filter string into an array.
    */
-  static function explodeFilterString($filter)
+  static function explodeFilterString($filterStr)
   {
-    list($parent,$categories, $name, $description, $filter, $flags) = split(";", $filter);
+    list($parent,$categories, $name, $description, $filterList, $flags) = split(";", $filterStr);
 
     // Ensure that we no empty category in our category list.
     if(empty($categories)){
@@ -81,7 +82,14 @@ class userFilter extends plugin
     if(empty($flags)){
       $flags = array();
     }else{
-      $flags = split(',', $flags);
+      $flags = preg_split('/,/', $flags);
+    }
+
+    // Get filters and their backends 
+    $queries = array();
+    foreach(split(",", $filterList) as $data){
+      list($filter, $backend) = preg_split('/:/', $data);
+      $queries[] =  array('backend' => $backend, 'filter' => base64_decode($filter));
     }
 
     // build up filter entry.
@@ -90,7 +98,7 @@ class userFilter extends plugin
         'name' => $name, 
         'categories' => $categories,
         'description' => base64_decode($description),
-        'filter' => base64_decode($filter),
+        'queries' => $queries,
         'flags' => $flags);
 
     return($tmp);
@@ -123,6 +131,9 @@ class userFilter extends plugin
   function execute()
   {
     plugin::execute();
+    
+    // Let the filter widget update itself
+    $this->filterWidget->update();
 
     // Cancel filter modifications (edit dialog)
     if(isset($_POST['cancelFilterSettings'])){
@@ -247,7 +258,12 @@ class userFilter extends plugin
       $tmp.= implode(',', $filter['categories']).";";
       $tmp.= $filter['name'].";";
       $tmp.= base64_encode($filter['description']).";";
-      $tmp.= base64_encode($filter['filter']).";";
+
+      // Add queries 
+      foreach($filter['queries'] as $query){
+         $tmp.= base64_encode($query['filter']).":".$query['backend'].",";
+      }
+      $tmp = trim($tmp,",").";";
       $tmp.= implode(',', $filter['flags']);
       $attrs[] = $tmp;
     }