From 7c9d8d71fe111be3d3d2354857f1c147568ab447 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ermal=20Lu=E7i?= Date: Sat, 28 Nov 2009 07:28:43 +0000 Subject: Please pretty please use the interfaces function rather than than growing yet again the horrendous custom made things. Thank you. Ticket #141 --- usr/local/www/firewall_aliases_edit.php | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'usr/local/www/firewall_aliases_edit.php') diff --git a/usr/local/www/firewall_aliases_edit.php b/usr/local/www/firewall_aliases_edit.php index ef21ed1..307a544 100755 --- a/usr/local/www/firewall_aliases_edit.php +++ b/usr/local/www/firewall_aliases_edit.php @@ -46,15 +46,16 @@ $pgtitle = array("Firewall","Aliases","Edit"); // Keywords not allowed in names -$reserved_keywords = array("pass", "out", "queue", "max", "min", "lan", "wan"); -for ($j = 1; isset($config['interfaces']['opt' . $j]); $j++) - $reserved_keywords[] = "opt{$j}"; +$reserved_keywords = array("pass", "out", "queue", "max", "min"); require("guiconfig.inc"); require_once("functions.inc"); require_once("filter.inc"); require_once("shaper.inc"); +$reserved_ifs = get_configured_interface_list(false, true); +$reserved_keywords = array_merge($reserved_keywords, $reserved_ifs); + if (!is_array($config['aliases']['alias'])) $config['aliases']['alias'] = array(); @@ -661,4 +662,4 @@ function process_alias_tgz($temp_filename) { fclose($fd); } -?> \ No newline at end of file +?> -- cgit v1.1