Code

Updated fileinto class.
[gosa.git] / include / sieve / class_My_Tree.inc
index a8321a4502bef0c73afe47e197e0ff0135c85b6a..8792f98f7a855b60f86f76dadf77a43b21b99ea3 100644 (file)
@@ -15,13 +15,26 @@ class My_Tree extends Tree
 
   var $mode_stack = array();
   var $pap             = array();
+  var $parent = NULL;
 
+       function My_Tree(&$root,$parent)
+       {
+    $this->parent = $parent;
+               $this->_construct($root);
+       }
+
+  function execute()
+  {
+    return($this->dump());
+  }
 
   /* Create a html interface for the current sieve filter 
    */
   function dump()
   {
-    error_reporting(E_ALL);
+    /**************
+     * Handle new elements 
+     **************/
 
     /* Only parse the tokens once */
     if(!count($this->pap)){
@@ -33,7 +46,6 @@ class My_Tree extends Tree
 
     /* Create html results */
     $smarty = get_smarty();
-    $smarty->fetch(get_template_path("templates/element_stop.tpl",TRUE,dirname(__FILE__)));
 
     $this -> dump_ = "";
     foreach($this->pap as $key => $object){
@@ -42,12 +54,7 @@ class My_Tree extends Tree
       }
     }
     
-
-    /* Create html results */
-    $smarty = get_smarty();
-    $smarty->assign("Contents",$this->dump_);
-    $ret = $smarty->fetch(get_template_path("templates/edit_frame_base.tpl",TRUE,dirname(__FILE__)));
-    return ($ret);
+    return($this->dump_);
   }
 
 
@@ -69,14 +76,14 @@ class My_Tree extends Tree
     if($node['class'] == "block-start"){
       $tmp = array_pop($this->mode_stack);
       $this->handle_elements($tmp,$node_id);
-      $this->handle_elements(array("TYPE" => "block_start"),$node_id);
+      $this->handle_elements(array("TYPE" => "block_start"),preg_replace("/[^0-9]/","",microtime()));
     }
 
     /* This closes the last mode */
     if($node['class'] == "block-end"){
       $tmp = array_pop($this->mode_stack);
       $this->handle_elements($tmp,$node_id);
-      $this->handle_elements(array("TYPE" => "block_end"),$node_id);
+      $this->handle_elements(array("TYPE" => "block_end"),preg_replace("/[^0-9]/","",microtime()));
     }
 
     /* Semicolon indicates a new command */
@@ -136,7 +143,7 @@ class My_Tree extends Tree
     
     $class_name= "sieve_".$type ;
     if(class_exists($class_name)){
-      $this->pap[] = new $class_name($data,$id);
+      $this->pap[] = new $class_name($data,$id,$this);
     }else{
       echo "<font color='red'>Missing : ".$class_name."</font>"."<br>";
     }
