From 3b07f4feaf35e70700082240ef03966f74f5df97 Mon Sep 17 00:00:00 2001 From: NOYB Date: Tue, 24 May 2016 13:39:09 -0700 Subject: Firewall / Aliases / Edit - New URL Table Alias Type Need to pass alias type to process_alias_urltable() function when creating a new url table alias because it is not yet set/available from config. So the alias_get_type() function can't be successfully used yet. --- src/etc/inc/pfsense-utils.inc | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'src/etc/inc/pfsense-utils.inc') diff --git a/src/etc/inc/pfsense-utils.inc b/src/etc/inc/pfsense-utils.inc index 71219fb..86f4a51 100644 --- a/src/etc/inc/pfsense-utils.inc +++ b/src/etc/inc/pfsense-utils.inc @@ -2150,7 +2150,7 @@ function pfs_version_compare($cur_time, $cur_text, $remote) { } return $v; } -function process_alias_urltable($name, $url, $freq, $forceupdate=false, $validateonly=false) { +function process_alias_urltable($name, $type, $url, $freq, $forceupdate=false, $validateonly=false) { global $g, $config; $urltable_prefix = "/var/db/aliastables/"; @@ -2177,7 +2177,8 @@ function process_alias_urltable($name, $url, $freq, $forceupdate=false, $validat if (download_file($url, $tmp_urltable_filename, $verify_ssl)) { // Convert lines that begin with '$' or ';' to comments '#' instead of deleting them. mwexec("/usr/bin/sed -i \"\" -E 's/^[[:space:]]*($|#|;)/#/g; /^#/!s/\;.*//g;' ". escapeshellarg($tmp_urltable_filename)); - if (alias_get_type($name) == "urltable_ports") { + $type = ($type) ? $type : alias_get_type($name); // If empty type passed, try to get it from config. + if ($type == "urltable_ports") { $ports = parse_aliases_file($tmp_urltable_filename, "url_ports", "-1", true); $ports = group_ports($ports, true); file_put_contents($urltable_filename, implode("\n", $ports)); -- cgit v1.1