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

Merge changes from upstream

Browse source 
I'm a little angry
This commit is contained in:
ZonD Eighty 2012-12-28 23:31:02 +04:00
commit 2b16d9bd83
254 changed files with 24485 additions and 24094 deletions
Download patch file Download diff file Expand all files Collapse all files

4
web/inc/i18n/ru.php
View file

@ -144,6 +144,8 @@ $LANG = array(
'IP Addresses'=>'IP адреса',
'RRD Graphics'=>'Графики',
'jobs'=>'Задания',
'Reset Code'=>'Код сброса'
'Reset Code'=>'Код сброса',
'disk'=>'Место',
'traffic'=>'Трафик',
);

18
web/inc/main.php
View file

@ -21,7 +21,7 @@ function _() {
}
// Check user session
if (!isset($_SESSION['user'])&&!defined('NO_AUTH_REQUIRED')) {
if ((!isset($_SESSION['user'])) && (!isset($api_mode))&&!defined('NO_AUTH_REQUIRED')) {
$_SESSION['request_uri'] = $_SERVER['REQUEST_URI'];
header("Location: /login/");
exit;
@ -66,9 +66,9 @@ function humanize_time($usage) {
if ( $usage > 60 ) {
$usage = $usage / 60;
$usage = number_format($usage, 2);
$usage = $usage." "._('Hour').".";
$usage = $usage." Hour.";
} else {
$usage = $usage." "._('Min').".";
$usage = $usage." Min.";
}
return $usage;
}
@ -81,17 +81,17 @@ function humanize_usage($usage) {
if ( $usage > 1000 ) {
$usage = $usage / 1000 ;
$usage = number_format($usage, 2);
$usage = $usage." "._('pb');
$usage = $usage." pb";
} else {
$usage = number_format($usage, 2);
$usage = $usage." "._('tb');
$usage = $usage." tb";
}
} else {
$usage = number_format($usage, 2);
$usage = $usage." "._('gb');
$usage = $usage." gb";
}
} else {
$usage = $usage." "._('mb');
$usage = $usage." mb";
}
return $usage;
}
@ -149,11 +149,11 @@ function display_error_block() {
});
});
</script>
<div id="dialog-message" title="'._('Error').'">
<div id="dialog-message" title="Error">
<p>';
echo $_SESSION['error_msg'];
echo "</p>\n </div>\n";
unset($_SESSION['error_msg']);
}
}
?>
?>