maketank/Froxlor
2
0
Fork 0
Code Pull Requests Releases Activity

Don't change PHPMailer core just modify public charset object-var, refs #1117

Browse Source 
Signed-off-by: Arnold Bechtoldt <mail@arnoldbechtoldt.com>
This commit is contained in:
Arnold Bechtoldt
2012-08-21 14:12:15 +02:00
parent 022d21054c
commit e1a0cca5cc
4 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lib/classes/phpmailer/class.PHPMailer.php
View File

@@ -56,7 +56,7 @@ class PHPMailer {
* Sets the CharSet of the message. * Sets the CharSet of the message.
* @var string * @var string
*/ */
public $CharSet = 'UTF-8'; public $CharSet = 'iso-8859-1';
/** /**
* Sets the Content-type of the message. * Sets the Content-type of the message.

2
lib/init.php
View File

@@ -500,6 +500,8 @@ if($page == '')
* Initialize the mailingsystem * Initialize the mailingsystem
*/ */
$mail = new PHPMailer(true); $mail = new PHPMailer(true);
$mail->CharSet = "UTF-8";
if(PHPMailer::ValidateAddress($settings['panel']['adminmail']) !== false) if(PHPMailer::ValidateAddress($settings['panel']['adminmail']) !== false)
{ {
// set return-to address and custom sender-name, see #76 // set return-to address and custom sender-name, see #76

1
scripts/jobs/cron_autoresponder.php
View File

@@ -226,6 +226,7 @@ if($db->num_rows($result) > 0)
$_mailerror = false; $_mailerror = false;
try { try {
$mail->CharSet = "UTF-8";
$mail->SetFrom($to, $to); $mail->SetFrom($to, $to);
$mail->AddReplyTo($to, $to); $mail->AddReplyTo($to, $to);
$mail->Subject = $row['subject']; $mail->Subject = $row['subject'];

2
scripts/jobs/cron_usage_report.php
View File

@@ -24,6 +24,8 @@ $yesterday = time() - (60 * 60 * 24);
* Initialize the mailingsystem * Initialize the mailingsystem
*/ */
$mail = new PHPMailer(true); $mail = new PHPMailer(true);
$mail->CharSet = "UTF-8";
$mail->SetFrom($settings['panel']['adminmail'], 'Froxlor Administrator'); $mail->SetFrom($settings['panel']['adminmail'], 'Froxlor Administrator');
// Warn the customers at xx% traffic-usage // Warn the customers at xx% traffic-usage