Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
D
dolibarr
Manage
Activity
Members
Code
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Deploy
Releases
Container registry
Model registry
Analyze
Contributor analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
GitLab community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Software_Artifact_Infrastructure_Repository
dolibarr
Commits
ef8b5557
Commit
ef8b5557
authored
11 years ago
by
Laurent Destailleur
Browse files
Options
Downloads
Patches
Plain Diff
Fix: When using option MAIN_MAIL_ALLOW_SENDMAIL_F, a mail was sent to
sender.
parent
d903db6a
No related branches found
No related tags found
No related merge requests found
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
ChangeLog
+1
-0
1 addition, 0 deletions
ChangeLog
htdocs/core/class/CMailFile.class.php
+1
-1
1 addition, 1 deletion
htdocs/core/class/CMailFile.class.php
with
2 additions
and
1 deletion
ChangeLog
+
1
−
0
View file @
ef8b5557
...
...
@@ -3,6 +3,7 @@ English Dolibarr ChangeLog
--------------------------------------------------------------
***** ChangeLog for 3.5.4 compared to 3.5.3 *****
Fix: When using option MAIN_MAIL_ALLOW_SENDMAIL_F, a mail was sent to sender.
Fix: Question about warehouse must not be done when module stock is disabled.
Fix: Option STOCK_SUPPORTS_SERVICES was not correctly implemented
(missing test at some places).
...
...
This diff is collapsed.
Click to expand it.
htdocs/core/class/CMailFile.class.php
+
1
−
1
View file @
ef8b5557
...
...
@@ -404,7 +404,7 @@ class CMailFile
// le return-path dans les header ne fonctionne pas avec tous les MTA
// Le passage par -f est donc possible si la constante MAIN_MAIL_ALLOW_SENDMAIL_F est definie.
// La variable definie pose des pb avec certains sendmail securisee (option -f refusee car dangereuse)
$bounce
.
=
(
$bounce
?
' '
:
''
)
.
(
!
empty
(
$conf
->
global
->
MAIN_MAIL_ERRORS_TO
)
?
'-f'
.
$conf
->
global
->
MAIN_MAIL_ERRORS_TO
:
(
$this
->
addr_from
!=
''
?
'-f'
.
$this
->
addr_from
:
''
)
);
$bounce
.
=
(
$bounce
?
' '
:
''
)
.
(
!
empty
(
$conf
->
global
->
MAIN_MAIL_ERRORS_TO
)
?
'-f'
.
$this
->
getValidAddress
(
$conf
->
global
->
MAIN_MAIL_ERRORS_TO
,
2
)
:
(
$this
->
addr_from
!=
''
?
'-f'
.
$this
->
getValidAddress
(
$this
->
addr_from
,
2
)
:
''
)
);
}
if
(
!
empty
(
$conf
->
global
->
MAIN_MAIL_SENDMAIL_FORCE_BA
))
// To force usage of -ba option. This option tells sendmail to read From: or Sender: to setup sender
{
...
...
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