Added DNS and DHCP enable disable options into setup step 2

[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 7afb53dfbea4ca28c3459d1a48c7fb79bd41c2b4..8ddafe2d46befaee65d94d2cb6be83d41b11dcf8 100644 (file)
--- a/include/sieve/class_My_Tree.inc
+++ b/include/sieve/class_My_Tree.inc
@@ -1,7 +1,5 @@
 <?php
 
-
-
 /* This class is inherited from the original 'Tree'
  *  class written by Heiko Hund.
  * It is partly rewritten to create a useable html interface 
@@ -17,17 +15,19 @@ 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()
   {
     return($this->dump());
   }
 
+
   /* Create a html interface for the current sieve filter 
    */
   function dump()
@@ -56,7 +56,7 @@ 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();
     $ends_complete_block = array();
@@ -68,7 +68,7 @@ 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])){
@@ -82,7 +82,7 @@ class My_Tree extends Tree
 
         if(isset($ends_complete_block[$key])){
           $this->dump_ .= "</div>";
-          $this->dump_ .= "<div style='height:12px;'>&nbsp;</div>";
+          $this->dump_ .= "<div style='height:10px;'></div>";
         }
       }
     }
@@ -247,7 +247,7 @@ class My_Tree extends Tree
     }
 
     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."));
+      trigger_error("Can't remove element with object_id=".$key_id.", there is no object with this identifier. Remove aborted.");
       return(false);
     }
 
@@ -722,6 +722,7 @@ function sieve_create_strings($data,$force_string = FALSE)
       $ret = preg_replace("/,$/","",trim($ret));
       $ret = "[".$ret."]";
     }
+      $ret = preg_replace("/\"\"/","\"",$ret);
   }else{
 
     $Multiline = preg_match("/\n/",$data);
@@ -731,9 +732,9 @@ function sieve_create_strings($data,$force_string = FALSE)
       $ret = "text: \r\n".$data."\r\n.\r\n";
     }else{
       $ret = "\"".$data."\"";
+      $ret = preg_replace("/\"\"/","\"",$ret);
     }
   }
-  $ret = preg_replace("/\"\"/","\"",$ret);
   $ret = preg_replace("/\n/","\r\n",$ret);
 
   return($ret);
@@ -753,13 +754,19 @@ function sieve_get_strings($data,$id)
     while(isset($data[$id]) && $data[$id]['class']  != "right-bracket" && $id < count($data)){
 
       if($data[$id]['class'] == "quoted-string"){
-        $ret[] = $data[$id]['text'];
+        $text = $data[$id]['text']; 
+        $text= preg_replace("/^\"/","",$text);
+        $text= preg_replace("/\"$/","",$text);
+        $ret[] = $text;
       }
 
       $id ++;
     }
   }elseif($data[$id]['class'] == "quoted-string"){
-    $ret[] = $data[$id]['text'];
+    $text = $data[$id]['text']; 
+    $text= preg_replace("/^\"/","",$text);
+    $text= preg_replace("/\"$/","",$text);
+    $ret[] = $text;
   }elseif($data[$id]['class'] == "number"){
     $ret[] = $data[$id]['text'];
   }elseif($data[$id]['class'] == "multi-line"){