github
/
phpservermon
mirror of https://github.com/phpservermon/phpservermon
1
0
Fork 0
Code Issues Releases Wiki Activity

Fixed #350 Email encoding 

Removed utf8_decode().

Co-authored-by: shuhai <admin@4wei.cn>
pull/569/head
Tim 2018-02-25 01:17:27 +01:00 committed by Timz99
parent 79a654e383
commit b9a3b203b4
No known key found for this signature in database
GPG Key ID: 4D8268DC68E8339D
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/psm/Util/Server/Updater/StatusNotifier.php
View File

@ -200,12 +200,12 @@ class StatusNotifier {
protected function notifyByEmail($users) { protected function notifyByEmail($users) {
// build mail object with some default values // build mail object with some default values
$mail = psm_build_mail(); $mail = psm_build_mail();
$mail->Subject = utf8_decode(psm_parse_msg($this->status_new, 'email_subject', $this->server)); $mail->Subject = psm_parse_msg($this->status_new, 'email_subject', $this->server);
$mail->Priority = 1; $mail->Priority = 1;
$body = psm_parse_msg($this->status_new, 'email_body', $this->server); $body = psm_parse_msg($this->status_new, 'email_body', $this->server);
$mail->Body = utf8_decode($body); $mail->Body = $body;
$mail->AltBody = str_replace('<br/>', "\n", $body); $mail->AltBody = str_replace('<br/>', "\n", $body);
if(psm_get_conf('log_email')) { if(psm_get_conf('log_email')) {
$log_id = psm_add_log($this->server_id, 'email', $body); $log_id = psm_add_log($this->server_id, 'email', $body);