Ticket #338. Remove aliases_sort function and keep the list always sorted in config.xml. This reverts to previous behaviour.

1 files changed, 4 insertions, 2 deletions

diff --git a/usr/local/www/firewall_aliases_import.php b/usr/local/www/firewall_aliases_import.php
index 0f26edb..3f09243 100755
--- a/usr/local/www/firewall_aliases_import.php
+++ b/usr/local/www/firewall_aliases_import.php
@@ -51,8 +51,6 @@ $reserved_keywords = array_merge($reserved_keywords, $reserved_ifs);
 
 if (!is_array($config['aliases']['alias']))
         $config['aliases']['alias'] = array();
-
-aliases_sort();
 $a_aliases = &$config['aliases']['alias'];
 
 if($_POST['aliasimport'] <> "") {
@@ -97,6 +95,10 @@ if($_POST['aliasimport'] <> "") {
 		$alias['type'] = "network";
 		$alias['descr'] = $_POST['descr'];
 		$a_aliases[] = $alias;
+
+		// Sort list
+		$a_aliases = msort($a_aliases, "name");
+
 		write_config();
 		
 		pfSenseHeader("firewall_aliases.php");