mirrors/pfsense
2
0
Fork 0
mirror of https://github.com/pfsense/pfsense.git synced 2025-10-26 11:38:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #903 from phildd/RELENG_2_1

Browse Source 
Releng 2 1 Enhance interface gateway data entry descriptions
This commit is contained in:
Ermal Luçi 2014-02-19 08:54:43 +01:00
commit 63fd577307
3 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
etc/rc.initial.setlanip
View File

@ -306,8 +306,8 @@ function console_configure_ip_address($version) {
$subnet = gen_subnet($intip, $intbits);
}
do {
echo "\n" . sprintf(gettext("Enter the new %s %s gateway address. Press <ENTER> for none:"),
$upperifname, $label_IPvX) . "\n> ";
echo "\n" . sprintf(gettext("For a WAN, enter the new %s %s upstream gateway address."), $upperifname, $label_IPvX) . "\n" .
gettext("For a LAN, press <ENTER> for none:") . "\n> ";
$gwip = chop(fgets($fp));
$is_ipaddr = ($version === 6) ? is_ipaddrv6($gwip) : is_ipaddrv4($gwip);
$is_in_subnet = $is_ipaddr && ip_in_subnet($gwip, $subnet . "/" . $intbits);

12
usr/local/www/interfaces.php
View File

@ -4,7 +4,7 @@
interfaces.php
Copyright (C) 2004-2008 Scott Ullrich
Copyright (C) 2006 Daniel S. Haischt.
Copyright (C) 2008-2010 Ermal Lu<EFBFBD>i
Copyright (C) 2008-2010 Ermal Luci
All rights reserved.
originally part of m0n0wall (http://m0n0.ch/wall)
@ -1546,7 +1546,7 @@ $types6 = array("none" => gettext("None"), "staticv6" => gettext("Static IPv6"),
</td>
</tr>
<tr>
<td width="22%" valign="top" class="vncell"><?=gettext("Gateway"); ?></td>
<td width="22%" valign="top" class="vncell"><?=gettext("IPv4 Upstream Gateway"); ?></td>
<td width="78%" class="vtable">
<select name="gateway" class="formselect" id="gateway">
<option value="none" selected="selected"><?=gettext("None"); ?></option>
@ -1567,7 +1567,8 @@ $types6 = array("none" => gettext("None"), "staticv6" => gettext("Static IPv6"),
- or <strong><a onclick="show_add_gateway();" href="#gatewaysection"><?=gettext("add a new one."); ?></a></strong>
<br/>
<div id='addgwbox'>
<?=gettext("If this interface is an Internet connection, select an existing Gateway from the list or add one using the link above"); ?>
<?=gettext("If this interface is an Internet connection, select an existing Gateway from the list or add a new one using the link above."); ?><br/>
<?=gettext("On local LANs the upstream gateway should be \"none\"."); ?>
</div>
<div id='notebox'>
</div>
@ -1651,7 +1652,7 @@ $types6 = array("none" => gettext("None"), "staticv6" => gettext("Static IPv6"),
</td>
</tr>
<tr>
<td width="22%" valign="top" class="vncell"><?=gettext("Gateway IPv6"); ?></td>
<td width="22%" valign="top" class="vncell"><?=gettext("IPv6 Upstream Gateway"); ?></td>
<td width="78%" class="vtable">
<select name="gatewayv6" class="formselect" id="gatewayv6">
<option value="none" selected="selected"><?=gettext("None"); ?></option>
@ -1672,7 +1673,8 @@ $types6 = array("none" => gettext("None"), "staticv6" => gettext("Static IPv6"),
- or <strong><a onclick="show_add_gateway_v6();" href="#gatewayv6section"><?=gettext("add a new one."); ?></a></strong>
<br/>
<div id='addgwboxv6'>
<?=gettext("If this interface is an Internet connection, select an existing Gateway from the list or add a new one using the link above"); ?>
<?=gettext("If this interface is an Internet connection, select an existing Gateway from the list or add a new one using the link above."); ?><br/>
<?=gettext("On local LANs the upstream gateway should be \"none\"."); ?>
</div>
<div id='noteboxv6'>
</div>

4
usr/local/www/wizards/setup_wizard.xml
View File

@ -193,7 +193,7 @@
<option>
<name>Static</name>
<value>Static</value>
<enablefields>ipaddress,subnetmask,gateway</enablefields>
<enablefields>ipaddress,subnetmask,upstreamgateway</enablefields>
</option>
<option>
<name>DHCP</name>
@ -262,7 +262,7 @@
<type>subnet_select</type>
</field>
<field>
<name>Gateway</name>
<name>Upstream Gateway</name>
<bindstofield>wizardtemp->wangateway</bindstofield>
<type>input</type>
<validate>^(?:(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.){3}(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)$</validate>