diff --git a/htdocs/admin/mailing.php b/htdocs/admin/mailing.php
index bad34ac83b2..4aa0ea209f7 100644
--- a/htdocs/admin/mailing.php
+++ b/htdocs/admin/mailing.php
@@ -49,6 +49,8 @@ if ($action == 'setvalue' && $user->admin)
if (! $res > 0) $error++;
$res=dolibarr_set_const($db, "MAILING_EMAIL_ERRORSTO",$mailerror,'chaine',0,'',$conf->entity);
if (! $res > 0) $error++;
+ $res=dolibarr_set_const($db, "MAILING_EMAIL_UNSUBSCRIBE",$checkread,'chaine',0,'',$conf->entity);
+ if (! $res > 0) $error++;
if (! $error)
{
@@ -101,6 +103,25 @@ print '';
+$var=!$var;
+print '
| ';
+print $langs->trans("ActivateCheckRead").' | ';
+if ($conf->global->MAILING_EMAIL_UNSUBSCRIBE==1)
+{
+ print '';
+ print img_picto($langs->trans("Enabled"),'switch_on');
+ print '';
+}
+else
+{
+ print '';
+ print img_picto($langs->trans("Disabled"),'switch_off');
+ print '';
+}
+print ' |
';
+
+
+
print ' |
';
print '';
diff --git a/htdocs/comm/mailing/fiche.php b/htdocs/comm/mailing/fiche.php
index 5f02441159c..d0708c96db5 100644
--- a/htdocs/comm/mailing/fiche.php
+++ b/htdocs/comm/mailing/fiche.php
@@ -57,7 +57,7 @@ $substitutionarray=array(
'__SIGNATURE__' => 'Signature',
'__PERSONALIZED__' => 'Personalized'
);
-if ($conf->global->MAIN_SOCIETE_UNSUBSCRIBE)
+if ($conf->global->MAILING_EMAIL_UNSUBSCRIBE)
{
$substitutionarray=array_merge(
$substitutionarray,
@@ -81,7 +81,7 @@ $substitutionarrayfortest=array(
'__SIGNATURE__' => 'TESTSignature',
'__PERSONALIZED__' => 'TESTPersonalized'
);
-if ($conf->global->MAIN_SOCIETE_UNSUBSCRIBE)
+if ($conf->global->MAILING_EMAIL_UNSUBSCRIBE)
{
$substitutionarrayfortest=array_merge(
$substitutionarrayfortest,
@@ -1043,7 +1043,7 @@ else
print '
'.$langs->trans("CommonSubstitutions").':
';
print '__ID__ = '.$langs->trans("IdRecord").'
';
print '__EMAIL__ = '.$langs->trans("EMail").'
';
- if ($conf->global->MAIN_SOCIETE_UNSUBSCRIBE)
+ if ($conf->global->MAILING_EMAIL_UNSUBSCRIBE)
{
print '__CHECK_READ__ = '.$langs->trans("CheckRead").'
';
print '__UNSUSCRIBE__ = '.$langs->trans("MailUnsubcribe").'
';
diff --git a/htdocs/public/emailing/mailing-read.php b/htdocs/public/emailing/mailing-read.php
index 0576b7dd614..91267cd6628 100644
--- a/htdocs/public/emailing/mailing-read.php
+++ b/htdocs/public/emailing/mailing-read.php
@@ -32,7 +32,7 @@ require("../../main.inc.php");
$id=GETPOST('tag');
-if (empty($conf->global->MAIN_SOCIETE_UNSUBSCRIBE)) accessforbidden('Option not enabled');
+if (empty($conf->global->MAILING_EMAIL_UNSUBSCRIBE)) accessforbidden('Option not enabled');
/*
diff --git a/htdocs/public/emailing/mailing-unsubscribe.php b/htdocs/public/emailing/mailing-unsubscribe.php
index 3d361b10e3c..ac261268a58 100644
--- a/htdocs/public/emailing/mailing-unsubscribe.php
+++ b/htdocs/public/emailing/mailing-unsubscribe.php
@@ -39,7 +39,7 @@ $langs->load("mails");
$id=GETPOST('tag');
$unsuscrib=GETPOST('unsuscrib');
-if (empty($conf->global->MAIN_SOCIETE_UNSUBSCRIBE)) accessforbidden('Option not enabled');
+if (empty($conf->global->MAILING_EMAIL_UNSUBSCRIBE)) accessforbidden('Option not enabled');
/*