From 4763969c8f4a2651995cb4dc55b87e6159ea08ea Mon Sep 17 00:00:00 2001
From: Mcat12 <newtoncat12@yahoo.com>
Date: Sat, 30 Jun 2018 22:03:53 -0400
Subject: [PATCH] Move processWildcards to query.sh

Closes #2255

Signed-off-by: Mcat12 <newtoncat12@yahoo.com>
---
 advanced/Scripts/query.sh | 17 +++++++++++++++++
 pihole                    | 17 -----------------
 2 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/advanced/Scripts/query.sh b/advanced/Scripts/query.sh
index e36a9d2b..6bd37079 100644
--- a/advanced/Scripts/query.sh
+++ b/advanced/Scripts/query.sh
@@ -23,6 +23,23 @@ matchType="match"
 colfile="/opt/pihole/COL_TABLE"
 source "${colfile}"
 
+# Print each subdomain
+# e.g: foo.bar.baz.com = "foo.bar.baz.com bar.baz.com baz.com com"
+processWildcards() {
+  IFS="." read -r -a array <<< "${1}"
+  for (( i=${#array[@]}-1; i>=0; i-- )); do
+    ar=""
+    for (( j=${#array[@]}-1; j>${#array[@]}-i-2; j-- )); do
+      if [[ $j == $((${#array[@]}-1)) ]]; then
+        ar="${array[$j]}"
+      else
+        ar="${array[$j]}.${ar}"
+      fi
+    done
+    echo "${ar}"
+  done
+}
+
 # Scan an array of files for matching strings
 scanList(){
   # Escape full stops
diff --git a/pihole b/pihole
index 21329849..0ee0c22f 100755
--- a/pihole
+++ b/pihole
@@ -86,23 +86,6 @@ updateGravityFunc() {
   exit 0
 }
 
-# Print each subdomain
-# e.g: foo.bar.baz.com = "foo.bar.baz.com bar.baz.com baz.com com"
-processWildcards() {
-  IFS="." read -r -a array <<< "${1}"
-  for (( i=${#array[@]}-1; i>=0; i-- )); do
-    ar=""
-    for (( j=${#array[@]}-1; j>${#array[@]}-i-2; j-- )); do
-      if [[ $j == $((${#array[@]}-1)) ]]; then
-        ar="${array[$j]}"
-      else
-        ar="${array[$j]}.${ar}"
-      fi
-    done
-    echo "${ar}"
-  done
-}
-
 queryFunc() {
   shift
   "${PI_HOLE_SCRIPT_DIR}"/query.sh "$@"