summaryrefslogtreecommitdiffstats
path: root/usr
diff options
context:
space:
mode:
authorErmal <eri@pfsense.org>2010-03-18 23:12:17 +0000
committerErmal <eri@pfsense.org>2010-03-18 23:12:17 +0000
commit9ae9a7fcc2cdbe2cc1b5300d4b6e533a9e1781d1 (patch)
treea51855e37032a39a6a81bef1c76926b7c5e538f0 /usr
parent6c33fb4b6d02d91f2903f7fc5390b48df7f712ac (diff)
downloadpfsense-9ae9a7fcc2cdbe2cc1b5300d4b6e533a9e1781d1.zip
pfsense-9ae9a7fcc2cdbe2cc1b5300d4b6e533a9e1781d1.tar.gz
Unbreak ranges.
Diffstat (limited to 'usr')
-rwxr-xr-xusr/local/www/firewall_aliases_edit.php2
-rwxr-xr-xusr/local/www/firewall_aliases_import.php2
2 files changed, 2 insertions, 2 deletions
diff --git a/usr/local/www/firewall_aliases_edit.php b/usr/local/www/firewall_aliases_edit.php
index 31a9d83..0ca8c1e 100755
--- a/usr/local/www/firewall_aliases_edit.php
+++ b/usr/local/www/firewall_aliases_edit.php
@@ -237,7 +237,7 @@ if ($_POST) {
if (is_iprange($_POST["address{$x}"])) {
list($startip, $endip) = explode('-', $_POST["address{$x}"]);
$rangesubnets = ip_range_to_subnet_array($startip, $endip);
- array_merge($address, $rangesubnets); //$address .= implode($rangesubnets, ' ');
+ $address = array_merge($address, $rangesubnets);
} else {
$tmpaddress = $_POST["address{$x}"];
if(($_POST['type'] == "network" || is_ipaddr($_POST["address{$x}"])) && $_POST["address_subnet{$x}"] <> "")
diff --git a/usr/local/www/firewall_aliases_import.php b/usr/local/www/firewall_aliases_import.php
index b479d6a..fdc8a65 100755
--- a/usr/local/www/firewall_aliases_import.php
+++ b/usr/local/www/firewall_aliases_import.php
@@ -88,7 +88,7 @@ if($_POST['aliasimport'] <> "") {
if (is_iprange($impip)) {
list($startip, $endip) = explode('-', $impip);
$rangesubnets = ip_range_to_subnet_array($startip, $endip);
- $address .= implode($rangesubnets, ' ');
+ $address .= implode(" ", $rangesubnets);
} else if (!is_ipaddr($impip) && !is_subnet($impip) && !empty($impip)) {
$input_errors[] = "$impip is not an IP address. Please correct the error to continue";
} elseif (!empty($impip)) {
OpenPOWER on IntegriCloud