[project @ 2005-10-06 03:10:42 by ajt]

don't reference undefined variables

diff --git a/cgi/common.pl b/cgi/common.pl
index 85b18bb31c7f32891e4074f8a20a881bb8bb277a..a6feece104127e5169f71bc07b299d007deb352e 100644 (file)
--- a/cgi/common.pl
+++ b/cgi/common.pl
@@ -206,6 +206,8 @@ sub readparse {
        $x =~ s/;\s+/;/g;
         $in = "$x;$in";
     }
+    $in =~ s/&/;/g;
+    $in =~ s/;;+/;/g; $in =~ s/^;//; $in =~ s/;$//;
     foreach (split(/[&;]/,$in)) {
         s/\+/ /g;
         ($key, $val) = split(/=/,$_,2);

diff --git a/cgi/pkgreport.cgi b/cgi/pkgreport.cgi
index ccc9967b5a7d35c5fc4e39314c1fe9e48270827c..86ebba632b7d6efbd56023d1822d44dde96b8798 100755 (executable)
--- a/cgi/pkgreport.cgi
+++ b/cgi/pkgreport.cgi
@@ -387,11 +387,13 @@ print "<tr><td></td>";
 print "    <td><input id=\"b_1_2\" name=vt value=bysuite type=radio onchange=\"enable(1);\" $checked_sui>" . pkg_htmlselectsuite(1,2,1) . " for " . pkg_htmlselectarch(1,2,2) . "</td></tr>\n";
 
 if (defined $pkg) {
+    my $v = $version || "";
     print "<tr><td></td>";
-    print "    <td><input id=\"b_1_3\" name=vt value=bypkg type=radio onchange=\"enable(1);\" $checked_ver>$pkg version <input id=\"b_1_3_1\" name=version value=\"$version\"></td></tr>\n";
+    print "    <td><input id=\"b_1_3\" name=vt value=bypkg type=radio onchange=\"enable(1);\" $checked_ver>$pkg version <input id=\"b_1_3_1\" name=version value=\"$v\"></td></tr>\n";
 } elsif (defined $src) {
+    my $v = $version || "";
     print "<tr><td></td>";
-    print "    <td><input name=vt value=bysrc type=radio onchange=\"enable(1);\" $checked_ver>$src version <input id=\"b_1_3_1\" name=version value=\"$version\"></td></tr>\n";
+    print "    <td><input name=vt value=bysrc type=radio onchange=\"enable(1);\" $checked_ver>$src version <input id=\"b_1_3_1\" name=version value=\"$v\"></td></tr>\n";
 }
 
 my $sel_rmy = ($repeatmerged ? " selected" : "");