|
|
|
@ -116,7 +116,7 @@ scanDatabaseTable() {
|
|
|
|
|
fi
|
|
|
|
|
|
|
|
|
|
# Send prepared query to gravity database
|
|
|
|
|
result="$(pihole-FTL sqlite3 "${gravityDBfile}" "${querystr}")" 2> /dev/null
|
|
|
|
|
result="$(pihole-FTL sqlite3 -separator ',' "${gravityDBfile}" "${querystr}")" 2> /dev/null
|
|
|
|
|
if [[ -z "${result}" ]]; then
|
|
|
|
|
# Return early when there are no matches in this table
|
|
|
|
|
return
|
|
|
|
@ -136,8 +136,8 @@ scanDatabaseTable() {
|
|
|
|
|
# Loop over results and print them
|
|
|
|
|
mapfile -t results <<< "${result}"
|
|
|
|
|
for result in "${results[@]}"; do
|
|
|
|
|
domain="${result/|*}"
|
|
|
|
|
if [[ "${result#*|}" == "0" ]]; then
|
|
|
|
|
domain="${result/,*}"
|
|
|
|
|
if [[ "${result#*,}" == "0" ]]; then
|
|
|
|
|
extra=" (disabled)"
|
|
|
|
|
else
|
|
|
|
|
extra=""
|
|
|
|
@ -212,10 +212,10 @@ if [[ -n "${exact}" ]]; then
|
|
|
|
|
fi
|
|
|
|
|
|
|
|
|
|
for result in "${results[@]}"; do
|
|
|
|
|
match="${result/|*/}"
|
|
|
|
|
extra="${result#*|}"
|
|
|
|
|
adlistAddress="${extra/|*/}"
|
|
|
|
|
extra="${extra#*|}"
|
|
|
|
|
match="${result/,*/}"
|
|
|
|
|
extra="${result#*,}"
|
|
|
|
|
adlistAddress="${extra/,*/}"
|
|
|
|
|
extra="${extra#*,}"
|
|
|
|
|
if [[ "${extra}" == "0" ]]; then
|
|
|
|
|
extra=" (disabled)"
|
|
|
|
|
else
|
|
|
|
|