Patch by Ian Wells <I.Wells@tarragon-et.co.uk> -- disable JavaScript

magic on IE (where it wasn't working), other minor cleanups.

webtools/bonsai/cvsblame.cgi

@@ -415,7 +415,8 @@ var event = 0;	// Nav3.0 compatibility
 document.loaded = false;
 
 function finishedLoad() {
-    if (parseInt(navigator.appVersion) < 4) {
+    if (parseInt(navigator.appVersion) < 4 ||
+        navigator.userAgent.toLowerCase().indexOf("msie") != -1) {
         return true;
     }
     document.loaded = true;
@@ -431,7 +432,8 @@ function revToName (rev) {
 }
 
 function log(event, prev_rev, rev) {
-    if (parseInt(navigator.appVersion) < 4) {
+    if (parseInt(navigator.appVersion) < 4 ||
+        navigator.userAgent.toLowerCase().indexOf("msie") != -1) {
         return true;
     }
 

webtools/bonsai/cvsquery.cgi

@@ -478,7 +478,8 @@ $script_str =<<'ENDJS';
 var event = 0;	// Nav3.0 compatibility
 
 function js_who_menu(n,extra,d) {
-    if( parseInt(navigator.appVersion) < 4 ){
+    if( parseInt(navigator.appVersion) < 4 ||
+        navigator.userAgent.toLowerCase().indexOf("msie") != -1 ){
         return true;
     }
     l = document.layers['popup'];
@@ -497,7 +498,8 @@ function js_who_menu(n,extra,d) {
 
 function js_file_menu(repos,dir,file,rev,branch,d) {
     var fileName="";
-    if( parseInt(navigator.appVersion) < 4 ){
+    if( parseInt(navigator.appVersion) < 4 ||
+        navigator.userAgent.toLowerCase().indexOf("msie") != -1 ){
         return true;
     }
     for (var i=0;i<d.target.text.length;i++)

webtools/bonsai/cvsquery.pl

@@ -17,6 +17,7 @@
 # Netscape Communications Corporation. All Rights Reserved.
 
 require 'globals.pl';
+require 'get_line.pl';
 
 #
 # Constants
@@ -437,30 +438,3 @@ sub build_map {
     return $bFound;
 }
 
-
-
-sub get_line {
-    local($l, $save);
-    
-    $bContinue = 1;
-
-    while( $bContinue && ($l = <MOD>) ){
-        chop($l);
-        if( $l =~ /^[ \t]*\#/ 
-                || $l =~ /^[ \t]*$/ ){
-            $l='';
-        }
-        elsif( $l =~ /\\[ \t]*$/ ){
-            chop ($l);
-            $save .= $l . ' ';
-        }
-        elsif( $l eq '' && $save eq ''){
-            # ignore blank lines
-        }
-        else {
-            $bContinue = 0;
-        }
-    }
-    return $save . $l;
-}
-

webtools/bonsai/get_line.pl

@@ -0,0 +1,60 @@
+# -*- Mode: perl; indent-tabs-mode: nil -*-
+#
+# The contents of this file are subject to the Netscape Public License
+# Version 1.0 (the "License"); you may not use this file except in
+# compliance with the License. You may obtain a copy of the License at
+# http://www.mozilla.org/NPL/
+#
+# Software distributed under the License is distributed on an "AS IS"
+# basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the
+# License for the specific language governing rights and limitations
+# under the License.
+#
+# The Original Code is the Bonsai CVS tool.
+#
+# The Initial Developer of the Original Code is Netscape Communications
+# Corporation. Portions created by Netscape are Copyright (C) 1998
+# Netscape Communications Corporation. All Rights Reserved.
+
+# Get a line, dealing with '\'.  Returns 'undef' when no more lines to return;
+# removes blank lines as it goes.
+# Allows spaces after a '\'.  This is naughty but will probably not matter
+# *too* much, and I'm not changing it now.
+sub get_line {
+    my($l, $save);
+    $l='';
+    $save='';
+
+    my $bContinue = 1;
+
+    while( $bContinue && ($l = <MOD>) ){
+        chop($l);
+        if( $l =~ /^[ \t]*\#/
+                || $l =~ /^[ \t]*$/ ){
+            $l='';              # Starts with a "#", or is only whitespace.
+        }
+        if( $l =~ /\\[ \t]*$/ ){
+            # Ends with a slash, so append it to the last line.
+            chop ($l);
+            $save .= $l . ' ';
+            $l='';
+        }
+        elsif( $l eq '' && $save eq ''){
+            # ignore blank lines
+        }
+        else {
+            $bContinue = 0;
+        }
+    }
+    if(!defined($l)) {
+        if($save ne '') {
+            return $save;
+        } else {
+            return $l;
+        }
+    } else {
+        return $save . $l;
+    }
+}
+
+1;

webtools/bonsai/globals.pl

@@ -124,9 +124,9 @@ sub SendSQL {
     my ($rows);
 
     $::currentquery = $::db->prepare($str)
-	|| die "'$str': $::db->errstr";
+	|| die "'$str': ". $::db->errstr;
     $rows = $::currentquery->execute
-        || die "'$str': Can't execute the query: $::currentquery->errstr";
+        || die "'$str': Can't execute the query: " . $::currentquery->errstr;
 }
 
 sub MoreSQLData {

webtools/bonsai/maketables.sh

@@ -34,7 +34,7 @@ read dummy
 
 echo Dropping old tables
 
-$MYSQL > /dev/null 2>/dev/null << OK_ALL_DONE
+$MYSQL << OK_ALL_DONE
 
 use bonsai;
 

webtools/bonsai/modules.pl

@@ -16,6 +16,7 @@
 # Corporation. Portions created by Netscape are Copyright (C) 1998
 # Netscape Communications Corporation. All Rights Reserved.
 
+require 'get_line.pl';
 
 $NOT_LOCAL = 1;
 $IS_LOCAL = 2;
@@ -26,7 +27,7 @@ if( $CVS_ROOT eq "" ){
     $CVS_ROOT = pickDefaultRepository();
 }
 
-if( $ENV{"OS"} eq "Windows_NT" ){
+if( defined($ENV{"OS"}) && $ENV{"OS"} eq "Windows_NT" ){
     $CVS_MODULES='modules';
 }
 else {
@@ -140,31 +141,3 @@ sub build_map {
     }
     return $bFound;
 }
-
-
-
-sub get_line {
-    local($l, $save);
-    
-    $bContinue = 1;
-
-    while( $bContinue && ($l = <MOD>) ){
-        chop($l);
-        if( $l =~ /^[ \t]*\#/ 
-                || $l =~ /^[ \t]*$/ ){
-            $l='';              # Starts with a "#", or is only whitespace.
-        }
-        if( $l =~ /\\[ \t]*$/ ){
-            # Ends with a slash, so append it to the last line.
-            chop ($l);
-            $save .= $l . ' ';
-        }
-        elsif( $l eq '' && $save eq ''){
-            # ignore blank lines
-        }
-        else {
-            $bContinue = 0;
-        }
-    }
-    return $save . $l;
-}

webtools/bonsai/rview.cgi

@@ -46,6 +46,10 @@ $dir =~ s/([^:]*)\/$/$1/;
 
 $rev = $::FORM{"rev"};
 
+if(!defined($rev)) {
+    $rev='';
+}
+
 print "Content-type: text/html\n\n";
 
 
@@ -187,7 +191,8 @@ $script_str =<<'ENDJS';
 var event = new Object;
 
 function js_who_menu(n,extra,d) {
-    if( parseInt(navigator.appVersion) < 4 ){
+    if( parseInt(navigator.appVersion) < 4 ||
+        navigator.userAgent.toLowerCase().indexOf("msie") != -1 ){
         return true;
     }
     l = document.layers['popup'];
@@ -209,7 +214,8 @@ function js_who_menu(n,extra,d) {
 }
 
 function js_file_menu(dir,file,rev,root,d) {
-    if( parseInt(navigator.appVersion) < 4 ){
+    if( parseInt(navigator.appVersion) < 4 ||
+        navigator.userAgent.toLowerCase().indexOf("msie") != -1 ){
         return true;
     }
     l = document.layers['popup'];