removed <!-- $Id$ --> 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

79 files changed, 23 insertions, 85 deletions

diff --git a/htetc/handler.pl b/htetc/handler.pl
index 37f2d37..5544ebb 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 067a06b..8079c72 100755
--- a/httemplate/browse/agent.cgi
+++ b/httemplate/browse/agent.cgi
@@ -1,4 +1,3 @@
-<!-- $Id: agent.cgi,v 1.7 2002-01-30 14:18:08 ivan Exp $ -->
 <%
 
 #Begin silliness
diff --git a/httemplate/browse/agent_type.cgi b/httemplate/browse/agent_type.cgi
index d75c450..ba74e0d 100755
--- a/httemplate/browse/agent_type.cgi
+++ b/httemplate/browse/agent_type.cgi
@@ -1,4 +1,3 @@
-<!-- $Id: agent_type.cgi,v 1.8 2002-02-07 22:29:34 ivan Exp $ -->
 <%
 
 print header("Agent Type Listing", menubar(
diff --git a/httemplate/browse/cust_main_county.cgi b/httemplate/browse/cust_main_county.cgi
index 89b1bfd..7273dd0 100755
--- a/httemplate/browse/cust_main_county.cgi
+++ b/httemplate/browse/cust_main_county.cgi
@@ -1,4 +1,3 @@
-<!-- $Id: cust_main_county.cgi,v 1.6 2002-01-30 14:18:08 ivan Exp $ -->
 <%
 
 print header("Tax Rate Listing", menubar(
diff --git a/httemplate/browse/cust_pay_batch.cgi b/httemplate/browse/cust_pay_batch.cgi
index 960843a..2202967 100755
--- a/httemplate/browse/cust_pay_batch.cgi
+++ b/httemplate/browse/cust_pay_batch.cgi
@@ -1,4 +1,3 @@
-<!-- $Id: cust_pay_batch.cgi,v 1.2 2002-01-30 14:18:08 ivan Exp $ -->
 <%
 
 print header("Pending credit card batch", menubar(
diff --git a/httemplate/browse/nas.cgi b/httemplate/browse/nas.cgi
index 2bac990..f1057ce 100755
--- a/httemplate/browse/nas.cgi
+++ b/httemplate/browse/nas.cgi
@@ -1,4 +1,3 @@
-<!-- $Id -->
 <%
 
 print header('NAS ports', menubar(
diff --git a/httemplate/browse/part_bill_event.cgi b/httemplate/browse/part_bill_event.cgi
index 81228f2..d850ae5 100755
--- a/httemplate/browse/part_bill_event.cgi
+++ b/httemplate/browse/part_bill_event.cgi
@@ -1,4 +1,3 @@
-<!-- $Id: part_bill_event.cgi,v 1.4 2002-02-10 02:16:46 ivan Exp $ -->
 <% 
 
 my %search;
diff --git a/httemplate/browse/part_pkg.cgi b/httemplate/browse/part_pkg.cgi
index 22d139c..03326d0 100755
--- a/httemplate/browse/part_pkg.cgi
+++ b/httemplate/browse/part_pkg.cgi
@@ -1,4 +1,3 @@
-<!-- $Id: part_pkg.cgi,v 1.10 2002-01-30 14:18:08 ivan Exp $ -->
 <%
 
 my %search;
diff --git a/httemplate/browse/part_referral.cgi b/httemplate/browse/part_referral.cgi
index 82f4292..3ca36b2 100755
--- a/httemplate/browse/part_referral.cgi
+++ b/httemplate/browse/part_referral.cgi
@@ -1,4 +1,3 @@
-<!-- $Id: part_referral.cgi,v 1.7 2002-01-30 14:18:08 ivan Exp $ -->
 <%
 
 print header("Referral Listing", menubar(
diff --git a/httemplate/browse/part_svc.cgi b/httemplate/browse/part_svc.cgi
index 54d4b08..5bfb803 100755
--- a/httemplate/browse/part_svc.cgi
+++ b/httemplate/browse/part_svc.cgi
@@ -1,4 +1,3 @@
-<!-- $Id: part_svc.cgi,v 1.7 2002-01-30 14:18:08 ivan Exp $ -->
 <% 
 
 my %search;
diff --git a/httemplate/browse/queue.cgi b/httemplate/browse/queue.cgi
index af8989b..e38e40b 100755
--- a/httemplate/browse/queue.cgi
+++ b/httemplate/browse/queue.cgi
@@ -1,4 +1,3 @@
-<!-- $Id: queue.cgi,v 1.7 2002-01-30 14:18:08 ivan Exp $ -->
 <%
 
 print header("Job Queue", menubar(
diff --git a/httemplate/browse/svc_acct_pop.cgi b/httemplate/browse/svc_acct_pop.cgi
index a881b9a..c6a661a 100755
--- a/httemplate/browse/svc_acct_pop.cgi
+++ b/httemplate/browse/svc_acct_pop.cgi
@@ -1,4 +1,3 @@
-<!-- $Id: svc_acct_pop.cgi,v 1.7 2002-01-30 14:18:08 ivan Exp $ -->
 <%
 
 print header('POP Listing', menubar(
diff --git a/httemplate/edit/agent.cgi b/httemplate/edit/agent.cgi
index f3864e6..25e4765 100755
--- a/httemplate/edit/agent.cgi
+++ b/httemplate/edit/agent.cgi
@@ -1,4 +1,3 @@
-<!-- $Id: agent.cgi,v 1.6 2002-01-30 14:18:08 ivan Exp $ -->
 <%
 
 my $agent;
diff --git a/httemplate/edit/agent_type.cgi b/httemplate/edit/agent_type.cgi
index c3ff30f..8b72920 100755
--- a/httemplate/edit/agent_type.cgi
+++ b/httemplate/edit/agent_type.cgi
@@ -1,4 +1,3 @@
-<!-- $Id: agent_type.cgi,v 1.7 2002-01-30 14:18:08 ivan Exp $ -->
 <%
 
 my($agent_type);
diff --git a/httemplate/edit/cust_bill_pay.cgi b/httemplate/edit/cust_bill_pay.cgi
index fd56b32..bfa2b3b 100755
--- a/httemplate/edit/cust_bill_pay.cgi
+++ b/httemplate/edit/cust_bill_pay.cgi
@@ -1,4 +1,3 @@
-<!-- $Id: cust_bill_pay.cgi,v 1.5 2002-01-30 14:18:08 ivan Exp $ -->
 <%
 
 my($paynum, $amount, $invnum);
diff --git a/httemplate/edit/cust_credit.cgi b/httemplate/edit/cust_credit.cgi
index 7c8a80c..3162265 100755
--- a/httemplate/edit/cust_credit.cgi
+++ b/httemplate/edit/cust_credit.cgi
@@ -1,4 +1,3 @@
-<!-- $Id: cust_credit.cgi,v 1.8 2002-01-30 14:18:08 ivan Exp $ -->
 <%
 
 my $conf = new FS::Conf;
diff --git a/httemplate/edit/cust_credit_bill.cgi b/httemplate/edit/cust_credit_bill.cgi
index 3748202..7528d85 100755
--- a/httemplate/edit/cust_credit_bill.cgi
+++ b/httemplate/edit/cust_credit_bill.cgi
@@ -1,4 +1,3 @@
-<!-- $Id: cust_credit_bill.cgi,v 1.7 2002-01-30 14:18:08 ivan Exp $ -->
 <%
 
 my($crednum, $amount, $invnum);
diff --git a/httemplate/edit/cust_main.cgi b/httemplate/edit/cust_main.cgi
index 5be6a35..a0472bd 100755
--- a/httemplate/edit/cust_main.cgi
+++ b/httemplate/edit/cust_main.cgi
@@ -1,4 +1,3 @@
-<!-- $Id: cust_main.cgi,v 1.20 2002-02-10 02:28:27 ivan Exp $ -->
 <%
 
   #for misplaced logic below
diff --git a/httemplate/edit/cust_main_county-expand.cgi b/httemplate/edit/cust_main_county-expand.cgi
index 092a2d0..05bfa6f 100755
--- a/httemplate/edit/cust_main_county-expand.cgi
+++ b/httemplate/edit/cust_main_county-expand.cgi
@@ -1,4 +1,3 @@
-<!-- $Id: cust_main_county-expand.cgi,v 1.6 2002-01-30 14:18:08 ivan Exp $ -->
 <%
 
 my($taxnum, $delim, $expansion );
diff --git a/httemplate/edit/cust_main_county.cgi b/httemplate/edit/cust_main_county.cgi
index 69def04..1936885 100755
--- a/httemplate/edit/cust_main_county.cgi
+++ b/httemplate/edit/cust_main_county.cgi
@@ -1,4 +1,3 @@
-<!-- $Id: cust_main_county.cgi,v 1.6 2002-01-30 14:18:08 ivan Exp $ -->
 <%
 
 print header("Edit tax rates", menubar(
diff --git a/httemplate/edit/cust_pay.cgi b/httemplate/edit/cust_pay.cgi
index 2794e22..6738dcd 100755
--- a/httemplate/edit/cust_pay.cgi
+++ b/httemplate/edit/cust_pay.cgi
@@ -1,4 +1,3 @@
-<!-- $Id: cust_pay.cgi,v 1.11 2002-01-30 14:18:08 ivan Exp $ -->
 <%
 
 my $conf = new FS::Conf;
diff --git a/httemplate/edit/cust_pkg.cgi b/httemplate/edit/cust_pkg.cgi
index c11a194..7fb88c3 100755
--- a/httemplate/edit/cust_pkg.cgi
+++ b/httemplate/edit/cust_pkg.cgi
@@ -1,4 +1,3 @@
-<!-- $Id: cust_pkg.cgi,v 1.6 2002-01-30 14:18:08 ivan Exp $ -->
 <%
 
 my %pkg = ();
diff --git a/httemplate/edit/part_bill_event.cgi b/httemplate/edit/part_bill_event.cgi
index 580e467..25d9bc0 100755
--- a/httemplate/edit/part_bill_event.cgi
+++ b/httemplate/edit/part_bill_event.cgi
@@ -1,5 +1,3 @@
-<!-- $Id: part_bill_event.cgi,v 1.5 2002-02-04 17:04:33 ivan Exp $ -->
-
 <%
 
 if ( $cgi->param('eventpart') && $cgi->param('eventpart') =~ /^(\d+)$/ ) {
diff --git a/httemplate/edit/part_pkg.cgi b/httemplate/edit/part_pkg.cgi
index bead141..a98179e 100755
--- a/httemplate/edit/part_pkg.cgi
+++ b/httemplate/edit/part_pkg.cgi
@@ -1,5 +1,3 @@
-<!-- $Id: part_pkg.cgi,v 1.10 2002-02-10 02:16:47 ivan Exp $ -->
-
 <%
 
 if ( $cgi->param('clone') && $cgi->param('clone') =~ /^(\d+)$/ ) {
@@ -417,7 +415,7 @@ if ( $cgi->param('pkgnum') ) {
        <INPUT TYPE="text" NAME="<%= $field %>" VALUE="<%= exists($plandata{$field}) ? $plandata{$field} : $href->{$field}{'default'} %>" onChange="fchanged(this)">
   <% } elsif ( $href->{$field}{'type'} eq 'select_multiple' ) { %>
        <SELECT MULTIPLE NAME="<%= $field %>" onChange="fchanged(this)">
-       <% foreach $record ( qsearch( $href->{$field}{'select_table'}, $href->{$field}{'select_hash'} ) ) {
+       <% foreach my $record ( qsearch( $href->{$field}{'select_table'}, $href->{$field}{'select_hash'} ) ) {
           my $value = $record->getfield($href->{$field}{'select_key'}); %>
          <OPTION VALUE="<%= $value %>"<%= $plandata{$field} =~ /(^|, *)$value *(,|$)/ ? ' SELECTED' : '' %>><%= $record->getfield($href->{$field}{'select_label'}) %>
        <% } %>
diff --git a/httemplate/edit/part_referral.cgi b/httemplate/edit/part_referral.cgi
index 18f6aa9..22277ce 100755
--- a/httemplate/edit/part_referral.cgi
+++ b/httemplate/edit/part_referral.cgi
@@ -1,4 +1,3 @@
-<!-- $Id: part_referral.cgi,v 1.5 2002-01-30 14:18:08 ivan Exp $ -->
 <%
 
 my $part_referral;
diff --git a/httemplate/edit/part_svc.cgi b/httemplate/edit/part_svc.cgi
index 39f49e1..9199567 100755
--- a/httemplate/edit/part_svc.cgi
+++ b/httemplate/edit/part_svc.cgi
@@ -1,4 +1,3 @@
-<!-- $Id: part_svc.cgi,v 1.14 2002-01-30 14:18:08 ivan Exp $ -->
 <% 
    my $part_svc;
    if ( $cgi->param('error') ) { #error
diff --git a/httemplate/edit/process/REAL_cust_pkg.cgi b/httemplate/edit/process/REAL_cust_pkg.cgi
index 4f33f6b..6bed85c 100755
--- a/httemplate/edit/process/REAL_cust_pkg.cgi
+++ b/httemplate/edit/process/REAL_cust_pkg.cgi
@@ -1,5 +1,4 @@
 <%
-#<!-- $Id: REAL_cust_pkg.cgi,v 1.1 2001-10-15 14:58:03 ivan Exp $ -->
 
 my $pkgnum = $cgi->param('pkgnum') or die;
 my $old = qsearchs('cust_pkg',{'pkgnum'=>$pkgnum});
diff --git a/httemplate/edit/process/agent.cgi b/httemplate/edit/process/agent.cgi
index 93ce4f9..182eeab 100755
--- a/httemplate/edit/process/agent.cgi
+++ b/httemplate/edit/process/agent.cgi
@@ -1,4 +1,3 @@
-<!-- $Id: agent.cgi,v 1.3 2002-01-30 14:18:08 ivan Exp $ -->
 <%
 
 my $agentnum = $cgi->param('agentnum');
diff --git a/httemplate/edit/process/agent_type.cgi b/httemplate/edit/process/agent_type.cgi
index 4e98cf1..67aacfd 100755
--- a/httemplate/edit/process/agent_type.cgi
+++ b/httemplate/edit/process/agent_type.cgi
@@ -1,4 +1,3 @@
-<!-- $Id: agent_type.cgi,v 1.4 2002-02-09 18:24:01 ivan Exp $ -->
 <%
 
 my $typenum = $cgi->param('typenum');
diff --git a/httemplate/edit/process/cust_bill_pay.cgi b/httemplate/edit/process/cust_bill_pay.cgi
index 16d30bd..0c33506 100755
--- a/httemplate/edit/process/cust_bill_pay.cgi
+++ b/httemplate/edit/process/cust_bill_pay.cgi
@@ -1,4 +1,3 @@
-<!-- $Id: cust_bill_pay.cgi,v 1.2 2002-01-30 14:18:08 ivan Exp $ -->
 <%
 
 $cgi->param('paynum') =~ /^(\d*)$/ or die "Illegal paynum!";
diff --git a/httemplate/edit/process/cust_credit.cgi b/httemplate/edit/process/cust_credit.cgi
index 51fca74..ac92631 100755
--- a/httemplate/edit/process/cust_credit.cgi
+++ b/httemplate/edit/process/cust_credit.cgi
@@ -1,4 +1,3 @@
-<!-- $Id: cust_credit.cgi,v 1.6 2002-01-30 14:18:08 ivan Exp $ -->
 <%
 
 $cgi->param('custnum') =~ /^(\d*)$/ or die "Illegal custnum!";
diff --git a/httemplate/edit/process/cust_credit_bill.cgi b/httemplate/edit/process/cust_credit_bill.cgi
index afe2973..4879b0e 100755
--- a/httemplate/edit/process/cust_credit_bill.cgi
+++ b/httemplate/edit/process/cust_credit_bill.cgi
@@ -1,4 +1,3 @@
-<!-- $Id: cust_credit_bill.cgi,v 1.3 2002-01-30 14:18:08 ivan Exp $ -->
 <%
 
 $cgi->param('crednum') =~ /^(\d*)$/ or die "Illegal crednum!";
diff --git a/httemplate/edit/process/cust_main.cgi b/httemplate/edit/process/cust_main.cgi
index fa50dc6..c8038ec 100755
--- a/httemplate/edit/process/cust_main.cgi
+++ b/httemplate/edit/process/cust_main.cgi
@@ -1,4 +1,3 @@
-<!-- $Id: cust_main.cgi,v 1.6 2002-01-30 14:18:09 ivan Exp $ -->
 <%
 
 my $error = '';
diff --git a/httemplate/edit/process/cust_main_county-collapse.cgi b/httemplate/edit/process/cust_main_county-collapse.cgi
index 4888b78..8e67140 100755
--- a/httemplate/edit/process/cust_main_county-collapse.cgi
+++ b/httemplate/edit/process/cust_main_county-collapse.cgi
@@ -1,4 +1,3 @@
-<!-- $Id: cust_main_county-collapse.cgi,v 1.2 2002-01-30 14:18:09 ivan Exp $ -->
 <%
 
 my($query) = $cgi->keywords;
diff --git a/httemplate/edit/process/cust_main_county-expand.cgi b/httemplate/edit/process/cust_main_county-expand.cgi
index 3427790..64061de 100755
--- a/httemplate/edit/process/cust_main_county-expand.cgi
+++ b/httemplate/edit/process/cust_main_county-expand.cgi
@@ -1,4 +1,3 @@
-<!-- $Id: cust_main_county-expand.cgi,v 1.5 2002-02-09 18:24:01 ivan Exp $ -->
 <%
 
 $cgi->param('taxnum') =~ /^(\d+)$/ or die "Illegal taxnum!";
diff --git a/httemplate/edit/process/cust_main_county.cgi b/httemplate/edit/process/cust_main_county.cgi
index e9d1308..0800789 100755
--- a/httemplate/edit/process/cust_main_county.cgi
+++ b/httemplate/edit/process/cust_main_county.cgi
@@ -1,4 +1,3 @@
-<!-- $Id: cust_main_county.cgi,v 1.4 2002-02-09 18:24:01 ivan Exp $ -->
 <%
 
 foreach ( $cgi->param ) {
diff --git a/httemplate/edit/process/cust_pay.cgi b/httemplate/edit/process/cust_pay.cgi
index 953ff3e..82442ae 100755
--- a/httemplate/edit/process/cust_pay.cgi
+++ b/httemplate/edit/process/cust_pay.cgi
@@ -1,4 +1,3 @@
-<!-- $Id: cust_pay.cgi,v 1.7 2002-02-09 18:24:01 ivan Exp $ -->
 <%
 
 $cgi->param('linknum') =~ /^(\d+)$/
diff --git a/httemplate/edit/process/cust_pkg.cgi b/httemplate/edit/process/cust_pkg.cgi
index 25b3201..f8c9f51 100755
--- a/httemplate/edit/process/cust_pkg.cgi
+++ b/httemplate/edit/process/cust_pkg.cgi
@@ -1,4 +1,3 @@
-<!-- $Id: cust_pkg.cgi,v 1.3 2002-01-30 14:18:09 ivan Exp $ -->
 <%
 
 my $error = '';
diff --git a/httemplate/edit/process/part_pkg.cgi b/httemplate/edit/process/part_pkg.cgi
index 9ad1527..d489426 100755
--- a/httemplate/edit/process/part_pkg.cgi
+++ b/httemplate/edit/process/part_pkg.cgi
@@ -1,4 +1,3 @@
-<!-- $Id: part_pkg.cgi,v 1.9 2002-02-10 02:16:47 ivan Exp $ -->
 <%
 
 my $dbh = dbh;
@@ -61,7 +60,7 @@ if ( $error ) {
   myexit();
 }
 
-foreach $part_svc (qsearch('part_svc',{})) {
+foreach my $part_svc (qsearch('part_svc',{})) {
   my $quantity = $cgi->param('pkg_svc'. $part_svc->svcpart) || 0;
   my $old_pkg_svc = qsearchs('pkg_svc', {
     'pkgpart' => $pkgpart,
diff --git a/httemplate/edit/process/part_referral.cgi b/httemplate/edit/process/part_referral.cgi
index 7e37db8..fd2c015 100755
--- a/httemplate/edit/process/part_referral.cgi
+++ b/httemplate/edit/process/part_referral.cgi
@@ -1,4 +1,3 @@
-<!-- $Id: part_referral.cgi,v 1.3 2002-01-30 14:18:09 ivan Exp $ -->
 <%
 
 my $refnum = $cgi->param('refnum');
diff --git a/httemplate/edit/process/quick-cust_pkg.cgi b/httemplate/edit/process/quick-cust_pkg.cgi
index 29a954c..5a4fb77 100644
--- a/httemplate/edit/process/quick-cust_pkg.cgi
+++ b/httemplate/edit/process/quick-cust_pkg.cgi
@@ -1,4 +1,3 @@
-<!-- $Id: quick-cust_pkg.cgi,v 1.4 2002-01-30 14:18:09 ivan Exp $ -->
 <%
 
 #untaint custnum
diff --git a/httemplate/edit/process/svc_acct.cgi b/httemplate/edit/process/svc_acct.cgi
index 178d7d8..5e8a16f 100755
--- a/httemplate/edit/process/svc_acct.cgi
+++ b/httemplate/edit/process/svc_acct.cgi
@@ -1,4 +1,3 @@
-<!-- $Id: svc_acct.cgi,v 1.3 2002-01-30 14:18:09 ivan Exp $ -->
 <%
 
 $cgi->param('svcnum') =~ /^(\d*)$/ or die "Illegal svcnum!";
diff --git a/httemplate/edit/process/svc_acct_pop.cgi b/httemplate/edit/process/svc_acct_pop.cgi
index 5d699f2..46ad74d 100755
--- a/httemplate/edit/process/svc_acct_pop.cgi
+++ b/httemplate/edit/process/svc_acct_pop.cgi
@@ -1,4 +1,3 @@
-<!-- $Id: svc_acct_pop.cgi,v 1.3 2002-01-30 14:18:09 ivan Exp $ -->
 <%
 
 my $popnum = $cgi->param('popnum');
diff --git a/httemplate/edit/process/svc_acct_sm.cgi b/httemplate/edit/process/svc_acct_sm.cgi
index 25cd88d..41d03fb 100755
--- a/httemplate/edit/process/svc_acct_sm.cgi
+++ b/httemplate/edit/process/svc_acct_sm.cgi
@@ -1,4 +1,3 @@
-<!-- $Id: svc_acct_sm.cgi,v 1.3 2002-01-30 14:18:09 ivan Exp $ -->
 <%
 
 $cgi->param('svcnum') =~ /^(\d*)$/ or die "Illegal svcnum!";
diff --git a/httemplate/edit/process/svc_domain.cgi b/httemplate/edit/process/svc_domain.cgi
index 0b7ec49..19f8eb4 100755
--- a/httemplate/edit/process/svc_domain.cgi
+++ b/httemplate/edit/process/svc_domain.cgi
@@ -1,4 +1,3 @@
-<!-- $Id: svc_domain.cgi,v 1.3 2002-01-30 14:18:09 ivan Exp $ -->
 <%
 
 #remove this to actually test the domains!
diff --git a/httemplate/edit/process/svc_forward.cgi b/httemplate/edit/process/svc_forward.cgi
index 5f0247f..bb066d8 100755
--- a/httemplate/edit/process/svc_forward.cgi
+++ b/httemplate/edit/process/svc_forward.cgi
@@ -1,4 +1,3 @@
-<!-- $Id: svc_forward.cgi,v 1.3 2002-01-30 14:18:09 ivan Exp $ -->
 <%
 
 $cgi->param('svcnum') =~ /^(\d*)$/ or die "Illegal svcnum!";
diff --git a/httemplate/edit/svc_acct.cgi b/httemplate/edit/svc_acct.cgi
index 681d8b5..fed39e7 100755
--- a/httemplate/edit/svc_acct.cgi
+++ b/httemplate/edit/svc_acct.cgi
@@ -1,4 +1,3 @@
-<!-- $Id: svc_acct.cgi,v 1.14 2002-01-30 14:18:08 ivan Exp $ -->
 <%
 
 my $conf = new FS::Conf;
diff --git a/httemplate/edit/svc_acct_pop.cgi b/httemplate/edit/svc_acct_pop.cgi
index c984ef9..97d42f5 100755
--- a/httemplate/edit/svc_acct_pop.cgi
+++ b/httemplate/edit/svc_acct_pop.cgi
@@ -1,4 +1,3 @@
-<!-- $Id: svc_acct_pop.cgi,v 1.5 2002-01-30 14:18:08 ivan Exp $ -->
 <%
 
 my $svc_acct_pop;
diff --git a/httemplate/edit/svc_acct_sm.cgi b/httemplate/edit/svc_acct_sm.cgi
index 62a041d..0cb27b8 100755
--- a/httemplate/edit/svc_acct_sm.cgi
+++ b/httemplate/edit/svc_acct_sm.cgi
@@ -1,4 +1,3 @@
-<!-- $Id: svc_acct_sm.cgi,v 1.7 2002-01-30 14:18:08 ivan Exp $ -->
 <%
 
 my $conf = new FS::Conf;
diff --git a/httemplate/edit/svc_domain.cgi b/httemplate/edit/svc_domain.cgi
index 57ee941..671a12d 100755
--- a/httemplate/edit/svc_domain.cgi
+++ b/httemplate/edit/svc_domain.cgi
@@ -1,4 +1,3 @@
-<!-- $Id: svc_domain.cgi,v 1.7 2002-01-30 14:18:08 ivan Exp $ -->
 <%
 
 my($svcnum, $pkgnum, $svcpart, $kludge_action, $purpose, $part_svc,
diff --git a/httemplate/edit/svc_forward.cgi b/httemplate/edit/svc_forward.cgi
index cda577b..88558ca 100755
--- a/httemplate/edit/svc_forward.cgi
+++ b/httemplate/edit/svc_forward.cgi
@@ -1,4 +1,3 @@
-<!-- $Id: svc_forward.cgi,v 1.8 2002-01-30 14:18:08 ivan Exp $ -->
 <%
 
 my $conf = new FS::Conf;
diff --git a/httemplate/misc/bill.cgi b/httemplate/misc/bill.cgi
index 7313095..8c21fe1 100755
--- a/httemplate/misc/bill.cgi
+++ b/httemplate/misc/bill.cgi
@@ -1,4 +1,3 @@
-<!-- $Id: bill.cgi,v 1.5 2002-01-30 14:18:09 ivan Exp $ -->
 <%
 
 #untaint custnum
diff --git a/httemplate/misc/cancel-unaudited.cgi b/httemplate/misc/cancel-unaudited.cgi
index 3e2bd07..a73b2ce 100755
--- a/httemplate/misc/cancel-unaudited.cgi
+++ b/httemplate/misc/cancel-unaudited.cgi
@@ -1,4 +1,4 @@
-<!-- $Id: cancel-unaudited.cgi,v 1.3 2002-01-30 14:18:09 ivan Exp $ -->
+<%
 
 my $dbh = dbh;
  
diff --git a/httemplate/misc/cancel_pkg.cgi b/httemplate/misc/cancel_pkg.cgi
index 1513ef0..0487677 100755
--- a/httemplate/misc/cancel_pkg.cgi
+++ b/httemplate/misc/cancel_pkg.cgi
@@ -1,4 +1,3 @@
-<!-- $Id: cancel_pkg.cgi,v 1.3 2002-01-30 14:18:09 ivan Exp $ -->
 <%
 
 #untaint pkgnum
diff --git a/httemplate/misc/catchall.cgi b/httemplate/misc/catchall.cgi
index a8d8657..cc4adb8 100755
--- a/httemplate/misc/catchall.cgi
+++ b/httemplate/misc/catchall.cgi
@@ -1,4 +1,3 @@
-<!-- $Id: catchall.cgi,v 1.5 2002-01-30 14:18:09 ivan Exp $ -->
 <%
 
 my $conf = new FS::Conf;
diff --git a/httemplate/misc/delete-cust_pay.cgi b/httemplate/misc/delete-cust_pay.cgi
index 3fb786d..3efd918 100755
--- a/httemplate/misc/delete-cust_pay.cgi
+++ b/httemplate/misc/delete-cust_pay.cgi
@@ -1,4 +1,3 @@
-<!-- $Id: delete-cust_pay.cgi,v 1.1 2002-02-07 22:29:35 ivan Exp $ -->
 <%
 
 #untaint paynum
diff --git a/httemplate/misc/delete-customer.cgi b/httemplate/misc/delete-customer.cgi
index 18f6e85..0ed3d01 100755
--- a/httemplate/misc/delete-customer.cgi
+++ b/httemplate/misc/delete-customer.cgi
@@ -1,4 +1,3 @@
-<!-- $Id: delete-customer.cgi,v 1.6 2002-01-30 14:18:09 ivan Exp $ -->
 <%
 
 my $conf = new FS::Conf;
diff --git a/httemplate/misc/expire_pkg.cgi b/httemplate/misc/expire_pkg.cgi
index 739fb51..9e4ce8b 100755
--- a/httemplate/misc/expire_pkg.cgi
+++ b/httemplate/misc/expire_pkg.cgi
@@ -1,4 +1,3 @@
-<!-- $Id: expire_pkg.cgi,v 1.3 2002-01-30 14:18:09 ivan Exp $ -->
 <%
 
 #untaint date & pkgnum
diff --git a/httemplate/misc/link.cgi b/httemplate/misc/link.cgi
index 3bcb5d9..81e1bc4 100755
--- a/httemplate/misc/link.cgi
+++ b/httemplate/misc/link.cgi
@@ -1,4 +1,3 @@
-<!-- $Id: link.cgi,v 1.5 2002-01-30 14:18:09 ivan Exp $ -->
 <%
 
 my %link_field = (
diff --git a/httemplate/misc/print-invoice.cgi b/httemplate/misc/print-invoice.cgi
index aec7cb3..a5500bf 100755
--- a/httemplate/misc/print-invoice.cgi
+++ b/httemplate/misc/print-invoice.cgi
@@ -1,4 +1,3 @@
-<!-- $Id: print-invoice.cgi,v 1.3 2002-01-30 14:18:09 ivan Exp $ -->
 <%
 
 my $conf = new FS::Conf;
diff --git a/httemplate/misc/process/catchall.cgi b/httemplate/misc/process/catchall.cgi
index cf6f8d7..44a63f9 100755
--- a/httemplate/misc/process/catchall.cgi
+++ b/httemplate/misc/process/catchall.cgi
@@ -1,4 +1,3 @@
-<!--$Id: catchall.cgi,v 1.3 2002-01-30 14:18:09 ivan Exp $ -->
 <%
 
 $FS::svc_domain::whois_hack=1;
diff --git a/httemplate/misc/process/delete-customer.cgi b/httemplate/misc/process/delete-customer.cgi
index 6f26c81..16bdbae 100755
--- a/httemplate/misc/process/delete-customer.cgi
+++ b/httemplate/misc/process/delete-customer.cgi
@@ -1,4 +1,3 @@
-<!-- $Id: delete-customer.cgi,v 1.3 2002-01-30 14:18:09 ivan Exp $ -->
 <%
 
 my $conf = new FS::Conf;
diff --git a/httemplate/misc/process/link.cgi b/httemplate/misc/process/link.cgi
index f8b7812..af96c0b 100755
--- a/httemplate/misc/process/link.cgi
+++ b/httemplate/misc/process/link.cgi
@@ -1,4 +1,3 @@
-<!-- $Id: link.cgi,v 1.4 2002-02-09 17:45:26 ivan Exp $ -->
 <%
 
 $cgi->param('pkgnum') =~ /^(\d+)$/;
diff --git a/httemplate/misc/susp_pkg.cgi b/httemplate/misc/susp_pkg.cgi
index efc2f9b..4a19fa8 100755
--- a/httemplate/misc/susp_pkg.cgi
+++ b/httemplate/misc/susp_pkg.cgi
@@ -1,4 +1,3 @@
-<!-- $Id: susp_pkg.cgi,v 1.3 2002-01-30 14:18:09 ivan Exp $ -->
 <%
 
 #untaint pkgnum
diff --git a/httemplate/misc/unsusp_pkg.cgi b/httemplate/misc/unsusp_pkg.cgi
index 00f3a08..5008729 100755
--- a/httemplate/misc/unsusp_pkg.cgi
+++ b/httemplate/misc/unsusp_pkg.cgi
@@ -1,4 +1,3 @@
-<!-- $Id: unsusp_pkg.cgi,v 1.3 2002-01-30 14:18:09 ivan Exp $ -->
 <%
 
 #untaint pkgnum
diff --git a/httemplate/search/cust_bill.cgi b/httemplate/search/cust_bill.cgi
index 755745f..0c9f27f 100755
--- a/httemplate/search/cust_bill.cgi
+++ b/httemplate/search/cust_bill.cgi
@@ -1,4 +1,3 @@
-<!-- $Id: cust_bill.cgi,v 1.6 2002-01-30 14:18:09 ivan Exp $ -->
 <%
 
 my(@cust_bill, $sortby);
diff --git a/httemplate/search/cust_pay.cgi b/httemplate/search/cust_pay.cgi
index 715e63e..8ebd654 100755
--- a/httemplate/search/cust_pay.cgi
+++ b/httemplate/search/cust_pay.cgi
@@ -1,4 +1,3 @@
-<!-- $Id: cust_pay.cgi,v 1.2 2002-01-30 14:18:09 ivan Exp $ -->
 <%
 
 $cgi->param('payinfo') =~ /^\s*(\d+)\s*$/ or die "illegal payinfo";
diff --git a/httemplate/search/cust_pkg.cgi b/httemplate/search/cust_pkg.cgi
index b2199e9..6b25fec 100755
--- a/httemplate/search/cust_pkg.cgi
+++ b/httemplate/search/cust_pkg.cgi
@@ -1,4 +1,3 @@
-<!-- $Id: cust_pkg.cgi,v 1.14 2002-02-09 18:24:02 ivan Exp $ -->
 <%
 
 my $conf = new FS::Conf;
diff --git a/httemplate/search/svc_acct.cgi b/httemplate/search/svc_acct.cgi
index 8d53296..a3fed83 100755
--- a/httemplate/search/svc_acct.cgi
+++ b/httemplate/search/svc_acct.cgi
@@ -1,4 +1,3 @@
-<!-- $Id: svc_acct.cgi,v 1.13 2002-01-30 14:18:09 ivan Exp $ -->
 <%
 
 my $mydomain = '';
diff --git a/httemplate/search/svc_acct_sm.cgi b/httemplate/search/svc_acct_sm.cgi
index 1f1f770..bcfe44c 100755
--- a/httemplate/search/svc_acct_sm.cgi
+++ b/httemplate/search/svc_acct_sm.cgi
@@ -1,4 +1,3 @@
-<!-- $Id: svc_acct_sm.cgi,v 1.5 2002-01-30 14:18:09 ivan Exp $ -->
 <%
 
 my $conf = new FS::Conf;
diff --git a/httemplate/search/svc_domain.cgi b/httemplate/search/svc_domain.cgi
index c274750..334b6c0 100755
--- a/httemplate/search/svc_domain.cgi
+++ b/httemplate/search/svc_domain.cgi
@@ -1,4 +1,3 @@
-<!-- $Id: svc_domain.cgi,v 1.7 2002-02-09 18:24:02 ivan Exp $ -->
 <%
 
 my $conf = new FS::Conf;
diff --git a/httemplate/view/cust_bill.cgi b/httemplate/view/cust_bill.cgi
index 5860ffd..da79d79 100755
--- a/httemplate/view/cust_bill.cgi
+++ b/httemplate/view/cust_bill.cgi
@@ -1,4 +1,3 @@
-<!-- $Id: cust_bill.cgi,v 1.8 2002-02-10 02:16:47 ivan Exp $ -->
 <%
 
 #untaint invnum
diff --git a/httemplate/view/cust_main.cgi b/httemplate/view/cust_main.cgi
index 946fc63..bc76301 100755
--- a/httemplate/view/cust_main.cgi
+++ b/httemplate/view/cust_main.cgi
@@ -1,4 +1,3 @@
-<!-- $Id: cust_main.cgi,v 1.21 2002-02-10 02:28:28 ivan Exp $ -->
 <%
 
 my $conf = new FS::Conf;
diff --git a/httemplate/view/cust_pkg.cgi b/httemplate/view/cust_pkg.cgi
index 0e67737..3cf9083 100755
--- a/httemplate/view/cust_pkg.cgi
+++ b/httemplate/view/cust_pkg.cgi
@@ -1,4 +1,3 @@
-<!-- $Id: cust_pkg.cgi,v 1.6 2002-01-30 14:18:09 ivan Exp $ -->
 <%
 
 my %uiview = ();
diff --git a/httemplate/view/svc_acct.cgi b/httemplate/view/svc_acct.cgi
index a4e3770..31327a6 100755
--- a/httemplate/view/svc_acct.cgi
+++ b/httemplate/view/svc_acct.cgi
@@ -1,4 +1,3 @@
-<!-- $Id: svc_acct.cgi,v 1.10 2002-01-30 14:18:09 ivan Exp $ -->
 <%
 
 my $conf = new FS::Conf;
diff --git a/httemplate/view/svc_acct_sm.cgi b/httemplate/view/svc_acct_sm.cgi
index c8561ca..ccb81f1 100755
--- a/httemplate/view/svc_acct_sm.cgi
+++ b/httemplate/view/svc_acct_sm.cgi
@@ -1,4 +1,3 @@
-<!-- $Id: svc_acct_sm.cgi,v 1.5 2002-01-30 14:18:09 ivan Exp $ -->
 <%
 
 my $conf = new FS::Conf;
diff --git a/httemplate/view/svc_domain.cgi b/httemplate/view/svc_domain.cgi
index c980b1c..f4aa42b 100755
--- a/httemplate/view/svc_domain.cgi
+++ b/httemplate/view/svc_domain.cgi
@@ -1,4 +1,3 @@
-<!-- $Id: svc_domain.cgi,v 1.6 2002-01-30 14:18:09 ivan Exp $ -->
 <%
 
 my($query) = $cgi->keywords;
diff --git a/httemplate/view/svc_forward.cgi b/httemplate/view/svc_forward.cgi
index fc465db..a5096e9 100755
--- a/httemplate/view/svc_forward.cgi
+++ b/httemplate/view/svc_forward.cgi
@@ -1,4 +1,3 @@
-<!-- $Id: svc_forward.cgi,v 1.5 2002-01-30 14:18:09 ivan Exp $ -->
 <%
 
 my $conf = new FS::Conf;
diff --git a/httemplate/view/svc_www.cgi b/httemplate/view/svc_www.cgi
index bc605be..2fc8ac4 100644
--- a/httemplate/view/svc_www.cgi
+++ b/httemplate/view/svc_www.cgi
@@ -1,4 +1,3 @@
-<!-- $Id: svc_www.cgi,v 1.2 2002-01-30 14:18:09 ivan Exp $ -->
 <%
 
 my($query) = $cgi->keywords;