From ce98306f315a53f2ac4b8c010341c4f84bf728a8 Mon Sep 17 00:00:00 2001 From: jeff Date: Thu, 19 Oct 2006 14:29:27 +0000 Subject: suspension and cancellation reasons --- httemplate/misc/process/cancel_pkg.html | 94 +++++++++++++++++++++++++++++++++ 1 file changed, 94 insertions(+) create mode 100755 httemplate/misc/process/cancel_pkg.html (limited to 'httemplate/misc/process/cancel_pkg.html') diff --git a/httemplate/misc/process/cancel_pkg.html b/httemplate/misc/process/cancel_pkg.html new file mode 100755 index 000000000..b53809854 --- /dev/null +++ b/httemplate/misc/process/cancel_pkg.html @@ -0,0 +1,94 @@ +% +% +%#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) { +% #untaint new reason +% my $nr = $cgi->param('newreasonnum'); +% $nr =~ /^([\w\s]+)$/ || die "Illegal new reason"; +% $nr = $1; +% +% #untaint new reason type +% my $nrtype = $cgi->param('newreasonnumT'); +% $nrtype =~ /^(\d+)$/ || die "Illegal new reason type"; +% $nrtype = $1; +% +% my $reason = new FS::reason({ 'reason_type' => $nrtype, +% 'reason' => $nr, +% }); +% $error = $reason->insert; +% $reasonnum = $reason->reasonnum +% unless $error; +%} +% +%unless ($error) { +% my $cust_pkg_reason = new FS::cust_pkg_reason({ 'pkgnum' => $pkgnum, +% 'reasonnum' => $reasonnum, +% 'otaker' => $otaker, +% 'date' => $date, +% }); +% $error = $cust_pkg_reason->insert; +%} +% +%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); +% }else{ +% $error = $cust_pkg->$method +% } +%} +% +%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', +% ); +<% header("Package $past{$method}") %> + + + -- cgit v1.2.1 From 9811b8ce65909a293810ddbcd8c9b5ca963fba01 Mon Sep 17 00:00:00 2001 From: jeff Date: Mon, 23 Oct 2006 04:21:04 +0000 Subject: events should attach reasons --- httemplate/misc/process/cancel_pkg.html | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) (limited to 'httemplate/misc/process/cancel_pkg.html') diff --git a/httemplate/misc/process/cancel_pkg.html b/httemplate/misc/process/cancel_pkg.html index b53809854..01433a3dc 100755 --- a/httemplate/misc/process/cancel_pkg.html +++ b/httemplate/misc/process/cancel_pkg.html @@ -55,22 +55,13 @@ %} % %unless ($error) { -% my $cust_pkg_reason = new FS::cust_pkg_reason({ 'pkgnum' => $pkgnum, -% 'reasonnum' => $reasonnum, -% 'otaker' => $otaker, -% 'date' => $date, -% }); -% $error = $cust_pkg_reason->insert; -%} -% -%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); +% $error = $new->replace($cust_pkg, 'reason' => $reasonnum); % }else{ -% $error = $cust_pkg->$method +% $error = $cust_pkg->$method( 'reason' => $reasonnum ); % } %} % -- cgit v1.2.1 From d5aaf28009ff269858f6b0532541da55b4968e6e Mon Sep 17 00:00:00 2001 From: ivan Date: Mon, 23 Oct 2006 08:47:07 +0000 Subject: better error message if you don't enter a reason. FS::reason::check can untaint its data, and will allow punctuation in reasons --- httemplate/misc/process/cancel_pkg.html | 18 ++++++------------ 1 file changed, 6 insertions(+), 12 deletions(-) (limited to 'httemplate/misc/process/cancel_pkg.html') diff --git a/httemplate/misc/process/cancel_pkg.html b/httemplate/misc/process/cancel_pkg.html index 01433a3dc..dfe1317f4 100755 --- a/httemplate/misc/process/cancel_pkg.html +++ b/httemplate/misc/process/cancel_pkg.html @@ -34,22 +34,16 @@ %$otaker = $FS::CurrentUser::CurrentUser->username % if ($otaker eq "User, Legacy"); % -%my $error; +%my $error = ''; %if ($reasonnum == -1) { -% #untaint new reason -% my $nr = $cgi->param('newreasonnum'); -% $nr =~ /^([\w\s]+)$/ || die "Illegal new reason"; -% $nr = $1; % -% #untaint new reason type -% my $nrtype = $cgi->param('newreasonnumT'); -% $nrtype =~ /^(\d+)$/ || die "Illegal new reason type"; -% $nrtype = $1; +% $error = 'Enter a new reason (or select an existing oen)' +% unless $cgi->param('newreasonnum') !~ /^\s*$/; % -% my $reason = new FS::reason({ 'reason_type' => $nrtype, -% 'reason' => $nr, +% my $reason = new FS::reason({ 'reason_type' => $cgi->param('newreasonnumT'), +% 'reason' => $cgi->param('newreasonnum'), % }); -% $error = $reason->insert; +% $error ||= $reason->insert; % $reasonnum = $reason->reasonnum % unless $error; %} -- cgit v1.2.1 From 96192f1c88de6f54c856cac650bd2e1338e64fbc Mon Sep 17 00:00:00 2001 From: ivan Date: Mon, 29 Jan 2007 21:11:49 +0000 Subject: correct a typo, and <%init> helps alot --- httemplate/misc/process/cancel_pkg.html | 143 ++++++++++++++++---------------- 1 file changed, 71 insertions(+), 72 deletions(-) (limited to 'httemplate/misc/process/cancel_pkg.html') 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', + ); + <% header("Package $past{$method}") %>