X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=FS%2FFS%2FUI%2Fbytecount.pm;h=7e78bf50197bb197309022d8be86fd48dd686bb0;hb=b5c4237a34aef94976bc343c8d9e138664fc3984;hp=d278dbecc86b7625c7e4a89a9d7d6d490a2bc960;hpb=093fbb43eb8cfa3f94c8416ac9d2b7b078d8ee18;p=freeside.git diff --git a/FS/FS/UI/bytecount.pm b/FS/FS/UI/bytecount.pm index d278dbecc..7e78bf501 100644 --- a/FS/FS/UI/bytecount.pm +++ b/FS/FS/UI/bytecount.pm @@ -1,10 +1,15 @@ package FS::UI::bytecount; use strict; -use vars qw($DEBUG $me); +use vars qw($DEBUG $me @ISA @EXPORT_OK); +use Exporter; use FS::Conf; use Number::Format 1.50; +@ISA = qw( Exporter ); + +@EXPORT_OK = qw( bytecount_unexact parse_bytecount display_bytecount ); + $DEBUG = 0; $me = '[FS::UID::bytecount]'; @@ -31,11 +36,11 @@ sub bytecount_unexact { my $bc = shift; return("$bc bytes") if ($bc < 1000); - return(sprintf("%.2f Kbytes", $bc/1000)) - if ($bc < 1000000); - return(sprintf("%.2f Mbytes", $bc/1000000)) - if ($bc < 1000000000); - return(sprintf("%.2f Gbytes", $bc/1000000000)); + return(sprintf("%.2f Kbytes", $bc/1024)) + if ($bc < 1048576); + return(sprintf("%.2f Mbytes", $bc/1048576)) + if ($bc < 1073741824); + return(sprintf("%.2f Gbytes", $bc/1073741824)); } =item parse_bytecount AMOUNT