diff --git a/htdocs/comm/mailing/card.php b/htdocs/comm/mailing/card.php
index cedd04c46c1..b8aa549aa83 100644
--- a/htdocs/comm/mailing/card.php
+++ b/htdocs/comm/mailing/card.php
@@ -840,7 +840,7 @@ else
if (! empty($conf->global->MAILING_SMTP_SETUP_EMAILS_FOR_QUESTIONS)) setEventMessages($langs->trans("MailSendSetupIs3", $conf->global->MAILING_SMTP_SETUP_EMAILS_FOR_QUESTIONS), null, 'warnings');
$_GET["action"]='';
}
- else if ($conf->global->MAILING_LIMIT_SENDBYWEB == '-1')
+ else if ($conf->global->MAILING_LIMIT_SENDBYWEB < 0)
{
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');
@@ -903,11 +903,11 @@ else
print '
| ';
print $langs->trans("TotalNbOfDistinctRecipients");
print ' | ';
- $nbemail = ($object->nbemail?$object->nbemail:img_warning('').' '.$langs->trans("NoTargetYet").'');
- if ($object->statut != 3 && is_numeric($nbemail))
+ $nbemail = ($object->nbemail?$object->nbemail:0);
+ if (is_numeric($nbemail))
{
$text='';
- if (! empty($conf->global->MAILING_LIMIT_SENDBYWEB) && $conf->global->MAILING_LIMIT_SENDBYWEB < $nbemail)
+ if ((! empty($conf->global->MAILING_LIMIT_SENDBYWEB) && $conf->global->MAILING_LIMIT_SENDBYWEB < $nbemail) && ($object->statut == 1 || $object->statut == 2))
{
if ($conf->global->MAILING_LIMIT_SENDBYWEB > 0)
{
@@ -915,9 +915,10 @@ else
}
else
{
- $text.=$langs->trans('NotEnoughPermissions');
+ $text.=$langs->trans('SendingFromWebInterfaceIsNotAllowed');
}
}
+ if (empty($nbemail)) $nbemail.=' '.img_warning('').' '.$langs->trans("NoTargetYet").'';
if ($text)
{
print $form->textwithpicto($nbemail,$text,1,'warning');
@@ -1008,7 +1009,11 @@ else
if (($object->statut == 1 || $object->statut == 2) && $object->nbemail > 0 && $user->rights->mailing->valider)
{
- if ($conf->global->MAILING_LIMIT_SENDBYWEB < 0 || (! empty($conf->global->MAIN_USE_ADVANCED_PERMS) && ! $user->rights->mailing->mailing_advance->send))
+ if ($conf->global->MAILING_LIMIT_SENDBYWEB < 0)
+ {
+ print ''.$langs->trans("SendMailing").'';
+ }
+ else if (! empty($conf->global->MAIN_USE_ADVANCED_PERMS) && ! $user->rights->mailing->mailing_advance->send)
{
print ''.$langs->trans("SendMailing").'';
}
@@ -1183,15 +1188,30 @@ else
print ' |
| ';
print $langs->trans("TotalNbOfDistinctRecipients");
print ' | ';
- $nbemail = ($object->nbemail?$object->nbemail:img_warning('').' '.$langs->trans("NoTargetYet").'');
- if (!empty($conf->global->MAILING_LIMIT_SENDBYWEB) && is_numeric($nbemail) && $conf->global->MAILING_LIMIT_SENDBYWEB < $nbemail)
+ $nbemail = ($object->nbemail?$object->nbemail:0);
+ if (is_numeric($nbemail))
{
- $text=$langs->trans('LimitSendingEmailing',$conf->global->MAILING_LIMIT_SENDBYWEB);
- print $form->textwithpicto($nbemail,$text,1,'warning');
- }
- else
- {
- print $nbemail;
+ $text='';
+ if ((! empty($conf->global->MAILING_LIMIT_SENDBYWEB) && $conf->global->MAILING_LIMIT_SENDBYWEB < $nbemail) && ($object->statut == 1 || $object->statut == 2))
+ {
+ if ($conf->global->MAILING_LIMIT_SENDBYWEB > 0)
+ {
+ $text.=$langs->trans('LimitSendingEmailing',$conf->global->MAILING_LIMIT_SENDBYWEB);
+ }
+ else
+ {
+ $text.=$langs->trans('SendingFromWebInterfaceIsNotAllowed');
+ }
+ }
+ if (empty($nbemail)) $nbemail.=' '.img_warning('').' '.$langs->trans("NoTargetYet").'';
+ if ($text)
+ {
+ print $form->textwithpicto($nbemail,$text,1,'warning');
+ }
+ else
+ {
+ print $nbemail;
+ }
}
print ' |
';
diff --git a/htdocs/comm/mailing/cibles.php b/htdocs/comm/mailing/cibles.php
index 7729c2737cc..e79b6e6c5d7 100644
--- a/htdocs/comm/mailing/cibles.php
+++ b/htdocs/comm/mailing/cibles.php
@@ -206,15 +206,30 @@ if ($object->fetch($id) >= 0)
print '| ';
print $langs->trans("TotalNbOfDistinctRecipients");
print ' | ';
- $nbemail = ($object->nbemail?$object->nbemail:'0');
- if (!empty($conf->global->MAILING_LIMIT_SENDBYWEB) && ($conf->global->MAILING_LIMIT_SENDBYWEB < $nbemail) && ($object->statut == 1 || $object->statut == 2))
+ $nbemail = ($object->nbemail?$object->nbemail:0);
+ if (is_numeric($nbemail))
{
- $text=$langs->trans('LimitSendingEmailing',$conf->global->MAILING_LIMIT_SENDBYWEB);
- print $form->textwithpicto($nbemail,$text,1,'warning');
- }
- else
- {
- print $nbemail;
+ $text='';
+ if ((! empty($conf->global->MAILING_LIMIT_SENDBYWEB) && $conf->global->MAILING_LIMIT_SENDBYWEB < $nbemail) && ($object->statut == 1 || $object->statut == 2))
+ {
+ if ($conf->global->MAILING_LIMIT_SENDBYWEB > 0)
+ {
+ $text.=$langs->trans('LimitSendingEmailing',$conf->global->MAILING_LIMIT_SENDBYWEB);
+ }
+ else
+ {
+ $text.=$langs->trans('SendingFromWebInterfaceIsNotAllowed');
+ }
+ }
+ if (empty($nbemail)) $nbemail.=' '.img_warning('').' '.$langs->trans("NoTargetYet").'';
+ if ($text)
+ {
+ print $form->textwithpicto($nbemail,$text,1,'warning');
+ }
+ else
+ {
+ print $nbemail;
+ }
}
print ' |
';
diff --git a/htdocs/langs/en_US/mails.lang b/htdocs/langs/en_US/mails.lang
index 4be167d3061..8e2b093fdc2 100644
--- a/htdocs/langs/en_US/mails.lang
+++ b/htdocs/langs/en_US/mails.lang
@@ -87,6 +87,7 @@ MailingModuleDescEmailsFromFile=Emails from file
MailingModuleDescEmailsFromUser=Emails input by user
MailingModuleDescDolibarrUsers=Users with Emails
MailingModuleDescThirdPartiesByCategories=Third parties (by categories)
+SendingFromWebInterfaceIsNotAllowed=Sending from web interface is not allowed.
# Libelle des modules de liste de destinataires mailing
LineInFile=Line %s in file