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
31818e88
Commit
31818e88
authored
8 years ago
by
Laurent Destailleur
Browse files
Options
Downloads
Patches
Plain Diff
Fix missing translation
parent
3a2f44ad
No related branches found
No related tags found
No related merge requests found
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
htdocs/comm/mailing/card.php
+5
-5
5 additions, 5 deletions
htdocs/comm/mailing/card.php
with
5 additions
and
5 deletions
htdocs/comm/mailing/card.php
+
5
−
5
View file @
31818e88
...
...
@@ -755,7 +755,7 @@ else
// MAILING_NO_USING_PHPMAIL may be defined or not.
// MAILING_LIMIT_SENDBYWEB is always defined to something != 0 (-1=forbidden).
// MAILING_LIMIT_SENDBYCLI may be defined ot not (-1=forbidden, 0=no limit).
// MAILING_LIMIT_SENDBYCLI may be defined ot not (-1=forbidden, 0
or undefined
=no limit).
if
(
!
empty
(
$conf
->
global
->
MAILING_NO_USING_PHPMAIL
)
&&
$sendingmode
==
'mail'
)
{
// EMailing feature may be a spam problem, so when you host several users/instance, having this option may force each user to use their own SMTP agent.
...
...
@@ -769,8 +769,8 @@ else
}
else
if
(
$conf
->
global
->
MAILING_LIMIT_SENDBYWEB
==
'-1'
)
{
if
(
!
empty
(
$conf
->
global
->
MAILING_LIMIT_WARNING_PHPMAIL
)
&&
$sendingmode
==
'mail'
)
setEventMessages
(
$conf
->
global
->
MAILING_LIMIT_WARNING_PHPMAIL
,
null
,
'warnings'
);
if
(
!
empty
(
$conf
->
global
->
MAILING_LIMIT_WARNING_NOPHPMAIL
)
&&
$sendingmode
!=
'mail'
)
setEventMessages
(
$conf
->
global
->
MAILING_LIMIT_WARNING_NOPHPMAIL
,
null
,
'warnings'
);
if
(
!
empty
(
$conf
->
global
->
MAILING_LIMIT_WARNING_PHPMAIL
)
&&
$sendingmode
==
'mail'
)
setEventMessages
(
$
langs
->
transnoentitiesnoconv
(
$
conf
->
global
->
MAILING_LIMIT_WARNING_PHPMAIL
)
,
null
,
'warnings'
);
if
(
!
empty
(
$conf
->
global
->
MAILING_LIMIT_WARNING_NOPHPMAIL
)
&&
$sendingmode
!=
'mail'
)
setEventMessages
(
$
langs
->
transnoentitiesnoconv
(
$
conf
->
global
->
MAILING_LIMIT_WARNING_NOPHPMAIL
)
,
null
,
'warnings'
);
// The feature is forbidden from GUI, we show just message to use from command line.
setEventMessages
(
$langs
->
trans
(
"MailingNeedCommand"
),
null
,
'warnings'
);
...
...
@@ -783,8 +783,8 @@ else
}
else
{
if
(
!
empty
(
$conf
->
global
->
MAILING_LIMIT_WARNING_PHPMAIL
)
&&
$sendingmode
==
'mail'
)
setEventMessages
(
$conf
->
global
->
MAILING_LIMIT_WARNING_PHPMAIL
,
null
,
'warnings'
);
if
(
!
empty
(
$conf
->
global
->
MAILING_LIMIT_WARNING_NOPHPMAIL
)
&&
$sendingmode
!=
'mail'
)
setEventMessages
(
$conf
->
global
->
MAILING_LIMIT_WARNING_NOPHPMAIL
,
null
,
'warnings'
);
if
(
!
empty
(
$conf
->
global
->
MAILING_LIMIT_WARNING_PHPMAIL
)
&&
$sendingmode
==
'mail'
)
setEventMessages
(
$
langs
->
transnoentitiesnoconv
(
$
conf
->
global
->
MAILING_LIMIT_WARNING_PHPMAIL
)
,
null
,
'warnings'
);
if
(
!
empty
(
$conf
->
global
->
MAILING_LIMIT_WARNING_NOPHPMAIL
)
&&
$sendingmode
!=
'mail'
)
setEventMessages
(
$
langs
->
transnoentitiesnoconv
(
$
conf
->
global
->
MAILING_LIMIT_WARNING_NOPHPMAIL
)
,
null
,
'warnings'
);
$text
=
''
;
if
(
$conf
->
global
->
MAILING_LIMIT_SENDBYCLI
>=
0
)
...
...
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