use FS::Conf;

diff --git a/htdocs/search/svc_acct_sm.cgi b/htdocs/search/svc_acct_sm.cgi
index 3b1a4cf..38656ea 100755 (executable)
--- a/htdocs/search/svc_acct_sm.cgi
+++ b/htdocs/search/svc_acct_sm.cgi
@@ -19,18 +19,15 @@
 #       bmccane@maxbaud.net     98-apr-3
 
 use strict;
+use vars qw($conf);
 use CGI::Request;
 use CGI::Carp qw(fatalsToBrowser);
 use FS::UID qw(cgisuidsetup);
 use FS::Record qw(qsearch qsearchs);
+use FS::Conf;
 
-my($conf_domain)="/var/spool/freeside/conf/domain";
-open(DOMAIN,$conf_domain) or die "Can't open $conf_domain: $!";
-my($mydomain)=map {
-  /^(.*)$/ or die "Illegal line in $conf_domain!"; #yes, we trust the file
-  $1
-} grep $_ !~ /^(#|$)/, <DOMAIN>;
-close DOMAIN;
+$conf = new FS::Conf;
+my $mydomain = $conf->config('domain');
 
 my($req)=new CGI::Request; # create form object
 &cgisuidsetup($req->cgi);

diff --git a/htdocs/view/svc_acct.cgi b/htdocs/view/svc_acct.cgi
index 7096c2f..e48878c 100755 (executable)
--- a/htdocs/view/svc_acct.cgi
+++ b/htdocs/view/svc_acct.cgi
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -Tw
 #
-# View svc_acct records
+# $Id: svc_acct.cgi,v 1.2 1998-12-16 05:24:29 ivan Exp $
 #
 # Usage: svc_acct.cgi svcnum
 #        http://server.name/path/svc_acct.cgi?svcnum
@@ -33,19 +33,22 @@
 # /var/spool/freeside/conf/domain ivan@sisd.com 98-jul-17
 #
 # displays arbitrary radius attributes ivan@sisd.com 98-aug-16
+#
+# $Log: svc_acct.cgi,v $
+# Revision 1.2  1998-12-16 05:24:29  ivan
+# use FS::Conf;
+#
 
 use strict;
+use vars qw($conf);
 use CGI::Base qw(:DEFAULT :CGI);
 use CGI::Carp qw(fatalsToBrowser);
 use FS::UID qw(cgisuidsetup);
 use FS::Record qw(qsearchs fields);
+use FS::Conf;
 
-my($conf_domain)="/var/spool/freeside/conf/domain";
-open(DOMAIN,$conf_domain) or die "Can't open $conf_domain: $!";
-my($mydomain)=map {
-  /^(.*)$/ or die "Illegal line in $conf_domain!"; #yes, we trust the file
-  $1;
-} grep $_ !~ /^(#|$)/, <DOMAIN>;
+$conf = new FS::Conf;
+my $mydomain = $conf->config('domain');
 
 my($cgi) = new CGI::Base;
 $cgi->get;

diff --git a/htdocs/view/svc_acct_sm.cgi b/htdocs/view/svc_acct_sm.cgi
index 42623ee..00aa555 100755 (executable)
--- a/htdocs/view/svc_acct_sm.cgi
+++ b/htdocs/view/svc_acct_sm.cgi
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -Tw
 #
-# View svc_acct_sm records
+# $Id: svc_acct_sm.cgi,v 1.2 1998-12-16 05:24:30 ivan Exp $
 #
 # Usage: svc_acct_sm.cgi svcnum
 #        http://server.name/path/svc_acct_sm.cgi?svcnum
@@ -20,19 +20,21 @@
 #       bmccane@maxbaud.net     98-apr-3
 #
 # /var/spool/freeside/conf/domain ivan@sisd.com 98-jul-17
+#
+# $Log: svc_acct_sm.cgi,v $
+# Revision 1.2  1998-12-16 05:24:30  ivan
+# use FS::Conf;
+#
 
 use strict;
+use vars qw($conf);
 use CGI::Base qw(:DEFAULT :CGI);
 use FS::UID qw(cgisuidsetup);
 use FS::Record qw(qsearchs);
+use FS::Conf;
 
-my($conf_domain)="/var/spool/freeside/conf/domain";
-open(DOMAIN,$conf_domain) or die "Can't open $conf_domain: $!";
-my($mydomain)=map {
-  /^(.*)$/ or die "Illegal line in $conf_domain!"; #yes, we trust the file
-  $1
-} grep $_ !~ /^(#|$)/, <DOMAIN>;
-close DOMAIN;
+$conf = new FS::Conf;
+my $mydomain = $conf->config('domain');
 
 my($cgi) = new CGI::Base;
 $cgi->get;