From 6a7b3d65c4ad15f3f5085dfa7cff4151ecf4d540 Mon Sep 17 00:00:00 2001
From: Serghey Rodin <serghey.rodin@gmail.com>
Date: Mon, 7 Sep 2015 16:45:18 +0300
Subject: [PATCH] humanize_usage update

---
 web/edit/user/index.php | 20 +++++++++-----------
 web/inc/main.php        | 36 +++++++-----------------------------
 2 files changed, 16 insertions(+), 40 deletions(-)

diff --git a/web/edit/user/index.php b/web/edit/user/index.php
index 0aa0215d2..fcb16072b 100644
--- a/web/edit/user/index.php
+++ b/web/edit/user/index.php
@@ -130,17 +130,15 @@ if (!empty($_POST['save'])) {
         }
     }
 
-    // Change full name (admin only)
-    if (($v_fname != $_POST['v_fname']) || ($v_lname != $_POST['v_lname'])) {
-        if (($_SESSION['user'] == 'admin') && (empty($_SESSION['error_msg']))) {
-            $v_fname = escapeshellarg($_POST['v_fname']);
-            $v_lname = escapeshellarg($_POST['v_lname']);
-            exec (VESTA_CMD."v-change-user-name ".$v_username." ".$v_fname." ".$v_lname, $output, $return_var);
-            check_return_code($return_var,$output);
-            unset($output);
-            $v_fname = $_POST['v_fname'];
-            $v_lname = $_POST['v_lname'];
-        }
+    // Change full name
+    if (($v_fname != $_POST['v_fname']) || ($v_lname != $_POST['v_lname']) && (empty($_SESSION['error_msg']))) {
+        $v_fname = escapeshellarg($_POST['v_fname']);
+        $v_lname = escapeshellarg($_POST['v_lname']);
+        exec (VESTA_CMD."v-change-user-name ".$v_username." ".$v_fname." ".$v_lname, $output, $return_var);
+        check_return_code($return_var,$output);
+        unset($output);
+        $v_fname = $_POST['v_fname'];
+        $v_lname = $_POST['v_lname'];
     }
 
     // Change NameServers
diff --git a/web/inc/main.php b/web/inc/main.php
index c7305a6f5..ae103cf26 100644
--- a/web/inc/main.php
+++ b/web/inc/main.php
@@ -1,6 +1,6 @@
 <?php
 
-// Check system settiongs
+// Check system settings
 if ((!isset($_SESSION['VERSION'])) && (!defined('NO_AUTH_REQUIRED'))) {
     session_destroy();
     $_SESSION['request_uri'] = $_SERVER['REQUEST_URI'];
@@ -168,29 +168,6 @@ function humanize_time($usage) {
     return $usage;
 }
 
-function humanize_usage($usage) {
-    if ( $usage > 1024 ) {
-        $usage = $usage / 1024;
-        if ( $usage > 1024 ) {
-                $usage = $usage / 1024 ;
-                if ( $usage > 1024 ) {
-                    $usage = $usage / 1024 ;
-                    $usage = number_format($usage, 2);
-                    $usage = $usage." ".__('pb');
-                } else {
-                    $usage = number_format($usage, 2);
-                    $usage = $usage." ".__('tb');
-                }
-        } else {
-            $usage = number_format($usage, 2);
-            $usage = $usage." ".__('gb');
-        }
-    } else {
-        $usage = $usage." ".__('mb');
-    }
-    return $usage;
-}
-
 function humanize_usage_size($usage) {
     if ( $usage > 1024 ) {
         $usage = $usage / 1024;
@@ -212,23 +189,24 @@ function humanize_usage_size($usage) {
 
 function humanize_usage_measure($usage) {
     $measure = 'kb';
+
     if ( $usage > 1024 ) {
         $usage = $usage / 1024;
         if ( $usage > 1024 ) {
                 $usage = $usage / 1024 ;
                 if ( $usage > 1024 ) {
-                    $measure = __('pb');
+                    $measure = 'pb';
                 } else {
-                    $measure = __('tb');
+                    $measure = 'tb';
                 }
         } else {
-            $measure = __('gb');
+            $measure = 'gb';
         }
     } else {
-        $measure = __('mb');
+        $measure = 'mb';
     }
 
-    return $measure;
+    return __($measure);
 }