fix linking to account list per access number

diff --git a/httemplate/browse/svc_acct_pop.cgi b/httemplate/browse/svc_acct_pop.cgi
index 8016872..f77fe82 100755 (executable)
--- a/httemplate/browse/svc_acct_pop.cgi
+++ b/httemplate/browse/svc_acct_pop.cgi
@@ -48,7 +48,7 @@ foreach my $svc_acct_pop ( sort {
           <%= $svc_acct_pop->loc %></A></TD>
         <TD>
           <FONT COLOR="#00CC00"><B><%= $num_accounts %></B></FONT>
           <%= $svc_acct_pop->loc %></A></TD>
         <TD>
           <FONT COLOR="#00CC00"><B><%= $num_accounts %></B></FONT>

-            <A HREF="<%= $svc_acct_link %>&showcancelledcustomers=0">active</A>
+            <A HREF="<%= $svc_acct_link %>">active</A>

         </TD>
       </TR>
 <% } %>
         </TD>
       </TR>
 <% } %>

diff --git a/httemplate/search/svc_acct.cgi b/httemplate/search/svc_acct.cgi
index 0954bf6..bbcac30 100755 (executable)
--- a/httemplate/search/svc_acct.cgi
+++ b/httemplate/search/svc_acct.cgi
@@ -48,7 +48,7 @@ if ( $query eq 'svcnum' ) {
   $sortby=\*uid_sort;
   $orderby = ( $unlinked ? 'AND' : 'WHERE' ).
              " ${tblname}uid IS NOT NULL ORDER BY ${tblname}uid";
   $sortby=\*uid_sort;
   $orderby = ( $unlinked ? 'AND' : 'WHERE' ).
              " ${tblname}uid IS NOT NULL ORDER BY ${tblname}uid";

-} elsif ( $query =~ /popnum=(\d+)/ ) {
+} elsif ( $query =~ /^popnum=(\d+)$/ ) {

   my $popnum = $1;
   $unlinked .= ( $unlinked ? 'AND' : 'WHERE' ).
                " popnum = $popnum";
   my $popnum = $1;
   $unlinked .= ( $unlinked ? 'AND' : 'WHERE' ).
                " popnum = $popnum";


@@ -63,7 +63,7 @@ if ( $query eq 'svcnum' ) {
 if (    $query eq 'svcnum'
      || $query eq 'username'
      || $query eq 'uid'
 if (    $query eq 'svcnum'
      || $query eq 'username'
      || $query eq 'uid'

-     || $query eq 'popnum'
+     || $query =~ /^popnum=(\d+)$/ ) {

    ) {
 
   my $statement = "SELECT COUNT(*) FROM svc_acct $unlinked";
    ) {
 
   my $statement = "SELECT COUNT(*) FROM svc_acct $unlinked";