From 67bbf15ed31e3d4dded763e738598dc6c59be913 Mon Sep 17 00:00:00 2001
From: Vitali Kari <vitali.kari@gmail.com>
Date: Tue, 18 Aug 2015 18:52:57 +0200
Subject: [PATCH 1/6] Update syslog.inc.php

---
 html/includes/common/syslog.inc.php | 51 ++++++++++++++---------------
 1 file changed, 25 insertions(+), 26 deletions(-)

diff --git a/html/includes/common/syslog.inc.php b/html/includes/common/syslog.inc.php
index d77936133..e610ebfc7 100644
--- a/html/includes/common/syslog.inc.php
+++ b/html/includes/common/syslog.inc.php
@@ -1,28 +1,27 @@
 <?php
-
-$sql  = "SELECT *, DATE_FORMAT(timestamp, '".$config['dateformat']['mysql']['compact']."') AS date from syslog ORDER BY timestamp DESC LIMIT 20";
-
-$syslog_output = '
-<div class="container-fluid">
-    <div class="row">
-        <div class="col-md-12">
-            <div class="panel panel-default panel-condensed">
-                <div class="panel-heading">
-                    <strong>Syslog entries</strong>
-                </div>
-                <table class="table table-hover table-condensed table-striped">';
-
-foreach (dbFetchRows($sql) as $entry) {
-    $entry = array_merge($entry, device_by_id_cache($entry['device_id']));
-    include 'includes/print-syslog.inc.php';
-}
-
-$syslog_output .= '
-                </table>
-            </div>
-        </div>
-    </div>
-</div>
+$common_output[] = '
+<table id="sysloglog" class="table table-hover table-condensed table-striped">
+    <thead>
+        <tr>
+            <th data-column-id="datetime" data-order="desc">Datetime</th>
+            <th data-column-id="hostname">Hostname</th>
+            <th data-column-id="program">Program</th>
+            <th data-column-id="message">Message</th>
+        </tr>
+    </thead>
+</table>
+<script>
+var syslog_grid = $("#syslog").bootgrid({
+    ajax: true,
+    post: function ()
+    {
+        return {
+            id: "syslog",
+            device: "' .mres($vars['device']) .'",
+            type: "' .mres($vars['type']) .'",
+        };
+    },
+    url: "ajax_table.php"
+});
+</script>
 ';
-
-$common_output[] = $syslog_output;

From 2a08827ebb43176c1bc1cc261c1563800e9634bb Mon Sep 17 00:00:00 2001
From: Vitali Kari <vitali.kari@gmail.com>
Date: Tue, 18 Aug 2015 19:03:59 +0200
Subject: [PATCH 2/6] Update syslog.inc.php

---
 html/includes/common/syslog.inc.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/html/includes/common/syslog.inc.php b/html/includes/common/syslog.inc.php
index e610ebfc7..7d3121e06 100644
--- a/html/includes/common/syslog.inc.php
+++ b/html/includes/common/syslog.inc.php
@@ -3,10 +3,10 @@ $common_output[] = '
 <table id="sysloglog" class="table table-hover table-condensed table-striped">
     <thead>
         <tr>
-            <th data-column-id="datetime" data-order="desc">Datetime</th>
-            <th data-column-id="hostname">Hostname</th>
+            <th data-column-id="timestamp" data-order="desc">Datetime</th>
+            <th data-column-id="device_id">Hostname</th>
             <th data-column-id="program">Program</th>
-            <th data-column-id="message">Message</th>
+            <th data-column-id="msg">Message</th>
         </tr>
     </thead>
 </table>

From 24d88ea7a46c78b76c6ed3c4374f29aa45925f78 Mon Sep 17 00:00:00 2001
From: Vitali Kari <vitali.kari@gmail.com>
Date: Wed, 19 Aug 2015 17:04:11 +0200
Subject: [PATCH 3/6] Update syslog.inc.php

---
 html/includes/common/syslog.inc.php | 87 +++++++++++++++++++++++++++--
 1 file changed, 81 insertions(+), 6 deletions(-)

