Rename global variable from MAIN_SOCIETE_UNSUBSCRIBE to

MAILING_EMAIL_UNSUBSCRIBE to be reliable on dolibarr implementation
Dolibarr · Apr 22, 2012 · 5ed77c8 · 5ed77c8
1 parent 07fc51b
commit 5ed77c8
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 7 deletions.
diff --git a/htdocs/admin/mailing.php b/htdocs/admin/mailing.php
@@ -50,7 +50,7 @@
 	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, "MAIN_SOCIETE_UNSUBSCRIBE",$checkread,'chaine',0,'',$conf->entity);
+	$res=dolibarr_set_const($db, "MAILING_EMAIL_UNSUBSCRIBE",$checkread,'chaine',0,'',$conf->entity);
 	if (! $res > 0) $error++;
 
  	if (! $error)
@@ -107,7 +107,7 @@
 $var=!$var;
 print '<tr '.$bc[$var].'><td>';
 print $langs->trans("ActivateCheckRead").'</td><td>';
-if ($conf->global->MAIN_SOCIETE_UNSUBSCRIBE==1)
+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');

diff --git a/htdocs/comm/mailing/fiche.php b/htdocs/comm/mailing/fiche.php
@@ -58,7 +58,7 @@
 		'__SIGNATURE__' => 'Signature',
 		'__PERSONALIZED__' => 'Personalized'
 );
-if ($conf->global->MAIN_SOCIETE_UNSUBSCRIBE)
+if ($conf->global->MAILING_EMAIL_UNSUBSCRIBE)
 {
 	$substitutionarray=array_merge(
 			$substitutionarray,
@@ -83,7 +83,7 @@
 		'__SIGNATURE__' => 'TESTSignature',
 		'__PERSONALIZED__' => 'TESTPersonalized'
 );
-if ($conf->global->MAIN_SOCIETE_UNSUBSCRIBE)
+if ($conf->global->MAILING_EMAIL_UNSUBSCRIBE)
 {
     $substitutionarrayfortest=array_merge(
     		$substitutionarrayfortest,
@@ -1046,7 +1046,7 @@
 			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
@@ -32,7 +32,7 @@
 
 $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
@@ -39,7 +39,7 @@
 $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');
 
 
 /*