X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;ds=sidebyside;f=cgi%2Fbugreport.cgi;h=a457dfd0d208bc0e3d36f9ae657ef1a0f2b77bf1;hb=1fbaca61f2f551b5b2645ce2233a1d964bc93b30;hp=5f88e18e6fc2023701b1f6f6f6a1a64a37a4485a;hpb=8b927b3e663ead456848b600ba4e05cc9bdec5ac;p=debbugs.git

diff --git a/cgi/bugreport.cgi b/cgi/bugreport.cgi
index 5f88e18..a457dfd 100755
--- a/cgi/bugreport.cgi
+++ b/cgi/bugreport.cgi
@@ -15,6 +15,29 @@ use MIME::Decoder;
 use IO::Scalar;
 use IO::File;
 
+# if we're running out of git, we want to use the git base directory as the
+# first INC directory. If you're not running out of git, don't do that.
+use File::Basename qw(dirname);
+use Cwd qw(abs_path);
+our $debbugs_dir;
+BEGIN {
+    $debbugs_dir =
+	abs_path(dirname(abs_path(__FILE__)) . '/../');
+    # clear the taint; we'll assume that the absolute path to __FILE__ is the
+    # right path if there's a .git directory there
+    ($debbugs_dir) = $debbugs_dir =~ /([[:print:]]+)/;
+    if (defined $debbugs_dir and
+	-d $debbugs_dir . '/.git/') {
+    } else {
+	undef $debbugs_dir;
+    }
+    # if the first directory in @INC is not an absolute directory, assume that
+    # someone has overridden us via -I.
+    if ($INC[0] !~ /^\//) {
+    }
+}
+use if defined $debbugs_dir, lib => $debbugs_dir;
+
 use Debbugs::Config qw(:globals :text :config);
 
 # for read_log_records
@@ -24,14 +47,20 @@ use Debbugs::CGI qw(:url :html :util :cache :usertags);
 use Debbugs::CGI::Bugreport qw(:all);
 use Debbugs::Common qw(buglog getmaintainers make_list bug_status);
 use Debbugs::Packages qw(getpkgsrc);
+use Debbugs::DB;
 use Debbugs::Status qw(splitpackages split_status_fields get_bug_status isstrongseverity);
 
 use Scalar::Util qw(looks_like_number);
 
 use Debbugs::Text qw(:templates);
+use URI::Escape qw(uri_escape_utf8);
+use List::AllUtils qw(max);
 
-use List::Util qw(max);
-
+my $s;
+if (defined $config{database}) {
+    $s = Debbugs::DB->connect($config{database}) or
+        die "Unable to connect to database";
+}
 
 use CGI::Simple;
 my $q = new CGI::Simple;
@@ -188,6 +217,7 @@ my %status;
 if ($need_status) {
     %status = %{split_status_fields(get_bug_status(bug=>$ref,
 						   bugusertags => \%bugusertags,
+                                                   defined $s?(schema => $s):(),
 						  ))}
 }
 
@@ -274,8 +304,8 @@ END
           next if @records > 1 and $spam->is_spam($msg_id);
       my @lines;
       if ($record->{inner_file}) {
-          push @lines, $record->{fh}->getline;
-          push @lines, $record->{fh}->getline;
+          push @lines, scalar $record->{fh}->getline;
+          push @lines, scalar $record->{fh}->getline;
           chomp $lines[0];
           chomp $lines[1];
       } else {
@@ -415,7 +445,9 @@ $status{blockedby_array} = [];
 if (@blockedby && $status{"pending"} ne 'fixed' && ! length($status{done})) {
     for my $b (@blockedby) {
         my %s = %{get_bug_status($b)};
-        next if $s{"pending"} eq 'fixed' || length $s{done};
+        next if (defined $s{pending} and
+                 $s{"pending"} eq 'fixed') or
+                     length $s{done};
 	push @{$status{blockedby_array}},{bug_num => $b, subject => $s{subject}, status => \%s};
    }
 }
@@ -452,13 +484,13 @@ print fill_in_template(template => 'cgi/bugreport',
 				     msg           => $msg,
 				     isstrongseverity => \&Debbugs::Status::isstrongseverity,
 				     html_escape   => \&Debbugs::CGI::html_escape,
+                                     uri_escape    => \&URI::Escape::uri_escape_utf8,
 				     looks_like_number => \&Scalar::Util::looks_like_number,
 				     make_list        => \&Debbugs::Common::make_list,
 				    },
 		       hole_var  => {'&package_links' => \&Debbugs::CGI::package_links,
 				     '&bug_links'     => \&Debbugs::CGI::bug_links,
 				     '&version_url'   => \&Debbugs::CGI::version_url,
-				     '&bug_url'       => \&Debbugs::CGI::bug_url,
 				     '&strftime'      => \&POSIX::strftime,
 				     '&maybelink'     => \&Debbugs::CGI::maybelink,
 				    },