From 28f49e03f709d484abb9508475e35547c2ce0f18 Mon Sep 17 00:00:00 2001
From: svncommit <devs@roundcube.net>
Date: Thu, 13 Dec 2007 07:49:28 -0500
Subject: [PATCH] Add Received header to outgoing mail.

---
 CHANGELOG                       |    4 ++++
 program/steps/mail/sendmail.inc |    5 +++++
 2 files changed, 9 insertions(+), 0 deletions(-)

diff --git a/CHANGELOG b/CHANGELOG
index a58196b..e3f577b 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,6 +1,10 @@
 CHANGELOG RoundCube Webmail
 ---------------------------
 
+2007/12/13 (robin)
+----------
+- Add Received header on outgoing mail
+
 2007/12/10 (estadtherr)
 ----------
 - Upgrade to TinyMCE 2.1.3
diff --git a/program/steps/mail/sendmail.inc b/program/steps/mail/sendmail.inc
index c2f9ff7..869ed6e 100644
--- a/program/steps/mail/sendmail.inc
+++ b/program/steps/mail/sendmail.inc
@@ -206,6 +206,11 @@
 // additional headers
 $headers['Message-ID'] = $message_id;
 $headers['X-Sender'] = $from;
+$headers['Received'] = 'from '.
+  (isset($_SERVER['HTTP_X_FORWARDED_FOR']) ?
+   gethostbyaddr($_SERVER['HTTP_X_FORWARDED_FOR']).' ['.$_SERVER['HTTP_X_FORWARDED_FOR']."]\r\n\tvia " : '').
+  gethostbyaddr($_SERVER['REMOTE_ADDR']).' ['.$_SERVER['REMOTE_ADDR']."]\r\n\t with ".
+  $_SERVER['SERVER_PROTOCOL'].' ('.$_SERVER['REQUEST_METHOD'].'); '.date('r');
 
 if (!empty($CONFIG['useragent']))
   $headers['User-Agent'] = $CONFIG['useragent'];

--
Gitblit v1.9.1