Merge branch 'patch-2' of https://github.com/gjones2/Freeside (fix closing </SELECT...

[freeside.git] / fs_selfservice / FS-SelfService / cgi / view_usage.html

diff --git a/fs_selfservice/FS-SelfService/cgi/view_usage.html b/fs_selfservice/FS-SelfService/cgi/view_usage.html
index beb1c2e..fd5426a 100644 (file)
--- a/fs_selfservice/FS-SelfService/cgi/view_usage.html
+++ b/fs_selfservice/FS-SelfService/cgi/view_usage.html
@@ -27,8 +27,10 @@
 <%= foreach my $svc ( @svc_acct ) {
       my $link = "${url}view_usage_details;".
         "svcnum=$svc->{'svcnum'};beginning=0;ending=0";
+    my $username = $svc->{'value'};
+    $username =~ s/@.*?$//g if $view_usage_nodomain;
   $OUT .= '<TR><TD>';
-    $OUT .= qq!<A HREF="$link">!. $svc->{'label'}. ': '. $svc->{'value'}.'</A>';
+    $OUT .= qq!<A HREF="$link">!. $svc->{'label'}. ': '. $username .'</A>';
     $OUT .= '</TD><TD ALIGN="right">';
     $OUT .= $svc->{'seconds'};
     $OUT .= '</TD><TD ALIGN="right">';
@@ -118,7 +120,7 @@ foreach my $svc_port ( @svc_port ) {
   $OUT .= '<TR><TD>'. $svc_port->{'label'}. ': '. $svc_port->{'value'}.'</TD>';
   $OUT .= qq! <TD><FORM ACTION="$url" METHOD="GET">
                <INPUT TYPE="hidden" name="svcnum" value="$svcnum">
-               <INPUT TYPE="hidden" name="action" value="view_usage_details">  
+               <INPUT TYPE="hidden" name="action" value="view_port_graph">  
                <INPUT TYPE="hidden" name="session" value="$session_id">  !;
   $OUT .= preset_range($default_start,$default_end,'Last Day',$date_format,$svcnum)
        .' | '.preset_range($default_end-86400*7,$default_end,'Last Week',$date_format,$svcnum)