os/doc
3
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Add some decent markup to the output of dosendpr.cgi.

Browse source 
The prerror class added to freebsd.css is not currently used; this will
happen once dosendpr.cgi is converted to use cgi-style.pl rather than
html.pl.
This commit is contained in:
Ceri Davies 2005-07-14 11:26:17 +00:00
parent 9cb8dd0d21
commit bc33ecc9ba
Notes: svn2git 2020-12-08 03:00:23 +00:00 
svn path=/www/; revision=25108
2 changed files with 21 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
en/cgi/dosendpr.cgi
View file

@ -8,7 +8,7 @@
# GNU General Public License Version 2. # GNU General Public License Version 2.
# (http://www.gnu.ai.mit.edu/copyleft/gpl.html) # (http://www.gnu.ai.mit.edu/copyleft/gpl.html)
# #
# $FreeBSD: www/en/cgi/dosendpr.cgi,v 1.20 2004/02/16 16:54:06 ceri Exp $ # $FreeBSD: www/en/cgi/dosendpr.cgi,v 1.21 2004/02/16 16:57:10 ceri Exp $
require "html.pl"; require "html.pl";
@ -71,9 +71,10 @@ sub isopenproxy ($$$) {
sub prerror { sub prerror {
&html_title ("Problem Report Error"); &html_title ("Problem Report Error");
&html_body(); &html_body();
print "There is an error in the configuration of the problem\n", print "<p>There is an error in the configuration of the problem\n",
"report form generator. Please back up one page and report\n", "report form generator. Please back up one page and report\n",
"the problem to the owner of that page. Report $_[0]."; "the problem to the owner of that page.<br />",
"Report <span class=\"prerror\">$_[0]</span>.</p>";
&html_end(); &html_end();
exit (1); exit (1);
} }
@ -105,25 +106,28 @@ if (defined($codeentered) && $codeentered && $db_hash{$codeentered} &&
(($currenttime - $expiretime) <= $db_hash{$codeentered})) { (($currenttime - $expiretime) <= $db_hash{$codeentered})) {
if (!$cgi_data{'email'} || !$cgi_data{'originator'} || if (!$cgi_data{'email'} || !$cgi_data{'originator'} ||
!$cgi_data{'synopsis'}) { !$cgi_data{'synopsis'}) {
print "<h1>Bad Data</h1>\nYou need to specify at least your ", print "<h1>Bad Data</h1><p>You need to specify at least your ",
"electronic mail address, your name and a synopsis ", "electronic mail address, your name and a synopsis ",
"of the problem.\n Please return to the form and add the ", "of the problem.<br /> Please return to the form and add the ",
"missing information. Thank you.\n"; "missing information. Thank you.</p>";
&html_end(); &html_end();
exit(1); exit(1);
} }
} else { } else {
print "<h1>Incorrect safety code</h1>\nYou need to enter the correct ", print "<h1>Incorrect safety code</h1><p>You need to enter the correct ",
"code from the image displayed. Please return to the form and enter the ", "code from the image displayed. Please return to the form and enter the ",
"code exactly as shown. Thank you.\n"; "code exactly as shown. Thank you.</p>";
&html_end(); &html_end();
exit(1); exit(1);
} }
# This code has now been used, so remove it.
delete $db_hash{"$codeentered"}; delete $db_hash{"$codeentered"};
# Sweep for and remove expired codes.
foreach $randomcode (keys %db_hash) { foreach $randomcode (keys %db_hash) {
if ( ($currenttime - $expiretime) <= $db_hash{$randomcode}) { if ( ($currenttime - $expiretime) <= $db_hash{$randomcode}) {
delete $db_hash{"$randomcode"}; delete $db_hash{"$randomcode"};
@ -177,9 +181,9 @@ if (open (SUBMIT, "|$submission_program")){
print SUBMIT $pr; print SUBMIT $pr;
close (SUBMIT); close (SUBMIT);
print "<h1>Thank You</h1>", print "<h1>Thank You</h1>",
"Thank you for the problem report. You should receive confirmation", "<p>Thank you for the problem report. You should receive confirmation",
" of your report by electronic mail within a day."; " of your report by electronic mail within a day.</p>";
} else { } else {
print "<h1>Error</h1>An error occured processing your problem report."; print "<h1>Error</h1><p>An error occured processing your problem report.</p>";
} }
&html_end(); &html_end();

7
en/freebsd.css
View file

@ -23,7 +23,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE. * SUCH DAMAGE.
* *
* $FreeBSD: www/en/freebsd.css,v 1.5 2005/06/11 18:36:01 murray Exp $ * $FreeBSD: www/en/freebsd.css,v 1.6 2005/07/14 10:34:12 ceri Exp $
*/ */
DIV.EXAMPLE P B { DIV.EXAMPLE P B {
@ -71,3 +71,8 @@ label {
cursor: pointer; cursor: pointer;
} }
/* Errors from www/en/cgi/dosendpr.cgi */
.prerror {
font-weight: bold;
}