X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=httemplate%2Fsearch%2Fsvc_acct.cgi;h=12d5991ea828d27ea7735f9e1b5d51f0509c3a30;hb=e168ca3db2702bd9a540316cd9bd840238dd19ce;hp=d7619493aa41f2f51c1a9492d6a6f9665e15fc20;hpb=6c08340010e68fa7ca0989f4902761c8d0db941f;p=freeside.git

diff --git a/httemplate/search/svc_acct.cgi b/httemplate/search/svc_acct.cgi
index d7619493a..12d5991ea 100755
--- a/httemplate/search/svc_acct.cgi
+++ b/httemplate/search/svc_acct.cgi
@@ -1,6 +1,6 @@
-<% include( 'elements/search.html',
-                 'title'       => 'Account Search Results',
-                 'name'        => 'accounts',
+<& elements/search.html,
+                 'title'       => emt('Account Search Results'),
+                 'name'        => emt('accounts'),
                  'query'       => $sql_query,
                  'count_query' => $count_query,
                  'redirect'    => $link,
@@ -11,8 +11,7 @@
                  'color'       => \@color,
                  'style'       => \@style,
                  'footer'      => \@footer,
-             )
-%>
+&>
 <%once>
 
 #false laziness w/ClientAPI/MyAccount.pm
@@ -69,12 +68,12 @@ my $link_cust = sub {
 my %search_hash = ();
 my @extra_sql = ();
 
-my @header = ( '#', 'Service', 'Account' );
-my @fields = ( 'svcnum', 'svc', 'email' );
-my @links = ( $link, $link, $link );
-my $align = 'rll';
-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;
@@ -83,7 +82,7 @@ if ( $conf->exists('report-showpasswords') #its a terrible idea
      && $curuser->access_right('List service passwords') #but if you insist...
    )
 {
-  push @header, 'Password';
+  push @header, emt('Password');
   push @fields, 'get_cleartext_password';
   push @links, $link;
   $align .= 'l';
@@ -91,7 +90,7 @@ if ( $conf->exists('report-showpasswords') #its a terrible idea
   push @style, '';
 }
 
-push @header, 'Real Name';
+push @header, emt('Real Name');
 push @fields, 'finger';
 push @links, $link;
 $align .= 'l';
@@ -100,7 +99,7 @@ push @style, '';
 
 #hide the UID, its much less useful these days
 if ( $cgi->param('show_uid') ) { #XXX add a checkbox
-  push @header, 'UID';
+  push @header, emt('UID');
   push @fields, 'uid';
   push @links, $link;
   $align .= 'l';
@@ -108,7 +107,7 @@ if ( $cgi->param('show_uid') ) { #XXX add a checkbox
   push @style, '';
 }
 
-push @header, 'Last Login';
+push @header, emt('Last Login');
 push @fields, 'last_login_text';
 push @links, $link;
 $align .= 'r';
@@ -140,8 +139,7 @@ if ( $cgi->param('magic') =~ /^(all|unlinked)$/ ) {
 
   if ( $sortby eq 'seconds' ) {
     my $tot_time = 0;
-    #push @header, 'Time remaining';
-    push @header, 'Time';
+    push @header, emt('Time');
     push @fields, sub { my $svc_acct = shift;
                         $tot_time += $svc_acct->seconds;
                         format_time($svc_acct->seconds);
@@ -151,14 +149,14 @@ if ( $cgi->param('magic') =~ /^(all|unlinked)$/ ) {
     push @color, '';
     push @style, '';
 
-    @footer = ( '', 'Total', '', '', '',
+    @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 @header, emt('Paid time'), emt('Last 30'), emt('Last 60'), emt('Last 90');
       push @fields,
         sub {
           my $svc_acct = shift;
@@ -201,6 +199,8 @@ if ( $cgi->param('magic') =~ /^(all|unlinked)$/ ) {
       ;
     }
 
+    push @footer, '', '';
+
   }
 
 } elsif ( $cgi->param('magic') =~ /^nologin$/ ) {
@@ -260,13 +260,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'};