From 58df839271d178391fc0cb356b8438cdf8bc5308 Mon Sep 17 00:00:00 2001
From: FHenry <florian.henry.mail@gmail.com>
Date: Wed, 25 Apr 2012 18:36:58 +0200
Subject: [PATCH] Rename global variable from MAIN_SOCIETE_UNSUBSCRIBE to
 MAILING_EMAIL_UNSUBSCRIBE to be reliable on dolibarr implementation

Conflicts:
	htdocs/admin/mailing.php
---
 htdocs/admin/mailing.php                      | 21 +++++++++++++++++++
 htdocs/comm/mailing/fiche.php                 |  6 +++---
 htdocs/public/emailing/mailing-read.php       |  2 +-
 .../public/emailing/mailing-unsubscribe.php   |  2 +-
 4 files changed, 26 insertions(+), 5 deletions(-)

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 '<input size="32" type="text" name="MAILING_EMAIL_ERRORSTO" value="'.$conf
 if (!empty($conf->global->MAILING_EMAIL_ERRORSTO) && ! isValidEmail($conf->global->MAILING_EMAIL_ERRORSTO)) print ' '.img_warning($langs->trans("BadEMail"));
 print '</td></tr>';
 
+$var=!$var;
+print '<tr '.$bc[$var].'><td>';
+print $langs->trans("ActivateCheckRead").'</td><td>';
+if ($conf->global->MAILING_EMAIL_UNSUBSCRIBE==1)
+{
+	print '<a href="'.$_SERVER["PHP_SELF"].'?action=setvalue&value=0">';
+	print img_picto($langs->trans("Enabled"),'switch_on');
+	print '</a>';
+}
+else
+{
+	print '<a href="'.$_SERVER["PHP_SELF"].'?action=setvalue&value=1">';
+	print img_picto($langs->trans("Disabled"),'switch_off');
+	print '</a>';
+}
+print '</td></tr>';
+
+
+
 print '<tr><td colspan="3" align="center"><input type="submit" class="button" value="'.$langs->trans("Modify").'"></td></tr>';
 print '</table></form>';
 
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 '<br><i>'.$langs->trans("CommonSubstitutions").':<br>';
 			print '__ID__ = '.$langs->trans("IdRecord").'<br>';
 			print '__EMAIL__ = '.$langs->trans("EMail").'<br>';
-            if ($conf->global->MAIN_SOCIETE_UNSUBSCRIBE)
+            if ($conf->global->MAILING_EMAIL_UNSUBSCRIBE)
             {
     			print '__CHECK_READ__ = '.$langs->trans("CheckRead").'<br>';
 	    		print '__UNSUSCRIBE__ = '.$langs->trans("MailUnsubcribe").'<br>';
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');
 
 
 /*