From 1ada21acbca5ff899357471aae7de3f9ee5d1f3d Mon Sep 17 00:00:00 2001
From: Don Armstrong <don@volo>
Date: Tue, 13 Mar 2007 23:40:33 -0700
Subject: [PATCH]   - Add link from singlemsg page to main page; remove useless
 links     (closes: #404806)

---
 cgi/bugreport.cgi | 25 +++++++++++++++----------
 debian/changelog  |  2 ++
 2 files changed, 17 insertions(+), 10 deletions(-)

diff --git a/cgi/bugreport.cgi b/cgi/bugreport.cgi
index 2052898..4c8e05d 100755
--- a/cgi/bugreport.cgi
+++ b/cgi/bugreport.cgi
@@ -604,17 +604,22 @@ function toggle_infmessages()
 END
 print "<H1>" . "$gProject $gBug report logs - <A HREF=\"mailto:$ref\@$gEmailDomain\">$short</A>" .
       "<BR>" . $title . "</H1>\n";
-
 print "$descriptivehead\n";
-print qq(<p><a href="mailto:$ref\@$gEmailDomain">Reply</a> ),
-     qq(or <a href="mailto:$ref-subscribe\@$gEmailDomain">subscribe</a> ),
-     qq(to this bug.</p>\n);
-print qq(<p><a href="javascript:toggle_infmessages();">Toggle useless messages</a></p>);
-printf qq(<div class="msgreceived"><p>View this report as an <a href="%s">mbox folder</a>, ).
-     qq(<a href="%s">status mbox</a>, <a href="%s">maintainer mbox</a></p></div>\n),
-     html_escape(bug_url($ref, mbox=>'yes')),
-     html_escape(bug_url($ref, mbox=>'yes',mboxstatus=>'yes')),
-     html_escape(bug_url($ref, mbox=>'yes',mboxmaint=>'yes'));
+
+if (looks_like_number($msg)) {
+     printf qq(<p><a href="%s">Full log</a></p>),html_escape(bug_url($ref));
+}
+else {
+     print qq(<p><a href="mailto:$ref\@$gEmailDomain">Reply</a> ),
+	  qq(or <a href="mailto:$ref-subscribe\@$gEmailDomain">subscribe</a> ),
+	       qq(to this bug.</p>\n);
+     print qq(<p><a href="javascript:toggle_infmessages();">Toggle useless messages</a></p>);
+     printf qq(<div class="msgreceived"><p>View this report as an <a href="%s">mbox folder</a>, ).
+	  qq(<a href="%s">status mbox</a>, <a href="%s">maintainer mbox</a></p></div>\n),
+	       html_escape(bug_url($ref, mbox=>'yes')),
+		    html_escape(bug_url($ref, mbox=>'yes',mboxstatus=>'yes')),
+			 html_escape(bug_url($ref, mbox=>'yes',mboxmaint=>'yes'));
+}
 print "$log";
 print "<HR>";
 print "<p class=\"msgreceived\">Send a report that <a href=\"/cgi-bin/bugspam.cgi?bug=$ref\">this bug log contains spam</a>.</p>\n<HR>\n";
diff --git a/debian/changelog b/debian/changelog
index bd8d65d..40c9c65 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -154,6 +154,8 @@ debbugs (2.4.2) UNRELEASED; urgency=low
     - When searching by source package, include the source package itself
       in the list of packages to search for, even if there is no binary
       package called that. (closes: #414825)
+    - Add link from singlemsg page to main page; remove useless links
+      (closes: #404806)
 
   
  -- Colin Watson <cjwatson@debian.org>  Fri, 20 Jun 2003 18:57:25 +0100
-- 
2.39.2