X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=Debbugs%2FCGI.pm;h=45673059af4e7996b927344af17f239fdd845c0b;hb=c34bda5a4f3e2be51095d7eac26b1342c461cd8b;hp=393b40602ef12203d1c746ddedcb53c0476f3fb3;hpb=235a779bdb026b6357e95053e1d7faaab87e8931;p=debbugs.git

diff --git a/Debbugs/CGI.pm b/Debbugs/CGI.pm
index 393b406..4567305 100644
--- a/Debbugs/CGI.pm
+++ b/Debbugs/CGI.pm
@@ -17,8 +17,6 @@ Debbugs::CGI -- General routines for the cgi scripts
 
 use Debbugs::CGI qw(:url :html);
 
-html_escape(bug_url($ref,mbox=>'yes',mboxstatus=>'yes'));
-
 =head1 DESCRIPTION
 
 This module is a replacement for parts of common.pl; subroutines in
@@ -36,36 +34,15 @@ use strict;
 use vars qw($VERSION $DEBUG %EXPORT_TAGS @EXPORT_OK @EXPORT);
 use Exporter qw(import);
 
-use Debbugs::URI;
-use HTML::Entities;
-use Debbugs::Common qw(getparsedaddrs make_list);
-use Params::Validate qw(validate_with :types);
-
-use Debbugs::Config qw(:config);
-use Debbugs::Status qw(splitpackages isstrongseverity);
-use Debbugs::User qw();
-
-use Mail::Address;
-use POSIX qw(ceil);
-use Storable qw(dclone);
-
-use List::Util qw(max);
-use File::stat;
-use Digest::MD5 qw(md5_hex);
-use Carp;
-
-use Debbugs::Text qw(fill_in_template);
-
 our %URL_PARAMS = ();
 
-
 BEGIN{
      ($VERSION) = q$Revision: 1.3 $ =~ /^Revision:\s+([^\s+])/;
      $DEBUG = 0 unless defined $DEBUG;
 
      @EXPORT = ();
-     %EXPORT_TAGS = (url    => [qw(bug_url bug_links bug_linklist maybelink),
-				qw(set_url_params pkg_url version_url),
+     %EXPORT_TAGS = (url    => [qw(bug_links bug_linklist maybelink),
+				qw(set_url_params version_url),
 				qw(submitterurl mainturl munge_url),
 				qw(package_links bug_links),
 			       ],
@@ -86,6 +63,26 @@ BEGIN{
      $EXPORT_TAGS{all} = [@EXPORT_OK];
 }
 
+use Debbugs::URI;
+use HTML::Entities;
+use Debbugs::Common qw(getparsedaddrs make_list);
+use Params::Validate qw(validate_with :types);
+
+use Debbugs::Config qw(:config);
+use Debbugs::Status qw(splitpackages isstrongseverity);
+use Debbugs::User qw();
+
+use Mail::Address;
+use POSIX qw(ceil);
+use Storable qw(dclone);
+
+use List::AllUtils qw(max);
+use File::stat;
+use Digest::MD5 qw(md5_hex);
+use Carp;
+
+use Debbugs::Text qw(fill_in_template);
+
 
 
 =head2 set_url_params
@@ -108,44 +105,6 @@ sub set_url_params{
 }
 
 
-=head2 bug_url
-
-     bug_url($ref,mbox=>'yes',mboxstat=>'yes');
-
-Constructs urls which point to a specific
-
-XXX use Params::Validate
-
-=cut
-
-sub bug_url{
-     my $ref = shift;
-     my %params;
-     if (@_ % 2) {
-	  shift;
-	  %params = (%URL_PARAMS,@_);
-     }
-     else {
-	  %params = @_;
-     }
-     carp "bug_url is deprecated, use bug_links instead";
-
-     return munge_url('bugreport.cgi?',%params,bug=>$ref);
-}
-
-sub pkg_url{
-     my %params;
-     if (@_ % 2) {
-	  shift;
-	  %params = (%URL_PARAMS,@_);
-     }
-     else {
-	  %params = @_;
-     }
-     carp "pkg_url is deprecated, use package_links instead";
-     return munge_url('pkgreport.cgi?',%params);
-}
-
 =head2 munge_url
 
      my $url = munge_url($url,%params_to_munge);
@@ -616,7 +575,7 @@ sub emailfromrfc822{
      return $addr;
 }
 
-sub mainturl { package_links(maint => $_[0], links_only => 1); }
+sub mainturl { package_links(maintainer => $_[0], links_only => 1); }
 sub submitterurl { package_links(submitter => $_[0], links_only => 1); }
 sub htmlize_maintlinks {
     my ($prefixfunc, $maints) = @_;
@@ -624,10 +583,6 @@ sub htmlize_maintlinks {
     return htmlize_addresslinks($prefixfunc, \&mainturl, $maints);
 }
 
-
-our $_maintainer;
-our $_maintainer_rev;
-
 =head2 bug_linklist
 
      bug_linklist($separator,$class,@bugs)
@@ -637,8 +592,7 @@ link class C<$class>.
 
 XXX Use L<Params::Validate>; we want to be able to support query
 arguments here too; we should be able to combine bug_links and this
-function into one. [Hell, bug_url should be one function with this one
-too.]
+function into one.
 
 =cut
 
@@ -843,7 +797,6 @@ sub option_form{
      for my $key (keys %{$param{form_option}}) {
 	  # strip out leader; shouldn't be anything here without one,
 	  # but skip stupid things anyway
-	  my $o_key = $key;
 	  next unless $key =~ s/^\Q$form_option_leader\E//;
 	  if ($key =~ /^add_(.+)$/) {
 	       # this causes a specific parameter to be added
@@ -867,23 +820,6 @@ sub option_form{
 	  # we'll add extra comands here once I figure out what they
 	  # should be
      }
-     # add in a few utility routines
-     $variables->{output_select_options} = sub {
-	  my ($options,$value) = @_;
-	  my @options = @{$options};
-	  my $output = '';
-	  while (my ($o_value,$name) = splice @options,0,2) {
-	       my $selected = '';
-	       if (defined $value and $o_value eq $value) {
-		    $selected = ' selected';
-	       }
-	       $output .= q(<option value=").html_escape($o_value).qq("$selected>).
-		   html_escape($name).qq(</option>\n);
-	  }
-	  return $output;
-     };
-     $variables->{make_list} = sub { make_list(@_);
-     };
      # now at this point, we're ready to create the template
      return Debbugs::Text::fill_in_template(template=>$param{template},
 					    (exists $param{language}?(language=>$param{language}):()),