From: ivan Date: Sun, 10 Feb 2002 13:21:31 +0000 (+0000) Subject: removed from all files to fix any redirects, whew X-Git-Tag: freeside_1_4_0pre11~85 X-Git-Url: http://git.freeside.biz/gitweb/?p=freeside.git;a=commitdiff_plain;h=22a35047ecdffff80110e06cc08fc84f9ddba9b0 removed from all files to fix any redirects, whew Mason handler.pl overrides CGI::redirect fixed strict; problems in edit/part_pkg.cgi & edit/process/part_pkg.cgi --- diff --git a/htetc/handler.pl b/htetc/handler.pl index 37f2d3766..5544ebbe8 100644 --- a/htetc/handler.pl +++ b/htetc/handler.pl @@ -101,6 +101,24 @@ sub handler use FS::svc_www; use FS::type_pkgs; + *CGI::redirect = sub { + my( $self, $location ) = @_; + + #http://www.masonhq.com/docs/faq/#how_do_i_do_an_external_redirect + $m->clear_buffer; + # The next two lines are necessary to stop Apache from re-reading + # POSTed data. + $r->method('GET'); + $r->headers_in->unset('Content-length'); + $r->content_type('text/html'); + $r->err_header_out('Location' => $location); + $r->header_out('Content-Type' => 'text/html'); + $m->abort(302); + + ''; + + }; + $cgi = new CGI; &cgisuidsetup($cgi); #&cgisuidsetup($r); @@ -114,9 +132,8 @@ sub handler #$r->no_cache(1); $headers->{'Expires'} = '0'; - my $status = $ah->handle_request($r); - - return $status; + $ah->handle_request($r); + } 1; diff --git a/httemplate/browse/agent.cgi b/httemplate/browse/agent.cgi index 067a06b30..8079c722b 100755 --- a/httemplate/browse/agent.cgi +++ b/httemplate/browse/agent.cgi @@ -1,4 +1,3 @@ - <% #Begin silliness diff --git a/httemplate/browse/agent_type.cgi b/httemplate/browse/agent_type.cgi index d75c45081..ba74e0d4c 100755 --- a/httemplate/browse/agent_type.cgi +++ b/httemplate/browse/agent_type.cgi @@ -1,4 +1,3 @@ - <% print header("Agent Type Listing", menubar( diff --git a/httemplate/browse/cust_main_county.cgi b/httemplate/browse/cust_main_county.cgi index 89b1bfd71..7273dd043 100755 --- a/httemplate/browse/cust_main_county.cgi +++ b/httemplate/browse/cust_main_county.cgi @@ -1,4 +1,3 @@ - <% print header("Tax Rate Listing", menubar( diff --git a/httemplate/browse/cust_pay_batch.cgi b/httemplate/browse/cust_pay_batch.cgi index 960843adf..220296724 100755 --- a/httemplate/browse/cust_pay_batch.cgi +++ b/httemplate/browse/cust_pay_batch.cgi @@ -1,4 +1,3 @@ - <% print header("Pending credit card batch", menubar( diff --git a/httemplate/browse/nas.cgi b/httemplate/browse/nas.cgi index 2bac9909f..f1057ced1 100755 --- a/httemplate/browse/nas.cgi +++ b/httemplate/browse/nas.cgi @@ -1,4 +1,3 @@ - <% print header('NAS ports', menubar( diff --git a/httemplate/browse/part_bill_event.cgi b/httemplate/browse/part_bill_event.cgi index 81228f2ea..d850ae556 100755 --- a/httemplate/browse/part_bill_event.cgi +++ b/httemplate/browse/part_bill_event.cgi @@ -1,4 +1,3 @@ - <% my %search; diff --git a/httemplate/browse/part_pkg.cgi b/httemplate/browse/part_pkg.cgi index 22d139c99..03326d039 100755 --- a/httemplate/browse/part_pkg.cgi +++ b/httemplate/browse/part_pkg.cgi @@ -1,4 +1,3 @@ - <% my %search; diff --git a/httemplate/browse/part_referral.cgi b/httemplate/browse/part_referral.cgi index 82f42924f..3ca36b244 100755 --- a/httemplate/browse/part_referral.cgi +++ b/httemplate/browse/part_referral.cgi @@ -1,4 +1,3 @@ - <% print header("Referral Listing", menubar( diff --git a/httemplate/browse/part_svc.cgi b/httemplate/browse/part_svc.cgi index 54d4b083b..5bfb80343 100755 --- a/httemplate/browse/part_svc.cgi +++ b/httemplate/browse/part_svc.cgi @@ -1,4 +1,3 @@ - <% my %search; diff --git a/httemplate/browse/queue.cgi b/httemplate/browse/queue.cgi index af8989b82..e38e40ba3 100755 --- a/httemplate/browse/queue.cgi +++ b/httemplate/browse/queue.cgi @@ -1,4 +1,3 @@ - <% print header("Job Queue", menubar( diff --git a/httemplate/browse/svc_acct_pop.cgi b/httemplate/browse/svc_acct_pop.cgi index a881b9a00..c6a661a98 100755 --- a/httemplate/browse/svc_acct_pop.cgi +++ b/httemplate/browse/svc_acct_pop.cgi @@ -1,4 +1,3 @@ - <% print header('POP Listing', menubar( diff --git a/httemplate/edit/agent.cgi b/httemplate/edit/agent.cgi index f3864e6c2..25e4765ba 100755 --- a/httemplate/edit/agent.cgi +++ b/httemplate/edit/agent.cgi @@ -1,4 +1,3 @@ - <% my $agent; diff --git a/httemplate/edit/agent_type.cgi b/httemplate/edit/agent_type.cgi index c3ff30ff6..8b729201d 100755 --- a/httemplate/edit/agent_type.cgi +++ b/httemplate/edit/agent_type.cgi @@ -1,4 +1,3 @@ - <% my($agent_type); diff --git a/httemplate/edit/cust_bill_pay.cgi b/httemplate/edit/cust_bill_pay.cgi index fd56b328a..bfa2b3baf 100755 --- a/httemplate/edit/cust_bill_pay.cgi +++ b/httemplate/edit/cust_bill_pay.cgi @@ -1,4 +1,3 @@ - <% my($paynum, $amount, $invnum); diff --git a/httemplate/edit/cust_credit.cgi b/httemplate/edit/cust_credit.cgi index 7c8a80c22..316226500 100755 --- a/httemplate/edit/cust_credit.cgi +++ b/httemplate/edit/cust_credit.cgi @@ -1,4 +1,3 @@ - <% my $conf = new FS::Conf; diff --git a/httemplate/edit/cust_credit_bill.cgi b/httemplate/edit/cust_credit_bill.cgi index 3748202a5..7528d85fc 100755 --- a/httemplate/edit/cust_credit_bill.cgi +++ b/httemplate/edit/cust_credit_bill.cgi @@ -1,4 +1,3 @@ - <% my($crednum, $amount, $invnum); diff --git a/httemplate/edit/cust_main.cgi b/httemplate/edit/cust_main.cgi index 5be6a3579..a0472bdf5 100755 --- a/httemplate/edit/cust_main.cgi +++ b/httemplate/edit/cust_main.cgi @@ -1,4 +1,3 @@ - <% #for misplaced logic below diff --git a/httemplate/edit/cust_main_county-expand.cgi b/httemplate/edit/cust_main_county-expand.cgi index 092a2d068..05bfa6f0e 100755 --- a/httemplate/edit/cust_main_county-expand.cgi +++ b/httemplate/edit/cust_main_county-expand.cgi @@ -1,4 +1,3 @@ - <% my($taxnum, $delim, $expansion ); diff --git a/httemplate/edit/cust_main_county.cgi b/httemplate/edit/cust_main_county.cgi index 69def0468..19368857c 100755 --- a/httemplate/edit/cust_main_county.cgi +++ b/httemplate/edit/cust_main_county.cgi @@ -1,4 +1,3 @@ - <% print header("Edit tax rates", menubar( diff --git a/httemplate/edit/cust_pay.cgi b/httemplate/edit/cust_pay.cgi index 2794e2218..6738dcd38 100755 --- a/httemplate/edit/cust_pay.cgi +++ b/httemplate/edit/cust_pay.cgi @@ -1,4 +1,3 @@ - <% my $conf = new FS::Conf; diff --git a/httemplate/edit/cust_pkg.cgi b/httemplate/edit/cust_pkg.cgi index c11a194b2..7fb88c3ce 100755 --- a/httemplate/edit/cust_pkg.cgi +++ b/httemplate/edit/cust_pkg.cgi @@ -1,4 +1,3 @@ - <% my %pkg = (); diff --git a/httemplate/edit/part_bill_event.cgi b/httemplate/edit/part_bill_event.cgi index 580e46734..25d9bc0ff 100755 --- a/httemplate/edit/part_bill_event.cgi +++ b/httemplate/edit/part_bill_event.cgi @@ -1,5 +1,3 @@ - - <% if ( $cgi->param('eventpart') && $cgi->param('eventpart') =~ /^(\d+)$/ ) { diff --git a/httemplate/edit/part_pkg.cgi b/httemplate/edit/part_pkg.cgi index bead1410a..a98179e12 100755 --- a/httemplate/edit/part_pkg.cgi +++ b/httemplate/edit/part_pkg.cgi @@ -1,5 +1,3 @@ - - <% if ( $cgi->param('clone') && $cgi->param('clone') =~ /^(\d+)$/ ) { @@ -417,7 +415,7 @@ if ( $cgi->param('pkgnum') ) { <% } elsif ( $href->{$field}{'type'} eq 'select_multiple' ) { %>