From 32077cfb91fa52aa9bde7a7f694bfb0c22bf79fa Mon Sep 17 00:00:00 2001
From: atif-shaikh <shaikh388@gmail.com>
Date: Tue, 25 Nov 2014 18:42:09 +0530
Subject: [PATCH] CRM-11302 - Enhance unsubscribe form to reduce likelihood of
 accidental unsubscribes

https://issues.civicrm.org/jira/browse/CRM-11302
---
 CRM/Mailing/Form/Unsubscribe.php           |  6 +++
 templates/CRM/Mailing/Form/Unsubscribe.tpl | 52 +++++++++++++---------
 2 files changed, 37 insertions(+), 21 deletions(-)

diff --git a/CRM/Mailing/Form/Unsubscribe.php b/CRM/Mailing/Form/Unsubscribe.php
index e19e5581b1..b164f22ee5 100644
--- a/CRM/Mailing/Form/Unsubscribe.php
+++ b/CRM/Mailing/Form/Unsubscribe.php
@@ -70,6 +70,12 @@ class CRM_Mailing_Form_Unsubscribe extends CRM_Core_Form {
         $groupExist = TRUE;
       }
     }
+    if (!$groupExist) {
+      $statusMsg = ts('Email: %1 has been successfully unsubscribed from this Mailing List/Group.',
+        array(1 => $email)
+      );
+      CRM_Core_Session::setStatus( $statusMsg, '', 'fail' );
+    }
     $this->assign('groupExist', $groupExist);
 
   }
diff --git a/templates/CRM/Mailing/Form/Unsubscribe.tpl b/templates/CRM/Mailing/Form/Unsubscribe.tpl
index 40d0038484..723098fee1 100644
--- a/templates/CRM/Mailing/Form/Unsubscribe.tpl
+++ b/templates/CRM/Mailing/Form/Unsubscribe.tpl
@@ -23,27 +23,37 @@
  | see the CiviCRM license FAQ at http://civicrm.org/licensing        |
  +--------------------------------------------------------------------+
 *}
-
-<div class="crm-block crm-form-block crm-miscellaneous-form-block">
-
-    <p>{ts}You are requesting to unsubscribe this email address:{/ts}</p>
-    <h3>{$email_masked}</h3>
-
-    <p>{ts}If this is not your email address, there is no need to do anything. You have <i><b>not</b></i> been added to any mailing lists. If this is your email address and you <i><b>wish to unsubscribe</b></i> please enter your email address below for verification purposes:{/ts}</p>
-
-    <table class="form-layout">
-      <tbody>
-      <tr>
-        <td class="label">{$form.email_confirm.label}</td>
-        <td class="content">{$form.email_confirm.html}
-      </tr>
-      </tbody>
+<div>
+  {if $groupExist}
+    <div class="messages status no-popup">
+      {ts}Are you sure you want to be removed from the mailing list(s) shown below:{/ts}<br/>
+    </div>
+    <table class="selector" style="width: auto; margin-top: 20px;">
+      {counter start=0 skip=1 print=false}
+      {foreach from=$groups item=group}
+        <tr class="{cycle values="odd-row,even-row"}">
+          <td><strong>{$group.title}</strong></td>
+          <td>&nbsp;&nbsp;{$group.description}&nbsp;</td>
+        </tr>
+      {/foreach}
     </table>
-
-  <div class="crm-submit-buttons">
-    {include file="CRM/common/formButtons.tpl" location="bottom"}
-  </div>
-
-<br/>
+    <div class="crm-block crm-form-block crm-miscellaneous-form-block">
+      <p>{ts}You are requesting to unsubscribe this email address:{/ts}</p>
+      <h3>{$email_masked}</h3>
+      <p>{ts}If this is not your email address, there is no need to do anything. You have <i><b>not</b></i> been added to any mailing lists. If this is your email address and you <i><b>wish to unsubscribe</b></i> please enter your email address below for verification purposes:{/ts}</p>
+      <table class="form-layout">
+        <tbody>
+          <tr>
+            <td class="label">{$form.email_confirm.label}</td>
+            <td class="content">{$form.email_confirm.html}</td>
+          </tr>
+        </tbody>
+      </table>
+      <div class="crm-submit-buttons">
+        {include file="CRM/common/formButtons.tpl" location="bottom"}
+      </div>
+      <br/>
+    </div>
+  {/if}
 </div>
 
-- 
2.25.1