From 21ecdb718a92c25bc1c95aa8ee78df9af947ab6e Mon Sep 17 00:00:00 2001
From: Bob Mottram <bob@freedombone.net>
Date: Sat, 15 Apr 2017 10:59:13 +0100
Subject: [PATCH] Wildcards
---
src/freedombone-controlpanel | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/src/freedombone-controlpanel b/src/freedombone-controlpanel
index 7ce68ae1a..e97996748 100755
--- a/src/freedombone-controlpanel
+++ b/src/freedombone-controlpanel
@@ -1865,7 +1865,7 @@ function domain_blocking_add {
0)
blocked_domain=$(<$data)
if [ ${#blocked_domain} -gt 2 ]; then
- if [[ "${blocked_domain}" == '.' ]]; then
+ if [[ "${blocked_domain}" == *'.'* ]]; then
firewall_block_domain $blocked_domain
dialog --title $"Block a domain" \
--msgbox $"The domain $blocked_domain has been blocked" 6 40
@@ -1886,7 +1886,7 @@ function domain_blocking_remove {
0)
unblocked_domain=$(<$data)
if [ ${#unblocked_domain} -gt 2 ]; then
- if [[ "${unblocked_domain}" == '.' ]]; then
+ if [[ "${unblocked_domain}" == *'.'* ]]; then
firewall_unblock_domain $unblocked_domain
dialog --title $"Unblock a domain" \
--msgbox $"The domain $unblocked_domain has been unblocked" 6 40
@@ -1901,6 +1901,9 @@ function domain_blocking_show {
clear
cat $FIREWALL_DOMAINS | sort
any_key
+ else
+ dialog --title $"Show blocked domains" \
+ --msgbox $"No domains are currently blocked" 6 40
fi
}
--
GitLab