From 644da35ce172a94a6d7ef29b5533b00beac78857 Mon Sep 17 00:00:00 2001
From: coax <matija@coax.hr>
Date: Fri, 3 Feb 2017 20:40:51 +0100
Subject: [PATCH] v0.9.8

---
 README.md                            |  15 +-
 hMailAdmin/hm_account.php            |  17 +-
 hMailAdmin/hm_domain.php             |   2 +-
 hMailAdmin/hm_logviewer.php          | 359 +++------------------------
 hMailAdmin/hm_rule.php               |   4 +-
 hMailAdmin/hm_rules.php              |   4 +-
 hMailAdmin/hm_securityranges.php     |  31 ++-
 hMailAdmin/hm_status.php             |   4 +-
 hMailAdmin/index.php                 |   4 +-
 hMailAdmin/modern/css/core.css       |  14 +-
 hMailAdmin/modern/css/datepicker.css |   1 +
 hMailAdmin/modern/impressum.php      |  13 +-
 hMailAdmin/modern/js/core.js         |  35 ++-
 hMailAdmin/modern/js/datepicker.js   |   2 +
 hMailAdmin/modern/json.php           |   6 +-
 hMailAdmin/modern/logview.php        | 177 +++++++++++++
 16 files changed, 332 insertions(+), 356 deletions(-)
 create mode 100644 hMailAdmin/modern/css/datepicker.css
 create mode 100644 hMailAdmin/modern/js/datepicker.js
 create mode 100644 hMailAdmin/modern/logview.php

diff --git a/README.md b/README.md
index 80e81e6..f308f7f 100644
--- a/README.md
+++ b/README.md
@@ -14,14 +14,13 @@ Features
 - confirmation dialogs in modal
 - form validation
 - table sorting
-- simple log parser
+- log parser
 - based on original PHPWebAdmin
 - works with latest hMailServer (stable) version
-- continous development
+- continuous development
 
 Roadmap for 2017
 -----
-- better log parser
 - buy community license for [Imperavi Grafs](https://imperavi.com/grafs/) (hence the donation link below)
 
 Donate
@@ -50,12 +49,18 @@ If you DON'T HAVE PHPWebAdmin installed:
 
 5\. Access web admin interface from browser (eg. http://www.yourdomain.com/hmailadmin/) and sign in with hMailServer credentials
 
-Common issue: https://www.hmailserver.com/documentation/latest/?page=ts_setup_phpwebadmin
+Common issues: https://www.hmailserver.com/documentation/latest/?page=ts_setup_phpwebadmin
 
 Changelog
 -----
+Version 0.9.8 beta (2017-02-03)
+- [new] powerful log parser (using server-side logs)
+- [new] datepicker for date fields
+- [tweak] IP Ranges expiry date more friendly
+- [fix] greylisting checkbox in hm_domain.php
+
 Version 0.9.7 beta (2017-02-01)
-- tweak] convert all dates to ISO (YYYY-MM-DD HH:MM:SS) due consistency
+- [tweak] convert all dates to ISO (YYYY-MM-DD HH:MM:SS) due consistency
 - [tweak] dashboard optimizations in JSON
 - [fix] typo in background_account_save.php
 - [fix] minor fixes in validation fields
diff --git a/hMailAdmin/hm_account.php b/hMailAdmin/hm_account.php
index e5cbb63..cad5acb 100644
--- a/hMailAdmin/hm_account.php
+++ b/hMailAdmin/hm_account.php
@@ -161,8 +161,9 @@
 PrintPropertyAreaRow("vacationmessage", "Text", $vacationmessage, 6, 55);
 
 PrintCheckboxRow("vacationmessageexpires", "Automatically expires", $vacationmessageexpires);
-PrintPropertyEditRow("vacationmessageexpiresdate", "Use ISO date format (YYYY-MM-DD)", $vacationmessageexpiresdate);
 ?>
+          <p><?php EchoTranslation("Expiration date (YYYY-MM-DD)")?></p>
+          <input type="text" name="vacationmessageexpiresdate" value="<?php echo $vacationmessageexpiresdate ?>" maxlength="10" data-toggle="datepicker" class="small">
         </div>
         <h3><a href="#"><?php EchoTranslation("Forwarding")?></a></h3>
         <div class="hidden">
@@ -231,9 +232,9 @@
 
 		$move = '';
 		if ($i > 0)
-			$move = $move . '<a href="?page=background_rule_save&action=move&savetype=ruleup&domainid=' . $domainid . '&accountid=' . $accountid . '&ruleid=' . $ruleid . '" class="arrow up">Up</a>';
+			$move = $move . '<a href="?page=background_rule_save&csrftoken=' . $csrftoken . '&action=move&savetype=ruleup&domainid=' . $domainid . '&accountid=' . $accountid . '&ruleid=' . $ruleid . '" class="arrow up">Up</a>';
 		if ($i < $Count-1)
-			$move = $move . '<a href="?page=background_rule_save&action=move&savetype=ruledown&domainid=' . $domainid . '&accountid=' . $accountid . '&ruleid=' . $ruleid . '" class="arrow down">Down</a>';
+			$move = $move . '<a href="?page=background_rule_save&csrftoken=' . $csrftoken . '&action=move&savetype=ruledown&domainid=' . $domainid . '&accountid=' . $accountid . '&ruleid=' . $ruleid . '" class="arrow down">Down</a>';
 
 		echo '              <tr>
                 <td><a href="?page=rule&action=edit&domainid=' . $domainid . '&accountid=' . $accountid . '&ruleid=' . $ruleid . '">' . $rulename . '</a></td>
@@ -261,6 +262,7 @@
 PrintPropertyEditRow("PersonLastName", "Last name", $PersonLastName);
 ?>
         </div>
+<?php if ($accountid > 0) { ?>
         <h3><a href="#"><?php EchoTranslation("External accounts") ?></a></h3>
         <div class="hidden">
           <table>
@@ -288,10 +290,10 @@
 	$ServerAddress = $obFetchAccount->ServerAddress;
 
 	echo '              <tr>
-                <td><a href="?page=account_externalaccount&action=edit&domainid=' . $domainid . '&accountid=' . $accountid . '&faid=' . $FAID . '">' . $Name . '</a></td>
-                <td><a href="?page=account_externalaccount&action=edit&domainid=' . $domainid . '&accountid=' . $accountid . '&faid=' . $FAID . '">' . $ServerAddress . '</a></td>
-                <td><a href="?page=background_account_externalaccount_save&action=downloadnow&domainid=' . $domainid . '&accountid=' . $accountid . '&faid=' . $FAID . '" class="download">' . $str_downloadnow . '</a></td>
-                <td><a href="#" onclick="return Confirm(\'Confirm delete <b>' . $Name . '</b>:\',\'Yes\',\'?page=background_account_externalaccount_save&action=delete&domainid=' . $domainid . '&accountid=' . $accountid . '&faid=' . $FAID . '\');" class="delete">' . $str_delete . '</a></td>
+                <td><a href="?page=account_externalaccount&csrftoken=' . $csrftoken . '&action=edit&domainid=' . $domainid . '&accountid=' . $accountid . '&faid=' . $FAID . '">' . $Name . '</a></td>
+                <td><a href="?page=account_externalaccount&csrftoken=' . $csrftoken . '&action=edit&domainid=' . $domainid . '&accountid=' . $accountid . '&faid=' . $FAID . '">' . $ServerAddress . '</a></td>
+                <td><a href="?page=background_account_externalaccount_save&csrftoken=' . $csrftoken . '&action=downloadnow&domainid=' . $domainid . '&accountid=' . $accountid . '&faid=' . $FAID . '" class="download">' . $str_downloadnow . '</a></td>
+                <td><a href="#" onclick="return Confirm(\'Confirm delete <b>' . $Name . '</b>:\',\'Yes\',\'?page=background_account_externalaccount_save&csrftoken=' . $csrftoken . '&action=delete&domainid=' . $domainid . '&accountid=' . $accountid . '&faid=' . $FAID . '\');" class="delete">' . $str_delete . '</a></td>
               </tr>' . PHP_EOL;
 }
 ?>
@@ -300,6 +302,7 @@
           <div class="buttons center"><a href="?page=account_externalaccount&action=add&domainid=<?php echo $domainid ?>&accountid=<?php echo $accountid ?>" class="button"><?php EchoTranslation("Add new external account") ?></a></div>
         </div>
 <?php
+};
 PrintSaveButton();
 ?>
       </form>
diff --git a/hMailAdmin/hm_domain.php b/hMailAdmin/hm_domain.php
index e62a851..0ddacb2 100644
--- a/hMailAdmin/hm_domain.php
+++ b/hMailAdmin/hm_domain.php
@@ -254,7 +254,7 @@
           <h3><a href="#"><?php EchoTranslation("Greylisting")?></a></h3>
           <div class="hidden">
 <?php
-PrintCheckboxRow("domainantispamenablegreylisting", $obLanguage->String("Enabled"), $domainantispamenablegreylistingchecked);
+PrintCheckboxRow("domainantispamenablegreylisting", $obLanguage->String("Enabled"), $domainantispamenablegreylisting);
 ?>
           </div>
 <?php
