Don't change PHPMailer core just modify public charset object-var, refs #1117
Signed-off-by: Arnold Bechtoldt <mail@arnoldbechtoldt.com>
This commit is contained in:
@@ -56,7 +56,7 @@ class PHPMailer {
|
||||
* Sets the CharSet of the message.
|
||||
* @var string
|
||||
*/
|
||||
public $CharSet = 'UTF-8';
|
||||
public $CharSet = 'iso-8859-1';
|
||||
|
||||
/**
|
||||
* Sets the Content-type of the message.
|
||||
|
||||
@@ -500,6 +500,8 @@ if($page == '')
|
||||
* Initialize the mailingsystem
|
||||
*/
|
||||
$mail = new PHPMailer(true);
|
||||
$mail->CharSet = "UTF-8";
|
||||
|
||||
if(PHPMailer::ValidateAddress($settings['panel']['adminmail']) !== false)
|
||||
{
|
||||
// set return-to address and custom sender-name, see #76
|
||||
|
||||
@@ -226,6 +226,7 @@ if($db->num_rows($result) > 0)
|
||||
|
||||
$_mailerror = false;
|
||||
try {
|
||||
$mail->CharSet = "UTF-8";
|
||||
$mail->SetFrom($to, $to);
|
||||
$mail->AddReplyTo($to, $to);
|
||||
$mail->Subject = $row['subject'];
|
||||
|
||||
@@ -24,6 +24,8 @@ $yesterday = time() - (60 * 60 * 24);
|
||||
* Initialize the mailingsystem
|
||||
*/
|
||||
$mail = new PHPMailer(true);
|
||||
|
||||
$mail->CharSet = "UTF-8";
|
||||
$mail->SetFrom($settings['panel']['adminmail'], 'Froxlor Administrator');
|
||||
|
||||
// Warn the customers at xx% traffic-usage
|
||||
|
||||
Reference in New Issue
Block a user