X-Git-Url: http://git.freeside.biz/gitweb/?p=freeside.git;a=blobdiff_plain;f=httemplate%2Fsearch%2Fsqlradius.cgi;h=f7873e72fbf37ef5e4121b444a1ed6fe16c50177;hp=5363944e47ce1bd08cd57acd029ff343b43a0d8d;hb=e9e0cf0989259b94d9758eceff448666a2e5a5cc;hpb=fb4ab1073f0d15d660c6cdc4e07afebf68ef3924

diff --git a/httemplate/search/sqlradius.cgi b/httemplate/search/sqlradius.cgi
index 5363944e4..f7873e72f 100644
--- a/httemplate/search/sqlradius.cgi
+++ b/httemplate/search/sqlradius.cgi
@@ -4,12 +4,9 @@
 % # and finally, display the thing
 % ### 
 %
-% foreach my $part_export (
-%   #grep $_->can('usage_sessions'), qsearch( 'part_export' )
-%   qsearch( 'part_export', { 'exporttype' => 'sqlradius' } ),
-%   qsearch( 'part_export', { 'exporttype' => 'sqlradius_withdomain' } )
-% ) {
-%   %user2svc_acct = ();
+% foreach my $part_export ( @part_export ) {
+%
+%   %user2svc = ();
 %
 %   my $efields = tie my %efields, 'Tie::IxHash', %fields;
 %   delete $efields{'framedipaddress'} if $part_export->option('hide_ip');
@@ -27,10 +24,12 @@
 %                            },
 %     );
 %   }
-%
-%
 
-    <% $part_export->exporttype %> to <% $part_export->machine %><BR>
+    <FONT CLASS="fsinnerbox-title">
+      <% $part_export->exportname || $part_export->exporttype |h %>
+      <% $part_export->machine ? ' to '. $part_export->machine : '' |h %>
+    </FONT><BR>
+
     <% include( '/elements/table-grid.html' ) %>
 %   my $bgcolor1 = '#eeeeee';
 %   my $bgcolor2 = '#ffffff';