@@ -144,34 +151,46 @@ class My_Tree extends Tree
 
   function save_object()
   {
+    reset($this->pap);
     foreach($this->pap as $key => $obj){
 
-      if(in_array(get_class($obj),array("sieve_if","sieve_elsif","sieve_vacation","sieve_comment","sieve_reject","sieve_fileinto","sieve_require","sieve_redirect"))){
-        $this->pap[$key]->save_object();
-      }
+      if(in_array(get_class($obj),array("sieve_if",
+                                        "sieve_elsif",
+                                        "sieve_vacation",
+                                        "sieve_comment",
+                                        "sieve_reject",
+                                        "sieve_fileinto",
+                                        "sieve_require",
+                                        "sieve_redirect"))){
 
-      $once = TRUE;
-      foreach($_POST as $name => $value){
 
-        if(isset($obj->object_id) && preg_match("/^Remove_Object_".$obj->object_id."_/",$name) && $once){
-          $once = FALSE;
-          $this->remove_object($key);
-        }
-        if(isset($obj->object_id) && preg_match("/^Move_Up_Object_".$obj->object_id."_/",$name) && $once){
-          $this->move_up_down($key,"up");
-          $once = FALSE;
-        }
-        if(isset($obj->object_id) && preg_match("/^Move_Down_Object_".$obj->object_id."_/",$name) && $once){
-          $this->move_up_down($key,"down");
-          $once = FALSE;
+        if(isset($this->pap[$key]) && method_exists($this->pap[$key],"save_object")){
+          $this->pap[$key]->save_object();
         }
       }
     }
   }
 
 
-  function remove_object($key_id){
-    unset($this->pap[$key_id]);
+  /* Remove the object at the given position */
+  function remove_object($key_id)
+  {
+    $class = get_class($this->pap[$key_id]);
+    if(in_array($class,array("sieve_if","sieve_elsif","sieve_else"))){
+      $block_start= $key_id;
+      $block_end  = $this->get_block_end($key_id);
+
+      for($i = $block_start ; $i <= $block_end ; $i ++ ){
+        unset($this->pap[$i]);
+      }
+    }else{
+      unset($this->pap[$key_id]);
+    }
+    $tmp = array();
+    foreach($this->pap as $element){
+      $tmp[] = $element;
+    }
+    $this->pap = $tmp;
   }
 
 
@@ -188,39 +207,172 @@ class My_Tree extends Tree
     /* Get the current element to decide what to move. */ 
     $e_class = get_class($this->pap[$key_id]);
       
-    
     if(in_array($e_class,array("sieve_if"))){
-      echo "move block";
+      $block_start= $key_id;
+      $block_end  = $this->get_block_end($key_id);
+
+      /* Depending on the direction move up down */
+      if($direction == "down"){
+        $next_free  = $this->_get_next_free_move_slot($block_end,$direction); 
+      }else{
+        $next_free  = $this->_get_next_free_move_slot($block_start,$direction); 
+      }
+
+      /* Move the given block */ 
+      $this->move_multiple_elements($block_start,$block_end,$next_free);
     }
 
-    if(in_array($e_class,array("sieve_stop","sieve_keep","sieve_require", "sieve_stop", "sieve_reject", "sieve_fileinto", "sieve_redirect", "sieve_discard"))){
-      echo "move single ".$key_id." to ".$this->_get_next_free_move_slot($key_id,$direction)."<br>";
-      $this->move_single_element_to($key_id,$this->_get_next_free_move_slot($key_id,$direction));
+    if(in_array($e_class,array( "sieve_stop",
+                                "sieve_keep",
+                                "sieve_require",
+                                "sieve_comment",
+                                "sieve_vacation",
+                                "sieve_stop",   
+                                "sieve_reject", 
+                                "sieve_fileinto",
+                                "sieve_redirect", 
+                                "sieve_discard"))){
+      $this->move_single_element($key_id,$this->_get_next_free_move_slot($key_id,$direction));
     }
   }
 
+  
+  /* Move the given block to position */
+  function move_multiple_elements($start,$end,$to)
+  {
+    /* Use class names for testing */
+    $data = $this->pap;
+
+    /* Get block to move */
+    $block_to_move = array_slice($data,$start, ($end - $start +1));
+
+    /* We want do move this block up */
+    if($end > $to){
+      
+      /* Get start block */
+      $start_block = array_slice($data,0,$to);
+
+      /* Get Get all elements between the block to move 
+       *  and next free position 
+       */
+      $block_to_free = array_slice($data,$to ,$start - $to );  
+      $block_to_end = array_slice($data,$end+1);
+      $new = array();
+      foreach($start_block as $block){
+        $new[] = $block;
+      }
+      foreach($block_to_move as $block){
+        $new[] = $block;
+      }
+      foreach($block_to_free as $block){
+        $new[] = $block;
+      }
+      foreach($block_to_end as $block){
+        $new[] = $block;
+      }
+      $old = $this->pap;
+      $this->pap = $new;
+    }
+    
+
+    /* We want to move this block down. */
+    if($to > $end){
+
+      /* Get start block */
+      $start_block = array_slice($data,0,$start);
+
+      /* Get Get all elements between the block to move 
+       *  and next free position 
+       */
+      $block_to_free = array_slice($data,$end +1,($to - $end  ));  
 
-  function move_single_element_to($from,$to)
+      /* Get the rest 
+       */
+      $block_to_end = array_slice($data,$to+1);
+
+      $new = array();
+      foreach($start_block as $block){
+        $new[] = $block;
+      }
+      foreach($block_to_free as $block){
+        $new[] = $block;
+      }
+      foreach($block_to_move as $block){
+        $new[] = $block;
+      }
+      foreach($block_to_end as $block){
+        $new[] = $block;
+      }
+      $old = $this->pap;
+      $this->pap = $new;
+    }
+  }  
+
+  
+  /* This function returns the id of the element 
+   *  where the current block ends  
+   */
+  function get_block_end($start)
   {
-    if($from == $to) return;
+    /* Only execute if this is a really a block element. 
+     * Block elements is only sieve_if
+     */
+    if(in_array(get_class($this->pap[$start]),array("sieve_if","sieve_elsif","sieve_else"))){
 
-    $ret = array();
+      $class      = get_class($this->pap[$start]);
+      $next_class = get_class($this->pap[$start+1]);
+      $block_depth = 0;
 
+      $end = FALSE;
 
-    $tmp = $this->pap;
+      while(!$end && $start < count($this->pap)){
+        if($class == "sieve_block_start"){
+          $block_depth ++;
+        }
 
-#    $tmp = array();
- #  foreach($this->pap as $class){
-  #    $tmp[] = get_class($class);
-   # }
+        if($class == "sieve_block_end"){
+          $block_depth --;
+        }
 
-    if($from > $to ){
+        if( $block_depth == 0 && 
+            $class == "sieve_block_end" && 
+            !in_array($next_class,array("sieve_else","sieve_elsif"))){
+          $end = TRUE;
+          $start --;
+        }
+        $start ++;       
+        $class      = get_class($this->pap[$start]);
+        
+        if(isset($this->pap[$start+1])){ 
+          $next_class = get_class($this->pap[$start+1]);
+        }else{
+          $next_class ="";
+        }
+      }
+    }
+    return($start);
+  }
+
+
+  /* This function moves the single element at 
+   *  position $from to position $to.
+   */
+  function move_single_element($from,$to)
+  {
+    if($from == $to) {
+      return;
+    }
 
-      $element = $this->pap[$from];
+    $ret = array();
+    $tmp = $this->pap;
 
-      $begin = array();
-      $middle = array();
-      $end = array();
+    $begin = array();
+    $middle = array();
+    $end = array();
+    $element = $this->pap[$from];
+
+    if($from > $to ){
 
       /* Get all element in fron to element to move */    
       if($from  != 0){
@@ -243,19 +395,10 @@ class My_Tree extends Tree
       foreach($end as $data){
         $ret[] = $data;
       }
-
-#      print_a(array("Anfang" => $begin ,$element, "middle" => $middle, "end" => $end));
-
       $this->pap = $ret;
     }
     if($from < $to ){
 
-      $element = $this->pap[$from];
-
-      $begin = array();
-      $middle = array();
-      $end = array();
-
       /* Get all element in fron to element to move */    
       if($from  != 0){
         $begin = array_slice($tmp,0,$from);
@@ -282,12 +425,20 @@ class My_Tree extends Tree
   }
 
 
+  /* Returns the next free position where we 
+   *  can add a new sinle element 
+   *    $key_id     = Current position
+   *    $direction  = Forward or backward.
+   */
   function _get_next_free_move_slot($key_id,$direction)
   {
     $last_class = "";
     $current_class ="";
     $next_class = "";
 
+    /* After this elements we can add new elements 
+     *  without having any trouble.
+     */
     $allowed_to_add_after = array("sieve_keep",
                                   "sieve_require", 
                                   "sieve_stop", 
@@ -295,132 +446,56 @@ class My_Tree extends Tree
                                   "sieve_fileinto", 
                                   "sieve_redirect", 
                                   "sieve_discard",
-                                  "sieve_block_end");
+                                  "sieve_comment",
+                                  "sieve_block_start"
+                                 );
+
+    /* Before this elements we can add new elements 
+     *  without having any trouble.
+     */
+    $allowed_to_add_before = array("sieve_keep",
+                                  "sieve_require", 
+                                  "sieve_stop", 
+                                  "sieve_reject", 
+                                  "sieve_fileinto", 
+                                  "sieve_comment",
+                                  "sieve_redirect", 
+                                  "sieve_discard",
+                                  "sieve_if", 
+                                  "sieve_block_end"
+                                 );
 
     if($direction == "down"){
+    
       $test = $this->pap;
-
-
       while($key_id < count($test)){
-       
-        if(($key_id+1) == count($test)) return($key_id);
-
+        if(($key_id+1) == count($test)) {
+          return($key_id);
+        }
         $key_id ++;
-
         $current_class  = get_class($test[$key_id]);
         if(in_array($current_class, $allowed_to_add_after)){
           return($key_id);
         } 
-      }
+      } 
     }else{
-
+  
       $test = $this->pap;
-
-      if($key_id == 0) return($key_id);
-    
+      if($key_id == 0) {
+        return($key_id);
+      }
       $key_id --;
       while($key_id >=0 ){
-
         $current_class  = get_class($test[$key_id]);
-        if(in_array($current_class, $allowed_to_add_after)){
+        if(in_array($current_class, $allowed_to_add_before)){
           return($key_id);
         } 
         $key_id --;
       }
+      return(0);
     }
   }
 
-  function move_object_up($key_id)
-  {
-    $new = array();
-    $add_now = NULL;
-    $key_id --;
-
-    if(!$key_id < 0) return;
-  
-    foreach($this->pap as $key => $data){
-      if($key == $key_id){
-        $add_now = $data;
-        continue;
-      }else{
-        $new[] = $data;
-      }
-
-      if($add_now != NULL){
-          
-        $new[] = $add_now;
-        $add_now = NULL;
-      }
-    }
-    if($add_now != NULL){
-      $new[] = $add_now;
-    }
-    $this->pap = $new;
-  }
-
-
-  /* This function moves the given element one position down 
-   *  if the next position is between 
-   *   '}' 'else[if]' or 'if' '{' use next available
-   */
-  function move_object_down($key_id)
-  {
-    $new = array();
-    $add_now = NULL;
-
-    /* Walk through all elements, till we found the given id.
-     *  If we found it, skip adding the current element,
-     *  first add the next element followed by the current.
-     */
-    foreach($this->pap as $key => $data){
-
-      /* Have we found the given id */
-      if($key == $key_id){
-        $add_now = $data;
-        $last_class = get_class($data);
-        continue;
-      }else{
-      
-        /* Add entry */
-        $new[] = $data;
-      }
-
-      /* We have skipped adding an element before,
-       *  try to add it now, if the position allows this.
-       */
-      if($add_now != NULL){
-
-        /* Don't allow adding an element directly after 
-         *  if/else/elsif 
-         */
-        if(in_array(get_class($data),array("sieve_if","sieve_elsif","sieve_else"))){
-          continue;
-        }
-
-        /* If this is an block end, check if there 
-         *  follows an if/else/elsif and skip adding the element in this case.
-         */
-        $next ="";
-        if(isset($this->pap[$key+1])){
-          $next = get_class($this->pap[$key+1]);
-        }
-        if(in_array(get_class($data),array("sieve_block_end")) && in_array($next,array("sieve_elsif","sieve_else"))){
-          continue;
-        }
-  
-        /* Add element, position seems to be ok */
-        $new[] = $add_now;
-        $add_now = NULL;
-      }
-    }
-
-    /* Element wasn't added, add it as last element */
-    if($add_now != NULL){
-      $new[] = $add_now;
-    }
-    $this->pap = $new;
-  }
-
 
   /* Need to be reviewed */
   function get_sieve_script()
@@ -456,10 +531,45 @@ class My_Tree extends Tree
     return($tmp);
   }
 
-  function Add_Element()
+  function check()
   {
-    $tmp = array("ELEMENTS" => array(array("class" => "qouted-string","text"=> "Bla bla, later more")));
-    $this->pap[] = new sieve_comment($tmp,rand(1000,100000));
+               $msgs = array();
+
+    /* Some logical checks. 
+     *  like :  only sieve_comment can appear before require.
+     */
+    
+    /* Ensure that there are no command before require 
+     *  - Get id of last require tag
+     *  - Collect object types in from of this tag. 
+     *  - Check if there are tags collected that are not allowed 
+     */
+    $last_found_at = -1; 
+    $objs = array();
+    foreach($this->pap as $key => $obj){
+      if(get_class($obj) == "sieve_require"){
+        $last_found_at = $key;
+      }
+    }
+    foreach($this->pap as $key => $obj){
+      if($key == $last_found_at) break;  
+      if(!in_array(get_class($obj),array("sieve_comment","sieve_require"))){
+        $objs[] = get_class($obj);
+      }
+    }
+    if(count($objs) && $last_found_at != -1){
+      $str = _("Require must be the first command in the script.");  
+      $msgs[] = $str;
+      print_red($str);;
+    }
+    
+               foreach($this->pap as $obj){
+                       $o_msgs = $obj->check();
+                       foreach($o_msgs as $o_msg){
+                               $msgs[] = $o_msg;
+                       }
+               }
+               return($msgs);
   }
 }
 
@@ -467,7 +577,7 @@ class My_Tree extends Tree
 /* Create valid sieve string/string-list 
  *  out of a given array
  */
-function sieve_create_strings($data)
+function sieve_create_strings($data,$force_string = FALSE)
 {
   $ret = "";
   if(is_array($data)){
@@ -491,7 +601,7 @@ function sieve_create_strings($data)
     $Multiline = preg_match("/\n/",$data);
     $data = preg_replace("/\r/","",$data);;
 
-    if($Multiline){
+    if($Multiline && !$force_string){
       $ret = "text: \r\n".$data."\r\n.\r\n";
     }else{
       $ret = "\"".$data."\"";
@@ -525,7 +635,12 @@ function sieve_get_strings($data,$id)
     $ret[] = $data[$id]['text'];
   }elseif($data[$id]['class'] == "number"){
     $ret[] = $data[$id]['text'];
+  }elseif($data[$id]['class'] == "multi-line"){
+    $str = trim(preg_replace("/^text:/","",$data[$id]['text']));
+    $str = trim(preg_replace("/\.$/","",$str));
+    $ret[] = $str;
   }
+  
   return(array("OFFSET" => $id, "STRINGS" => $ret));
 }