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-19 05:40:13 +00:00
Code Issues Projects Releases Packages Wiki Activity

Review comments and fixing stickler complaints.

Browse source 
Signed-off-by: DL6ER <dl6er@dl6er.de>
This commit is contained in:
DL6ER 2019-07-06 09:32:41 +02:00
parent 2fb4256f84
commit 0405aaa3da
No known key found for this signature in database
GPG key ID: 00135ACBD90B28DD
5 changed files with 34 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

22
advanced/Scripts/webpage.sh
View file

@ -542,24 +542,38 @@ Teleporter() {
php /var/www/html/admin/scripts/pi-hole/php/teleporter.php > "pi-hole-teleporter_${datetimestamp}.tar.gz"
}
checkDomain()
{
local domain validDomain
# Convert to lowercase
domain="${1,,}"
validDomain=$(grep -P "^((-|_)*[a-z\\d]((-|_)*[a-z\\d])*(-|_)*)(\\.(-|_)*([a-z\\d]((-|_)*[a-z\\d])*))*$" <<< "${domain}") # Valid chars check
validDomain=$(grep -P "^[^\\.]{1,63}(\\.[^\\.]{1,63})*$" <<< "${validDomain}") # Length of each label
echo "${validDomain}"
}
addAudit()
{
shift # skip "-a"
shift # skip "audit"
local domains="('${1}')"
local domains validDomain
domains="('$(checkDomain "${1}")')"
shift # skip first domain, as it has already been added
for domain in "$@"
do
# Insert only the domain here. The date_added field will be
# filled with its default value (date_added = current timestamp)
domains="${domains},('${domain}')"
validDomain="$(checkDomain "${domain}")"
if [[ -n "${validDomain}" ]]; then
domains="${domains},('${domain}')"
fi
done
sqlite3 "${gravityDBfile}" "INSERT INTO \"auditlist\" (domain) VALUES ${domains};"
sqlite3 "${gravityDBfile}" "INSERT INTO \"domain_auditlist\" (domain) VALUES ${domains};"
}
clearAudit()
{
sqlite3 "${gravityDBfile}" "DELETE FROM \"auditlist\";"
sqlite3 "${gravityDBfile}" "DELETE FROM \"domain_auditlist\";"
}
SetPrivacyLevel() {