From: Mischa POSLAWSKY <perl@shiar.org>
Date: Mon, 25 Jan 2021 23:35:41 +0000 (+0100)
Subject: widget/contact: client ip address in received mail header
X-Git-Tag: v5.2~6
X-Git-Url: http://git.shiar.net/minimedit.git/commitdiff_plain/aaa8edcff1a910c5b27a74fcc1c7ff329514224a?hp=e7a8a9311f482c787aa98a9ee5ef8f693f9832ac

widget/contact: client ip address in received mail header

Do not record technical identification in message body, instead emulate as
mail sender hidden for common consumption.
---

diff --git a/widget/contact.php b/widget/contact.php
index b2d41cb..de059ec 100644
--- a/widget/contact.php
+++ b/widget/contact.php
@@ -59,6 +59,13 @@ switch ($source) {
 	}
 	$header = "From: $reply";
 
+	if ($origin = @$_SERVER['REMOTE_ADDR']) {
+		if ($resolved = @gethostbyaddr($origin) and $resolved !== $origin) {
+			$origin .= sprintf(' (%s)', gethostbyaddr($origin));
+		}
+		$header .= "\r\nReceived: from $origin by $domain{$config['url']}; ".date('r');
+	}
+
 	foreach (array(
 		'X-Accept-Language' => 'HTTP_ACCEPT_LANGUAGE',
 		'User-Agent'        => 'HTTP_USER_AGENT',
@@ -67,12 +74,7 @@ switch ($source) {
 		$header .= "\r\n$mailhdr: ".$_SERVER[$serverhdr];
 	}
 
-	$origin = $_SERVER['REMOTE_ADDR'];
-	if ($resolved = @gethostbyaddr($origin) and $resolved !== $origin) {
-		$origin .= sprintf(' (%s)', gethostbyaddr($origin));
-	}
-	$body = "Ingevuld vanaf $origin:\r\n\r\n";
-
+	$body = '';
 	foreach ($input as $k => $v) {
 		$body .= "$k: $v\r\n";
 	}