more info in error message for unknown export type, fix test for sqlradius_withdomain...

[freeside.git] / httemplate / search / sqlradius.cgi

diff --git a/httemplate/search/sqlradius.cgi b/httemplate/search/sqlradius.cgi
index bb51acb..b506ba1 100644 (file)
--- a/httemplate/search/sqlradius.cgi
+++ b/httemplate/search/sqlradius.cgi
@@ -64,7 +64,7 @@
       $svc_acct = $user2svc_acct{$user};
     } else {
       my %search = ();
-      if ( $part_export->exporrtype eq 'sqlradius_withdomain' ) {
+      if ( $part_export->exporttype eq 'sqlradius_withdomain' ) {
         my $domain;
         if ( $user =~ /^([^@]+)\@([^@]+)$/ ) {
          $search{'username'} = $1;
@@ -82,7 +82,8 @@
       } elsif ( $part_export->exporttype eq 'sqlradius' ) {
         $search{'username'} = $user;
       } else {
-        die "guru meditation #420";
+        die 'unknown export type '. $part_export->exporttype.
+            " for $part_export\n";
       }
       if ( keys %search ) {
         my @svc_acct =
@@ -125,7 +126,7 @@
     my $time = shift;
     return ' ' if $time == 0;
     my $pretty = time2str('%T%P %a %b %o %Y', $time );
-    $pretty =~ s/ (\d)(st|dn|rd|th)/ $1$2/;
+    $pretty =~ s/ (\d)(st|dn|rd|th)/$1$2/;
     $pretty;
   };
 
@@ -161,15 +162,18 @@
                              name    => 'User',
                              attrib  => 'UserName',
                              fmt     => $user_format,
+                             align   => 'left',
                            },
     'realm'             => {
                              name    => 'Realm',
                              attrib  => 'Realm',
+                             align   => 'left',
                            },
     'dummy'             => {
                              name    => 'Customer',
                              attrib  => '',
                              fmt     => $customer_format,
+                             align   => 'left',
                            },
     'framedipaddress'   => {
                              name    => 'IP Address',
@@ -177,31 +181,37 @@
                              fmt     => sub { my $ip = shift;
                                               length($ip) ? $ip : '&nbsp';
                                             },
+                             align   => 'right',
                            },
     'acctstarttime'     => {
                              name    => 'Start time',
                              attrib  => 'Acct-Start-Time',
                              fmt     => $time_format,
+                             align   => 'left',
                            },
     'acctstoptime'      => {
                              name    => 'End time',
                              attrib  => 'Acct-Stop-Time',
                              fmt     => $time_format,
+                             align   => 'left',
                            },
     'acctsessiontime'   => {
                              name    => 'Duration',
                              attrib  => 'Acct-Session-Time',
                              fmt     => $duration_format,
+                             align   => 'right',
                            },
     'acctinputoctets'   => {
                              name    => 'Upload', # (from user)',
                              attrib  => 'Acct-Input-Octets',
                              fmt     => $octets_format,
+                             align   => 'right',
                            },
     'acctoutputoctets'  => {
                              name    => 'Download', # (to user)',
                              attrib  => 'Acct-Output-Octets',
                              fmt     => $octets_format,
+                             align   => 'right',
                            },
   ;
   $fields{$_}->{fmt} ||= sub { length($_[0]) ? shift : '&nbsp'; }
@@ -233,7 +243,7 @@
 ) { %>
   <TR>
     <% foreach my $field ( keys %fields ) { %>
-      <TD ALIGN="right">
+      <TD ALIGN="<%= $fields{$field}->{align} %>">
         <%= &{ $fields{$field}->{fmt} }( $session->{$field},
                                          $session,
                                          $part_export,