X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=httemplate%2Fsearch%2Fsvc_domain.cgi;h=fb372db1416099d001fc6264aa606891ad410d92;hb=d83a273f3ac71431f5b007bb83fb55d7c83eae5c;hp=fb386e2cfbcc53d4c702713c434be6e38fe300a9;hpb=3d671921441ba8422650b54435a1959ad1d4c71d;p=freeside.git

diff --git a/httemplate/search/svc_domain.cgi b/httemplate/search/svc_domain.cgi
index fb386e2cf..fb372db14 100755
--- a/httemplate/search/svc_domain.cgi
+++ b/httemplate/search/svc_domain.cgi
@@ -1,26 +1,11 @@
 <%
-# <!-- $Id: svc_domain.cgi,v 1.3 2001-08-21 02:31:57 ivan Exp $ -->
-
-use strict;
-use vars qw ( $cgi @svc_domain $sortby $query $conf $mydomain );
-use CGI;
-use CGI::Carp qw(fatalsToBrowser);
-use FS::UID qw(cgisuidsetup);
-use FS::Record qw(qsearch qsearchs);
-use FS::CGI qw(header eidiot popurl);
-use FS::svc_domain;
-use FS::cust_svc;
-use FS::svc_acct;
-use FS::svc_forward;
-
-$cgi = new CGI;
-&cgisuidsetup($cgi);
-
-$conf = new FS::Conf;
-$mydomain = $conf->config('domain');
-
-($query)=$cgi->keywords;
+
+my $conf = new FS::Conf;
+my $mydomain = $conf->config('domain');
+
+my($query)=$cgi->keywords;
 $query ||= ''; #to avoid use of unitialized value errors
+my(@svc_domain,$sortby);
 if ( $query eq 'svcnum' ) {
   $sortby=\*svcnum_sort;
   @svc_domain=qsearch('svc_domain',{});
@@ -48,14 +33,18 @@ if ( $query eq 'svcnum' ) {
 
 if ( scalar(@svc_domain) == 1 ) {
   print $cgi->redirect(popurl(2). "view/svc_domain.cgi?". $svc_domain[0]->svcnum);
-  exit;
+  #exit;
 } elsif ( scalar(@svc_domain) == 0 ) {
+%>
+<!-- mason kludge -->
+<%
   eidiot "No matching domains found!\n";
 } else {
-
+%>
+<!-- mason kludge -->
+<%
   my($total)=scalar(@svc_domain);
-  print $cgi->header( '-expires' => 'now' ),
-        header("Domain Search Results",''), <<END;
+  print header("Domain Search Results",''), <<END;
 
     $total matching domains found
     <TABLE BORDER=4 CELLSPACING=0 CELLPADDING=0>
@@ -70,9 +59,7 @@ END
 #  my(%saw);                 # if we've multiple domains with the same
                              # svcnum, then we've a corrupt database
 
-  my($svc_domain);
-  my $p = popurl(2);
-  foreach $svc_domain (
+  foreach my $svc_domain (
 #    sort $sortby grep(!$saw{$_->svcnum}++, @svc_domain)
     sort $sortby (@svc_domain)
   ) {