From c1e33a61324f4e06157c522af7882a97a021830f Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Wed, 18 Sep 2002 22:50:44 +0000
Subject: remove domain config file, closes: Bug#269

---
 httemplate/edit/svc_forward.cgi  |  1 -
 httemplate/search/svc_acct.cgi   | 25 ++++---------------------
 httemplate/search/svc_domain.cgi |  1 -
 httemplate/view/svc_acct.cgi     |  7 +------
 4 files changed, 5 insertions(+), 29 deletions(-)

(limited to 'httemplate')

diff --git a/httemplate/edit/svc_forward.cgi b/httemplate/edit/svc_forward.cgi
index bc19fe1de..0d815b9e5 100755
--- a/httemplate/edit/svc_forward.cgi
+++ b/httemplate/edit/svc_forward.cgi
@@ -2,7 +2,6 @@
 <%
 
 my $conf = new FS::Conf;
-my $mydomain = $conf->config('domain');
 
 my($svcnum, $pkgnum, $svcpart, $part_svc, $svc_forward);
 if ( $cgi->param('error') ) {
diff --git a/httemplate/search/svc_acct.cgi b/httemplate/search/svc_acct.cgi
index 549231d3f..dcf261296 100755
--- a/httemplate/search/svc_acct.cgi
+++ b/httemplate/search/svc_acct.cgi
@@ -1,7 +1,5 @@
 <%
 
-my $mydomain = '';
-
 my $conf = new FS::Conf;
 my $maxrecords = $conf->config('maxsearchrecordsperpage');
 
@@ -147,14 +145,8 @@ END
       $domain = "<A HREF=\"${p}view/svc_domain.cgi?". $svc_domain->svcnum.
                 "\">". $svc_domain->domain. "</A>";
     } else {
-      unless ( $mydomain ) {
-        my $conf = new FS::Conf;
-        unless ( $mydomain = $conf->config('domain') ) {
-          die "No legacy domain config file and no svc_domain.svcnum record ".
-              "for svc_acct.domsvc: ". $svc_acct->domsvc;
-        }
-      }
-      $domain = "<i>$mydomain</i><FONT COLOR=\"#FF0000\">*</FONT>";
+      die "No svc_domain.svcnum record for svc_acct.domsvc: ".'
+          $svc_acct->domsvc;
     }
     my($cust_pkg,$cust_main);
     if ( $cust_svc->pkgnum ) {
@@ -216,17 +208,8 @@ END
 
   }
  
-  print "</TABLE>$pager<BR>";
-
-  if ( $mydomain ) {
-    print "<BR><FONT COLOR=\"#FF0000\">*</FONT> The <I>$mydomain</I> domain ".
-          "is contained in your legacy <CODE>domain</CODE> ".
-          "<A HREF=\"${p}docs/config.html#domain\">configuration file</A>.  ".
-          "You should run the <CODE>bin/fs-migrate-svc_acct_sm</CODE> script ".
-          "to create a proper svc_domain record for this domain.";
-  }
-
-  print '</BODY></HTML>';
+  print "</TABLE>$pager<BR>".
+        '</BODY></HTML>';
 
 }
 
diff --git a/httemplate/search/svc_domain.cgi b/httemplate/search/svc_domain.cgi
index 0bb39f191..60f1f8c81 100755
--- a/httemplate/search/svc_domain.cgi
+++ b/httemplate/search/svc_domain.cgi
@@ -1,7 +1,6 @@
 <%
 
 my $conf = new FS::Conf;
-my $mydomain = $conf->config('domain');
 
 my($query)=$cgi->keywords;
 $query ||= ''; #to avoid use of unitialized value errors
diff --git a/httemplate/view/svc_acct.cgi b/httemplate/view/svc_acct.cgi
index 19953bafd..df55e85bf 100755
--- a/httemplate/view/svc_acct.cgi
+++ b/httemplate/view/svc_acct.cgi
@@ -2,7 +2,6 @@
 <%
 
 my $conf = new FS::Conf;
-my $mydomain = $conf->config('domain');
 
 my($query) = $cgi->keywords;
 $query =~ /^(\d+)$/;
@@ -32,11 +31,7 @@ if ( $svc_acct->domsvc ) {
   die "Unknown domain" unless $svc_domain;
   $domain = $svc_domain->domain;
 } else {
-  unless ( $mydomain ) {
-    die "No legacy domain config file and no svc_domain.svcnum record ".
-        "for svc_acct.domsvc: ". $cust_svc->domsvc;
-  }
-  $domain = $mydomain;
+  die "No svc_domain.svcnum record for svc_acct.domsvc: ". $cust_svc->domsvc;
 }
 
 %>
-- 
cgit v1.2.1