From fd21d04bfbfc14e999e188cba377c5c55ba8b1a1 Mon Sep 17 00:00:00 2001 From: Martin Date: Thu, 12 Jan 2017 11:07:49 +0100 Subject: [PATCH 1/5] Fixed querying ads over HTTPS changed http: to // to always use the correct protocol Fixes #352 --- scripts/pi-hole/js/queryads.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/pi-hole/js/queryads.js b/scripts/pi-hole/js/queryads.js index 11d7dd030..6fc06d04b 100644 --- a/scripts/pi-hole/js/queryads.js +++ b/scripts/pi-hole/js/queryads.js @@ -16,7 +16,7 @@ function eventsource() { } var host = window.location.host; - var source = new EventSource("http://"+host+"/admin/scripts/pi-hole/php/queryads.php?domain="+domain.val().toLowerCase()+"&"+exact); + var source = new EventSource("//"+host+"/admin/scripts/pi-hole/php/queryads.php?domain="+domain.val().toLowerCase()+"&"+exact); // Reset and show field ta.empty(); From fed83cb49fef2f96f93f9dcf0c430c6e382e5621 Mon Sep 17 00:00:00 2001 From: Martin Date: Thu, 12 Jan 2017 11:25:36 +0100 Subject: [PATCH 2/5] Fix HTTPS small edit --- scripts/pi-hole/js/queryads.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/pi-hole/js/queryads.js b/scripts/pi-hole/js/queryads.js index 6fc06d04b..e5322a903 100644 --- a/scripts/pi-hole/js/queryads.js +++ b/scripts/pi-hole/js/queryads.js @@ -16,7 +16,7 @@ function eventsource() { } var host = window.location.host; - var source = new EventSource("//"+host+"/admin/scripts/pi-hole/php/queryads.php?domain="+domain.val().toLowerCase()+"&"+exact); + var source = new EventSource("scripts/pi-hole/php/queryads.php?domain="+domain.val().toLowerCase()+"&"+exact); // Reset and show field ta.empty(); From bd7be220b58399056f5725dc8ac6349557b51a8c Mon Sep 17 00:00:00 2001 From: Martin Date: Sat, 14 Jan 2017 00:22:56 +0100 Subject: [PATCH 3/5] Update queryads.js --- scripts/pi-hole/js/queryads.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/pi-hole/js/queryads.js b/scripts/pi-hole/js/queryads.js index e5322a903..6fc06d04b 100644 --- a/scripts/pi-hole/js/queryads.js +++ b/scripts/pi-hole/js/queryads.js @@ -16,7 +16,7 @@ function eventsource() { } var host = window.location.host; - var source = new EventSource("scripts/pi-hole/php/queryads.php?domain="+domain.val().toLowerCase()+"&"+exact); + var source = new EventSource("//"+host+"/admin/scripts/pi-hole/php/queryads.php?domain="+domain.val().toLowerCase()+"&"+exact); // Reset and show field ta.empty(); From 4cd19dfb6053b107a2251b63480e29b8e16d6f1a Mon Sep 17 00:00:00 2001 From: Martin Date: Sat, 14 Jan 2017 00:33:31 +0100 Subject: [PATCH 4/5] Update queryads.js --- scripts/pi-hole/js/queryads.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/pi-hole/js/queryads.js b/scripts/pi-hole/js/queryads.js index 6fc06d04b..03c3f30d2 100644 --- a/scripts/pi-hole/js/queryads.js +++ b/scripts/pi-hole/js/queryads.js @@ -16,7 +16,7 @@ function eventsource() { } var host = window.location.host; - var source = new EventSource("//"+host+"/admin/scripts/pi-hole/php/queryads.php?domain="+domain.val().toLowerCase()+"&"+exact); + var source = new EventSource(/admin/scripts/pi-hole/php/queryads.php?domain="+domain.val().toLowerCase()+"&"+exact); // Reset and show field ta.empty(); From 019910c319674c909d35a8098c16e63104928853 Mon Sep 17 00:00:00 2001 From: Martin Date: Sat, 14 Jan 2017 00:34:18 +0100 Subject: [PATCH 5/5] Update queryads.js --- scripts/pi-hole/js/queryads.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/pi-hole/js/queryads.js b/scripts/pi-hole/js/queryads.js index 03c3f30d2..6ba9f1a08 100644 --- a/scripts/pi-hole/js/queryads.js +++ b/scripts/pi-hole/js/queryads.js @@ -16,7 +16,7 @@ function eventsource() { } var host = window.location.host; - var source = new EventSource(/admin/scripts/pi-hole/php/queryads.php?domain="+domain.val().toLowerCase()+"&"+exact); + var source = new EventSource("/admin/scripts/pi-hole/php/queryads.php?domain="+domain.val().toLowerCase()+"&"+exact); // Reset and show field ta.empty();