From 28fcddcdd68cf6c72119305462696a1bb6dae0b8 Mon Sep 17 00:00:00 2001
From: jim-p <jim@pingle.org>
Date: Fri, 12 Mar 2010 17:00:32 -0500
Subject: Fix alias importing. Resolves #422

---
 usr/local/www/firewall_aliases_import.php | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

(limited to 'usr/local/www/firewall_aliases_import.php')

diff --git a/usr/local/www/firewall_aliases_import.php b/usr/local/www/firewall_aliases_import.php
index 3f09243..5949529 100755
--- a/usr/local/www/firewall_aliases_import.php
+++ b/usr/local/www/firewall_aliases_import.php
@@ -81,16 +81,21 @@ if($_POST['aliasimport'] <> "") {
         }
 
 	if ($_POST['aliasimport']) {
-		$toimport = split("\n", $_POST['aliasimport']);
-		foreach ($toimport as $impip) {
-			if (!is_ipaddr(trim($impip)) && !is_subnet(trim($impip)))
+		$tocheck = explode("\n", $_POST['aliasimport']);
+		$imported = array();
+		foreach ($tocheck as $impip) {
+			$impip = trim($impip);
+			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)) {
+				$imported[] = $impip;
+			}
 		}
 	}
 
-	if (!$input_errors) {			
+	if (!$input_errors && is_array($imported)) {
 		$alias = array();
-		$alias['address'] = str_replace("\n", " ", $_POST['aliasimport']);
+		$alias['address'] = implode(" ", $imported);
 		$alias['name'] = $_POST['name'];
 		$alias['type'] = "network";
 		$alias['descr'] = $_POST['descr'];
-- 
cgit v1.1