diff options
| author | Renato Botelho <renato.botelho@bluepex.com> | 2010-08-03 10:54:45 -0300 |
|---|---|---|
| committer | Renato Botelho <renato.botelho@bluepex.com> | 2010-08-03 10:54:45 -0300 |
| commit | f16ba51e6de4e3760d49a3e1e82a41e809bf9d09 (patch) | |
| tree | 4856af8615fbcd40013b11f7e33cc391e109c39c /usr/local/www/services_dhcp_edit.php | |
| parent | 97fc77679d3b269803d7d7cdcec941cc42ee1694 (diff) | |
| parent | 073a2697dd86a8dece8dafa28b71084a547ba31e (diff) | |
| download | pfsense-f16ba51e6de4e3760d49a3e1e82a41e809bf9d09.zip pfsense-f16ba51e6de4e3760d49a3e1e82a41e809bf9d09.tar.gz | |
Merge remote branch 'mainline/master'
Conflicts:
usr/local/www/services_dhcp_edit.php
Diffstat (limited to 'usr/local/www/services_dhcp_edit.php')
| -rwxr-xr-x | usr/local/www/services_dhcp_edit.php | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/usr/local/www/services_dhcp_edit.php b/usr/local/www/services_dhcp_edit.php index 202f4e5..26d3580 100755 --- a/usr/local/www/services_dhcp_edit.php +++ b/usr/local/www/services_dhcp_edit.php @@ -72,7 +72,7 @@ if (!is_array($config['dhcpd'][$if]['staticmap'])) { $config['dhcpd'][$if]['staticmap'] = array(); } -$static_map_enabled=isset($config['dhcpd'][$if]['staticarp']); +$static_arp_enabled=isset($config['dhcpd'][$if]['staticarp']); $a_maps = &$config['dhcpd'][$if]['staticmap']; $ifcfgip = get_interface_ip($if); @@ -123,8 +123,8 @@ if ($_POST) { if (($_POST['mac'] && !is_macaddr($_POST['mac']))) { $input_errors[] = gettext("A valid MAC address must be specified."); } - if($static_map_enabled && !$_POST['ipaddr']) { - $input_errors[] = gettext("Static map is enabled. You must specify an IP address."); + if($static_arp_enabled && !$_POST['ipaddr']) { + $input_errors[] = gettext("Static ARP is enabled. You must specify an IP address."); } /* check for overlaps */ |
