Patch by David Gardiner <david.gardiner@unisa.edu.au> -- added new headerhtml

param to allow people to customize the html put in the <HEAD> portion of generated documents. Also, a few other minor patches.

Patch by David Gardiner <david.gardiner@unisa.edu.au> -- added new headerhtml
a6681fdc · terry%netscape.com · 52f6d572 · a6681fdc · a6681fdc · a6681fdc
Commit a6681fdc authored Apr 28, 1999 by terry%netscape.com
Hide whitespace changes
Inline Side-by-side

Showing with 32 additions and 16 deletions

CGI.pl CGI.pl +19 -12

defparams.pl defparams.pl +4 -0

query.cgi query.cgi +9 -4

No files found.
--- a/CGI.pl
+++ b/CGI.pl
@@ -220,17 +220,20 @@ sub make_options {
    my $last = "";
    my $popup = "";
    my $found = 0;
-    foreach my $item (@$src) {
-        if ($item eq "-blank-" || $item ne $last) {
-            if ($item eq "-blank-") {
-		$item = "";
-	    }
-            $last = $item;
-            if ($isregexp ? $item =~ $default : $default eq $item) {
-                $popup .= "<OPTION SELECTED VALUE=\"$item\">$item";
-                $found = 1;
-            } else {
-		$popup .= "<OPTION VALUE=\"$item\">$item";
+
+    if ($src) {
+        foreach my $item (@$src) {
+            if ($item eq "-blank-" || $item ne $last) {
+                if ($item eq "-blank-") {
+                    $item = "";
+                }
+                $last = $item;
+                if ($isregexp ? $item =~ $default : $default eq $item) {
+                    $popup .= "<OPTION SELECTED VALUE=\"$item\">$item";
+                    $found = 1;
+                } else {
+                    $popup .= "<OPTION VALUE=\"$item\">$item";
+                }
            }
        }
    }
@@ -294,6 +297,9 @@ sub quietly_check_login() {
            }
        }
    }
+    if (!$loginok) {
+        delete $::COOKIE{"Bugzilla_login"};
+    }
    return $loginok;
 }

@@ -468,7 +474,8 @@ sub PutHeader {
 	$h2 = "";
    }

-    print "<HTML><HEAD><TITLE>$title</TITLE></HEAD>\n";
+    print "<HTML><HEAD>\n<TITLE>$title</TITLE>\n";
+    print Param("headerhtml") . "\n</HEAD>\n";
    print "<BODY   BGCOLOR=\"#FFFFFF\" TEXT=\"#000000\"\n";
    print "LINK=\"#0000EE\" VLINK=\"#551A8B\" ALINK=\"#FF0000\">\n";


--- a/defparams.pl
+++ b/defparams.pl
@@ -131,6 +131,10 @@ sub check_despotbaseurl {
 }


+DefParam("headerhtml",
+         "Additional HTML to add to the HEAD area of documents, eg. links to stylesheets.",
+         "l",
+         '');


 DefParam("bannerhtml",

--- a/query.cgi
+++ b/query.cgi
@@ -219,11 +219,16 @@ foreach $v (@::legal_versions) {


 for $p (@::legal_product) {
-    foreach $c (@{$::components{$p}}) {
-        $jscript .= "cpts['$c'].push('$p');\n";
+    if ($::components{$p}) {
+        foreach $c (@{$::components{$p}}) {
+            $jscript .= "cpts['$c'].push('$p');\n";
+        }
    }
-    foreach $v (@{$::versions{$p}}) {
-        $jscript .= "vers['$v'].push('$p');\n";
+
+    if ($::versions{$p}) {
+        foreach $v (@{$::versions{$p}}) {
+            $jscript .= "vers['$v'].push('$p');\n";
+        }
    }
 }