X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=httemplate%2Fsearch%2Fsvc_acct.cgi;h=549231d3f8200343cf58dfe2bfd570026b1b5720;hb=d83a273f3ac71431f5b007bb83fb55d7c83eae5c;hp=eba032d525b3e50b68e0c6c99d76553e08a3b3bf;hpb=7fc18b419e3cec20eb7c898017673b40a7424cde;p=freeside.git

diff --git a/httemplate/search/svc_acct.cgi b/httemplate/search/svc_acct.cgi
index eba032d52..549231d3f 100755
--- a/httemplate/search/svc_acct.cgi
+++ b/httemplate/search/svc_acct.cgi
@@ -64,11 +64,6 @@ if ( $query eq 'svcnum' || $query eq 'username' || $query eq 'uid' ) {
 
   $total = $sth->fetchrow_arrayref->[0];
 
-  #if ( driver_name eq 'mysql' ) { #remove ORDER BY for mysql?  hua?
-  #  @svc_acct = qsearch('svc_acct', {}, '', "$unlinked $limit");
-  #} else {
-  #  @svc_acct = qsearch('svc_acct', {}, '', "$unlinked $orderby $limit");
-  #}
   @svc_acct = qsearch('svc_acct', {}, '', "$unlinked $orderby $limit");
 
 }
@@ -249,10 +244,50 @@ sub uid_sort {
 
 sub usernamesearch {
 
+  my @svc_acct;
+
+  my %username_type;
+  foreach ( $cgi->param('username_type') ) {
+    $username_type{$_}++;
+  }
+
   $cgi->param('username') =~ /^([\w\-\.\&]+)$/; #untaint username_text
-  my($username)=$1;
+  my $username = $1;
+
+  if ( $username_type{'Exact'} || $username_type{'Fuzzy'} ) {
+    push @svc_acct, qsearch( 'svc_acct',
+                             { 'username' => { 'op'    => 'ILIKE',
+                                               'value' => $username } } );
+  }
+
+  if ( $username_type{'Substring'} || $username_type{'All'} ) {
+    push @svc_acct, qsearch( 'svc_acct',
+                             { 'username' => { 'op'    => 'ILIKE',
+                                               'value' => "%$username%" } } );
+  }
+
+  if ( $username_type{'Fuzzy'} || $username_type{'All'} ) {
+    &FS::svc_acct::check_and_rebuild_fuzzyfiles;
+    my $all_username = &FS::svc_acct::all_username;
+
+    my %username;
+    if ( $username_type{'Fuzzy'} || $username_type{'All'} ) { 
+      foreach ( amatch($username, [ qw(i) ], @$all_username) ) {
+        $username{$_}++; 
+      }
+    }
+
+    #if ($username_type{'Sound-alike'}) {
+    #}
+
+    foreach ( keys %username ) {
+      push @svc_acct, qsearch('svc_acct',{'username'=>$_});
+    }
+
+  }
 
-  [ qsearch('svc_acct',{'username'=>$username}) ];
+  #[ qsearch('svc_acct',{'username'=>$username}) ];
+  \@svc_acct;
 
 }