Remove remaining calls to idiot/eidiot. Should fix 1479

[freeside.git] / httemplate / search / cust_main.cgi

diff --git a/httemplate/search/cust_main.cgi b/httemplate/search/cust_main.cgi
index c484496..b0f657f 100755 (executable)
--- a/httemplate/search/cust_main.cgi
+++ b/httemplate/search/cust_main.cgi
@@ -1,4 +1,5 @@
-%
+%die "access denied"
+%  unless $FS::CurrentUser::CurrentUser->access_right('List customers');
 %
 %my $conf = new FS::Conf;
 %my $maxrecords = $conf->config('maxsearchrecordsperpage');
@@ -84,10 +85,12 @@
 %  }
 %
 %  if ( $cgi->param('otaker_on') ) {
-%    $cgi->param('otaker') =~ /^(\w{1,32})$/ or eidiot "Illegal otaker\n";
+%    die "access denied"
+%      unless $FS::CurrentUser::CurrentUser->access_right('Configuration');
+%    $cgi->param('otaker') =~ /^(\w{1,32})$/ or errorpage("Illegal otaker");
 %    $search{otaker} = $1;
 %  } elsif ( $cgi->param('agentnum_on') ) {
-%    $cgi->param('agentnum') =~ /^(\d+)$/ or eidiot "Illegal agentnum\n";
+%    $cgi->param('agentnum') =~ /^(\d+)$/ or errorpage("Illegal agentnum");
 %    $search{agentnum} = $1;
 %#  } else {
 %#    die "unknown query...";
@@ -194,7 +197,6 @@
 %  if ( $cgi->param('search_cust') ) {
 %    $sortby = \*company_sort;
 %    $orderby = "ORDER BY LOWER(company || ' ' || last || ' ' || first )";
-%    warn "smart searching for: ". $cgi->param('search_cust');
 %    push @cust_main, smart_search( 'search' => $cgi->param('search_cust') );
 %  }
 %
@@ -230,7 +232,7 @@
 
 <!-- mason kludge -->
 %
-%  eidiot "No matching customers found!\n";
+%  errorpage("No matching customers found!");
 %} else { 
 %
 
@@ -239,33 +241,13 @@
 
 
   <% $total %> matching customers found
-%
-%  #begin pager
-%  my $pager = '';
-%  if ( $total != scalar(@cust_main) && $maxrecords ) {
-%    unless ( $offset == 0 ) {
-%      $cgi->param('offset', $offset - $maxrecords);
-%      $pager .= '<A HREF="'. $cgi->self_url.
-%                '"><B><FONT SIZE="+1">Previous</FONT></B></A> ';
-%    }
-%    my $poff;
-%    my $page;
-%    for ( $poff = 0; $poff < $total; $poff += $maxrecords ) {
-%      $page++;
-%      if ( $offset == $poff ) {
-%        $pager .= qq!<FONT SIZE="+2">$page</FONT> !;
-%      } else {
-%        $cgi->param('offset', $poff);
-%        $pager .= qq!<A HREF="!. $cgi->self_url. qq!">$page</A> !;
-%      }
-%    }
-%    unless ( $offset + $maxrecords > $total ) {
-%      $cgi->param('offset', $offset + $maxrecords);
-%      $pager .= '<A HREF="'. $cgi->self_url.
-%                '"><B><FONT SIZE="+1">Next</FONT></B></A> ';
-%    }
-%  }
-%  #end pager
+
+% my $pager = include( '/elements/pager.html',
+%                        'offset'     => $offset,
+%                       'num_rows'   => scalar(@cust_main),
+%                       'total'      => $total,
+%                       'maxrecords' => $maxrecords,
+%                    );
 %
 %  unless ( $cgi->param('cancelled') ) {
 %    if ( $cgi->param('showcancelledcustomers') eq '0' #see if it was set by me
@@ -286,7 +268,7 @@
 %
 %  if ( $cgi->param('referral_custnum') ) {
 %    $cgi->param('referral_custnum') =~ /^(\d+)$/
-%      or eidiot "Illegal referral_custnum\n";
+%      or errorpage("Illegal referral_custnum");
 %    my $referral_custnum = $1;
 %    my $cust_main = qsearchs('cust_main', { custnum => $referral_custnum } );
 %    print '<FORM METHOD="GET">'.
@@ -306,7 +288,7 @@
 %    print ' <SELECT NAME="referral_depth" SIZE="1" onChange="changed(this)">';
 %    my $max = 8; #config file
 %    $cgi->param('referral_depth') =~ /^(\d*)$/ 
-%      or eidiot "Illegal referral_depth";
+%      or errorpage("Illegal referral_depth");
 %    my $referral_depth = $1;
 %
 %    foreach my $depth ( 1 .. $max ) {
@@ -328,7 +310,8 @@
 %
 %  print "<BR><BR>". $pager. include('/elements/table-grid.html'). <<END;
 %      <TR>
-%        <TH CLASS="grid" BGCOLOR="#cccccc"></TH>
+%        <TH CLASS="grid" BGCOLOR="#cccccc">#</TH>
+%        <TH CLASS="grid" BGCOLOR="#cccccc">Status</TH>
 %        <TH CLASS="grid" BGCOLOR="#cccccc">(bill) name</TH>
 %        <TH CLASS="grid" BGCOLOR="#cccccc">company</TH>
 %END
@@ -392,10 +375,12 @@
 %      ? qq!<A HREF="$view"><FONT SIZE=-1>$company</FONT></A>!
 %      : '<FONT SIZE=-1>&nbsp;</FONT>';
 %    
-
+%    my $status = $cust_main->status;
+%    my $statuscol = $cust_main->statuscolor;
 
     <TR>
-      <TD CLASS="grid" BGCOLOR="<% $bgcolor %>" ROWSPAN=<% $rowspan || 1 %>><A HREF="<% $view %>"><FONT SIZE=-1><% $custnum %></FONT></A></TD>
+      <TD CLASS="grid" ALIGN="right" BGCOLOR="<% $bgcolor %>" ROWSPAN=<% $rowspan || 1 %>><A HREF="<% $view %>"><FONT SIZE=-1><% $custnum %></FONT></A></TD>
+      <TD CLASS="grid" ALIGN="center" BGCOLOR="<% $bgcolor %>" ROWSPAN=<% $rowspan || 1 %>><FONT SIZE="-1" COLOR="#<% $statuscol %>"><B><% ucfirst($status) %></B></FONT></TD>
       <TD CLASS="grid" BGCOLOR="<% $bgcolor %>" ROWSPAN=<% $rowspan || 1 %>><A HREF="<% $view %>"><FONT SIZE=-1><% "$last, $first" %></FONT></A></TD>
       <TD CLASS="grid" BGCOLOR="<% $bgcolor %>" ROWSPAN=<% $rowspan || 1 %>><% $pcompany %></TD>
 %
@@ -507,8 +492,9 @@
 %         my($label, $value, $svcdb) = $cust_svc->label;
 %         my($svcnum) = $cust_svc->svcnum;
 %         my($sview) = $p.'view';
-%         print $n2,qq!<TD CLASS="grid" BGCOLOR="$bgcolor" ><A HREF="$sview/$svcdb.cgi?$svcnum"><FONT SIZE=-1>$label</FONT></A></TD>!,
-%               qq!<TD CLASS="grid" BGCOLOR="$bgcolor" ><A HREF="$sview/$svcdb.cgi?$svcnum"><FONT SIZE=-1>$value</FONT></A></TD>!;
+%         print $n2,
+%           qq!<TD CLASS="grid" BGCOLOR="$bgcolor" >!. FS::UI::Web::svc_link($m, $cust_svc->part_svc, $cust_svc) . qq!</TD> !.
+%           qq!<TD CLASS="grid" BGCOLOR="$bgcolor" >!. FS::UI::Web::svc_label_link($m, $cust_svc->part_svc, $cust_svc) . qq!</TD> !;
 %         $n2="</TR><TR>";
 %      }
 %
@@ -564,7 +550,7 @@
 %
 %  my $custnum = $cgi->param('custnum_text');
 %  $custnum =~ s/\D//g;
-%  $custnum =~ /^(\d{1,23})$/ or eidiot "Illegal customer number\n";
+%  $custnum =~ /^(\d{1,23})$/ or errorpage("Illegal customer number");
 %  $custnum = $1;
 %  
 %  [ qsearchs('cust_main', { 'custnum' => $custnum } ) ];
@@ -574,7 +560,7 @@
 %
 %  my($card)=$cgi->param('card');
 %  $card =~ s/\D//g;
-%  $card =~ /^(\d{13,16})$/ or eidiot "Illegal card number\n";
+%  $card =~ /^(\d{13,16})$/ or errorpage("Illegal card number");
 %  my($payinfo)=$1;
 %
 %  [ qsearch('cust_main',{'payinfo'=>$payinfo, 'payby'=>'CARD'}),
@@ -584,13 +570,13 @@
 %
 %sub referralsearch {
 %  $cgi->param('referral_custnum') =~ /^(\d+)$/
-%    or eidiot "Illegal referral_custnum";
+%    or errorpage("Illegal referral_custnum");
 %  my $cust_main = qsearchs('cust_main', { 'custnum' => $1 } )
-%    or eidiot "Customer $1 not found";
+%    or errorpage("Customer $1 not found");
 %  my $depth;
 %  if ( $cgi->param('referral_depth') ) {
 %    $cgi->param('referral_depth') =~ /^(\d+)$/
-%      or eidiot "Illegal referral_depth";
+%      or errorpage("Illegal referral_depth");
 %    $depth = $1;
 %  } else {
 %    $depth = 1;
@@ -606,7 +592,7 @@
 %  }
 %
 %  $cgi->param('last_text') =~ /^([\w \,\.\-\']*)$/
-%    or eidiot "Illegal last name";
+%    or errorpage("Illegal last name");
 %  my($last)=$1;
 %
 %  if ( $last_type{'Exact'} || $last_type{'Fuzzy'} ) {
@@ -653,7 +639,7 @@
 %
 %  $cgi->param('company_text') =~
 %    /^([\w \!\@\#\$\%\&\(\)\-\+\;\:\'\"\,\.\?\/\=]*)$/
-%      or eidiot "Illegal company";
+%      or errorpage("Illegal company");
 %  my $company = $1;
 %
 %  if ( $company_type{'Exact'} || $company_type{'Fuzzy'} ) {
@@ -695,7 +681,7 @@
 %
 %  $cgi->param('address2_text') =~
 %    /^([\w \!\@\#\$\%\&\(\)\-\+\;\:\'\"\,\.\?\/\=]*)$/
-%      or eidiot "Illegal address2";
+%      or errorpage("Illegal address2");
 %  my $address2 = $1;
 %
 %  push @cust_main, qsearch( 'cust_main',
@@ -725,7 +711,7 @@
 %  } elsif ( $phone =~ /^(\d{3,4})$/ ) {
 %    $phone = $1;
 %  } else {
-%    eidiot gettext('illegal_phone'). ": $phone";
+%    errorpage(gettext('illegal_phone'). ": $phone");
 %  }
 %
 %  my @fields = qw(daytime night fax);
@@ -740,6 +726,3 @@
 %
 %  \@cust_main;
 %}
-%
-%
-