$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;
} 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 =
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;
};
my $duration_format = sub {
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',
+ name => 'IP Address',
attrib => 'Framed-IP-Address',
fmt => sub { my $ip = shift;
length($ip) ? $ip : ' ';
},
+ align => 'right',
},
'acctstarttime' => {
- name => 'Start time',
+ name => 'Start time',
attrib => 'Acct-Start-Time',
fmt => $time_format,
+ align => 'left',
},
'acctstoptime' => {
- name => 'End time',
+ 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 : ' '; }
) { %>
<TR>
<% foreach my $field ( keys %fields ) { %>
- <TD ALIGN="right">
+ <TD ALIGN="<%= $fields{$field}->{align} %>">
<%= &{ $fields{$field}->{fmt} }( $session->{$field},
$session,
$part_export,