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

UI improvements

Browse source
This commit is contained in:
Serghey Rodin 2015-05-29 19:51:24 +03:00
commit 60f9f276b8
49 changed files with 256 additions and 125 deletions
Download patch file Download diff file Expand all files Collapse all files

14
web/css/styles.min.css vendored
View file

@ -1080,6 +1080,10 @@ div.l-content > div.l-separator:nth-of-type(4) {
display: inline-block;
border-style: solid none solid solid;
}
.lang-ru .l-select {
width: 199px;
}
.l-select:after {
pointer-events: none;
background-image: url("/images/sprite.png");
@ -1104,6 +1108,9 @@ div.l-content > div.l-separator:nth-of-type(4) {
border: 0;
outline: 0;
}
.lang-ru .l-select select {
min-width: 215px;
}
.l-select select option {
padding: 7px;
}
@ -1342,6 +1349,7 @@ div.l-content > div.l-separator:nth-of-type(4) {
.l-unit__stat-col--right {
float: left;
max-width: 152px;
}
.l-unit-toolbar__col--left {
@ -1988,7 +1996,7 @@ div.l-content > div.l-separator:nth-of-type(4) {
height: 16px;
overflow: hidden;
padding-top: 6px;
width: 600px;
max-width: 600px;
}
.vst-ok a {
@ -2362,6 +2370,10 @@ td.hint {
vertical-align: top;
width: 500px;
}
.login a.error {
color: #BE5ABF;
}
.vestacp {
color: #505050;
font-size: 10px;

6
web/edit/db/index.php
View file

@ -35,7 +35,7 @@ unset($output);
$v_username = $user;
$v_database = $_GET['database'];
$v_dbuser = $data[$v_database]['DBUSER'];
$v_password = "••••••••";
$v_password = "";
$v_host = $data[$v_database]['HOST'];
$v_type = $data[$v_database]['TYPE'];
$v_charset = $data[$v_database]['CHARSET'];
@ -63,7 +63,7 @@ if (!empty($_POST['save'])) {
}
// Change database password
if (($v_password != $_POST['v_password']) && (empty($_SESSION['error_msg']))) {
if ((!empty($_POST['v_password'])) && (empty($_SESSION['error_msg']))) {
$v_password = tempnam("/tmp","vst");
$fp = fopen($v_password, "w");
fwrite($fp, $_POST['v_password']."\n");
@ -72,7 +72,7 @@ if (!empty($_POST['save'])) {
check_return_code($return_var,$output);
unset($output);
unlink($v_password);
$v_password = "••••••••";
$v_password = escapeshellarg($_POST['v_password']);
}
// Set success message

6
web/edit/mail/index.php
View file

@ -60,7 +60,7 @@ if ((!empty($_GET['domain'])) && (!empty($_GET['account']))) {
$v_username = $user;
$v_domain = $_GET['domain'];
$v_account = $_GET['account'];
$v_password = "••••••••";
$v_password = "";
$v_aliases = str_replace(',', "\n", $data[$v_account]['ALIAS']);
$valiases = explode(",", $data[$v_account]['ALIAS']);
$v_fwd = str_replace(',', "\n", $data[$v_account]['FWD']);
@ -177,7 +177,7 @@ if ((!empty($_POST['save'])) && (!empty($_GET['domain'])) && (!empty($_GET['acco
$v_account = escapeshellarg($_POST['v_account']);
// Change password
if (($v_password != $_POST['v_password']) && (empty($_SESSION['error_msg']))) {
if ((!empty($_POST['v_password'])) && (empty($_SESSION['error_msg']))) {
$v_password = tempnam("/tmp","vst");
$fp = fopen($v_password, "w");
fwrite($fp, $_POST['v_password']."\n");
@ -186,7 +186,7 @@ if ((!empty($_POST['save'])) && (!empty($_GET['domain'])) && (!empty($_GET['acco
check_return_code($return_var,$output);
unset($output);
unlink($v_password);
$v_password = "••••••••";
$v_password = escapeshellarg($_POST['v_password']);;
}
// Change quota

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

@ -32,7 +32,7 @@ $data = json_decode(implode('', $output), true);
unset($output);
// Parse user
$v_password = "••••••••";
$v_password = "";
$v_email = $data[$v_username]['CONTACT'];
$v_package = $data[$v_username]['PACKAGE'];
$v_language = $data[$v_username]['LANGUAGE'];
@ -75,7 +75,7 @@ unset($output);
if (!empty($_POST['save'])) {
// Change password
if (($v_password != $_POST['v_password']) && (empty($_SESSION['error_msg']))) {
if ((!empty($_POST['v_password'])) && (empty($_SESSION['error_msg']))) {
$v_password = tempnam("/tmp","vst");
$fp = fopen($v_password, "w");
fwrite($fp, $_POST['v_password']."\n");
@ -84,7 +84,7 @@ if (!empty($_POST['save'])) {
check_return_code($return_var,$output);
unset($output);
unlink($v_password);
$v_password = "••••••••";
$v_password = escapeshellarg($_POST['v_password']);
}
// Change package (admin only)

46
web/edit/web/index.php
View file

@ -51,9 +51,10 @@ $v_proxy_template = $data[$v_domain]['PROXY'];
$v_proxy_ext = str_replace(',', ', ', $data[$v_domain]['PROXY_EXT']);
$v_stats = $data[$v_domain]['STATS'];
$v_stats_user = $data[$v_domain]['STATS_USER'];
if (!empty($v_stats_user)) $v_stats_password = "••••••••";
if (!empty($v_stats_user)) $v_stats_password = "";
$v_ftp_user = $data[$v_domain]['FTP_USER'];
if (!empty($v_ftp_user)) $v_ftp_password = "••••••••";
$v_ftp_path = $data[$v_domain]['FTP_PATH'];
if (!empty($v_ftp_user)) $v_ftp_password = "";
$v_ftp_user_prepath = $data[$v_domain]['DOCUMENT_ROOT'];
$v_ftp_user_prepath = str_replace('/public_html', '', $v_ftp_user_prepath, $occurance = 1);
$v_ftp_email = $panel[$user]['CONTACT'];
@ -430,7 +431,6 @@ if (!empty($_POST['save'])) {
// Change web stats user or password
if ((empty($v_stats_user)) && (!empty($_POST['v_stats_auth'])) && (empty($_SESSION['error_msg']))) {
if (empty($_POST['v_stats_user'])) $errors[] = __('stats username');
if (empty($_POST['v_stats_password'])) $errors[] = __('stats password');
if (!empty($errors[0])) {
foreach ($errors as $i => $error) {
if ( $i == 0 ) {
@ -450,14 +450,13 @@ if (!empty($_POST['save'])) {
check_return_code($return_var,$output);
unset($output);
unlink($v_stats_password);
$v_stats_password = "••••••••";
$v_stats_password = escapeshellarg($_POST['v_stats_password']);
}
}
// Add web stats authorization
if ((!empty($v_stats_user)) && (!empty($_POST['v_stats_auth'])) && (empty($_SESSION['error_msg']))) {
if (empty($_POST['v_stats_user'])) $errors[] = __('stats user');
if (empty($_POST['v_stats_password'])) $errors[] = __('stats password');
if (!empty($errors[0])) {
foreach ($errors as $i => $error) {
if ( $i == 0 ) {
@ -468,7 +467,7 @@ if (!empty($_POST['save'])) {
}
$_SESSION['error_msg'] = __('Field "%s" can not be blank.',$error_msg);
}
if (($v_stats_user != $_POST['v_stats_user']) || ($_POST['v_stats_password'] != "••••••••" ) && (empty($_SESSION['error_msg']))) {
if (($v_stats_user != $_POST['v_stats_user']) || (!empty($_POST['v_stats_password'])) && (empty($_SESSION['error_msg']))) {
$v_stats_user = escapeshellarg($_POST['v_stats_user']);
$v_stats_password = tempnam("/tmp","vst");
$fp = fopen($v_stats_password, "w");
@ -478,22 +477,22 @@ if (!empty($_POST['save'])) {
check_return_code($return_var,$output);
unset($output);
unlink($v_stats_password);
$v_stats_password = "••••••••";
$v_stats_password = escapeshellarg($_POST['v_stats_password']);
}
}
// Change ftp accounts
// Update ftp account
if (!empty($_POST['v_ftp_user'])) {
$v_ftp_users_updated = array();
foreach ($_POST['v_ftp_user'] as $i => $v_ftp_user_data) {
if (empty($v_ftp_user_data['v_ftp_user']) && empty($v_ftp_user_data['v_ftp_password'])) {
if (empty($v_ftp_user_data['v_ftp_user'])) {
continue;
}
$v_ftp_user_data['v_ftp_user'] = preg_replace("/^".$user."_/i", "", $v_ftp_user_data['v_ftp_user']);
if ($v_ftp_user_data['is_new'] == 1 && !empty($_POST['v_ftp'])) {
if ((!empty($v_ftp_user_data['v_ftp_email'])) && (!filter_var($v_ftp_user_data['v_ftp_email'], FILTER_VALIDATE_EMAIL))) $_SESSION['error_msg'] = __('Please enter valid email address.');
if (empty($v_ftp_user_data['v_ftp_user'])) $errors[] = 'ftp user';
if (empty($v_ftp_user_data['v_ftp_password'])) $errors[] = 'ftp user password';
if (!empty($errors[0])) {
foreach ($errors as $i => $error) {
if ( $i == 0 ) {
@ -505,6 +504,7 @@ if (!empty($_POST['save'])) {
$_SESSION['error_msg'] = __('Field "%s" can not be blank.',$error_msg);
}
// Add ftp account
$v_ftp_username = $v_ftp_user_data['v_ftp_user'];
$v_ftp_username_full = $user . '_' . $v_ftp_user_data['v_ftp_user'];
$v_ftp_user = escapeshellarg($v_ftp_username);
@ -531,7 +531,7 @@ if (!empty($_POST['save'])) {
}
if ($return_var == 0) {
$v_ftp_password = "••••••••";
$v_ftp_password = "";
$v_ftp_user_data['is_new'] = 0;
}
else {
@ -550,7 +550,7 @@ if (!empty($_POST['save'])) {
continue;
}
// Delete FTP account
if ($v_ftp_user_data['delete'] == 1) {
$v_ftp_username = $user . '_' . $v_ftp_user_data['v_ftp_user'];
exec (VESTA_CMD."v-delete-web-domain-ftp ".$v_username." ".$v_domain." ".$v_ftp_username, $output, $return_var);
@ -561,9 +561,7 @@ if (!empty($_POST['save'])) {
}
if (!empty($_POST['v_ftp'])) {
// Change FTP Account
if (empty($v_ftp_user_data['v_ftp_user'])) $errors[] = __('ftp user');
if (empty($v_ftp_user_data['v_ftp_password'])) $errors[] = __('ftp user password');
if (!empty($errors[0])) {
foreach ($errors as $i => $error) {
if ( $i == 0 ) {
@ -575,19 +573,23 @@ if (!empty($_POST['save'])) {
$_SESSION['error_msg'] = __('Field "%s" can not be blank.',$error_msg);
}
// Change FTP account path
$v_ftp_username = $user . '_' . $v_ftp_user_data['v_ftp_user']; //preg_replace("/^".$user."_/", "", $v_ftp_user_data['v_ftp_user']);
$v_ftp_username = escapeshellarg($v_ftp_username);
$v_ftp_user_data['v_ftp_password'] = escapeshellarg(trim($v_ftp_user_data['v_ftp_password']));
$v_ftp_path = escapeshellarg(trim($v_ftp_user_data['v_ftp_path']));
exec (VESTA_CMD."v-change-web-domain-ftp-path ".$v_username." ".$v_domain." ".$v_ftp_username." ".$v_ftp_path, $output, $return_var);
if ($v_ftp_user_data['v_ftp_password'] != "'••••••••'" && $v_ftp_user_data['v_ftp_password'] != "••••••••" && !empty($v_ftp_user_data['v_ftp_password'])) {
//if (!empty($v_ftp_user_data['v_ftp_path'])) {
$v_ftp_path = escapeshellarg(trim($v_ftp_user_data['v_ftp_path']));
exec (VESTA_CMD."v-change-web-domain-ftp-path ".$v_username." ".$v_domain." ".$v_ftp_username." ".$v_ftp_path, $output, $return_var);
//}
// Change FTP account password
if (!empty($v_ftp_user_data['v_ftp_password'])) {
$v_ftp_password = tempnam("/tmp","vst");
$fp = fopen($v_ftp_password, "w");
fwrite($fp, $v_ftp_user_data['v_ftp_password']."\n");
fclose($fp);
exec (VESTA_CMD."v-change-web-domain-ftp-password ".$v_username." ".$v_domain." ".$v_ftp_username." ".$v_ftp_user_data['v_ftp_password'], $output, $return_var);
exec (VESTA_CMD."v-change-web-domain-ftp-password ".$v_username." ".$v_domain." ".$v_ftp_username." ".$v_ftp_password, $output, $return_var);
unlink($v_ftp_password);
$v_ftp_user_data['v_ftp_password'] = escapeshellarg(trim($v_ftp_user_data['v_ftp_password']));
$to = $v_ftp_user_data['v_ftp_email'];
$subject = __("FTP login credentials");
$hostname = exec('hostname');
@ -599,12 +601,10 @@ if (!empty($_POST['save'])) {
check_return_code($return_var, $output);
unset($output);
$v_ftp_password = "••••••••";
$v_ftp_users_updated[] = array(
'is_new' => 0,
'v_ftp_user' => $v_ftp_username,
'v_ftp_password' => $v_ftp_password,
'v_ftp_password' => $v_ftp_user_data['v_ftp_password'],
'v_ftp_path' => $v_ftp_user_data['v_ftp_path'],
'v_ftp_email' => $v_ftp_user_data['v_ftp_email'],
'v_ftp_pre_path' => $v_ftp_user_prepath

41
web/inc/main.php
View file

@ -181,6 +181,47 @@ function humanize_usage($usage) {
return $usage;
}
function humanize_usage_size($usage) {
if ( $usage > 1024 ) {
$usage = $usage / 1024;
if ( $usage > 1024 ) {
$usage = $usage / 1024 ;
if ( $usage > 1024 ) {
$usage = $usage / 1024 ;
$usage = number_format($usage, 2);
} else {
$usage = number_format($usage, 2);
}
} else {
$usage = number_format($usage, 2);
}
}
return $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');
} else {
$measure = __('tb');
}
} else {
$measure = __('gb');
}
} else {
$measure = __('mb');
}
return $measure;
}
function get_percentage($used,$total) {
if (!isset($total)) $total = 0;
if (!isset($used)) $used = 0;

2
web/list/updates/index.php
View file

@ -1,6 +1,6 @@
<?php
session_start();
$TAB = 'SERVER';
$TAB = 'UPDATES';
// Main include
include($_SERVER['DOCUMENT_ROOT']."/inc/main.php");

33
web/templates/admin/add_package.html
View file

@ -52,7 +52,7 @@
</tr>
<tr>
<td class="vst-text input-label">
<?php print __('Web Template');?>
<?php print __('Web Template') . "<span class='optional'>" . strtoupper($_SESSION['WEB_SYSTEM']) . "</span>" ;?>
</td>
</tr>
<tr>
@ -73,10 +73,37 @@
</select>
</td>
</tr>
<?php if (!empty($_SESSION['WEB_BACKEND'])) { echo ""; ?>
<tr>
<td class="vst-text input-label">
<?php print __('Backend Template') . "<span class='optional'>" . strtoupper($_SESSION['WEB_BACKEND']). "</span>" ;?>
</td>
</tr>
<tr>
<td>
<select class="vst-list" name="v_backend_template">
<?php
foreach ($backend_templates as $key => $value) {
echo "\t\t\t\t<option value=\"".$value."\"";
if ((!empty($v_backend_template)) && ( $value == $v_backend_template)){
echo 'selected' ;
}
if ((!empty($v_backend_template)) && ( $value == $_POST['v_backend_template'])){
echo 'selected' ;
}
echo ">".$value."</option>\n";
}
?>
</select>
</td>
</tr>
<?php echo ""; }?>
<?php if (!empty($_SESSION['PROXY_SYSTEM'])) { echo ""; ?>
<tr>
<td class="vst-text input-label">
<?php print __('Proxy Template');?>
<?php print __('Proxy Template') . "<span class='optional'>" .strtoupper($_SESSION['PROXY_SYSTEM']) . "</span>" ;?>
</td>
</tr>
<tr>
@ -100,7 +127,7 @@
<?php echo ""; }?>
<tr>
<td class="vst-text input-label">
<?php print __('DNS Template');?>
<?php print __('DNS Template') . "<span class='optional'>" .strtoupper($_SESSION['DNS_SYSTEM']) . "</span>" ;?>
</td>
</tr>
<tr>

2
web/templates/admin/add_web.html
View file

@ -373,7 +373,7 @@
<table class="ftptable ftptable-nrm" name="v_add_domain_ftp">
<tr>
<td class="vst-text input-label">
<?php print __('FTP') ?> #<span class="ftp-user-number"></span> <a class="ftp-remove-user additional-control do_delete" onCLick="App.Actions.WEB.remove_ftp_user(this)">(<?php print __('delete') ?>)</a>
<?php print __('FTP') ?> #<span class="ftp-user-number"></span> <a class="ftp-remove-user additional-control do_delete" onCLick="App.Actions.WEB.remove_ftp_user(this)">(<?=__('delete')?>)</a>
<input type="hidden" class="v-ftp-user-deleted" name="v_ftp_user[%INDEX%][delete]" value="0" />
<input type="hidden" class="v-ftp-user-is-new" name="v_ftp_user[%INDEX%][is_new]" value="1" />
</td>

4
web/templates/admin/edit_cron.html
View file

@ -29,7 +29,7 @@
$back = "location.href='".$back."'";
}
?>
<form id="vstobjects" name="v_edit_cron" method="post" class="<?=__($v_status)?>">
<form id="vstobjects" name="v_edit_cron" method="post" class="<?=$v_status?>">
<input type="hidden" name="token" value="<?=$_SESSION['token']?>" />
<table class='data'>
<tr class="data-add">
@ -41,7 +41,7 @@
<a class="data-date"><?php echo $v_time?></a>
</td>
</tr>
<tr><td class="data-<?php echo $v_status ?>"><b><?php echo __($v_status) ?></b></td></tr>
<tr><td class="data-<?php echo $v_status ?>"><b><?=__($v_status)?></b></td></tr>
</table>
</td>
<td class="data-dotted">

2
web/templates/admin/edit_db.html
View file

@ -29,7 +29,7 @@
$back = "location.href='".$back."'";
}
?>
<form id="vstobjects" name="v_edit_db" method="post" class="<?=__($v_status)?>">
<form id="vstobjects" name="v_edit_db" method="post" class="<?=$v_status?>">
<input type="hidden" name="token" value="<?=$_SESSION['token']?>" />
<script type="text/javascript">
function elementHideShow(elementToHideOrShow) {

4
web/templates/admin/edit_dns.html
View file

@ -29,7 +29,7 @@
$back = "location.href='".$back."'";
}
?>
<form id="vstobjects" name="v_edit_dns" method="post" class="<?=__($v_status)?>">
<form id="vstobjects" name="v_edit_dns" method="post" class="<?=$v_status?>">
<input type="hidden" name="token" value="<?=$_SESSION['token']?>" />
<table class='data'>
@ -69,7 +69,7 @@
</tr>
<tr>
<td class="vst-text input-label">
<?php print __('Template');?>
<?php print __('Template') . "<span class='optional'>" . strtoupper($_SESSION['DNS_SYSTEM']) . "</span>";?>
</td>
</tr>
<tr>

2
web/templates/admin/edit_dns_rec.html
View file

@ -29,7 +29,7 @@
$back = "location.href='".$back."'";
}
?>
<form id="vstobjects" name="v_edit_dns_rec" method="post" class="<?=__($v_status)?>">
<form id="vstobjects" name="v_edit_dns_rec" method="post" class="<?=$v_status?>">
<input type="hidden" name="token" value="<?=$_SESSION['token']?>" />
<table class='data'>
<tr class="data-add">

2
web/templates/admin/edit_firewall.html
View file

@ -29,7 +29,7 @@
$back = "location.href='".$back."'";
}
?>
<form id="vstobjects" name="v_edit_firewall" method="post" class="<?=__($v_status)?>">
<form id="vstobjects" name="v_edit_firewall" method="post" class="<?=$v_status?>">
<input type="hidden" name="token" value="<?=$_SESSION['token']?>" />
<script type="text/javascript">
function elementHideShow(elementToHideOrShow) {

2
web/templates/admin/edit_ip.html
View file

@ -29,7 +29,7 @@
$back = "location.href='".$back."'";
}
?>
<form id="vstobjects" name="v_edit_ip" method="post" class="<?=__($v_status)?>">
<form id="vstobjects" name="v_edit_ip" method="post" class="<?=$v_status?>">
<input type="hidden" name="token" value="<?=$_SESSION['token']?>" />
<script type="text/javascript">
function elementHideShow(elementToHideOrShow) {

2
web/templates/admin/edit_mail.html
View file

@ -29,7 +29,7 @@
$back = "location.href='".$back."'";
}
?>
<form id="vstobjects" name="v_edit_mail" method="post" class="<?=__($v_status)?>">
<form id="vstobjects" name="v_edit_mail" method="post" class="<?=$v_status?>">
<input type="hidden" name="token" value="<?=$_SESSION['token']?>" />
<table class='data'>
<tr class="data-add">

2
web/templates/admin/edit_mail_acc.html
View file

@ -29,7 +29,7 @@
$back = "location.href='".$back."'";
}
?>
<form id="vstobjects" name="v_edit_mail_acc" method="post" class="<?=__($v_status)?>">
<form id="vstobjects" name="v_edit_mail_acc" method="post" class="<?=$v_status?>">
<input type="hidden" name="token" value="<?=$_SESSION['token']?>" />
<script type="text/javascript">
function elementHideShow(elementToHideOrShow) {

33
web/templates/admin/edit_package.html
View file

@ -29,7 +29,7 @@
$back = "location.href='".$back."'";
}
?>
<form id="vstobjects" name="v_edit_package" method="post" class="<?=__($v_status)?>">
<form id="vstobjects" name="v_edit_package" method="post" class="<?=$v_status?>">
<input type="hidden" name="token" value="<?=$_SESSION['token']?>" />
<table class='data'>
<tr class="data-add">
@ -59,7 +59,7 @@
</tr>
<tr>
<td class="vst-text input-label">
<?php print __('Web Template');?>
<?php print __('Web Template') . " <span class='optional'> " .strtoupper($_SESSION['WEB_SYSTEM']) . "</span>";?>
</td>
</tr>
<tr>
@ -80,10 +80,35 @@
</select>
</td>
</tr>
<?php if (!empty($_SESSION['WEB_BACKEND'])) { echo ""; ?>
<tr>
<td class="vst-text input-label">
<?php print __('Backend Template') . "<span class='optional'>" .strtoupper($_SESSION['WEB_BACKEND']) . "</span>";?>
</td>
</tr>
<tr>
<td>
<select class="vst-list" name="v_backend_template">
<?php
foreach ($backend_templates as $key => $value) {
echo "\t\t\t\t<option value=\"".$value."\"";
if ((!empty($v_backend_template)) && ( $value == $v_backend_template)){
echo ' selected' ;
}
if ((!empty($v_backend_template)) && ( $value == $_POST['v_backend_template'])){
echo ' selected' ;
}
echo ">".$value."</option>\n";
}
?>
</select>
</td>
</tr>
<?php echo ""; }?>
<?php if (!empty($_SESSION['PROXY_SYSTEM'])) { echo ""; ?>
<tr>
<td class="vst-text input-label">
<?php print __('Proxy Template');?>
<?php print __('Proxy Template') . "<span class='optional'>" .strtoupper($_SESSION['PROXY_SYSTEM']) . "</span>";?>
</td>
</tr>
<tr>
@ -107,7 +132,7 @@
<?php echo ""; }?>
<tr>
<td class="vst-text input-label">
<?php print __('DNS Template');?>
<?php print __('DNS Template') . "<span class='optional'>" .strtoupper($_SESSION['DNS_SYSTEM']) . "</span>";?>
</td>
</tr>
<tr>

2
web/templates/admin/edit_user.html
View file

@ -29,7 +29,7 @@
$back = "location.href='".$back."'";
}
?>
<form id="vstobjects" method="post" name="v_edit_user" class="<?=__($v_status)?>" class="<?=__($v_status)?>">
<form id="vstobjects" method="post" name="v_edit_user" class="<?=$v_status?>">
<input type="hidden" name="token" value="<?=$_SESSION['token']?>" />
<script type="text/javascript">
function randomString() {

36
web/templates/admin/edit_web.html
View file

@ -29,7 +29,7 @@
$back = "location.href='".$back."'";
}
?>
<form id="vstobjects" name="v_edit_web" method="post" class="<?=__($v_status)?>">
<form id="vstobjects" name="v_edit_web" method="post" class="<?=$v_status?>">
<input type="hidden" name="token" value="<?=$_SESSION['token']?>" />
<script language="javascript">
function WEBrandom() {
@ -125,7 +125,7 @@
</tr>
<tr>
<td class="vst-text input-label">
<?php print __('Web Template');?>
<?php print __('Web Template') . "<span class='optional'>" .strtoupper($_SESSION['WEB_SYSTEM']) . "</span>";?>
</td>
</tr>
<tr>
@ -144,10 +144,36 @@
</select>
</td>
</tr>
<?php if (!empty($_SESSION['WEB_BACKEND'])) { echo ""; ?>
<tr>
<td class="vst-text input-label">
<?php print __('Backend Template') . " <span class='optional''> / " . strtoupper($_SESSION['WEB_BACKEND']) . "</span>";?>
</td>
</tr>
<tr>
<td>
<select class="vst-list" name="v_backend_template">
<?php
foreach ($backend_templates as $key => $value) {
echo "\t\t\t\t<option value=\"".$value."\"";
$svalue = "'".$value."'";
if ((!empty($v_backend_template)) && ( $value == $v_backend_template ) || ($svalue == $v_backend_template)){
echo ' selected' ;
}
if ((empty($v_backend_template)) && ($value == 'default')){
echo ' selected' ;
}
echo ">".$value."</option>\n";
}
?>
</select>
</td>
</tr>
<?php echo ""; }?>
<?php if (!empty($_SESSION['PROXY_SYSTEM'])) { echo ""; ?>
<tr>
<td class="vst-text step-top">
<label><input type="checkbox" size="20" class="vst-checkbox" name="v_proxy" <?php if (!empty($v_proxy)) echo "checked=yes" ?> onclick="javascript:elementHideShow('proxytable');"> <?php print __('Proxy Support');?></label>
<label><input type="checkbox" size="20" class="vst-checkbox" name="v_proxy" <?php if (!empty($v_proxy)) echo "checked=yes" ?> onclick="javascript:elementHideShow('proxytable');"> <?php print __('Proxy Support') . "<span class='optional'>" . strtoupper($_SESSION['PROXY_SYSTEM']) . "</span>";?></label>
</td>
</tr>
<tr>
@ -323,7 +349,7 @@
<table style="display:<?php if (empty($v_ftp_user)) { echo 'none';} else {echo 'block';}?> ;" class="ftptable ftptable-nrm" name="v_add_domain_ftp">
<tr>
<td class="vst-text input-label">
<?php print __('FTP') ?> #<span class="ftp-user-number"><?php print $i + 1; ?></span> <a class="ftp-remove-user additional-control" onCLick="App.Actions.WEB.remove_ftp_user(this)">(<?php print __('remove') ?>)</a>
<?php print __('FTP') ?> #<span class="ftp-user-number"><?php print $i + 1; ?></span> <a class="ftp-remove-user additional-control" onCLick="App.Actions.WEB.remove_ftp_user(this)">(<?=__('delete')?>)</a>
<input type="hidden" class="v-ftp-user-deleted" name="v_ftp_user[<?php print $i ?>][delete]" value="0" />
<input type="hidden" class="v-ftp-user-is-new" name="v_ftp_user[<?php print $i ?>][is_new]" value="<?php print htmlentities($ftp_user['is_new']) ?>" />
</td>
@ -405,7 +431,7 @@
<table class="ftptable ftptable-nrm" name="v_add_domain_ftp">
<tr>
<td class="vst-text input-label">
<?php print __('FTP') ?> #<span class="ftp-user-number"></span> <a class="ftp-remove-user additional-control" onCLick="App.Actions.WEB.remove_ftp_user(this)">(<?php print __('remove') ?>)</a>
<?php print __('FTP') ?> #<span class="ftp-user-number"></span> <a class="ftp-remove-user additional-control" onCLick="App.Actions.WEB.remove_ftp_user(this)">(<?=__('delete')?>)</a>
<input type="hidden" class="v-ftp-user-deleted" name="v_ftp_user[%INDEX%][delete]" value="0" />
<input type="hidden" class="v-ftp-user-is-new" name="v_ftp_user[%INDEX%][is_new]" value="1" />
</td>

2
web/templates/admin/list_backup.html
View file

@ -114,7 +114,7 @@
<div class="l-unit__stat-cols clearfix">
<div class="l-unit__stat-col l-unit__stat-col--left"><?=__('Backup Size')?>:</div>
<div class="l-unit__stat-col l-unit__stat-col--right">
<b><?=humanize_usage($data[$key]['SIZE'])?></b> <?=humanize_usage($data[$key]['SIZE'])?>
<b><?=humanize_usage_size($data[$key]['SIZE'])?></b> <?=humanize_usage_measure($data[$key]['SIZE'])?>
</div>
</div>
</td>

2
web/templates/admin/list_cron.html
View file

@ -116,7 +116,7 @@
<div class="l-unit__date">
<?=strftime("%d %b %Y", strtotime($data[$key]['DATE']))?>
</div>
<div class="l-unit__suspended"">suspended</div>
<div class="l-unit__suspended""><?=__('suspended')?></div>
</div>
<!-- /.l-unit__col -->
<div class="l-unit__col l-unit__col--right">

4
web/templates/admin/list_db.html
View file

@ -113,7 +113,7 @@
<div class="l-unit__date">
<?=strftime("%d %b %Y", strtotime($data[$key]['DATE']))?>
</div>
<div class="l-unit__suspended"">suspended</div>
<div class="l-unit__suspended""><?=__('suspended')?></div>
</div>
<!-- /.l-unit__col -->
<div class="l-unit__col l-unit__col--right">
@ -130,7 +130,7 @@
<?=__('Disk')?>
</div>
<div class="l-unit__stat-col l-unit__stat-col--right text-right volume">
<b><?=humanize_usage($data[$key]['U_DISK'])?></b> <?=humanize_usage($data[$key]['U_DISK'])?>
<b><?=humanize_usage_size($data[$key]['U_DISK'])?></b> <?=humanize_usage_measure($data[$key]['U_DISK'])?>
</div>
</div>
<div class="l-percent">

2
web/templates/admin/list_dns.html
View file

@ -102,7 +102,7 @@
<div class="l-unit__date">
<?=strftime("%d %b %Y", strtotime($data[$key]['DATE']))?>
</div>
<div class="l-unit__suspended"">suspended</div>
<div class="l-unit__suspended""><?=__('suspended')?></div>
</div>
<!-- /.l-unit__col -->
<div class="l-unit__col l-unit__col--right">

2
web/templates/admin/list_dns_rec.html
View file

@ -98,7 +98,7 @@
<!-- /.l-unit-toolbar -->
<div class="l-unit__col l-unit__col--left clearfix">
<div class="l-unit__suspended"">suspended</div>
<div class="l-unit__suspended""><?=__('suspended')?></div>
</div>
<!-- /.l-unit__col -->
<div class="l-unit__col l-unit__col--right">

2
web/templates/admin/list_firewall.html
View file

@ -100,7 +100,7 @@
<!-- /.l-unit-toolbar -->
<div class="l-unit__col l-unit__col--left clearfix">
<div class="l-unit__suspended"">suspended</div>
<div class="l-unit__suspended""><?=__('suspended')?></div>
</div>
<!-- /.l-unit__col -->
<div class="l-unit__col l-unit__col--right">

2
web/templates/admin/list_ip.html
View file

@ -85,7 +85,7 @@
<div class="l-unit__date">
<?=strftime("%d&nbsp; %b&nbsp; %Y", strtotime($data[$key]['DATE']))?>
</div>
<div class="l-unit__suspended"">suspended</div>
<div class="l-unit__suspended""><?=__('suspended')?></div>
</div>
<!-- /.l-unit__col -->
<div class="l-unit__col l-unit__col--right">

4
web/templates/admin/list_mail.html
View file

@ -116,7 +116,7 @@
<div class="l-unit__date">
<?=strftime("%d %b %Y", strtotime($data[$key]['DATE']))?>
</div>
<div class="l-unit__suspended"">suspended</div>
<div class="l-unit__suspended""><?=__('suspended')?></div>
</div>
<!-- /.l-unit__col -->
<div class="l-unit__col l-unit__col--right">
@ -133,7 +133,7 @@
<?=__('Disk')?>
</div>
<div class="l-unit__stat-col l-unit__stat-col--right text-right volume">
<b><?=humanize_usage($data[$key]['U_DISK'])?></b> <?=humanize_usage($data[$key]['U_DISK'])?>
<b><?=humanize_usage_size($data[$key]['U_DISK'])?></b> <?=humanize_usage_measure($data[$key]['U_DISK'])?>
</div>
</div>
<div class="l-percent">

4
web/templates/admin/list_mail_acc.html
View file

@ -112,7 +112,7 @@
<div class="l-unit__date">
<?=strftime("%d %b %Y", strtotime($data[$key]['DATE']))?>
</div>
<div class="l-unit__suspended"">suspended</div>
<div class="l-unit__suspended""><?=__('suspended')?></div>
</div>
<!-- /.l-unit__col -->
<div class="l-unit__col l-unit__col--right">
@ -129,7 +129,7 @@
<?=__('Disk')?>
</div>
<div class="l-unit__stat-col l-unit__stat-col--right text-right volume">
<b><?=humanize_usage($data[$key]['U_DISK'])?></b> <?=humanize_usage($data[$key]['U_DISK'])?>
<b><?=humanize_usage_size($data[$key]['U_DISK'])?></b> <?=humanize_usage_measure($data[$key]['U_DISK'])?>
</div>
</div>
<div class="l-percent">

6
web/templates/admin/list_packages.html
View file

@ -83,7 +83,7 @@
<div class="l-unit__date">
<?=strftime("%d&nbsp; %b&nbsp; %Y", strtotime($data[$key]['DATE']))?>
</div>
<div class="l-unit__suspended"">suspended</div>
<div class="l-unit__suspended""><?__('suspended')?></div>
</div>
<!-- /.l-unit__col -->
<div class="l-unit__col l-unit__col--right">
@ -145,7 +145,7 @@
<div class="l-unit__stat-cols clearfix last">
<div class="l-unit__stat-col l-unit__stat-col--left"><?=__('Bandwidth')?>:</div>
<div class="l-unit__stat-col l-unit__stat-col--right">
<b><?=humanize_usage($data[$key]['BANDWIDTH'])?></b> <?=humanize_usage($data[$key]['BANDWIDTH'])?>
<b><?=humanize_usage_size($data[$key]['BANDWIDTH'])?></b> <?=humanize_usage_measure($data[$key]['BANDWIDTH'])?>
</div>
</div>
</td>
@ -172,7 +172,7 @@
<div class="l-unit__stat-cols clearfix last">
<div class="l-unit__stat-col l-unit__stat-col--left"><?=__('Disk')?>:</div>
<div class="l-unit__stat-col l-unit__stat-col--right">
<b><?=humanize_usage($data[$key]['DISK_QUOTA'])?></b> <?=humanize_usage($data[$key]['DISK_QUOTA'])?>
<b><?=humanize_usage_size($data[$key]['DISK_QUOTA'])?></b> <?=humanize_usage_measure($data[$key]['DISK_QUOTA'])?>
</div>
</div>
</td>

2
web/templates/admin/list_search.html
View file

@ -195,7 +195,7 @@
<div class="l-unit__date" u_date="<?=strtotime($data[$key]['DATE'])?>">
<?=strftime("%d %b %Y", strtotime($data[$key]['DATE']))?>
</div>
<div class="l-unit__suspended"">suspended</div>
<div class="l-unit__suspended""><?__('suspended')?></div>
</div>
<!-- /.l-unit__col -->
<div class="l-unit__col l-unit__col--right">

2
web/templates/admin/list_services.html
View file

@ -64,7 +64,7 @@
<!-- /.l-unit-toolbar -->
<div class="l-unit__col l-unit__col--left clearfix">
<div class="l-unit__suspended"">suspended</div>
<div class="l-unit__suspended""><?__('suspended')?></div>
<!-- div class="l-unit__date">
</div-->
</div>

12
web/templates/admin/list_stats.html
View file

@ -94,7 +94,7 @@
<?=__('Bandwidth')?>
</div>
<div class="l-unit__stat-col l-unit__stat-col--right text-right volume">
<b><?=humanize_usage($data[$key]['U_BANDWIDTH'])?></b> <?=humanize_usage($data[$key]['U_BANDWIDTH'])?>
<b><?=humanize_usage_size($data[$key]['U_BANDWIDTH'])?></b> <?=humanize_usage_measure($data[$key]['U_BANDWIDTH'])?>
</div>
</div>
<div class="l-percent">
@ -151,7 +151,7 @@
<div class="l-unit__stat-cols clearfix graph">
<div class="l-unit__stat-col l-unit__stat-col--left"><?=__('Disk')?>:</div>
<div class="l-unit__stat-col l-unit__stat-col--right text-right volume">
<b><?=humanize_usage($data[$key]['U_DISK'])?></b> <?=humanize_usage($data[$key]['U_DISK'])?>
<b><?=humanize_usage_size($data[$key]['U_DISK'])?></b> <?=humanize_usage_measure($data[$key]['U_DISK'])?>
</div>
</div>
<div class="l-percent">
@ -181,10 +181,10 @@
<td>
<div class="l-unit__stat-cols clearfix tiny">
<div class="l-unit__stat-col l-unit__stat-col--left">
<?=__('Web')?>: <b><?=humanize_usage($data[$key]['U_DISK_WEB'])?></b> <?=humanize_usage($data[$key]['U_DISK_WEB'])?>
<?=__('Web')?>: <b><?=humanize_usage_size($data[$key]['U_DISK_WEB'])?></b> <?=humanize_usage_measure($data[$key]['U_DISK_WEB'])?>
</div>
<div class="l-unit__stat-col l-unit__stat-col--right">
<?=__('Databases')?>: <b><?=humanize_usage($data[$key]['U_DISK_DB'])?></b> <?=humanize_usage($data[$key]['U_DISK_DB'])?>
<?=__('Databases')?>: <b><?=humanize_usage_size($data[$key]['U_DISK_DB'])?></b> <?=humanize_usage_measure($data[$key]['U_DISK_DB'])?>
</div>
</div>
</td>
@ -210,10 +210,10 @@
<td>
<div class="l-unit__stat-cols clearfix tiny">
<div class="l-unit__stat-col l-unit__stat-col--left">
<?=__('Mail')?>: <b><?=humanize_usage($data[$key]['U_DISK_MAIL'])?></b> <?=humanize_usage($data[$key]['U_DISK_MAIL'])?>
<?=__('Mail')?>: <b><?=humanize_usage_size($data[$key]['U_DISK_MAIL'])?></b> <?=humanize_usage_measure($data[$key]['U_DISK_MAIL'])?>
</div>
<div class="l-unit__stat-col l-unit__stat-col--right">
<?=__('User Directories')?>: <b><?=humanize_usage($data[$key]['U_DISK_DIRS'])?></b> <?=humanize_usage($data[$key]['U_DISK_DIRS'])?>
<?=__('User Directories')?>: <b><?=humanize_usage_size($data[$key]['U_DISK_DIRS'])?></b> <?=humanize_usage_measure($data[$key]['U_DISK_DIRS'])?>
</div>
</div>
</td>

16
web/templates/admin/list_user.html
View file

@ -110,7 +110,7 @@
unset($_SESSION['look_alert']);
}
} else { ?>
<div class="actions-panel__col actions-panel__loginas"><a href="/login/?loginas=<?=$key?>&token=<?=$_SESSION['token']?>""><?=__('login as')?> <i></i></a></div>
<div class="actions-panel__col actions-panel__loginas"><a href="/login/?loginas=<?=$key?>&token=<?=$_SESSION['token']?>""><?=__('login as').' '.$key?> <i></i></a></div>
<?}?>
<div class="actions-panel__col actions-panel__edit"><a href="/edit/user/?user=<?=$key?>&token=<?=$_SESSION['token']?>"><?=__('edit')?> <i></i></a></div>
<div class="actions-panel__col actions-panel__suspend">
@ -142,7 +142,7 @@
<div class="l-unit__date">
<?=strftime("%d&nbsp; %b&nbsp; %Y", strtotime($data[$key]['DATE']))?>
</div>
<div class="l-unit__suspended"">suspended</div>
<div class="l-unit__suspended""><?__('suspended')?></div>
</div>
<!-- /.l-unit__col -->
<div class="l-unit__col l-unit__col--right">
@ -165,7 +165,7 @@
<?=__('Bandwidth')?>
</div>
<div class="l-unit__stat-col l-unit__stat-col--right text-right volume">
<b><?=humanize_usage($data[$key]['U_BANDWIDTH'])?></b> <?=humanize_usage($data[$key]['U_BANDWIDTH'])?>
<b><?=humanize_usage_size($data[$key]['U_BANDWIDTH'])?></b> <?=humanize_usage_measure($data[$key]['U_BANDWIDTH'])?>
</div>
</div>
<div class="l-percent">
@ -222,7 +222,7 @@
<div class="l-unit__stat-cols clearfix graph">
<div class="l-unit__stat-col l-unit__stat-col--left"><?=__('Disk')?>:</div>
<div class="l-unit__stat-col l-unit__stat-col--right text-right volume">
<b><?=humanize_usage($data[$key]['U_DISK'])?></b> <?=humanize_usage($data[$key]['U_DISK'])?>
<b><?=humanize_usage_size($data[$key]['U_DISK'])?></b> <?=humanize_usage_measure($data[$key]['U_DISK'])?>
</div>
</div>
<div class="l-percent">
@ -252,10 +252,10 @@
<td>
<div class="l-unit__stat-cols clearfix tiny">
<div class="l-unit__stat-col l-unit__stat-col--left">
<?=__('Web')?>: <b><?=humanize_usage($data[$key]['U_DISK_WEB'])?></b> <?=humanize_usage($data[$key]['U_DISK_WEB'])?>
<?=__('Web')?>: <b><?=humanize_usage_size($data[$key]['U_DISK_WEB'])?></b> <?=humanize_usage_measure($data[$key]['U_DISK_WEB'])?>
</div>
<div class="l-unit__stat-col l-unit__stat-col--right">
<?=__('Databases')?>: <b><?=humanize_usage($data[$key]['U_DISK_DB'])?></b> <?=humanize_usage($data[$key]['U_DISK_DB'])?>
<?=__('Databases')?>: <b><?=humanize_usage_size($data[$key]['U_DISK_DB'])?></b> <?=humanize_usage_measure($data[$key]['U_DISK_DB'])?>
</div>
</div>
</td>
@ -281,10 +281,10 @@
<td>
<div class="l-unit__stat-cols clearfix tiny">
<div class="l-unit__stat-col l-unit__stat-col--left">
<?=__('Mail')?>: <b><?=humanize_usage($data[$key]['U_DISK_MAIL'])?></b> <?=humanize_usage($data[$key]['U_DISK_MAIL'])?>
<?=__('Mail')?>: <b><?=humanize_usage_size($data[$key]['U_DISK_MAIL'])?></b> <?=humanize_usage_measure($data[$key]['U_DISK_MAIL'])?>
</div>
<div class="l-unit__stat-col l-unit__stat-col--right">
<?=__('User Directories')?>: <b><?=humanize_usage($data[$key]['U_DISK_DIRS'])?></b> <?=humanize_usage($data[$key]['U_DISK_DIRS'])?>
<?=__('User Directories')?>: <b><?=humanize_usage_size($data[$key]['U_DISK_DIRS'])?></b> <?=humanize_usage_measure($data[$key]['U_DISK_DIRS'])?>
</div>
</div>
</td>

6
web/templates/admin/list_web.html
View file

@ -160,7 +160,7 @@
<div class="l-unit__date" u_date="<?=strtotime('1/1/2011')?>">
<?=strftime("%d %b %Y", strtotime($data[$key]['DATE']))?>
</div>
<div class="l-unit__suspended"">suspended</div>
<div class="l-unit__suspended""><?=__('suspended')?></div>
</div>
<!-- /.l-unit__col -->
<div class="l-unit__col l-unit__col--right">
@ -181,7 +181,7 @@
<?=__('Bandwidth')?>
</div>
<div class="l-unit__stat-col l-unit__stat-col--right text-right volume">
<b><?=humanize_usage($data[$key]['U_BANDWIDTH'])?></b> <?=humanize_usage($data[$key]['U_BANDWIDTH'])?>
<b><?=humanize_usage_size($data[$key]['U_BANDWIDTH'])?></b> <?=humanize_usage_measure($data[$key]['U_BANDWIDTH'])?>
</div>
</div>
<div class="l-percent">
@ -238,7 +238,7 @@
<div class="l-unit__stat-cols clearfix graph">
<div class="l-unit__stat-col l-unit__stat-col--left"><?=__('Disk')?>:</div>
<div class="l-unit__stat-col l-unit__stat-col--right text-right volume">
<b><?=humanize_usage($data[$key]['U_DISK'])?></b> <?=humanize_usage($data[$key]['U_DISK'])?>
<b><?=humanize_usage_size($data[$key]['U_DISK'])?></b> <?=humanize_usage_measure($data[$key]['U_DISK'])?>
</div>
</div>
<div class="l-percent">

2
web/templates/user/edit_dns.html
View file

@ -29,7 +29,7 @@
$back = "location.href='".$back."'";
}
?>
<form id="vstobjects" name="v_edit_dns" method="post" class="<?=__($v_status)?>">
<form id="vstobjects" name="v_edit_dns" method="post" class="<?=$v_status?>">
<input type="hidden" name="token" value="<?=$_SESSION['token']?>" />
<table class='data'>
<tr class="data-add">

2
web/templates/user/edit_user.html
View file

@ -29,7 +29,7 @@
$back = "location.href='".$back."'";
}
?>
<form id="vstobjects" method="post" name="v_edit_user" class="<?=__($v_status)?>">
<form id="vstobjects" method="post" name="v_edit_user" class="<?=$v_status?>">
<input type="hidden" name="token" value="<?=$_SESSION['token']?>" />
<script type="text/javascript">
function randomString() {

6
web/templates/user/edit_web.html
View file

@ -29,7 +29,7 @@
$back = "location.href='".$back."'";
}
?>
<form id="vstobjects" name="v_edit_web" method="post" class="<?=__($v_status)?>">
<form id="vstobjects" name="v_edit_web" method="post" class="<?=$v_status?>">
<input type="hidden" name="token" value="<?=$_SESSION['token']?>" />
<script language="javascript">
function WEBrandom() {
@ -323,7 +323,7 @@
<table style="display:<?php if (empty($v_ftp_user)) { echo 'none';} else {echo 'block';}?> ;" class="ftptable ftptable-nrm" name="v_add_domain_ftp">
<tr>
<td class="vst-text input-label">
<?php print __('FTP') ?> #<span class="ftp-user-number"><?php print $i + 1; ?></span> <a class="ftp-remove-user additional-control" onCLick="App.Actions.WEB.remove_ftp_user(this)">(<?php print __('remove') ?>)</a>
<?php print __('FTP') ?> #<span class="ftp-user-number"><?php print $i + 1; ?></span> <a class="ftp-remove-user additional-control" onCLick="App.Actions.WEB.remove_ftp_user(this)">(<?=__('delete') ?>)</a>
<input type="hidden" class="v-ftp-user-deleted" name="v_ftp_user[<?php print $i ?>][delete]" value="0" />
<input type="hidden" class="v-ftp-user-is-new" name="v_ftp_user[<?php print $i ?>][is_new]" value="<?php print htmlentities($ftp_user['is_new']) ?>" />
</td>
@ -405,7 +405,7 @@
<table class="ftptable ftptable-nrm" name="v_add_domain_ftp">
<tr>
<td class="vst-text input-label">
<?php print __('FTP') ?> #<span class="ftp-user-number"></span> <a class="ftp-remove-user additional-control" onCLick="App.Actions.WEB.remove_ftp_user(this)">(<?php print __('remove') ?>)</a>
<?php print __('FTP') ?> #<span class="ftp-user-number"></span> <a class="ftp-remove-user additional-control" onCLick="App.Actions.WEB.remove_ftp_user(this)">(<?=__('delete')?>)</a>
<input type="hidden" class="v-ftp-user-deleted" name="v_ftp_user[%INDEX%][delete]" value="0" />
<input type="hidden" class="v-ftp-user-is-new" name="v_ftp_user[%INDEX%][is_new]" value="1" />
</td>

2
web/templates/user/list_cron.html
View file

@ -116,7 +116,7 @@
<div class="l-unit__date">
<?=strftime("%d %b %Y", strtotime($data[$key]['DATE']))?>
</div>
<div class="l-unit__suspended"">suspended</div>
<div class="l-unit__suspended""><?__('suspended')?></div>
</div>
<!-- /.l-unit__col -->
<div class="l-unit__col l-unit__col--right">

4
web/templates/user/list_db.html
View file

@ -115,7 +115,7 @@
<div class="l-unit__date">
<?=strftime("%d %b %Y", strtotime($data[$key]['DATE']))?>
</div>
<div class="l-unit__suspended"">suspended</div>
<div class="l-unit__suspended""><?__('suspended')?></div>
</div>
<!-- /.l-unit__col -->
<div class="l-unit__col l-unit__col--right">
@ -132,7 +132,7 @@
<?=__('Disk')?>
</div>
<div class="l-unit__stat-col l-unit__stat-col--right text-right volume">
<b><?=humanize_usage($data[$key]['U_DISK'])?></b> <?=humanize_usage($data[$key]['U_DISK'])?>
<b><?=humanize_usage_size($data[$key]['U_DISK'])?></b> <?=humanize_usage_measure($data[$key]['U_DISK'])?>
</div>
</div>
<div class="l-percent">

2
web/templates/user/list_dns.html
View file

@ -102,7 +102,7 @@
<div class="l-unit__date">
<?=strftime("%d %b %Y", strtotime($data[$key]['DATE']))?>
</div>
<div class="l-unit__suspended"">suspended</div>
<div class="l-unit__suspended""><?__('suspended')?></div>
</div>
<!-- /.l-unit__col -->
<div class="l-unit__col l-unit__col--right">

2
web/templates/user/list_dns_rec.html
View file

@ -98,7 +98,7 @@
<!-- /.l-unit-toolbar -->
<div class="l-unit__col l-unit__col--left clearfix">
<div class="l-unit__suspended"">suspended</div>
<div class="l-unit__suspended""><?__('suspended')?></div>
</div>
<!-- /.l-unit__col -->
<div class="l-unit__col l-unit__col--right">

4
web/templates/user/list_mail.html
View file

@ -116,7 +116,7 @@
<div class="l-unit__date">
<?=strftime("%d %b %Y", strtotime($data[$key]['DATE']))?>
</div>
<div class="l-unit__suspended"">suspended</div>
<div class="l-unit__suspended""><?__('suspended')?></div>
</div>
<!-- /.l-unit__col -->
<div class="l-unit__col l-unit__col--right">
@ -133,7 +133,7 @@
<?=__('Disk')?>
</div>
<div class="l-unit__stat-col l-unit__stat-col--right text-right volume">
<b><?=humanize_usage($data[$key]['U_DISK'])?></b> <?=humanize_usage($data[$key]['U_DISK'])?>
<b><?=humanize_usage_size($data[$key]['U_DISK'])?></b> <?=humanize_usage_measure($data[$key]['U_DISK'])?>
</div>
</div>
<div class="l-percent">

4
web/templates/user/list_mail_acc.html
View file

@ -111,7 +111,7 @@
<div class="l-unit__date">
<?=strftime("%d %b %Y", strtotime($data[$key]['DATE']))?>
</div>
<div class="l-unit__suspended"">suspended</div>
<div class="l-unit__suspended""><?__('suspended')?></div>
</div>
<!-- /.l-unit__col -->
<div class="l-unit__col l-unit__col--right">
@ -128,7 +128,7 @@
<?=__('Disk')?>
</div>
<div class="l-unit__stat-col l-unit__stat-col--right text-right volume">
<b><?=humanize_usage($data[$key]['U_DISK'])?></b> <?=humanize_usage($data[$key]['U_DISK'])?>
<b><?=humanize_usage_size($data[$key]['U_DISK'])?></b> <?=humanize_usage_measure($data[$key]['U_DISK'])?>
</div>
</div>
<div class="l-percent">

2
web/templates/user/list_search.html
View file

@ -195,7 +195,7 @@
<div class="l-unit__date" u_date="<?=strtotime($data[$key]['DATE'])?>">
<?=strftime("%d %b %Y", strtotime($data[$key]['DATE']))?>
</div>
<div class="l-unit__suspended"">suspended</div>
<div class="l-unit__suspended""><?__('suspended')?></div>
</div>
<!-- /.l-unit__col -->
<div class="l-unit__col l-unit__col--right">

12
web/templates/user/list_stats.html
View file

@ -94,7 +94,7 @@
<?=__('Bandwidth')?>
</div>
<div class="l-unit__stat-col l-unit__stat-col--right text-right volume">
<b><?=humanize_usage($data[$key]['U_BANDWIDTH'])?></b> <?=humanize_usage($data[$key]['U_BANDWIDTH'])?>
<b><?=humanize_usage_size($data[$key]['U_BANDWIDTH'])?></b> <?=humanize_usage_measure($data[$key]['U_BANDWIDTH'])?>
</div>
</div>
<div class="l-percent">
@ -151,7 +151,7 @@
<div class="l-unit__stat-cols clearfix graph">
<div class="l-unit__stat-col l-unit__stat-col--left"><?=__('Disk')?>:</div>
<div class="l-unit__stat-col l-unit__stat-col--right text-right volume">
<b><?=humanize_usage($data[$key]['U_DISK'])?></b> <?=humanize_usage($data[$key]['U_DISK'])?>
<b><?=humanize_usage_size($data[$key]['U_DISK'])?></b> <?=humanize_usage_measure($data[$key]['U_DISK'])?>
</div>
</div>
<div class="l-percent">
@ -181,10 +181,10 @@
<td>
<div class="l-unit__stat-cols clearfix tiny">
<div class="l-unit__stat-col l-unit__stat-col--left">
<?=__('Web')?>: <b><?=humanize_usage($data[$key]['U_DISK_WEB'])?></b> <?=humanize_usage($data[$key]['U_DISK_WEB'])?>
<?=__('Web')?>: <b><?=humanize_usage_size($data[$key]['U_DISK_WEB'])?></b> <?=humanize_usage_measure($data[$key]['U_DISK_WEB'])?>
</div>
<div class="l-unit__stat-col l-unit__stat-col--right">
<?=__('Databases')?>: <b><?=humanize_usage($data[$key]['U_DISK_DB'])?></b> <?=humanize_usage($data[$key]['U_DISK_DB'])?>
<?=__('Databases')?>: <b><?=humanize_usage_size($data[$key]['U_DISK_DB'])?></b> <?=humanize_usage_measure($data[$key]['U_DISK_DB'])?>
</div>
</div>
</td>
@ -210,10 +210,10 @@
<td>
<div class="l-unit__stat-cols clearfix tiny">
<div class="l-unit__stat-col l-unit__stat-col--left">
<?=__('Mail')?>: <b><?=humanize_usage($data[$key]['U_DISK_MAIL'])?></b> <?=humanize_usage($data[$key]['U_DISK_MAIL'])?>
<?=__('Mail')?>: <b><?=humanize_usage_size($data[$key]['U_DISK_MAIL'])?></b> <?=humanize_usage_measure($data[$key]['U_DISK_MAIL'])?>
</div>
<div class="l-unit__stat-col l-unit__stat-col--right">
<?=__('User Directories')?>: <b><?=humanize_usage($data[$key]['U_DISK_DIRS'])?></b> <?=humanize_usage($data[$key]['U_DISK_DIRS'])?>
<?=__('User Directories')?>: <b><?=humanize_usage_size($data[$key]['U_DISK_DIRS'])?></b> <?=humanize_usage_measure($data[$key]['U_DISK_DIRS'])?>
</div>
</div>
</td>

14
web/templates/user/list_user.html
View file

@ -142,7 +142,7 @@
<div class="l-unit__date">
<?=strftime("%d&nbsp; %b&nbsp; %Y", strtotime($data[$key]['DATE']))?>
</div>
<div class="l-unit__suspended"">suspended</div>
<div class="l-unit__suspended""><?__('suspended')?></div>
</div>
<!-- /.l-unit__col -->
<div class="l-unit__col l-unit__col--right">
@ -165,7 +165,7 @@
<?=__('Bandwidth')?>
</div>
<div class="l-unit__stat-col l-unit__stat-col--right text-right volume">
<b><?=humanize_usage($data[$key]['U_BANDWIDTH'])?></b> <?=humanize_usage($data[$key]['U_BANDWIDTH'])?>
<b><?=humanize_usage_size($data[$key]['U_BANDWIDTH'])?></b> <?=humanize_usage_measure($data[$key]['U_BANDWIDTH'])?>
</div>
</div>
<div class="l-percent">
@ -222,7 +222,7 @@
<div class="l-unit__stat-cols clearfix graph">
<div class="l-unit__stat-col l-unit__stat-col--left"><?=__('Disk')?>:</div>
<div class="l-unit__stat-col l-unit__stat-col--right text-right volume">
<b><?=humanize_usage($data[$key]['U_DISK'])?></b> <?=humanize_usage($data[$key]['U_DISK'])?>
<b><?=humanize_usage_size($data[$key]['U_DISK'])?></b> <?=humanize_usage_measure($data[$key]['U_DISK'])?>
</div>
</div>
<div class="l-percent">
@ -252,10 +252,10 @@
<td>
<div class="l-unit__stat-cols clearfix tiny">
<div class="l-unit__stat-col l-unit__stat-col--left">
<?=__('Web')?>: <b><?=humanize_usage($data[$key]['U_DISK_WEB'])?></b> <?=humanize_usage($data[$key]['U_DISK_WEB'])?>
<?=__('Web')?>: <b><?=humanize_usage_size($data[$key]['U_DISK_WEB'])?></b> <?=humanize_usage_measure($data[$key]['U_DISK_WEB'])?>
</div>
<div class="l-unit__stat-col l-unit__stat-col--right">
<?=__('Databases')?>: <b><?=humanize_usage($data[$key]['U_DISK_DB'])?></b> <?=humanize_usage($data[$key]['U_DISK_DB'])?>
<?=__('Databases')?>: <b><?=humanize_usage_size($data[$key]['U_DISK_DB'])?></b> <?=humanize_usage_measure($data[$key]['U_DISK_DB'])?>
</div>
</div>
</td>
@ -281,10 +281,10 @@
<td>
<div class="l-unit__stat-cols clearfix tiny">
<div class="l-unit__stat-col l-unit__stat-col--left">
<?=__('Mail')?>: <b><?=humanize_usage($data[$key]['U_DISK_MAIL'])?></b> <?=humanize_usage($data[$key]['U_DISK_MAIL'])?>
<?=__('Mail')?>: <b><?=humanize_usage_size($data[$key]['U_DISK_MAIL'])?></b> <?=humanize_usage_measure($data[$key]['U_DISK_MAIL'])?>
</div>
<div class="l-unit__stat-col l-unit__stat-col--right">
<?=__('User Directories')?>: <b><?=humanize_usage($data[$key]['U_DISK_DIRS'])?></b> <?=humanize_usage($data[$key]['U_DISK_DIRS'])?>
<?=__('User Directories')?>: <b><?=humanize_usage_size($data[$key]['U_DISK_DIRS'])?></b> <?=humanize_usage_measure($data[$key]['U_DISK_DIRS'])?>
</div>
</div>
</td>

6
web/templates/user/list_web.html
View file

@ -161,7 +161,7 @@
<div class="l-unit__date" u_date="<?=strtotime('1/1/2011')?>">
<?=strftime("%d %b %Y", strtotime($data[$key]['DATE']))?>
</div>
<div class="l-unit__suspended"">suspended</div>
<div class="l-unit__suspended""><?__('suspended')?></div>
</div>
<!-- /.l-unit__col -->
<div class="l-unit__col l-unit__col--right">
@ -182,7 +182,7 @@
<?=__('Bandwidth')?>
</div>
<div class="l-unit__stat-col l-unit__stat-col--right text-right volume">
<b><?=humanize_usage($data[$key]['U_BANDWIDTH'])?></b> <?=humanize_usage($data[$key]['U_BANDWIDTH'])?>
<b><?=humanize_usage_size($data[$key]['U_BANDWIDTH'])?></b> <?=humanize_usage_measure($data[$key]['U_BANDWIDTH'])?>
</div>
</div>
<div class="l-percent">
@ -239,7 +239,7 @@
<div class="l-unit__stat-cols clearfix graph">
<div class="l-unit__stat-col l-unit__stat-col--left"><?=__('Disk')?>:</div>
<div class="l-unit__stat-col l-unit__stat-col--right text-right volume">
<b><?=humanize_usage($data[$key]['U_DISK'])?></b> <?=humanize_usage($data[$key]['U_DISK'])?>
<b><?=humanize_usage_size($data[$key]['U_DISK'])?></b> <?=humanize_usage_measure($data[$key]['U_DISK'])?>
</div>
</div>
<div class="l-percent">

4
web/templates/user/panel.html
View file

@ -29,8 +29,8 @@
<a href="/list/user/">
<div class="l-stat__col-title"><?=__('USER')?></div>
<ul>
<li><?=__('Disk')?>: <span><?=humanize_usage($panel[$user]['U_DISK'])?></span></li>
<li><?=__('Bandwidth');?>: <span><?=humanize_usage($panel[$user]['U_BANDWIDTH'])?></span></li>
<li><?=__('Disk')?>: <span><?=humanize_usage_size($panel[$user]['U_DISK'])?> <?=humanize_usage_measure($panel[$user]['U_DISK'])?></span></li>
<li><?=__('Bandwidth');?>: <span> <?=humanize_usage_size($panel[$user]['U_BANDWIDTH'])?> <?=humanize_usage_measure($panel[$user]['U_BANDWIDTH'])?></span></li>
</ul>
</a>
</div>