github/myvesta
1
0
Fork 0
mirror of https://github.com/myvesta/vesta synced 2025-08-19 04:50:47 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix for Nginx-less setup

Browse source
This commit is contained in:
Serghey Rodin 2015-02-18 02:33:49 +02:00
commit f7236d034e
10 changed files with 58 additions and 44 deletions
Download patch file Download diff file Expand all files Collapse all files

26
web/add/package/index.php
View file

@ -19,7 +19,9 @@ if (!empty($_POST['ok'])) {
// Check empty fields
if (empty($_POST['v_package'])) $errors[] = __('package');
if (empty($_POST['v_web_template'])) $errors[] = __('web template');
if (!empty($_SESSION['PROXY_SYSTEM'])) {
if (empty($_POST['v_proxy_template'])) $errors[] = __('proxy template');
}
if (empty($_POST['v_dns_template'])) $errors[] = __('dns template');
if (empty($_POST['v_shell'])) $errrors[] = __('shell');
if (!isset($_POST['v_web_domains'])) $errors[] = __('web domains');
@ -140,9 +142,11 @@ $web_templates = json_decode(implode('', $output), true);
unset($output);
// List web templates for proxy
if (!empty($_SESSION['PROXY_SYSTEM'])) {
exec (VESTA_CMD."v-list-web-templates-proxy json", $output, $return_var);
$proxy_templates = json_decode(implode('', $output), true);
unset($output);
}
// List DNS templates
exec (VESTA_CMD."v-list-dns-templates json", $output, $return_var);
@ -159,17 +163,17 @@ if (empty($v_web_template)) $v_web_template = 'default';
if (empty($v_proxy_template)) $v_proxy_template = 'default';
if (empty($v_dns_template)) $v_dns_template = 'default';
if (empty($v_shell)) $v_shell = 'nologin';
if (empty($v_web_domains)) $v_web_domains = "'0'";
if (empty($v_web_aliases)) $v_web_aliases = "'0'";
if (empty($v_dns_domains)) $v_dns_domains = "'0'";
if (empty($v_dns_records)) $v_dns_records = "'0'";
if (empty($v_mail_domains)) $v_mail_domains = "'0'";
if (empty($v_mail_accounts)) $v_mail_accounts = "'0'";
if (empty($v_databases)) $v_databases = "'0'";
if (empty($v_cron_jobs)) $v_cron_jobs = "'0'";
if (empty($v_backups)) $v_backups = "'0'";
if (empty($v_disk_quota)) $v_disk_quota = "'0'";
if (empty($v_bandwidth)) $v_bandwidth = "'0'";
if (empty($v_web_domains)) $v_web_domains = "'1'";
if (empty($v_web_aliases)) $v_web_aliases = "'1'";
if (empty($v_dns_domains)) $v_dns_domains = "'1'";
if (empty($v_dns_records)) $v_dns_records = "'1'";
if (empty($v_mail_domains)) $v_mail_domains = "'1'";
if (empty($v_mail_accounts)) $v_mail_accounts = "'1'";
if (empty($v_databases)) $v_databases = "'1'";
if (empty($v_cron_jobs)) $v_cron_jobs = "'1'";
if (empty($v_backups)) $v_backups = "'1'";
if (empty($v_disk_quota)) $v_disk_quota = "'1000'";
if (empty($v_bandwidth)) $v_bandwidth = "'1000'";
if (empty($v_ns1)) $v_ns1 = 'ns1.example.ltd';
if (empty($v_ns2)) $v_ns2 = 'ns2.example.ltd';

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

@ -141,7 +141,7 @@ if (!empty($_POST['ok'])) {
}
// Add proxy support
if (($_POST['v_proxy'] == 'on') && (empty($_SESSION['error_msg']))) {
if ((!empty($_SESSION['PROXY_SYSTEM'])) && ($_POST['v_proxy'] == 'on') && (empty($_SESSION['error_msg']))) {
$ext = str_replace(' ', '', $v_proxy_ext);
$ext = escapeshellarg($ext);
exec (VESTA_CMD."v-add-web-domain-proxy ".$user." ".$v_domain." '' ".$ext." 'no'", $output, $return_var);
@ -217,7 +217,7 @@ if (!empty($_POST['ok'])) {
}
// Restart proxy server
if (($_POST['v_proxy'] == 'on') && (empty($_SESSION['error_msg']))) {
if ((!empty($_SESSION['PROXY_SYSTEM'])) && ($_POST['v_proxy'] == 'on') && (empty($_SESSION['error_msg']))) {
exec (VESTA_CMD."v-restart-proxy", $output, $return_var);
check_return_code($return_var,$output);
unset($output);

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

@ -60,9 +60,11 @@ $web_templates = json_decode(implode('', $output), true);
unset($output);
// List proxy templates
if (!empty($_SESSION['PROXY_SYSTEM'])) {
exec (VESTA_CMD."v-list-web-templates-proxy json", $output, $return_var);
$proxy_templates = json_decode(implode('', $output), true);
unset($output);
}
// List dns templates
exec (VESTA_CMD."v-list-dns-templates json", $output, $return_var);

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

@ -76,9 +76,11 @@ $templates = json_decode(implode('', $output), true);
unset($output);
// List proxy templates
if (!empty($_SESSION['PROXY_SYSTEM'])) {
exec (VESTA_CMD."v-list-web-templates-proxy json", $output, $return_var);
$proxy_templates = json_decode(implode('', $output), true);
unset($output);
}
// List web stat engines
exec (VESTA_CMD."v-list-web-stats json", $output, $return_var);
@ -189,7 +191,7 @@ if (!empty($_POST['save'])) {
}
// Delete proxy support
if ((!empty($v_proxy)) && (empty($_POST['v_proxy'])) && (empty($_SESSION['error_msg']))) {
if ((!empty($_SESSION['PROXY_SYSTEM'])) && (!empty($v_proxy)) && (empty($_POST['v_proxy'])) && (empty($_SESSION['error_msg']))) {
exec (VESTA_CMD."v-delete-web-domain-proxy ".$v_username." ".$v_domain." 'no'", $output, $return_var);
check_return_code($return_var,$output);
unset($output);
@ -198,7 +200,7 @@ if (!empty($_POST['save'])) {
}
// Change proxy template / Update extention list
if ((!empty($v_proxy)) && (!empty($_POST['v_proxy'])) && (empty($_SESSION['error_msg']))) {
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);
$ext = preg_replace('/\s+/', ' ',$ext);
@ -216,7 +218,7 @@ if (!empty($_POST['save'])) {
}
// Add proxy support
if ((empty($v_proxy)) && (!empty($_POST['v_proxy'])) && (empty($_SESSION['error_msg']))) {
if ((!empty($_SESSION['PROXY_SYSTEM'])) && (empty($v_proxy)) && (!empty($_POST['v_proxy'])) && (empty($_SESSION['error_msg']))) {
$v_proxy_template = $_POST['v_proxy_template'];
if (!empty($_POST['v_proxy_ext'])) {
$ext = preg_replace("/\n/", " ", $_POST['v_proxy_ext']);
@ -584,7 +586,7 @@ if (!empty($_POST['save'])) {
}
// Restart proxy server
if (!empty($restart_proxy) && (empty($_SESSION['error_msg']))) {
if ((!empty($_SESSION['PROXY_SYSTEM'])) && !empty($restart_proxy) && (empty($_SESSION['error_msg']))) {
exec (VESTA_CMD."v-restart-proxy", $output, $return_var);
check_return_code($return_var,$output);
unset($output);

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

@ -67,6 +67,7 @@
</select>
</td>
</tr>
<?php if (!empty($_SESSION['PROXY_SYSTEM'])) { echo ""; ?>
<tr>
<td class="vst-text input-label">
<?php print __('Proxy Template');?>
@ -90,6 +91,7 @@
</select>
</td>
</tr>
<?php echo ""; }?>
<tr>
<td class="vst-text input-label">
<?php print __('DNS Template');?>
@ -232,7 +234,6 @@
<tr>
<td>
<input type="text" size="20" class="vst-input" name="v_backups" <?php if (isset($v_backups)) echo "value=".$v_backups; ?>>
<img id="unlim-backups" class="unlim-trigger" src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAA4AAAAQCAQAAACMnYaxAAAAAmJLR0QA/4ePzL8AAACaSURBVBgZxcExasJQAADQBwkIujhGXHSxB3ArDg4u0lkE8TRCZwvFC2Rzq2fQOCpY0EO4qoNgftEM9gTte/y9CJG6spOnRNVZoOlbEOyN3I0dBMFOgy9LLW0frj7NXE21vcgsOBoodFycvSoMnWI3kUIiRqIQuzG30dWTyk28y6V6urbm1GWCXKbv7s1aEKzUPFSU/FZS8U9+AP5iKrZ4my0HAAAAAElFTkSuQmCC" />
</td>
</tr>
<tr>

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

@ -133,6 +133,7 @@
<textarea size="20" class="vst-textinput" name="v_aliases" id="v_aliases" ><?php if (!empty($v_aliases)) echo $v_aliases; ?></textarea>
</td>
</tr>
<?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>
@ -154,6 +155,7 @@
</table>
</td>
</tr>
<?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> /

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

@ -73,6 +73,7 @@
</select>
</td>
</tr>
<?php if (!empty($_SESSION['PROXY_SYSTEM'])) { echo ""; ?>
<tr>
<td class="vst-text input-label">
<?php print __('Proxy Template');?>
@ -96,6 +97,7 @@
</select>
</td>
</tr>
<?php echo ""; }?>
<tr>
<td class="vst-text input-label">
<?php print __('DNS Template');?>
@ -206,7 +208,6 @@
<td>
<input type="text" size="20" class="vst-input" name="v_mail_accounts" <?php if (isset($v_mail_accounts)) echo "value=".$v_mail_accounts; ?>>
<img id="unlim-mail-accounts" class="unlim-trigger" src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAA4AAAAQCAQAAACMnYaxAAAAAmJLR0QA/4ePzL8AAACaSURBVBgZxcExasJQAADQBwkIujhGXHSxB3ArDg4u0lkE8TRCZwvFC2Rzq2fQOCpY0EO4qoNgftEM9gTte/y9CJG6spOnRNVZoOlbEOyN3I0dBMFOgy9LLW0frj7NXE21vcgsOBoodFycvSoMnWI3kUIiRqIQuzG30dWTyk28y6V6urbm1GWCXKbv7s1aEKzUPFSU/FZS8U9+AP5iKrZ4my0HAAAAAElFTkSuQmCC" />
<td>
</tr>
<tr>
@ -239,7 +240,6 @@
<tr>
<td>
<input type="text" size="20" class="vst-input" name="v_backups" <?php if (isset($v_backups)) echo "value=".$v_backups; ?>>
<img id="unlim-backups" class="unlim-trigger" src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAA4AAAAQCAQAAACMnYaxAAAAAmJLR0QA/4ePzL8AAACaSURBVBgZxcExasJQAADQBwkIujhGXHSxB3ArDg4u0lkE8TRCZwvFC2Rzq2fQOCpY0EO4qoNgftEM9gTte/y9CJG6spOnRNVZoOlbEOyN3I0dBMFOgy9LLW0frj7NXE21vcgsOBoodFycvSoMnWI3kUIiRqIQuzG30dWTyk28y6V6urbm1GWCXKbv7s1aEKzUPFSU/FZS8U9+AP5iKrZ4my0HAAAAAElFTkSuQmCC" />
</td>
</tr>
<tr>

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

@ -140,6 +140,7 @@
</select>
</td>
</tr>
<?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>
@ -185,6 +186,7 @@
</table>
</td>
</tr>
<?php echo ""; }?>
<tr>
<td class="vst-text step-top">
<label><input type="checkbox" size="20" class="vst-checkbox" name="v_ssl" <?php if ($v_ssl == 'yes') echo "checked=yes" ?> onclick="javascript:elementHideShow('ssltable');"> <?php print __('SSL Support');?></label> /

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

@ -71,10 +71,12 @@
<td class="counter-name"><?php print __('Web Template');?>:</td>
<td class="counter-value"><?php print __($data[$key]['WEB_TEMPLATE'])?></td>
</tr>
<?php if (!empty($_SESSION['PROXY_SYSTEM'])) { echo ""; ?>
<tr>
<td class="counter-name"><?php print __('Proxy Template');?>:</td>
<td class="counter-value"><?php print __($data[$key]['PROXY_TEMPLATE']);?></td>
</tr>
<?php echo ""; }?>
<tr>
<td class="counter-name"><?php print __('DNS Template');?>:</td>
<td class="counter-value"><?php print __($data[$key]['DNS_TEMPLATE']);?></td>

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

@ -174,6 +174,7 @@
</td>
<td style="vertical-align:top;" width="238px">
<table>
<tr><td>&nbsp;</td><td></td></tr>
<tr>
<td class="counter-name"><?php print __('Web Template');?>:</td>
<td class="counter-value"><?php print __($data[$key]['TPL']) ?></td>
@ -182,33 +183,31 @@
<td class="counter-name"><?php print __('SSL Support');?>:</td>
<td class="counter-value"><?php print __($data[$key]['SSL']) ?></td>
</tr>
<tr>
<td class="counter-name"><?php print __('Web Statistics');?>: </td>
<td class="counter-value"> <?php print __($web_stats) ?></td>
</tr>
<tr>
<td class="counter-name"><?php print __('Proxy Support');?>:</td>
<td class="counter-value"><?php print __($proxy_support);?></td>
</tr>
</table>
</td>
<td rowspan=4 style="vertical-align:top;">
<table>
<tr><td>&nbsp;</td><td></td></tr>
<?php if (!empty($_SESSION['PROXY_SYSTEM'])) { echo ""; ?>
<tr>
<td class="counter-name"><?php print __('Proxy Support');?>:</td>
<td class="counter-value"><?php print __($proxy_support);?></td>
</tr>
<tr>
<td class="counter-name"><?php print __('Proxy Template');?>:</td>
<td class="counter-value"><?php echo $data[$key]['PROXY'];?></td>
</tr>
<tr>
<td class="counter-name"><?php print __('Proxy Extensions');?>:</td>
<td class="counter-value"><?php echo $proxy_ext;?></td>
</tr>
<?php echo ""; }?>
<tr>
<td class="counter-name"> <?php print __('Additional FTP Account');?>:</td>
<td class="counter-value"> <?php print __($ftp_user) ?></td>
</tr>
</table>
</td>
</tr>