| 
				
			 | 
			
			
				@@ -1857,7 +1857,7 @@ function menu_email { 
			 | 
		
	
		
			
			| 
				1857
			 | 
			
				1857
			 | 
			
			
				 function domain_blocking_add { 
			 | 
		
	
		
			
			| 
				1858
			 | 
			
				1858
			 | 
			
			
				     data=$(tempfile 2>/dev/null) 
			 | 
		
	
		
			
			| 
				1859
			 | 
			
				1859
			 | 
			
			
				     trap "rm -f $data" 0 1 2 5 15 
			 | 
		
	
		
			
			| 
				1860
			 | 
			
				
			 | 
			
			
				-    dialog --title $"Block a domain name" \ 
			 | 
		
	
		
			
			| 
				
			 | 
			
				1860
			 | 
			
			
				+    dialog --title $"Block a domain or user" \ 
			 | 
		
	
		
			
			| 
				1861
			 | 
			
				1861
			 | 
			
			
				            --backtitle $"Freedombone Control Panel" \ 
			 | 
		
	
		
			
			| 
				1862
			 | 
			
				1862
			 | 
			
			
				            --inputbox $"Enter the domain name or GNU Social/postActiv nick@domain that you wish to block" 8 60 "" 2>$data 
			 | 
		
	
		
			
			| 
				1863
			 | 
			
				1863
			 | 
			
			
				     sel=$? 
			 | 
		
	
	
		
			
			| 
				
			 | 
			
			
				@@ -1883,7 +1883,7 @@ function domain_blocking_add { 
			 | 
		
	
		
			
			| 
				1883
			 | 
			
				1883
			 | 
			
			
				 function domain_blocking_remove { 
			 | 
		
	
		
			
			| 
				1884
			 | 
			
				1884
			 | 
			
			
				     data=$(tempfile 2>/dev/null) 
			 | 
		
	
		
			
			| 
				1885
			 | 
			
				1885
			 | 
			
			
				     trap "rm -f $data" 0 1 2 5 15 
			 | 
		
	
		
			
			| 
				1886
			 | 
			
				
			 | 
			
			
				-    dialog --title $"Unblock a domain name" \ 
			 | 
		
	
		
			
			| 
				
			 | 
			
				1886
			 | 
			
			
				+    dialog --title $"Unblock a domain or user" \ 
			 | 
		
	
		
			
			| 
				1887
			 | 
			
				1887
			 | 
			
			
				            --backtitle $"Freedombone Control Panel" \ 
			 | 
		
	
		
			
			| 
				1888
			 | 
			
				1888
			 | 
			
			
				            --inputbox $"Enter the domain name or GNU Social/postActiv nick@domain that you wish to unblock" 8 60 "" 2>$data 
			 | 
		
	
		
			
			| 
				1889
			 | 
			
				1889
			 | 
			
			
				     sel=$? 
			 | 
		
	
	
		
			
			| 
				
			 | 
			
			
				@@ -1910,13 +1910,13 @@ function domain_blocking_show { 
			 | 
		
	
		
			
			| 
				1910
			 | 
			
				1910
			 | 
			
			
				     if [ -f $FIREWALL_DOMAINS ]; then 
			 | 
		
	
		
			
			| 
				1911
			 | 
			
				1911
			 | 
			
			
				         clear 
			 | 
		
	
		
			
			| 
				1912
			 | 
			
				1912
			 | 
			
			
				         echo '' 
			 | 
		
	
		
			
			| 
				1913
			 | 
			
				
			 | 
			
			
				-        echo $'The following domains have been blocked:' 
			 | 
		
	
		
			
			| 
				
			 | 
			
				1913
			 | 
			
			
				+        echo $'The following domains or users have been blocked:' 
			 | 
		
	
		
			
			| 
				1914
			 | 
			
				1914
			 | 
			
			
				         echo '' 
			 | 
		
	
		
			
			| 
				1915
			 | 
			
				1915
			 | 
			
			
				         cat $FIREWALL_DOMAINS | sort 
			 | 
		
	
		
			
			| 
				1916
			 | 
			
				1916
			 | 
			
			
				         any_key 
			 | 
		
	
		
			
			| 
				1917
			 | 
			
				1917
			 | 
			
			
				     else 
			 | 
		
	
		
			
			| 
				1918
			 | 
			
				
			 | 
			
			
				-        dialog --title $"Show blocked domains" \ 
			 | 
		
	
		
			
			| 
				1919
			 | 
			
				
			 | 
			
			
				-               --msgbox $"No domains are currently blocked" 6 40 
			 | 
		
	
		
			
			| 
				
			 | 
			
				1918
			 | 
			
			
				+        dialog --title $"Show blocked domains or users" \ 
			 | 
		
	
		
			
			| 
				
			 | 
			
				1919
			 | 
			
			
				+               --msgbox $"No domains or users are currently blocked" 6 40 
			 | 
		
	
		
			
			| 
				1920
			 | 
			
				1920
			 | 
			
			
				     fi 
			 | 
		
	
		
			
			| 
				1921
			 | 
			
				1921
			 | 
			
			
				 } 
			 | 
		
	
		
			
			| 
				1922
			 | 
			
				1922
			 | 
			
			
				  
			 | 
		
	
	
		
			
			| 
				
			 | 
			
			
				@@ -1926,11 +1926,11 @@ function domain_blocking { 
			 | 
		
	
		
			
			| 
				1926
			 | 
			
				1926
			 | 
			
			
				         data=$(tempfile 2>/dev/null) 
			 | 
		
	
		
			
			| 
				1927
			 | 
			
				1927
			 | 
			
			
				         trap "rm -f $data" 0 1 2 5 15 
			 | 
		
	
		
			
			| 
				1928
			 | 
			
				1928
			 | 
			
			
				         dialog --backtitle $"Freedombone Control Panel" \ 
			 | 
		
	
		
			
			| 
				1929
			 | 
			
				
			 | 
			
			
				-               --title $"Domain Blocking" \ 
			 | 
		
	
		
			
			| 
				
			 | 
			
				1929
			 | 
			
			
				+               --title $"Domain or User Blocking" \ 
			 | 
		
	
		
			
			| 
				1930
			 | 
			
				1930
			 | 
			
			
				                --radiolist $"Choose an operation:" 12 60 4 \ 
			 | 
		
	
		
			
			| 
				1931
			 | 
			
				
			 | 
			
			
				-               1 $"Block a domain" off \ 
			 | 
		
	
		
			
			| 
				1932
			 | 
			
				
			 | 
			
			
				-               2 $"Unblock a domain" off \ 
			 | 
		
	
		
			
			| 
				1933
			 | 
			
				
			 | 
			
			
				-               3 $"Show blocked domains" off \ 
			 | 
		
	
		
			
			| 
				
			 | 
			
				1931
			 | 
			
			
				+               1 $"Block a domain or user" off \ 
			 | 
		
	
		
			
			| 
				
			 | 
			
				1932
			 | 
			
			
				+               2 $"Unblock a domain or user" off \ 
			 | 
		
	
		
			
			| 
				
			 | 
			
				1933
			 | 
			
			
				+               3 $"Show blocked domains and users" off \ 
			 | 
		
	
		
			
			| 
				1934
			 | 
			
				1934
			 | 
			
			
				                4 $"Back to main menu" on 2> $data 
			 | 
		
	
		
			
			| 
				1935
			 | 
			
				1935
			 | 
			
			
				         sel=$? 
			 | 
		
	
		
			
			| 
				1936
			 | 
			
				1936
			 | 
			
			
				         case $sel in 
			 | 
		
	
	
		
			
			| 
				
			 | 
			
			
				@@ -2092,7 +2092,7 @@ function menu_top_level { 
			 | 
		
	
		
			
			| 
				2092
			 | 
			
				2092
			 | 
			
			
				                9 $"Ping enable/disable" off \ 
			 | 
		
	
		
			
			| 
				2093
			 | 
			
				2093
			 | 
			
			
				                10 $"Manage Users" off \ 
			 | 
		
	
		
			
			| 
				2094
			 | 
			
				2094
			 | 
			
			
				                11 $"Email Menu" off \ 
			 | 
		
	
		
			
			| 
				2095
			 | 
			
				
			 | 
			
			
				-               12 $"Domain blocking" off \ 
			 | 
		
	
		
			
			| 
				
			 | 
			
				2095
			 | 
			
			
				+               12 $"Domain or User Blocking" off \ 
			 | 
		
	
		
			
			| 
				2096
			 | 
			
				2096
			 | 
			
			
				                13 $"Security Settings" off \ 
			 | 
		
	
		
			
			| 
				2097
			 | 
			
				2097
			 | 
			
			
				                14 $"Set the main repository (repo mirrors)" off \ 
			 | 
		
	
		
			
			| 
				2098
			 | 
			
				2098
			 | 
			
			
				                15 $"Change the name of this system" off \ 
			 |