Code

Updated fileinto class.
[gosa.git] / include / sieve / class_My_Tree.inc
index c6355d40784d809987b22fe405aa0cc686f4163e..8792f98f7a855b60f86f76dadf77a43b21b99ea3 100644 (file)
@@ -15,39 +15,16 @@ class My_Tree extends Tree
 
   var $mode_stack = array();
   var $pap             = array();
+  var $parent = NULL;
 
-  var $add_new          = FALSE;
-  var $add_new_id       = 0;
-  var $add_type         = "top";
-  var $add_element_type = "";
+       function My_Tree(&$root,$parent)
+       {
+    $this->parent = $parent;
+               $this->_construct($root);
+       }
 
   function execute()
   {
-    foreach($_POST as $name => $value){
-      if(preg_match("/Add_Test_Object_/",$name)) {
-        $name = preg_replace("/Add_Test_Object_/","",$name);
-        $name = preg_replace("/_(x|y)$/","",$name);
-    
-        $test_types_to_add = array(
-          "address" =>_("Address"),
-          "header"  =>_("Header"),
-          "envelope"=>_("Envelope"),
-          "size"    =>_("Size"),
-          "exists"  =>_("Exists"),
-          "allof"   =>_("All of"),
-          "anyof"   =>_("Any of"),
-          "true"    =>_("True"),
-          "false"   =>_("False"));
-        $smarty = get_smarty();
-        $smarty->assign("ID",$name); 
-        $smarty->assign("test_types_to_add",$test_types_to_add); 
-        $ret = $smarty->fetch(get_template_path("templates/select_test_type.tpl",TRUE,dirname(__FILE__)));
-        return($ret);
-      }
-    }
-
-
     return($this->dump());
   }
 
@@ -55,104 +32,10 @@ class My_Tree extends Tree
    */
   function dump()
   {
-    error_reporting(E_ALL);
-
     /**************
      * Handle new elements 
      **************/
 
-    if(isset($_POST['select_new_element_type_cancel'])){
-      $this->add_new = FALSE;
-    }
-
-    if($this->add_new){
-  
-      $element_types= array(
-          "sieve_keep"      => _("Keep"),
-          "sieve_comment"   => _("Comment"),
-          "sieve_fileinto"  => _("File into"),
-          "sieve_keep"      => _("Keep"),
-          "sieve_discard"   => _("Discard"),
-          "sieve_redirect"  => _("Redirect"),
-          "sieve_reject"    => _("Reject"),
-          "sieve_require"   => _("Require"),
-          "sieve_stop"      => _("Stop"),
-          "sieve_vacation"  => _("Vacation message"),
-          "sieve_if"        => _("If"));
-
-
-      /* Element selected */
-      if(isset($_POST['element_type']) && isset($element_types[$_POST['element_type']])){
-        $this->add_element_type = $_POST['element_type'];
-      }
-
-      /* Create new element and add it at the selected position */
-      if(isset($_POST['select_new_element_type'])){
-
-        $ele[] = new $this->add_element_type(NULL, preg_replace("/[^0-9]/","",microtime()));
-        if($this->add_element_type == "sieve_if"){
-          $ele[] = new sieve_block_start(NULL,preg_replace("/[^0-9]/","",microtime()));
-          $ele[] = new sieve_block_end(NULL,preg_replace("/[^0-9]/","",microtime()));
-        }
-        $start = $end = array();
-        $found = false;  
-
-        /* Add above current element*/
-        if($this->add_type == "top"){
-          foreach($this->pap as $key => $obj){
-            if($obj->object_id == $this->add_new_id){
-              $found = true;
-            }
-            if(!$found){
-              $start[] = $obj;
-            }else{
-              $end[] = $obj;
-            }
-          }    
-        }else{
-        /* Add below current element */
-          foreach($this->pap as $key => $obj){
-            if(!$found){
-              $start[] = $obj;
-            }else{
-              $end[] = $obj;
-            }
-            if($obj->object_id == $this->add_new_id){
-              $found = true;
-            }
-          }    
-        }
-
-        /* Only add, if current element could be located */
-        if($found){
-          $new = array();
-          foreach($start as $obj){
-            $new[] = $obj;
-          }      
-          foreach($ele as $el){
-            $new[] = $el;
-          }
-          foreach($end as $obj){
-            $new[] = $obj;
-          }
-          $this->pap = $new;
-          $this->add_new = FALSE;
-        }else{
-          print_red(_("Something went wrong while adding a new entry."));
-        }
-      }
-
-    }
-
-    /* Only display select dialog if it is necessary */
-    if($this->add_new){  
-      $smarty = get_smarty();
-      $smarty->assign("element_types",$element_types );
-      $smarty->assign("element_type",$this->add_element_type);
-      $str = $smarty->fetch(get_template_path("templates/add_element.tpl",TRUE,dirname(__FILE__)));
-      return($str);
-    }
-
     /* Only parse the tokens once */
     if(!count($this->pap)){
       $this->dump_ = "";
@@ -171,11 +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_);
   }
 
 
@@ -197,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 */
@@ -264,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>";
     }
@@ -289,51 +168,18 @@ class My_Tree extends Tree
           $this->pap[$key]->save_object();
         }
       }
-
-      $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($obj->object_id) && preg_match("/^Add_Object_Top_".$obj->object_id."_/",$name) && $once){
-          $this->add_new_object($obj->object_id,"top");
-          $once = FALSE;
-        }
-        if(isset($obj->object_id) && preg_match("/^Add_Object_Bottom_".$obj->object_id."_/",$name) && $once){
-          $this->add_new_object($obj->object_id,"bottom");
-          $once = FALSE;
-        }
-      }
     }
   }
 
 
-  /* Add a new object at the given position */
-  function add_new_object($id,$top_bottom = "bottom")
-  {
-    $this->add_new    = TRUE;
-    $this->add_new_id = $id;
-    $this->add_type   = $top_bottom;
-  }
-
-
   /* 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"))){
+    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]);
       }
@@ -380,6 +226,7 @@ class My_Tree extends Tree
                                 "sieve_keep",
                                 "sieve_require",
                                 "sieve_comment",
+                                "sieve_vacation",
                                 "sieve_stop",   
                                 "sieve_reject", 
                                 "sieve_fileinto",
@@ -470,7 +317,7 @@ class My_Tree extends Tree
     /* 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"))){
+    if(in_array(get_class($this->pap[$start]),array("sieve_if","sieve_elsif","sieve_else"))){
 
       $class      = get_class($this->pap[$start]);
       $next_class = get_class($this->pap[$start+1]);
@@ -496,7 +343,12 @@ class My_Tree extends Tree
         }
         $start ++;       
         $class      = get_class($this->pap[$start]);
-        $next_class = get_class($this->pap[$start+1]);
+        
+        if(isset($this->pap[$start+1])){ 
+          $next_class = get_class($this->pap[$start+1]);
+        }else{
+          $next_class ="";
+        }
       }
     }
     return($start);
@@ -679,12 +531,6 @@ class My_Tree extends Tree
     return($tmp);
   }
 
-  function Add_Element()
-  {
-    $tmp = array("ELEMENTS" => array(array("class" => "qouted-string","text"=> "Bla bla, later more")));
-    $this->pap[] = new sieve_comment($tmp,rand(1000,100000));
-  }
-
   function check()
   {
                $msgs = array();
@@ -731,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)){
@@ -755,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."\"";
@@ -789,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));
 }