From 745fa9c94ba17cbc8708dd0da549cb9e72554b6b Mon Sep 17 00:00:00 2001
From: Adam Warner <awarner@croydon.parkeon.com>
Date: Thu, 3 Nov 2016 08:27:19 +0000
Subject: [PATCH 1/7] Same logic as https://github.com/pi-hole/pi-hole/pull/891

---
 data.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/data.php b/data.php
index 7828f9fe..5b4462bb 100644
--- a/data.php
+++ b/data.php
@@ -1,13 +1,13 @@
 <?php
     $log = array();
-    $ipv6 =  parse_ini_file("/etc/pihole/setupVars.conf")['IPv6_address'] != "";
+    $divide =  parse_ini_file("/etc/pihole/setupVars.conf")['IPv6_address'] != "" && parse_ini_file("/etc/pihole/setupVars.conf")['IPv4_address'] != "";
     $hosts = file_exists("/etc/hosts") ? file("/etc/hosts") : array();
     $log = new \SplFileObject('/var/log/pihole.log');
 
     /*******   Public Members ********/
     function getSummaryData() {
-        global $log, $ipv6;
-        $domains_being_blocked = gravityCount() / ($ipv6 ? 2 : 1);
+        global $log, $divide;
+        $domains_being_blocked = gravityCount() / ($divide ? 2 : 1);
 
         $dns_queries_today = count(getDnsQueries($log));
 

From 025c22c287ac61390cbfc171e13389d0bb1fc76f Mon Sep 17 00:00:00 2001
From: DL6ER <derigs@ph1.uni-koeln.de>
Date: Sun, 13 Nov 2016 18:57:25 +0100
Subject: [PATCH 2/7] Add possibility to blacklist/whitelist entries on the
 Queries page.

---
 data.php             |  1 +
 js/pihole/queries.js | 37 ++++++++++++++++++++++++++++++++-----
 queries.php          | 11 +++++++++++
 3 files changed, 44 insertions(+), 5 deletions(-)

diff --git a/data.php b/data.php
index 7828f9fe..64289cd9 100644
--- a/data.php
+++ b/data.php
@@ -150,6 +150,7 @@
                 $domain,
                 hasHostName($client),
                 $status,
+                ""
               ));
             }
 
diff --git a/js/pihole/queries.js b/js/pihole/queries.js
index d13008dc..9f2c7aa8 100644
--- a/js/pihole/queries.js
+++ b/js/pihole/queries.js
@@ -16,12 +16,39 @@ $(document).ready(function() {
             { "width" : "20%", "type": "date" },
             { "width" : "10%" },
             { "width" : "40%" },
-            { "width" : "15%" },
-            { "width" : "15%" }
-        ]
-    })
+            { "width" : "12.5%" },
+            { "width" : "12.5%" },
+            { "width" : "5%" },
+        ],
+        "columnDefs": [ {
+            "targets": -1,
+            "data": null,
+            "defaultContent": "<button>Do it!</button>"
+        } ]
+    });
+    $('#all-queries tbody').on( 'click', 'button', function () {
+        var data = tableApi.row( $(this).parents('tr') ).data();
+        if (data[4] == "Pi-holed")
+        {
+          add(data[2],"white");
+        }
+        else
+        {
+          add(data[2],"black");
+        }
+    } );
 } );
 
 function refreshData() {
     tableApi.ajax.url("api.php?getAllQueries").load();
-}
\ No newline at end of file
+}
+
+function add(domain,list) {
+    var token = $("#token").html();
+    $.ajax({
+        url: "php/add.php",
+        method: "post",
+        data: {"domain":domain, "list":list, "token":token}
+//        success: function(response) { alert(response); }
+    });
+}
diff --git a/queries.php b/queries.php
index 07046bed..20f2ead9 100644
--- a/queries.php
+++ b/queries.php
@@ -1,6 +1,15 @@
 <?php
     require "header.php";
+
+session_start();
+// Generate CSRF token
+if(empty($_SESSION['token'])) {
+    $_SESSION['token'] = base64_encode(openssl_random_pseudo_bytes(32));
+}
+$token = $_SESSION['token'];
 ?>
