diff options
| author | Ermal Luçi <eri@pfsense.org> | 2013-12-30 00:07:21 -0800 |
|---|---|---|
| committer | Ermal Luçi <eri@pfsense.org> | 2013-12-30 00:07:21 -0800 |
| commit | 737f26e9d6e389b16b8df8716383ac9e126996e0 (patch) | |
| tree | 7b61640af9ae8bd7441b4580df214e145317c49b | |
| parent | ef1c9f095def20fb48a7bc174b4f7562619b39cb (diff) | |
| parent | 54e81df0d3d6f1650c0bde8b74f583f4c0b40488 (diff) | |
| download | pfsense-737f26e9d6e389b16b8df8716383ac9e126996e0.zip pfsense-737f26e9d6e389b16b8df8716383ac9e126996e0.tar.gz | |
Merge pull request #868 from phildd/master
Validate IP address ranges correctly on Alias Bulk Import
| -rwxr-xr-x | usr/local/www/firewall_aliases_import.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/usr/local/www/firewall_aliases_import.php b/usr/local/www/firewall_aliases_import.php index 26e5e2d..bb3218a 100755 --- a/usr/local/www/firewall_aliases_import.php +++ b/usr/local/www/firewall_aliases_import.php @@ -1,7 +1,7 @@ <?php /* $Id$ */ /* - firewall_aliases_edit.php + firewall_aliases_import.php Copyright (C) 2005 Scott Ullrich All rights reserved. @@ -89,7 +89,7 @@ if($_POST['aliasimport'] <> "") { if (is_iprange($impip)) { list($startip, $endip) = explode('-', $impip); $rangesubnets = ip_range_to_subnet_array($startip, $endip); - $address .= implode(" ", $rangesubnets); + $imported = array_merge($imported, $rangesubnets); } else if (!is_ipaddr($impip) && !is_subnet($impip) && !empty($impip)) { $input_errors[] = sprintf(gettext("%s is not an IP address. Please correct the error to continue"), $impip); } elseif (!empty($impip)) { |
