* my_url in pkgreport.cgi now returns the complete url (closes: #378566)

 * Document precisely how forwarded works (closes: #228049)

diff --git a/cgi/pkgreport.cgi b/cgi/pkgreport.cgi
index a6c8e8d386037edfa8b20da82afe2b3a8c7336c1..8c7051e36b87bb03f89e2232d1d986a1a20e6e7c 100755 (executable)
--- a/cgi/pkgreport.cgi
+++ b/cgi/pkgreport.cgi
@@ -961,12 +961,13 @@ sub pkg_htmlselectarch {
 }
 
 sub myurl {
-    return pkg_etc_url($pkg, "pkg", 0) if defined($pkg);
-    return pkg_etc_url($src, "src", 0) if defined($src);
-    return pkg_etc_url($maint, "maint", 0) if defined($maint);
-    return pkg_etc_url($submitter, "submitter", 0) if defined($submitter);
-    return pkg_etc_url($severity, "severity", 0) if defined($severity);
-    return pkg_etc_url($tag, "tag", 0) if defined($tag);
+     return urlsanit('pkgreport.cgi?'.
+                    join(';',
+                         (map {("$_=$param{$_}")
+                                           } keys %param
+                         )
+                        )
+                   );
 }
 
 sub make_order_list {

diff --git a/debian/changelog b/debian/changelog
index 06efe83d0a447e07a1eabe9c7aba2d1dae2b57de..3bb240c9f54f0cc8d5659dd0e839cfe79b88df5d 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -137,6 +137,8 @@ debbugs (2.4.2) UNRELEASED; urgency=low
     - Fix javascript error in pkgreport.cgi (closes: #346043)
     - When a bug can't be found in control@; indicate to user that it may
       be archived. (closes: #153536)
+    - my_url in pkgreport.cgi now returns the complete url (closes: #378566)
+    - Document precisely how forwarded works (closes: #228049)
 
   
  -- Colin Watson <cjwatson@debian.org>  Fri, 20 Jun 2003 18:57:25 +0100

diff --git a/html/Developer.html.in b/html/Developer.html.in
index 8f8e7881fdc85e5208ea0ef40bc17566fdd0c50f..d876d91dbaa9ceec1cd07922b6b1ff0d01cb7b10 100644 (file)
--- a/html/Developer.html.in
+++ b/html/Developer.html.in
@@ -123,8 +123,9 @@ they should note this in the $gBug tracking system as follows:
 
 <p>Make sure that the <code>To</code> field of your message to the author
 has only the author(s) address(es) in it; put both the person who
-reported the $gBug and
-<var>nnn</var><code>-forwarded\@$gEmailDomain</code> in the
+reported the $gBug, 
+<var>nnn</var><code>-forwarded\@$gEmailDomain</code> and
+<var>nnn</var><code>\@$gEmailDomain</code> in the
 <code>CC</code> field.
 
 <p>Ask the author to preserve the <code>CC</code> to