diff --git a/htdocs/admin/mailing.php b/htdocs/admin/mailing.php
index 1b0df5843f3..7988c0dab7f 100644
--- a/htdocs/admin/mailing.php
+++ b/htdocs/admin/mailing.php
@@ -132,6 +132,7 @@ print '
';
print '';
print '| '.$langs->trans("Parameter").' | ';
print ''.$langs->trans("Value").' | ';
+print ''.$langs->trans("Example").' | ';
print "
\n";
print '| ';
@@ -140,7 +141,8 @@ print ' |
';
+print ''.dol_escape_htmltag(($mysoc->name ? $mysoc->name : 'MyName').' ').' | ';
+print '';
print '| ';
print $langs->trans("MailingEMailError").' | ';
@@ -148,12 +150,14 @@ print ' |
';
+print 'webmaster@example.com> | ';
+print '';
print '| ';
print $langs->trans("MailingDelay").' | ';
print '';
-print ' |
';
+print ' | ';
+print '';
// Constant to add salt into the unsubscribe and check read tag.
@@ -165,15 +169,17 @@ print '';
+print ' | ';
+print '';
// default blacklist from mailing
print '';
-print '| ' . $langs->trans("DefaultBlacklistMailingStatus") . ' | ';
+print '' . $langs->trans("DefaultBlacklistMailingStatus", $langs->transnoentitiesnoconv("No_Email")) . ' | ';
print '';
-$blacklist_setting=array(0=>$langs->trans('No'),1=>$langs->trans('Yes'),-1=>$langs->trans('DefaultStatusEmptyMandatory'));
+$blacklist_setting=array(0=>$langs->trans('No'), 1=>$langs->trans('Yes'), 2=>$langs->trans('DefaultStatusEmptyMandatory'));
print $form->selectarray("MAILING_CONTACT_DEFAULT_BULK_STATUS", $blacklist_setting, $conf->global->MAILING_CONTACT_DEFAULT_BULK_STATUS);
print ' | ';
+print ' | ';
print '
';
@@ -181,7 +187,8 @@ if (!empty($conf->use_javascript_ajax) && $conf->global->MAIN_FEATURES_LEVEL >=
print '| ';
print $langs->trans("MailAdvTargetRecipients").' | ';
print ajax_constantonoff('EMAILING_USE_ADVANCED_SELECTOR');
- print ' |
';
+ print ' | ';
+ print '';
}
print '
';
diff --git a/htdocs/contact/card.php b/htdocs/contact/card.php
index 469869f00e9..2f6b717a2dc 100644
--- a/htdocs/contact/card.php
+++ b/htdocs/contact/card.php
@@ -225,7 +225,7 @@ if (empty($reshook)) {
$action = 'create';
}
- if (!empty($conf->mailing->enabled) && $conf->global->MAILING_CONTACT_DEFAULT_BULK_STATUS == -1 && $object->no_email == -1 && !empty($object->email)) {
+ if (!empty($conf->mailing->enabled) && $conf->global->MAILING_CONTACT_DEFAULT_BULK_STATUS == 2 && $object->no_email == -1 && !empty($object->email)) {
$error++;
$errors[] = $langs->trans("ErrorFieldRequired", $langs->transnoentities("No_Email"));
$action = 'create';
@@ -317,7 +317,7 @@ if (empty($reshook)) {
$action = 'edit';
}
- if (!empty($conf->mailing->enabled) && $conf->global->MAILING_CONTACT_DEFAULT_BULK_STATUS == -1 && GETPOST("no_email", "int") == -1 && !empty(GETPOST('email', 'custom', 0, FILTER_SANITIZE_EMAIL))) {
+ if (!empty($conf->mailing->enabled) && $conf->global->MAILING_CONTACT_DEFAULT_BULK_STATUS == 2 && GETPOST("no_email", "int") == -1 && !empty(GETPOST('email', 'custom', 0, FILTER_SANITIZE_EMAIL))) {
$error++;
$errors[] = $langs->trans("ErrorFieldRequired", $langs->transnoentities("No_Email"));
$action = 'edit';
@@ -780,7 +780,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
// Unsubscribe
if (!empty($conf->mailing->enabled)) {
- if ($conf->use_javascript_ajax && $conf->global->MAILING_CONTACT_DEFAULT_BULK_STATUS == -1) {
+ if ($conf->use_javascript_ajax && $conf->global->MAILING_CONTACT_DEFAULT_BULK_STATUS == 2) {
print "\n".'