+<!-- Send PHP info to JS -->
+<div id="token" hidden><?php echo $token ?></div>
 
 <!--
 <div class="row">
@@ -26,6 +35,7 @@
                             <th>Domain</th>
                             <th>Client</th>
                             <th>Status</th>
+                            <th>Action</th>
                         </tr>
                     </thead>
                     <tfoot>
@@ -35,6 +45,7 @@
                             <th>Domain</th>
                             <th>Client</th>
                             <th>Status</th>
+                            <th>Action</th>
                         </tr>
                     </tfoot>
                 </table>

From b22c92a7387670fe9ce97f8a3a0d1d0703822efc Mon Sep 17 00:00:00 2001
From: DL6ER <derigs@ph1.uni-koeln.de>
Date: Sun, 13 Nov 2016 19:16:57 +0100
Subject: [PATCH 3/7] Add individual labels for the black-/whitelisting button

---
 js/pihole/queries.js | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/js/pihole/queries.js b/js/pihole/queries.js
index 9f2c7aa8..b9368c59 100644
--- a/js/pihole/queries.js
+++ b/js/pihole/queries.js
@@ -2,10 +2,12 @@ $(document).ready(function() {
     tableApi = $('#all-queries').DataTable( {
         "rowCallback": function( row, data, index ){
             if (data[4] == "Pi-holed") {
-                $(row).css('color','red')
+                $(row).css('color','red');
+                $('td:eq(5)', row).html( '<button style="color:green;"><i class="fa fa-pencil-square-o"></i> To whitelist</button>' );
             }
             else{
-                $(row).css('color','green')
+                $(row).css('color','green');
+                $('td:eq(5)', row).html( '<button style="color:red;"><i class="fa fa-ban"></i> To blacklist</button>' );
             }
 
         },
@@ -16,14 +18,14 @@ $(document).ready(function() {
             { "width" : "20%", "type": "date" },
             { "width" : "10%" },
             { "width" : "40%" },
-            { "width" : "12.5%" },
-            { "width" : "12.5%" },
-            { "width" : "5%" },
+            { "width" : "10%" },
+            { "width" : "10%" },
+            { "width" : "10%" },
         ],
         "columnDefs": [ {
             "targets": -1,
             "data": null,
-            "defaultContent": "<button>Do it!</button>"
+            "defaultContent": ''
         } ]
     });
     $('#all-queries tbody').on( 'click', 'button', function () {

From ddb9ca75c8270c8e2ff4f4c5bf6aba2a458abb29 Mon Sep 17 00:00:00 2001
From: DL6ER <derigs@ph1.uni-koeln.de>
Date: Sun, 13 Nov 2016 20:44:45 +0100
Subject: [PATCH 4/7] Named the buttons imperatively

---
 js/pihole/queries.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/js/pihole/queries.js b/js/pihole/queries.js
index b9368c59..fd321715 100644
--- a/js/pihole/queries.js
+++ b/js/pihole/queries.js
@@ -3,11 +3,11 @@ $(document).ready(function() {
         "rowCallback": function( row, data, index ){
             if (data[4] == "Pi-holed") {
                 $(row).css('color','red');
-                $('td:eq(5)', row).html( '<button style="color:green;"><i class="fa fa-pencil-square-o"></i> To whitelist</button>' );
+                $('td:eq(5)', row).html( '<button style="color:green;"><i class="fa fa-pencil-square-o"></i> Whitelist</button>' );
             }
             else{
                 $(row).css('color','green');
-                $('td:eq(5)', row).html( '<button style="color:red;"><i class="fa fa-ban"></i> To blacklist</button>' );
+                $('td:eq(5)', row).html( '<button style="color:red;"><i class="fa fa-ban"></i> Blacklist</button>' );
             }
 
         },

From 409e189ed17327f5fae107b1bddf1e94960c9d1e Mon Sep 17 00:00:00 2001
From: DL6ER <derigs@ph1.uni-koeln.de>
Date: Sun, 13 Nov 2016 21:22:53 +0100
Subject: [PATCH 5/7] Added feedback when adding some entry to the
 black-/whitelist

---
 js/pihole/queries.js | 52 ++++++++++++++++++++++++++++++++++++++++++--
 queries.php          | 15 +++++++++++++
 2 files changed, 65 insertions(+), 2 deletions(-)

diff --git a/js/pihole/queries.js b/js/pihole/queries.js
index fd321715..db365f9f 100644
--- a/js/pihole/queries.js
+++ b/js/pihole/queries.js
@@ -47,10 +47,58 @@ function refreshData() {
 
 function add(domain,list) {
     var token = $("#token").html();
+    var alInfo = $("#alInfo");
+    var alList = $("#alList");
+    var alSuccess = $("#alSuccess");
+    var alFailure = $("#alFailure");
+
+    if(list == "white")
+    {
+        alList.html("Whitelist");
+    }
+    else
+    {
+        alList.html("Blacklist");
+    }
+
+    alInfo.show();
+    alSuccess.hide();
+    alFailure.hide();
     $.ajax({
         url: "php/add.php",
         method: "post",
-        data: {"domain":domain, "list":list, "token":token}
-//        success: function(response) { alert(response); }
+        data: {"domain":domain, "list":list, "token":token},
+        success: function(response) {
+          if (response.indexOf("not a valid argument") >= 0 ||
+              response.indexOf("is not a valid domain") >= 0) {
+            alFailure.show();
+            alFailure.delay(1000).fadeOut(2000, function() {
+                alFailure.hide();
+            });
+            alInfo.delay(1000).fadeOut(2000, function() {
+                alInfo.hide();
+                alList.html("");
+            });
+          } else {
+            alSuccess.show();
+            alSuccess.delay(1000).fadeOut(2000, function() {
+                alSuccess.hide();
+            });
+            alInfo.delay(1000).fadeOut(2000, function() {
+                alInfo.hide();
+                alList.html("");
+            });
+          }
+        },
+        error: function(jqXHR, exception) {
+            alFailure.show();
+            alFailure.delay(1000).fadeOut(2000, function() {
+                alFailure.hide();
+            });
+            alInfo.delay(1000).fadeOut(2000, function() {
+                alInfo.hide();
+                alList.html("");
+            });
+        }
     });
 }
diff --git a/queries.php b/queries.php
index 20f2ead9..5ec01f61 100644
--- a/queries.php
+++ b/queries.php
@@ -18,6 +18,21 @@ $token = $_SESSION['token'];
     </div>
 </div>
 -->
+
+<!-- Alerts -->
+<div id="alInfo" class="alert alert-info alert-dismissible fade in" role="alert" hidden="true">
+    <button type="button" class="close" data-hide="alert" aria-label="Close"><span aria-hidden="true">&times;</span></button>
+    Adding to the <span id="alList"></span>...
+</div>
+<div id="alSuccess" class="alert alert-success alert-dismissible fade in" role="alert" hidden="true">
+    <button type="button" class="close" data-hide="alert" aria-label="Close"><span aria-hidden="true">&times;</span></button>
+    Success!
+</div>
+<div id="alFailure" class="alert alert-danger alert-dismissible fade in" role="alert" hidden="true">
+    <button type="button" class="close" data-hide="alert" aria-label="Close"><span aria-hidden="true">&times;</span></button>
+    Failure! Something went wrong.
+</div>
+
 <div class="row">
     <div class="col-md-12">
       <div class="box" id="recent-queries">

From d7a6412d7a4310fbe723cf98ea0f6546ab199ddb Mon Sep 17 00:00:00 2001
From: DL6ER <derigs@ph1.uni-koeln.de>
Date: Mon, 14 Nov 2016 10:52:54 +0100
Subject: [PATCH 6/7] Display which domain will be added to the
 black-/whitelist

---
 js/pihole/queries.js | 5 +++++
 queries.php          | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/js/pihole/queries.js b/js/pihole/queries.js
index db365f9f..2436b911 100644
--- a/js/pihole/queries.js
+++ b/js/pihole/queries.js
@@ -49,6 +49,8 @@ function add(domain,list) {
     var token = $("#token").html();
     var alInfo = $("#alInfo");
     var alList = $("#alList");
+    var alDomain = $("#alDomain");
+    alDomain.html(domain);
     var alSuccess = $("#alSuccess");
     var alFailure = $("#alFailure");
 
@@ -78,6 +80,7 @@ function add(domain,list) {
             alInfo.delay(1000).fadeOut(2000, function() {
                 alInfo.hide();
                 alList.html("");
+                alDomain.html("");
             });
           } else {
             alSuccess.show();
@@ -87,6 +90,7 @@ function add(domain,list) {
             alInfo.delay(1000).fadeOut(2000, function() {
                 alInfo.hide();
                 alList.html("");
+                alDomain.html("");
             });
           }
         },
@@ -98,6 +102,7 @@ function add(domain,list) {
             alInfo.delay(1000).fadeOut(2000, function() {
                 alInfo.hide();
                 alList.html("");
+                alDomain.html("");
             });
         }
     });
diff --git a/queries.php b/queries.php
index 5ec01f61..43549289 100644
--- a/queries.php
+++ b/queries.php
@@ -22,7 +22,7 @@ $token = $_SESSION['token'];
 <!-- Alerts -->
 <div id="alInfo" class="alert alert-info alert-dismissible fade in" role="alert" hidden="true">
     <button type="button" class="close" data-hide="alert" aria-label="Close"><span aria-hidden="true">&times;</span></button>
-    Adding to the <span id="alList"></span>...
+    Adding <span id="alDomain"></span> to the <span id="alList"></span>...
 </div>
 <div id="alSuccess" class="alert alert-success alert-dismissible fade in" role="alert" hidden="true">
     <button type="button" class="close" data-hide="alert" aria-label="Close"><span aria-hidden="true">&times;</span></button>

From 80da4b6c9f259ad2f3c5af2ac060d1d7c4f7d1b2 Mon Sep 17 00:00:00 2001
From: DL6ER <derigs@ph1.uni-koeln.de>
Date: Mon, 14 Nov 2016 10:57:05 +0100
Subject: [PATCH 7/7] Minor code cleaning.

---
 js/pihole/queries.js | 35 ++++++++++++++---------------------
 1 file changed, 14 insertions(+), 21 deletions(-)

diff --git a/js/pihole/queries.js b/js/pihole/queries.js
index 2436b911..736ffddf 100644
--- a/js/pihole/queries.js
+++ b/js/pihole/queries.js
@@ -71,28 +71,21 @@ function add(domain,list) {
         method: "post",
         data: {"domain":domain, "list":list, "token":token},
         success: function(response) {
-          if (response.indexOf("not a valid argument") >= 0 ||
-              response.indexOf("is not a valid domain") >= 0) {
-            alFailure.show();
-            alFailure.delay(1000).fadeOut(2000, function() {
-                alFailure.hide();
-            });
-            alInfo.delay(1000).fadeOut(2000, function() {
-                alInfo.hide();
-                alList.html("");
-                alDomain.html("");
-            });
-          } else {
-            alSuccess.show();
-            alSuccess.delay(1000).fadeOut(2000, function() {
-                alSuccess.hide();
-            });
-            alInfo.delay(1000).fadeOut(2000, function() {
-                alInfo.hide();
-                alList.html("");
-                alDomain.html("");
-            });
+          if (response.indexOf("not a valid argument") >= 0 || response.indexOf("is not a valid domain") >= 0)
+          {
+              alFailure.show();
+              alFailure.delay(1000).fadeOut(2000, function() { alFailure.hide(); });
           }
+          else
+          {
+              alSuccess.show();
+              alSuccess.delay(1000).fadeOut(2000, function() { alSuccess.hide(); });
+          }
+          alInfo.delay(1000).fadeOut(2000, function() {
+              alInfo.hide();
+              alList.html("");
+              alDomain.html("");
+          });
         },
         error: function(jqXHR, exception) {
             alFailure.show();