diff --git a/html/includes/common/syslog.inc.php b/html/includes/common/syslog.inc.php
index 7d3121e06..4e75fd38c 100644
--- a/html/includes/common/syslog.inc.php
+++ b/html/includes/common/syslog.inc.php
@@ -1,6 +1,15 @@
 <?php
-$common_output[] = '
-<table id="sysloglog" class="table table-hover table-condensed table-striped">
+$no_refresh = true;
+$param = array();
+if ($vars['action'] == 'expunge' && $_SESSION['userlevel'] >= '10') {
+    dbQuery('TRUNCATE TABLE `syslog`');
+    print_message('syslog truncated');
+}
+$pagetitle[] = 'Syslog';
+?>
+
+<div class="table-responsive">
+<table id="syslog" class="table table-hover table-condensed table-striped">
     <thead>
         <tr>
             <th data-column-id="timestamp" data-order="desc">Datetime</th>
@@ -10,18 +19,84 @@ $common_output[] = '
         </tr>
     </thead>
 </table>
+</div>
+
 <script>
-var syslog_grid = $("#syslog").bootgrid({
+var grid = $("#syslog").bootgrid({
     ajax: true,
+    templates: {
+        header: "<div id=\"{{ctx.id}}\" class=\"{{css.header}}\"><div class=\"row\">"+
+                "<div class=\"col-sm-9 actionBar\"><span class=\"pull-left\">"+
+                "<form method=\"post\" action=\"\" class=\"form-inline\" role=\"form\" id=\"result_form\">"+
+                "<div class=\"form-group\">"+
+                "<select name=\"device\" id=\"device\" class=\"form-control input-sm\">"+
+                "<option value=\"\">All Devices</option>"+
+                <?php
+                foreach (get_all_devices() as $hostname) {
+                    $device_id = getidbyname($hostname);
+                    if (device_permitted($device_id)) {
+                        echo '"<option value=\"'.$device_id.'\"';
+                        if ($device_id == $vars['device']) {
+                            echo ' selected';
+                        }
+                        echo '>'.$hostname.'</option>"+';
+                    }
+                }
+                ?>
+                "</select>"+
+                "</div>"+
+                "<div class=\"form-group\">"+
+                "<select name=\"program\" id=\"program\" class=\"form-control input-sm\">"+
+                "<option value=\"\">All Programs</option>"+
+                <?php
+                foreach (dbFetchRows('SELECT DISTINCT `program` FROM `syslog` ORDER BY `program`') as $data) {
+                    echo '"<option value=\"'.$data['program'].'\"';
+                    if ($data['program'] == $vars['program']) {
+                        echo ' selected';
+                    }
+                    echo '>'.$data['program'].'</option>"+';
+                }
+                ?>
+                "</select>"+
+                "</div>"+
+                "<div class=\"form-group\">"+
+                "<input name=\"from\" type=\"text\" class=\"form-control input-sm\" id=\"dtpickerfrom\" maxlength=\"16\" value=\"<?php echo $vars['from']; ?>\" placeholder=\"From\" data-date-format=\"YYYY-MM-DD HH:mm\">"+
+                "</div>"+
+                "<div class=\"form-group\">"+
+                "<input name=\"to\" type=\"text\" class=\"form-control input-sm\" id=\"dtpickerto\" maxlength=\"16\" value=\"<?php echo $vars['to']; ?>\" placeholder=\"To\" data-date-format=\"YYYY-MM-DD HH:mm\">"+
+                "</div>"+
+                "<button type=\"submit\" class=\"btn btn-default input-sm\">Filter</button>"+
+                "</form></span></div>"+
+                "<div class=\"col-sm-3 actionBar\"><p class=\"{{css.actions}}\"></p></div></div></div>"
+    },
     post: function ()
     {
         return {
             id: "syslog",
-            device: "' .mres($vars['device']) .'",
-            type: "' .mres($vars['type']) .'",
+            device: '<?php echo htmlspecialchars($vars['device']); ?>',
+            program: '<?php echo htmlspecialchars($vars['program']); ?>',
+            to: '<?php echo htmlspecialchars($vars['to']); ?>',
+            from: '<?php echo htmlspecialchars($vars['from']); ?>',
         };
     },
     url: "ajax_table.php"
 });
+$(function () {
+    $("#dtpickerfrom").datetimepicker();
+    $("#dtpickerfrom").on("dp.change", function (e) {
+        $("#dtpickerto").data("DateTimePicker").minDate(e.date);
+    });
+    $("#dtpickerto").datetimepicker();
+    $("#dtpickerto").on("dp.change", function (e) {
+        $("#dtpickerfrom").data("DateTimePicker").maxDate(e.date);
+    });
+    if( $("#dtpickerfrom").val() != "" ) {
+        $("#dtpickerto").data("DateTimePicker").minDate($("#dtpickerfrom").val());
+    }
+    if( $("#dtpickerto").val() != "" ) {
+        $("#dtpickerfrom").data("DateTimePicker").maxDate($("#dtpickerto").val());
+    } else {
+        $("#dtpickerto").data("DateTimePicker").maxDate('<?php echo date($config['dateformat']['byminute']); ?>');
+    }
+});
 </script>
-';

From 178024e61fdeffb11ba9f35593720260132e2598 Mon Sep 17 00:00:00 2001
From: vitalisator <vitali.kari@gmail.com>
Date: Wed, 19 Aug 2015 18:03:43 +0200
Subject: [PATCH 4/6] -

---
 html/includes/common/syslog.inc.php | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/html/includes/common/syslog.inc.php b/html/includes/common/syslog.inc.php
index 4e75fd38c..bd708c175 100644
--- a/html/includes/common/syslog.inc.php
+++ b/html/includes/common/syslog.inc.php
@@ -1,10 +1,14 @@
 <?php
+
 $no_refresh = true;
+
 $param = array();
+
 if ($vars['action'] == 'expunge' && $_SESSION['userlevel'] >= '10') {
     dbQuery('TRUNCATE TABLE `syslog`');
     print_message('syslog truncated');
 }
+
 $pagetitle[] = 'Syslog';
 ?>
 
@@ -22,6 +26,7 @@ $pagetitle[] = 'Syslog';
 </div>
 
 <script>
+
 var grid = $("#syslog").bootgrid({
     ajax: true,
     templates: {
@@ -39,6 +44,7 @@ var grid = $("#syslog").bootgrid({
                         if ($device_id == $vars['device']) {
                             echo ' selected';
                         }
+
                         echo '>'.$hostname.'</option>"+';
                     }
                 }
@@ -54,6 +60,7 @@ var grid = $("#syslog").bootgrid({
                     if ($data['program'] == $vars['program']) {
                         echo ' selected';
                     }
+
                     echo '>'.$data['program'].'</option>"+';
                 }
                 ?>
@@ -68,6 +75,7 @@ var grid = $("#syslog").bootgrid({
                 "<button type=\"submit\" class=\"btn btn-default input-sm\">Filter</button>"+
                 "</form></span></div>"+
                 "<div class=\"col-sm-3 actionBar\"><p class=\"{{css.actions}}\"></p></div></div></div>"
+
     },
     post: function ()
     {
@@ -81,6 +89,7 @@ var grid = $("#syslog").bootgrid({
     },
     url: "ajax_table.php"
 });
+
 $(function () {
     $("#dtpickerfrom").datetimepicker();
     $("#dtpickerfrom").on("dp.change", function (e) {

From eb3dc1617cb0d0341c5fddd740a26c2d2c7214c8 Mon Sep 17 00:00:00 2001
From: vitalisator <vitali.kari@gmail.com>
Date: Thu, 20 Aug 2015 11:31:00 +0200
Subject: [PATCH 5/6] still try...

---
 html/includes/common/syslog.inc.php | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/html/includes/common/syslog.inc.php b/html/includes/common/syslog.inc.php
index bd708c175..e5e492edc 100644
--- a/html/includes/common/syslog.inc.php
+++ b/html/includes/common/syslog.inc.php
@@ -1,5 +1,4 @@
 <?php
-
 $no_refresh = true;
 
 $param = array();
@@ -10,8 +9,7 @@ if ($vars['action'] == 'expunge' && $_SESSION['userlevel'] >= '10') {
 }
 
 $pagetitle[] = 'Syslog';
-?>
-
+$syslog_output = '
 <div class="table-responsive">
 <table id="syslog" class="table table-hover table-condensed table-striped">
     <thead>
@@ -36,7 +34,7 @@ var grid = $("#syslog").bootgrid({
                 "<div class=\"form-group\">"+
                 "<select name=\"device\" id=\"device\" class=\"form-control input-sm\">"+
                 "<option value=\"\">All Devices</option>"+
-                <?php
+';
                 foreach (get_all_devices() as $hostname) {
                     $device_id = getidbyname($hostname);
                     if (device_permitted($device_id)) {
@@ -48,13 +46,13 @@ var grid = $("#syslog").bootgrid({
                         echo '>'.$hostname.'</option>"+';
                     }
                 }
-                ?>
+$syslog_output .= '
                 "</select>"+
                 "</div>"+
                 "<div class=\"form-group\">"+
                 "<select name=\"program\" id=\"program\" class=\"form-control input-sm\">"+
                 "<option value=\"\">All Programs</option>"+
-                <?php
+';
                 foreach (dbFetchRows('SELECT DISTINCT `program` FROM `syslog` ORDER BY `program`') as $data) {
                     echo '"<option value=\"'.$data['program'].'\"';
                     if ($data['program'] == $vars['program']) {
@@ -63,7 +61,7 @@ var grid = $("#syslog").bootgrid({
 
                     echo '>'.$data['program'].'</option>"+';
                 }
-                ?>
+$syslog_output .= '
                 "</select>"+
                 "</div>"+
                 "<div class=\"form-group\">"+
@@ -81,10 +79,10 @@ var grid = $("#syslog").bootgrid({
     {
         return {
             id: "syslog",
-            device: '<?php echo htmlspecialchars($vars['device']); ?>',
-            program: '<?php echo htmlspecialchars($vars['program']); ?>',
-            to: '<?php echo htmlspecialchars($vars['to']); ?>',
-            from: '<?php echo htmlspecialchars($vars['from']); ?>',
+            device: "' .mres($vars['device']) .'",
+            program: "' .mres($vars['program']) .'",
+            to: "' .mres($vars['to']) .'",
+            from: "' .mres($vars['from']) .'",
         };
     },
     url: "ajax_table.php"
@@ -105,7 +103,9 @@ $(function () {
     if( $("#dtpickerto").val() != "" ) {
         $("#dtpickerfrom").data("DateTimePicker").maxDate($("#dtpickerto").val());
     } else {
-        $("#dtpickerto").data("DateTimePicker").maxDate('<?php echo date($config['dateformat']['byminute']); ?>');
+        $("#dtpickerto").data("DateTimePicker").maxDate("'.mres($config['dateformat']['byminute']) .')";
     }
 });
 </script>
+';
+$common_output[] = $syslog_output;

From ff565608d23b1b0eb7ec2109141b0dd190308da4 Mon Sep 17 00:00:00 2001
From: vitalisator <vitali.kari@gmail.com>
Date: Fri, 21 Aug 2015 18:04:12 +0200
Subject: [PATCH 6/6] working one

---
 html/includes/common/syslog.inc.php | 85 +----------------------------
 1 file changed, 2 insertions(+), 83 deletions(-)

diff --git a/html/includes/common/syslog.inc.php b/html/includes/common/syslog.inc.php
index e5e492edc..eb61936a5 100644
--- a/html/includes/common/syslog.inc.php
+++ b/html/includes/common/syslog.inc.php
@@ -1,16 +1,6 @@
 <?php
-$no_refresh = true;
 
-$param = array();
-
-if ($vars['action'] == 'expunge' && $_SESSION['userlevel'] >= '10') {
-    dbQuery('TRUNCATE TABLE `syslog`');
-    print_message('syslog truncated');
-}
-
-$pagetitle[] = 'Syslog';
-$syslog_output = '
-<div class="table-responsive">
+$common_output[] = '
 <table id="syslog" class="table table-hover table-condensed table-striped">
     <thead>
         <tr>
@@ -21,91 +11,20 @@ $syslog_output = '
         </tr>
     </thead>
 </table>
-</div>
 
 <script>
 
-var grid = $("#syslog").bootgrid({
+var syslog_grid = $("#syslog").bootgrid({
     ajax: true,
-    templates: {
-        header: "<div id=\"{{ctx.id}}\" class=\"{{css.header}}\"><div class=\"row\">"+
-                "<div class=\"col-sm-9 actionBar\"><span class=\"pull-left\">"+
-                "<form method=\"post\" action=\"\" class=\"form-inline\" role=\"form\" id=\"result_form\">"+
-                "<div class=\"form-group\">"+
-                "<select name=\"device\" id=\"device\" class=\"form-control input-sm\">"+
-                "<option value=\"\">All Devices</option>"+
-';
-                foreach (get_all_devices() as $hostname) {
-                    $device_id = getidbyname($hostname);
-                    if (device_permitted($device_id)) {
-                        echo '"<option value=\"'.$device_id.'\"';
-                        if ($device_id == $vars['device']) {
-                            echo ' selected';
-                        }
-
-                        echo '>'.$hostname.'</option>"+';
-                    }
-                }
-$syslog_output .= '
-                "</select>"+
-                "</div>"+
-                "<div class=\"form-group\">"+
-                "<select name=\"program\" id=\"program\" class=\"form-control input-sm\">"+
-                "<option value=\"\">All Programs</option>"+
-';
-                foreach (dbFetchRows('SELECT DISTINCT `program` FROM `syslog` ORDER BY `program`') as $data) {
-                    echo '"<option value=\"'.$data['program'].'\"';
-                    if ($data['program'] == $vars['program']) {
-                        echo ' selected';
-                    }
-
-                    echo '>'.$data['program'].'</option>"+';
-                }
-$syslog_output .= '
-                "</select>"+
-                "</div>"+
-                "<div class=\"form-group\">"+
-                "<input name=\"from\" type=\"text\" class=\"form-control input-sm\" id=\"dtpickerfrom\" maxlength=\"16\" value=\"<?php echo $vars['from']; ?>\" placeholder=\"From\" data-date-format=\"YYYY-MM-DD HH:mm\">"+
-                "</div>"+
-                "<div class=\"form-group\">"+
-                "<input name=\"to\" type=\"text\" class=\"form-control input-sm\" id=\"dtpickerto\" maxlength=\"16\" value=\"<?php echo $vars['to']; ?>\" placeholder=\"To\" data-date-format=\"YYYY-MM-DD HH:mm\">"+
-                "</div>"+
-                "<button type=\"submit\" class=\"btn btn-default input-sm\">Filter</button>"+
-                "</form></span></div>"+
-                "<div class=\"col-sm-3 actionBar\"><p class=\"{{css.actions}}\"></p></div></div></div>"
-
-    },
     post: function ()
     {
         return {
             id: "syslog",
             device: "' .mres($vars['device']) .'",
-            program: "' .mres($vars['program']) .'",
-            to: "' .mres($vars['to']) .'",
-            from: "' .mres($vars['from']) .'",
         };
     },
     url: "ajax_table.php"
 });
 
-$(function () {
-    $("#dtpickerfrom").datetimepicker();
-    $("#dtpickerfrom").on("dp.change", function (e) {
-        $("#dtpickerto").data("DateTimePicker").minDate(e.date);
-    });
-    $("#dtpickerto").datetimepicker();
-    $("#dtpickerto").on("dp.change", function (e) {
-        $("#dtpickerfrom").data("DateTimePicker").maxDate(e.date);
-    });
-    if( $("#dtpickerfrom").val() != "" ) {
-        $("#dtpickerto").data("DateTimePicker").minDate($("#dtpickerfrom").val());
-    }
-    if( $("#dtpickerto").val() != "" ) {
-        $("#dtpickerfrom").data("DateTimePicker").maxDate($("#dtpickerto").val());
-    } else {
-        $("#dtpickerto").data("DateTimePicker").maxDate("'.mres($config['dateformat']['byminute']) .')";
-    }
-});
 </script>
 ';
-$common_output[] = $syslog_output;