Merge branch 'master' of ssh://numinibsd/git/base/enigma-bbs

mods/last_callers.js

@@ -7,6 +7,7 @@ const ViewController	= require('../core/view_controller.js').ViewController;
 const StatLog			= require('../core/stat_log.js');
 const getUserName		= require('../core/user.js').getUserName;
 const loadProperties	= require('../core/user.js').loadProperties;
+const isRootUserId		= require('../core/user.js').isRootUserId;
 
 //	deps
 const moment			= require('moment');
@@ -68,6 +69,13 @@ LastCallersModule.prototype.mciReady = function(mciData, cb) {
 
 				StatLog.getSystemLogEntries('user_login_history', StatLog.Order.TimestampDesc, callersView.dimens.height, (err, lh) => {
 					loginHistory = lh;
+
+					if(self.menuConfig.config.hideSysOpLogin) {
+						loginHistory = loginHistory.filter(lh => {
+							return false === isRootUserId(parseInt(lh.log_value));	//	log_value=userId
+						});
+					}
+
 					return callback(err);
 				});
 			},

mods/telnet_bridge.js

@@ -50,8 +50,11 @@ class TelnetClientConnection extends EventEmitter {
 		if(!this.pipeRestored) {
 			this.pipeRestored = true;
 
-			this.client.term.output.unpipe(this.bridgeConnection);
-			this.client.term.output.resume();
+			//	client may have bailed
+			if(_.has(this, 'client.term.output')) {
+				this.client.term.output.unpipe(this.bridgeConnection);
+				this.client.term.output.resume();
+			}
 		}
 	}