From d8e659b5118ef15dda8eed0f3edcc8a47b12e215 Mon Sep 17 00:00:00 2001
From: jim-p <jimp@pfsense.org>
Date: Tue, 5 Nov 2013 10:17:29 -0500
Subject: Fix sendmail formatting for arpwatch

---
 config/arpwatch.xml | 2 +-
 config/sm.php       | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

(limited to 'config')

diff --git a/config/arpwatch.xml b/config/arpwatch.xml
index 64aadcea..bf163ad6 100644
--- a/config/arpwatch.xml
+++ b/config/arpwatch.xml
@@ -45,7 +45,7 @@
 	<requirements>None</requirements>
 	<faq>Currently there are no FAQ items provided.</faq>
 	<name>arpwatch</name>
-	<version>2.1.a14 pkg v1.1</version>
+	<version>2.1.a14 pkg v1.1.1</version>
 	<title>arpwatch: Settings</title>
 	<aftersaveredirect>pkg_edit.php?xml=arpwatch.xml&amp;id=0</aftersaveredirect>
 	<menu>
diff --git a/config/sm.php b/config/sm.php
index e2c56fc4..2e1cc4a0 100644
--- a/config/sm.php
+++ b/config/sm.php
@@ -23,6 +23,7 @@ if($options['s'] <> "") {
 
 $in = file("php://stdin");
 foreach($in as $line){
+	$line = trim($line);
 	if (       (substr($line, 0, 6) == "From: ")
 		|| (substr($line, 0, 6) == "Date: ")
 		|| (substr($line, 0, 4) == "To: "))
@@ -31,7 +32,7 @@ foreach($in as $line){
 		$subject = substr($line, 9);
 		continue;
 	}
-	$message .= "$line";
+	$message .= "$line\n";
 }
 
 if (!empty($subject))
-- 
cgit v1.2.3