Pi-hole/pi-hole
Pi-hole/pi-hole
1
0
Fork 0
mirror of https://github.com/pi-hole/pi-hole.git synced 2025-04-24 00:00:14 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'development' into BugFix463

Browse source 
Conflicts:
	advanced/Scripts/blacklist.sh
	advanced/Scripts/whitelist.sh
This commit is contained in:
Mcat12 2016-04-20 15:54:58 -04:00
commit 619082dbed
4 changed files with 64 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

4
advanced/Scripts/whitelist.sh
View file

@ -79,6 +79,10 @@ function helpFunc()
exit 1
}
if [[ $# = 0 ]]; then
helpFunc
fi
function HandleOther(){
#check validity of domain
validDomain=$(echo "$1" | perl -ne'print if /\b((?=[a-z0-9-]{1,63}\.)(xn--)?[a-z0-9]+(-[a-z0-9]+)*\.)+[a-z]{2,63}\b/')