diff --git a/hMailAdmin/hm_logviewer.php b/hMailAdmin/hm_logviewer.php
index 2364266..68004b2 100644
--- a/hMailAdmin/hm_logviewer.php
+++ b/hMailAdmin/hm_logviewer.php
@@ -1,326 +1,41 @@
-<style type="text/css">
-.file_container, .log_container {position:relative; font-size:9pt;}
-div.event {margin:18px 18px 0 18px; padding:4px;}
-div.event .line div {display:inline-block; margin:0 18px 0; line-height:150%;}
-div.event a.tag {display:block; float:right; background:#1784c7; color:#fff; text-align:center; padding:4px; margin:0 4px 4px 0;}
-div.event a.tag-ip {clear:right}
-div.event a.tag-ip img {display:inline-block; vertical-align:middle; margin-right:.4em}
-div.event:hover {background: #f9fafa;}
-div.event .line:hover {background:#f2f2f2;}
-/* Clearfix */
-.cf:before, .cf:after {content:' '; display:table;}
-.cf:after {clear:both;}
-.cf {*zoom:1;}
-</style>
-<script type="text/javascript">
-var file, intv, size, position;
-
-var options = {
-	parseSize: 50, // Parses only last n kilobytes. Value of 0 will parse entire file but not recommended for performance reasons.
-	displayLimit: 100, // Limits displayed event group count.  Value of 0 will display all events.
-	updateInterval: 500, // Update interval, in miliseconds. Lower value means frequent updates.
-	newLine: "\r\n",
-	flagPath: 'https://raw.githubusercontent.com/hazarkarabay/hmailserver-logviewer/master/flags/'
-};
-
-// This holds known events and their formatting.
-var events = {
-	SMTPD: {
-		groupId: 'group-{0}-{2}',
-		groupHTML: '<div id="group-{0}-{2}" class="event type-{0} cf"><a class="tag">{0}</a><a class="tag tag-group">{2}</a><a class="tag tag-ip">{4}</a><div class="line-container"></div></div>',
-		lineHTML: '<div class="line"><div class="column-3">{3}</div><div class="column-5">{5}</div></div>',
-		columnFormatter: function(data) {
-
-			// Long line snipper.
-			if (data[5].length > 100) {
-				data[5] = data[5].substr(0, 40) + '···8<···' + data[5].substr(data[5].length - 40, data[5].length);
-			}
-
-			// AUTH LOGIN decoder.
-			// First we get a RECEIVED: AUTH LOGIN
-			// The next RECEIVED: line contains login username which is e-mail address, base64 encoded.
-			if (typeof window._cfDataStorage != "object")
-				window._cfDataStorage = {};
-
-			if (typeof window._cfDataStorage[data[0] + data[2]] != "undefined" && data[5].indexOf('RECEIVED: ') > -1) {
-				// We got it.
-				var base64 = data[5].substr(data[5].lastIndexOf(" ") + 1, data[5].length);
-				data[5] = 'RECEIVED: ' + decodeBase64(base64);
-				delete window._cfDataStorage[data[0] + data[2]];
-			} else if (data[5].indexOf('RECEIVED: AUTH LOGIN') > -1) {
-				// Wait for it.
-				window._cfDataStorage[data[0] + data[2]] = true;
-			}
-
-			return data;
-		}
-	},
-	ERROR: {
-		groupHTML: '<div id="group-{0}-{2}" class="event type-{0} cf"><a class="tag">{0}</a><div class="line-container"></div></div>',
-		lineHTML: '<div class="line"><div class="column-2">{2}</div><div class="column-3">{3}</div></div>'
-	}
-};
-
-// SMTPC is same thing as SMTPD and I hate repeating things.
-events.SMTPC = events.SMTPD;
-
-$(function() {
-	$("#logfile").change(function() {
-		file = $(this).prop('files')[0];
-		if (!file)
-			alert('You need to select a log file.');
-
-		// Initialize
-		$("div.log_container").html('');
-		window.clearInterval(intv);
-		size = file.size;
-		position = 0;
-
-		if (options.parseSize > 0 && size > 1024 * options.parseSize) {
-			// As we cut from middle of the file, this position most likely located at middle of the line.
-			position = size - 1024 * options.parseSize;
-
-			// We try to find next new line and put the start mark there.
-			var reader = new FileReader();
-			reader.onloadend = function(evt) {
-				if (evt.target.readyState == FileReader.DONE) {
-					position += evt.target.result.indexOf(options.newLine) + options.newLine.length;
-
-					// Start the loop
-					read(position);
-					intv = window.setInterval(function() {
-						read(position)
-					}, options.updateInterval);
-				}
-			};
-			var blob = file.slice(position, position + 1000);
-			reader.readAsBinaryString(blob);
-		} else {
-			// Start the loop
-			read(position);
-			intv = window.setInterval(function() {
-				read(position)
-			}, options.updateInterval);
-		}
-	});
-
-	// IP lookup loop
-	window.setInterval(function() {
-		IPLookup();
-	}, options.updateInterval);
-});
-
-function read(startByte, endByte) {
-	var reader = new FileReader();
-
-	var start = parseInt(startByte) || 0;
-	var end = parseInt(endByte) || file.size;
-
-	if (start == end)
-		return;
-
-	reader.onloadend = function(evt) {
-		if (evt.target.readyState == FileReader.DONE) {
-			parse(evt.target.result);
-			if (options.displayLimit > 0) {
-				// To keep browser up and running, we're limiting the on-screen log threads.
-				$("div.log_container .event").slice(options.displayLimit).remove();
-			}
-			position = end;
-		}
-	};
-
-	var blob = file.slice(start, end);
-	reader.readAsBinaryString(blob);
-}
-
-function parse(text) {
-	var lines = text.split(options.newLine);
-	var data, elem;
-	var container = $("div.log_container");
-
-	var parent = container.parent();
-	container.detach();
-
-	console.time('parse');
-
-	$.each(lines, function(k, v) {
-		data = v.replace(/"/g, "").split("\t");
-
-		if (typeof events[data[0]] != "undefined") {
-			var eTempCache = events[data[0]];
-
-			// Run column formatters if exists
-			if (typeof eTempCache.columnFormatter == 'function') {
-				data = eTempCache.columnFormatter(data);
-			}
-
-			if (typeof eTempCache.groupId != "undefined") {
-				// This event type has to be grouped.
-				if ($("#" + eTempCache.groupId.substitute(data), container).length == 0) {
-					// Let's create it.
-					container.prepend($.parseHTML(eTempCache.groupHTML.substitute(data)));
-				} // Else it is already exists.
-				elem = $("#" + eTempCache.groupId.substitute(data) + ' div.line-container', container);
-			} else {
-				// This is one shot event.
-				elem = $($.parseHTML(eTempCache.groupHTML.substitute(data))).prependTo(container).find('div.line-container');
-			}
-
-			// Add line
-			elem.prepend($.parseHTML(eTempCache.lineHTML.substitute(data)));
-
-		} else
-			return true; // continue;
-	});
-
-	console.timeEnd('parse');
-
-	console.time('repaint');
-	parent.append(container);
-	console.timeEnd('repaint');
-}
-
-function IPLookup() {
-	if (typeof window._hmLogIPLookup != "object")
-		window._hmLogIPLookup = {
-			running: false,
-			data: {}
-		};
-
-	var cache = window._hmLogIPLookup;
-
-	if (cache.running)
-		return false;
-
-	// Loop each .event which contains a class="tag tag-ip"
-	// We don't want to DDoS that free service, so we limit our parallel queries.
-	if ($(".log_container a.tag-ip:not(.processed)").length) {
-		cache.running = true;
-		$.when($(".log_container a.tag-ip:not(.processed)").slice(0, 3).each(function() {
-				var elem = $(this);
-				var ip = elem.text();
-
-				// Cache control
-				if (cache.data[ip]) {
-					var flag = options.flagPath + cache.data[ip]['country_code'].toLowerCase() + '.png';
-					elem.prepend('<img src="' + flag + '" title="' + cache.data[ip]['country_name'] + ' ' + cache.data[ip]['region_name'] + '">');
-					elem.addClass('processed');
-				} else {
-					$.get("http://freegeoip.net/json/" + ip)
-						.done(function(data) {
-							console.log(data);
-							cache.data[ip] = data;
-							var flag = options.flagPath + cache.data[ip]['country_code'].toLowerCase() + '.png';
-							elem.prepend('<img src="' + flag + '" title="' + cache.data[ip]['country_name'] + ' ' + cache.data[ip]['region_name'] + '">');
-							elem.addClass('processed');
-						}, "json");
-				}
-			}))
-			.then(function() {
-				cache.running = false;
-			});
-	}
-
-}
-
-// Helper functions
-var base64Matcher = new RegExp("^(?:[A-Za-z0-9+/]{4})*(?:[A-Za-z0-9+/]{2}==|[A-Za-z0-9+/]{3}=|[A-Za-z0-9+/]{4})([=]{1,2})?$");
-
-var entityMap = {
-	"&": "&amp;",
-	"<": "&lt;",
-	">": "&gt;",
-	'"': '&quot;',
-	"'": '&#39;',
-	"/": '&#x2F;'
-};
-
-function escapeHtml(string) {
-	return String(string).replace(/[&<>"'\/]/g, function(s) {
-		return entityMap[s];
-	});
-}
-
-String.prototype.substitute = function(obj) {
-	return String(this).replace(/\\?\{([^{}]+)\}/g, function(match, name) {
-		if (match.charAt(0) == '\\')
-			return match.slice(1);
-		return (obj[name] != null) ? escapeHtml(obj[name]) : '';
-	});
-};
-
-// http://stackoverflow.com/questions/15900485/correct-way-to-convert-size-in-bytes-to-kb-mb-gb-in-javascript
-function bytesToSize(bytes) {
-	var sizes = ['Bytes', 'KB', 'MB', 'GB', 'TB'];
-	if (bytes == 0)
-		return '0 Bytes';
-	var i = parseInt(Math.floor(Math.log(bytes) / Math.log(1024)));
-	return Math.round(bytes / Math.pow(1024, i), 2) + ' ' + sizes[i];
-}
-
-// http://stackoverflow.com/a/15016605
-decodeBase64 = function(s) {
-	var e = {},
-		i, b = 0,
-		c, x, l = 0,
-		a, r = '',
-		w = String.fromCharCode,
-		L = s.length;
-	var A = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/";
-	for (i = 0; i < 64; i++) {
-		e[A.charAt(i)] = i;
-	}
-	for (x = 0; x < L; x++) {
-		c = e[s.charAt(x)];
-		b = (b << 6) + c;
-		l += 6;
-		while (l >= 8) {
-			((a = (b >>> (l -= 8)) & 0xff) || (x < (L - 2))) && (r += w(a));
-		}
-	}
-	return r;
-};
-
-// for debug purposes
-function dump(arr, level) {
-	var dumped_text = "";
-	if (!level)
-		level = 0;
-
-	//The padding given at the beginning of the line.
-	var level_padding = "";
-	for (var j = 0; j < level + 1; j++)
-		level_padding += "    ";
-
-	if (typeof(arr) == 'object') { //Array/Hashes/Objects
-		for (var item in arr) {
-			var value = arr[item];
-
-			if (typeof(value) == 'object') { //If it is an array,
-				dumped_text += level_padding + "'" + item + "' ...\n";
-				dumped_text += dump(value, level + 1);
-			} else {
-				dumped_text += level_padding + "'" + item + "' => \"" + value + "\"\n";
-			}
-		}
-	} else { //Stings/Chars/Numbers etc.
-		dumped_text = "===>" + arr + "<===(" + typeof(arr) + ")";
-	}
-	return dumped_text;
-}
-</script>
-    <div class="box medium file_container">
+<?php
+if (!defined('IN_WEBADMIN'))
+	exit();
+
+if (hmailGetAdminLevel() != 2)
+	hmailHackingAttemp();
+?>
+    <div class="box large">
       <h2>hMailServer Log Parser</h2>
       <div style="margin:0 18px 18px;">
-        <p>Select your log file.</p>
-        <div style="margin-top:9px;"><input type="file" name="file" id="logfile"></div>
-      </div>
-    </div>
-
-    <div class="box large log_container">
-      <h2>Results</h2>
-      <div style="margin:0 18px 18px;">
-        <p>Your logs will show here.</p>
+        <form action="" class="cd-form" id="log-parser">
+<?php
+PrintHiddenCsrfToken();
+?>
+          <p>Date:</p>
+          <input type="text" name="LogFilename" value="<?php echo date("Y-m-d") ?>" maxlength="10" data-toggle="datepicker" class="small">
+          <p>Show logs only for:</p>
+          <select name="LogType" class="small">
+            <option value="SMTPD" selected>SMTP server (daemon)</option>
+            <option value="SMTPC">SMTP client</option>
+            <option value="POP3D">POP3</option>
+            <option value="POP3C">POP3 fetch</option>
+            <option value="IMAPD">IMAP</option>
+            <option value="DEBUG">Debug</option>
+            <option value="TCPIP">Tcp IP</option>
+            <option value="APPLICATION">Application</option>
+            <option value="ERROR">Errors</option>
+            <option value="ALL">All</option>
+            <option value="RAW">Unparsed (raw)</option>
+          </select>
+          <p>Filter results by:</p>
+          <input type="text" name="LogFilter" value="" maxlength="50" class="small">
+          <div class="buttons"><input type="submit" value="Parse log"></div>
+          <p>Results:</p>
+          <div id="results">
+            Click on "Parse log" button
+          </div>
+          <div class="buttons"><input type="button" value="Clear results"></div>
+        </form>
       </div>
     </div>
\ No newline at end of file
diff --git a/hMailAdmin/hm_rule.php b/hMailAdmin/hm_rule.php
index 702550c..70c27f9 100644
--- a/hMailAdmin/hm_rule.php
+++ b/hMailAdmin/hm_rule.php
@@ -115,9 +115,9 @@
 
 		$move = '';
 		if ($i > 0)
-			$move = $move . '<a href="?page=background_rule_save&action=move&savetype=actionup&domainid=' . $domainid . '&accountid=' . $accountid . '&ruleid=' . $ruleid . '&actionid=' . $actionid . '" class="arrow up">Up</a>';
+			$move = $move . '<a href="?page=background_rule_save&csrftoken=' . $csrftoken . '&action=move&savetype=actionup&domainid=' . $domainid . '&accountid=' . $accountid . '&ruleid=' . $ruleid . '&actionid=' . $actionid . '" class="arrow up">Up</a>';
 		if ($i < $count-1)
-			$move = $move . '<a href="?page=background_rule_save&action=move&savetype=actiondown&domainid=' . $domainid . '&accountid=' . $accountid . '&ruleid=' . $ruleid . '&actionid=' . $actionid . '" class="arrow down">Down</a>';
+			$move = $move . '<a href="?page=background_rule_save&csrftoken=' . $csrftoken . '&action=move&savetype=actiondown&domainid=' . $domainid . '&accountid=' . $accountid . '&ruleid=' . $ruleid . '&actionid=' . $actionid . '" class="arrow down">Down</a>';
 
 		echo '              <tr>
                 <td><a href="?page=rule_action&action=edit&domainid=' . $domainid . '&accountid=' . $accountid . '&ruleid=' . $ruleid . '&actionid=' . $actionid . '">' . $actionName . '</a></td>
diff --git a/hMailAdmin/hm_rules.php b/hMailAdmin/hm_rules.php
index d724876..bd8e302 100644
--- a/hMailAdmin/hm_rules.php
+++ b/hMailAdmin/hm_rules.php
@@ -33,9 +33,9 @@
 
 	$move = '';
 	if ($i > 0)
-		$move = $move . '<a href="?page=background_rule_save&action=move&savetype=ruleup&domainid=0&accountid=0&ruleid=' . $ruleid . '" class="arrow up">Up</a>';
+		$move = $move . '<a href="?page=background_rule_save&csrftoken=' . $csrftoken . '&action=move&savetype=ruleup&domainid=0&accountid=0&ruleid=' . $ruleid . '" class="arrow up">Up</a>';
 	if ($i < $Count-1)
-		$move = $move . '<a href="?page=background_rule_save&action=move&savetype=ruledown&domainid=0&accountid=0&ruleid=' . $ruleid . '" class="arrow down">Down</a>';
+		$move = $move . '<a href="?page=background_rule_save&csrftoken=' . $csrftoken . '&action=move&savetype=ruledown&domainid=0&accountid=0&ruleid=' . $ruleid . '" class="arrow down">Down</a>';
 
 	echo '            <tr>
               <td><a href="?page=rule&action=edit&domainid=0&accountid=0&ruleid=' . $ruleid . '">' . $rulename . '</a></td>
diff --git a/hMailAdmin/hm_securityranges.php b/hMailAdmin/hm_securityranges.php
index fb46eb6..207ce6e 100644
--- a/hMailAdmin/hm_securityranges.php
+++ b/hMailAdmin/hm_securityranges.php
@@ -17,12 +17,35 @@
             <tr>
               <th><?php EchoTranslation("Name")?></th>
               <th style="width:10%;"><?php EchoTranslation("Priority") ?></th>
-              <th style="width:20%;"><?php EchoTranslation("Expires (min)") ?></th>
+              <th style="width:20%;"><?php EchoTranslation("Expires") ?></th>
               <th style="width:32px;" class="no-sort">&nbsp;</th>
             </tr>
           </thead>
           <tbody>
 <?php
+function humanTiming($time) {
+	$time = $time - time();
+	$time = ($time<1) ? 0 : $time;
+	$tokens = array (
+		31536000 => 'year',
+		2592000 => 'month',
+		604800 => 'week',
+		86400 => 'day',
+		3600 => 'hour',
+		60 => 'minute',
+		1 => 'second'
+	);
+
+	if ($time == 0)
+		return 'Never';
+	else
+		foreach ($tokens as $unit => $text) {
+			if ($time < $unit) continue;
+			$numberOfUnits = floor($time / $unit);
+			return $numberOfUnits . ' ' . $text . (($numberOfUnits>1) ? 's' : '');
+		}
+}
+
 for ($i = 0; $i < $Count; $i++) {
 	$obSecurityRange = $obSecurityRanges->Item($i);
 	$securityrangename = $obSecurityRange->Name;
@@ -30,12 +53,14 @@
 
 	$securityrangename = PreprocessOutput($securityrangename);
 	$securityrangepriority = $obSecurityRange->Priority; //added
-	$ExpiresTime = $obSecurityRange->Expires ? ceil((strtotime($obSecurityRange->ExpiresTime)-time())/60):'Never expires'; //added
+	//$ExpiresTime = $obSecurityRange->Expires ? ceil((strtotime($obSecurityRange->ExpiresTime)-time())/60):'Never expires'; //added
+	$ExpiresTime = $obSecurityRange->ExpiresTime;
+
 
 	echo '            <tr>
               <td><a href="?page=securityrange&action=edit&securityrangeid=' . $securityrangeid . '"' . (strpos($securityrangename,'Auto-ban:')!==false?' class="red"':'') . '>' . $securityrangename . '</a></td>
               <td>' . $securityrangepriority . '</td>
-              <td>' . $ExpiresTime . '</td>
+              <td>' . humanTiming(strtotime($ExpiresTime)) . '</td>
               <td><a href="#" onclick="return Confirm(\'Confirm delete <b>' . $securityrangename . '</b>:\',\'Yes\',\'?page=background_securityrange_save&csrftoken=' . $csrftoken . '&action=delete&securityrangeid=' . $securityrangeid . '\');" class="delete">Delete</a></td>
             </tr>' . PHP_EOL;
 }
diff --git a/hMailAdmin/hm_status.php b/hMailAdmin/hm_status.php
index 6f23287..271953b 100644
--- a/hMailAdmin/hm_status.php
+++ b/hMailAdmin/hm_status.php
@@ -76,7 +76,7 @@
 
 		if (count($columns)>4) {
 			$columns[4] = makeIsoDate($columns[4]);
-			if ($columns[4] == "1970-01-01 01:00:00") $columns[4] = "ASAP";
+			if ($columns[4] <= "1970-01-01 01:00:00") $columns[4] = "ASAP";
 
 			echo '            <tr>
               <td><a href="modern/view.php?q=' . $columns[5] . '" rel="facebox">' . $columns[0] . '</a></td>
@@ -84,7 +84,7 @@
               <td>' . PreprocessOutput($columns[2]) . '</td>
               <td>' . PreprocessOutput($columns[3]) . '</td>
               <td>' . $columns[4] . '</td>
-              <td>' . $columns[6] . '</td>
+              <td>' . $columns[7] . '</td>
             </tr>' . PHP_EOL;
 		}
 	}
diff --git a/hMailAdmin/index.php b/hMailAdmin/index.php
index a9c28dc..6c53dc9 100644
--- a/hMailAdmin/index.php
+++ b/hMailAdmin/index.php
@@ -80,6 +80,8 @@
   <script type="text/javascript" src="modern/js/chartist.js"></script>
   <link href="modern/css/chartist.css" rel="stylesheet">
   <script type="text/javascript" src="modern/js/chartist-tooltip.js"></script>
+  <script type="text/javascript" src="modern/js/datepicker.js"></script>
+  <link href="modern/css/datepicker.css" rel="stylesheet">
   <link href="modern/css/reset.css" rel="stylesheet">
   <link href="modern/css/core.css" rel="stylesheet">
 </head>
@@ -117,7 +119,7 @@
 include "include_treemenu.php";
 ?>
       </ul>
-      <a href="modern/impressum.php" rel="facebox" class="impressum">hMailAdmin 0.9.7 [beta]</a>
+      <a href="modern/impressum.php" rel="facebox" class="impressum">hMailAdmin 0.9.8 [beta]</a>
     </nav>
 
     <div class="content-wrapper">
diff --git a/hMailAdmin/modern/css/core.css b/hMailAdmin/modern/css/core.css
index dd4ee1f..b7d0d93 100644
--- a/hMailAdmin/modern/css/core.css
+++ b/hMailAdmin/modern/css/core.css
@@ -82,7 +82,7 @@ table tbody tr:hover {background:#f2f2f2;}
 table th:nth-child(1) {text-indent:10px;}
 table td a:nth-child(1) {padding-left:10px;}
 table.queue th:nth-child(1), table.queue th:nth-child(6), table.queue td:nth-child(1), table.queue td:nth-child(6) {width:8%;}
-table.queue th:nth-child(2), table.queue th:nth-child(5), table.queue td:nth-child(2), table.queue td:nth-child(5) {width:17%;}
+table.queue th:nth-child(2), table.queue th:nth-child(5), table.queue td:nth-child(2), table.queue td:nth-child(5) {width:17%; overflow:hidden; overflow-x:auto;}
 table.queue th:nth-child(3), table.queue th:nth-child(4), table.queue td:nth-child(3), table.queue td:nth-child(4) {width:25%; overflow:hidden; overflow-x:auto;}
 
 /* chartist */
@@ -223,6 +223,18 @@ input.wait, input:hover.wait {background:url('../../modern/css/wait.gif') 50% no
 .has-children.selected > ul {display:block;}
 .has-children.selected > a::after {-webkit-transform:translateY(-50%) rotate(180deg); -moz-transform:translateY(-50%) rotate(180deg); -ms-transform:translateY(-50%) rotate(180deg); -o-transform:translateY(-50%) rotate(180deg); transform:translateY(-50%) rotate(180deg);}
 
+/* log viewer */
+.cd-form #results {width:100%; max-height:500px; padding:8px; border:1px solid #cfd9db; background-color:#fff; border-radius:3px; box-shadow:inset 0 1px 1px rgba(0, 0, 0, 0.08); font-size:12px; color:#3e454c; overflow:auto;}
+.cd-form #results > div {clear:both; min-width:900px; margin-bottom:4px;}
+.cd-form #results > div span {display:inline-block; border-bottom:1px dotted; font-weight:700;}
+.cd-form #results > div ul {padding:8px 0; display:table; width:100%;}
+.cd-form #results > div ul li {display:table-row;}
+.cd-form #results > div ul li:hover {background:#f2f2f2;}
+.cd-form #results > div ul li div {display:table-cell; padding:0 8px; line-height:16px;}
+.cd-form #results > div ul li div:first-child {width:180px;}
+.cd-form #results > div ul li div em {font-style:normal; color:#ff7e66;}
+.cd-form #results > div sup {font-size:9px;}
+
 /* tablet */
 @media only screen and (min-width:768px) {
 	.cd-main-content .content-wrapper {margin-left:110px; padding-top:85px;}
diff --git a/hMailAdmin/modern/css/datepicker.css b/hMailAdmin/modern/css/datepicker.css
new file mode 100644
index 0000000..c40f3bf
--- /dev/null
+++ b/hMailAdmin/modern/css/datepicker.css
@@ -0,0 +1 @@
+.datepicker-container li{line-height:30px;}.datepicker-container{font-size:12px;line-height:30px;position:fixed;z-index:-1;top:0;left:0;width:210px;-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none;background-color:#fff;direction:ltr!important;-ms-touch-action:none;touch-action:none;-webkit-tap-highlight-color:transparent;-webkit-touch-callout:none}.datepicker-container:after,.datepicker-container:before{position:absolute;display:block;width:0;height:0;content:' ';border:5px solid transparent}.datepicker-dropdown{position:absolute;z-index:1;-webkit-box-sizing:content-box;-moz-box-sizing:content-box;box-sizing:content-box;border:1px solid #ccc;-webkit-box-shadow:0 3px 6px #ccc;box-shadow:0 3px 6px #ccc}.datepicker-inline{position:static}.datepicker-top-left,.datepicker-top-right{border-top-color:#1784c7}.datepicker-top-left:after,.datepicker-top-left:before,.datepicker-top-right:after,.datepicker-top-right:before{top:-5px;left:10px;border-top:0}.datepicker-top-left:before,.datepicker-top-right:before{border-bottom-color:#1784c7}.datepicker-top-left:after,.datepicker-top-right:after{top:-4px;border-bottom-color:#fff}.datepicker-bottom-left,.datepicker-bottom-right{border-bottom-color:#1784c7}.datepicker-bottom-left:after,.datepicker-bottom-left:before,.datepicker-bottom-right:after,.datepicker-bottom-right:before{bottom:-5px;left:10px;border-bottom:0}.datepicker-bottom-left:before,.datepicker-bottom-right:before{border-top-color:#1784c7}.datepicker-bottom-left:after,.datepicker-bottom-right:after{bottom:-4px;border-top-color:#fff}.datepicker-bottom-right:after,.datepicker-bottom-right:before,.datepicker-top-right:after,.datepicker-top-right:before{right:10px;left:auto}.datepicker-panel>ul:after,.datepicker-panel>ul:before{display:table;content:' '}.datepicker-panel>ul:after{clear:both}.datepicker-panel>ul{width:102%;margin:0;padding:0}.datepicker-panel>ul>li{float:left;width:30px;height:30px;margin:0;padding:0;list-style:none;cursor:pointer;text-align:center;background-color:#fff}.datepicker-panel>ul>li:hover{background-color:#eee}.datepicker-panel>ul>li.muted,.datepicker-panel>ul>li.muted:hover{color:#999}.datepicker-panel>ul>li.picked,.datepicker-panel>ul>li.picked:hover{color:#1784c7}.datepicker-panel>ul>li.disabled,.datepicker-panel>ul>li.disabled:hover{cursor:default;color:#ccc;background-color:#fff}.datepicker-panel>ul>li[data-view='years prev'],.datepicker-panel>ul>li[data-view='year prev'],.datepicker-panel>ul>li[data-view='month prev'],.datepicker-panel>ul>li[data-view='years next'],.datepicker-panel>ul>li[data-view='year next'],.datepicker-panel>ul>li[data-view='month next'],.datepicker-panel>ul>li[data-view=next]{font-size:18px}.datepicker-panel>ul>li[data-view='month current'],.datepicker-panel>ul>li[data-view='years current'],.datepicker-panel>ul>li[data-view='year current']{width:150px}.datepicker-panel>ul[data-view=years]>li,.datepicker-panel>ul[data-view=months]>li{line-height:52.5px;width:52.5px;height:52.5px}.datepicker-panel>ul[data-view=week]>li,.datepicker-panel>ul[data-view=week]>li:hover{cursor:default;background-color:#fff}.datepicker-hide{display:none}
\ No newline at end of file
diff --git a/hMailAdmin/modern/impressum.php b/hMailAdmin/modern/impressum.php
index 1f41489..084a7bf 100644
--- a/hMailAdmin/modern/impressum.php
+++ b/hMailAdmin/modern/impressum.php
@@ -1,22 +1,23 @@
 <h2>Impressum</h2>
 <div style="margin:0 18px 18px;">
-  <p>WebAdmin redesign &amp; coding by <a href="http://www.matecic.com/" target="_blank">Matija Matečić</a></p>
+  <p>hMailServer web admin redesign &amp; coding by <a href="http://www.matecic.com/" target="_blank">Matija Matečić</a></p>
   <p>Additional coding by Andreas Tunberg</p>
-  <p>Version 0.9.7 [beta], source on <a href="https://github.com/coax/hmailserver-webadmin" target="_blank">GitHub</a>
+  <p>Version 0.9.8 [beta], source on <a href="https://github.com/coax/hmailserver-webadmin" target="_blank">GitHub</a>
   <p>hMailServer author Martin Knafve</p>
   <p>License information <a href="https://www.hmailserver.com/documentation/latest/?page=information_copyright" target="_blank">here</a></p>
   <h3>Third party components</h3>
-  <p>This section lists third party components and libraries used in hMailServer PHPWebAdmin.</p>
+  <p>This section lists third party components and libraries used in hMailAdmin:</p>
   <ul style="padding:0 10px;">
     <li style="padding-bottom:4px;"><a href="https://jquery.com/" target="_blank">jQuery</a></li>
     <li style="padding-bottom:4px;"><a href="https://modernizr.com/" target="_blank">Modernizr</a></li>
     <li style="padding-bottom:4px;"><a href="http://defunkt.io/facebox/" target="_blank">Defunkt Facebox</a></li>
-    <li style="padding-bottom:4px;"><a href="http://github.com/kylefox/jquery-tablesort" target="_blank">tablesort</a></li>
-    <li style="padding-bottom:4px;"><a href="http://timeago.yarp.com/" target="_blank">timeago</a></li>
+    <li style="padding-bottom:4px;"><a href="https://github.com/kylefox/jquery-tablesort" target="_blank">tablesort</a></li>
+    <li style="padding-bottom:4px;"><a href="https://github.com/fengyuanchen/datepicker" target="_blank">datepicker</a></li>
+    <li style="padding-bottom:4px;"><a href="https://timeago.yarp.com/" target="_blank">timeago</a></li>
     <li style="padding-bottom:4px;"><a href="https://gionkunz.github.io/chartist-js/" target="_blank">Chartist</a></li>
     <li style="padding-bottom:4px;"><a href="https://codyhouse.co/gem/responsive-sidebar-navigation/" target="_blank">CodyHouse Responsive Sidebar Navigation</a></li>
     <li style="padding-bottom:4px;"><a href="https://useiconic.com/open/" target="_blank">Open Iconic</a></li>
-    <li style="padding-bottom:4px;"><a href="https://github.com/hazarkarabay/hmailserver-logviewer" target="_blank">hMailServer log viewer</a></li>
+    <!--<li style="padding-bottom:4px;"><a href="https://github.com/hazarkarabay/hmailserver-logviewer" target="_blank">hMailServer log viewer</a></li>-->
   </ul>
   <h3>Donate</h3>
   <p>Don't worry, hMailAdmin will stay free - but I do need your support in order to continue to develop it! Thank you :)</p>
diff --git a/hMailAdmin/modern/js/core.js b/hMailAdmin/modern/js/core.js
index 9648774..aa8f05d 100644
--- a/hMailAdmin/modern/js/core.js
+++ b/hMailAdmin/modern/js/core.js
@@ -16,6 +16,39 @@ jQuery(document).ready(function(){
 	//bind facebox modal
 	$('a[rel*=facebox]').facebox();
 
+	//show datepicker
+	if($('[data-toggle="datepicker"]').length){
+		$('[data-toggle="datepicker"]').datepicker({format: 'yyyy-mm-dd', autoHide: true});
+	}
+
+	if($('#log-parser').length){
+		$('#log-parser :submit').click(function() {
+			var form = $('#log-parser'),
+			result = $('#results'),
+			params = form.serialize(),
+			button = $(':submit', form);
+			$.ajax({
+				type: 'post',
+				url: './modern/logview.php',
+				data: params,
+				cache: false,
+				timeout: 50000,
+				beforeSend: function() {
+					result.html('Please wait... this might take some time.');
+					button.prop('disabled', true).addClass('wait');
+				},
+				success: function(data) {
+					result.html(data);
+					button.prop('disabled', false).removeClass('wait');
+				}
+			});
+			return false;
+		});
+		$('#log-parser [type=button]').click(function() {
+			$('#results').html('Click on "Parse log" button');
+		});
+	}
+
 	//grafs refresh
 	if($('#processed, #sessions').length){
 		// Chartist
@@ -119,7 +152,7 @@ jQuery(document).ready(function(){
 				$('#pop3').text(Number(json[1][1].toFixed(0)).toLocaleString());
 				$('#imap').text(Number(json[1][2].toFixed(0)).toLocaleString());
 				//Delivery queue
-				var queue;
+				var queue = '';
 				if (json[2] !== 0) {
 					$.each(json[2], function(key, data){
 						queue += '<tr><td><a href="#" onclick="$.facebox({ajax:\'modern/view.php?q=' + data[5] + '\'}); return false;">' + data[0] + '</a></td><td>' + data[1] + '</td><td>' + data[2] + '</td><td>' + data[3] + '</td><td>' + data[4] + '</td><td>' + data[6] + '</td></tr>';
diff --git a/hMailAdmin/modern/js/datepicker.js b/hMailAdmin/modern/js/datepicker.js
new file mode 100644
index 0000000..5073906
--- /dev/null
+++ b/hMailAdmin/modern/js/datepicker.js
@@ -0,0 +1,2 @@
+//github.com/fengyuanchen/datepicker
+!function(t){"function"==typeof define&&define.amd?define("datepicker",["jquery"],t):t("object"==typeof exports?require("jquery"):jQuery)}(function(t){"use strict";function e(t){return j.call(t).slice(8,-1).toLowerCase()}function i(t){return"string"==typeof t}function s(t){return"number"==typeof t&&!isNaN(t)}function a(t){return"undefined"==typeof t}function n(t){return"date"===e(t)}function r(t,e){var i=[];return Array.from?Array.from(t).slice(e||0):(s(e)&&i.push(e),i.slice.apply(t,i))}function h(t,e){var i=r(arguments,2);return function(){return t.apply(e,i.concat(r(arguments)))}}function o(t){return t%4===0&&t%100!==0||t%400===0}function l(t,e){return[31,o(t)?29:28,31,30,31,30,31,31,30,31,30,31][e]}function d(t){var e,i,s=String(t).toLowerCase(),a=s.match(x);if(!a||0===a.length)throw new Error("Invalid date format.");for(t={source:s,parts:a},e=a.length,i=0;i<e;i++)switch(a[i]){case"dd":case"d":t.hasDay=!0;break;case"mm":case"m":t.hasMonth=!0;break;case"yyyy":case"yy":t.hasYear=!0}return t}function u(e,i){i=t.isPlainObject(i)?i:{},i.language&&(i=t.extend({},u.LANGUAGES[i.language],i)),this.$element=t(e),this.options=t.extend({},u.DEFAULTS,i),this.isBuilt=!1,this.isShown=!1,this.isInput=!1,this.isInline=!1,this.initialValue="",this.initialDate=null,this.startDate=null,this.endDate=null,this.init()}var c=t(window),f=window.document,p=t(f),w=window.Number,y="datepicker",m="click."+y,g="keyup."+y,v="focus."+y,D="resize."+y,k="show."+y,b="hide."+y,$="pick."+y,x=/(y|m|d)+/g,C=/\d+/g,S=/^\d{2,4}$/,F=y+"-inline",V=y+"-dropdown",M=y+"-top-left",I=y+"-top-right",T=y+"-bottom-left",Y=y+"-bottom-right",A=[M,I,T,Y].join(" "),P=y+"-hide",N=Math.min,j=Object.prototype.toString;u.prototype={constructor:u,init:function(){var e=this.options,i=this.$element,s=e.startDate,a=e.endDate,n=e.date;this.$trigger=t(e.trigger||i),this.isInput=i.is("input")||i.is("textarea"),this.isInline=e.inline&&(e.container||!this.isInput),this.format=d(e.format),this.oldValue=this.initialValue=this.getValue(),n=this.parseDate(n||this.initialValue),s&&(s=this.parseDate(s),n.getTime()<s.getTime()&&(n=new Date(s)),this.startDate=s),a&&(a=this.parseDate(a),s&&a.getTime()<s.getTime()&&(a=new Date(s)),n.getTime()>a.getTime()&&(n=new Date(a)),this.endDate=a),this.date=n,this.viewDate=new Date(n),this.initialDate=new Date(this.date),this.bind(),(e.autoShow||this.isInline)&&this.show(),e.autoPick&&this.pick()},build:function(){var e,i=this.options,s=this.$element;this.isBuilt||(this.isBuilt=!0,this.$picker=e=t(i.template),this.$week=e.find('[data-view="week"]'),this.$yearsPicker=e.find('[data-view="years picker"]'),this.$yearsPrev=e.find('[data-view="years prev"]'),this.$yearsNext=e.find('[data-view="years next"]'),this.$yearsCurrent=e.find('[data-view="years current"]'),this.$years=e.find('[data-view="years"]'),this.$monthsPicker=e.find('[data-view="months picker"]'),this.$yearPrev=e.find('[data-view="year prev"]'),this.$yearNext=e.find('[data-view="year next"]'),this.$yearCurrent=e.find('[data-view="year current"]'),this.$months=e.find('[data-view="months"]'),this.$daysPicker=e.find('[data-view="days picker"]'),this.$monthPrev=e.find('[data-view="month prev"]'),this.$monthNext=e.find('[data-view="month next"]'),this.$monthCurrent=e.find('[data-view="month current"]'),this.$days=e.find('[data-view="days"]'),this.isInline?t(i.container||s).append(e.addClass(F)):(t(f.body).append(e.addClass(V)),e.addClass(P)),this.fillWeek())},unbuild:function(){this.isBuilt&&(this.isBuilt=!1,this.$picker.remove())},bind:function(){var e=this.options,i=this.$element;t.isFunction(e.show)&&i.on(k,e.show),t.isFunction(e.hide)&&i.on(b,e.hide),t.isFunction(e.pick)&&i.on($,e.pick),this.isInput&&(i.on(g,t.proxy(this.keyup,this)),e.trigger||i.on(v,t.proxy(this.show,this))),this.$trigger.on(m,t.proxy(this.show,this))},unbind:function(){var e=this.options,i=this.$element;t.isFunction(e.show)&&i.off(k,e.show),t.isFunction(e.hide)&&i.off(b,e.hide),t.isFunction(e.pick)&&i.off($,e.pick),this.isInput&&(i.off(g,this.keyup),e.trigger||i.off(v,this.show)),this.$trigger.off(m,this.show)},showView:function(t){var e=this.$yearsPicker,i=this.$monthsPicker,s=this.$daysPicker,a=this.format;if(a.hasYear||a.hasMonth||a.hasDay)switch(w(t)){case 2:case"years":i.addClass(P),s.addClass(P),a.hasYear?(this.fillYears(),e.removeClass(P)):this.showView(0);break;case 1:case"months":e.addClass(P),s.addClass(P),a.hasMonth?(this.fillMonths(),i.removeClass(P)):this.showView(2);break;default:e.addClass(P),i.addClass(P),a.hasDay?(this.fillDays(),s.removeClass(P)):this.showView(1)}},hideView:function(){this.options.autoHide&&this.hide()},place:function(){var t=this.options,e=this.$element,i=this.$picker,s=p.outerWidth(),a=p.outerHeight(),n=e.outerWidth(),r=e.outerHeight(),h=i.width(),o=i.height(),l=e.offset(),d=l.left,u=l.top,c=parseFloat(t.offset)||10,f=M;u>o&&u+r+o>a?(u-=o+c,f=T):u+=r+c,d+h>s&&(d=d+n-h,f=f.replace("left","right")),i.removeClass(A).addClass(f).css({top:u,left:d,zIndex:parseInt(t.zIndex,10)})},trigger:function(e,i){var s=t.Event(e,i);return this.$element.trigger(s),s},createItem:function(e){var i=this.options,s=i.itemTag,a={text:"",view:"",muted:!1,picked:!1,disabled:!1};return t.extend(a,e),"<"+s+" "+(a.disabled?'class="'+i.disabledClass+'"':a.picked?'class="'+i.pickedClass+'"':a.muted?'class="'+i.mutedClass+'"':"")+(a.view?' data-view="'+a.view+'"':"")+">"+a.text+"</"+s+">"},fillAll:function(){this.fillYears(),this.fillMonths(),this.fillDays()},fillWeek:function(){var e,i=this.options,s=parseInt(i.weekStart,10)%7,a=i.daysMin,n="";for(a=t.merge(a.slice(s),a.slice(0,s)),e=0;e<=6;e++)n+=this.createItem({text:a[e]});this.$week.html(n)},fillYears:function(){var e,i=this.options,s=i.disabledClass||"",a=i.yearSuffix||"",n=t.isFunction(i.filter)&&i.filter,r=this.startDate,h=this.endDate,o=this.viewDate,l=o.getFullYear(),d=o.getMonth(),u=o.getDate(),c=this.date,f=c.getFullYear(),p=!1,w=!1,y=!1,m=!1,g=!1,v="",D=-5,k=6;for(e=D;e<=k;e++)c=new Date(l+e,d,u),g=e===D||e===k,m=l+e===f,y=!1,r&&(y=c.getFullYear()<r.getFullYear(),e===D&&(p=y)),!y&&h&&(y=c.getFullYear()>h.getFullYear(),e===k&&(w=y)),!y&&n&&(y=n.call(this.$element,c)===!1),v+=this.createItem({text:l+e,view:y?"year disabled":m?"year picked":"year",muted:g,picked:m,disabled:y});this.$yearsPrev.toggleClass(s,p),this.$yearsNext.toggleClass(s,w),this.$yearsCurrent.toggleClass(s,!0).html(l+D+a+" - "+(l+k)+a),this.$years.html(v)},fillMonths:function(){var e,i=this.options,s=i.disabledClass||"",a=i.monthsShort,n=t.isFunction(i.filter)&&i.filter,r=this.startDate,h=this.endDate,o=this.viewDate,l=o.getFullYear(),d=o.getDate(),u=this.date,c=u.getFullYear(),f=u.getMonth(),p=!1,w=!1,y=!1,m=!1,g="";for(e=0;e<=11;e++)u=new Date(l,e,d),m=l===c&&e===f,y=!1,r&&(p=u.getFullYear()===r.getFullYear(),y=p&&u.getMonth()<r.getMonth()),!y&&h&&(w=u.getFullYear()===h.getFullYear(),y=w&&u.getMonth()>h.getMonth()),!y&&n&&(y=n.call(this.$element,u)===!1),g+=this.createItem({index:e,text:a[e],view:y?"month disabled":m?"month picked":"month",picked:m,disabled:y});this.$yearPrev.toggleClass(s,p),this.$yearNext.toggleClass(s,w),this.$yearCurrent.toggleClass(s,p&&w).html(l+i.yearSuffix||""),this.$months.html(g)},fillDays:function(){var e,i,s,a=this.options,n=a.disabledClass||"",r=a.yearSuffix||"",h=a.monthsShort,o=parseInt(a.weekStart,10)%7,d=t.isFunction(a.filter)&&a.filter,u=this.startDate,c=this.endDate,f=this.viewDate,p=f.getFullYear(),w=f.getMonth(),y=p,m=w,g=p,v=w,D=this.date,k=D.getFullYear(),b=D.getMonth(),$=D.getDate(),x=!1,C=!1,S=!1,F=!1,V=[],M=[],I=[],T=42;for(0===w?(y-=1,m=11):m-=1,e=l(y,m),D=new Date(p,w,1),s=D.getDay()-o,s<=0&&(s+=7),u&&(x=D.getTime()<=u.getTime()),i=e-(s-1);i<=e;i++)D=new Date(y,m,i),S=!1,u&&(S=D.getTime()<u.getTime()),!S&&d&&(S=d.call(this.$element,D)===!1),V.push(this.createItem({text:i,view:"day prev",muted:!0,disabled:S}));for(11===w?(g+=1,v=0):v+=1,e=l(p,w),s=T-(V.length+e),D=new Date(p,w,e),c&&(C=D.getTime()>=c.getTime()),i=1;i<=s;i++)D=new Date(g,v,i),S=!1,c&&(S=D.getTime()>c.getTime()),!S&&d&&(S=d.call(this.$element,D)===!1),M.push(this.createItem({text:i,view:"day next",muted:!0,disabled:S}));for(i=1;i<=e;i++)D=new Date(p,w,i),F=p===k&&w===b&&i===$,S=!1,u&&(S=D.getTime()<u.getTime()),!S&&c&&(S=D.getTime()>c.getTime()),!S&&d&&(S=d.call(this.$element,D)===!1),I.push(this.createItem({text:i,view:S?"day disabled":F?"day picked":"day",picked:F,disabled:S}));this.$monthPrev.toggleClass(n,x),this.$monthNext.toggleClass(n,C),this.$monthCurrent.toggleClass(n,x&&C).html(a.yearFirst?p+r+" "+h[w]:h[w]+" "+p+r),this.$days.html(V.join("")+I.join(" ")+M.join(""))},click:function(e){var i,s,a,n,r,h,o=t(e.target),l=this.viewDate;if(e.stopPropagation(),e.preventDefault(),!o.hasClass("disabled"))switch(i=l.getFullYear(),s=l.getMonth(),a=l.getDate(),h=o.data("view")){case"years prev":case"years next":i="years prev"===h?i-10:i+10,r=o.text(),n=S.test(r),n&&(i=parseInt(r,10),this.date=new Date(i,s,N(a,28))),this.viewDate=new Date(i,s,N(a,28)),this.fillYears(),n&&(this.showView(1),this.pick("year"));break;case"year prev":case"year next":i="year prev"===h?i-1:i+1,this.viewDate=new Date(i,s,N(a,28)),this.fillMonths();break;case"year current":this.format.hasYear&&this.showView(2);break;case"year picked":this.format.hasMonth?this.showView(1):this.hideView();break;case"year":i=parseInt(o.text(),10),this.date=new Date(i,s,N(a,28)),this.viewDate=new Date(i,s,N(a,28)),this.format.hasMonth?this.showView(1):this.hideView(),this.pick("year");break;case"month prev":case"month next":s="month prev"===h?s-1:"month next"===h?s+1:s,this.viewDate=new Date(i,s,N(a,28)),this.fillDays();break;case"month current":this.format.hasMonth&&this.showView(1);break;case"month picked":this.format.hasDay?this.showView(0):this.hideView();break;case"month":s=t.inArray(o.text(),this.options.monthsShort),this.date=new Date(i,s,N(a,28)),this.viewDate=new Date(i,s,N(a,28)),this.format.hasDay?this.showView(0):this.hideView(),this.pick("month");break;case"day prev":case"day next":case"day":s="day prev"===h?s-1:"day next"===h?s+1:s,a=parseInt(o.text(),10),this.date=new Date(i,s,a),this.viewDate=new Date(i,s,a),this.fillDays(),"day"===h&&this.hideView(),this.pick("day");break;case"day picked":this.hideView(),this.pick("day")}},clickDoc:function(t){for(var e,i=t.target,s=this.$trigger[0];i!==f;){if(i===s){e=!0;break}i=i.parentNode}e||this.hide()},keyup:function(){this.update()},getValue:function(){var t=this.$element,e="";return this.isInput?e=t.val():this.isInline?this.options.container&&(e=t.text()):e=t.text(),e},setValue:function(t){var e=this.$element;t=i(t)?t:"",this.isInput?e.val(t):this.isInline?this.options.container&&e.text(t):e.text(t)},show:function(){this.isBuilt||this.build(),this.isShown||this.trigger(k).isDefaultPrevented()||(this.isShown=!0,this.$picker.removeClass(P).on(m,t.proxy(this.click,this)),this.showView(this.options.startView),this.isInline||(c.on(D,this._place=h(this.place,this)),p.on(m,this._clickDoc=h(this.clickDoc,this)),this.place()))},hide:function(){this.isShown&&(this.trigger(b).isDefaultPrevented()||(this.isShown=!1,this.$picker.addClass(P).off(m,this.click),this.isInline||(c.off(D,this._place),p.off(m,this._clickDoc))))},update:function(){var t=this.getValue();t!==this.oldValue&&(this.setDate(t,!0),this.oldValue=t)},pick:function(t){var e=this.$element,i=this.date;this.trigger($,{view:t||"",date:i}).isDefaultPrevented()||(this.setValue(i=this.formatDate(this.date)),this.isInput&&e.trigger("change"))},reset:function(){this.setDate(this.initialDate,!0),this.setValue(this.initialValue),this.isShown&&this.showView(this.options.startView)},getMonthName:function(e,i){var n=this.options,r=n.months;return t.isNumeric(e)?e=w(e):a(i)&&(i=e),i===!0&&(r=n.monthsShort),r[s(e)?e:this.date.getMonth()]},getDayName:function(e,i,n){var r=this.options,h=r.days;return t.isNumeric(e)?e=w(e):(a(n)&&(n=i),a(i)&&(i=e)),h=n===!0?r.daysMin:i===!0?r.daysShort:h,h[s(e)?e:this.date.getDay()]},getDate:function(t){var e=this.date;return t?this.formatDate(e):new Date(e)},setDate:function(e,s){var a=this.options.filter;if(n(e)||i(e)){if(e=this.parseDate(e),t.isFunction(a)&&a.call(this.$element,e)===!1)return;this.date=e,this.viewDate=new Date(e),s||this.pick(),this.isBuilt&&this.fillAll()}},setStartDate:function(t){(n(t)||i(t))&&(this.startDate=this.parseDate(t),this.isBuilt&&this.fillAll())},setEndDate:function(t){(n(t)||i(t))&&(this.endDate=this.parseDate(t),this.isBuilt&&this.fillAll())},parseDate:function(t){var e,s,a,r,h,o,l=this.format,d=[];if(n(t))return new Date(t.getFullYear(),t.getMonth(),t.getDate());if(i(t)&&(d=t.match(C)||[]),t=new Date,s=t.getFullYear(),a=t.getDate(),r=t.getMonth(),e=l.parts.length,d.length===e)for(o=0;o<e;o++)switch(h=parseInt(d[o],10)||1,l.parts[o]){case"dd":case"d":a=h;break;case"mm":case"m":r=h-1;break;case"yy":s=2e3+h;break;case"yyyy":s=h}return new Date(s,r,a)},formatDate:function(t){var e,i,s,a,r,h=this.format,o="";if(n(t))for(o=h.source,i=t.getFullYear(),a={d:t.getDate(),m:t.getMonth()+1,yy:i.toString().substring(2),yyyy:i},a.dd=(a.d<10?"0":"")+a.d,a.mm=(a.m<10?"0":"")+a.m,e=h.parts.length,r=0;r<e;r++)s=h.parts[r],o=o.replace(s,a[s]);return o},destroy:function(){this.unbind(),this.unbuild(),this.$element.removeData(y)}},u.LANGUAGES={},u.DEFAULTS={autoShow:!1,autoHide:!1,autoPick:!1,inline:!1,container:null,trigger:null,language:"",format:"mm/dd/yyyy",date:null,startDate:null,endDate:null,startView:0,weekStart:0,yearFirst:!1,yearSuffix:"",days:["Sunday","Monday","Tuesday","Wednesday","Thursday","Friday","Saturday"],daysShort:["Sun","Mon","Tue","Wed","Thu","Fri","Sat"],daysMin:["Su","Mo","Tu","We","Th","Fr","Sa"],months:["January","February","March","April","May","June","July","August","September","October","November","December"],monthsShort:["Jan","Feb","Mar","Apr","May","Jun","Jul","Aug","Sep","Oct","Nov","Dec"],itemTag:"li",mutedClass:"muted",pickedClass:"picked",disabledClass:"disabled",template:'<div class="datepicker-container"><div class="datepicker-panel" data-view="years picker"><ul><li data-view="years prev">&lsaquo;</li><li data-view="years current"></li><li data-view="years next">&rsaquo;</li></ul><ul data-view="years"></ul></div><div class="datepicker-panel" data-view="months picker"><ul><li data-view="year prev">&lsaquo;</li><li data-view="year current"></li><li data-view="year next">&rsaquo;</li></ul><ul data-view="months"></ul></div><div class="datepicker-panel" data-view="days picker"><ul><li data-view="month prev">&lsaquo;</li><li data-view="month current"></li><li data-view="month next">&rsaquo;</li></ul><ul data-view="week"></ul><ul data-view="days"></ul></div></div>',offset:10,zIndex:1e3,filter:null,show:null,hide:null,pick:null},u.setDefaults=function(e){e=t.isPlainObject(e)?e:{},e.language&&(e=t.extend({},u.LANGUAGES[e.language],e)),t.extend(u.DEFAULTS,e)},u.other=t.fn.datepicker,t.fn.datepicker=function(e){var s,n=r(arguments,1);return this.each(function(){var a,r,h=t(this),o=h.data(y);if(!o){if(/destroy/.test(e))return;a=t.extend({},h.data(),t.isPlainObject(e)&&e),h.data(y,o=new u(this,a))}i(e)&&t.isFunction(r=o[e])&&(s=r.apply(o,n))}),a(s)?this:s},t.fn.datepicker.Constructor=u,t.fn.datepicker.languages=u.LANGUAGES,t.fn.datepicker.setDefaults=u.setDefaults,t.fn.datepicker.noConflict=function(){return t.fn.datepicker=u.other,this}});
\ No newline at end of file
diff --git a/hMailAdmin/modern/json.php b/hMailAdmin/modern/json.php
index c19c9b1..218fc0f 100644
--- a/hMailAdmin/modern/json.php
+++ b/hMailAdmin/modern/json.php
@@ -33,7 +33,7 @@
 
 		if (count($columns) > 4) {
 			$columns[4] = makeIsoDate($columns[4]);
-			if ($columns[4] == "1970-01-01 01:00:00") $columns[4] = $as_soon_as_possible;
+			if ($columns[4] <= "1970-01-01 01:00:00") $columns[4] = $as_soon_as_possible;
 
 			//escape invalid characters
 			$characters = array("\\", "{", "}");
@@ -41,11 +41,11 @@
 			$columns[5] = str_replace($characters, $replacements, $columns[5]);
 
   			if ($q3 != '[') $q3 .= ', ';
-			$q3 .= '[' . $columns[0] . ', "' . makeIsoDate($columns[1]) . '", "' . PreprocessOutput($columns[2]) . '", "' . PreprocessOutput($columns[3]) . '", "' . $columns[4] . '", "' . $columns[5] . '", ' . $columns[6] . ']';
+			$q3 .= '[' . $columns[0] . ', "' . makeIsoDate($columns[1]) . '", "' . PreprocessOutput($columns[2]) . '", "' . PreprocessOutput($columns[3]) . '", "' . $columns[4] . '", "' . $columns[5] . '", ' . $columns[7] . ']';
 		}
 	}
 	$q3 .= ']';
-} else $q3 = '0';
+} else $q3 = '[]';
 $q5 = $QueueCount;
 
 header('Content-Type: application/json');
diff --git a/hMailAdmin/modern/logview.php b/hMailAdmin/modern/logview.php
new file mode 100644
index 0000000..b112eb8
--- /dev/null
+++ b/hMailAdmin/modern/logview.php
@@ -0,0 +1,177 @@
+<?php
+//ini_set('display_errors', 1);
+define('IN_WEBADMIN', true);
+
+require_once("../config.php");
+require_once("../include/initialization_test.php");
+require_once("../initialize.php");
+
+if (hmailGetAdminLevel() != 2)
+	hmailHackingAttemp();
+
+function filter_result($str, $findme, $type=true) {
+	if ( ($pos = stripos($str, $findme)) !== false && (!$type || $pos < 3)) {
+		return $str;
+	}
+}
+
+$Type = !empty($_POST['LogType']) ? $_POST['LogType'] : 'SMTPD';
+$Filter = !empty($_POST['LogFilter']) ? $_POST['LogFilter'] : null;
+$Filename = !empty($_POST['LogFilename']) ? $_POST['LogFilename'] : date("Y-m-d");
+$Filename = 'hmailserver_' . $Filename . '.log';
+$Path = $obBaseApp->Settings->Directories->LogDirectory;
+$Filename = $Path . '\\' . $Filename;
+
+if (file_exists($Filename)) {
+	$Filesize = filesize($Filename);
+	$File = fopen($Filename, 'r');
+
+	if ($File) {
+		$events=array();
+		while (($Line = fgets($File)) !== false) {
+			if($Type == 'RAW'){
+				$events[0]['type'] = 'RAW';
+				$events[0]['data'][] = $Line;
+				continue;
+			}
+
+			$Unfiltered = $Line;
+			$Filtered = $Type == 'ALL' ? $Unfiltered : filter_result($Unfiltered, $Type, true);
+			if (!is_null($Filter)) {
+				$Filtered = filter_result($Filtered, $Filter, false);
+				$Filtered = preg_replace("/\w*?$Filter\w*/i", "{em}$0{/em}", $Filtered);
+			}
+
+			if (!is_null($Filtered)) prase($Filtered);
+			//echo $Filtered;
+		}
+		fclose($File);
+		echo events();
+	} else {
+		echo 'Error opening log file.';
+	}
+} else echo 'Log file not found.';
+
+function prase($line){
+	global $events;
+	$line = cleanString($line);
+	$data = explode("\t", $line);
+	switch($data[0]){
+		case 'SMTPD':
+		case 'SMTPC':
+			prase_smtp($data);
+			break;
+		case 'POP3D':
+		case 'POP3C':
+		case 'IMAPD':
+			prase_imap($data);
+			break;
+		case 'TCPIP':
+		case 'DEBUG':
+		case 'APPLICATION':
+		case 'ERROR':
+			prase_error($data);
+	}
+}
+
+$datastore = array();
+function prase_smtp($data){
+	global $datastore,$events;
+
+	if (!isset($events[$data[0].$data[2]]['type'])) $events[$data[0].$data[2]]['type'] = $data[0];
+	if (!isset($events[$data[0].$data[2]]['id'])) $events[$data[0].$data[2]]['id'] = $data[2];
+	if (!isset($events[$data[0].$data[2]]['ip'])) $events[$data[0].$data[2]]['ip'] = $data[4];
+
+	// AUTH LOGIN decoder.
+	// First we get a RECEIVED: AUTH LOGIN
+	// The next RECEIVED: line contains login username which is e-mail address, base64 encoded.
+	if (isset($datastore[$data[0] . $data[2]]) && strpos($data[5],'RECEIVED: ') !== false) {
+		// We got it.
+		$base64 = substr($data[5] ,strrpos($data[5]," ") + 1, strlen($data[5]));
+		$data[5] = 'RECEIVED: ' . base64_decode($base64);
+		unset($datastore[$data[0] . $data[2]]);
+	} else if (strpos($data[5],'RECEIVED: AUTH LOGIN') !== false) {
+		// Wait for it.
+		$datastore[$data[0] . $data[2]] = true;
+	}
+
+	$events[$data[0].$data[2]]['data'][] = $data;
+}
+
+function prase_imap($data){
+	global $events;
+
+	if (!isset($events[$data[0].$data[2]]['type'])) $events[$data[0].$data[2]]['type'] = $data[0];
+	if (!isset($events[$data[0].$data[2]]['id'])) $events[$data[0].$data[2]]['id'] = $data[2];
+	if (!isset($events[$data[0].$data[2]]['ip'])) $events[$data[0].$data[2]]['ip'] = $data[4];
+
+	$events[$data[0].$data[2]]['data'][] = $data;
+}
+
+function prase_error($data){
+	global $events;
+
+	if (!isset($events[$data[0].$data[2]]['type'])) $events[$data[0].$data[2]]['type'] = $data[0];
+	if (!isset($events[$data[0].$data[2]]['id'])) $events[$data[0].$data[2]]['id'] = $data[2];
+
+	$events[$data[0].$data[2]]['data'][] = $data;
+}
+
+function events(){
+	global $events;
+	$out = '';
+	foreach ($events as $data) {
+		switch($data['type']){
+			case 'SMTPD':
+			case 'SMTPC':
+			case 'IMAPD':
+			case 'POP3D':
+			case 'POP3C':
+				$out .= out_smtp($data);
+				break;
+			case 'RAW':
+				$out .= out_raw($data);
+				break;
+			case 'TCPIP':
+			case 'DEBUG':
+			case 'APPLICATION':
+			case 'ERROR':
+				$out .= out_error($data);
+		}
+	}
+	if (empty($out)) $out = 'No entries in log.';
+	return $out;
+}
+
+function out_smtp($data){
+	$out = '<div id="group-' . $data['type'] . '-' . $data['id'] . '"><span>' . $data['type'] . ' &nbsp;&ndash;&nbsp; ' . $data['id'] . ' &nbsp;&ndash;&nbsp; ' . $data['ip'] . ' <sup><a href="https://href.li/?http://ip-api.com/line/' . $data['ip'] . '" target="_blank">?</a></sup></span><ul>';
+	foreach ($data['data'] as $col) {
+		$out .= '<li><div>' . $col[3] . '</div><div>' . $col[5] . '</div></li>';
+	}
+	$out .= '</ul></div>';
+	return $out;
+}
+
+function out_error($data){
+	$out = '<div id="group-' . $data['type'] . '-' . $data['id'] . '"><span>' . $data['type'] . '</span><ul>';
+	foreach ($data['data'] as $col) {
+		$out .= '<li><div>' . $col[2] . '</div><div>' . $col[3] . '</div></li>';
+	}
+	$out .= '</ul></div>';
+	return $out;
+}
+
+function out_raw($data){
+	$out = '';
+	foreach ($data['data'] as $col) {
+		$out .= htmlentities($col, ENT_COMPAT, 'UTF-8') . '<br>';
+	}
+	return $out;
+}
+
+function cleanString($str) {
+	$search = array('"','<','>','[nl]','{em}','{/em}');
+	$replace = array('','&lt;','&gt;','<br>','<em>','</em>');
+	return str_replace($search,$replace,$str);
+}
+?>
\ No newline at end of file