mirror/php-e107
1
0
Fork 0
mirror of https://github.com/e107inc/e107.git synced 2025-08-02 12:48:26 +02:00
Code Issues Releases Wiki Activity

Bugtracker #4030 - attachment handling in mailout

Browse Source
This commit is contained in:
e107steved
2007-08-02 20:37:11 +00:00
parent b6a8d5b5fa
commit 00f54ee470
1 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
e107_handlers/phpmailer/mailout_process.php
View File

@@ -11,8 +11,8 @@
| GNU General Public License (http://gnu.org). | GNU General Public License (http://gnu.org).
| |
| $Source: /cvs_backup/e107_0.8/e107_handlers/phpmailer/mailout_process.php,v $ | $Source: /cvs_backup/e107_0.8/e107_handlers/phpmailer/mailout_process.php,v $
| $Revision: 1.4 $ | $Revision: 1.5 $
| $Date: 2007-04-24 20:29:11 $ | $Date: 2007-08-02 20:37:10 $
| $Author: e107steved $ | $Author: e107steved $
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
*/ */
@@ -114,11 +114,7 @@ if($_POST['cancel_emails']){
$mail->Sender = $pref['mail_bounce_email']; $mail->Sender = $pref['mail_bounce_email'];
} }
$attach = chop($_POST['email_attachment']); $attach = trim($_POST['email_attachment']);
if (($temp = strrchr($attach,'/')) !== FALSE)
{ // Just specify filename as attachment - no path
$attach = substr($attach,1);
}
if(is_readable(e_DOWNLOAD.$attach)) if(is_readable(e_DOWNLOAD.$attach))
{ {
@@ -129,11 +125,16 @@ if($_POST['cancel_emails']){
$attach_link = e_FILE.'public/'.$attach; $attach_link = e_FILE.'public/'.$attach;
} }
if (($temp = strrchr($attach,'/')) !== FALSE)
{ // Just specify filename as attachment - no path
$attach = substr($temp,1);
}
if ($attach != "" && !$mail->AddAttachment($attach_link, $attach)) if ($attach != "" && !$mail->AddAttachment($attach_link, $attach))
{ {
$mss = MAILAN_58."<br />$attach_link"; // problem with attachment. $mss = MAILAN_58."<br />$attach_link"; // problem with attachment.
$ns->tablerender("Error", $mss); $ns->tablerender("Error", $mss);
require_once(e_ADMIN."footer.php"); // require_once(e_ADMIN."footer.php");
exit; exit;
} }