Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
P
phpmailer
Manage
Activity
Members
Labels
Plan
Wiki
Custom issue tracker
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Model registry
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Code review analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
project
phpmailer
Commits
aed9a13d
Commit
aed9a13d
authored
13 years ago
by
Daniel Kudwien
Browse files
Options
Downloads
Patches
Plain Diff
-
#927646
by oadaeh: Fixed Bogus case of Cc and Bcc mail header fields.
parent
a3819e10
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
CHANGELOG.txt
+1
-0
1 addition, 0 deletions
CHANGELOG.txt
includes/phpmailer.class.inc
+5
-5
5 additions, 5 deletions
includes/phpmailer.class.inc
includes/phpmailer.mimemail.inc
+5
-5
5 additions, 5 deletions
includes/phpmailer.mimemail.inc
with
11 additions
and
10 deletions
CHANGELOG.txt
+
1
−
0
View file @
aed9a13d
PHPMailer 7.x-3.x, xxxx-xx-xx
PHPMailer 7.x-3.x, xxxx-xx-xx
-----------------------------
-----------------------------
#927646 by oadaeh: Fixed Bogus case of Cc and Bcc mail header fields.
#811774 by InternetDevels.Com, sun: Fixed MimeMail integration.
#811774 by InternetDevels.Com, sun: Fixed MimeMail integration.
#811774 by sun: Fixed duplicate disabled warning when submitting settings form.
#811774 by sun: Fixed duplicate disabled warning when submitting settings form.
#1188610 by sun: Fixed bogus variable $mail in exception handling.
#1188610 by sun: Fixed bogus variable $mail in exception handling.
...
...
This diff is collapsed.
Click to expand it.
includes/phpmailer.class.inc
+
5
−
5
View file @
aed9a13d
...
@@ -271,13 +271,13 @@ class DrupalPHPMailer extends PHPMailer implements MailSystemInterface {
...
@@ -271,13 +271,13 @@ class DrupalPHPMailer extends PHPMailer implements MailSystemInterface {
$this
->
AddAddress
(
$address
[
'mail'
],
$address
[
'name'
]);
$this
->
AddAddress
(
$address
[
'mail'
],
$address
[
'name'
]);
}
}
// Extract CCs and BCCs from headers.
// Extract CCs and BCCs from headers.
if
(
isset
(
$message
[
'headers'
][
'C
C
'
]))
{
if
(
isset
(
$message
[
'headers'
][
'C
c
'
]))
{
foreach
(
phpmailer_parse_address
(
$message
[
'headers'
][
'C
C
'
])
as
$address
)
{
foreach
(
phpmailer_parse_address
(
$message
[
'headers'
][
'C
c
'
])
as
$address
)
{
$this
->
AddCC
(
$address
[
'mail'
],
$address
[
'name'
]);
$this
->
AddCC
(
$address
[
'mail'
],
$address
[
'name'
]);
}
}
}
}
if
(
isset
(
$message
[
'headers'
][
'B
CC
'
]))
{
if
(
isset
(
$message
[
'headers'
][
'B
cc
'
]))
{
foreach
(
phpmailer_parse_address
(
$message
[
'headers'
][
'B
CC
'
])
as
$address
)
{
foreach
(
phpmailer_parse_address
(
$message
[
'headers'
][
'B
cc
'
])
as
$address
)
{
$this
->
AddBCC
(
$address
[
'mail'
],
$address
[
'name'
]);
$this
->
AddBCC
(
$address
[
'mail'
],
$address
[
'name'
]);
}
}
}
}
...
@@ -286,7 +286,7 @@ class DrupalPHPMailer extends PHPMailer implements MailSystemInterface {
...
@@ -286,7 +286,7 @@ class DrupalPHPMailer extends PHPMailer implements MailSystemInterface {
// Reroute to debug e-mail address.
// Reroute to debug e-mail address.
$this
->
AddAddress
(
variable_get
(
'phpmailer_debug_email'
,
''
));
$this
->
AddAddress
(
variable_get
(
'phpmailer_debug_email'
,
''
));
}
}
unset
(
$message
[
'headers'
][
'C
C
'
],
$message
[
'headers'
][
'B
CC
'
]);
unset
(
$message
[
'headers'
][
'C
c
'
],
$message
[
'headers'
][
'B
cc
'
]);
// Extract Reply-To from headers.
// Extract Reply-To from headers.
if
(
isset
(
$message
[
'headers'
][
'Reply-To'
]))
{
if
(
isset
(
$message
[
'headers'
][
'Reply-To'
]))
{
...
...
This diff is collapsed.
Click to expand it.
includes/phpmailer.mimemail.inc
+
5
−
5
View file @
aed9a13d
...
@@ -38,13 +38,13 @@ function mimemail_phpmailer_send($message) {
...
@@ -38,13 +38,13 @@ function mimemail_phpmailer_send($message) {
$mail
->
AddAddress
(
$address
[
'mail'
]);
$mail
->
AddAddress
(
$address
[
'mail'
]);
}
}
// Extract CCs and BCCs from headers.
// Extract CCs and BCCs from headers.
if
(
isset
(
$message
[
'headers'
][
'C
C
'
]))
{
if
(
isset
(
$message
[
'headers'
][
'C
c
'
]))
{
foreach
(
phpmailer_parse_address
(
$message
[
'headers'
][
'C
C
'
])
as
$address
)
{
foreach
(
phpmailer_parse_address
(
$message
[
'headers'
][
'C
c
'
])
as
$address
)
{
$mail
->
AddCC
(
$address
[
'mail'
]);
$mail
->
AddCC
(
$address
[
'mail'
]);
}
}
}
}
if
(
isset
(
$message
[
'headers'
][
'B
CC
'
]))
{
if
(
isset
(
$message
[
'headers'
][
'B
cc
'
]))
{
foreach
(
phpmailer_parse_address
(
$message
[
'headers'
][
'B
CC
'
])
as
$address
)
{
foreach
(
phpmailer_parse_address
(
$message
[
'headers'
][
'B
cc
'
])
as
$address
)
{
$mail
->
AddBCC
(
$address
[
'mail'
]);
$mail
->
AddBCC
(
$address
[
'mail'
]);
}
}
}
}
...
@@ -54,7 +54,7 @@ function mimemail_phpmailer_send($message) {
...
@@ -54,7 +54,7 @@ function mimemail_phpmailer_send($message) {
$message
[
'to'
]
=
variable_get
(
'phpmailer_debug_email'
,
''
);
$message
[
'to'
]
=
variable_get
(
'phpmailer_debug_email'
,
''
);
$mail
->
AddAddress
(
$message
[
'to'
]);
$mail
->
AddAddress
(
$message
[
'to'
]);
}
}
unset
(
$message
[
'headers'
][
'C
C
'
],
$message
[
'headers'
][
'B
CC
'
]);
unset
(
$message
[
'headers'
][
'C
c
'
],
$message
[
'headers'
][
'B
cc
'
]);
$message
[
'headers'
][
'Date'
]
=
$mail
->
RFCDate
();
$message
[
'headers'
][
'Date'
]
=
$mail
->
RFCDate
();
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment