mirror/php-e107
1
0
Fork 0
mirror of https://github.com/e107inc/e107.git synced 2025-07-31 03:40:37 +02:00
Code Issues Releases Wiki Activity

Merged core mailout routine into e107_plugins/user/e_mailout.php. Fixed pop3 error messages from phpmailer. Corrected email preview when no template selected. Corrected mailout Email source names.

Browse Source
This commit is contained in:
Cameron
2016-04-11 18:39:19 -07:00
parent b762c10ecc
commit 84d7271d10
8 changed files with 359 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
e107_handlers/mail.php
View File

@@ -697,9 +697,16 @@ class e107Email extends PHPMailer
}
}
$text = $this->Body;
if($eml['template'] == 'textonly')
{
$text = strip_tags($text);
}
if(!empty($this->previewAttachments))
{
$text .= "<hr />Attachments:";
@@ -710,7 +717,12 @@ class e107Email extends PHPMailer
$text .= "</div>";
}
}
if($eml['template'] == 'texthtml' || $eml['template'] == 'textonly' )
{
$text = "<body style='background-color:#FFFFFF'>".$text."</body>";
}
return $text;
}
@@ -1192,6 +1204,9 @@ class e107Email extends PHPMailer
}
} // End of e107Mailer class