Updated elements

git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@5843 594d385d-05f5-0310-b6e9-bd551577e9d8

diff --git a/include/sieve/class_sieveElement_Block_End.inc b/include/sieve/class_sieveElement_Block_End.inc
index 8f5739f1c187f86937b3f83980e589d3942d61c9..3bd0b0436ff8a0db311e8cab19007c4ef35710d4 100644 (file)
--- a/include/sieve/class_sieveElement_Block_End.inc
+++ b/include/sieve/class_sieveElement_Block_End.inc
@@ -21,7 +21,7 @@ class sieve_block_end
 
   function get_sieve_script_part()
   {
-    return("}\n");
+    return("}");
   } 
   function save_object()
   {

diff --git a/include/sieve/class_sieveElement_Block_Start.inc b/include/sieve/class_sieveElement_Block_Start.inc
index fc924ce8fdd31cd0e3d920c53f4a6dd8f658a6e8..e001cdc58db89483950c8728124b1494442a5778 100644 (file)
--- a/include/sieve/class_sieveElement_Block_Start.inc
+++ b/include/sieve/class_sieveElement_Block_Start.inc
@@ -26,7 +26,7 @@ class sieve_block_start
 
   function get_sieve_script_part()
   {
-    return("{\n");
+    return("{");
   } 
 }
 // vim:tabstop=2:expandtab:shiftwidth=2:filetype=php:syntax:ruler:

diff --git a/include/sieve/class_sieveElement_Comment.inc b/include/sieve/class_sieveElement_Comment.inc
index 51c1d8f37b5f8f01db3b202f20b9adc2796f733e..c235616cad4e9987bc5ce7714dcb22737844bb04 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()

diff --git a/include/sieve/class_sieveElement_Discard.inc b/include/sieve/class_sieveElement_Discard.inc
index 504fe4adb059265326e7b07442a0df3ed910a777..d152c6f7ce712b77ad793c049804da636f660e1e 100644 (file)
--- a/include/sieve/class_sieveElement_Discard.inc
+++ b/include/sieve/class_sieveElement_Discard.inc
@@ -12,7 +12,7 @@ class sieve_discard
 
   function get_sieve_script_part()
   {
-    return("discard;\n");
+    return("discard;");
   } 
   function check()
   {

diff --git a/include/sieve/class_sieveElement_Else_Elsif.inc b/include/sieve/class_sieveElement_Else_Elsif.inc
index e4b8046f81d05923800a4cf35d23d8dfb7be61d1..c101bfad827f74a8657b680ad5728f3f534e0204 100644 (file)
--- a/include/sieve/class_sieveElement_Else_Elsif.inc
+++ b/include/sieve/class_sieveElement_Else_Elsif.inc
@@ -36,7 +36,7 @@ class sieve_else
 
   function get_sieve_script_part()
   {
-    return(" else ");
+    return("else");
   }
 }
 

diff --git a/include/sieve/class_sieveElement_Fileinto.inc b/include/sieve/class_sieveElement_Fileinto.inc
index 71024ba0663e0cfa6509dab2cde310a9eea1927a..a62e8eeaf2c76cd8826b9969dd06f8ebba17cef6 100644 (file)
--- a/include/sieve/class_sieveElement_Fileinto.inc
+++ b/include/sieve/class_sieveElement_Fileinto.inc
@@ -65,10 +65,10 @@ class sieve_fileinto
   function get_sieve_script_part()
   {
     $tmp = "";
-      $tmp.= "\"".$this->data."\", ";
+    $tmp.= "\"".$this->data."\", ";
     $tmp = preg_replace("/,$/","",trim($tmp));
     $tmp = preg_replace ("/\"\"/","\"",$tmp);
-    return("fileinto ".$tmp.";\n");
+    return("fileinto ".$tmp.";");
   } 
     
   function execute()

diff --git a/include/sieve/class_sieveElement_If.inc b/include/sieve/class_sieveElement_If.inc
index 090880d6a1613d6172593d79ddea1244cc8b0a08..2ddd66d47aba542597d636993011cae41d7ccc2b 100644 (file)
--- a/include/sieve/class_sieveElement_If.inc
+++ b/include/sieve/class_sieveElement_If.inc
@@ -20,6 +20,7 @@ class sieve_if
   function sieve_if($elements,$object_id,$parent)
   {
     $this->parent = $parent;
+    print_a($elements);;
   
     /* Possible address parts we can select */
     $this->address_parts = array( 

diff --git a/include/sieve/class_sieveElement_Keep.inc b/include/sieve/class_sieveElement_Keep.inc
index 8a8a412b3aafb99235cde775f3c6b833b06f0ef2..d1870ba147bc6250d28998e2cd88ef9ba104f7b8 100644 (file)
--- a/include/sieve/class_sieveElement_Keep.inc
+++ b/include/sieve/class_sieveElement_Keep.inc
@@ -30,7 +30,7 @@ class sieve_keep
   }
   function get_sieve_script_part()
   {
-    return("keep;\n");
+    return("keep;");
   } 
 }
 

diff --git a/include/sieve/class_sieveElement_Redirect.inc b/include/sieve/class_sieveElement_Redirect.inc
index de599151e03105acf9e2bfe599604e316d45bb4a..47cea6020effb68ac9eeb32dc459316b03296d6d 100644 (file)
--- a/include/sieve/class_sieveElement_Redirect.inc
+++ b/include/sieve/class_sieveElement_Redirect.inc
@@ -45,7 +45,7 @@ class sieve_redirect
 
   function get_sieve_script_part()
   {
-    return("redirect ".sieve_create_strings($this->data).";\n");
+    return("redirect ".sieve_create_strings($this->data).";");
   } 
    
  

diff --git a/include/sieve/class_sieveElement_Reject.inc b/include/sieve/class_sieveElement_Reject.inc
index 8bf9bb61bd4d281ee643e4e59fef546e9e41ff66..cdb89f9fb391ec737bd45e4c49f0f700d601e639 100644 (file)
--- a/include/sieve/class_sieveElement_Reject.inc
+++ b/include/sieve/class_sieveElement_Reject.inc
@@ -53,7 +53,7 @@ class sieve_reject
 
   function get_sieve_script_part()
   {
-    return("reject ".sieve_create_strings($this->data).";\n");
+    return("reject ".sieve_create_strings($this->data).";");
   } 
 
   function execute()