Merge pull request #2801 from spjspj/master

Add missing field to userData

Mage.Common/src/mage/view/UserView.java

@@ -45,8 +45,9 @@ public class UserView implements Serializable {
     private final String userState;
     private final Date muteChatUntil;
     private final String clientVersion;
+    private final String email;
 
-    public UserView(String userName, String host, String sessionId, Date timeConnected, String gameInfo, String userState, Date muteChatUntil, String clientVersion) {
+    public UserView(String userName, String host, String sessionId, Date timeConnected, String gameInfo, String userState, Date muteChatUntil, String clientVersion, String email) {
         this.userName = userName;
         this.host = host;
         this.sessionId = sessionId;
@@ -55,6 +56,7 @@ public class UserView implements Serializable {
         this.userState = userState;
         this.muteChatUntil = muteChatUntil;
         this.clientVersion = clientVersion;
+        this.email = email;
     }
 
     public String getUserName() {
@@ -89,4 +91,8 @@ public class UserView implements Serializable {
         return timeConnected;
     }
     
+    public String getEmail() {
+        return email;
+    }
+
 }

Mage.Server/src/main/java/mage/server/MageServerImpl.java

@@ -966,7 +966,8 @@ public class MageServerImpl implements MageServer {
                             user.getGameInfo(),
                             user.getUserState().toString(),
                             user.getChatLockedUntil(),
-                            user.getClientVersion()
+                            user.getClientVersion(),
+                            user.getEmail()
                     ));
                 }
                 return users;

Mage.Server/src/main/java/mage/server/User.java

@@ -784,6 +784,13 @@ public class User {
         return number;
     }
     
+    public String getEmail() {
+        if (authorizedUser != null) {
+            return authorizedUser.email;
+        }
+        return "";
+    }
+
     private void updateAuthorizedUser() {
         if (authorizedUser != null) {
             authorizedUser.lastConnection = this.connectionTime;