Ticket #1711 fixes

2 files changed, 9 insertions, 1 deletions

diff --git a/usr/local/www/firewall_aliases_edit.php b/usr/local/www/firewall_aliases_edit.php
index 05dafec..402fd87 100755
--- a/usr/local/www/firewall_aliases_edit.php
+++ b/usr/local/www/firewall_aliases_edit.php
@@ -50,7 +50,11 @@ if (isset($id) && $a_aliases[$id]) {
 	$pconfig['detail'] = $a_aliases[$id]['detail'];
 	$pconfig['address'] = $a_aliases[$id]['address'];
 	$pconfig['descr'] = html_entity_decode($a_aliases[$id]['descr']);
-	
+
+	for ($i = 1; isset($config['interfaces']['opt' . $i]); $i++) 
+		if($config['interfaces']['opt' . $i]['descr'] == $pconfig['descr']) 
+			$input_errors[] = "Sorry, an interface is already named {$pconfig['descr']}.";
+
 	$addresses = explode(' ', $pconfig['address']);
 	$address = explode("/", $addresses[0]);
 	if ($address[1])
diff --git a/usr/local/www/interfaces_opt.php b/usr/local/www/interfaces_opt.php
index f40d7c5..d47664c 100755
--- a/usr/local/www/interfaces_opt.php
+++ b/usr/local/www/interfaces_opt.php
@@ -55,6 +55,10 @@ $a_gateways = &$config['gateways']['gateway_item'];
 $optcfg = &$config['interfaces']['opt' . $index];
 $optcfg['descr'] = remove_bad_chars($optcfg['descr']);
 
+foreach($config['aliases']['alias'] as $alias) 
+	if($alias['name'] == $optcfg['descr']) 
+		$input_errors[] = gettext("Sorry, an alias with the name {$optcfg['descr']} already exists.");
+
 $pconfig['descr'] = $optcfg['descr'];
 $pconfig['bridge'] = $optcfg['bridge'];