Commit: 6b02210535a6f868a38a528d98eb13966bb0d65d - xoopscubelegacy (git)

XOOPS Cube Legacy base repository

Commit MetaInfo

• Revision: 6b02210535a6f868a38a528d98eb13966bb0d65d (tree)
• Zeit: 2013-02-23 14:16:05
• Autor: HIKAWA Kilica <kilica.hikawa@gmai...>
• Commiter: HIKAWA Kilica

Log Message

Merge pull request #48 from nao-pon/xoopscube_mailer_patch

fix send mail with safe mode (phpmailer patch)

Ändern Zusammenfassung

• modified: html/class/mail/phpmailer/class.phpmailer.php

Diff

--- a/html/class/mail/phpmailer/class.phpmailer.php
+++ b/html/class/mail/phpmailer/class.phpmailer.php
@@ -741,7 +741,8 @@ class PHPMailer {
     } else {
       $params = sprintf("-oi -f %s", $this->Sender);
     }
-    if ($this->Sender != '' and !ini_get('safe_mode')) {
+    $isSafeMode = !!ini_get('safe_mode');
+    if ($this->Sender != '' and !$isSafeMode) {
       $old_from = ini_get('sendmail_from');
       ini_set('sendmail_from', $this->Sender);
       if ($this->SingleTo === true && count($toArr) > 1) {
@@ -760,13 +761,21 @@ class PHPMailer {
     } else {
       if ($this->SingleTo === true && count($toArr) > 1) {
         foreach ($toArr as $key => $val) {
-          $rt = @mail($val, $this->EncodeHeader($this->SecureHeader($this->Subject)), $body, $header, $params);
+          if ($isSafeMode) {
+            $rt = @mail($val, $this->EncodeHeader($this->SecureHeader($this->Subject)), $body, $header);
+          } else {
+            $rt = @mail($val, $this->EncodeHeader($this->SecureHeader($this->Subject)), $body, $header, $params);
+          }
           // implement call back function if it exists
           $isSent = ($rt == 1) ? 1 : 0;
           $this->doCallback($isSent, $val, $this->cc, $this->bcc, $this->Subject, $body);
         }
       } else {
-        $rt = @mail($to, $this->EncodeHeader($this->SecureHeader($this->Subject)), $body, $header, $params);
+        if ($isSafeMode) {
+          $rt = @mail($to, $this->EncodeHeader($this->SecureHeader($this->Subject)), $body, $header);
+        } else {
+          $rt = @mail($to, $this->EncodeHeader($this->SecureHeader($this->Subject)), $body, $header, $params);
+        }
         // implement call back function if it exists
         $isSent = ($rt == 1) ? 1 : 0;
         $this->doCallback($isSent, $to, $this->cc, $this->bcc, $this->Subject, $body);