Vergleich inc/class_mailhandler.php - 1.4.1 - 1.4.2

  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 4098 2008-08-10 03:18:01Z chris $

 * $Id: class_mailhandler.php 4159 2008-08-31 01:05:54Z Tikitiki $

 */

/**

 */

/**

Zeile 159Zeile 159
	 */
function set_subject($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 215Zeile 214

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