From adafda77731a9301f91c482e70bab3f81cb15703 Mon Sep 17 00:00:00 2001
From: Florian Beer <fb@42dev.eu>
Date: Fri, 5 Aug 2016 14:30:06 +0200
Subject: [PATCH] Update syslog page

Brings Syslog page HTML in line with Eventlog page.
---
 html/includes/common/syslog.inc.php |   7 +-
 html/pages/syslog.inc.php           | 170 +++++++++++++---------------
 2 files changed, 84 insertions(+), 93 deletions(-)

diff --git a/html/includes/common/syslog.inc.php b/html/includes/common/syslog.inc.php
index 87eb4c04df..a28b487742 100644
--- a/html/includes/common/syslog.inc.php
+++ b/html/includes/common/syslog.inc.php
@@ -5,6 +5,7 @@ $common_output[] = '
     <table id="syslog" class="table table-hover table-condensed table-striped">
         <thead>
             <tr>
+                <th data-column-id="priority">&nbsp;</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>
@@ -21,7 +22,11 @@ var syslog_grid = $("#syslog").bootgrid({
     {
         return {
             id: "syslog",
-            device: "' .mres($vars['device']) .'",
+            device: "'.mres($vars['device']) .'",
+            program: "'.mres($vars['program']).'",
+            priority: "'.mres($vars['priority']).'",
+            to: "'.mres($vars['to']).'",
+            from: "'.mres($vars['from']).'",
         };
     },
     url: "ajax_table.php"
diff --git a/html/pages/syslog.inc.php b/html/pages/syslog.inc.php
index c94101bff9..6407074d3f 100644
--- a/html/pages/syslog.inc.php
+++ b/html/pages/syslog.inc.php
@@ -10,103 +10,82 @@ if ($vars['action'] == 'expunge' && $_SESSION['userlevel'] >= '10') {
 }
 
 $pagetitle[] = 'Syslog';
+
+print_optionbar_start();
+
 ?>
 
-<div class="table-responsive">
-<table id="syslog" class="table table-hover table-condensed table-striped">
-    <thead>
-        <tr>
-            <th data-column-id="priority">&nbsp;</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="msg">Message</th>
-        </tr>
-    </thead>
-</table>
+
+<div id="{{ctx.id}}" class="{{css.header}}">
+    <div class="row">
+        <div class="col-sm-9 actionBar">
+            <div 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">
+                        <select name="priority" id="priority" class="form-control input-sm">
+                            <option value="">All Priorities</option>
+                                <?php
+                                foreach (dbFetchRows('SELECT DISTINCT `priority` FROM `syslog` ORDER BY `level`') as $data) {
+                                    echo '"<option value="'.$data['priority'].'"';
+                                    if ($data['priority'] == $vars['priority']) {
+                                        echo ' selected';
+                                    }
+
+                                    echo '>'.$data['priority'].'</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>
+            </div>
+        </div>
+        <div class="col-sm-3 actionBar">
+            <p class="{{css.actions}}"></p>
+        </div>
+    </div>
 </div>
 
 <script>
-
-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\">"+
-                "<select name=\"priority\" id=\"priority\" class=\"form-control input-sm\">"+
-                "<option value=\"\">All Priorities</option>"+
-                <?php
-                foreach (dbFetchRows('SELECT DISTINCT `priority` FROM `syslog` ORDER BY `level`') as $data) {
-                    echo '"<option value=\"'.$data['priority'].'\"';
-                    if ($data['priority'] == $vars['priority']) {
-                        echo ' selected';
-                    }
-
-                    echo '>'.$data['priority'].'</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: '<?php echo htmlspecialchars($vars['device']); ?>',
-            program: '<?php echo htmlspecialchars($vars['program']); ?>',
-            priority: '<?php echo htmlspecialchars($vars['priority']); ?>',
-            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) {
@@ -126,3 +105,10 @@ $(function () {
     }
 });
 </script>
+
+<?php
+print_optionbar_end();
+require_once 'includes/common/syslog.inc.php';
+echo implode('',$common_output);
+?>
+