diff options
author | jeff <jeff> | 2007-10-04 02:07:30 +0000 |
---|---|---|
committer | jeff <jeff> | 2007-10-04 02:07:30 +0000 |
commit | 093fbb43eb8cfa3f94c8416ac9d2b7b078d8ee18 (patch) | |
tree | b4bc331bb1a0d3b13d357efe849bf7dd027c49e4 /FS/FS | |
parent | 614af30dfb1d4b24d42ca2e3eed66784038ec398 (diff) |
support part_pkg option input validation, check bytecounts and allow commas (closes 1863)
Diffstat (limited to 'FS/FS')
-rw-r--r-- | FS/FS/UI/bytecount.pm | 7 | ||||
-rw-r--r-- | FS/FS/part_pkg/flat.pm | 9 | ||||
-rw-r--r-- | FS/FS/part_pkg/prorate.pm | 9 | ||||
-rw-r--r-- | FS/FS/part_pkg/subscription.pm | 9 |
4 files changed, 31 insertions, 3 deletions
diff --git a/FS/FS/UI/bytecount.pm b/FS/FS/UI/bytecount.pm index 38aa1dfd6..d278dbecc 100644 --- a/FS/FS/UI/bytecount.pm +++ b/FS/FS/UI/bytecount.pm @@ -42,20 +42,21 @@ sub bytecount_unexact { Accepts a number (digits and a decimal point) possibly followed by k, m, g, or t (and an optional 'b') in either case. Returns a pure number representing -the input or the input itself if unparsable. +the input or the input itself if unparsable. Discards commas as noise. =cut sub parse_bytecount { my $bc = shift; return $bc if (($bc =~ tr/.//) > 1); - $bc =~ /^\s*([\d.]*)\s*([kKmMgGtT]?)[bB]?\s*$/ or return $bc; + $bc =~ /^\s*([,\d.]*)\s*([kKmMgGtT]?)[bB]?\s*$/ or return $bc; my $base = $1; + $base =~ tr/,//d; return $bc unless length $base; my $exponent = index ' kmgt', lc($2); return $bc if ($exponent < 0 && $2); $exponent = 0 if ($exponent < 0); - return $base * 1024 ** $exponent; + return int($base * 1024 ** $exponent); #bytecounts are integer values } =item display_bytecount AMOUNT diff --git a/FS/FS/part_pkg/flat.pm b/FS/FS/part_pkg/flat.pm index 471f216ba..f5ccd0119 100644 --- a/FS/FS/part_pkg/flat.pm +++ b/FS/FS/part_pkg/flat.pm @@ -26,40 +26,49 @@ use FS::part_pkg; }, 'seconds' => { 'name' => 'Time limit for this package', 'default' => '', + 'check' => sub { shift =~ /^\d*$/ }, }, 'upbytes' => { 'name' => 'Upload limit for this package', 'default' => '', + 'check' => sub { shift =~ /^\d*$/ }, 'format' => \&FS::UI::bytecount::display_bytecount, 'parse' => \&FS::UI::bytecount::parse_bytecount, }, 'downbytes' => { 'name' => 'Download limit for this package', 'default' => '', + 'check' => sub { shift =~ /^\d*$/ }, 'format' => \&FS::UI::bytecount::display_bytecount, 'parse' => \&FS::UI::bytecount::parse_bytecount, }, 'totalbytes' => { 'name' => 'Transfer limit for this package', 'default' => '', + 'check' => sub { shift =~ /^\d*$/ }, 'format' => \&FS::UI::bytecount::display_bytecount, 'parse' => \&FS::UI::bytecount::parse_bytecount, }, 'recharge_amount' => { 'name' => 'Cost of recharge for this package', 'default' => '', + 'check' => sub { shift =~ /^\d*(\.\d{2})?$/ }, }, 'recharge_seconds' => { 'name' => 'Recharge time for this package', 'default' => '', + 'check' => sub { shift =~ /^\d*$/ }, }, 'recharge_upbytes' => { 'name' => 'Recharge upload for this package', 'default' => '', + 'check' => sub { shift =~ /^\d*$/ }, 'format' => \&FS::UI::bytecount::display_bytecount, 'parse' => \&FS::UI::bytecount::parse_bytecount, }, 'recharge_downbytes' => { 'name' => 'Recharge download for this package', 'default' => '', + 'check' => sub { shift =~ /^\d*$/ }, 'format' => \&FS::UI::bytecount::display_bytecount, 'parse' => \&FS::UI::bytecount::parse_bytecount, }, 'recharge_totalbytes' => { 'name' => 'Recharge transfer for this package', 'default' => '', + 'check' => sub { shift =~ /^\d*$/ }, 'format' => \&FS::UI::bytecount::display_bytecount, 'parse' => \&FS::UI::bytecount::parse_bytecount, }, diff --git a/FS/FS/part_pkg/prorate.pm b/FS/FS/part_pkg/prorate.pm index 6b7c61532..967b1eb18 100644 --- a/FS/FS/part_pkg/prorate.pm +++ b/FS/FS/part_pkg/prorate.pm @@ -26,38 +26,47 @@ use FS::part_pkg::flat; }, 'seconds' => { 'name' => 'Time limit for this package', 'default' => '', + 'check' => sub { shift =~ /^\d*$/ }, }, 'upbytes' => { 'name' => 'Upload limit for this package', 'default' => '', + 'check' => sub { shift =~ /^\d*$/ }, 'format' => \&FS::UI::bytecount::display_bytecount, 'parse' => \&FS::UI::bytecount::parse_bytecount, }, 'downbytes' => { 'name' => 'Download limit for this package', 'default' => '', + 'check' => sub { shift =~ /^\d*$/ }, 'format' => \&FS::UI::bytecount::display_bytecount, 'parse' => \&FS::UI::bytecount::parse_bytecount, }, 'totalbytes' => { 'name' => 'Transfer limit for this package', 'default' => '', + 'check' => sub { shift =~ /^\d*$/ }, 'format' => \&FS::UI::bytecount::display_bytecount, 'parse' => \&FS::UI::bytecount::parse_bytecount, }, 'recharge_amount' => { 'name' => 'Cost of recharge for this package', 'default' => '', + 'check' => sub { shift =~ /^\d*(\.\d{2})?$/ }, }, 'recharge_seconds' => { 'name' => 'Recharge time for this package', 'default' => '', + 'check' => sub { shift =~ /^\d*$/ }, }, 'recharge_upbytes' => { 'name' => 'Recharge upload for this package', 'default' => '', + 'check' => sub { shift =~ /^\d*$/ }, 'format' => \&FS::UI::bytecount::display_bytecount, 'parse' => \&FS::UI::bytecount::parse_bytecount, }, 'recharge_downbytes' => { 'name' => 'Recharge download for this package', 'default' => '', + 'check' => sub { shift =~ /^\d*$/ }, 'format' => \&FS::UI::bytecount::display_bytecount, 'parse' => \&FS::UI::bytecount::parse_bytecount, }, 'recharge_totalbytes' => { 'name' => 'Recharge transfer for this package', 'default' => '', + 'check' => sub { shift =~ /^\d*$/ }, 'format' => \&FS::UI::bytecount::display_bytecount, 'parse' => \&FS::UI::bytecount::parse_bytecount, }, diff --git a/FS/FS/part_pkg/subscription.pm b/FS/FS/part_pkg/subscription.pm index 7f4dbcab9..3e5a41669 100644 --- a/FS/FS/part_pkg/subscription.pm +++ b/FS/FS/part_pkg/subscription.pm @@ -22,38 +22,47 @@ use FS::part_pkg::flat; }, 'seconds' => { 'name' => 'Time limit for this package', 'default' => '', + 'check' => sub { shift =~ /^\d*$/ }, }, 'upbytes' => { 'name' => 'Upload limit for this package', 'default' => '', + 'check' => sub { shift =~ /^\d*$/ }, 'format' => \&FS::UI::bytecount::display_bytecount, 'parse' => \&FS::UI::bytecount::parse_bytecount, }, 'downbytes' => { 'name' => 'Download limit for this package', 'default' => '', + 'check' => sub { shift =~ /^\d*$/ }, 'format' => \&FS::UI::bytecount::display_bytecount, 'parse' => \&FS::UI::bytecount::parse_bytecount, }, 'totalbytes' => { 'name' => 'Transfer limit for this package', 'default' => '', + 'check' => sub { shift =~ /^\d*$/ }, 'format' => \&FS::UI::bytecount::display_bytecount, 'parse' => \&FS::UI::bytecount::parse_bytecount, }, 'recharge_amount' => { 'name' => 'Cost of recharge for this package', 'default' => '', + 'check' => sub { shift =~ /^\d*(\.\d{2})?$/ }, }, 'recharge_seconds' => { 'name' => 'Recharge time for this package', 'default' => '', + 'check' => sub { shift =~ /^\d*$/ }, }, 'recharge_upbytes' => { 'name' => 'Recharge upload for this package', 'default' => '', + 'check' => sub { shift =~ /^\d*$/ }, 'format' => \&FS::UI::bytecount::display_bytecount, 'parse' => \&FS::UI::bytecount::parse_bytecount, }, 'recharge_downbytes' => { 'name' => 'Recharge download for this package', 'default' => '', + 'check' => sub { shift =~ /^\d*$/ }, 'format' => \&FS::UI::bytecount::display_bytecount, 'parse' => \&FS::UI::bytecount::parse_bytecount, }, 'recharge_totalbytes' => { 'name' => 'Recharge transfer for this package', 'default' => '', + 'check' => sub { shift =~ /^\d*$/ }, 'format' => \&FS::UI::bytecount::display_bytecount, 'parse' => \&FS::UI::bytecount::parse_bytecount, }, |