# HG changeset patch
# User wolfgang.scherer@gmx.de
# Date 2018-02-28 15:34:15
# Node ID e7c378036e33cbbac0a3ab24be768bc6ce489b60
# Parent  0152e8091f0c0b37d0d36768b0ed21731f6f618a

index.php: quoting for final message fixed.

diff --git a/index.php b/index.php
--- a/index.php
+++ b/index.php
@@ -344,19 +344,27 @@ if ($vacation_setup || $vacation_setup_r
         }
         // Actually set it
 
+        if (!$FOOTER || $vacation_setup_raw || $x_wsv_raw) {
+            $vacation_body_full = $vacation_body;
+        } else {
+            $vacation_body_full = str_replace("\n", "\r\n", str_replace("\r", "", rtrim(rtrim($vacation_body)."\n\n".$FOOTER)));
+        }
+
         // Prepare vacation(1) message
         if (!empty($vacation_forward_to)) {
             header_set($vacation_headers, sprintf('X-WSV-Forward-To: %s', $vacation_forward_to));
         }
         if ( $vacation_setup_raw ) {
-            $vacation_msg = message_join($vacation_headers, $vacation_body);
+            $vacation_msg_in = message_join($vacation_headers, $vacation_body);
+            $vacation_msg = message_join($vacation_headers, $vacation_body_full);
             // echo "<pre>"; // |:debug:|
             // var_dump($vacation_headers);
             // var_dump($vacation_body);
             // echo $vacation_msg;
             // echo "</pre>";
         } else {
-            $vacation_msg = vacation_join($vacation_subject, $vacation_body, $vacation_headers);
+            $vacation_msg_in = vacation_join($vacation_subject, $vacation_body, $vacation_headers);
+            $vacation_msg = vacation_join($vacation_subject, $vacation_body_full, $vacation_headers);
         }
         $pipe_cmd = sprintf(
             '%s -u %s %s %s %s',
@@ -364,7 +372,7 @@ if ($vacation_setup || $vacation_setup_r
         // fprintf($stderr, "\$pipe_cmd: %s<br>\n", $pipe_cmd);
 
         $vacation_msg_pipe = popen($pipe_cmd, 'w');
-        fwrite($vacation_msg_pipe, $vacation_msg);
+        fwrite($vacation_msg_pipe, $vacation_msg_in);
         pclose($vacation_msg_pipe);
 
         $pipe_cmd = sprintf(
@@ -373,12 +381,7 @@ if ($vacation_setup || $vacation_setup_r
         // fprintf($stderr, "\$pipe_cmd: %s<br>\n", $pipe_cmd);
 
         $vacation_msg_pipe = popen($pipe_cmd, 'w');
-        if (!$FOOTER || $vacation_setup_raw || $x_wsv_raw) {
-            $full_msg = $vacation_msg;
-        } else {
-            $full_msg = rtrim(rtrim($vacation_msg)."\n".$FOOTER)."\n";
-        }
-        fwrite($vacation_msg_pipe, $full_msg);
+        fwrite($vacation_msg_pipe, $vacation_msg);
         pclose($vacation_msg_pipe);
 
         // Initialize vacation(1) if necessary.
@@ -585,7 +588,7 @@ if ($x_wsv_raw || $EXPERT_ENABLED)
     $form[] = sprintf('<span class="label">%s<sup>*</sup>:</span>', get_text('message'));
     $form[] = (
         '<textarea name="message" cols="56" rows="'.$text_rows.'"'
-        .' style="vertical-align: top; width: 440px;">' . htmlspecialchars($vacation_msg, ENT_NOQUOTES, "UTF-8") . '</textarea><br />');
+        .' style="vertical-align: top; width: 440px;">' . htmlspecialchars($vacation_msg_in, ENT_NOQUOTES, "UTF-8") . '</textarea><br />');
 
     $form[] = '<span class="label">&nbsp;</span>';
     $form[] = (