X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=httemplate%2Fview%2Fsvc_acct.cgi;h=e755f87d7f8896e5047d542a0f33357dd16b6c64;hb=05030dc1852f7886f3b792b5a5fe469dcaa36199;hp=a4e377078df0fcbb435ee37a9eb765224511b03e;hpb=1fd6d8cf5d7854860ef4fd10ed89828e0c04ec39;p=freeside.git

diff --git a/httemplate/view/svc_acct.cgi b/httemplate/view/svc_acct.cgi
index a4e377078..e755f87d7 100755
--- a/httemplate/view/svc_acct.cgi
+++ b/httemplate/view/svc_acct.cgi
@@ -1,8 +1,7 @@
-<!-- $Id: svc_acct.cgi,v 1.10 2002-01-30 14:18:09 ivan Exp $ -->
+<!-- mason kludge -->
 <%
 
 my $conf = new FS::Conf;
-my $mydomain = $conf->config('domain');
 
 my($query) = $cgi->keywords;
 $query =~ /^(\d+)$/;
@@ -32,23 +31,30 @@ 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;
+}
+
+%>
+
+<SCRIPT>
+function areyousure(href) {
+    if (confirm("Permanently delete this account?") == true)
+        window.location.href = href;
 }
+</SCRIPT>
 
-print header('Account View', menubar(
+<%= 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",
       )
     : ( "Cancel this (unaudited) account" =>
-          "${p}misc/cancel-unaudited.cgi?$svcnum" )
+          "javascript:areyousure(\'${p}misc/cancel-unaudited.cgi?$svcnum\')" )
   ),
   "Main menu" => $p,
-));
+)) %>
+
+<%
 
 #print qq!<BR><A HREF="../misc/sendconfig.cgi?$svcnum">Send account information</A>!;
 
@@ -72,13 +78,19 @@ if ( $password =~ /^\*\w+\* (.*)$/ ) {
   print "<I>(login disabled)</I> ";
 }
 if ( $conf->exists('showpasswords') ) {
-  print "$password";
+  print '<PRE>'. encode_entities($password). '</PRE>';
 } else {
   print "<I>(hidden)</I>";
 }
 print "</TR></TD>";
 $password = '';
 
+if ( $conf->exists('security_phrase') ) {
+  my $sec_phrase = $svc_acct->sec_phrase;
+  print '<TR><TD ALIGN="right">Security phrase</TD><TD BGCOLOR="#ffffff">'.
+        $svc_acct->sec_phrase. '</TD></TR>';
+}
+
 my $svc_acct_pop = qsearchs('svc_acct_pop',{'popnum'=>$svc_acct->popnum});
 print "<TR><TD ALIGN=\"right\">Access number</TD>".
       "<TD BGCOLOR=\"#ffffff\">". $svc_acct_pop->text. '</TD></TR>'
@@ -129,6 +141,41 @@ if ($svc_acct->slipip) {
   print "<TR><TH COLSPAN=2>(No SLIP/PPP account)</TH></TR>";
 }
 
-print "</TABLE></TD></TR></TABLE></BODY></HTML>";
+print '<TR><TD ALIGN="right">RADIUS groups</TD><TD BGCOLOR="#ffffff">'.
+      join('<BR>', $svc_acct->radius_groups). '</TD></TR>';
+
+print '</TABLE></TD></TR></TABLE><BR><BR>';
+
+if ( $cust_pkg && $cust_pkg->part_pkg->plan eq 'sqlradacct_hour' ) {
+
+  #false laziness w/httemplate/edit/part_pkg... this stuff doesn't really
+  #belong in plan data
+  my %plandata = map { /^(\w+)=(.*)$/; ( $1 => $2 ); }
+                    split("\n", $cust_pkg->part_pkg->plandata );
+
+  my $last_bill = $cust_pkg->last_bill;
+  my $seconds = $svc_acct->seconds_since_sqlradacct(
+    $last_bill,
+    time,
+    $plandata{sql_datasrc},
+    $plandata{sql_username},
+    $plandata{sql_password},
+  );
+  my $h = int($seconds/3600);
+  my $m = int( ($seconds%3600) / 60 );
+  my $s = $seconds%60;
+  if ( $seconds ) {
+    print 'Online $h h $m m $s s this billing cycle (since '.
+          time2str(%C, $last_bill). ') - '. 
+          $plandata{recur_included_hours}. ' total hours in plan<BR><BR>';
+  } else {
+    print 'Has not logged on this billing cycle (since '.
+          time2str(%C, $last_bill). ')<BR><BR>';
+  }
+
+}
+
+print join("\n", $conf->config('svc_acct-notes') ).  '<BR><BR>'.
+      joblisting({'svcnum'=>$svcnum}, 1). '</BODY></HTML>';
 
 %>