Vergleich inc/class_mailhandler.php - 1.8.6 - 1.8.17

  Keine Änderungen   Hinzugefügt   Modifiziert   Entfernt
Zeile 33Zeile 33
	 * @var string
*/
public $from;

	 * @var string
*/
public $from;

 

/**
* Full from string including name in format "name" <email>
*
* @var string
*/
public $from_named;


/**
* Who the email should return to.


/**
* Who the email should return to.

Zeile 40Zeile 47
	 * @var string
*/
public $return_email;

	 * @var string
*/
public $return_email;


/**


/**

	 * The subject of mail.
*
* @var string
*/
public $subject;

	 * The subject of mail.
*
* @var string
*/
public $subject;


/**


/**

	 * The unaltered subject of mail.
*
* @var string
*/
public $orig_subject;

	 * The unaltered subject of mail.
*
* @var string
*/
public $orig_subject;


/**


/**

	 * The message of the mail.
*
* @var string
*/
public $message;

	 * The message of the mail.
*
* @var string
*/
public $message;


/**


/**

	 * The headers of the mail.
*
* @var string
*/
public $headers;

	 * The headers of the mail.
*
* @var string
*/
public $headers;


/**


/**

	 * The charset of the mail.
*
* @var string
* @default utf-8
*/
public $charset = "utf-8";

	 * The charset of the mail.
*
* @var string
* @default utf-8
*/
public $charset = "utf-8";


/**


/**

	 * The currently used delimiter new lines.
*
* @var string
*/

	 * The currently used delimiter new lines.
*
* @var string
*/

	public $delimiter = "\r\n";















	public $delimiter = "\r\n";

/**
* How it should parse the email (HTML or plain text?)
*
* @var string
*/
public $parse_format = 'text';

/**
* The last received response from the SMTP server.
*
* @var string
*/
public $data = '';


/**


/**

	 * How it should parse the email (HTML or plain text?)

	 * The last received response code from the SMTP server.

	 *
* @var string
*/

	 *
* @var string
*/

	public $parse_format = 'text';

	public $code = 0;


/**
* Selects between AdminEmail and ReturnEmail, dependant on if ReturnEmail is filled.


/**
* Selects between AdminEmail and ReturnEmail, dependant on if ReturnEmail is filled.

Zeile 139Zeile 160
		}
else
{

		}
else
{

			$this->from = "";
if($mybb->settings['mail_handler'] == 'smtp')
{
$this->from = $this->get_from_email();
}
else
{
$this->from = '"'.$this->utf8_encode($mybb->settings['bbname']).'"';
$this->from .= " <".$this->get_from_email().">";
}

			$this->from = $this->get_from_email();
$this->from_named = '"'.$this->utf8_encode($mybb->settings['bbname']).'"';
$this->from_named .= " <".$this->from.">";








		}

if($return_email)

		}

if($return_email)

Zeile 299Zeile 313
		global $mybb;

// Build mail headers

		global $mybb;

// Build mail headers

		$this->headers .= "From: {$this->from}{$this->delimiter}";

		$this->headers .= "From: {$this->from_named}{$this->delimiter}";


if($this->return_email)
{


if($this->return_email)
{