From owner-freebsd-doc  Tue Mar  5  8:20:17 2002
Delivered-To: freebsd-doc@freebsd.org
Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21])
	by hub.freebsd.org (Postfix) with ESMTP id 0230D37B417
	for <freebsd-doc@freebsd.org>; Tue,  5 Mar 2002 08:20:01 -0800 (PST)
Received: (from gnats@localhost)
	by freefall.freebsd.org (8.11.6/8.11.6) id g25GK0398025;
	Tue, 5 Mar 2002 08:20:00 -0800 (PST)
	(envelope-from gnats)
Received: from relay3-gui.server.ntli.net (relay3-gui.server.ntli.net [194.168.4.200])
	by hub.freebsd.org (Postfix) with ESMTP id 0110037B402
	for <FreeBSD-gnats-submit@freebsd.org>; Tue,  5 Mar 2002 08:17:58 -0800 (PST)
Received: from pc4-card4-0-cust162.cdf.cable.ntl.com
	([80.4.14.162] helo=rhadamanth.private.submonkey.net ident=mailnull)
	by relay3-gui.server.ntli.net with esmtp (Exim 3.03 #2)
	id 16iHdU-0002Vq-00
	for FreeBSD-gnats-submit@freebsd.org; Tue, 05 Mar 2002 16:17:56 +0000
Received: from setantae by rhadamanth.private.submonkey.net with local (Exim 3.35 #1)
	id 16iHdI-0001D3-00
	for FreeBSD-gnats-submit@freebsd.org; Tue, 05 Mar 2002 16:17:44 +0000
Message-Id: <E16iHdI-0001D3-00@rhadamanth.private.submonkey.net>
Date: Tue, 05 Mar 2002 16:17:44 +0000
From: Ceri <setantae@submonkey.net>
Reply-To: Ceri <setantae@submonkey.net>
To: FreeBSD-gnats-submit@freebsd.org
X-Send-Pr-Version: 3.113
Subject: docs/35563: [Patch] Stop asking people to give us their postal address for no reason
Sender: owner-freebsd-doc@FreeBSD.ORG
Precedence: bulk
List-ID: <freebsd-doc.FreeBSD.ORG>
List-Archive: <http://docs.freebsd.org/mail/> (Web Archive)
List-Help: <mailto:majordomo@FreeBSD.ORG?subject=help> (List Instructions)
List-Subscribe: <mailto:majordomo@FreeBSD.ORG?subject=subscribe%20freebsd-doc>
List-Unsubscribe: <mailto:majordomo@FreeBSD.ORG?subject=unsubscribe%20freebsd-doc>
X-Loop: FreeBSD.org


>Number:         35563
>Category:       docs
>Synopsis:       [Patch] Stop asking people to give us their postal address for no reason
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-doc
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Tue Mar 05 08:20:00 PST 2002
>Closed-Date:
>Last-Modified:
>Originator:     Ceri <setantae@submonkey.net>
>Release:        FreeBSD 4.5-STABLE i386
>Organization:
>Environment:
System: FreeBSD rhadamanth.private.submonkey.net 4.5-STABLE FreeBSD 4.5-STABLE #0: Thu Feb 28 17:50:57 GMT 2002 setantae@rhadamanth.private.submonkey.net:/usr/obj/usr/src/sys/RHADAMANTH i386


	
>Description:

The newsletter is dead (jkh confirmed this to me).
http://www.freebsd.org/publish.html still encourages people to visit
http://www.freebsd.org/register.html and enter their details to receive
the next edition of the newsletter by post.
This is never going to happen, and nik@FreeBSD.org tells me that he
knows of no reason why this information should continue to be collected.

This patch kills mention of registering for the newsletter, and replaces
the registration page with a simple form that merely subscribes and/or
unsubscribes users to the announce and security-notification lists.

Ceri

>How-To-Repeat:
	
Visit http://www.FreeBSD.org/publish.html and try and sign up to receive
the newsletter.

>Fix:

diff -ru www.orig/en/cgi/reg.cgi www/en/cgi/reg.cgi
--- www.orig/en/cgi/reg.cgi	Mon Apr  3 09:45:51 2000
+++ www/en/cgi/reg.cgi	Tue Mar  5 15:09:32 2002
@@ -4,6 +4,9 @@
 #
 # $FreeBSD: www/en/cgi/reg.cgi,v 1.7 2000/04/03 08:45:51 phantom Exp $
 
+sub do_header;
+sub close_body;
+
 $mailprog = '/usr/sbin/sendmail';
 
 print "Content-type: text/html\n\n";
@@ -45,63 +48,66 @@
 $value
 .
 
-# Open the mail file and write to it
-open (MAIL, "|$mailprog $recipient") || die "$mailprog not available.\n";
-print MAIL "From: $FORM{'emaila'}\n";
-print MAIL "Subject: FreeBSD Registration from $FORM{'emaila'}\n\n";
-
-print MAIL "<entry>\n";
-print MAIL "<first>$FORM{'First'}</first>\n";
-print MAIL "<last>$FORM{'Last'}</last>\n";
-print MAIL "<email>$FORM{'emaila'}</email>\n";
-print MAIL "<address>$FORM{'Address'}</address>\n";
-print MAIL "<city>$FORM{'City'}</city>\n";
-print MAIL "<state>$FORM{'State'}</state>\n";
-print MAIL "<zip>$FORM{'Zip'}</zip>\n";
-print MAIL "<options commerce_email=$FORM{'commerce_email'}";
-print MAIL " announce=$FORM{'announce'} newsletter=$FORM{'newsletter'}>";
-print MAIL " </options>\n";
-print MAIL "<version>$FORM{'version'}</version>\n";
-print MAIL "</entry>\n";
-print MAIL "\n";
-close (MAIL);
+my ($sub_announce, $sub_security, $unsub_announce, $unsub_security) = ();
+$sub_announce = 1 if $FORM{"announce"} eq "yes";
+$unsub_announce = 1 if $FORM{"announce"} eq "no";
+$sub_security = 1 if $FORM{"security-notifications"} eq "yes";
+$unsub_security = 1 if $FORM{"security-notifications"} eq "no";
 
 # Open the mail file and write to it
 # if user is subscribing to maillist 
-if ($FORM{"announce"} eq "yes") {
+# which they should be, otherwise why did they hit submit ?
+if ( $sub_announce || $sub_security || $unsub_announce || $unsub_security ) {
 open (MAIL, "|$mailprog $sub_recipient") || die "$mailprog not available.\n";
 print MAIL "From: $FORM{'emaila'}\n";
-print MAIL "Subject: subscribe freebsd-announce $FORM{'emaila'}\n\n";
+print MAIL "Subject: \n\n";
     
-print MAIL "subscribe freebsd-announce $FORM{'emaila'}\n";
+$sub_announce and print MAIL "subscribe freebsd-announce $FORM{'emaila'}\n";
+$unsub_announce and print MAIL "unsubscribe freebsd-announce $FORM{'emaila'}\n";
+$sub_security and print MAIL "subscribe freebsd-security-notifications $FORM{'emaila'}\n";
+$unsub_security and print MAIL "unsubscribe freebsd-security-notifications $FORM{'emaila'}\n";
 
 close (MAIL);
+} else {
+  &do_header("No action");
+  print "<P>No action chosen, hence no action taken.</p>";
+  &close_body;
+  exit;
 }
-print "<HTML>\n";
-print "<HEAD>\n";
-print "<TITLE>Mail Sent</TITLE>\n";
-print "</HEAD>\n";
-print "<BODY BGCOLOR=\"\#FFFFFF\" TEXT=\"\#660000\">\n";
-print "<FONT SIZE=4> \n";
-print "<CENTER>\n";
-print "<IMG SRC=\"..\/gifs\/bar.gif\" BORDER=0 USEMAP=\"\#bar\">\n";
-print "<MAP NAME=\"bar\">\n";
-print "<AREA SHAPE=\"RECT\" COORDS=\"1,1,111,31\" HREF=\"../index.html\">\n";
-print "<AREA SHAPE=\"RECT\" COORDS=\"112,11,196,31\" HREF=\"../ports/index.html\">\n";
-print "<AREA SHAPE=\"RECT\" COORDS=\"196,12,257,33\" HREF=\"../support.html\">\n";
-print "<AREA SHAPE=\"RECT\" COORDS=\"256,12,365,33\" HREF=\"../docs.html\">\n";
-print "<AREA SHAPE=\"RECT\" COORDS=\"366,13,424,32\" HREF=\"../commercial.html\">\n";
-print "<AREA SHAPE=\"RECT\" COORDS=\"425,16,475,32\" HREF=\"../search/search.html\">\n";
-print "<AREA SHAPE=\"RECT\" COORDS=\"477,16,516,33\" HREF=\"../search/index-site.html\">\n";
-print "<AREA SHAPE=\"RECT\" COORDS=\"516,15,562,33\" HREF=\"../index.html\">\n";
-print "<AREA SHAPE=\"RECT\" COORDS=\"0,0,564,32\" HREF=\"../index.html\">\n";
-print "</MAP>\n";
-print "<P>Thank you, $FORM{'First'} $FORM{'Last'}, for your registration.\n";
-print "<BR>It has been submitted.\n";
-if ($FORM{"announce"} eq "yes") {
-print "<BR>As you requested, you have also been subscribed to announce\@FreeBSD.org.\n";
+
+&do_header("Subscription processed");
+print "<P>Thank you, $FORM{'emaila'}, for your submission.\n";
+print "<BR>The request will need to be authenticated; check your mailbox ";
+print "for instructions on how to do this.\n";
+&close_body;
+
+sub do_header {
+  my $title = @_;
+  print "<HTML>\n";
+  print "<HEAD>\n";
+  print "<TITLE>$title</TITLE>\n";
+  print "</HEAD>\n";
+  print "<BODY BGCOLOR=\"\#FFFFFF\" TEXT=\"\#660000\">\n";
+  print "<FONT SIZE=4> \n";
+  print "<CENTER>\n";
+  print "<IMG SRC=\"..\/gifs\/bar.gif\" BORDER=0 USEMAP=\"\#bar\">\n";
+  print "<MAP NAME=\"bar\">\n";
+  print "<AREA SHAPE=\"RECT\" COORDS=\"1,1,111,31\" HREF=\"../index.html\">\n";
+  print "<AREA SHAPE=\"RECT\" COORDS=\"112,11,196,31\" HREF=\"../ports/index.html\">\n";
+  print "<AREA SHAPE=\"RECT\" COORDS=\"196,12,257,33\" HREF=\"../support.html\">\n";
+  print "<AREA SHAPE=\"RECT\" COORDS=\"256,12,365,33\" HREF=\"../docs.html\">\n";
+  print "<AREA SHAPE=\"RECT\" COORDS=\"366,13,424,32\" HREF=\"../commercial.html\">\n";
+  print "<AREA SHAPE=\"RECT\" COORDS=\"425,16,475,32\" HREF=\"../search/search.html\">\n";
+  print "<AREA SHAPE=\"RECT\" COORDS=\"477,16,516,33\" HREF=\"../search/index-site.html\">\n";
+  print "<AREA SHAPE=\"RECT\" COORDS=\"516,15,562,33\" HREF=\"../index.html\">\n";
+  print "<AREA SHAPE=\"RECT\" COORDS=\"0,0,564,32\" HREF=\"../index.html\">\n";
+  print "</MAP>\n";
 }
-print "</CENTER>\n";
-print "</BODY>\n";
 
+sub close_body {
+  print "</CENTER>\n";
+  print "</BODY>\n";
+  print "</HTML>\n";
+}
 1;
+
diff -ru www.orig/en/publish.sgml www/en/publish.sgml
--- www.orig/en/publish.sgml	Sat Jan 19 13:03:33 2002
+++ www/en/publish.sgml	Tue Mar  5 15:09:24 2002
@@ -498,11 +498,8 @@
 	      WIDTH="150" HEIGHT="194"></a></td>
 
 	<td>This is <a href="http://www.freebsdmall.com/newsletter1/">issue
-	    #1</a> of the FreeBSD Newsletter, published and distributed free
+	    #1</a> of the FreeBSD Newsletter, which was published and distributed free
 	  of charge by <a href="http://www.wccdrom.com/">Walnut Creek CDROM</a>.
-	  You can <a href="register.html">register</a>
-	  to receive it.  Submit articles/make comments by sending email to
-	  <a href="mailto:newsletter@FreeBSD.ORG">newsletter@FreeBSD.ORG</a>.
 	</td>
       </tr>
 
@@ -511,11 +508,8 @@
 	      WIDTH="150" HEIGHT="194"></a></td>
 
 	<td>This is <a href="http://www.freebsdmall.com/newsletter2/">issue
-	    #2</a> of the FreeBSD Newsletter, published and distributed free
+	    #2</a> of the FreeBSD Newsletter, which was published and distributed free
 	  of charge by <a href="http://www.wccdrom.com/">Walnut Creek CDROM</a>.
-	  You can <a href="register.html">register</a>
-	  to receive it.  Submit articles/make comments by sending email to
-	  <a href="mailto:newsletter@FreeBSD.ORG">newsletter@FreeBSD.ORG</a>.
 	</td>
       </tr>
     </table>
diff -ru www.orig/en/register.sgml www/en/register.sgml
--- www.orig/en/register.sgml	Fri Jul 13 13:52:11 2001
+++ www/en/register.sgml	Tue Mar  5 15:09:18 2002
@@ -7,92 +7,37 @@
 <html>
     &header;
 
-    <center><font size="4">Register to receive the FreeBSD Newsletter and
-	subscribe to the announce@FreeBSD.org mailing list.</font></center>
+    <center><font size="4">Subscribe to the announce@FreeBSD.org and security-announce@FreeBSD.org mailing lists.</font></center>
     
     <form action="http://www.FreeBSD.org/cgi/reg.cgi" method="post">
-      <input type="hidden" name="recipient" value="register@FreeBSD.org"><br>
+      <input type="hidden" name="recipient" value="majordomo@FreeBSD.org"><br>
       <input type="hidden" name="version" value="Web-Registration">
 
       <center>
-	<table width="95%" border="0">
-	  <tr valign="top">
-	  </tr>
-	    
-	  <tr valign="top">
-	    <td>First Name: </td>
-
-	    <td colspan="3" align="left"><input type="text" name="First"
-		size="30"></td>
-	  </tr>
-	  
-	  <tr valign="top">
-	    <td align="left">Last Name: </td>
-	    
-	    <td colspan="3" align="left"><input type="text" name="Last"
-		size="30"></td>
-	  </tr>
-	  
+	<table width="75%" border="0">
 	  <tr>
 	    <td>Email Address: </td>
 	    
-	    <td colspan="3" align="left"><input type="text" name="emaila"
-		size="30"></td>
-	  </tr>
-	  
-	  <tr valign="top">
-	    <td align="left">Address: </td>
-	    
-	    <td colspan="3" align="left"><input type="text" name="Address"
-		size="30"></td>
-	  </tr>
-	  
-	  <tr valign="top">
-	    <td align="left">City: </td>
-	    
-	    <td colspan="3" align="left"><input type="text" name="City"
+	    <td align="left"><input type="text" name="emaila"
 		size="30"></td>
 	  </tr>
 	  
-	  <tr valign="top">
-	    <td align="left">Country/U.S. State: </td>
-	    
-	    <td align="left"><input type="text" name="State" size="10"></td>
-	    
-	    <td align="left">Country/Zip Code: </td>
-	    
-	    <td align="left"><input type="text" name="Zip" size="12"></td>
-	  </tr>
-	  
 	  <tr>
-	    <td></td>
-	  </tr>
-	  
-	  <tr>
-	    <td colspan="4">Do you wish to receive FreeBSD related
-	      commercial email?
-	      
-	      <input type="checkbox" name="commerce_email" value="yes"></td>
-	  </tr>
+	    <td>Options for the
+	      announce@FreeBSD.org mailing list: </td>
 
-	  <tr>
-	    <td colspan="4">Subscribe listed email address to the
-	      announce@FreeBSD.org mailing list?
-
-	      <input type="checkbox" name="announce" value="yes"></td>
+	    <td><input type="radio" name="announce" value="yes"> Subscribe<br>
+	      <input type="radio" name="announce" value="no"> Unsubscribe</td>
 	  </tr>
 
 	  <tr>
-	    <td colspan="4">Sign up for FreeBSD Newsletter?
+	    <td>Options for the
+	      security-notifications@FreeBSD.org mailing list: </td>
 
-	      <select name="newsletter" size="1">
-		<option>Postal Copy</option>
-		<option>E-mail</option>
-		<option>No Thanks</option>
-		<option></option>
-	      </select>
-	    </td>
+	    <td><input type="radio" name="security-notifications" value="yes"> Subscribe<br>
+	      <input type="radio" name="security-notifications" value="no"> Unsubscribe</td>
 	  </tr>
+
 	</table>
 
 	<p><input type="submit" value="Send">
@@ -100,13 +45,6 @@
       </center>
     </form>
     
-    <p>Preview a copy of the newsletter in <a
-	href="ftp://ftp.FreeBSD.org/pub/FreeBSD/doc/newsletter/issue2.pdf">Adobe
-	PDF format</a>.  A <a
-	href="ftp://ftp.FreeBSD.org/pub/FreeBSD/doc/newsletter/README.TXT">help
-	file</a> is available to assist you in selecting and using a PDF
-      viewer.</p>
-      
       &footer;
   </body>
 </html>
>Release-Note:
>Audit-Trail:
>Unformatted:

To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-doc" in the body of the message