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

Improved template preview

Browse Source
This commit is contained in:
Cameron
2014-11-11 14:23:46 -08:00
parent c7f86fcac6
commit 8784b30ca6
1 changed files with 34 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
e107_handlers/mail.php
View File

@@ -159,6 +159,7 @@ class e107Email extends PHPMailer
private $debug = false; // echos various debug info when set to true. private $debug = false; // echos various debug info when set to true.
private $pref = array(); // Store code prefs. private $pref = array(); // Store code prefs.
private $previewMode = false; private $previewMode = false;
private $previewAttachments = array();
private $overrides = array( private $overrides = array(
// Legacy // New // Legacy // New
'SMTPDebug' => 'SMTPDebug', 'SMTPDebug' => 'SMTPDebug',
@@ -599,15 +600,29 @@ class e107Email extends PHPMailer
{ {
if (!$attachments) return; if (!$attachments) return;
if (!is_array($attachments)) $attachments = array($attachments); if (!is_array($attachments)) $attachments = array($attachments);
$mes = e107::getMessage();
foreach($attachments as $attach) foreach($attachments as $attach)
{ {
$tempName = basename($attach); $tempName = basename($attach);
if(is_readable($attach) && $tempName) if(is_readable($attach) && $tempName) // First parameter is complete path + filename; second parameter is 'name' of file to send
{ // First parameter is complete path + filename; second parameter is 'name' of file to send {
$ext = pathinfo($attach, PATHINFO_EXTENSION); if($this->previewMode === true)
$this->AddAttachment($attach, $tempName,'base64',$this->_mime_types($ext)); {
$this->previewAttachments[] = array('file'=>$attach, 'status'=>true);
}
else
{
$ext = pathinfo($attach, PATHINFO_EXTENSION);
$this->AddAttachment($attach, $tempName,'base64',$this->_mime_types($ext));
}
} }
elseif($this->previewMode === true)
{
$this->previewAttachments[] = array('file'=>$attach, 'status'=>false);
}
} }
} }
@@ -638,6 +653,7 @@ class e107Email extends PHPMailer
public function preview($eml) public function preview($eml)
{ {
$this->previewMode = true; $this->previewMode = true;
$mes = e107::getMessage();
if (count($eml)) if (count($eml))
{ {
@@ -648,7 +664,20 @@ class e107Email extends PHPMailer
} }
return $this->Body; $text = $this->Body;
if(!empty($this->previewAttachments))
{
$text .= "<hr />Attachments:";
foreach($this->previewAttachments as $val)
{
$text .= "<div>".$val['file']." - ";
$text .= ($val['status'] !== true) ? "Not Found" : "OK";
$text .= "</div>";
}
}
return $text;
} }