From d9b74471d0e4236557f44483c747e910a3eb7bcd Mon Sep 17 00:00:00 2001
From: Andrew Engelbrecht <andrew@fsf.org>
Date: Mon, 18 Sep 2017 21:11:43 -0400
Subject: [PATCH] Use double opt-in when signing up to FSS list

I've switched over the two mailing list signup forms to use a profile
that performs double opt-in for both the LibrePlanet Announce group and
the Free Software Supporter group.
---
 2018/includes/join-list.html    | 11 +++++------
 2018/includes/live_sidebar.html | 28 ++++++++++++++--------------
 2 files changed, 19 insertions(+), 20 deletions(-)

diff --git a/2018/includes/join-list.html b/2018/includes/join-list.html
index 1c684749..1c5c7b12 100644
--- a/2018/includes/join-list.html
+++ b/2018/includes/join-list.html
@@ -1,7 +1,7 @@
 <!-- start of signup form-->
 <div id="lp-signup-block" class="col-sm-offset-1 col-sm-5 col-xs-12">
   <form class="lp-signup"
-        action="https://my.fsf.org/civicrm/profile/create?gid=285&amp;reset=1"
+        action="https://my.fsf.org/civicrm/profile/create?gid=507&amp;reset=1"
         method="post" name="Edit" id="Edit">
     <div>
       <input name="postURL" type="hidden"
@@ -34,13 +34,12 @@
           </span>
         </div>
       </div>
-      <div id="editrow-custom_79">
+      <div id="editrow-group">
         <div class="checkbox">
-          <input
-             type="hidden" name="custom_79[yes]" value="" />
+          <input type="hidden" name="group[25]" value="" />
           <label class="lp-label-news">
-            <input id="custom_79_yes"
-                   name="custom_79[yes]" type="checkbox" value="1" checked="checked"
+            <input id="group_25"
+                   name="group[25]" type="checkbox" value="1" checked="checked"
                    class="checkbox" />
 			<span class="text-muted">Also join the FSF's newsletter</span>
           </label>
diff --git a/2018/includes/live_sidebar.html b/2018/includes/live_sidebar.html
index a05b60c0..41d18713 100755
--- a/2018/includes/live_sidebar.html
+++ b/2018/includes/live_sidebar.html
@@ -35,21 +35,21 @@
   </div>
   <div class="panel-body">
 	<p>Sign up to receive updates about LibrePlanet.</p>
-	<form action="https://my.fsf.org/civicrm/profile/create?gid=285&amp;reset=1"
+	<form action="https://my.fsf.org/civicrm/profile/create?gid=507&amp;reset=1"
           class="" method="post" name="Edit" id="Edit-live-sidebar" >
 
       <div>
 		<input name="entryURL" type="hidden"
-	           value="https://my.fsf.org/civicrm/profile/create?gid=285&amp;reset=1/update?action=update&amp;amp;id=285&amp;amp;reset=1&amp;amp;context=field"
+	           value="https://my.fsf.org/civicrm/profile/create?gid=507&amp;reset=1/update?action=update&amp;amp;id=507&amp;amp;reset=1&amp;amp;context=field"
 	           />
 		<input name="postURL" type="hidden" value="https://libreplanet.org/2018/live/confirmation.html" />
 		<input name="cancelURL" type="hidden"
-	           value="https://my.fsf.org/civicrm/profile?reset=1&amp;gid=285" />
+	           value="https://my.fsf.org/civicrm/profile?reset=1&amp;gid=507" />
 		<input name="add_to_group" type="hidden" value="619" />
 		<input name="_qf_default" type="hidden" value="Edit:cancel" />
       </div>
 
-      <div class="crm-profile-name-interested_in_libreplanet_285">
+      <div class="crm-profile-name-interested_in_libreplanet_507">
 
 		<div id="crm-container-live-sidebar" class="crm-container crm-public" lang="en"
 			 xml:lang="en">
@@ -62,16 +62,16 @@
 					class="form-control" />
 	      </div>
 
-	      <div id="editrow-custom_79-live-siderbar" class="form-group">
-			<div class="checkbox">
-		      <input type="hidden" name="custom_79[yes]" value="" />
-		      <input data-crm-custom="Simple_mailing_list_signup:Would_you_like_to_join_our_mailing_list_"
-					 style="margin-left: 0 !important"   id="custom_79_yes-live-sidebar" name="custom_79[yes]" type="checkbox" value="1"
-					 checked="checked"  />
-		      <label for="custom_79_yes" class="control-label">Follow
-				the FSF by email!</label>
-			</div>
-		  </div>
+	      <div id="editrow-group" class="form-group">
+		<div class="checkbox">
+		  <input type="hidden" name="group[25]" value="" />
+		  <input id="group_25-live-sidebar"
+			 style="margin-left: 0 !important"
+			 name="group[25]" type="checkbox" value="1"
+			 checked="checked" />
+		  <label for="group_25" class="control-label">Follow the FSF by email!</label>
+		</div>
+	      </div>
 
 	      <div class="form-group">
 			<input class="btn btn-default btn-block"
-- 
2.25.1