From b1d5fcb4081a96010b314578b3f36a631ccc7b7a Mon Sep 17 00:00:00 2001
From: doug <doug.burks@gmail.com>
Date: Thu, 14 Jun 2018 13:37:31 -0400
Subject: [PATCH] Issue 1259: Squert: turning grouping off results in no alerts

---
 .inc/callback.php                             |  4 ++
 debian/changelog                              |  6 +++
 ...-turning-grouping-off-results-in-no-alerts | 49 +++++++++++++++++++
 debian/patches/series                         |  1 +
 login.php                                     |  2 +-
 5 files changed, 61 insertions(+), 1 deletion(-)
 create mode 100644 debian/patches/Issue-1259:-Squert:-turning-grouping-off-results-in-no-alerts

diff --git a/.inc/callback.php b/.inc/callback.php
index 0053c85..216e50c 100644
--- a/.inc/callback.php
+++ b/.inc/callback.php
@@ -498,6 +498,10 @@ function level2a() {
   $query->execute($merged_params);
   // fetch the data and encode to json
   $rows = $query->fetchAll(PDO::FETCH_ASSOC);
+  // the frontend expects all values to be strings
+  for ($i=0;$i<count($rows);$i++) {
+    $rows[$i] = array_map('strval', $rows[$i]);
+  }
   $theJSON = json_encode($rows);
   echo $theJSON;
 }
diff --git a/debian/changelog b/debian/changelog
index 0def78b..197fc29 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+securityonion-squert (20161212-1ubuntu1securityonion41) xenial; urgency=medium
+
+  * Issue 1259: Squert: turning grouping off results in no alerts 
+
+ -- Doug Burks <doug.burks@gmail.com>  Thu, 14 Jun 2018 13:36:43 -0400
+
 securityonion-squert (20161212-1ubuntu1securityonion40) xenial; urgency=medium
 
   * Issue 1169: Squert: remove search link from context menu 
diff --git a/debian/patches/Issue-1259:-Squert:-turning-grouping-off-results-in-no-alerts b/debian/patches/Issue-1259:-Squert:-turning-grouping-off-results-in-no-alerts
new file mode 100644
index 0000000..c806b48
--- /dev/null
+++ b/debian/patches/Issue-1259:-Squert:-turning-grouping-off-results-in-no-alerts
@@ -0,0 +1,49 @@
+Description: <short summary of the patch>
+ TODO: Put a short summary on the line above and replace this paragraph
+ with a longer explanation of this change. Complete the meta-information
+ with other relevant fields (see below for details). To make it easier, the
+ information below has been extracted from the changelog. Adjust it or drop
+ it.
+ .
+ securityonion-squert (20161212-1ubuntu1securityonion41) xenial; urgency=medium
+ .
+   * Issue 1259: Squert: turning grouping off results in no alerts
+Author: Doug Burks <doug.burks@gmail.com>
+
+---
+The information above should follow the Patch Tagging Guidelines, please
+checkout http://dep.debian.net/deps/dep3/ to learn about the format. Here
+are templates for supplementary fields that you might want to add:
+
+Origin: <vendor|upstream|other>, <url of original patch>
+Bug: <url in upstream bugtracker>
+Bug-Debian: https://bugs.debian.org/<bugnumber>
+Bug-Ubuntu: https://launchpad.net/bugs/<bugnumber>
+Forwarded: <no|not-needed|url proving that it has been forwarded>
+Reviewed-By: <name and email of someone who approved the patch>
+Last-Update: <YYYY-MM-DD>
+
+--- securityonion-squert-20161212.orig/.inc/callback.php
++++ securityonion-squert-20161212/.inc/callback.php
+@@ -498,6 +498,10 @@ function level2a() {
+   $query->execute($merged_params);
+   // fetch the data and encode to json
+   $rows = $query->fetchAll(PDO::FETCH_ASSOC);
++  // the frontend expects all values to be strings
++  for ($i=0;$i<count($rows);$i++) {
++    $rows[$i] = array_map('strval', $rows[$i]);
++  }
+   $theJSON = json_encode($rows);
+   echo $theJSON;
+ }
+--- securityonion-squert-20161212.orig/login.php
++++ securityonion-squert-20161212/login.php
+@@ -150,7 +150,7 @@ Password<br>
+ <input id=logmein name=logmein class=rb type=submit name=login value=submit><br><br></td>
+ <td class=err><?php echo $err;?></td></tr>
+ </table>
+-<div class=cp>Version 1.8.0<span>&copy;2016 Paul Halliday</span></div>
++<div class=cp>Version 1.8.1<span>&copy;2016 Paul Halliday</span></div>
+ </div>
+ </form>
+ <script type="text/javascript">document.credcheck.<?php echo $focus;?>.focus();</script>
diff --git a/debian/patches/series b/debian/patches/series
index 16ca594..53b8331 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -35,3 +35,4 @@ fix-for-loop
 update-mysql-function-calls-in-ip2c.php
 remove-unnecessary-code-from-ip2c.php:wq
 Issue-1169:-Squert:-remove-search-link-from-context-menu
+Issue-1259:-Squert:-turning-grouping-off-results-in-no-alerts
diff --git a/login.php b/login.php
index a579456..2f1937f 100644
--- a/login.php
+++ b/login.php
@@ -150,7 +150,7 @@ function cleanUp($string) {
 <input id=logmein name=logmein class=rb type=submit name=login value=submit><br><br></td>
 <td class=err><?php echo $err;?></td></tr>
 </table>
-<div class=cp>Version 1.8.0<span>&copy;2016 Paul Halliday</span></div>
+<div class=cp>Version 1.8.1<span>&copy;2016 Paul Halliday</span></div>
 </div>
 </form>
 <script type="text/javascript">document.credcheck.<?php echo $focus;?>.focus();</script>