X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=httemplate%2Fsearch%2Fsvc_acct.cgi;h=e28e00e6127fab71e3598ca10748d5afb6ce8e4f;hb=336d87dc8c7c105d3d9cd41c3590acc09964281d;hp=a3fed83847b6ad18c57dc25c258eed4a9e13b10a;hpb=22a35047ecdffff80110e06cc08fc84f9ddba9b0;p=freeside.git

diff --git a/httemplate/search/svc_acct.cgi b/httemplate/search/svc_acct.cgi
index a3fed8384..e28e00e61 100755
--- a/httemplate/search/svc_acct.cgi
+++ b/httemplate/search/svc_acct.cgi
@@ -21,13 +21,14 @@ $query ||= ''; #to avoid use of unitialized value errors
 my $unlinked = '';
 if ( $query =~ /^UN_(.*)$/ ) {
   $query = $1;
-  $unlinked = '
+  my $empty = driver_name =~ /^Pg$/i ? qq('') : qq("");
+  $unlinked = "
     WHERE 0 <
       ( SELECT count(*) FROM cust_svc
           WHERE cust_svc.svcnum = svc_acct.svcnum
-            AND pkgnum IS NULL
+            AND ( pkgnum IS NULL OR pkgnum = 0 OR pkgnum = $empty )
       )
-  ';
+  ";
 }
 
 my(@svc_acct, $sortby);
@@ -63,8 +64,14 @@ if ( scalar(@svc_acct) == 1 ) {
   print $cgi->redirect(popurl(2). "view/svc_acct.cgi?$svcnum");  #redirect
   #exit;
 } elsif ( scalar(@svc_acct) == 0 ) { #error
+%>
+<!-- mason kludge -->
+<%
   idiot("Account not found");
 } else {
+%>
+<!-- mason kludge -->
+<%
   $total ||= scalar(@svc_acct);
 
   #begin pager
@@ -94,7 +101,7 @@ if ( scalar(@svc_acct) == 1 ) {
   }
   #end pager
 
-  print header("Account Search Results",''),
+  print header("Account Search Results",menubar('Main Menu'=>popurl(2))),
         "$total matching accounts found<BR><BR>$pager",
         &table(), <<END;
       <TR>
@@ -135,7 +142,7 @@ END
         my $conf = new FS::Conf;
         unless ( $mydomain = $conf->config('domain') ) {
           die "No legacy domain config file and no svc_domain.svcnum record ".
-              "for svc_acct.domsvc: ". $cust_svc->domsvc;
+              "for svc_acct.domsvc: ". $svc_acct->domsvc;
         }
       }
       $domain = "<i>$mydomain</i><FONT COLOR=\"#FF0000\">*</FONT>";
@@ -228,7 +235,7 @@ sub uid_sort {
 
 sub usernamesearch {
 
-  $cgi->param('username') =~ /^([\w\d\-]+)$/; #untaint username_text
+  $cgi->param('username') =~ /^([\w\-\.\&]+)$/; #untaint username_text
   my($username)=$1;
 
   [ qsearch('svc_acct',{'username'=>$username}) ];