X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=httemplate%2Fsearch%2Fsvc_acct.cgi;h=c3ddd660bf9c202545af238878fb43f39fa64afb;hb=d1eb981dfbf03363513be788e9166e50794b6e1e;hp=e2abf5625fb348c37a8ba0db27771f51bdf9bd58;hpb=63a268637b2d51a8766412617724b9436439deb6;p=freeside.git

diff --git a/httemplate/search/svc_acct.cgi b/httemplate/search/svc_acct.cgi
index e2abf5625..c3ddd660b 100755
--- a/httemplate/search/svc_acct.cgi
+++ b/httemplate/search/svc_acct.cgi
@@ -10,6 +10,7 @@
                  'align'       => $align,
                  'color'       => \@color,
                  'style'       => \@style,
+                 'footer'      => \@footer,
              )
 %>
 <%once>
@@ -51,8 +52,9 @@ sub timelast {
 </%once>
 <%init>
 
-die "access denied"
-  unless $FS::CurrentUser::CurrentUser->access_right('List services');
+my $curuser =  $FS::CurrentUser::CurrentUser;
+
+die "access denied" unless $curuser->access_right('List services');
 
 my $link      = [ "${p}view/svc_acct.cgi?",   'svcnum'  ];
 my $link_cust = sub {
@@ -67,12 +69,52 @@ my $link_cust = sub {
 my %search_hash = ();
 my @extra_sql = ();
 
-my @header = ( '#', 'Service', 'Account', 'UID', 'Last Login' );
-my @fields = ( 'svcnum', 'svc', 'email', 'uid', 'last_login_text' );
-my @links = ( $link, $link, $link, $link, $link );
-my $align = 'rlllr';
-my @color = ( '', '', '', '', '' );
-my @style = ( '', '', '', '', '' );
+my @header = ( 'Service', 'Account' );
+my @fields = ( 'svc', 'email' );
+my @links = ( $link, $link );
+my $align = 'll';
+my @color = ( '', '' );
+my @style = ( '', '' );
+my @footer = ();
+
+my $conf = new FS::Conf;
+
+if ( $conf->exists('report-showpasswords') #its a terrible idea
+     && $curuser->access_right('List service passwords') #but if you insist...
+   )
+{
+  push @header, 'Password';
+  push @fields, 'get_cleartext_password';
+  push @links, $link;
+  $align .= 'l';
+  push @color, '';
+  push @style, '';
+}
+
+push @header, 'Real Name';
+push @fields, 'finger';
+push @links, $link;
+$align .= 'l';
+push @color, '';
+push @style, '';
+
+#hide the UID, its much less useful these days
+if ( $cgi->param('show_uid') ) { #XXX add a checkbox
+  push @header, 'UID';
+  push @fields, 'uid';
+  push @links, $link;
+  $align .= 'l';
+  push @color, '';
+  push @style, '';
+}
+
+push @header, 'Last Login';
+push @fields, 'last_login_text';
+push @links, $link;
+$align .= 'r';
+push @color, '';
+push @style, '';
+
 
 for (qw( domain domsvc agentnum custnum popnum svcpart cust_fields )) {
   $search_hash{$_} = $cgi->param($_) if length($cgi->param($_));
@@ -97,16 +139,25 @@ if ( $cgi->param('magic') =~ /^(all|unlinked)$/ ) {
   }
 
   if ( $sortby eq 'seconds' ) {
+    my $tot_time = 0;
     #push @header, 'Time remaining';
     push @header, 'Time';
-    push @fields, sub { my $svc_acct = shift; format_time($svc_acct->seconds) };
+    push @fields, sub { my $svc_acct = shift;
+                        $tot_time += $svc_acct->seconds;
+                        format_time($svc_acct->seconds);
+                      };
     push @links, '';
     $align .= 'r';
     push @color, '';
     push @style, '';
 
-    my $conf = new FS::Conf;
+    @footer = ( 'Total', '', '', '',
+                sub { format_time($tot_time) }, #time
+              );
+
     if ( $conf->exists('svc_acct-display_paid_time_remaining') ) {
+      my $tot_paid_time = 0;
+      my %tot = ( '30'=>0, '60'=>0, '90'=>0 );
       push @header, 'Paid time', 'Last 30', 'Last 60', 'Last 90';
       push @fields,
         sub {
@@ -130,6 +181,7 @@ if ( $cgi->param('magic') =~ /^(all|unlinked)$/ ) {
           my $time_unpaid = $periods_unpaid * $timepermonth;
           $time_unpaid *= $part_pkg->freq
             if $part_pkg->freq =~ /^\d+$/ && $part_pkg->freq != 0;
+          $tot_paid_time += $seconds-$time_unpaid;
           format_time($seconds-$time_unpaid).
             sprintf(' (%.2fx monthly)', ( $seconds-$time_unpaid ) / $timepermonth );
         },
@@ -141,8 +193,16 @@ if ( $cgi->param('magic') =~ /^(all|unlinked)$/ ) {
       $align .= 'rrrr';
       push @color, '', '', '', '';
       push @style, '', '', '', '';
+      push @footer, 
+        sub { format_time($tot_paid_time) }, #paid time
+        '', #XXX sub { $tot{'30'} }, #30
+        '', #XXX sub { $tot{'60'} }, #60
+        '', #XXX sub { $tot{'90'} }, #90
+      ;
     }
 
+    push @footer, '', '';
+
   }
 
 } elsif ( $cgi->param('magic') =~ /^nologin$/ ) {
@@ -202,13 +262,13 @@ if ( $cgi->param('magic') =~ /^(all|unlinked)$/ ) {
   }
 
   $cgi->param('username') =~ /^([\w\-\.\&]+)$/; #untaint username_text
-  my $username = $1;
+  my $username = lc($1);
 
-  push @username_sql, "username ILIKE '$username'"
+  push @username_sql, "LOWER(username) LIKE '$username'"
     if $username_type{'Exact'}
     || $username_type{'Fuzzy'};
 
-  push @username_sql, "username ILIKE '\%$username\%'"
+  push @username_sql, "LOWER(username) LIKE '\%$username\%'"
     if $username_type{'Substring'}
     || $username_type{'All'};
 
@@ -235,6 +295,28 @@ if ( $cgi->param('magic') =~ /^(all|unlinked)$/ ) {
 
 }
 
+my $date_format = $conf->config('date_format') || '%m/%d/%Y';
+
+$cgi->param('cust_pkg_fields') =~ /^([\w\,]*)$/ or die "bad cust_pkg_fields";
+my @pkg_fields = split(',', $1);
+foreach my $pkg_field ( @pkg_fields ) {
+  ( my $header = ucfirst($pkg_field) ) =~ s/_/ /; #:/
+  push @header, $header;
+
+  #not the most efficient to do it every field, but this is of niche use. so far
+  push @fields, sub { my $svc_acct = shift;
+                      my $cust_pkg = $svc_acct->cust_svc->cust_pkg or return '';
+                      my $value = $cust_pkg->get($pkg_field);#closures help alot
+                      $value ? time2str('%b %d %Y', $value ) : '';
+                    };
+
+  push @links, '';
+  $align .= 'c';
+  push @color, '';
+  push @style, '';
+  
+}
+
 push @header, FS::UI::Web::cust_header($cgi->param('cust_fields'));
 push @fields, \&FS::UI::Web::cust_fields,
 push @links, map { $_ ne 'Cust. Status' ? $link_cust : '' }