Browse Source

Wildcards

Bob Mottram 8 years ago
parent
commit
21ecdb718a
1 changed files with 5 additions and 2 deletions
  1. 5
    2
      src/freedombone-controlpanel

+ 5
- 2
src/freedombone-controlpanel View File

1865
         0)
1865
         0)
1866
             blocked_domain=$(<$data)
1866
             blocked_domain=$(<$data)
1867
             if [ ${#blocked_domain} -gt 2 ]; then
1867
             if [ ${#blocked_domain} -gt 2 ]; then
1868
-                if [[ "${blocked_domain}" == '.'  ]]; then
1868
+                if [[ "${blocked_domain}" == *'.'* ]]; then
1869
                     firewall_block_domain $blocked_domain
1869
                     firewall_block_domain $blocked_domain
1870
                     dialog --title $"Block a domain" \
1870
                     dialog --title $"Block a domain" \
1871
                            --msgbox $"The domain $blocked_domain has been blocked" 6 40
1871
                            --msgbox $"The domain $blocked_domain has been blocked" 6 40
1886
         0)
1886
         0)
1887
             unblocked_domain=$(<$data)
1887
             unblocked_domain=$(<$data)
1888
             if [ ${#unblocked_domain} -gt 2 ]; then
1888
             if [ ${#unblocked_domain} -gt 2 ]; then
1889
-                if [[ "${unblocked_domain}" == '.'  ]]; then
1889
+                if [[ "${unblocked_domain}" == *'.'* ]]; then
1890
                     firewall_unblock_domain $unblocked_domain
1890
                     firewall_unblock_domain $unblocked_domain
1891
                     dialog --title $"Unblock a domain" \
1891
                     dialog --title $"Unblock a domain" \
1892
                            --msgbox $"The domain $unblocked_domain has been unblocked" 6 40
1892
                            --msgbox $"The domain $unblocked_domain has been unblocked" 6 40
1901
         clear
1901
         clear
1902
         cat $FIREWALL_DOMAINS | sort
1902
         cat $FIREWALL_DOMAINS | sort
1903
         any_key
1903
         any_key
1904
+    else
1905
+        dialog --title $"Show blocked domains" \
1906
+               --msgbox $"No domains are currently blocked" 6 40
1904
     fi
1907
     fi
1905
 }
1908
 }
1906
 
1909