Turn the entered code uppercase before looking it up in the database,

to permit entering the code in lowercase (since the generator doesn't
 generate lowercase letters).
Use a relative url to querypr-code.cgi so that mirrors (and test boxes)
 can use the query-pr cgis unmodified.
This commit is contained in:
Bill Fenner 2005-11-16 23:35:57 +00:00
parent 22cb43132c
commit a7613f7a01
Notes: svn2git 2020-12-08 03:00:23 +00:00
svn path=/www/; revision=26358
2 changed files with 6 additions and 4 deletions

View file

@ -8,7 +8,7 @@
# GNU General Public License Version 2.
# (http://www.gnu.ai.mit.edu/copyleft/gpl.html)
#
# $FreeBSD: www/en/cgi/dosendpr.cgi,v 1.22 2005/07/14 11:26:17 ceri Exp $
# $FreeBSD: www/en/cgi/dosendpr.cgi,v 1.23 2005/11/06 22:07:23 ceri Exp $
require "html.pl";
@ -101,6 +101,7 @@ unless (flock (DB_FH, LOCK_EX | LOCK_NB)) {
}
$codeentered = $cgi_data{'code-confirm'};
$codeentered =~ s/.*/\U$&/; # Turn input uppercase
$currenttime = time();
if (defined($codeentered) && $codeentered && $db_hash{$codeentered} &&
(($currenttime - $expiretime) <= $db_hash{$codeentered})) {

View file

@ -1,5 +1,5 @@
#!/usr/bin/perl -T
# $FreeBSD: www/en/cgi/query-pr.cgi,v 1.49 2005/11/07 10:43:19 ceri Exp $
# $FreeBSD: www/en/cgi/query-pr.cgi,v 1.50 2005/11/09 21:38:31 fenner Exp $
$ENV{'PATH'} = "/bin:/usr/bin:/usr/sbin:/sbin:/usr/local/bin";
@ -38,7 +38,7 @@ if ($opt_p) {
print " from the image below: <input type='text' ";
print " name='code-confirm' id='code-confirm' size='8' />\n";
print "</p><p><label for='code-confirm'>";
print "<img src='http://www.FreeBSD.org/cgi/querypr-code.cgi?dummy=1' ";
print "<img src='querypr-code.cgi?dummy=1' ";
print " alt='Random text; if you cannot see the image, please email ";
print " bugbusters\@FreeBSD.org' border='0' height='24' /></label></p>\n";
print "<input type='submit' value='Query' />\n</form>\n";
@ -75,6 +75,7 @@ foreach $randomcode (keys %db_hash) {
}
}
$codeentered =~ s/.*/\U$&/; # Turn input uppercase
$currenttime = time();
if (defined($codeentered) && $codeentered && $db_hash{$codeentered} &&
(($currenttime - $expiretime) <= $db_hash{$codeentered})) {
@ -251,7 +252,7 @@ if (! $codeok ) {
print "<input type='text' name='code-confirm' ";
print " id='code-confirm' size='8' />\n";
print "<label for='code-confirm'>";
print "<img src='http://www.FreeBSD.org/cgi/querypr-code.cgi?dummy=1' ";
print "<img src='querypr-code.cgi?dummy=1' ";
print " alt='Random text; if you cannot see the image, please email ";
print " bugbusters\@FreeBSD.org' border='0' height='24' /></label>\n";
print "<input type='submit' value='Go' />\n";