thomascube
2008-04-02 5ec11328c7bbc91b2960b8b4a2db3aaaa8edbaba
Make the http-received header in outgoing mails configurable

1 files modified
14 ■■■■■ changed files
program/steps/mail/sendmail.inc 14 ●●●●● patch | view | raw | blame | history
program/steps/mail/sendmail.inc
@@ -212,12 +212,16 @@
// additional headers
$headers['Message-ID'] = $message_id;
$headers['X-Sender'] = $from;
$headers['Received'] =  wordwrap('from ' .
  (isset($_SERVER['HTTP_X_FORWARDED_FOR']) ?
    gethostbyaddr($_SERVER['HTTP_X_FORWARDED_FOR']).' ['.$_SERVER['HTTP_X_FORWARDED_FOR'].'] via ' : '') .
  gethostbyaddr($_SERVER['REMOTE_ADDR']).' ['.$_SERVER['REMOTE_ADDR'].'] with ' .
if ($CONFIG['http_received_header'])
{
  $nldlm = rcmail_header_delm() . "\t";
  $headers['Received'] =  wordwrap('from ' . (isset($_SERVER['HTTP_X_FORWARDED_FOR']) ?
      gethostbyaddr($_SERVER['HTTP_X_FORWARDED_FOR']).' ['.$_SERVER['HTTP_X_FORWARDED_FOR'].']'.$nldlm.' via ' : '') .
    gethostbyaddr($_SERVER['REMOTE_ADDR']).' ['.$_SERVER['REMOTE_ADDR'].']'.$nldlm.'with ' .
  $_SERVER['SERVER_PROTOCOL'].' ('.$_SERVER['REQUEST_METHOD'].'); ' . date('r'),
  69, rcmail_header_delm() . "\t");
    69, $nldlm);
}
if (!empty($CONFIG['useragent']))
  $headers['User-Agent'] = $CONFIG['useragent'];