diff --git a/en/Makefile b/en/Makefile index c08f57bb81..1430f770f2 100644 --- a/en/Makefile +++ b/en/Makefile @@ -1,113 +1,112 @@ -# $FreeBSD: www/en/Makefile,v 1.117 2004/12/30 17:53:43 hrs Exp $ +# $FreeBSD: www/en/Makefile,v 1.118 2005/02/13 19:51:22 hrs Exp $ .if exists(Makefile.conf) .include "Makefile.conf" .endif .if exists(../Makefile.inc) .include "../Makefile.inc" .endif # These are turned into validated, normalized HTML files. DOCS= applications.sgml DOCS+= art.sgml DOCS+= auditors.sgml DOCS+= availability.sgml DOCS+= docs.sgml DOCS+= features.sgml -DOCS+= register.sgml DOCS+= internet.sgml DOCS+= mailto.sgml DOCS+= publish.sgml DOCS+= relnotes.sgml DOCS+= send-pr.sgml DOCS+= support.sgml DOCS+= usergroups.sgml DOCS+= where.sgml DOCS+= y2kbug.sgml # These will be directly installed. DATA= favicon.ico DATA+= freebsd.css DATA+= index.css DATA+= robots.txt DATA+= vendors.html # Subdirectories # SGML SUBDIR= FAQ SUBDIR+= advocacy SUBDIR+= commercial SUBDIR+= copyright SUBDIR+= docproj SUBDIR+= donations SUBDIR+= events SUBDIR+= gnome SUBDIR+= handbook SUBDIR+= internal SUBDIR+= java SUBDIR+= kse SUBDIR+= news SUBDIR+= platforms SUBDIR+= projects SUBDIR+= prstats SUBDIR+= releases SUBDIR+= releng SUBDIR+= search SUBDIR+= security SUBDIR+= smp SUBDIR+= snapshots SUBDIR+= tutorials .if !defined(WEB_ONLY) || empty(WEB_ONLY) SUBDIR+= doc SUBDIR+= ports .endif .if defined(BUILD_RELNOTES) SUBDIR+= relnotes .endif # Non-SGML SUBDIR+= cgi SUBDIR+= gifs WEB_LANG?= da de es fr it ja nl pt_BR ru tr zh # Non-English .if !defined(ENGLISH_ONLY) || empty(ENGLISH_ONLY) .for DIR in ${WEB_LANG} SUBDIR+= ../${DIR} .endfor .endif WEBDIR?= data # index.html is special, and generated from index.xsl and news/news.xml DATA+= index.html CLEANFILES+= index.html .include "${WEB_PREFIX}/share/mk/web.site.mk" index.html: index.xsl ${XML_INCLUDES}\ ${XML_NEWS_INCLUDES} \ ${XML_NEWS_NEWS} ${XML_NEWS_NEWS_MASTER} \ ${XML_NEWS_PRESS} ${XML_NEWS_PRESS_MASTER} \ ${XML_MIRRORS} ${XML_TRANSTABLE} \ ${XML_ADVISORIES} ${XML_NOTICES} \ ${XML_NAVIGATION} ${XSLTPROC} ${XSLTPROCOPTS} \ -o $@ \ --param advisories.xml "'${XML_ADVISORIES}'" \ --param mirrors.xml "'${XML_MIRRORS}'" \ --param navigation.xml "'${XML_NAVIGATION}'" \ --param news.press.xml-master "'${XML_NEWS_PRESS_MASTER}'" \ --param news.press.xml "'${XML_NEWS_PRESS}'" \ --param news.project.xml-master "'${XML_NEWS_NEWS_MASTER}'" \ --param news.project.xml "'${XML_NEWS_NEWS}'" \ --param notices.xml "'${XML_NOTICES}'" \ --param transtable.xml "'${XML_TRANSTABLE}'" \ ${.CURDIR}/index.xsl ${XML_NEWS_NEWS} .if !defined(NO_TIDY) -${TIDY} ${TIDYOPTS} ${.TARGET} .endif diff --git a/en/cgi/reg.cgi b/en/cgi/reg.cgi index 1c85671701..ccaef30728 100755 --- a/en/cgi/reg.cgi +++ b/en/cgi/reg.cgi @@ -1,110 +1,110 @@ #!/usr/bin/perl # # Perl program to send mail. # -# $FreeBSD: www/en/cgi/reg.cgi,v 1.9 2005/02/12 12:59:53 ceri Exp $ +# $FreeBSD: www/en/cgi/reg.cgi,v 1.10 2005/02/12 13:04:00 ceri Exp $ sub do_header; sub close_body; $mailprog = '/usr/sbin/sendmail'; print "Content-type: text/html\n\n"; if ($ENV{'REQUEST_METHOD'} eq "get") { $buffer = $ENV{'QUERY_STRING'}; } else { read(STDIN, $buffer, $ENV{'CONTENT_LENGTH'}); } @nvpairs = split(/&/, $buffer); foreach $pair (@nvpairs) { ($name, $value) = split(/=/, $pair); $value =~ tr/+/ /; $value =~ s/%([a-fA-F0-9][a-fA-F0-9])/pack("C", hex($1))/eg; $FORM{$name} = $value; } if ($FORM{"emaila"} eq "") { print "\n"; print "\n"; print "Entry Error: Email Field Blank\n"; print "\n"; print "\n"; print "\n"; print "

Your email address was left blank. Please enter it.\n"; print "\n"; print "\n"; exit(0); } $sub_recipient = "majordomo\@FreeBSD.org"; # # format the mail file format MAIL = ~~ ^<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<< $value . 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 # 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: \n\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 "

No action chosen, hence no action taken.

"; &close_body; exit; } &do_header("Subscription processed"); print "

Thank you, $FORM{'emaila'}, for your submission.\n"; print "
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 "\n"; print "\n"; print "$title\n"; print "\n"; print "\n"; print "\n"; print "\n"; print "\n"; print "\n"; print "\n"; print "\n"; print "\n"; print "\n"; print "\n"; print "\n"; print "\n"; print "\n"; print "

\n"; } sub close_body { print "
\n"; print "\n"; print "\n"; } 1; diff --git a/en/register.sgml b/en/register.sgml deleted file mode 100644 index 4a91b053b0..0000000000 --- a/en/register.sgml +++ /dev/null @@ -1,69 +0,0 @@ - - - %includes; -]> - - - &header; - -
Subscribe to the announce@FreeBSD.org and - security-announce@FreeBSD.org mailing lists.
- -

The announce@FreeBSD.org mailing list is used to communicate important - Project events, such as new releases, milestone events and security - advisories.

- -

Security advisories are also communicated via the - security-notifications@FreeBSD.org mailing list (note that - announce@FreeBSD.org is a superset of this list, and so there is no need - to subscribe to both).

- -
-
- - - - - - - - - - - - - - - - - - -
Options for the - announce@FreeBSD.org mailing list:
-
Options for the - security-notifications@FreeBSD.org mailing list:
-
- -

-

-
-
- - &footer; - - - -