Move file size format function to Common lib

Author: carlbennett

src/libraries/Attachment.php

@@ -141,24 +141,7 @@ public function getContentSize($format = false) {
     $bytes = strlen($this->getContent());
 
     if ($format) {
-
-      $kilobytes = 1024;
-      $megabytes = 1024 * $kilobytes;
-      $gigabytes = 1024 * $megabytes;
-      $terabytes = 1024 * $gigabytes;
-
-      if ($bytes >= $terabytes) {
-        $bytes = round($bytes / $terabytes, 2) . " TiB";
-      } else if ($bytes >= $gigabytes) {
-        $bytes = round($bytes / $gigabytes, 2) . " GiB";
-      } else if ($bytes >= $megabytes) {
-        $bytes = round($bytes / $megabytes, 2) . " MiB";
-      } else if ($bytes >= $kilobytes) {
-        $bytes = round($bytes / $kilobytes, 2) . " KiB";
-      } else {
-        $bytes = $bytes . " B";
-      }
-
+      $bytes = Common::formatFileSize($bytes);
     }
 
     return $bytes;

src/libraries/Common.php

@@ -69,6 +69,29 @@ public static function curlRequest($url, $post_content = null,
     return $response;
   }
 
+  public static function formatFileSize($value) {
+
+    $bytes     = $value;
+    $kilobytes = 1024;
+    $megabytes = 1024 * $kilobytes;
+    $gigabytes = 1024 * $megabytes;
+    $terabytes = 1024 * $gigabytes;
+
+    if ($bytes >= $terabytes) {
+      $bytes = round($bytes / $terabytes, 2) . " TiB";
+    } else if ($bytes >= $gigabytes) {
+      $bytes = round($bytes / $gigabytes, 2) . " GiB";
+    } else if ($bytes >= $megabytes) {
+      $bytes = round($bytes / $megabytes, 2) . " MiB";
+    } else if ($bytes >= $kilobytes) {
+      $bytes = round($bytes / $kilobytes, 2) . " KiB";
+    } else {
+      $bytes = $bytes . " B";
+    }
+
+    return $bytes;
+  }
+
   public static function getVersionProperties() {
     $versions           = new StdClass();
     $versions->bnetdocs = file_get_contents("../etc/.rsync-version");