From dcf82365338ec75a4262d3ea4e0c07031b5a5b81 Mon Sep 17 00:00:00 2001
From: Heikki Hannikainen <hessu@hes.iki.fi>
Date: Thu, 4 Aug 2016 09:55:11 +0300
Subject: [PATCH] status: Implement showemail option

---
 src/web/aprsc.js   | 46 ++++++++++++++++++++++++++--------------------
 src/web/index.html |  1 +
 2 files changed, 27 insertions(+), 20 deletions(-)

diff --git a/src/web/aprsc.js b/src/web/aprsc.js
index 970c9d3..53a5177 100644
--- a/src/web/aprsc.js
+++ b/src/web/aprsc.js
@@ -22,20 +22,6 @@ function cancel_events(e)
 	if (e.cancel != null) e.cancel = true;
 }
 
-function parse_options(s)
-{
-	options = {};
-	var a = s.split(' ');
-	for (var i = 0; i < a.length; i++) {
-		var p = a[i].split('=');
-		var c = p[0].toLowerCase();
-		options[c] = p[1];
-	}
-	
-	if (options['showemail'] == 1)
-		key_translate['email'] = 'Admin email';
-}
-
 function addr_loc_port(s)
 {
 	return s.substr(s.lastIndexOf(':') + 1);
@@ -227,14 +213,8 @@ function render_alarms(alarms)
 	}
 }
 
-var options_s;
-
 function render(d)
 {
-	if (d['status_options'] != options_s) {
-		options_s = d['status_options'];
-		parse_options(options_s);
-	}
 	if (d['server'] && d['server']['tick_now']) {
 		var s = d['server'];
 		
@@ -420,6 +400,7 @@ var app = angular.module('aprsc', [ 'pascalprecht.translate', 'graph', 'ngDialog
 			SERVER_TITLE: 'Server',
 			SERVER_SERVER_ID: 'Server ID',
 			SERVER_SERVER_ADMIN: 'Server admin',
+			SERVER_SERVER_EMAIL: 'Admin email',
 			SERVER_SOFTWARE: 'Software',
 			SERVER_SOFTWARE_FEATURES: 'Software features',
 			SERVER_UPTIME: 'Uptime',
@@ -651,6 +632,26 @@ app.controller('aprscc', [ '$scope', '$http', 'graphs', 'ngDialog', '$sce', func
 		}
 	};
 	
+	/* status options parsing */
+	var options_s;
+	
+	var parse_options = function(s) {
+		if (!s) {
+			$scope.options = {};
+			return;
+		}
+		
+		var o = {};
+		var a = s.split(' ');
+		for (var i = 0; i < a.length; i++) {
+			var p = a[i].split('=');
+			var c = p[0].toLowerCase();
+			o[c] = p[1];
+		}
+		
+		$scope.options = o;
+	}
+	
 	/* Ajax updates */
 	
 	var full_load = function($scope, $http) {
@@ -674,6 +675,11 @@ app.controller('aprscc', [ '$scope', '$http', 'graphs', 'ngDialog', '$sce', func
 			$scope.status = d;
 			$scope.uierror = null;
 			
+			if (d['status_options'] != options_s) {
+				options_s = d['status_options'];
+				parse_options(options_s);
+			}
+			
 			motd_check(d);
 			
 			setTimeout(function() { full_load($scope, $http); }, 10000);
diff --git a/src/web/index.html b/src/web/index.html
index 41e1204..cd5b2d2 100644
--- a/src/web/index.html
+++ b/src/web/index.html
@@ -45,6 +45,7 @@
 <table class='table table-hover table-condensed'>
   <tr><td>{{ 'SERVER_SERVER_ID' | translate }}</td> <td class="ar">{{ status.server.server_id }}</td></tr>
   <tr><td>{{ 'SERVER_SERVER_ADMIN' | translate }}</td> <td class="ar">{{ status.server.admin }}</td></tr>
+  <tr ng-show='options.showemail == 1'><td>{{ 'SERVER_SERVER_EMAIL' | translate }}</td> <td class="ar">{{ status.server.email }}</td></tr>
   <tr><td>{{ 'SERVER_SOFTWARE' | translate }}</td> <td class="ar">{{ status.server.software }} {{ status.server.software_version }}</td></tr>
   <tr><td>{{ 'SERVER_SOFTWARE_FEATURES' | translate }}</td> <td class="ar">{{ status.server.software_build_features }}</td></tr>
   <tr><td>{{ 'SERVER_UPTIME' | translate }}</td> <td class="ar">{{ status.server.uptime | duration }}</td></tr>