X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=gosa-core%2Finclude%2Fclass_userFilterEditor.inc;h=6c86f4b519853ff238789b0d69d87d8c9eca2460;hb=7ce564d554053c9ff7ae13d00df50f5a1961357d;hp=ffff3e658b3c6fff057b338f7aa93225212a9806;hpb=6f130a54d22debc4c9838aef2243c6ec6b12190b;p=gosa.git

diff --git a/gosa-core/include/class_userFilterEditor.inc b/gosa-core/include/class_userFilterEditor.inc
index ffff3e658..6c86f4b51 100644
--- a/gosa-core/include/class_userFilterEditor.inc
+++ b/gosa-core/include/class_userFilterEditor.inc
@@ -2,34 +2,45 @@
 
 class userFilterEditor extends plugin 
 {
+  public $pathTitle= "Edit";
+
   // The original entry else array(), allows us to perform existence checks.
   public $entry = array();
 
   // The values
   public $name = "";
   public $description = "";
+  public $parent = "";
   public $selectedCategories = array();
   public $share = FALSE;
   public $enabled = TRUE;
-  public $filter = "(objectClass=*)";
+  public $queries = array();
+
+  public $listing = NULL;
 
   // The list of all categories mangaged by the current filter object.
   // Used in the grop-down box.
-  public $availableCategories = array();
   public $orig_name = "";
 
+  public $backends = array('LDAP', 'SYSTEMS', 'FAI', 'GroupLDAP','ACL');  
+
 
   /*! \brief    Instantiate the filter editing dialog. 
    *            Parses the filter info into editable data.
    */
-  function __construct($entry, $categories)
+  function __construct($entry, $listing)
   {
-    $this->availableCategories = $categories;
+    $this->listing = &$listing;
     if($entry){
       $this->entry = $entry;
-      $this->name = $entry['name'];
+      $this->parent = $entry['parent'];
+      $this->name = $entry['tag'];
       $this->description = $entry['description'];
-      $this->filter = $entry['filter'];
+      
+      foreach($entry['query'] as $query){
+        $query['filter'] = userFilterEditor::_autoIndentFilter($query['filter'], "  ");
+        $this->queries[] = $query;
+      }
       $this->selectedCategories = $entry['categories'];
       $this->share = in_array("share",$entry['flags']);
       $this->enable = in_array("enable",$entry['flags']);
@@ -38,6 +49,49 @@ class userFilterEditor extends plugin
   }
 
 
+  /*! \brief    Automatic indent indentation for filters.
+   */
+  static function _autoIndentFilter($str, $indent = " ")
+  {
+    // Remove line breaks and escaped brackets 
+    $str = preg_replace('/[\t ]*\n[\t ]*/', "", $str);
+    $str = preg_replace('/\\\\\\(/', "::OPEN::", $str);
+    $str = preg_replace('/\\\\\\)/', "::CLOSE::", $str);
+   
+    // Add a line break infront of every bracket 
+    $str = preg_replace('/\\(/', "\n(", $str);
+    $str = preg_replace('/\\)/', ")\n", $str);
+
+    // Split by linebreaks
+    $lines = preg_split("/\n/", $str);
+    $str = "";
+    $i = 0;
+ 
+    // Walk trough search blocks 
+    foreach($lines as $line){
+      $line = trim($line);
+      if(empty($line)) continue;
+
+      // Go back one level in indentation  
+      if(!preg_match("/\\(.*\\)/", $line) && preg_match('/\\)$/', $line)){
+        $i --;
+      }
+
+      $str.= "\n";
+      $str = str_pad($str,strlen($str)+$i, $indent); 
+      $str.= $line;
+
+      // Go one level deeper in indentation 
+      if(!preg_match("/\\(.*\\)/", $line) && preg_match('/^\\(/', $line)){
+        $i ++;
+      }
+    }
+    $str = preg_replace('/::OPEN::/', '\(', $str);
+    $str = preg_replace('/::CLOSE::/', '\)', $str);
+    return($str);
+  }
+
+
   /*! \brief    Retunrs the filters original name 
    *  @param    The original name of the filter (if none was given 
    *             an empty string is returned)
@@ -63,14 +117,29 @@ class userFilterEditor extends plugin
   function execute()
   {
     plugin::execute();
+
     $smarty = get_smarty();
-    $smarty->assign('name', $this->name);
-    $smarty->assign('filter', $this->filter);
+
+    // Build up HTML compliant html output
+    $queries = array();
+    foreach($this->queries as $key => $query){
+      $query['filter'] =  htmlentities($query['filter'],ENT_COMPAT,'UTF-8');
+      $queries[$key] = $query; 
+    }  
+
+    // Build up list of hard coded filters 
+    $filter= $this->listing->getFilter();
+
+    $smarty->assign("fixedFilters", array_keys($filter->searches));
+    $smarty->assign('parent', $this->parent);
+    $smarty->assign('backends', $this->backends);
+    $smarty->assign('tag', htmlentities($this->name,ENT_COMPAT,'UTF-8'));
+    $smarty->assign('queries', $queries);
     $smarty->assign('share', $this->share);
     $smarty->assign('enable', $this->enabled);
-    $smarty->assign('description', $this->description);
+    $smarty->assign('description', htmlentities($this->description,ENT_COMPAT,'UTF-8'));
     $smarty->assign('selectedCategories', $this->selectedCategories);
-    $smarty->assign('availableCategories', $this->availableCategories);
+    $smarty->assign('availableCategories', array_unique($this->listing->categories));
     return($smarty->fetch(get_template_path('userFilterEditor.tpl', FALSE)));
   }
 
@@ -82,12 +151,32 @@ class userFilterEditor extends plugin
     if(isset($_POST['userFilterEditor'])){
 
       // Get posted strings
-      foreach(array('name','description','filter') as $attr){
+      foreach(array('tag','description', 'parent') as $attr){
         if(isset($_POST[$attr])){
           $this->$attr = get_post($attr);
         }
       }
 
+      // Filter needs special handling, it may contain charactes like < and >
+      //  wich are stipped out by get_post() && validate()
+      foreach($this->queries as $key => $query){
+        if(isset($_POST['filter_'.$key])){
+          $f = mb_convert_encoding($_POST['filter_'.$key], 'UTF-8');
+          if(get_magic_quotes_gpc()){
+            $f = stripcslashes($f);
+          }
+          $this->queries[$key]['filter'] = $f;
+          $this->queries[$key]['backend'] = get_post('backend_'.$key);
+        }
+      }
+      
+      foreach($this->queries as $key => $query){
+        if(isset($_POST['removeQuery_'.$key])){
+          unset($this->queries[$key]);
+          $this->queries = array_values($this->queries);
+        }   
+      }
+
       // Get posted flags 
       $this->share = isset($_POST['shareFilter']);
       $this->enable = isset($_POST['enableFilter']);
@@ -99,6 +188,7 @@ class userFilterEditor extends plugin
         }elseif(isset($_POST['availableCategory']) && !empty($_POST['availableCategory'])){
           $this->selectedCategories[] = get_post('availableCategory');
         }
+        $this->selectedCategories = array_unique($this->selectedCategories);
       }
 
       // Remove categories
@@ -107,6 +197,27 @@ class userFilterEditor extends plugin
           if(isset($this->selectedCategories[$cat])) unset($this->selectedCategories[$cat]);
         }
       }
+
+      // Add new query 
+      if(isset($_POST['addQuery'])){
+
+        $filter= $this->listing->getFilter();
+        $backend = 'LDAP';
+        $query = "(objectClass=*)";
+        if(isset($filter->searches[$this->parent])){
+      
+          $tmp = $filter->searches[$this->parent];  
+          if(isset($tmp['query'][count($this->queries)])){
+            $query = $tmp['query'][count($this->queries)]['filter'];
+            $backend = $tmp['query'][count($this->queries)]['backend'];
+          }elseif(isset($tmp['query']['filter'])){
+            $query = $tmp['query']['filter'];
+            $backend = $tmp['query']['backend'];
+          }
+        }
+
+        $this->queries[] = array('backend'=> $backend, 'filter' => userFilterEditor::_autoIndentFilter($query,"  "));
+      }
     }
   }
 
@@ -121,18 +232,25 @@ class userFilterEditor extends plugin
     // Check if the name is given
     if(empty($this->name)){
       $msgs[] = msgPool::required(_("Name"));
-    }elseif(preg_match("/[^a-z0-9\-_ ]/i", $this->name)){
+    }elseif(preg_match("/[^a-z0-9]/i", $this->name)){
       
       // Check for a valid name, no special chars here - in particular no ; 
-      $msgs[] = msgPool::invalid(_("Name"), $this->name,"/[a-z0-9\-_ ]/i");
+      $msgs[] = msgPool::invalid(_("Name"), $this->name,"/[a-z0-9]/i");
     }  
 
+    // Description is a must value.
+    if(empty($this->description)){
+      $msgs[] = msgPool::required(_("Description"));
+    }
+
     // Count the number of opening and closing brackets - exclude escaped ones.
-    $f = preg_replace('/\\\\[\(\)]/',"",$this->filter);
-    $o = substr_count($f, '(');
-    $c = substr_count($f, ')');
-    if($o != $c){
-      $msgs[] = sprintf(_("Please check your filter, you have '%s' opening and '%s' closing brackets!"), $o, $c);
+    foreach($this->queries as $key => $query){
+      $f = preg_replace('/\\\\[\(\)]/',"",$query['filter']);
+      $o = substr_count($f, '(');
+      $c = substr_count($f, ')');
+      if($o != $c){
+        $msgs[] = sprintf(_("Please check your filter #%s. You have '%s' opening and '%s' closing brackets!"), ($key+1),$o, $c);
+      }
     }
 
     return($msgs);
@@ -146,10 +264,11 @@ class userFilterEditor extends plugin
   function save()
   {
     $ret= array();
-    $ret['name'] = $this->name;
+    $ret['parent'] = $this->parent;
+    $ret['tag'] = $this->name;
     $ret['description'] = $this->description;
     $ret['categories'] = $this->selectedCategories;
-    $ret['filter'] = $this->filter;
+    $ret['query'] = $this->queries;
     $ret['flags'] = array();
     if($this->share){
       $ret['flags'][] = "share";