Vergleich inc/class_mailhandler.php - 1.4.4 - 1.4.13

  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 4267 2008-11-10 21:28:36Z Tikitiki $

 * $Id: class_mailhandler.php 4850 2010-03-31 08:14:21Z RyanGordon $

 */

/**

 */

/**

Zeile 48Zeile 48
	 * @var string
*/
var $subject;

	 * @var string
*/
var $subject;

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


/**
* The message of the mail.


/**
* The message of the mail.

Zeile 123Zeile 130
		{
$this->return_email = "";
}

		{
$this->return_email = "";
}

		



		$this->set_to($to);
$this->set_subject($subject);
if($charset)

		$this->set_to($to);
$this->set_subject($subject);
if($charset)

Zeile 180Zeile 187
	 */
function set_subject($subject)
{

	 */
function set_subject($subject)
{

		$this->subject = $this->utf8_encode($this->cleanup($subject));


		$this->orig_subject = $this->cleanup($subject);
$this->subject = $this->utf8_encode($this->orig_subject);

	}

/**

	}

/**

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

		}
}

/**

		}
}

/**

	 * Sets the common headers.
*/
function set_common_headers()

	 * Sets the common headers.
*/
function set_common_headers()

Zeile 302Zeile 310
		$this->headers .= "X-Priority: 3{$this->delimiter}";
$this->headers .= "X-MSMail-Priority: Normal{$this->delimiter}";
$this->headers .= "X-Mailer: MyBB{$this->delimiter}";

		$this->headers .= "X-Priority: 3{$this->delimiter}";
$this->headers .= "X-MSMail-Priority: Normal{$this->delimiter}";
$this->headers .= "X-Mailer: MyBB{$this->delimiter}";

		if(defined("IN_ADMINCP"))
{
$_SERVER['PHP_SELF'] = str_replace($mybb->config['admin_dir']."/", "admin-", $_SERVER['PHP_SELF']);
}
$this->headers .= "X-MyBB-Script: {$http_host}{$_SERVER['PHP_SELF']}{$this->delimiter}";

 
		$this->headers .= "MIME-Version: 1.0{$this->delimiter}";
}


		$this->headers .= "MIME-Version: 1.0{$this->delimiter}";
}


Zeile 321Zeile 324
		global $db;

$mail_error = array(

		global $db;

$mail_error = array(

			"subject" => $db->escape_string($this->subject),

			"subject" => $db->escape_string($this->orig_subject),

			"message" => $db->escape_string($this->message),
"toaddress" => $db->escape_string($this->to),
"fromaddress" => $db->escape_string($this->from),

			"message" => $db->escape_string($this->message),
"toaddress" => $db->escape_string($this->to),
"fromaddress" => $db->escape_string($this->from),

Zeile 358Zeile 361
	 */
function utf8_encode($string)
{

	 */
function utf8_encode($string)
{

		$encoded_string = $string;
if(strtolower($this->charset) == 'utf-8' && preg_match('/[\x00-\x08\x0b\x0c\x0e-\x1f\x7f-\xff]/', $string))

		if(strtolower($this->charset) == 'utf-8' && preg_match('/[^\x20-\x7E]/', $string))


		{

		{

			// Define start delimimter, end delimiter and spacer
$end = "?=";
$start = "=?" . $this->charset . "?B?";
$spacer = $end . ' ' . $start;

			$chunk_size = 47; // Derived from floor((75 - strlen("=?UTF-8?B??=")) * 0.75);
$len = strlen($string);
$output = '';
$pos = 0;





			// Determine length of encoded text within chunks and ensure length is even (should NOT use the my_strlen functions)
$length = 75 - strlen($start) - strlen($end);
$length = floor($length/4) * 4;

// Encode the string and split it into chunks with spacers after each chunk
$encoded_string = base64_encode($encoded_string);
$encoded_string = chunk_split($encoded_string, $length, $spacer);



            while($pos < $len)
{
$newpos = min($pos + $chunk_size, $len);

while(ord($string[$newpos]) >= 0x80 && ord($string[$newpos]) < 0xC0)
{
// Reduce len until it's safe to split UTF-8.
$newpos--;
}





			// Remove trailing spacer and add start and end delimiters
$spacer = preg_quote($spacer);
$encoded_string = preg_replace("/" . $spacer . "$/", "", $encoded_string);
$encoded_string = $start . $encoded_string . $end;



				$chunk = substr($string, $pos, $newpos - $pos);
$pos = $newpos;

$output .= " =?UTF-8?B?".base64_encode($chunk)."?=\n";
}
return trim($output);

		}

		}

		return $encoded_string;
}

		return $string;
}

}
?>

}
?>