X-Git-Url: http://git.freeside.biz/gitweb/?p=freeside.git;a=blobdiff_plain;f=httemplate%2Fview%2Fsvc_acct.cgi;h=496dab366e4c7bbb59ff08bd93b3fd1e5e8fd337;hp=ad7e6539d8947daf24451b1179321c9ec087303a;hb=87af741da0dd5f6a76bbb566b4d6c54cd5b15315;hpb=844855ae401bc5a7167b5fa8898275f89719ed71
diff --git a/httemplate/view/svc_acct.cgi b/httemplate/view/svc_acct.cgi
index ad7e6539d..496dab366 100755
--- a/httemplate/view/svc_acct.cgi
+++ b/httemplate/view/svc_acct.cgi
@@ -1,51 +1,45 @@
+
<%
-#
-
-use strict;
-use vars qw( $conf $cgi $svc_domain $query $svcnum $svc_acct $cust_svc $pkgnum
- $cust_pkg $custnum $part_svc $p $svc_acct_pop $password );
-use CGI;
-use CGI::Carp qw( fatalsToBrowser );
-use FS::UID qw( cgisuidsetup );
-use FS::CGI qw( header popurl menubar);
-use FS::Record qw( qsearchs fields );
-use FS::Conf;
-use FS::svc_acct;
-use FS::cust_svc;
-use FS::cust_pkg;
-use FS::part_svc;
-use FS::svc_acct_pop;
-use FS::raddb;
-
-$cgi = new CGI;
-&cgisuidsetup($cgi);
-
-$conf = new FS::Conf;
-
-($query) = $cgi->keywords;
+
+my $conf = new FS::Conf;
+my $mydomain = $conf->config('domain');
+
+my($query) = $cgi->keywords;
$query =~ /^(\d+)$/;
-$svcnum = $1;
-$svc_acct = qsearchs('svc_acct',{'svcnum'=>$svcnum});
+my $svcnum = $1;
+my $svc_acct = qsearchs('svc_acct',{'svcnum'=>$svcnum});
die "Unknown svcnum" unless $svc_acct;
-$cust_svc = qsearchs('cust_svc',{'svcnum'=>$svcnum});
-$pkgnum = $cust_svc->getfield('pkgnum');
+#false laziness w/all svc_*.cgi
+my $cust_svc = qsearchs( 'cust_svc' , { 'svcnum' => $svcnum } );
+my $pkgnum = $cust_svc->getfield('pkgnum');
+my($cust_pkg, $custnum);
if ($pkgnum) {
- $cust_pkg=qsearchs('cust_pkg',{'pkgnum'=>$pkgnum});
- $custnum=$cust_pkg->getfield('custnum');
+ $cust_pkg = qsearchs( 'cust_pkg', { 'pkgnum' => $pkgnum } );
+ $custnum = $cust_pkg->custnum;
} else {
$cust_pkg = '';
$custnum = '';
}
+#eofalse
-$part_svc = qsearchs('part_svc',{'svcpart'=> $cust_svc->svcpart } );
+my $part_svc = qsearchs('part_svc',{'svcpart'=> $cust_svc->svcpart } );
die "Unknown svcpart" unless $part_svc;
-$svc_domain = qsearchs('svc_domain', { 'svcnum' => $svc_acct->domsvc } );
-die "Unknown domain" unless $svc_domain;
+my $domain;
+if ( $svc_acct->domsvc ) {
+ my $svc_domain = qsearchs('svc_domain', { 'svcnum' => $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;
+}
-$p = popurl(2);
-print $cgi->header( '-expires' => 'now' ), header('Account View', menubar(
+print header('Account View', menubar(
( ( $pkgnum || $custnum )
? ( "View this package (#$pkgnum)" => "${p}view/cust_pkg.cgi?$pkgnum",
"View this customer (#$custnum)" => "${p}view/cust_main.cgi?$custnum",
@@ -58,63 +52,94 @@ print $cgi->header( '-expires' => 'now' ), header('Account View', menubar(
#print qq!
Send account information!;
-print qq!Edit this information!,
- "
Service #$svcnum",
- "
Service: ", $part_svc->svc, "",
- "
Username: ", $svc_acct->username, ""
+print qq!Edit this information
!.
+ &ntable("#cccccc"). '| '. &ntable("#cccccc",2).
+ " |
| Service number | ".
+ "$svcnum |
".
+ "| Service | ".
+ "". $part_svc->svc. " |
".
+ "| Username | ".
+ "". $svc_acct->username. " |
"
;
-print "
Domain: ", $svc_domain->domain, "";
+print "| Domain | ".
+ "". $domain, " |
";
-print "
Password: ";
-$password = $svc_acct->_password;
+print "| Password | ";
+my $password = $svc_acct->_password;
if ( $password =~ /^\*\w+\* (.*)$/ ) {
$password = $1;
print "(login disabled) ";
}
if ( $conf->exists('showpasswords') ) {
- print "$password";
+ print "$password";
} else {
print "(hidden)";
}
+print " |
";
$password = '';
-$svc_acct_pop = qsearchs('svc_acct_pop',{'popnum'=>$svc_acct->popnum});
-print "
POP: ", $svc_acct_pop->city, ", ", $svc_acct_pop->state,
- " (", $svc_acct_pop->ac, ")/", $svc_acct_pop->exch, ""
+if ( $conf->exists('security_phrase') ) {
+ my $sec_phrase = $svc_acct->sec_phrase;
+ print '| Security phrase | '.
+ $svc_acct->sec_phrase. ' |
;
+}
+
+my $svc_acct_pop = qsearchs('svc_acct_pop',{'popnum'=>$svc_acct->popnum});
+print "| Access number | ".
+ "". $svc_acct_pop->text. ' |
'
if $svc_acct_pop;
if ($svc_acct->uid ne '') {
- print "
Uid: ", $svc_acct->uid, "",
- "
Gid: ", $svc_acct->gid, "",
- "
Finger name: ", $svc_acct->finger, "",
- "
Home directory: ", $svc_acct->dir, "",
- "
Shell: ", $svc_acct->shell, "",
- "
Quota: ", $svc_acct->quota, " (unimplemented)"
+ print "| Uid | ".
+ "". $svc_acct->uid. " |
",
+ "| Gid | ".
+ "". $svc_acct->gid. " |
",
+ "| GECOS | ".
+ "". $svc_acct->finger. " |
",
+ "| Home directory | ".
+ "". $svc_acct->dir. " |
",
+ "| Shell | ".
+ "". $svc_acct->shell. " |
",
+ "| Quota | ".
+ "". $svc_acct->quota. " |
"
;
} else {
- print "
(No shell account)";
+ print "| (No shell account) |
|---|
";
}
if ($svc_acct->slipip) {
- print "
IP address: ", ( $svc_acct->slipip eq "0.0.0.0" || $svc_acct->slipip eq '0e0' ) ? "(Dynamic)" : $svc_acct->slipip ,"";
+ print "| IP address | ".
+ ( ( $svc_acct->slipip eq "0.0.0.0" || $svc_acct->slipip eq '0e0' )
+ ? "(Dynamic)"
+ : $svc_acct->slipip
+ ). " | ";
my($attribute);
foreach $attribute ( grep /^radius_/, fields('svc_acct') ) {
#warn $attribute;
$attribute =~ /^radius_(.*)$/;
my $pattribute = $FS::raddb::attrib{$1};
- print "
Radius (reply) $pattribute: ". $svc_acct->getfield($attribute), "";
+ print "
| Radius (reply) $pattribute | ".
+ "". $svc_acct->getfield($attribute).
+ " |
";
}
foreach $attribute ( grep /^rc_/, fields('svc_acct') ) {
#warn $attribute;
$attribute =~ /^rc_(.*)$/;
my $pattribute = $FS::raddb::attrib{$1};
- print "
Radius (check) $pattribute: ". $svc_acct->getfield($attribute), "";
+ print "| Radius (check) $pattribute: | ".
+ "". $svc_acct->getfield($attribute).
+ " |
";
}
} else {
- print "
(No SLIP/PPP account)";
+ print "| (No SLIP/PPP account) |
|---|
";
}
-print "