Some style fixes

[gosa.git] / include / sieve / class_My_Tree.inc

diff --git a/include/sieve/class_My_Tree.inc b/include/sieve/class_My_Tree.inc
index 839f82e5fe6742d561f1cf267ab4eb1ee8a2b709..06d70a8c39e1a3203c2c030c6cd20978feba55ec 100644 (file)
--- a/include/sieve/class_My_Tree.inc
+++ b/include/sieve/class_My_Tree.inc
@@ -61,21 +61,29 @@ class My_Tree extends Tree
 
     $this -> dump_ = "";
     $ends = array();
-    if(!count($this->pap)){
-#      $this->pap[] = new sieve_comment(NULL,preg_replace("/[^0-9]/","",microtime()),$this);
-    }
+    $ends_complete_block = array();
+
     foreach($this->pap as $key => $object){
       if(is_object($object)){
-        $end = $this->get_block_end($key);
 
-        if($end != $key && get_class($object) == "sieve_if") {
-          $ends[$end] = $end;  
-          $this->dump_  .= $block_indent_start;
+        $end = $this->get_block_end($key,false);
+        $end2 = $this->get_block_end($key);
+        if($end != $key && in_array(get_class($object),array("sieve_if"))){
+          $ends_complete_block[$end2] = $end2;
+          $this->dump_ .= "<div style='height:12px;'>&nbsp;</div>";
         }
-        $this->dump_ .= preg_replace("/>/",">\n",$object->execute()); 
         if(isset($ends[$key])){
           $this->dump_  .= $block_indent_stop;
         }
+        $this->dump_ .= preg_replace("/>/",">\n",$object->execute()); 
+        if($end != $key && in_array(get_class($object),array("sieve_if","sieve_else","sieve_elsif"))) {
+          $ends[$end] = $end;  
+          $this->dump_  .= $block_indent_start;
+        }
+
+        if(isset($ends_complete_block[$key])){
+          $this->dump_ .= "<div style='height:12px;'>&nbsp;</div>";
+        }
       }
     }
     
@@ -238,6 +246,11 @@ class My_Tree extends Tree
       return;
     }
 
+    if(!isset($this->pap[$key_id])){
+      trigger_error(_("Can't remove element with object_id=".$key_id.", there is no object with this identifier. Remove aborted."));
+      return(false);
+    }
+
     $class = get_class($this->pap[$key_id]);
     if(in_array($class,array("sieve_if","sieve_elsif","sieve_else"))){
       $block_start= $key_id;
@@ -375,7 +388,7 @@ class My_Tree extends Tree
   /* This function returns the id of the element 
    *  where the current block ends  
    */
-  function get_block_end($start)
+  function get_block_end($start,$complete = TRUE)
   {
     /* Only execute if this is a really a block element. 
      * Block elements is only sieve_if
@@ -398,12 +411,22 @@ class My_Tree extends Tree
           $block_depth --;
         }
 
-        if( $block_depth == 0 && 
-            $class == "sieve_block_end" && 
-            !in_array($next_class,array("sieve_else","sieve_elsif"))){
-          $end = TRUE;
-          $start --;
+        if($complete){
+          if( $block_depth == 0 && 
+              $class == "sieve_block_end" && 
+              !in_array($next_class,array("sieve_else","sieve_elsif"))){
+            $end = TRUE;
+            $start --;
+          }
+        }else{
+
+          if( $block_depth == 0 && 
+              $class == "sieve_block_end" ){ 
+            $end = TRUE;
+            $start --;
+          }
         }
+
         $start ++;       
         $class      = get_class($this->pap[$start]);