Vergleich inc/class_mailhandler.php - 1.8.11 - 1.8.26

  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 150Zeile 157
		if($from)
{
$this->from = $from;

		if($from)
{
$this->from = $from;

 
			$this->from_named = $this->from;

		}
else
{

		}
else
{

			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 170Zeile 172
		}
else
{

		}
else
{

			$this->return_email = "";

 
			$this->return_email = $this->get_from_email();
}


			$this->return_email = $this->get_from_email();
}


Zeile 312Zeile 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)
{