Updated sieve filter styles.

[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 06d70a8c39e1a3203c2c030c6cd20978feba55ec..ee1276a36ac3c1aba3c85281c0f2aa6b0bd2696b 100644 (file)
--- a/include/sieve/class_My_Tree.inc
+++ b/include/sieve/class_My_Tree.inc
@@ -17,11 +17,11 @@ class My_Tree extends Tree
   var $pap             = array();
   var $parent = NULL;
 
-       function My_Tree(&$root,$parent)
-       {
+  function My_Tree(&$root,$parent)
+  {
     $this->parent = $parent;
-               $this->_construct($root);
-       }
+    $this->_construct($root);
+  }
 
   function execute()
   {
@@ -56,8 +56,6 @@ class My_Tree extends Tree
 
     $block_indent_start = $smarty->fetch(get_template_path("templates/block_indent_start.tpl",TRUE,dirname(__FILE__)));
     $block_indent_stop  = $smarty->fetch(get_template_path("templates/block_indent_stop.tpl",TRUE,dirname(__FILE__))); 
-  
-  
 
     $this -> dump_ = "";
     $ends = array();
@@ -70,7 +68,8 @@ class My_Tree extends Tree
         $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_ .= "<div style='height:10px;'></div>";
+          $this->dump_ .= "<div class='container_'>";
         }
         if(isset($ends[$key])){
           $this->dump_  .= $block_indent_stop;
@@ -82,7 +81,8 @@ class My_Tree extends Tree
         }
 
         if(isset($ends_complete_block[$key])){
-          $this->dump_ .= "<div style='height:12px;'>&nbsp;</div>";
+          $this->dump_ .= "</div>";
+          $this->dump_ .= "<div style='height:10px;'></div>";
         }
       }
     }
@@ -630,12 +630,12 @@ class My_Tree extends Tree
 
   function check()
   {
-               $msgs = array();
+    $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. 
@@ -659,14 +659,14 @@ class My_Tree extends Tree
       $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);
+
+    foreach($this->pap as $obj){
+      $o_msgs = $obj->check();
+      foreach($o_msgs as $o_msg){
+        $msgs[] = $o_msg;
+      }
+    }
+    return($msgs);
   }
 
 
@@ -682,7 +682,7 @@ class My_Tree extends Tree
         $require_id = $key;
       }
     }
-  
+
     /* No require found, add one */
     if($require_id == -1){
       $require = new sieve_require(NULL,preg_replace("/[^0-9]/","",microtime()),$this);
@@ -735,7 +735,7 @@ function sieve_create_strings($data,$force_string = FALSE)
   }
   $ret = preg_replace("/\"\"/","\"",$ret);
   $ret = preg_replace("/\n/","\r\n",$ret);
-  
+
   return($ret);
 }
 
@@ -751,7 +751,7 @@ function sieve_get_strings($data,$id)
   $ret = array();
   if($data[$id]['class'] == "left-bracket"){
     while(isset($data[$id]) && $data[$id]['class']  != "right-bracket" && $id < count($data)){
-      
+
       if($data[$id]['class'] == "quoted-string"){
         $ret[] = $data[$id]['text'];
       }
@@ -767,7 +767,7 @@ function sieve_get_strings($data,$id)
     $str = trim(preg_replace("/\.$/","",$str));
     $ret[] = $str;
   }
-  
+
   return(array("OFFSET" => $id, "STRINGS" => $ret));
 }