1 files changed, 59 insertions, 7 deletions

diff --git a/OpenSim/Server/Handlers/UserAccounts/UserAccountServerPostHandler.cs b/OpenSim/Server/Handlers/UserAccounts/UserAccountServerPostHandler.cs
index 21eb790..bc12ef9 100644
--- a/OpenSim/Server/Handlers/UserAccounts/UserAccountServerPostHandler.cs
+++ b/OpenSim/Server/Handlers/UserAccounts/UserAccountServerPostHandler.cs
@@ -72,9 +72,9 @@ namespace OpenSim.Server.Handlers.UserAccounts
         protected override byte[] ProcessRequest(string path, Stream requestData,
                 IOSHttpRequest httpRequest, IOSHttpResponse httpResponse)
         {
-            StreamReader sr = new StreamReader(requestData);
-            string body = sr.ReadToEnd();
-            sr.Close();
+            string body;
+            using(StreamReader sr = new StreamReader(requestData))
+                body = sr.ReadToEnd();
             body = body.Trim();
 
             // We need to check the authorization header
@@ -98,16 +98,18 @@ namespace OpenSim.Server.Handlers.UserAccounts
                         if (m_AllowCreateUser)
                             return CreateUser(request);
                         else
-                            break;
+                            return FailureResult();
                     case "getaccount":
                         return GetAccount(request);
                     case "getaccounts":
                         return GetAccounts(request);
+                    case "getmultiaccounts":
+                        return GetMultiAccounts(request);
                     case "setaccount":
                         if (m_AllowSetAccount)
                             return StoreAccount(request);
                         else
-                            break;
+                            return FailureResult();
                 }
 
                 m_log.DebugFormat("[USER SERVICE HANDLER]: unknown method request: {0}", method);
@@ -201,6 +203,52 @@ namespace OpenSim.Server.Handlers.UserAccounts
             return Util.UTF8NoBomEncoding.GetBytes(xmlString);
         }
 
+        byte[] GetMultiAccounts(Dictionary<string, object> request)
+        {
+            UUID scopeID = UUID.Zero;
+            if (request.ContainsKey("ScopeID") && !UUID.TryParse(request["ScopeID"].ToString(), out scopeID))
+                return FailureResult();
+
+            if (!request.ContainsKey("IDS"))
+            {
+                m_log.DebugFormat("[USER SERVICE HANDLER]: GetMultiAccounts called without required uuids argument");
+                return FailureResult();
+            }
+
+            if (!(request["IDS"] is List<string>))
+            {
+                m_log.DebugFormat("[USER SERVICE HANDLER]: GetMultiAccounts input argument was of unexpected type {0}", request["IDS"].GetType().ToString());
+                return FailureResult();
+            }
+
+            List<string> userIDs = (List<string>)request["IDS"];
+
+            List<UserAccount> accounts = m_UserAccountService.GetUserAccounts(scopeID, userIDs);
+
+            Dictionary<string, object> result = new Dictionary<string, object>();
+            if ((accounts == null) || ((accounts != null) && (accounts.Count == 0)))
+            {
+                result["result"] = "null";
+            }
+            else
+            {
+                int i = 0;
+                foreach (UserAccount acc in accounts)
+                {
+                    if(acc == null)
+                        continue;
+                    Dictionary<string, object> rinfoDict = acc.ToKeyValuePairs();
+                    result["account" + i] = rinfoDict;
+                    i++;
+                }
+            }
+
+            string xmlString = ServerUtils.BuildXmlResponse(result);
+
+            //m_log.DebugFormat("[GRID HANDLER]: resp string: {0}", xmlString);
+            return Util.UTF8NoBomEncoding.GetBytes(xmlString);
+        }
+
         byte[] StoreAccount(Dictionary<string, object> request)
         {
             UUID principalID = UUID.Zero;
@@ -280,12 +328,16 @@ namespace OpenSim.Server.Handlers.UserAccounts
             if (request.ContainsKey("Email"))
                 email = request["Email"].ToString();
 
+            string model = "";
+            if (request.ContainsKey("Model"))
+                model = request["Model"].ToString();
+
             UserAccount createdUserAccount = null;
 
             if (m_UserAccountService is UserAccountService)
                 createdUserAccount
                     = ((UserAccountService)m_UserAccountService).CreateUser(
-                        scopeID, principalID, firstName, lastName, password, email);
+                        scopeID, principalID, firstName, lastName, password, email, model);
 
             if (createdUserAccount == null)
                 return FailureResult();
@@ -345,4 +397,4 @@ namespace OpenSim.Server.Handlers.UserAccounts
             return Util.UTF8NoBomEncoding.GetBytes(xmlString);
         }
     }
-}
\ No newline at end of file
+}