Fix default user for usertags

[debbugs.git] / cgi / search.cgi

diff --git a/cgi/search.cgi b/cgi/search.cgi
index b1f5e09f84724a8b3e38377db960073d275b7ce9..275be8ab3f232e87b162135b6f9d515036eccd20 100755 (executable)
--- a/cgi/search.cgi
+++ b/cgi/search.cgi
@@ -3,11 +3,11 @@
 use warnings;
 use strict;
 
-# Hack to work on merkel where suexec is in place
+# Hack to work on bugs-search.debian.org
 BEGIN{
-     if ($ENV{HTTP_HOST} eq 'merkel.debian.org') {
-         unshift @INC, qw(/home/don/perl/usr/share/perl5 /home/don/perl/usr/lib/perl5 /home/don/source);
-         $ENV{DEBBUGS_CONFIG_FILE}="/home/don/config_internal";
+     if ($ENV{HTTP_HOST} eq 'bugs-search.debian.org') {
+         unshift @INC, qw(/srv/bugs.debian.org/source/debian/);
+         $ENV{DEBBUGS_CONFIG_FILE}="/srv/bugs.debian.org/etc/config";
      }
 }
 
@@ -198,11 +198,11 @@ for my $attribute (@{$cgi_var{attribute}}) {
      }
      print qq(</select>\n);
      $$attribute{value}='' if not defined $$attribute{value};
-     print qq(<input type="text" name="attribute_value" value="$$attribute{value}"><input type="submit" name="delete_attribute_$attr_num" value="Delete"><br/>\n);
+     print qq(<input type="text" name="attribute_value" value="$$attribute{value}"><input type="submit" name="delete_attribute_$attr_num" value="Delete"><br>\n);
      $attr_num++;
 
 }
-print qq(<input type="submit" name="add_attribute" value="Add Attribute"><br/>);
+print qq(<input type="submit" name="add_attribute" value="Add Attribute"><br>);
 
 # order
 
@@ -269,9 +269,9 @@ if (defined $nres) {
          my $showseverity;
          $showseverity = "Severity: <em>$attr{severity}</em>;\n";
          print <<END;
-<li><a href="$url${bugnum}#${msgnum}">#${bugnum}: $attr{'@title'}</a> @{[htmlize_packagelinks($attr{package})]}<br/>
-$showseverity<br/>
-Sent by: @{[encode_entities($attr{'@author'})]} at $attr{'@cdate'}<br/>
+<li><a href="$url${bugnum}#${msgnum}">#${bugnum}: $attr{'@title'}</a> @{[htmlize_packagelinks($attr{package})]}<br>
+$showseverity<br>
+Sent by: @{[encode_entities($attr{'@author'})]} at $attr{'@cdate'}<br>
 END
          # Deal with the snippet
          # make the things that match bits of the phrase bold, the rest normal.