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

notice removal and fix for $returnpath - thanks steved

Browse Source
This commit is contained in:
CaMer0n
2006-12-19 10:03:31 +00:00
parent cf8e2aa9aa
commit 83e615bb6f
1 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
e107_handlers/mail.php
View File

@@ -11,9 +11,9 @@
| GNU General Public License (http://gnu.org). | GNU General Public License (http://gnu.org).
| |
| $Source: /cvs_backup/e107_0.8/e107_handlers/mail.php,v $ | $Source: /cvs_backup/e107_0.8/e107_handlers/mail.php,v $
| $Revision: 1.1.1.1 $ | $Revision: 1.2 $
| $Date: 2006-12-02 04:33:46 $ | $Date: 2006-12-19 10:03:31 $
| $Author: mcfly_e107 $ | $Author: e107coders $
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
*/ */
@@ -39,7 +39,7 @@ php 4.3.6 does NOT have this problem.
// Comment out the line below if you have trouble with some people not receiving emails. // Comment out the line below if you have trouble with some people not receiving emails.
// e107_ini_set(sendmail_path, "/usr/sbin/sendmail -t -f ".$pref['siteadminemail']); // e107_ini_set(sendmail_path, "/usr/sbin/sendmail -t -f ".$pref['siteadminemail']);
function sendemail($send_to, $subject, $message, $to_name, $send_from, $from_name, $attachments, $Cc, $Bcc, $returnpath, $returnreceipt,$inline ="") { function sendemail($send_to, $subject, $message, $to_name, $send_from, $from_name, $attachments='', $Cc='', $Bcc='', $returnpath='', $returnreceipt='',$inline ="") {
global $pref,$mailheader_e107id; global $pref,$mailheader_e107id;
require_once(e_HANDLER."phpmailer/class.phpmailer.php"); require_once(e_HANDLER."phpmailer/class.phpmailer.php");
@@ -163,7 +163,11 @@ function sendemail($send_to, $subject, $message, $to_name, $send_from, $from_nam
} }
} }
if($pref['mail_bounce_email'] !=''){ if (isset($returnpath) && ($returnpath != ""))
{ // Passed parameter overrides any system default
$mail->Sender = $returnpath;
}
elseif($pref['mail_bounce_email'] !=''){
$mail->Sender = $pref['mail_bounce_email']; $mail->Sender = $pref['mail_bounce_email'];
} }