From: Don Armstrong Date: Sat, 18 Nov 2006 07:44:37 +0000 (-0800) Subject: * Finish migration to Debbugs::Config in bugreport.cgi X-Git-Tag: release/2.6.0~585^2^2~69 X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=be6b586c98f037c63990166faf4fc841df7b3e94;p=debbugs.git * Finish migration to Debbugs::Config in bugreport.cgi * Make use of the basic text snippets which have moved to Debbugs::Config * Fix the bug --- diff --git a/cgi/bugreport.cgi b/cgi/bugreport.cgi index 7dd91d44..331d1dd3 100755 --- a/cgi/bugreport.cgi +++ b/cgi/bugreport.cgi @@ -10,12 +10,10 @@ use MIME::Decoder; use IO::Scalar; use IO::File; -use Debbugs::Config qw(:globals); +use Debbugs::Config qw(:globals :text); #require '/usr/lib/debbugs/errorlib'; require './common.pl'; -require '/etc/debbugs/text'; - # for read_log_records use Debbugs::Log; use Debbugs::MIME qw(convert_to_utf8 decode_rfc1522 create_mime_message); @@ -191,10 +189,10 @@ Content-Type: text/html; charset=utf-8 -$short - $debbugs::gProject $debbugs::gBug report logs +$short - $gProject $gBug report logs -

$debbugs::gProject $debbugs::gBug report logs - $short

-

There is no record of $debbugs::gBug $short. +

$gProject $gBug report logs - $short

+

There is no record of $gBug $short. Try the search page instead.

$tail_html EOF @@ -331,7 +329,7 @@ eval{ @records = read_log_records($buglogfh); }; if ($@) { - quitcgi("Bad bug log for $debbugs::gBug $ref. Unable to read records: $@"); + quitcgi("Bad bug log for $gBug $ref. Unable to read records: $@"); } undef $buglogfh; @@ -479,10 +477,10 @@ if ( $mbox ) { } } print STDOUT qq(From unknown $date\n), - create_mime_message([From => "$debbugs::gBug#$ref <$ref\@$debbugs::gEmailDomain>", - To => "$debbugs::gBug#$ref <$ref\@$debbugs::gEmailDomain>", + create_mime_message([From => "$gBug#$ref <$ref\@$gEmailDomain>", + To => "$gBug#$ref <$ref\@$gEmailDomain>", Subject => "Status: $status{subject}", - "Reply-To" => "$debbugs::gBug#$ref <$ref\@$debbugs::gEmailDomain>", + "Reply-To" => "$gBug#$ref <$ref\@$gEmailDomain>", ], <\n"; print < -$short - $title - $debbugs::gProject $debbugs::gBug report logs +$short - $title - $gProject $gBug report logs - + - + END -print "

" . "$debbugs::gProject $debbugs::gBug report logs - $short" . +print "

" . "$gProject $gBug report logs - $short" . "
" . $title . "

\n"; print "$descriptivehead\n"; -print qq(

Reply ), - qq(or subscribe ), +print qq(

Reply ), + qq(or subscribe ), qq(to this bug.

\n); print qq(

Show useless messages

); printf qq(

View this report as an mbox folder, ).