From 64d532a95cd15c4a18f9eb3589a547a7e933842f Mon Sep 17 00:00:00 2001
From: DL6ER <derigs@ph1.uni-koeln.de>
Date: Tue, 22 Nov 2016 15:36:16 +0100
Subject: [PATCH] Pass "Invalid domain!" error message to user

---
 js/pihole/queryads.js |  2 ++
 php/queryads.php      | 36 +++++++++++++++++-------------------
 2 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/js/pihole/queryads.js b/js/pihole/queryads.js
index d0da2412..b7693bab 100644
--- a/js/pihole/queryads.js
+++ b/js/pihole/queryads.js
@@ -2,7 +2,9 @@ function eventsource() {
     var ta = $("#output");
     var domain = $("#domain");
     if(domain.val().length === 0)
+    {
         return;
+    }
     var source = new EventSource("php/queryads.php?domain="+domain.val());
 
     // Reset and show field
diff --git a/php/queryads.php b/php/queryads.php
index fddcebae..9faac669 100644
--- a/php/queryads.php
+++ b/php/queryads.php
@@ -1,20 +1,4 @@
 <?php
-// Test if domain is set
-if(isset($_GET["domain"]))
-{
-    // Remove illegal characters
-    $url = filter_var($_GET["domain"], FILTER_SANITIZE_URL);
-    // Is this a valid domain?
-    if(!filter_var(gethostbyname($url), FILTER_VALIDATE_IP))
-    {
-       die("Invalid domain!");
-    }
-}
-else
-{
-    die("No domain provided");
-}
-
 ob_end_flush();
 ini_set("output_buffering", "0");
 ob_implicit_flush(true);
@@ -25,12 +9,26 @@ function echoEvent($datatext) {
     echo "data: ".implode("\ndata: ", explode("\n", $datatext))."\n\n";
 }
 
-// echoEvent("***START***");
+// Test if domain is set
+if(isset($_GET["domain"]))
+{
+    // Remove illegal characters
+    $url = filter_var($_GET["domain"], FILTER_SANITIZE_URL);
+    // Is this a valid domain?
+    if(!filter_var(gethostbyname($url), FILTER_VALIDATE_IP))
+    {
+        echoEvent("Invalid domain!");
+        die();
+    }
+}
+else
+{
+    echoEvent("No domain provided");
+    die();
+}
 
 $proc = popen("sudo pihole -q ".$url, 'r');
 while (!feof($proc)) {
     echoEvent(fread($proc, 4096));
 }
-
-// echoEvent("***END***");
 ?>