@@ -51,10 +50,10 @@
 %       @{ $part_export->usage_sessions( {
 %            'stoptime_start'  => $beginning,
 %            'stoptime_end'    => $ending,
-%            'open_sessions'   => $open_sessions,
+%            'session_status'  => $status,
 %            'starttime_start' => $starttime_beginning,
 %            'starttime_end'   => $starttime_ending,
-%            'svc_acct'        => $cgi_svc_acct,
+%            'svc'             => $cgi_svc,
 %            'ip'              => $ip,
 %            'prefix'          => $prefix, 
 %            'summarize'       => $summarize,
@@ -117,9 +116,9 @@ if ( $cgi->param('end') && $cgi->param('end') =~ /^(\d+)$/ ) {
   $ending = $1;
 }
 
-my $open_sessions = '';
-if ( $cgi->param('open_sessions') =~ /^(\d*)$/ ) {
-  $open_sessions = $1;
+my $status = '';
+if ( $cgi->param('session_status') =~ /^(closed|open)$/ ) {
+  $status = $1;
 }
 
 my( $starttime_beginning, $starttime_ending ) = ( '', '' );
@@ -132,9 +131,10 @@ if ( $cgi->param('starttime_ending')
   $starttime_ending = parse_datetime($1); # + 86399;
 }
 
-my $cgi_svc_acct = '';
+my $cgi_svc = '';
 if ( $cgi->param('svcnum') =~ /^(\d+)$/ ) {
-  $cgi_svc_acct = qsearchs( 'svc_acct', { 'svcnum' => $1 } );
+  $cgi_svc =  qsearchs( 'svc_acct',      { 'svcnum' => $1 } )
+           || qsearchs( 'svc_broadband', { 'svcnum' => $1 } );
 } elsif ( $cgi->param('username') =~ /^([^@]+)\@([^@]+)$/ ) {
   my %search = { 'username' => $1 };
   my $svc_domain = qsearchs('svc_domain', { 'domain' => $2 } );
@@ -143,10 +143,27 @@ if ( $cgi->param('svcnum') =~ /^(\d+)$/ ) {
   } else {
     delete $search{'username'};
   }
-  $cgi_svc_acct = qsearchs( 'svc_acct', \%search )
+  $cgi_svc = qsearchs( 'svc_acct', \%search )
     if keys %search;
 } elsif ( $cgi->param('username') =~ /^(.+)$/ ) {
-  $cgi_svc_acct = qsearchs( 'svc_acct', { 'username' => $1 } );
+  $cgi_svc = qsearchs( 'svc_acct', { 'username' => $1 } );
+}
+
+my @part_export = ();
+if ( $cgi_svc ) {
+  my $part_svc = $cgi_svc->cust_svc->part_svc;
+  @part_export = (
+    $part_svc->part_export('sqlradius'),
+    $part_svc->part_export('sqlradius_withdomain'),
+    $part_svc->part_export('broadband_sqlradius'),
+  );
+} else {
+  @part_export = (
+    #grep $_->can('usage_sessions'), qsearch( 'part_export' )
+    qsearch( 'part_export', { 'exporttype' => 'sqlradius' } ),
+    qsearch( 'part_export', { 'exporttype' => 'sqlradius_withdomain' } ),
+    qsearch( 'part_export', { 'exporttype' => 'broadband_sqlradius' } ),
+  );
 }
 
 my $ip = '';
@@ -167,55 +184,85 @@ if ( $prefix =~ /^(\d+)$/ ) {
 # field formatting subroutines
 ###
 
-my %user2svc_acct = ();
+my %user2svc = ();
 my $user_format = sub {
   my ( $user, $session, $part_export ) = @_;
 
-  my $svc_acct = '';
-  if ( exists $user2svc_acct{$user} ) {
-    $svc_acct = $user2svc_acct{$user};
+  my $svc = '';
+  if ( exists $user2svc{$user} ) {
+    $svc = $user2svc{$user};
   } else {
-    my %search = ();
-    if ( $part_export->exporttype eq 'sqlradius_withdomain' ) {
-      my $domain;
-      if ( $user =~ /^([^@]+)\@([^@]+)$/ ) {
-       $search{'username'} = $1;
-       $domain = $2;
-     } else {
-       $search{'username'} = $user;
-       $domain = $session->{'realm'};
-     }
-     my $svc_domain = qsearchs('svc_domain', { 'domain' => $domain } );
-     if ( $svc_domain ) {
-       $search{'domsvc'} = $svc_domain->svcnum;
-     } else {
-       delete $search{'username'};
-     }
-    } elsif ( $part_export->exporttype eq 'sqlradius' ) {
-      $search{'username'} = $user;
-    } else {
-      die 'unknown export type '. $part_export->exporttype.
-          " for $part_export\n";
-    }
-    if ( keys %search ) {
-      my @svc_acct =
+
+    if ( $part_export->exporttype eq 'broadband_sqlradius' ) {
+
+      ( my $mac = $user ) =~ s/[^0-9a-f]//ig;
+
+      my @svc_broadband =
         grep { qsearchs( 'export_svc', {
                  'exportnum' => $part_export->exportnum,
                  'svcpart'   => $_->cust_svc->svcpart,
                } )
-             } qsearch( 'svc_acct', \%search );
-      if ( @svc_acct ) {
-        warn 'multiple svc_acct records for user $user found; '.
+             } qsearch( 'svc_broadband', {
+                          mac_addr => { op=>'ILIKE', value=>$mac }
+                      });
+
+      if ( @svc_broadband ) {
+        warn 'multiple svc_broadband records for user $user found; '.
              'using first arbitrarily'
-          if scalar(@svc_acct) > 1;
-        $user2svc_acct{$user} = $svc_acct = shift @svc_acct;
+          if scalar(@svc_broadband) > 1;
+        $user2svc{$user} = $svc = shift @svc_broadband;
       }
-    } 
+
+    } else {
+
+      my %search = ();
+      if ( $part_export->exporttype eq 'sqlradius_withdomain' ) {
+        my $domain;
+        if ( $user =~ /^([^@]+)\@([^@]+)$/ ) {
+         $search{'username'} = $1;
+         $domain = $2;
+       } else {
+         $search{'username'} = $user;
+         $domain = $session->{'realm'};
+       }
+       my $svc_domain = qsearchs('svc_domain', { 'domain' => $domain } );
+       if ( $svc_domain ) {
+         $search{'domsvc'} = $svc_domain->svcnum;
+       } else {
+         delete $search{'username'};
+       }
+      } elsif ( $part_export->exporttype eq 'sqlradius' ) {
+        $search{'username'} = $user;
+      } else {
+        die 'unknown export type '. $part_export->exporttype.
+            " for $part_export\n";
+      }
+      if ( keys %search ) {
+        my @svc_acct =
+          grep { qsearchs( 'export_svc', {
+                   'exportnum' => $part_export->exportnum,
+                   'svcpart'   => $_->cust_svc->svcpart,
+                 } )
+               } qsearch( 'svc_acct', \%search );
+        if ( @svc_acct ) {
+          warn 'multiple svc_acct records for user $user found; '.
+               'using first arbitrarily'
+            if scalar(@svc_acct) > 1;
+          $user2svc{$user} = $svc = shift @svc_acct;
+        }
+      } 
+
+    }
+
   }
 
-  if ( $svc_acct ) { 
-    my $svcnum = $svc_acct->svcnum;
-    qq(<A HREF="${p}view/svc_acct.cgi?$svcnum"><B>$user</B></A>);
+  if ( $svc ) { 
+
+    #i should use svc_link, but that's expensive per-user
+    my $svcnum = $svc->svcnum;
+    my $table = $svc->table;
+    qq(<A HREF="${p}view/$table.cgi?$svcnum"><B>$user</B></A>);
+
   } else {
     "<B>$user</B>";
   }
@@ -224,9 +271,9 @@ my $user_format = sub {
 
 my $customer_format = sub {
   my( $unused, $session ) = @_;
-  return '&nbsp;' unless exists $user2svc_acct{$session->{'username'}};
-  my $svc_acct = $user2svc_acct{$session->{'username'}};
-  my $cust_pkg = $svc_acct->cust_svc->cust_pkg;
+  return '&nbsp;' unless exists $user2svc{$session->{'username'}};
+  my $svc = $user2svc{$session->{'username'}};
+  my $cust_pkg = $svc->cust_svc->cust_pkg;
   return '&nbsp;' unless $cust_pkg;
   my $cust_main = $cust_pkg->cust_main;
 
@@ -242,8 +289,15 @@ my $time_format = sub {
   $pretty;
 };
 
+my $time_format_or_open = sub {
+  my $time = shift;
+  return '<CENTER>OPEN</CENTER>' if $time == 0;
+  &{$time_format}($time);
+};
+
 my $duration_format = sub {
   my $seconds = shift;
+  return '' if $seconds eq ''; # open session
   my $hour = int($seconds/3600);
   my $min = int( ($seconds%3600) / 60 );
   my $sec = $seconds%60;
@@ -339,7 +393,7 @@ tie %fields, 'Tie::IxHash',
   'acctstoptime'      => {
                            name    => 'End&nbsp;time',
                            attrib  => 'Acct-Stop-Time',
-                           fmt     => $time_format,
+                           fmt     => $time_format_or_open,
                            align   => 'left',
                          },
   'acctsessiontime'   => {