From be3465c5ca2661f4aabd8a05aefe27c7ecc426e2 Mon Sep 17 00:00:00 2001
From: Baris Soner Usakli <barisusakli@gmail.com>
Date: Sun, 29 Dec 2013 18:10:42 -0500
Subject: [PATCH] display events in admin page events section

---
 public/templates/admin/events.tpl |  5 +++++
 public/templates/admin/header.tpl |  1 +
 public/templates/config.json      |  1 +
 src/events.js                     |  8 +++++++-
 src/routes/admin.js               | 12 +++++++++++-
 5 files changed, 25 insertions(+), 2 deletions(-)
 create mode 100644 public/templates/admin/events.tpl

diff --git a/public/templates/admin/events.tpl b/public/templates/admin/events.tpl
new file mode 100644
index 0000000000..989bdaa7f3
--- /dev/null
+++ b/public/templates/admin/events.tpl
@@ -0,0 +1,5 @@
+<h1>Events</h1>
+
+<pre>
+{eventdata}
+</pre>
\ No newline at end of file
diff --git a/public/templates/admin/header.tpl b/public/templates/admin/header.tpl
index 905170fa9f..f1988b9f21 100644
--- a/public/templates/admin/header.tpl
+++ b/public/templates/admin/header.tpl
@@ -108,6 +108,7 @@
 						<li><a href='{relative_path}/admin/database'><i class='fa fa-hdd-o'></i> Database</a></li>
 						<li><a href='{relative_path}/admin/logger'><i class='fa fa-th'></i> Logger</a></li>
 						<li><a href="{relative_path}/admin/motd"><i class="fa fa-comment"></i> MOTD</a></li>
+						<li><a href="{relative_path}/admin/events"><i class="fa fa-calendar-o"></i> Events</a></li>
 					</ul>
 				</div>
 				<div class="well sidebar-nav">
diff --git a/public/templates/config.json b/public/templates/config.json
index 45e922c3df..0fb31a1c30 100644
--- a/public/templates/config.json
+++ b/public/templates/config.json
@@ -5,6 +5,7 @@
 		"^admin/categories.*": "admin/categories",
 		"^admin/users.*": "admin/users",
 		"^admin/database.*": "admin/database",
+		"^admin/events.*": "admin/events",
 		"^admin/index.*": "admin/index",
 		"^admin/themes.*": "admin/themes",
 		"^admin/plugins/?$": "admin/plugins",
diff --git a/src/events.js b/src/events.js
index b40afe6a93..8dfb922dfa 100644
--- a/src/events.js
+++ b/src/events.js
@@ -7,6 +7,8 @@ var fs = require('fs'),
 
 
 (function(events) {
+	var logFileName = 'events.log';
+
 	events.logPasswordChange = function(uid) {
 		log(uid, 'changed password');
 	}
@@ -54,7 +56,7 @@ var fs = require('fs'),
 			var date = new Date().toUTCString();
 
 			var msg = '[' + date + '] - ' + username + '(uid ' + uid + ') ' + string + '\n';
-			var logFile = path.join(nconf.get('base_dir'), 'events.log');
+			var logFile = path.join(nconf.get('base_dir'), logFileName);
 
 			fs.appendFile(logFile, msg, function(err) {
 				if(err) {
@@ -63,8 +65,12 @@ var fs = require('fs'),
 				}
 			});
 		});
+	}
 
+	events.getLog = function(callback) {
+		var logFile = path.join(nconf.get('base_dir'), logFileName);
 
+		fs.readFile(logFile, callback);
 	}
 
 }(module.exports));
\ No newline at end of file
diff --git a/src/routes/admin.js b/src/routes/admin.js
index 3bb8783340..88d3226039 100644
--- a/src/routes/admin.js
+++ b/src/routes/admin.js
@@ -11,6 +11,7 @@ var nconf = require('nconf'),
 	categories = require('./../categories'),
 	meta = require('../meta'),
 	plugins = require('../plugins'),
+	events = require('./../events'),
 	utils = require('./../../public/src/utils.js');
 
 
@@ -56,7 +57,7 @@ var nconf = require('nconf'),
 		(function () {
 			var routes = [
 				'categories/active', 'categories/disabled', 'users', 'topics', 'settings', 'themes',
-				'twitter', 'facebook', 'gplus', 'database', 'motd', 'groups', 'plugins', 'logger',
+				'twitter', 'facebook', 'gplus', 'database', 'events', 'motd', 'groups', 'plugins', 'logger',
 				'users/latest', 'users/sort-posts', 'users/sort-reputation',
 				'users/search'
 			];
@@ -403,6 +404,15 @@ var nconf = require('nconf'),
 				// });
 			});
 
+			app.get('/events', function(req, res, next) {
+				events.getLog(function(err, data) {
+					if(err) {
+						return next(err);
+					}
+					res.json(200, {eventdata: data.toString()});
+				});
+			});
+
 			app.get('/plugins', function (req, res) {
 				plugins.showInstalled(function (err, plugins) {
 					if (err || !Array.isArray(plugins)) plugins = [];