FreeBSD Bugzilla – Attachment 20129 Details for
Bug 35563
[Patch] Stop asking people to give us their postal address for no reason
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
Remember
[x]
|
Forgot Password
Login:
[x]
[patch]
file.diff
file.diff (text/plain), 10.21 KB, created by
setantae
on 2002-03-05 16:20:00 UTC
(
hide
)
Description:
file.diff
Filename:
MIME Type:
Creator:
setantae
Created:
2002-03-05 16:20:00 UTC
Size:
10.21 KB
patch
obsolete
>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>
<b>You cannot view the attachment while viewing its details because your browser does not support IFRAMEs. <a href="attachment.cgi?id=20129">View the attachment on a separate page</a>.</b>
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 35563
: 20129