Review comments

Signed-off-by: DL6ER <[email protected]>
ERauch · Jun 17, 2018 · 3f72469 · 3f72469
1 parent a0f9a1b
commit 3f72469
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 15 deletions.
diff --git a/scripts/pi-hole/js/list.js b/scripts/pi-hole/js/list.js
@@ -108,18 +108,6 @@ function refresh(fade) {
                         });
                     });
                 }
-
-
-/*
-                        // Blacklist: exact + wildcard array
-                        entry = entry.substr(1, entry.length - 1);
-
-            if(data.length === 2)
-            {
-                    }
-                    else
-                    {
-*/
             }
             list.fadeIn(100);
             if(listw)

diff --git a/scripts/pi-hole/php/get.php b/scripts/pi-hole/php/get.php
@@ -22,9 +22,9 @@
         break;
 
     case "black":
-        $exact = array(getListContent("blacklist.txt"));
-        $regex = array(getListContent("regex.list"));
-        $list = array_merge($exact, $regex);
+        $exact = getListContent("blacklist.txt");
+        $regex = getListContent("regex.list");
+        $list = array($exact, $regex);
         break;
 
     default: