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

Fix for siteurl on email template. Prevent pausing on emails when bulkmail is inactive. Fix for missing mail-identifier in signup email.

Browse Source
This commit is contained in:
Cameron
2015-05-13 15:21:27 -07:00
parent 1b403bba6d
commit d596abc90a
4 changed files with 16 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
e107_handlers/mail.php
View File

@@ -920,7 +920,7 @@ class e107Email extends PHPMailer
*
* @return boolean|string - TRUE if success, error message if failure
*/
public function sendEmail($send_to, $to_name, $eml = '', $bulkmail = FALSE)
public function sendEmail($send_to, $to_name, $eml = '', $bulkmail = false)
{
if (count($eml))
{
@@ -931,7 +931,7 @@ class e107Email extends PHPMailer
}
if ($bulkmail && $this->localUseVerp && $this->save_bouncepath && (strpos($this->save_bouncepath,'@') !== FALSE))
if (($bulkmail == true) && $this->localUseVerp && $this->save_bouncepath && (strpos($this->save_bouncepath,'@') !== false))
{
// Format where sender is owner@origin, target is user@domain is: owner+user=domain@origin
list($our_sender,$our_domain) = explode('@', $this->save_bouncepath,2);
@@ -976,7 +976,7 @@ class e107Email extends PHPMailer
$this->TotalSent++;
if (($this->pause_amount > 0) && ($this->SendCount >= $this->pause_amount))
if (($bulkmail == true) && ($this->pause_amount > 0) && ($this->SendCount >= $this->pause_amount))
{
if ($this->SMTPKeepAlive && ($this->Mailer == 'smtp')) $this->SmtpClose();
sleep($this->pause_time);