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

support for NATed networks

Browse source
This commit is contained in:
Serghey Rodin 2013-02-05 22:58:40 +02:00
commit 138ef6c7b0
37 changed files with 271 additions and 94 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -135,6 +135,18 @@
<input type="text" size="20" class="vst-input" name="v_name" <?php if (!empty($v_name)) echo "value=".$v_name; ?>>
</td>
</tr>
<tr>
<td class="vst-text" style="padding: 10 0 0 2px;">
<?php print _('NAT IP association');?> <span style="padding:0 0 0 6px; font-size: 10pt; color:#555;">(<?php print _('optional');?>)</span>
</td>
</tr>
<tr>
<td>
<input type="text" size="20" class="vst-input" name="v_nat" <?php if (!empty($v_nat)) echo "value=".$v_nat; ?>>
</td>
</tr>
</table>
<table class="data-col2">
<tr>

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

@ -103,11 +103,13 @@
<select class="vst-list" name="v_ip">
<?php
foreach ($ips as $key => $value) {
echo "\t\t\t\t<option value=\"".$key."\"";
if ((!empty($v_ip)) && ( $key == $_POST['v_ip'])){
$display_ip = $key;
if (!empty($value['NAT'])) $display_ip = $value['NAT'];
echo "\t\t\t\t<option value=\"".$display_ip."\"";
if ((!empty($v_ip)) && ( $display_ip == $_POST['v_ip'])){
echo ' selected';
}
echo ">".$key."</option>\n";
echo ">".$display_ip."</option>\n";
}
?>
</select>

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

@ -123,6 +123,17 @@
<input type="text" size="20" class="vst-input" name="v_name" <?php if (!empty($v_name)) echo "value=".$v_name; ?>>
</td>
</tr>
<tr>
<td class="vst-text" style="padding: 10 0 0 2px;">
<?php print _('NAT IP association');?> <span style="padding:0 0 0 6px; font-size: 10pt; color:#555;">(<?php print _('optional');?>)</span>
</td>
</tr>
<tr>
<td>
<input type="text" size="20" class="vst-input" name="v_nat" <?php if (!empty($v_nat)) echo "value=".$v_nat; ?>>
</td>
</tr>
</table>
<table class="data-col2">
<tr>

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

@ -95,12 +95,14 @@
<select class="vst-list" name="v_ip">
<?php
foreach ($ips as $key => $value) {
echo "\n\t\t\t\t\t\t\t\t\t\t<option value=\"".$key."\"";
$skey = "'".$key."'";
if ((!empty($v_ip)) && ( $key == $v_ip ) || ( $skey == $v_ip )){
$display_ip = $key;
if (!empty($value['NAT'])) $display_ip = $value['NAT'];
$skey = "'".$display_ip."'";
echo "\n\t\t\t\t\t\t\t\t\t\t\t\t<option value=\"".$display_ip."\"";
if ((!empty($v_ip)) && ( $display_ip == $v_ip ) || ( $skey == $v_ip )){
echo ' selected';
}
echo ">".$key."</option>\n";
echo ">".$display_ip."</option>\n";
}
?>
</select>

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

@ -20,6 +20,31 @@
</select>
<input type="submit" name="ok" value="›" class="button" style="width: 37px; font-size: 12px; height: 24px;">
</div>
<?php
if (!empty($_SESSION['error_msg'])) {
?>
<div>
<script type="text/javascript">
$(function() {
$( "#dialog:ui-dialog" ).dialog( "destroy" );
$( "#dialog-message" ).dialog({
modal: true,
buttons: {
Ok: function() {
$( this ).dialog( "close" );
}
}
});
});
</script>
<div id="dialog-message" title="Error">
<p><?php echo $_SESSION['error_msg'] ?></p>
</div>
</div>
<?php
unset($_SESSION['error_msg']);
}
?>
</td>
</tr>
</table>
@ -64,7 +89,9 @@
<table class="data-col2" width="830px">
<tr>
<td colspan=3 class="domain" style="padding: 0 0 0 4px;">
<b><?php echo $key ?></b><a class="aliases" style="padding:0 0 0 8px;"><?php echo $data[$key]['NAME'] ?></a>
<b><?php echo $key ?></b>
<?php if (!empty($data[$key]['NAT'])) echo ' → <b>' . $data[$key]['NAT'] . '</b>'; ?>
<a class="aliases" style="padding:0 0 0 8px;"><?php echo $data[$key]['NAME'] ?></a>
</td>
</tr>
<tr>

14
web/templates/admin/panel.html
View file

@ -9,26 +9,26 @@
<tr>
<td style="border-bottom: 1px solid #c4c4c4; height: 26px; border-left: 1px solid #c4c4c4; padding: 0 0 0 0px">
<b><a class="top-<?php if($TAB == 'PACKAGE' ) echo 'selected-' ?>link" href="/list/package/">
<?php print _('Packages') ?>
<?php print _('Packages') ?>
</a></b>
<b><a class="top-<?php if($TAB == 'IP' ) echo 'selected-' ?>link" href="/list/ip/">
<?php print _('IP') ?>
<?php print _('IP') ?>
</a></b>
<b><a class="top-<?php if($TAB == 'RRD' ) echo 'selected-' ?>link" href="/list/rrd/">
<?php print _('Graphics') ?>
<?php print _('Graphics') ?>
</a></b>
<b><a class="top-<?php if($TAB == 'STATS' ) echo 'selected-' ?>link" href="/list/stats/">
<?php print _('Statistics') ?>
<?php print _('Statistics') ?>
</a></b>
<b><a class="top-<?php if($TAB == 'LOG' ) echo 'selected-' ?>link" href="/list/log/">
<?php print _('Log') ?>
<?php print _('Log') ?>
</a></b>
<b><a class="top-<?php if($TAB == 'SERVICES' ) echo 'selected-' ?>link" href="/list/services/">
<?php print _('Services') ?>
<?php print _('Services') ?>
</a></b>
<b><a class="top-<?php if($TAB == 'UPDATES' ) echo 'selected-' ?>link" href="/list/updates/">
<?php print _('Updates') ?>
<?php print _('Updates') ?>
</a></b>
</td>
<td style="border-bottom: 1px solid #c4c4c4; height: 26px; text-align: right; border-right: 1px solid #c4c4c4; padding: 0 24px 0 0px; weight:120px">

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

@ -103,11 +103,13 @@
<select class="vst-list" name="v_ip">
<?php
foreach ($ips as $key => $value) {
echo "\t\t\t\t<option value=\"".$key."\"";
if ((!empty($v_ip)) && ( $key == $_POST['v_ip'])){
$display_ip = $key;
if (!empty($value['NAT'])) $display_ip = $value['NAT'];
echo "\t\t\t\t<option value=\"".$display_ip."\"";
if ((!empty($v_ip)) && ( $display_ip == $_POST['v_ip'])){
echo ' selected';
}
echo ">".$key."</option>\n";
echo ">".$display_ip."</option>\n";
}
?>
</select>

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

@ -95,12 +95,14 @@
<select class="vst-list" name="v_ip">
<?php
foreach ($ips as $key => $value) {
echo "\n\t\t\t\t\t\t\t\t\t\t<option value=\"".$key."\"";
$skey = "'".$key."'";
if ((!empty($v_ip)) && ( $key == $v_ip ) || ( $skey == $v_ip )){
$display_ip = $key;
if (!empty($value['NAT'])) $display_ip = $value['NAT'];
$skey = "'".$display_ip."'";
echo "\n\t\t\t\t\t\t\t\t\t\t\t\t<option value=\"".$display_ip."\"";
if ((!empty($v_ip)) && ( $display_ip == $v_ip ) || ( $skey == $v_ip )){
echo ' selected';
}
echo ">".$key."</option>\n";
echo ">".$display_ip."</option>\n";
}
?>
</select>

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

@ -9,16 +9,16 @@
<tr>
<td style="border-bottom: 1px solid #c4c4c4; height: 26px; border-left: 1px solid #c4c4c4; padding: 0 0 0 0px">
<b><a class="top-<?php if($TAB == 'STATS' ) echo 'selected-' ?>link" href="/list/stats/">
<?php print _('Statistics') ?>
<?php print _('Statistics') ?>
</a></b>
<b><a class="top-<?php if($TAB == 'LOG' ) echo 'selected-' ?>link" href="/list/log/">
<?php print _('Log') ?>
<?php print _('Log') ?>
</a></b>
</td>
<td style="border-bottom: 1px solid #c4c4c4; height: 26px; text-align: right; border-right: 1px solid #c4c4c4; padding: 0 24px 0 0px; weight:120px">
<b><?php if($user != $_SESSION['user']) echo 'admin / ' ?><?php echo $user ?></b>
<a class="top-link" style="padding: 5px 0px 5px 2px; border:0px" href="/logout/">
<?php print _('Log out') ?>
<?php print _('Log out') ?>
</a>
</td>
</tr>
@ -41,12 +41,12 @@
<a class="nav-lnk" href="/list/web/">
<span class="nav-<?php if($TAB == 'WEB' ) echo 'selected-' ?>block">
<p class="nav-<?php if($TAB == 'WEB' ) echo 'selected-' ?>header">
<?php print _('WEB');?>
<?php print _('WEB');?>
</p>
<p class="nav-counters" style="decoration: none;">
<?php print _('domains');?>: <? echo $panel[$user]['U_WEB_DOMAINS']?><br>
<?php print _('aliases');?>: <? echo $panel[$user]['U_WEB_ALIASES']?><br>
<?php print _('spnd');?>: <? echo $panel[$user]['SUSPENDED_WEB']?>
<?php print _('spnd');?>: <? echo $panel[$user]['SUSPENDED_WEB']?>
</p>
</span>
</a>
@ -54,12 +54,12 @@
<a class="nav-lnk" href="/list/dns/">
<span class="nav-<?php if($TAB == 'DNS' ) echo 'selected-' ?>block">
<p class="nav-<?php if($TAB == 'DNS' ) echo 'selected-' ?>header">
<?php print _('DNS');?>
<?php print _('DNS');?>
</p>
<p class="nav-counters" style="decoration: none;">
<?php print _('domains');?>: <? echo $panel[$user]['U_DNS_DOMAINS']?><br>
<?php print _('records');?>: <? echo $panel[$user]['U_DNS_RECORDS']?><br>
<?php print _('spnd');?>: <? echo $panel[$user]['SUSPENDED_DNS']?>
<?php print _('spnd');?>: <? echo $panel[$user]['SUSPENDED_DNS']?>
</p>
</span>
</a>
@ -67,12 +67,12 @@
<a class="nav-lnk" href="/list/mail/">
<span class="nav-<?php if($TAB == 'MAIL' ) echo 'selected-' ?>block">
<p class="nav-<?php if($TAB == 'MAIL' ) echo 'selected-' ?>header">
<?php print _('MAIL');?>
<?php print _('MAIL');?>
</p>
<p class="nav-counters" style="decoration: none;">
<?php print _('domains');?>: <? echo $panel[$user]['U_MAIL_DOMAINS']?><br>
<?php print _('accounts');?>: <? echo $panel[$user]['U_MAIL_ACCOUNTS']?><br>
<?php print _('spnd');?>: <? echo $panel[$user]['SUSPENDED_MAIL']?>
<?php print _('spnd');?>: <? echo $panel[$user]['SUSPENDED_MAIL']?>
</p>
</span>
</a>
@ -80,11 +80,11 @@
<a class="nav-lnk" href="/list/db/">
<span class="nav-<?php if($TAB == 'DB' ) echo 'selected-' ?>block">
<p class="nav-<?php if($TAB == 'DB' ) echo 'selected-' ?>header">
<?php print _('DB');?>
<?php print _('DB');?>
</p>
<p class="nav-counters" style="decoration: none;">
<?php print _('databases');?>: <? echo $panel[$user]['U_DATABASES']?><br>
<?php print _('spnd');?>: <? echo $panel[$user]['SUSPENDED_DB']?>
<?php print _('spnd');?>: <? echo $panel[$user]['SUSPENDED_DB']?>
</p>
</span>
</a>
@ -92,11 +92,11 @@
<a class="nav-lnk" href="/list/cron/">
<span class="nav-<?php if($TAB == 'CRON' ) echo 'selected-' ?>block">
<p class="nav-<?php if($TAB == 'CRON' ) echo 'selected-' ?>header">
<?php print _('CRON');?>
<?php print _('CRON');?>
</p>
<p class="nav-counters" style="decoration: none;">
<?php print _('jobs');?>: <? echo $panel[$user]['U_CRON_JOBS']?><br>
<?php print _('spnd');?>: <? echo $panel[$user]['SUSPENDED_CRON']?>
<?php print _('spnd');?>: <? echo $panel[$user]['SUSPENDED_CRON']?>
</p>
</span>
</a>
@ -104,7 +104,7 @@
<a class="nav-lnk" href="/list/backup/">
<span class="nav-<?php if($TAB == 'BACKUP' ) echo 'selected-' ?>block">
<p class="nav-<?php if($TAB == 'BACKUP' ) echo 'selected-' ?>header">
<?php print _('BACKUP');?>
<?php print _('BACKUP');?>
</p>
<p class="nav-counters" style="decoration: none;">
<?php print _('backups');?>: <? echo $panel[$user]['U_BACKUPS']?><br>