summaryrefslogtreecommitdiff
path: root/htdocs/search
diff options
context:
space:
mode:
Diffstat (limited to 'htdocs/search')
-rwxr-xr-xhtdocs/search/cust_main.cgi19
-rwxr-xr-xhtdocs/search/cust_pkg.cgi17
-rwxr-xr-xhtdocs/search/svc_acct.cgi12
-rwxr-xr-xhtdocs/search/svc_domain.cgi12
4 files changed, 35 insertions, 25 deletions
diff --git a/htdocs/search/cust_main.cgi b/htdocs/search/cust_main.cgi
index 55139e9a8..ed7b71425 100755
--- a/htdocs/search/cust_main.cgi
+++ b/htdocs/search/cust_main.cgi
@@ -1,6 +1,6 @@
#!/usr/bin/perl -Tw
#
-# $Id: cust_main.cgi,v 1.7 1999-01-25 12:19:11 ivan Exp $
+# $Id: cust_main.cgi,v 1.8 1999-02-07 09:59:36 ivan Exp $
#
# Usage: post form to:
# http://server.name/path/cust_main.cgi
@@ -19,7 +19,10 @@
# display total, use FS::CGI ivan@sisd.com 98-jul-17
#
# $Log: cust_main.cgi,v $
-# Revision 1.7 1999-01-25 12:19:11 ivan
+# Revision 1.8 1999-02-07 09:59:36 ivan
+# more mod_perl fixes, and bugfixes Peter Wemm sent via email
+#
+# Revision 1.7 1999/01/25 12:19:11 ivan
# yet more mod_perl stuff
#
# Revision 1.6 1999/01/19 05:14:12 ivan
@@ -52,7 +55,7 @@ use IO::Handle;
use String::Approx qw(amatch);
use FS::UID qw(cgisuidsetup);
use FS::Record qw(qsearch qsearchs);
-use FS::CGI qw(header menubar idiot popurl table);
+use FS::CGI qw(header menubar eidiot popurl table);
use FS::cust_main;
$cgi = new CGI;
@@ -83,8 +86,7 @@ if ( scalar(@cust_main) == 1 ) {
print $cgi->redirect(popurl(2). "view/cust_main.cgi?". $cust_main[0]->custnum);
exit;
} elsif ( scalar(@cust_main) == 0 ) {
- idiot "No matching customers found!\n";
- exit;
+ eidiot "No matching customers found!\n";
} else {
my($total)=scalar(@cust_main);
@@ -156,7 +158,6 @@ END
print <<END;
</TABLE>
- </CENTER>
</BODY>
</HTML>
END
@@ -183,7 +184,7 @@ sub cardsearch {
my($card)=$cgi->param('card');
$card =~ s/\D//g;
- $card =~ /^(\d{13,16})$/ or do { idiot "Illegal card number\n"; exit; };
+ $card =~ /^(\d{13,16})$/ or eidiot "Illegal card number\n";
my($payinfo)=$1;
push @cust_main, qsearch('cust_main',{'payinfo'=>$payinfo, 'payby'=>'CARD'});
@@ -197,7 +198,7 @@ sub lastsearch {
}
$cgi->param('last_text') =~ /^([\w \,\.\-\']*)$/
- or do { idiot "Illegal last name"; exit; };
+ or eidiot "Illegal last name";
my($last)=$1;
if ( $last_type{'Exact'}
@@ -237,7 +238,7 @@ sub companysearch {
};
$cgi->param('company_text') =~ /^([\w \,\.\-\']*)$/
- or do { idiot "Illegal company"; exit; };
+ or eidiot "Illegal company";
my($company)=$1;
if ( $company_type{'Exact'}
diff --git a/htdocs/search/cust_pkg.cgi b/htdocs/search/cust_pkg.cgi
index 6685aea70..b7afc62a5 100755
--- a/htdocs/search/cust_pkg.cgi
+++ b/htdocs/search/cust_pkg.cgi
@@ -1,11 +1,14 @@
#!/usr/bin/perl -Tw
#
-# $Id: cust_pkg.cgi,v 1.6 1999-01-19 05:14:13 ivan Exp $
+# $Id: cust_pkg.cgi,v 1.7 1999-02-07 09:59:37 ivan Exp $
#
# based on search/svc_acct.cgi ivan@sisd.com 98-jul-17
#
# $Log: cust_pkg.cgi,v $
-# Revision 1.6 1999-01-19 05:14:13 ivan
+# Revision 1.7 1999-02-07 09:59:37 ivan
+# more mod_perl fixes, and bugfixes Peter Wemm sent via email
+#
+# Revision 1.6 1999/01/19 05:14:13 ivan
# for mod_perl: no more top-level my() variables; use vars instead
# also the last s/create/new/;
#
@@ -29,7 +32,11 @@ use CGI;
use CGI::Carp qw(fatalsToBrowser);
use FS::UID qw(cgisuidsetup);
use FS::Record qw(qsearch qsearchs);
-use FS::CGI qw(header idiot popurl);
+use FS::CGI qw(header eidiot popurl);
+use FS::cust_pkg;
+use FS::pkg_svc;
+use FS::cust_svc;
+use FS::cust_main;
$cgi = new CGI;
&cgisuidsetup($cgi);
@@ -71,8 +78,7 @@ if ( scalar(@cust_pkg) == 1 ) {
print $cgi->redirect(popurl(2). "view/cust_pkg.cgi?$pkgnum");
exit;
} elsif ( scalar(@cust_pkg) == 0 ) { #error
- &idiot("No packages found");
- exit;
+ eidiot("No packages found");
} else {
my($total)=scalar(@cust_pkg);
print $cgi->header( '-expires' => 'now' ), header('Package Search Results',''), <<END;
@@ -110,7 +116,6 @@ END
print <<END;
</TABLE>
- </CENTER>
</BODY>
</HTML>
END
diff --git a/htdocs/search/svc_acct.cgi b/htdocs/search/svc_acct.cgi
index f3305080b..93b03e56d 100755
--- a/htdocs/search/svc_acct.cgi
+++ b/htdocs/search/svc_acct.cgi
@@ -1,6 +1,6 @@
#!/usr/bin/perl -Tw
#
-# $Id: svc_acct.cgi,v 1.6 1999-01-19 05:14:14 ivan Exp $
+# $Id: svc_acct.cgi,v 1.7 1999-02-07 09:59:38 ivan Exp $
#
# Usage: post form to:
# http://server.name/path/svc_acct.cgi
@@ -23,7 +23,10 @@
# give service and customer info too ivan@sisd.com 98-aug-16
#
# $Log: svc_acct.cgi,v $
-# Revision 1.6 1999-01-19 05:14:14 ivan
+# Revision 1.7 1999-02-07 09:59:38 ivan
+# more mod_perl fixes, and bugfixes Peter Wemm sent via email
+#
+# Revision 1.6 1999/01/19 05:14:14 ivan
# for mod_perl: no more top-level my() variables; use vars instead
# also the last s/create/new/;
#
@@ -47,7 +50,7 @@ use CGI;
use CGI::Carp qw(fatalsToBrowser);
use FS::UID qw(cgisuidsetup);
use FS::Record qw(qsearch qsearchs);
-use FS::CGI qw(header idiot popurl);
+use FS::CGI qw(header eidiot popurl);
use FS::svc_acct;
use FS::cust_main;
@@ -93,8 +96,7 @@ if ( scalar(@svc_acct) == 1 ) {
print $cgi->redirect(popurl(2). "view/svc_acct.cgi?$svcnum"); #redirect
exit;
} elsif ( scalar(@svc_acct) == 0 ) { #error
- idiot("Account not found");
- exit;
+ eidiot("Account not found");
} else {
my($total)=scalar(@svc_acct);
print $cgi->header( '-expires' => 'now' ), header("Account Search Results",''), <<END;
diff --git a/htdocs/search/svc_domain.cgi b/htdocs/search/svc_domain.cgi
index cb704a3c4..732265210 100755
--- a/htdocs/search/svc_domain.cgi
+++ b/htdocs/search/svc_domain.cgi
@@ -1,6 +1,6 @@
#!/usr/bin/perl -Tw
#
-# $Id: svc_domain.cgi,v 1.4 1999-01-19 05:14:17 ivan Exp $
+# $Id: svc_domain.cgi,v 1.5 1999-02-07 09:59:39 ivan Exp $
#
# Usage: post form to:
# http://server.name/path/svc_domain.cgi
@@ -17,7 +17,10 @@
# display total, use FS::CGI now does browsing too ivan@sisd.com 98-jul-17
#
# $Log: svc_domain.cgi,v $
-# Revision 1.4 1999-01-19 05:14:17 ivan
+# Revision 1.5 1999-02-07 09:59:39 ivan
+# more mod_perl fixes, and bugfixes Peter Wemm sent via email
+#
+# Revision 1.4 1999/01/19 05:14:17 ivan
# for mod_perl: no more top-level my() variables; use vars instead
# also the last s/create/new/;
#
@@ -34,7 +37,7 @@ use CGI;
use CGI::Carp qw(fatalsToBrowser);
use FS::UID qw(cgisuidsetup);
use FS::Record qw(qsearch qsearchs);
-use FS::CGI qw(header idiot popurl);
+use FS::CGI qw(header eidiot popurl);
$cgi = new CGI;
&cgisuidsetup($cgi);
@@ -68,8 +71,7 @@ if ( scalar(@svc_domain) == 1 ) {
print $cgi->redirect(popurl(2). "view/svc_domain.cgi?". $svc_domain[0]->svcnum);
exit;
} elsif ( scalar(@svc_domain) == 0 ) {
- idiot "No matching domains found!\n";
- exit;
+ eidiot "No matching domains found!\n";
} else {
CGI::Base::SendHeaders(); # one guess