correct a typo, and <%init> helps alot

1 files changed, 71 insertions, 72 deletions

diff --git a/httemplate/misc/process/cancel_pkg.html b/httemplate/misc/process/cancel_pkg.html
index dfe1317f4..cd533be10 100755
--- a/httemplate/misc/process/cancel_pkg.html
+++ b/httemplate/misc/process/cancel_pkg.html
@@ -1,76 +1,75 @@
-%
-%
-%#untaint method
-%my $method = $cgi->param('method');
-%$method =~ /^(cancel|expire|suspend)$/ || die "Illegal method";
-%$method = $1;
+<%init>
+#untaint method
+my $method = $cgi->param('method');
+$method =~ /^(cancel|expire|suspend)$/ || die "Illegal method";
+$method = $1;
 
-%#untaint pkgnum
-%my $pkgnum = $cgi->param('pkgnum');
-%$pkgnum =~ /^(\d+)$/ || die "Illegal pkgnum";
-%$pkgnum = $1;
-%
-%#untaint reasonnum
-%my $reasonnum = $cgi->param('reasonnum');
-%$reasonnum =~ /^(-?\d+)$/ || die "Illegal reasonnum";
-%$reasonnum = $1;
-%
-%my $date = time;
-%if ($method eq 'expire'){
-%  #untaint date
-%  $date = $cgi->param('date');
-%  str2time($cgi->param('date')) =~ /^(\d+)$/ || die "Illegal date";
-%  $date = $1;
-%}
-%
-%my $cust_pkg = qsearchs( 'cust_pkg', {'pkgnum'=>$pkgnum} );
-%
-%
-%my $oldAutoCommit = $FS::UID::AutoCommit;
-%local $FS::UID::AutoCommit = 0;
-%my $dbh = dbh;
-%
-%my $otaker = $FS::CurrentUser::CurrentUser->name;
-%$otaker = $FS::CurrentUser::CurrentUser->username
-%  if ($otaker eq "User, Legacy");
-%
-%my $error = '';
-%if ($reasonnum == -1) {
-%
-%  $error = 'Enter a new reason (or select an existing oen)'
-%    unless $cgi->param('newreasonnum') !~ /^\s*$/;
-%
-%  my $reason = new FS::reason({ 'reason_type' => $cgi->param('newreasonnumT'),
-%                                'reason'      => $cgi->param('newreasonnum'),
-%                              });
-%  $error ||= $reason->insert;
-%  $reasonnum = $reason->reasonnum
-%    unless $error;
-%}
-%
-%unless ($error) {
-%  if ($method eq 'expire'){
-%    my %hash = $cust_pkg->hash;
-%    $hash{'expire'}=$date;
-%    my $new = new FS::cust_pkg (\%hash);
-%    $error = $new->replace($cust_pkg, 'reason' => $reasonnum);
-%  }else{
-%    $error = $cust_pkg->$method( 'reason' => $reasonnum );
-%  }
-%}
-%
-%if ($error) {
-%  $cgi->param('error', $error);
-%  $dbh->rollback if $oldAutoCommit;
-%  print $cgi->redirect(popurl(2). "cancel_pkg.html?". $cgi->query_string );
-%}
-%
-%$dbh->commit or die $dbh->errstr if $oldAutoCommit;
-%
-% my %past = ( 'cancel'  => 'cancelled',
-%              'expire'  => 'expired',
-%              'suspend' => 'suspended',
-%            );
+#untaint pkgnum
+my $pkgnum = $cgi->param('pkgnum');
+$pkgnum =~ /^(\d+)$/ || die "Illegal pkgnum";
+$pkgnum = $1;
+
+#untaint reasonnum
+my $reasonnum = $cgi->param('reasonnum');
+$reasonnum =~ /^(-?\d+)$/ || die "Illegal reasonnum";
+$reasonnum = $1;
+
+my $date = time;
+if ($method eq 'expire'){
+  #untaint date
+  $date = $cgi->param('date');
+  str2time($cgi->param('date')) =~ /^(\d+)$/ || die "Illegal date";
+  $date = $1;
+}
+
+my $cust_pkg = qsearchs( 'cust_pkg', {'pkgnum'=>$pkgnum} );
+
+my $oldAutoCommit = $FS::UID::AutoCommit;
+local $FS::UID::AutoCommit = 0;
+my $dbh = dbh;
+
+my $otaker = $FS::CurrentUser::CurrentUser->name;
+$otaker = $FS::CurrentUser::CurrentUser->username
+  if ($otaker eq "User, Legacy");
+
+my $error = '';
+if ($reasonnum == -1) {
+
+  $error = 'Enter a new reason (or select an existing one)'
+    unless $cgi->param('newreasonnum') !~ /^\s*$/;
+
+  my $reason = new FS::reason({ 'reason_type' => $cgi->param('newreasonnumT'),
+                                'reason'      => $cgi->param('newreasonnum'),
+                              });
+  $error ||= $reason->insert;
+  $reasonnum = $reason->reasonnum
+    unless $error;
+}
+
+unless ($error) {
+  if ($method eq 'expire'){
+    my %hash = $cust_pkg->hash;
+    $hash{'expire'}=$date;
+    my $new = new FS::cust_pkg (\%hash);
+    $error = $new->replace($cust_pkg, 'reason' => $reasonnum);
+  }else{
+    $error = $cust_pkg->$method( 'reason' => $reasonnum );
+  }
+}
+
+if ($error) {
+  $cgi->param('error', $error);
+  $dbh->rollback if $oldAutoCommit;
+  print $cgi->redirect(popurl(2). "cancel_pkg.html?". $cgi->query_string );
+}
+
+$dbh->commit or die $dbh->errstr if $oldAutoCommit;
+
+ my %past = ( 'cancel'  => 'cancelled',
+              'expire'  => 'expired',
+              'suspend' => 'suspended',
+            );
+</%init>
 <% header("Package $past{$method}") %>
   <SCRIPT TYPE="text/javascript">
     window.top.location.reload();