feat(filesize): change conversion for file sizes

Signed-off-by: Domingo Oropeza <doropeza@teclib.com>
flyve-mdm · Mar 2, 2018 · 02718ba · 02718ba
1 parent b5c5355
commit 02718ba
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 20 deletions.
diff --git a/inc/common.class.php b/inc/common.class.php
@@ -37,24 +37,6 @@ class PluginFlyvemdmCommon
 {
    const SEMVER_VERSION_REGEX = '#\bv?(?:0|[1-9]\d*)\.(?:0|[1-9]\d*)\.(?:0|[1-9]\d*)(?:-[\da-z\-]+(?:\.[\da-z\-]+)*)?(?:\+[\da-z\-]+(?:\.[\da-z\-]+)*)?\b#i';
 
-
-   /**
-    * Convert int size to GiB
-    * @param float $size
-    * @return string format numeric
-    */
-   public static function convertToGiB($size) {
-      $units = ['KiB', 'MiB', 'GiB', 'TiB'];
-      $unit = 'B';
-
-      while ($size > 1024 && count($units) > 0) {
-         $size = $size / 1024;
-         $unit = array_shift($units);
-      }
-      $size = Html::formatNumber($size, false, 2);
-      return "$size $unit";
-   }
-
    /**
     * Display massive actions
     * @param array $massiveactionparams

diff --git a/inc/file.class.php b/inc/file.class.php
@@ -436,7 +436,7 @@ public function showForm($ID, array $options = []) {
          $fields['filesize'] = '';
       } else {
          $fields['filesize'] = fileSize(FLYVEMDM_FILE_PATH . '/' . $fields['source']);
-         $fields['filesize'] = PluginFlyvemdmCommon::convertToGiB($fields['filesize']);
+         $fields['filesize'] = Toolbox::getSize($fields['filesize']);
       }
       $data = [
          'withTemplate' => (isset($options['withtemplate']) && $options['withtemplate'] ? "*" : ""),

diff --git a/inc/package.class.php b/inc/package.class.php
@@ -141,7 +141,7 @@ public function showForm($ID, array $options = []) {
          $this, 'name',
          ['value' => $objectName, 'display' => false]
       );
-      $fields['filesize'] = PluginFlyvemdmCommon::convertToGiB($fields['filesize']);
+      $fields['filesize'] = Toolbox::getSize($fields['filesize']);
       $data = [
          'withTemplate' => (isset($options['withtemplate']) && $options['withtemplate'] ? '*' : ''),
          'canUpdate'    => (!$this->isNewID($ID)) && ($this->canUpdate() > 0) || $this->isNewID($ID),