Vergleich inc/class_mailhandler.php - 1.4.2 - 1.4.4

  Keine Änderungen   Hinzugefügt   Modifiziert   Entfernt
Zeile 6Zeile 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 4159 2008-08-31 01:05:54Z Tikitiki $

 * $Id: class_mailhandler.php 4267 2008-11-10 21:28:36Z Tikitiki $

 */

/**

 */

/**

Zeile 34Zeile 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.

Zeile 90Zeile 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 102Zeile 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 113Zeile 134
		$this->set_common_headers();
$this->set_message($message, $message_text);


		$this->set_common_headers();
$this->set_message($message, $message_text);


	}


	}


	/**
* Sets the charset.
*

	/**
* Sets the charset.
*

Zeile 166Zeile 187
	 * Sets and formats the recipient address.
*
* @param string to

	 * Sets and formats the recipient address.
*
* @param string to

	 */

	 */

	function set_to($to)
{
$to = $this->cleanup($to);

	function set_to($to)
{
$to = $this->cleanup($to);





		$this->to = $this->cleanup($to);

		$this->to = $this->cleanup($to);

	}


	}


	/**
* Sets the plain headers, text/plain

	/**
* Sets the plain headers, text/plain

	 */

	 */

	function set_plain_headers()
{
$this->headers .= "Content-Type: text/plain; charset={$this->charset}{$this->delimiter}";

	function set_plain_headers()
{
$this->headers .= "Content-Type: text/plain; charset={$this->charset}{$this->delimiter}";

Zeile 192Zeile 213
		if(!$message_text && $this->parse_format == 'both')
{
$message_text = strip_tags($message);

		if(!$message_text && $this->parse_format == 'both')
{
$message_text = strip_tags($message);

		}

		}

		
if($this->parse_format == 'both')
{

		
if($this->parse_format == 'both')
{

Zeile 245Zeile 266

$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}";