summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChris Buechler <cmb@pfsense.org>2016-02-12 01:54:37 -0600
committerChris Buechler <cmb@pfsense.org>2016-02-12 01:54:37 -0600
commit99a05a0a051c7722f800b5ed0f6560ec8d5fbda0 (patch)
tree10d1a24cf0dd0cade7c89553a38ab69175c83ccf
parentb913daf800a9e91f0f4819a7a0c8678dfe30b95f (diff)
downloadpfsense-99a05a0a051c7722f800b5ed0f6560ec8d5fbda0.zip
pfsense-99a05a0a051c7722f800b5ed0f6560ec8d5fbda0.tar.gz
Delete URL table file when deleting an alias. Ticket #5856
-rw-r--r--src/usr/local/www/firewall_aliases.php4
1 files changed, 4 insertions, 0 deletions
diff --git a/src/usr/local/www/firewall_aliases.php b/src/usr/local/www/firewall_aliases.php
index 4f422dd..a07da68 100644
--- a/src/usr/local/www/firewall_aliases.php
+++ b/src/usr/local/www/firewall_aliases.php
@@ -132,6 +132,10 @@ if ($_GET['act'] == "del") {
if ($is_alias_referenced == true) {
$savemsg = sprintf(gettext("Cannot delete alias. Currently in use by %s"), htmlspecialchars($referenced_by));
} else {
+ if (preg_match("/urltable/i", $a_aliases[$_GET['id']]['type'])) {
+ // this is a URL table type alias, delete its file as well
+ unlink_if_exists("/var/db/aliastables/" . $a_aliases[$_GET['id']]['name'] . ".txt");
+ }
unset($a_aliases[$_GET['id']]);
if (write_config()) {
filter_configure();
OpenPOWER on IntegriCloud