github/myvesta
1
0
Fork 0
mirror of https://github.com/myvesta/vesta synced 2025-08-14 18:49:21 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

humanize_usage update

Browse source
This commit is contained in:
Serghey Rodin 2015-09-07 16:45:18 +03:00
commit 6a7b3d65c4
2 changed files with 16 additions and 40 deletions
Download patch file Download diff file Expand all files Collapse all files

20
web/edit/user/index.php
View file

@ -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

36
web/inc/main.php
View file

@ -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);
}