diff options
| author | Renato Botelho <renato.botelho@bluepex.com> | 2010-08-12 12:55:32 -0300 |
|---|---|---|
| committer | Renato Botelho <renato.botelho@bluepex.com> | 2010-08-12 12:55:32 -0300 |
| commit | e73b001e2585b55973faaf0be199a5f438c4ae89 (patch) | |
| tree | 6dc08100313fe95ab4ca2dfa9883c23152dd4538 /usr/local/www/services_dhcp.php | |
| parent | 3e6ec5dfba9679f6b521962269aca9570e391abb (diff) | |
| parent | 3e4f5a3359ebcc46710f37466620d0c0cdfd7293 (diff) | |
| download | pfsense-e73b001e2585b55973faaf0be199a5f438c4ae89.zip pfsense-e73b001e2585b55973faaf0be199a5f438c4ae89.tar.gz | |
Merge remote branch 'mainline/master'
Conflicts:
usr/local/www/diag_smart.php
usr/local/www/firewall_rules_edit.php
usr/local/www/interfaces.php
usr/local/www/load_balancer_pool_edit.php
usr/local/www/pkg_mgr_settings.php
Diffstat (limited to 'usr/local/www/services_dhcp.php')
| -rwxr-xr-x | usr/local/www/services_dhcp.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/usr/local/www/services_dhcp.php b/usr/local/www/services_dhcp.php index 729f324..086e38d 100755 --- a/usr/local/www/services_dhcp.php +++ b/usr/local/www/services_dhcp.php @@ -248,7 +248,7 @@ if ($_POST) { foreach($config['virtualip']['vip'] as $vip) { if($vip['interface'] == $if) if($vip['subnet'] && is_inrange($vip['subnet'], $_POST['range_from'], $_POST['range_to'])) - $input_errors[] = printf(gettext("The subnet range cannot overlap with virtual IP address %s."),$vip['subnet']); + $input_errors[] = sprintf(gettext("The subnet range cannot overlap with virtual IP address %s."),$vip['subnet']); } } @@ -274,7 +274,7 @@ if ($_POST) { /* make sure that the DHCP Relay isn't enabled on this interface */ if (isset($config['dhcrelay'][$if]['enable'])) - $input_errors[] = printf(gettext("You must disable the DHCP relay on the %s interface before enabling the DHCP server."),$iflist[$if]); + $input_errors[] = sprintf(gettext("You must disable the DHCP relay on the %s interface before enabling the DHCP server."),$iflist[$if]); } } |
