EstateAccess do fill the fields(mySQL only); fix the response

2 files changed, 37 insertions, 20 deletions

diff --git a/OpenSim/Region/ClientStack/Linden/Caps/EstateAccess.cs b/OpenSim/Region/ClientStack/Linden/Caps/EstateAccess.cs
index c3a48d9..3a4d9a5 100644
--- a/OpenSim/Region/ClientStack/Linden/Caps/EstateAccess.cs
+++ b/OpenSim/Region/ClientStack/Linden/Caps/EstateAccess.cs
@@ -28,6 +28,7 @@
 using System;
 using System.Collections;
 using System.Collections.Generic;
+using System.Globalization;
 using System.Text;
 
 using log4net;
@@ -166,59 +167,73 @@ namespace OpenSim.Region.ClientStack.Linden
             EstateBan[] EstateBans = regionSettings.EstateBans;
 
             StringBuilder sb = LLSDxmlEncode.Start();
-            LLSDxmlEncode.AddArray(sb);
+            LLSDxmlEncode.AddMap(sb);
 
             if (allowed != null && allowed.Length > 0)
             {
-                LLSDxmlEncode.AddMap("AllowedAgents", sb);
+                LLSDxmlEncode.AddArray("AllowedAgents", sb);
                 for (int i = 0; i < allowed.Length; ++i)
                 {
                     UUID id = allowed[i];
                     if (id == UUID.Zero)
                         continue;
-                    LLSDxmlEncode.AddElem("id", id, sb);
+                    LLSDxmlEncode.AddMap(sb);
+                        LLSDxmlEncode.AddElem("id", id, sb);
+                    LLSDxmlEncode.AddEndMap(sb);
                 }
-                LLSDxmlEncode.AddEndMap(sb);
+                LLSDxmlEncode.AddEndArray(sb);
             }
 
             if (groups != null && groups.Length > 0)
             {
-                LLSDxmlEncode.AddMap("AllowedGroups", sb);
+                LLSDxmlEncode.AddArray("AllowedGroups", sb);
                 for (int i = 0; i < groups.Length; ++i)
                 {
                     UUID id = groups[i];
                     if (id == UUID.Zero)
                         continue;
-                    LLSDxmlEncode.AddElem("id", id, sb);
+                    LLSDxmlEncode.AddMap(sb);
+                        LLSDxmlEncode.AddElem("id", id, sb);
+                    LLSDxmlEncode.AddEndMap(sb);
                 }
-                LLSDxmlEncode.AddEndMap(sb);
+                LLSDxmlEncode.AddEndArray(sb);
             }
 
             if (EstateBans != null && EstateBans.Length > 0)
             {
-                LLSDxmlEncode.AddMap("BannedAgents", sb);
+                LLSDxmlEncode.AddArray("BannedAgents", sb);
                 for (int i = 0; i < EstateBans.Length; ++i)
                 {
-                    UUID id = EstateBans[i].BannedUserID;
+                    EstateBan ban = EstateBans[i];
+                    UUID id = ban.BannedUserID;
                     if (id == UUID.Zero)
                         continue;
-                    LLSDxmlEncode.AddElem("id", id, sb);
-                    LLSDxmlEncode.AddElem("last_login_date", "0000-00-00 00:00:00", sb); // We will not have this
-                    LLSDxmlEncode.AddElem("ban_date", "0000-00-00 00:00:00", sb); // We will have this
-                    LLSDxmlEncode.AddElem("banning_id", UUID.Zero, sb); // we will have this one day
+                    LLSDxmlEncode.AddMap(sb);
+                        LLSDxmlEncode.AddElem("id", id, sb);
+                        LLSDxmlEncode.AddElem("banning_id", ban.BanningUserID, sb);
+                        LLSDxmlEncode.AddElem("last_login_date", "na", sb); // We will not have this. This information is far at grid
+                        if (ban.BanTime == 0)
+                            LLSDxmlEncode.AddElem("ban_date", "0000-00-00 00:00", sb);
+                        else
+                            LLSDxmlEncode.AddElem("ban_date", (Util.ToDateTime(ban.BanTime)).ToString("yyyy-MM-dd HH:mm", CultureInfo.InvariantCulture), sb);
+                    LLSDxmlEncode.AddEndMap(sb);
                 }
-                LLSDxmlEncode.AddEndMap(sb);
+                LLSDxmlEncode.AddEndArray(sb);
             }
 
             if (managers != null && managers.Length > 0)
             {
-                LLSDxmlEncode.AddMap("Managers", sb);
+                LLSDxmlEncode.AddArray("Managers", sb);
                 for (int i = 0; i < managers.Length; ++i)
-                    LLSDxmlEncode.AddElem("id", managers[i], sb);
-                LLSDxmlEncode.AddEndMap(sb);
+                {
+                    LLSDxmlEncode.AddMap(sb);
+                        LLSDxmlEncode.AddElem("id", managers[i], sb);
+                    LLSDxmlEncode.AddEndMap(sb);
+                }
+                LLSDxmlEncode.AddEndArray(sb);
             }
 
-            LLSDxmlEncode.AddEndArray(sb);
+            LLSDxmlEncode.AddEndMap(sb);
             responsedata["str_response_string"] = LLSDxmlEncode.End(sb);
 
             return responsedata;
diff --git a/OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs b/OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs
index c91933f..00c77d7 100644
--- a/OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs
+++ b/OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs
@@ -969,11 +969,12 @@ namespace OpenSim.Region.CoreModules.World.Estate
                                         continue;
 
                                     EstateBan bitem = new EstateBan();
-
                                     bitem.BannedUserID = user;
                                     bitem.EstateID = estateSettings.EstateID;
                                     bitem.BannedHostAddress = "0.0.0.0";
                                     bitem.BannedHostIPMask = "0.0.0.0";
+                                    bitem.BanningUserID = remote_client.AgentId;
+                                    bitem.BanTime = Util.UnixTimeSinceEpoch();
 
                                     estateSettings.AddBan(bitem);
                                     estateSettings.RemoveEstateUser(user);
@@ -982,11 +983,12 @@ namespace OpenSim.Region.CoreModules.World.Estate
                             }
 
                             EstateBan item = new EstateBan();
-
                             item.BannedUserID = user;
                             item.EstateID = Scene.RegionInfo.EstateSettings.EstateID;
                             item.BannedHostAddress = "0.0.0.0";
                             item.BannedHostIPMask = "0.0.0.0";
+                            item.BanningUserID = remote_client.AgentId;
+                            item.BanTime = Util.UnixTimeSinceEpoch();
 
                             thisSettings.AddBan(item);
                             thisSettings.RemoveEstateUser(user);