From: ivan <ivan>
Date: Sun, 15 Mar 2009 10:30:26 +0000 (+0000)
Subject: we're not a disk drive manufacturer, don't use halfass base-10 megs/gigs
X-Git-Tag: root_of_svc_elec_features~1386
X-Git-Url: http://git.freeside.biz/gitweb/?p=freeside.git;a=commitdiff_plain;h=dc24b4b7e2e41dbb3039e9ce367b018fef299ade

we're not a disk drive manufacturer, don't use halfass base-10 megs/gigs
---

diff --git a/FS/FS/UI/bytecount.pm b/FS/FS/UI/bytecount.pm
index 0891e6d68..0ddc7545c 100644
--- a/FS/FS/UI/bytecount.pm
+++ b/FS/FS/UI/bytecount.pm
@@ -32,9 +32,9 @@ sub bytecount_unexact {
   return("$bc bytes")
     if ($bc < 1000);
   return(sprintf("%.2f Kbytes", $bc/1024))
-    if ($bc < 1000000);
+    if ($bc < 1048576);
   return(sprintf("%.2f Mbytes", $bc/1048576))
-    if ($bc < 1000000000);
+    if ($bc < 1073741824);
   return(sprintf("%.2f Gbytes", $bc/1073741824));
 }
 
diff --git a/httemplate/edit/prepay_credit.cgi b/httemplate/edit/prepay_credit.cgi
index 9e1c30ba6..ed404b7cd 100644
--- a/httemplate/edit/prepay_credit.cgi
+++ b/httemplate/edit/prepay_credit.cgi
@@ -97,14 +97,14 @@ tie my %multiplier, 'Tie::IxHash',
 
 tie my %bytemultiplier, 'Tie::IxHash',
   1          => 'bytes',
-  1000       => 'Kbytes',
-  1000000    => 'Mbytes',
-  1000000000 => 'Gbytes',
+  1024       => 'Kbytes',
+  1048576    => 'Mbytes',
+  1073741824 => 'Gbytes',
 ;
 
 $cgi->param('multiplier',     '60')      unless $cgi->param('multiplier');
-$cgi->param('upmultiplier',   '1000000') unless $cgi->param('upmultiplier');
-$cgi->param('downmultiplier', '1000000') unless $cgi->param('downmultiplier');
-$cgi->param('totalmultiplier','1000000') unless $cgi->param('totalmultiplier');
+$cgi->param('upmultiplier',   '1048576') unless $cgi->param('upmultiplier');
+$cgi->param('downmultiplier', '1048576') unless $cgi->param('downmultiplier');
+$cgi->param('totalmultiplier','1048576') unless $cgi->param('totalmultiplier');
 
 </%init>