| Zeile 6 | Zeile 6 |
|---|
* Website: http://mybb.com
* License: http://mybb.com/about/license
*
|
* Website: http://mybb.com
* License: http://mybb.com/about/license
*
|
* $Id: class_mailhandler.php 5297 2010-12-28 22:01:14Z Tomm $
| * $Id: class_mailhandler.php 5589 2011-09-13 15:08:11Z Tomm $
|
*/
/**
| */
/**
|
| Zeile 120 | Zeile 120 |
|---|
else
{
$this->from = "";
|
else
{
$this->from = "";
|
}
|
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']}>";
}
}
|
if($return_email)
|
if($return_email)
|
{
| {
|
$this->return_email = $return_email;
|
$this->return_email = $return_email;
|
}
else
{
$this->return_email = "";
}
| }
else
{
$this->return_email = "";
if($mybb->settings['returnemail'])
{
$this->return_email = $mybb->settings['returnemail'];
}
else
{
$this->return_email = $mybb->settings['adminemail'];
}
}
|
$this->set_to($to);
$this->set_subject($subject);
|
$this->set_to($to);
$this->set_subject($subject);
|
| |
|
if($charset)
{
$this->set_charset($charset);
}
|
if($charset)
{
$this->set_charset($charset);
}
|
| |
|
$this->parse_format = $format;
$this->set_common_headers();
$this->set_message($message, $message_text);
|
$this->parse_format = $format;
$this->set_common_headers();
$this->set_message($message, $message_text);
|
}
/**
| }
/**
|
* Sets the charset.
*
* @param string charset
| * Sets the charset.
*
* @param string charset
|
| Zeile 201 | Zeile 220 |
|---|
$to = $this->cleanup($to);
$this->to = $this->cleanup($to);
|
$to = $this->cleanup($to);
$this->to = $this->cleanup($to);
|
}
/**
| }
/**
|
* Sets the plain headers, text/plain
*/
function set_plain_headers()
| * Sets the plain headers, text/plain
*/
function set_plain_headers()
|
| Zeile 242 | Zeile 261 |
|---|
$this->message .= $message."{$this->delimiter}{$this->delimiter}";
$this->message .= "--{$mime_boundary}--{$this->delimiter}{$this->delimiter}";
|
$this->message .= $message."{$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 256 | Zeile 275 |
|---|
*/
function set_common_headers()
{
|
*/
function set_common_headers()
{
|
global $mybb;
| |
// Build mail headers
|
// Build mail headers
|
if(!trim($this->from))
{
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}";
if($this->return_email)
|
$this->headers .= "From: {$this->from}{$this->delimiter}";
if($this->return_email)
|
{
| {
|
$this->headers .= "Return-Path: {$this->return_email}{$this->delimiter}";
$this->headers .= "Reply-To: {$this->return_email}{$this->delimiter}";
|
$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}";
}
else
{
$this->headers .= "Return-Path: {$mybb->settings['adminemail']}{$this->delimiter}";
$this->headers .= "Reply-To: {$mybb->settings['adminemail']}{$this->delimiter}";
| |
}
if(isset($_SERVER['SERVER_NAME']))
| }
if(isset($_SERVER['SERVER_NAME']))
|