diff options
| author | Simon Cornelius P. Umacob <simoncpu@gmail.com> | 2009-01-20 15:52:39 +0800 |
|---|---|---|
| committer | Simon Cornelius P. Umacob <simoncpu@gmail.com> | 2009-01-20 15:52:39 +0800 |
| commit | f193cf92b2c925a2f3f71a713d766efd1e4d81e0 (patch) | |
| tree | c02f02076434ddf76d0892a06a66ad0969cbe70e /usr/local/www/system.php | |
| parent | 1f9f2a95b7b42cf33e730535092e56e214fdb848 (diff) | |
| download | pfsense-f193cf92b2c925a2f3f71a713d766efd1e4d81e0.zip pfsense-f193cf92b2c925a2f3f71a713d766efd1e4d81e0.tar.gz | |
Merge IPv6 changes
Diffstat (limited to 'usr/local/www/system.php')
| -rwxr-xr-x | usr/local/www/system.php | 18 |
1 files changed, 16 insertions, 2 deletions
diff --git a/usr/local/www/system.php b/usr/local/www/system.php index fe466da..650c797 100755 --- a/usr/local/www/system.php +++ b/usr/local/www/system.php @@ -38,6 +38,7 @@ require("guiconfig.inc"); +require_once("IPv6.inc"); $pconfig['hostname'] = $config['system']['hostname']; $pconfig['domain'] = $config['system']['domain']; @@ -110,12 +111,25 @@ if ($_POST) { if ($_POST['domain'] && !is_domain($_POST['domain'])) { $input_errors[] = "The domain may only contain the characters a-z, 0-9, '-' and '.'."; } + /* if (($_POST['dns1'] && !is_ipaddr($_POST['dns1'])) || ($_POST['dns2'] && !is_ipaddr($_POST['dns2']))) { $input_errors[] = "A valid IP address must be specified for the primary/secondary DNS server."; } if (($_POST['dns3'] && !is_ipaddr($_POST['dns3'])) || ($_POST['dns4'] && !is_ipaddr($_POST['dns4']))) { $input_errors[] = "A valid IP address must be specified for the primary/secondary DNS server."; } + */ + + if ( + $_POST['dns1'] && !is_ipaddr($_POST['dns1']) && !Net_IPv6::checkIPv6($_POST['dns1']) || + $_POST['dns2'] && !is_ipaddr($_POST['dns2']) && !Net_IPv6::checkIPv6($_POST['dns2']) || + $_POST['dns3'] && !is_ipaddr($_POST['dns3']) && !Net_IPv6::checkIPv6($_POST['dns3']) || + $_POST['dns4'] && !is_ipaddr($_POST['dns4']) && !Net_IPv6::checkIPv6($_POST['dns4']) + ) { + $input_errors[] = "A valid IPv4/IPv6 address must be specified for the primary/secondary DNS server."; + } + + if ($_POST['webguiport'] && (!is_numericint($_POST['webguiport']) || ($_POST['webguiport'] < 1) || ($_POST['webguiport'] > 65535))) { $input_errors[] = "A valid TCP/IP port must be specified for the webConfigurator port."; @@ -253,7 +267,7 @@ include("head.inc"); <td width="78%" class="vtable"> <input name="domain" type="text" class="formfld unknown" id="domain" size="40" value="<?=htmlspecialchars($pconfig['domain']);?>"> <br/> <span class="vexpl"> - e.g. <em>mycorp.com</em> + e.g. <em>example.com</em> </span> </td> </tr> @@ -307,7 +321,7 @@ include("head.inc"); </table> <br> <span class="vexpl"> - IP addresses; these are also used for the DHCP + IPv4/IPv6 addresses; these are also used for the DHCP service, DNS forwarder and for PPTP VPN clients. <br/> <?php if($multiwan): ?> |
