X-Git-Url: http://git.freeside.biz/gitweb/?p=freeside.git;a=blobdiff_plain;f=FS%2FFS%2FUI%2FWeb.pm;h=682dc31c5a820b738b3d0db30e8f5531ea05ce52;hp=9ddcf142d033b3cd14e15e226c545c4a6bf3e173;hb=1748e50c012a65ecb729f15e09169f5d8122a3b1;hpb=ab9e07a6507647e1aaf59df75edc54b40a745643 diff --git a/FS/FS/UI/Web.pm b/FS/FS/UI/Web.pm index 9ddcf142d..682dc31c5 100644 --- a/FS/FS/UI/Web.pm +++ b/FS/FS/UI/Web.pm @@ -1,13 +1,18 @@ package FS::UI::Web; use strict; -use vars qw($DEBUG $me); +use vars qw($DEBUG @ISA @EXPORT_OK $me); +use Exporter; +use Number::Format; use FS::Conf; use FS::Record qw(dbdef); #use vars qw(@ISA); #use FS::UI #@ISA = qw( FS::UI ); +@ISA = qw( Exporter ); + +@EXPORT_OK = qw( svc_url ); $DEBUG = 0; $me = '[FS::UID::Web]'; @@ -113,6 +118,7 @@ sub svc_url { $url .= 'svcnum=' if $query =~ /^\d+(;|$)/ or $query eq ''; } + import FS::CGI 'rooturl'; #WTF! why is this necessary my $return = rooturl(). "$opt{action}/$url$query"; $return = qq!! if $opt{ahref}; @@ -175,17 +181,6 @@ sub parse_lt_gt { } -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)); -} - ### # cust_main report subroutines ###