Some style fixes

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

diff --git a/include/sieve/class_sieveElement_Comment.inc b/include/sieve/class_sieveElement_Comment.inc
index 51c1d8f37b5f8f01db3b202f20b9adc2796f733e..e8caa157ca64ec0c812864e80bfefb046c663470 100644 (file)
--- a/include/sieve/class_sieveElement_Comment.inc
+++ b/include/sieve/class_sieveElement_Comment.inc
@@ -9,7 +9,7 @@ class sieve_comment
 
   function get_sieve_script_part()
   {
-    $str = "/*".$this->data."*/\n";
+    $str = "\n/*".$this->data."*/";
     return($str);
   } 
     
@@ -39,6 +39,7 @@ class sieve_comment
 
       $this->data .= $text."\n";
     }
+    $this->data = rtrim($this->data)."\n";
   }
 
   function check()
@@ -71,11 +72,10 @@ class sieve_comment
     }
  
     /* Create html object */ 
-    $smarty = get_smarty();
     $smarty->assign("Comment",$Comment);
     $smarty->assign("ID",$this->object_id);
     $object = $smarty->fetch(get_template_path("templates/element_comment.tpl",TRUE,dirname(__FILE__)));    
-    $str = preg_replace("/%%OBJECT_CONTENT%%/",$object,$object_container);
+    $str = preg_replace("/%%OBJECT_CONTENT%%/",addcslashes($object,"\\"),$object_container);
     return($str);
   }
 }