From aaa8edcff1a910c5b27a74fcc1c7ff329514224a Mon Sep 17 00:00:00 2001 From: Mischa POSLAWSKY Date: Tue, 26 Jan 2021 00:35:41 +0100 Subject: [PATCH] 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. --- widget/contact.php | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) 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"; } -- 2.30.0