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

fixes from dalaylama for 0.9.7

Browse source
This commit is contained in:
Serghey Rodin 2012-07-06 10:55:35 +03:00
commit 3b3836ff1d
4 changed files with 32 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -21,7 +21,7 @@ top_panel($user,$TAB);
if (empty($_POST['v_template'])) $errors[] = 'template'; if (empty($_POST['v_template'])) $errors[] = 'template';
if ((!empty($_POST['v_ssl'])) && (empty($_POST['v_ssl_crt']))) $errors[] = 'ssl certificate'; if ((!empty($_POST['v_ssl'])) && (empty($_POST['v_ssl_crt']))) $errors[] = 'ssl certificate';
if ((!empty($_POST['v_ssl'])) && (empty($_POST['v_ssl_key']))) $errors[] = 'ssl key'; if ((!empty($_POST['v_ssl'])) && (empty($_POST['v_ssl_key']))) $errors[] = 'ssl key';
if ((!empty($_POST['v_aliases'])) || (!empty($_POST['v_elog'])) || (!empty($_POST['v_ssl'])) || (!empty($_POST['v_ssl_crt'])) || (!empty($_POST['v_ssl_key'])) || (!empty($_POST['v_ssl_ca'])) || ($_POST['v_stats'] != 'none')) $v_adv = 'yes'; if ((!empty($_POST['v_aliases'])) || (!empty($_POST['v_elog'])) || (!empty($_POST['v_ssl'])) || (!empty($_POST['v_ssl_crt'])) || (!empty($_POST['v_ssl_key'])) || (!empty($_POST['v_ssl_ca'])) || ($_POST['v_stats'] != 'none') || (empty($_POST['v_nginx']))) $v_adv = 'yes';
// Protect input // Protect input
$v_domain = preg_replace("/^www./i", "", $_POST['v_domain']); $v_domain = preg_replace("/^www./i", "", $_POST['v_domain']);
@ -30,9 +30,9 @@ top_panel($user,$TAB);
$v_template = escapeshellarg($_POST['v_template']); $v_template = escapeshellarg($_POST['v_template']);
if (empty($_POST['v_dns'])) $v_dns = 'off'; if (empty($_POST['v_dns'])) $v_dns = 'off';
if (empty($_POST['v_mail'])) $v_mail = 'off'; if (empty($_POST['v_mail'])) $v_mail = 'off';
if (empty($_POST['v_nginx'])) $v_nginx = 'off';
$v_aliases = $_POST['v_aliases']; $v_aliases = $_POST['v_aliases'];
$v_elog = $_POST['v_elog']; $v_elog = $_POST['v_elog'];
$v_nginx = $_POST['v_nginx'];
$v_ssl = $_POST['v_ssl']; $v_ssl = $_POST['v_ssl'];
$v_ssl_crt = $_POST['v_ssl_crt']; $v_ssl_crt = $_POST['v_ssl_crt'];
$v_ssl_key = $_POST['v_ssl_key']; $v_ssl_key = $_POST['v_ssl_key'];
@ -123,7 +123,7 @@ top_panel($user,$TAB);
} }
// Add Nginx // Add Nginx
if ((!empty($_POST['v_nginx'])) && (empty($_SESSION['error_msg']))) { if (($_POST['v_nginx'] == 'on') && (empty($_SESSION['error_msg']))) {
$nginx_ext = "'jpg,jpeg,gif,png,ico,css,zip,tgz,gz,rar,bz2,doc,xls,exe,pdf,ppt,txt,tar,wav,bmp,rtf,js,mp3,avi,mpeg,html,htm'"; $nginx_ext = "'jpg,jpeg,gif,png,ico,css,zip,tgz,gz,rar,bz2,doc,xls,exe,pdf,ppt,txt,tar,wav,bmp,rtf,js,mp3,avi,mpeg,html,htm'";
exec (VESTA_CMD."v_add_web_domain_nginx ".$user." ".$v_domain." 'default' ".$nginx_ext." 'no'", $output, $return_var); exec (VESTA_CMD."v_add_web_domain_nginx ".$user." ".$v_domain." 'default' ".$nginx_ext." 'no'", $output, $return_var);
if ($return_var != 0) { if ($return_var != 0) {

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

@ -64,7 +64,7 @@
<tr><td class="add-text" style="padding: 10px 0 0 2px;">Error Logging</td></tr> <tr><td class="add-text" style="padding: 10px 0 0 2px;">Error Logging</td></tr>
<tr><td><input type="checkbox" size="20" class="add-checkbox" name="v_elog" <?php if (!empty($v_elog)) echo "checked=yes" ?>></tr> <tr><td><input type="checkbox" size="20" class="add-checkbox" name="v_elog" <?php if (!empty($v_elog)) echo "checked=yes" ?>></tr>
<tr><td class="add-text" style="padding: 10px 0 0 2px;">Nginx Support</td></tr> <tr><td class="add-text" style="padding: 10px 0 0 2px;">Nginx Support</td></tr>
<tr><td><input type="checkbox" size="20" class="add-checkbox" name="v_nginx" <?php if (!empty($v_nginx)) echo "checked=yes" ?>></tr> <tr><td><input type="checkbox" size="20" class="add-checkbox" name="v_nginx" <?php if (empty($v_nginx)) echo "checked=yes" ?>></tr>
<tr><td class="add-text" style="padding: 10px 0 0 2px;">SSL Support</td></tr> <tr><td class="add-text" style="padding: 10px 0 0 2px;">SSL Support</td></tr>
<tr><td><input type="checkbox" size="20" class="add-checkbox" name="v_ssl" <?php if (!empty($v_ssl)) echo "checked=yes" ?>></tr> <tr><td><input type="checkbox" size="20" class="add-checkbox" name="v_ssl" <?php if (!empty($v_ssl)) echo "checked=yes" ?>></tr>
<tr><td class="add-text" style="padding: 10px 0 0 2px;">SSL Certificate</td></tr> <tr><td class="add-text" style="padding: 10px 0 0 2px;">SSL Certificate</td></tr>

3
web/templates/admin/list_rrd.html
View file

@ -21,8 +21,7 @@ foreach ($data as $key => $value) {
<td class="data-dotted" width="830px" style="vertical-align:top;"> <td class="data-dotted" width="830px" style="vertical-align:top;">
<table width="830px"><tr> <table width="830px"><tr>
<td></td> <td></td>
<td class="data-controls" width="80px"><img src="/images/download.png" width="8px" height="8px"><a href="#"> download</a></td> <td class="data-controls" width="80px"><img src="/images/download.png" width="8px" height="8px"><a href="/rrd/<?php echo $data[$key]['TYPE']."/".$period."-".$data[$key]['RRD'].".png" ?>" target="_blank"> download</a></td>
<td class="data-controls" width="70px"><img src="/images/delete.png" width="7px" height="7px"><a href="#"> update</a></td>
</tr></table> </tr></table>
<table class="data-col2" width="830px"> <table class="data-col2" width="830px">

29
web/templates/header.html
View file

@ -169,11 +169,16 @@ if (!empty($_SESSION['look'])) {
.nav-slink { .nav-slink {
letter-spacing: -1.2px; letter-spacing: -1.2px;
font-size: 16pt; font-size: 16pt;
color: #8B99A2; color: #7ba1aa;
font-family: Arial, sans-serif; font-family: Arial, sans-serif;
text-decoration: none; text-decoration: none;
} }
.nav-slink:active {
color: #68797d;
text-decoration: underline;
}
.sub-menu { .sub-menu {
margin-left: auto; margin-left: auto;
margin-right: auto; margin-right: auto;
@ -519,9 +524,29 @@ if (!empty($_SESSION['look'])) {
} }
.add-button { .add-button {
cursor: pointer;
background-color: #F1F1F1;
border: 1px solid #ACACAC;
border-radius: 3px 3px 3px 3px;
color: #555555;
font-size: 12px;
font-weight: bold;
padding: 3px 16px;
width: 105px;
padding: 4px; padding: 4px;
margin: 0 6px 0 0; margin: 0 6px 0 0;
font-size: 12pt; }
button {
cursor: pointer;
background-color: #F1F1F1;
border: 1px solid #ACACAC;
border-radius: 3px 3px 3px 3px;
color: #555555;
font-size: 12px;
font-weight: bold;
padding: 3px 16px;
width: 105px;
} }
.genpass { .genpass {