[freeside-commits] freeside/httemplate/search cust_main.cgi, 1.72.2.2, 1.72.2.3 cust_svc.html, 1.4.2.1, 1.4.2.2 inventory_item.html, 1.5, 1.5.2.1 reg_code.html, 1.4, 1.4.2.1 sql.html, 1.5, 1.5.2.1 svc_acct.cgi, 1.40, 1.40.2.1 svc_broadband.cgi, 1.4.2.2, 1.4.2.3

[Jeff Finucane,420,,]

Update of /home/cvs/cvsroot/freeside/httemplate/search
In directory wavetail:/tmp/cvs-serv9413/httemplate/search

Modified Files:
      Tag: FREESIDE_1_7_BRANCH
	cust_main.cgi cust_svc.html inventory_item.html reg_code.html 
	sql.html svc_acct.cgi svc_broadband.cgi 
Log Message:
Remove remaining calls to idiot/eidiot.  Should fix 1479

Index: cust_main.cgi
===================================================================
RCS file: /home/cvs/cvsroot/freeside/httemplate/search/cust_main.cgi,v
retrieving revision 1.72.2.2
retrieving revision 1.72.2.3
diff -u -d -r1.72.2.2 -r1.72.2.3
--- cust_main.cgi	13 Sep 2007 22:05:56 -0000	1.72.2.2
+++ cust_main.cgi	8 Oct 2007 19:04:50 -0000	1.72.2.3
@@ -87,10 +87,10 @@
 %  if ( $cgi->param('otaker_on') ) {
 %    die "access denied"
 %      unless $FS::CurrentUser::CurrentUser->access_right('Configuration');
-%    $cgi->param('otaker') =~ /^(\w{1,32})$/ or eidiot "Illegal otaker\n";
+%    $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...";
@@ -232,7 +232,7 @@
 
 <!-- mason kludge -->
 %
-%  eidiot "No matching customers found!\n";
+%  errorpage("No matching customers found!");
 %} else { 
 %
 
@@ -268,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">'.
@@ -288,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 ) {
@@ -550,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 } ) ];
@@ -560,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'}),
@@ -570,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;
@@ -592,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'} ) {
@@ -639,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'} ) {
@@ -681,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',
@@ -711,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);

Index: reg_code.html
===================================================================
RCS file: /home/cvs/cvsroot/freeside/httemplate/search/reg_code.html,v
retrieving revision 1.4
retrieving revision 1.4.2.1
diff -u -d -r1.4 -r1.4.2.1
--- reg_code.html	3 Feb 2007 11:36:30 -0000	1.4
+++ reg_code.html	8 Oct 2007 19:04:50 -0000	1.4.2.1
@@ -31,10 +31,10 @@
   unless $FS::CurrentUser::CurrentUser->access_right('Configuration');
 
 my $agentnum = $cgi->param('agentnum');
-$agentnum =~ /^(\d+)$/ or eidiot "illegal agentnum $agentnum";
+$agentnum =~ /^(\d+)$/ or errorpage("illegal agentnum $agentnum");
 $agentnum = $1;
 my $agent = qsearchs('agent', { 'agentnum' => $agentnum } );
 
 my $count_query = "SELECT COUNT(*) FROM reg_code WHERE agentnum = $agentnum";
 
-<%init>
+</%init>

Index: inventory_item.html
===================================================================
RCS file: /home/cvs/cvsroot/freeside/httemplate/search/inventory_item.html,v
retrieving revision 1.5
retrieving revision 1.5.2.1
diff -u -d -r1.5 -r1.5.2.1
--- inventory_item.html	3 Feb 2007 11:36:30 -0000	1.5
+++ inventory_item.html	8 Oct 2007 19:04:50 -0000	1.5.2.1
@@ -77,7 +77,7 @@
   unless $FS::CurrentUser::CurrentUser->access_right('Configuration');
 
 my $classnum = $cgi->param('classnum');
-$classnum =~ /^(\d+)$/ or eidiot "illegal classnum $classnum";
+$classnum =~ /^(\d+)$/ or errorpage("illegal classnum $classnum");
 $classnum = $1;
 
 my $inventory_class = qsearchs( {

Index: sql.html
===================================================================
RCS file: /home/cvs/cvsroot/freeside/httemplate/search/sql.html,v
retrieving revision 1.5
retrieving revision 1.5.2.1
diff -u -d -r1.5 -r1.5.2.1
--- sql.html	3 Feb 2007 11:36:30 -0000	1.5
+++ sql.html	8 Oct 2007 19:04:50 -0000	1.5.2.1
@@ -2,7 +2,7 @@
                'title' => 'Query Results',
                'name'  => 'rows',
                'query' => 'SELECT '. ( $cgi->param('sql')
-                                       || eidiot('Empty query') ),
+                             || errorpage('Empty query') ),
     )
 %>
 <%init>

Index: svc_acct.cgi
===================================================================
RCS file: /home/cvs/cvsroot/freeside/httemplate/search/svc_acct.cgi,v
retrieving revision 1.40
retrieving revision 1.40.2.1
diff -u -d -r1.40 -r1.40.2.1
--- svc_acct.cgi	3 Feb 2007 11:36:30 -0000	1.40
+++ svc_acct.cgi	8 Oct 2007 19:04:50 -0000	1.40.2.1
@@ -54,7 +54,7 @@
    unless ( $svc_domain ) {
      #it would be nice if this looked more like the other "not found"
      #errors, but this will do for now.
-     eidiot "Domain ". $cgi->param('domain'). " not found at all";
+     errorpage("Domain ". $cgi->param('domain'). " not found at all");
    } else {
      push @extra_sql, 'domsvc = '. $svc_domain->svcnum;
    }

Index: svc_broadband.cgi
===================================================================
RCS file: /home/cvs/cvsroot/freeside/httemplate/search/svc_broadband.cgi,v
retrieving revision 1.4.2.2
retrieving revision 1.4.2.3
diff -u -d -r1.4.2.2 -r1.4.2.3
--- svc_broadband.cgi	18 Sep 2007 21:41:14 -0000	1.4.2.2
+++ svc_broadband.cgi	8 Oct 2007 19:04:50 -0000	1.4.2.3
@@ -56,7 +56,7 @@
 
 <!-- mason kludge -->
 %
-%  eidiot "No matching broadband services found!\n";
+% errorpage("No matching broadband services found!");
 %} else {
 %
 

Index: cust_svc.html
===================================================================
RCS file: /home/cvs/cvsroot/freeside/httemplate/search/cust_svc.html,v
retrieving revision 1.4.2.1
retrieving revision 1.4.2.2
diff -u -d -r1.4.2.1 -r1.4.2.2
--- cust_svc.html	19 Apr 2007 20:18:07 -0000	1.4.2.1
+++ cust_svc.html	8 Oct 2007 19:04:50 -0000	1.4.2.2
@@ -90,7 +90,7 @@
   push @extra_sql, "svcpart = $1";
 
 } else {
-  eidiot("No search term specified");
+  errorpage("No search term specified");
 }
 
 #here is the agent virtualization