diff options
| -rw-r--r-- | FS/FS/cust_pkg.pm | 5 | ||||
| -rwxr-xr-x | httemplate/search/477partVI_census.html | 9 | ||||
| -rwxr-xr-x | httemplate/search/cust_pkg.cgi | 9 |
3 files changed, 14 insertions, 9 deletions
diff --git a/FS/FS/cust_pkg.pm b/FS/FS/cust_pkg.pm index 3b58a47d3..fd715a8f4 100644 --- a/FS/FS/cust_pkg.pm +++ b/FS/FS/cust_pkg.pm @@ -3038,7 +3038,10 @@ sub search { ### # parse censustract2 ### - if ( exists($params->{'censustract2'}) =~ /^(\d*)$/ ) { + if ( exists($params->{'censustract2'}) + && $params->{'censustract2'} =~ /^(\d*)$/ + ) + { if ($1) { push @where, "cust_main.censustract LIKE '$1%'"; } else { diff --git a/httemplate/search/477partVI_census.html b/httemplate/search/477partVI_census.html index dbaaaab61..15d2b814b 100755 --- a/httemplate/search/477partVI_census.html +++ b/httemplate/search/477partVI_census.html @@ -1,6 +1,6 @@ <% include( 'elements/search.html', 'html_init' => $html_init, - 'html_foot' => $html_foot,, + 'html_foot' => $html_foot, 'name' => 'regions', 'query' => [ @sql_query ], 'count_query' => $count_query, @@ -32,10 +32,10 @@ sub { my $row = shift; my $state = substr($row->censustract, 0, 2); $state_hash{$state}++; - substr($row->censustract, 2, 3) || 'None' + substr($row->censustract, 2, 3) || 'None'; }, sub { my $row = shift; - substr($row->censustract, 5) || 'None' + substr($row->censustract, 5) || 'None'; }, 'upload', 'download', @@ -81,7 +81,8 @@ my %state_pkgcount = (); for ( qw(agentnum magic) ) { $search_hash{$_} = $cgi->param($_) if $cgi->param($_); } -$search_hash{'classnum'} = [ $cgi->param('classnum') ]; +$search_hash{'classnum'} = [ $cgi->param('classnum') ] + if grep { $_ eq 'classnum' } $cgi->param; my @column_option = grep { /^\d+$/ } $cgi->param('part1_column_option') if $cgi->param('part1_column_option'); diff --git a/httemplate/search/cust_pkg.cgi b/httemplate/search/cust_pkg.cgi index b30a2d58a..67e4c05c3 100755 --- a/httemplate/search/cust_pkg.cgi +++ b/httemplate/search/cust_pkg.cgi @@ -173,14 +173,15 @@ for (qw( agentnum custnum magic status custom cust_fields pkgbatch )) { } #arrays -for (qw( pkgpart classnum )) { - $search_hash{$_} = [ $cgi->param($_) ]; +for my $param (qw( pkgpart classnum )) { + $search_hash{$param} = [ $cgi->param($param) ]; + if grep { $_ eq $param } $cgi->param; } #scalars that need to be passed if empty -for my $param (qw(censustract censustract2 )) { +for my $param (qw( censustract censustract2 )) { $search_hash{$param} = $cgi->param($param) || '' - if ( grep { /$param/ } $cgi->param ); + if grep { $_ eq $param } $cgi->param; } my @report_option = $cgi->param('report_option') |