| Zeile 6 | Zeile 6 |
|---|
* Website: http://www.mybboard.net
* License: http://www.mybboard.net/about/license
*
|
* Website: http://www.mybboard.net
* License: http://www.mybboard.net/about/license
*
|
* $Id: class_mailhandler.php 4098 2008-08-10 03:18:01Z chris $
| * $Id: class_mailhandler.php 4267 2008-11-10 21:28:36Z Tikitiki $
|
*/
/**
| */
/**
|
| Zeile 34 | Zeile 34 |
|---|
* @var string
*/
var $from;
|
* @var string
*/
var $from;
|
| |
/**
* Who the email should return to.
*
* @var string
*/
var $return_email;
|
/**
* The subject of mail.
|
/**
* The subject of mail.
|
*
| *
|
* @var string
*/
var $subject;
/**
* The message of the mail.
|
* @var string
*/
var $subject;
/**
* The message of the mail.
|
*
* @var string
*/
| *
* @var string
*/
|
var $message;
|
var $message;
|
/**
|
/**
|
* The headers of the mail.
*
* @var string
| * The headers of the mail.
*
* @var string
|
| Zeile 58 | Zeile 65 |
|---|
/**
* The charset of the mail.
|
/**
* The charset of the mail.
|
*
| *
|
* @var string
* @default utf-8
*/
| * @var string
* @default utf-8
*/
|
| Zeile 90 | Zeile 97 |
|---|
* @param string headers of email.
* @param string format of the email (HTML, plain text, or both?).
* @param string plain text version of the email.
|
* @param string headers of email.
* @param string format of the email (HTML, plain text, or both?).
* @param string plain text version of the email.
|
| | * @param string the return email address.
|
*/
|
*/
|
function build_message($to, $subject, $message, $from="", $charset="", $headers="", $format="text", $message_text="")
| function build_message($to, $subject, $message, $from="", $charset="", $headers="", $format="text", $message_text="", $return_email="")
|
{
global $parser, $lang, $mybb;
| {
global $parser, $lang, $mybb;
|
| Zeile 102 | Zeile 110 |
|---|
{
$this->from = $from;
}
|
{
$this->from = $from;
}
|
| else
{
$this->from = "";
}
if($return_email)
{
$this->return_email = $return_email;
}
else
{
$this->return_email = "";
}
|
$this->set_to($to);
$this->set_subject($subject);
if($charset)
| $this->set_to($to);
$this->set_subject($subject);
if($charset)
|
| Zeile 131 | Zeile 152 |
|---|
else
{
$this->charset = $charset;
|
else
{
$this->charset = $charset;
|
}
}
| }
}
|
/**
* Sets and formats the email message.
*
| /**
* Sets and formats the email message.
*
|
| Zeile 158 | Zeile 179 |
|---|
* @param string subject
*/
function set_subject($subject)
|
* @param string subject
*/
function set_subject($subject)
|
{
$this->subject = $this->cleanup($subject);
$this->subject = $this->utf8_encode($subject);
| {
$this->subject = $this->utf8_encode($this->cleanup($subject));
|
}
/**
| }
/**
|
| Zeile 215 | Zeile 235 |
|---|
$this->message .= "--{$mime_boundary}--{$this->delimiter}{$this->delimiter}";
}
|
$this->message .= "--{$mime_boundary}--{$this->delimiter}{$this->delimiter}";
}
|
else {
| else
{
|
$this->headers .= "Content-Type: text/html; charset=\"{$this->charset}\"{$this->delimiter}";
$this->headers .= "Content-Transfer-Encoding: 8bit{$this->delimiter}{$this->delimiter}";
$this->message = $message."{$this->delimiter}{$this->delimiter}";
| $this->headers .= "Content-Type: text/html; charset=\"{$this->charset}\"{$this->delimiter}";
$this->headers .= "Content-Transfer-Encoding: 8bit{$this->delimiter}{$this->delimiter}";
$this->message = $message."{$this->delimiter}{$this->delimiter}";
|
| Zeile 228 | Zeile 249 |
|---|
function set_common_headers()
{
global $mybb;
|
function set_common_headers()
{
global $mybb;
|
|
|
// Build mail headers
if(!trim($this->from))
{
|
// Build mail headers
if(!trim($this->from))
{
|
$this->from = '"'.$this->utf8_encode($mybb->settings['bbname'].'"');
$this->from .= " <{$mybb->settings['adminemail']}>";
| if($mybb->settings['mail_handler'] == 'smtp')
{
$this->from = $mybb->settings['adminemail'];
}
else
{
$this->from = '"'.$this->utf8_encode($mybb->settings['bbname']).'"';
$this->from .= " <{$mybb->settings['adminemail']}>";
}
|
}
$this->headers .= "From: {$this->from}{$this->delimiter}";
|
}
$this->headers .= "From: {$this->from}{$this->delimiter}";
|
if($mybb->settings['returnemail'])
| if($this->return_email)
{
$this->headers .= "Return-Path: {$this->return_email}{$this->delimiter}";
$this->headers .= "Reply-To: {$this->return_email}{$this->delimiter}";
}
elseif($mybb->settings['returnemail'])
|
{
$this->headers .= "Return-Path: {$mybb->settings['returnemail']}{$this->delimiter}";
$this->headers .= "Reply-To: {$mybb->settings['adminemail']}{$this->delimiter}";
| {
$this->headers .= "Return-Path: {$mybb->settings['returnemail']}{$this->delimiter}";
$this->headers .= "Reply-To: {$mybb->settings['adminemail']}{$this->delimiter}";
|