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

Correct typo, replace 'LoadAverage' with 'Load Average'

Browse source
This commit is contained in:
Flat 2016-07-03 16:15:52 +09:00
commit 869c54970e
5 changed files with 11 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

4
web/add/web/index.php
View file

@ -60,7 +60,7 @@ if (!empty($_POST['ok'])) {
$aliases = implode(",",$aliases_arr);
$aliases = escapeshellarg($aliases);
// Define proxy extentions
// Define proxy extensions
$v_proxy_ext = $_POST['v_proxy_ext'];
$proxy_ext = preg_replace("/\n/", ",", $v_proxy_ext);
$proxy_ext = preg_replace("/\r/", ",", $proxy_ext);
@ -272,7 +272,7 @@ if (!empty($_POST['ok'])) {
$fp = fopen($v_ftp_password, "w");
fwrite($fp, $v_ftp_user_data['v_ftp_password']."\n");
fclose($fp);
exec (VESTA_CMD."v-add-web-domain-ftp ".$user." ".$v_domain." ".$v_ftp_user." ".$v_ftp_password . " " . $v_ftp_path, $output, $return_var);
exec (VESTA_CMD."v-add-web-domain-ftp ".$user." ".$v_domain." ".$v_ftp_user." ".$v_ftp_password . " " . $v_ftp_path, $output, $return_var);
check_return_code($return_var,$output);
unset($output);
unlink($v_ftp_password);

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

@ -222,7 +222,7 @@ if (!empty($_POST['save'])) {
$restart_proxy = 'yes';
}
// Change proxy template / Update extention list
// Change proxy template / Update extension list
if ((!empty($_SESSION['PROXY_SYSTEM'])) && (!empty($v_proxy)) && (!empty($_POST['v_proxy'])) && (empty($_SESSION['error_msg']))) {
$ext = preg_replace("/\n/", " ", $_POST['v_proxy_ext']);
$ext = preg_replace("/,/", " ", $ext);

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

@ -54,7 +54,7 @@
<table class="data-col2" width="600px">
<tr>
<td class="vst-text step-top">
<?php print __('Banlist') ?>
<?php print __('Banlist') ?>
</td>
</tr>
<tr>
@ -72,7 +72,7 @@
</tr>
<tr>
<td class="vst-text input-label">
<?php print __('IP address');?> <span class="optional">(<?php print __('CDIR format is supported');?>)</span>
<?=__('IP address')?> <span class="optional">(<?=__('CIDR format is supported')?>)</span>
</td>
</tr>
<tr>
@ -95,4 +95,4 @@
</tr>
</table>
</from>
</div>
</div>

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

@ -142,7 +142,7 @@
<textarea size="20" class="vst-textinput" name="v_aliases" id="v_aliases" ><?php if (!empty($v_aliases)) echo htmlentities($v_aliases); ?></textarea>
</td>
</tr>
<?php if (!empty($_SESSION['PROXY_SYSTEM'])) { 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 ($v_proxy !== 'off') echo "checked=yes" ?> onclick="javascript:elementHideShow('proxytable');"> <?php print __('Proxy Support');?></label>
@ -153,7 +153,7 @@
<table style="display:<?php if ($v_proxy == 'off') { echo 'none';} else {echo 'block';}?>;" id="proxytable" >
<tr>
<td class="vst-text input-label step-left">
<?php print __('Proxy Extentions');?>
<?php print __('Proxy Extensions');?>
</td>
</tr>
<tr>
@ -164,7 +164,7 @@
</table>
</td>
</tr>
<?php echo ""; }?>
<?php echo ""; }?>
<tr>
<td class="step-top vst-text">
<label><input type="checkbox" size="20" class="vst-checkbox" name="v_ssl" <?php if($v_ssl == 'yes' || $v_ssl == 'on') echo "checked=yes" ?> onclick="javascript:elementHideShow('ssltable');"> <?php print __('SSL Support');?></label> /
@ -242,7 +242,7 @@
}
echo ">" . htmlentities(__($value)) . "</option>\n";
}
?>
?>
</select>
</td>
</tr>

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

@ -91,7 +91,7 @@
</td>
<td>
<div class="l-unit__stat-cols clearfix">
<div class="l-unit__stat-col l-unit__stat-col--left"><?=__('LoadAverage')?>:</div>
<div class="l-unit__stat-col l-unit__stat-col--left"><?=__('Load Average')?>:</div>
<div class="l-unit__stat-col l-unit__stat-col--right"><b><?=$sys['sysinfo']['LOADAVERAGE']?></b></div>
</div>
</td>