| version 1.8, 2005/04/15 21:36:01 |
version 1.9, 2005/04/16 13:14:26 |
|
|
| <?php |
<?php |
| |
|
| // $Platon: mylist/backend/receiver/receiver.php,v 1.7 2005/04/15 20:54:36 majo Exp $ |
// $Platon: mylist/backend/receiver/receiver.php,v 1.8 2005/04/15 21:36:01 majo Exp $ |
| require_once "validator.php"; |
require_once "validator.php"; |
| require_once "../../mylist.config.php"; |
require_once "../../mylist.config.php"; |
| require_once "../shared/emailMessage.php"; |
require_once "../shared/emailMessage.php"; |
| Line 106 class CReceiver { |
|
| Line 106 class CReceiver { |
|
| // **************************************************** |
// **************************************************** |
| // ************* HEADERS MODIFICATIONS **************** |
// ************* HEADERS MODIFICATIONS **************** |
| |
|
| $_header = "From: ".$this->validator->emailMessage->structure->headers["from"].$MLIST_CRLF; |
//$_header = "From: ".$this->validator->emailMessage->structure->headers["from"].$MLIST_CRLF; |
| |
$_header = "From: ".$this->validator->emailMessage->structure->headers["from"]."\n"; |
| $_header .= "X-Mailinglist-From: ".$row["name"]."\n"; |
$_header .= "X-Mailinglist-From: ".$row["name"]."\n"; |
| $_header .= "To: ".$row["name"]."\n"; |
$_header .= "To: ".$row["name"]."\n"; |
| $_header .= "Errors-To: $errors_to\n"; |
$_header .= "Errors-To: $errors_to\n"; |
| if (isset($this->validator->emailMessage->structure->headers["in-reply-to"])) |
if (isset($this->validator->emailMessage->structure->headers["in-reply-to"])) |
| $_header .= "In-Reply-To: ".$this->validator->emailMessage->structure->headers["in-reply-to"].$MLIST_CRLF; |
//$_header .= "In-Reply-To: ".$this->validator->emailMessage->structure->headers["in-reply-to"].$MLIST_CRLF; |
| |
$_header .= "In-Reply-To: ".$this->validator->emailMessage->structure->headers["in-reply-to"]."\n"; |
| |
|
| if (isset($this->validator->emailMessage->structure->headers["references"])) |
if (isset($this->validator->emailMessage->structure->headers["references"])) |
| $_header .= "References: ".$this->validator->emailMessage->structure->headers["references"].$MLIST_CRLF; |
$_header .= "References: ".$this->validator->emailMessage->structure->headers["references"]."\n"; |
| |
//$_header .= "References: ".$this->validator->emailMessage->structure->headers["references"].$MLIST_CRLF; |
| |
|
| if ($row["f_reply_to_mlist"]) |
if ($row["f_reply_to_mlist"]) |
| $_header .= "Reply-To: ".$row["name"]; |
$_header .= "Reply-To: ".$row["name"]; |
| Line 128 class CReceiver { |
|
| Line 131 class CReceiver { |
|
| While(Current($this->validator->emailMessage->structure->headers["received"])) |
While(Current($this->validator->emailMessage->structure->headers["received"])) |
| { |
{ |
| |
|
| $_header .= $MLIST_CRLF."Received: ".Current($this->validator->emailMessage->structure->headers["received"]); |
//$_header .= $MLIST_CRLF."Received: ".Current($this->validator->emailMessage->structure->headers["received"]); |
| |
$_header .= "\nReceived: ".Current($this->validator->emailMessage->structure->headers["received"]); |
| |
|
| Next($this->validator->emailMessage->structure->headers["received"]); |
Next($this->validator->emailMessage->structure->headers["received"]); |
| } |
} |
| } |
} |
| else if (isset($this->validator->emailMessage->structure->headers["received"])) |
else if (isset($this->validator->emailMessage->structure->headers["received"])) |
| { |
{ |
| $_header .= $MLIST_CRLF."Received: ".$this->validator->emailMessage->structure->headers["received"]; |
//$_header .= $MLIST_CRLF."Received: ".$this->validator->emailMessage->structure->headers["received"]; |
| |
$_header .= "\nReceived: ".$this->validator->emailMessage->structure->headers["received"]; |
| } |
} |
| |
|
| |
|
| |
|
| // ************* PREXIF SUBJECT *********************** |
// ************* PREXIF SUBJECT *********************** |
| |
|
| Line 149 class CReceiver { |
|
| Line 153 class CReceiver { |
|
| if (!( ($pos=StrPos($subject,"[".$row["prefix"]."]")) || ($subject[0] == "[".$row["prefix"]."]") )) |
if (!( ($pos=StrPos($subject,"[".$row["prefix"]."]")) || ($subject[0] == "[".$row["prefix"]."]") )) |
| $this->modifiedMessage->subject = "[".$row["prefix"]."] ".$subject; |
$this->modifiedMessage->subject = "[".$row["prefix"]."] ".$subject; |
| else |
else |
| $this->modifiedMessgae->subject = $subject; |
$this->modifiedMessage->subject = $subject; |
| } |
} |
| else |
else |
| $this->modifiedMessage->subject = $subject; |
$this->modifiedMessage->subject = $subject; |
| |
|
| |
|
| $_header .= $MLIST_CRLF."Subject: ".$this->modifiedMessage->subject; |
$_header .= "\nSubject: ".$this->modifiedMessage->subject; |
| |
|
| |
|
| |
|
| Line 166 class CReceiver { |
|
| Line 170 class CReceiver { |
|
| // ************** OTHERS *************** |
// ************** OTHERS *************** |
| |
|
| if (isset($this->validator->emailMessage->structure->headers["mime-version"])) |
if (isset($this->validator->emailMessage->structure->headers["mime-version"])) |
| $_header .= $MLIST_CRLF."MIME-Version: ".$this->validator->emailMessage->structure->headers["mime-version"].$MLIST_CRLF; |
// $_header .= $MLIST_CRLF."MIME-Version: ".$this->validator->emailMessage->structure->headers["mime-version"].$MLIST_CRLF; |
| |
$_header .= "\nMIME-Version: ".$this->validator->emailMessage->structure->headers["mime-version"]; |
| |
|
| if (isset($this->validator->emailMessage->structure->headers["content-type"])) |
if (isset($this->validator->emailMessage->structure->headers["content-type"])) |
| $_header .= "Content-Type: ".$this->validator->emailMessage->structure->headers["content-type"].$MLIST_CRLF; |
//$_header .= "Content-Type: ".$this->validator->emailMessage->structure->headers["content-type"].$MLIST_CRLF; |
| |
$_header .= "\nContent-Type: ".$this->validator->emailMessage->structure->headers["content-type"]; |
| |
|
| $this->modifiedMessage->header = $_header; |
$this->modifiedMessage->header = $_header; |
| |
|