From 110b72f6c13c8b560a5a616764a21a23f2e2d6ed Mon Sep 17 00:00:00 2001
From: Pedro Beschorner Marin <pedrobmarin@gmail.com>
Date: Thu, 13 Nov 2014 17:03:26 -0200
Subject: [PATCH] Refactored the config email and added a version field

---
 labs/bbb-client-check/resources/config.xml.template  |  3 ++-
 .../bigbluebutton/clientcheck/model/IXMLConfig.as    |  3 ++-
 .../org/bigbluebutton/clientcheck/model/XMLConfig.as | 12 +++++++++---
 .../clientcheck/view/mainview/MailButtonMediator.as  |  2 +-
 .../clientcheck/view/mainview/MainViewMediator.as    |  6 +++++-
 5 files changed, 19 insertions(+), 7 deletions(-)

diff --git a/labs/bbb-client-check/resources/config.xml.template b/labs/bbb-client-check/resources/config.xml.template
index 6bcdf6a970..7c817fd5f1 100644
--- a/labs/bbb-client-check/resources/config.xml.template
+++ b/labs/bbb-client-check/resources/config.xml.template
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <config>
-	<admMail>helpdesk@bigbluebutton.org</admMail>
+	<version>VERSION</version>
+	<mail>MAIL</mail>
 	<downloadFilePath url="test_image.jpg"/>
 	<ports>
 		<port>
diff --git a/labs/bbb-client-check/src/org/bigbluebutton/clientcheck/model/IXMLConfig.as b/labs/bbb-client-check/src/org/bigbluebutton/clientcheck/model/IXMLConfig.as
index 1212749aac..44f7f9450c 100755
--- a/labs/bbb-client-check/src/org/bigbluebutton/clientcheck/model/IXMLConfig.as
+++ b/labs/bbb-client-check/src/org/bigbluebutton/clientcheck/model/IXMLConfig.as
@@ -10,6 +10,7 @@ package org.bigbluebutton.clientcheck.model
 		function get serverUrl():Object;
 		function getPorts():XMLList;
 		function getRTMPApps():XMLList;
-		function getAdmMail():String;
+		function getVersion():String;
+		function getMail():String;
 	}
 }
diff --git a/labs/bbb-client-check/src/org/bigbluebutton/clientcheck/model/XMLConfig.as b/labs/bbb-client-check/src/org/bigbluebutton/clientcheck/model/XMLConfig.as
index 20d5f57482..7e0eb2e0b7 100755
--- a/labs/bbb-client-check/src/org/bigbluebutton/clientcheck/model/XMLConfig.as
+++ b/labs/bbb-client-check/src/org/bigbluebutton/clientcheck/model/XMLConfig.as
@@ -42,10 +42,16 @@ package org.bigbluebutton.clientcheck.model
 			return new XMLList(_config.rtmpapps).children();
 		}
 
-		public function getAdmMail():String
+		public function getVersion():String
 		{
-			var admMail:String = _config.admMail;
-			return admMail;
+			var version:String = _config.version;
+			return version;
+		}
+
+		public function getMail():String
+		{
+			var mail:String = _config.mail;
+			return mail;
 		}
 	}
 }
diff --git a/labs/bbb-client-check/src/org/bigbluebutton/clientcheck/view/mainview/MailButtonMediator.as b/labs/bbb-client-check/src/org/bigbluebutton/clientcheck/view/mainview/MailButtonMediator.as
index 350ee74659..0f8b39c1c4 100644
--- a/labs/bbb-client-check/src/org/bigbluebutton/clientcheck/view/mainview/MailButtonMediator.as
+++ b/labs/bbb-client-check/src/org/bigbluebutton/clientcheck/view/mainview/MailButtonMediator.as
@@ -35,7 +35,7 @@ package org.bigbluebutton.clientcheck.view.mainview
 		 */
 		private function mouseClickHandler(e:MouseEvent):void
 		{
-			var mailMsg:URLRequest = new URLRequest('mailto:' + config.getAdmMail());
+			var mailMsg:URLRequest = new URLRequest('mailto:' + config.getMail());
 			var variables:URLVariables = new URLVariables();
 			variables.subject = "BigBlueButton Client Check";
 			variables.body = dp.getAllDataAsString();
diff --git a/labs/bbb-client-check/src/org/bigbluebutton/clientcheck/view/mainview/MainViewMediator.as b/labs/bbb-client-check/src/org/bigbluebutton/clientcheck/view/mainview/MainViewMediator.as
index d0cef92251..573bed6f90 100755
--- a/labs/bbb-client-check/src/org/bigbluebutton/clientcheck/view/mainview/MainViewMediator.as
+++ b/labs/bbb-client-check/src/org/bigbluebutton/clientcheck/view/mainview/MainViewMediator.as
@@ -67,7 +67,9 @@ package org.bigbluebutton.clientcheck.view.mainview
 
 		private static var FAILED:String="Fail";
 		private static var SUCCEED:String="Succeed";
-		private static var LOADING:String="Loading..."
+		private static var LOADING:String="Loading...";
+
+		private static var VERSION:String="Version";
 
 		override public function initialize():void
 		{
@@ -156,6 +158,8 @@ package org.bigbluebutton.clientcheck.view.mainview
 					dp.addData({Item: systemConfiguration.ports[j].portName, Result: null, Status: LOADING});
 				}
 			}
+			dp.addData({Item: VERSION, Result: config.getVersion(), Status: SUCCEED});
+
 		}
 
 		/**