1 files changed, 17 insertions, 47 deletions
diff --git a/httemplate/misc/expire_pkg.cgi b/httemplate/misc/expire_pkg.cgi
index b59674a69..9e4ce8b62 100755
--- a/httemplate/misc/expire_pkg.cgi
+++ b/httemplate/misc/expire_pkg.cgi
@@ -1,55 +1,25 @@
-<!-- mason kludge -->
 <%
 
-my($query) = $cgi->keywords;
-$query =~ /^(\d+)$/;
+#untaint date & pkgnum
+
+my $date;
+if ( $cgi->param('date') ) {
+  str2time($cgi->param('date')) =~ /^(\d+)$/ or die "Illegal date";
+  $date=$1;
+} else {
+  $date='';
+}
+
+$cgi->param('pkgnum') =~ /^(\d+)$/ or die "Illegal pkgnum";
 my $pkgnum = $1;
 
-#get package record
 my $cust_pkg = qsearchs('cust_pkg',{'pkgnum'=>$pkgnum});
-die "Unknown pkgnum $pkgnum" unless $cust_pkg;
-my $part_pkg = $cust_pkg->part_pkg;
-
-my $custnum = $cust_pkg->getfield('custnum');
+my %hash = $cust_pkg->hash;
+$hash{expire}=$date;
+my $new = new FS::cust_pkg ( \%hash );
+my $error = $new->replace($cust_pkg);
+&eidiot($error) if $error;
 
-my $date = $cust_pkg->expire ? time2str('%D', $cust_pkg->expire) : '';
+print $cgi->redirect(popurl(2). "view/cust_main.cgi?".$cust_pkg->getfield('custnum'));
 
 %>
-
-<%= header('Expire package', menubar(
-  "View this customer (#$custnum)" => "${p}view/cust_main.cgi?$custnum",
-  'Main Menu' => popurl(2)
-)) %>
-
-<LINK REL="stylesheet" TYPE="text/css" HREF="../elements/calendar-win2k-2.css" TITLE="win2k-2">
-<SCRIPT TYPE="text/javascript" SRC="../elements/calendar_stripped.js"></SCRIPT>
-<SCRIPT TYPE="text/javascript" SRC="../elements/calendar-en.js"></SCRIPT>
-<SCRIPT TYPE="text/javascript" SRC="../elements/calendar-setup.js"></SCRIPT>
-
-<%= $pkgnum %>: <%= $part_pkg->pkg. ' - '. $part_pkg->comment %>
-
-<FORM NAME="formname" ACTION="process/expire_pkg.cgi" METHOD="post">
-<INPUT TYPE="hidden" NAME="pkgnum" VALUE="<%= $pkgnum %>">
-<TABLE>
-  <TR>
-    <TD>Cancel package on </TD>
-    <TD><INPUT TYPE="text" NAME="date" ID="expire_date" VALUE="<%= $date %>">
-        <IMG SRC="<%= $p %>images/calendar.png" ID="expire_button" STYLE="cursor:pointer" TITLE="Select date">
-        <BR><I>m/d/y</I>
-    </TD>
-  </TR>
-</TABLE>
-
-<SCRIPT TYPE="text/javascript">
-  Calendar.setup({
-    inputField: "expire_date",
-    ifFormat:   "%m/%d/%Y",
-    button:     "expire_button",
-    align:      "BR"
-  });
-</SCRIPT>
-
-<INPUT TYPE="submit" VALUE="Cancel later">
-</FORM>
-</BODY>
-</HTML>