diff options
author | Melanie | 2010-04-02 14:53:10 +0100 |
---|---|---|
committer | Melanie | 2010-04-02 14:53:33 +0100 |
commit | 4b98d0db92ed4cac695091426b6483b6366f090e (patch) | |
tree | 4e930d042c5999f04856101ab255979ed07dd5ea /OpenSim/Region/OptionalModules/Avatar | |
parent | When saving an oar/iar, don't attempt to write out the data byte array if it'... (diff) | |
download | opensim-SC-4b98d0db92ed4cac695091426b6483b6366f090e.zip opensim-SC-4b98d0db92ed4cac695091426b6483b6366f090e.tar.gz opensim-SC-4b98d0db92ed4cac695091426b6483b6366f090e.tar.bz2 opensim-SC-4b98d0db92ed4cac695091426b6483b6366f090e.tar.xz |
Adding the groups update (Mantis #4646)
Thanks, mcortez.
Diffstat (limited to 'OpenSim/Region/OptionalModules/Avatar')
4 files changed, 1543 insertions, 294 deletions
diff --git a/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/GroupsModule.cs b/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/GroupsModule.cs index 61c51e0..6b942cb 100644 --- a/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/GroupsModule.cs +++ b/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/GroupsModule.cs | |||
@@ -89,16 +89,6 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups | |||
89 | 89 | ||
90 | private IGroupsServicesConnector m_groupData = null; | 90 | private IGroupsServicesConnector m_groupData = null; |
91 | 91 | ||
92 | class GroupRequestIDInfo | ||
93 | { | ||
94 | public GroupRequestID RequestID = new GroupRequestID(); | ||
95 | public DateTime LastUsedTMStamp = DateTime.MinValue; | ||
96 | } | ||
97 | private Dictionary<UUID, GroupRequestIDInfo> m_clientRequestIDInfo = new Dictionary<UUID, GroupRequestIDInfo>(); | ||
98 | private const int m_clientRequestIDFlushTimeOut = 300000; // Every 5 minutes | ||
99 | private Timer m_clientRequestIDFlushTimer; | ||
100 | |||
101 | |||
102 | // Configuration settings | 92 | // Configuration settings |
103 | private bool m_groupsEnabled = false; | 93 | private bool m_groupsEnabled = false; |
104 | private bool m_groupNoticesEnabled = true; | 94 | private bool m_groupNoticesEnabled = true; |
@@ -135,30 +125,6 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups | |||
135 | m_groupNoticesEnabled = groupsConfig.GetBoolean("NoticesEnabled", true); | 125 | m_groupNoticesEnabled = groupsConfig.GetBoolean("NoticesEnabled", true); |
136 | m_debugEnabled = groupsConfig.GetBoolean("DebugEnabled", true); | 126 | m_debugEnabled = groupsConfig.GetBoolean("DebugEnabled", true); |
137 | 127 | ||
138 | m_clientRequestIDFlushTimer = new Timer(); | ||
139 | m_clientRequestIDFlushTimer.Interval = m_clientRequestIDFlushTimeOut; | ||
140 | m_clientRequestIDFlushTimer.Elapsed += FlushClientRequestIDInfoCache; | ||
141 | m_clientRequestIDFlushTimer.AutoReset = true; | ||
142 | m_clientRequestIDFlushTimer.Start(); | ||
143 | } | ||
144 | } | ||
145 | |||
146 | void FlushClientRequestIDInfoCache(object sender, ElapsedEventArgs e) | ||
147 | { | ||
148 | lock (m_clientRequestIDInfo) | ||
149 | { | ||
150 | TimeSpan cacheTimeout = new TimeSpan(0,0, m_clientRequestIDFlushTimeOut / 1000); | ||
151 | UUID[] CurrentKeys = new UUID[m_clientRequestIDInfo.Count]; | ||
152 | foreach (UUID key in CurrentKeys) | ||
153 | { | ||
154 | if (m_clientRequestIDInfo.ContainsKey(key)) | ||
155 | { | ||
156 | if (DateTime.Now - m_clientRequestIDInfo[key].LastUsedTMStamp > cacheTimeout) | ||
157 | { | ||
158 | m_clientRequestIDInfo.Remove(key); | ||
159 | } | ||
160 | } | ||
161 | } | ||
162 | } | 128 | } |
163 | } | 129 | } |
164 | 130 | ||
@@ -236,8 +202,6 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups | |||
236 | return; | 202 | return; |
237 | 203 | ||
238 | if (m_debugEnabled) m_log.Debug("[GROUPS]: Shutting down Groups module."); | 204 | if (m_debugEnabled) m_log.Debug("[GROUPS]: Shutting down Groups module."); |
239 | |||
240 | m_clientRequestIDFlushTimer.Stop(); | ||
241 | } | 205 | } |
242 | 206 | ||
243 | public Type ReplaceableInterface | 207 | public Type ReplaceableInterface |
@@ -274,14 +238,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups | |||
274 | // Used for Notices and Group Invites/Accept/Reject | 238 | // Used for Notices and Group Invites/Accept/Reject |
275 | client.OnInstantMessage += OnInstantMessage; | 239 | client.OnInstantMessage += OnInstantMessage; |
276 | 240 | ||
277 | lock (m_clientRequestIDInfo) | 241 | // Send client thier groups information. |
278 | { | ||
279 | if (m_clientRequestIDInfo.ContainsKey(client.AgentId)) | ||
280 | { | ||
281 | // flush any old RequestID information | ||
282 | m_clientRequestIDInfo.Remove(client.AgentId); | ||
283 | } | ||
284 | } | ||
285 | SendAgentGroupDataUpdate(client, client.AgentId); | 242 | SendAgentGroupDataUpdate(client, client.AgentId); |
286 | } | 243 | } |
287 | 244 | ||
@@ -289,7 +246,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups | |||
289 | { | 246 | { |
290 | if (m_debugEnabled) m_log.DebugFormat("[GROUPS]: {0} called", System.Reflection.MethodBase.GetCurrentMethod().Name); | 247 | if (m_debugEnabled) m_log.DebugFormat("[GROUPS]: {0} called", System.Reflection.MethodBase.GetCurrentMethod().Name); |
291 | 248 | ||
292 | //GroupMembershipData[] avatarGroups = m_groupData.GetAgentGroupMemberships(GetClientGroupRequestID(remoteClient), avatarID).ToArray(); | 249 | //GroupMembershipData[] avatarGroups = m_groupData.GetAgentGroupMemberships(GetRequestingAgentID(remoteClient), avatarID).ToArray(); |
293 | GroupMembershipData[] avatarGroups = GetProfileListedGroupMemberships(remoteClient, avatarID); | 250 | GroupMembershipData[] avatarGroups = GetProfileListedGroupMemberships(remoteClient, avatarID); |
294 | remoteClient.SendAvatarGroupsReply(avatarID, avatarGroups); | 251 | remoteClient.SendAvatarGroupsReply(avatarID, avatarGroups); |
295 | } | 252 | } |
@@ -338,9 +295,9 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups | |||
338 | System.Reflection.MethodBase.GetCurrentMethod().Name, queryText, (DirFindFlags)queryFlags, queryStart); | 295 | System.Reflection.MethodBase.GetCurrentMethod().Name, queryText, (DirFindFlags)queryFlags, queryStart); |
339 | 296 | ||
340 | // TODO: This currently ignores pretty much all the query flags including Mature and sort order | 297 | // TODO: This currently ignores pretty much all the query flags including Mature and sort order |
341 | remoteClient.SendDirGroupsReply( | 298 | remoteClient.SendDirGroupsReply(queryID, m_groupData.FindGroups(GetRequestingAgentID(remoteClient), queryText).ToArray()); |
342 | queryID, m_groupData.FindGroups(GetClientGroupRequestID(remoteClient), queryText).ToArray()); | 299 | } |
343 | } | 300 | |
344 | } | 301 | } |
345 | 302 | ||
346 | private void OnAgentDataUpdateRequest(IClientAPI remoteClient, UUID dataForAgentID, UUID sessionID) | 303 | private void OnAgentDataUpdateRequest(IClientAPI remoteClient, UUID dataForAgentID, UUID sessionID) |
@@ -352,7 +309,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups | |||
352 | string activeGroupName = string.Empty; | 309 | string activeGroupName = string.Empty; |
353 | ulong activeGroupPowers = (ulong)GroupPowers.None; | 310 | ulong activeGroupPowers = (ulong)GroupPowers.None; |
354 | 311 | ||
355 | GroupMembershipData membership = m_groupData.GetAgentActiveMembership(GetClientGroupRequestID(remoteClient), dataForAgentID); | 312 | GroupMembershipData membership = m_groupData.GetAgentActiveMembership(GetRequestingAgentID(remoteClient), dataForAgentID); |
356 | if (membership != null) | 313 | if (membership != null) |
357 | { | 314 | { |
358 | activeGroupID = membership.GroupID; | 315 | activeGroupID = membership.GroupID; |
@@ -371,7 +328,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups | |||
371 | 328 | ||
372 | string GroupName; | 329 | string GroupName; |
373 | 330 | ||
374 | GroupRecord group = m_groupData.GetGroupRecord(GetClientGroupRequestID(remoteClient), GroupID, null); | 331 | GroupRecord group = m_groupData.GetGroupRecord(GetRequestingAgentID(remoteClient), GroupID, null); |
375 | if (group != null) | 332 | if (group != null) |
376 | { | 333 | { |
377 | GroupName = group.GroupName; | 334 | GroupName = group.GroupName; |
@@ -392,7 +349,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups | |||
392 | if ((im.dialog == (byte)InstantMessageDialog.GroupInvitationAccept) || (im.dialog == (byte)InstantMessageDialog.GroupInvitationDecline)) | 349 | if ((im.dialog == (byte)InstantMessageDialog.GroupInvitationAccept) || (im.dialog == (byte)InstantMessageDialog.GroupInvitationDecline)) |
393 | { | 350 | { |
394 | UUID inviteID = new UUID(im.imSessionID); | 351 | UUID inviteID = new UUID(im.imSessionID); |
395 | GroupInviteInfo inviteInfo = m_groupData.GetAgentToGroupInvite(GetClientGroupRequestID(remoteClient), inviteID); | 352 | GroupInviteInfo inviteInfo = m_groupData.GetAgentToGroupInvite(GetRequestingAgentID(remoteClient), inviteID); |
396 | 353 | ||
397 | if (inviteInfo == null) | 354 | if (inviteInfo == null) |
398 | { | 355 | { |
@@ -411,7 +368,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups | |||
411 | if (m_debugEnabled) m_log.DebugFormat("[GROUPS]: Received an accept invite notice."); | 368 | if (m_debugEnabled) m_log.DebugFormat("[GROUPS]: Received an accept invite notice."); |
412 | 369 | ||
413 | // and the sessionid is the role | 370 | // and the sessionid is the role |
414 | m_groupData.AddAgentToGroup(GetClientGroupRequestID(remoteClient), inviteInfo.AgentID, inviteInfo.GroupID, inviteInfo.RoleID); | 371 | m_groupData.AddAgentToGroup(GetRequestingAgentID(remoteClient), inviteInfo.AgentID, inviteInfo.GroupID, inviteInfo.RoleID); |
415 | 372 | ||
416 | GridInstantMessage msg = new GridInstantMessage(); | 373 | GridInstantMessage msg = new GridInstantMessage(); |
417 | msg.imSessionID = UUID.Zero.Guid; | 374 | msg.imSessionID = UUID.Zero.Guid; |
@@ -435,14 +392,14 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups | |||
435 | // TODO: If the inviter is still online, they need an agent dataupdate | 392 | // TODO: If the inviter is still online, they need an agent dataupdate |
436 | // and maybe group membership updates for the invitee | 393 | // and maybe group membership updates for the invitee |
437 | 394 | ||
438 | m_groupData.RemoveAgentToGroupInvite(GetClientGroupRequestID(remoteClient), inviteID); | 395 | m_groupData.RemoveAgentToGroupInvite(GetRequestingAgentID(remoteClient), inviteID); |
439 | } | 396 | } |
440 | 397 | ||
441 | // Reject | 398 | // Reject |
442 | if (im.dialog == (byte)InstantMessageDialog.GroupInvitationDecline) | 399 | if (im.dialog == (byte)InstantMessageDialog.GroupInvitationDecline) |
443 | { | 400 | { |
444 | if (m_debugEnabled) m_log.DebugFormat("[GROUPS]: Received a reject invite notice."); | 401 | if (m_debugEnabled) m_log.DebugFormat("[GROUPS]: Received a reject invite notice."); |
445 | m_groupData.RemoveAgentToGroupInvite(GetClientGroupRequestID(remoteClient), inviteID); | 402 | m_groupData.RemoveAgentToGroupInvite(GetRequestingAgentID(remoteClient), inviteID); |
446 | } | 403 | } |
447 | } | 404 | } |
448 | } | 405 | } |
@@ -456,7 +413,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups | |||
456 | } | 413 | } |
457 | 414 | ||
458 | UUID GroupID = new UUID(im.toAgentID); | 415 | UUID GroupID = new UUID(im.toAgentID); |
459 | if (m_groupData.GetGroupRecord(GetClientGroupRequestID(remoteClient), GroupID, null) != null) | 416 | if (m_groupData.GetGroupRecord(GetRequestingAgentID(remoteClient), GroupID, null) != null) |
460 | { | 417 | { |
461 | UUID NoticeID = UUID.Random(); | 418 | UUID NoticeID = UUID.Random(); |
462 | string Subject = im.message.Substring(0, im.message.IndexOf('|')); | 419 | string Subject = im.message.Substring(0, im.message.IndexOf('|')); |
@@ -500,14 +457,14 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups | |||
500 | } | 457 | } |
501 | 458 | ||
502 | 459 | ||
503 | m_groupData.AddGroupNotice(GetClientGroupRequestID(remoteClient), GroupID, NoticeID, im.fromAgentName, Subject, Message, bucket); | 460 | m_groupData.AddGroupNotice(GetRequestingAgentID(remoteClient), GroupID, NoticeID, im.fromAgentName, Subject, Message, bucket); |
504 | if (OnNewGroupNotice != null) | 461 | if (OnNewGroupNotice != null) |
505 | { | 462 | { |
506 | OnNewGroupNotice(GroupID, NoticeID); | 463 | OnNewGroupNotice(GroupID, NoticeID); |
507 | } | 464 | } |
508 | 465 | ||
509 | // Send notice out to everyone that wants notices | 466 | // Send notice out to everyone that wants notices |
510 | foreach (GroupMembersData member in m_groupData.GetGroupMembers(GetClientGroupRequestID(remoteClient), GroupID)) | 467 | foreach (GroupMembersData member in m_groupData.GetGroupMembers(GetRequestingAgentID(remoteClient), GroupID)) |
511 | { | 468 | { |
512 | if (m_debugEnabled) | 469 | if (m_debugEnabled) |
513 | { | 470 | { |
@@ -592,25 +549,25 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups | |||
592 | 549 | ||
593 | public GroupRecord GetGroupRecord(UUID GroupID) | 550 | public GroupRecord GetGroupRecord(UUID GroupID) |
594 | { | 551 | { |
595 | return m_groupData.GetGroupRecord(null, GroupID, null); | 552 | return m_groupData.GetGroupRecord(UUID.Zero, GroupID, null); |
596 | } | 553 | } |
597 | 554 | ||
598 | public GroupRecord GetGroupRecord(string name) | 555 | public GroupRecord GetGroupRecord(string name) |
599 | { | 556 | { |
600 | return m_groupData.GetGroupRecord(null, UUID.Zero, name); | 557 | return m_groupData.GetGroupRecord(UUID.Zero, UUID.Zero, name); |
601 | } | 558 | } |
602 | 559 | ||
603 | public void ActivateGroup(IClientAPI remoteClient, UUID groupID) | 560 | public void ActivateGroup(IClientAPI remoteClient, UUID groupID) |
604 | { | 561 | { |
605 | if (m_debugEnabled) m_log.DebugFormat("[GROUPS]: {0} called", System.Reflection.MethodBase.GetCurrentMethod().Name); | 562 | if (m_debugEnabled) m_log.DebugFormat("[GROUPS]: {0} called", System.Reflection.MethodBase.GetCurrentMethod().Name); |
606 | 563 | ||
607 | m_groupData.SetAgentActiveGroup(GetClientGroupRequestID(remoteClient), remoteClient.AgentId, groupID); | 564 | m_groupData.SetAgentActiveGroup(GetRequestingAgentID(remoteClient), GetRequestingAgentID(remoteClient), groupID); |
608 | 565 | ||
609 | // Changing active group changes title, active powers, all kinds of things | 566 | // Changing active group changes title, active powers, all kinds of things |
610 | // anyone who is in any region that can see this client, should probably be | 567 | // anyone who is in any region that can see this client, should probably be |
611 | // updated with new group info. At a minimum, they should get ScenePresence | 568 | // updated with new group info. At a minimum, they should get ScenePresence |
612 | // updated with new title. | 569 | // updated with new title. |
613 | UpdateAllClientsWithGroupInfo(remoteClient.AgentId); | 570 | UpdateAllClientsWithGroupInfo(GetRequestingAgentID(remoteClient)); |
614 | } | 571 | } |
615 | 572 | ||
616 | /// <summary> | 573 | /// <summary> |
@@ -620,10 +577,9 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups | |||
620 | { | 577 | { |
621 | if (m_debugEnabled) m_log.DebugFormat("[GROUPS]: {0} called", System.Reflection.MethodBase.GetCurrentMethod().Name); | 578 | if (m_debugEnabled) m_log.DebugFormat("[GROUPS]: {0} called", System.Reflection.MethodBase.GetCurrentMethod().Name); |
622 | 579 | ||
623 | GroupRequestID grID = GetClientGroupRequestID(remoteClient); | ||
624 | 580 | ||
625 | List<GroupRolesData> agentRoles = m_groupData.GetAgentGroupRoles(grID, remoteClient.AgentId, groupID); | 581 | List<GroupRolesData> agentRoles = m_groupData.GetAgentGroupRoles(GetRequestingAgentID(remoteClient), GetRequestingAgentID(remoteClient), groupID); |
626 | GroupMembershipData agentMembership = m_groupData.GetAgentGroupMembership(grID, remoteClient.AgentId, groupID); | 582 | GroupMembershipData agentMembership = m_groupData.GetAgentGroupMembership(GetRequestingAgentID(remoteClient), GetRequestingAgentID(remoteClient), groupID); |
627 | 583 | ||
628 | List<GroupTitlesData> titles = new List<GroupTitlesData>(); | 584 | List<GroupTitlesData> titles = new List<GroupTitlesData>(); |
629 | foreach (GroupRolesData role in agentRoles) | 585 | foreach (GroupRolesData role in agentRoles) |
@@ -645,8 +601,15 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups | |||
645 | public List<GroupMembersData> GroupMembersRequest(IClientAPI remoteClient, UUID groupID) | 601 | public List<GroupMembersData> GroupMembersRequest(IClientAPI remoteClient, UUID groupID) |
646 | { | 602 | { |
647 | if (m_debugEnabled) m_log.DebugFormat("[GROUPS]: {0} called", System.Reflection.MethodBase.GetCurrentMethod().Name); | 603 | if (m_debugEnabled) m_log.DebugFormat("[GROUPS]: {0} called", System.Reflection.MethodBase.GetCurrentMethod().Name); |
648 | 604 | List<GroupMembersData> data = m_groupData.GetGroupMembers(GetRequestingAgentID(remoteClient), groupID); | |
649 | List<GroupMembersData> data = m_groupData.GetGroupMembers(GetClientGroupRequestID(remoteClient), groupID); | 605 | |
606 | if (m_debugEnabled) | ||
607 | { | ||
608 | foreach (GroupMembersData member in data) | ||
609 | { | ||
610 | m_log.DebugFormat("[GROUPS]: Member({0}) - IsOwner({1})", member.AgentID, member.IsOwner); | ||
611 | } | ||
612 | } | ||
650 | 613 | ||
651 | return data; | 614 | return data; |
652 | 615 | ||
@@ -656,7 +619,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups | |||
656 | { | 619 | { |
657 | if (m_debugEnabled) m_log.DebugFormat("[GROUPS]: {0} called", System.Reflection.MethodBase.GetCurrentMethod().Name); | 620 | if (m_debugEnabled) m_log.DebugFormat("[GROUPS]: {0} called", System.Reflection.MethodBase.GetCurrentMethod().Name); |
658 | 621 | ||
659 | List<GroupRolesData> data = m_groupData.GetGroupRoles(GetClientGroupRequestID(remoteClient), groupID); | 622 | List<GroupRolesData> data = m_groupData.GetGroupRoles(GetRequestingAgentID(remoteClient), groupID); |
660 | 623 | ||
661 | return data; | 624 | return data; |
662 | } | 625 | } |
@@ -665,8 +628,15 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups | |||
665 | { | 628 | { |
666 | if (m_debugEnabled) m_log.DebugFormat("[GROUPS]: {0} called", System.Reflection.MethodBase.GetCurrentMethod().Name); | 629 | if (m_debugEnabled) m_log.DebugFormat("[GROUPS]: {0} called", System.Reflection.MethodBase.GetCurrentMethod().Name); |
667 | 630 | ||
668 | List<GroupRoleMembersData> data = m_groupData.GetGroupRoleMembers(GetClientGroupRequestID(remoteClient), groupID); | 631 | List<GroupRoleMembersData> data = m_groupData.GetGroupRoleMembers(GetRequestingAgentID(remoteClient), groupID); |
669 | 632 | ||
633 | if (m_debugEnabled) | ||
634 | { | ||
635 | foreach (GroupRoleMembersData member in data) | ||
636 | { | ||
637 | m_log.DebugFormat("[GROUPS]: Member({0}) - Role({1})", member.MemberID, member.RoleID); | ||
638 | } | ||
639 | } | ||
670 | return data; | 640 | return data; |
671 | } | 641 | } |
672 | 642 | ||
@@ -676,17 +646,16 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups | |||
676 | 646 | ||
677 | GroupProfileData profile = new GroupProfileData(); | 647 | GroupProfileData profile = new GroupProfileData(); |
678 | 648 | ||
679 | GroupRequestID grID = GetClientGroupRequestID(remoteClient); | ||
680 | 649 | ||
681 | GroupRecord groupInfo = m_groupData.GetGroupRecord(GetClientGroupRequestID(remoteClient), groupID, null); | 650 | GroupRecord groupInfo = m_groupData.GetGroupRecord(GetRequestingAgentID(remoteClient), groupID, null); |
682 | if (groupInfo != null) | 651 | if (groupInfo != null) |
683 | { | 652 | { |
684 | profile.AllowPublish = groupInfo.AllowPublish; | 653 | profile.AllowPublish = groupInfo.AllowPublish; |
685 | profile.Charter = groupInfo.Charter; | 654 | profile.Charter = groupInfo.Charter; |
686 | profile.FounderID = groupInfo.FounderID; | 655 | profile.FounderID = groupInfo.FounderID; |
687 | profile.GroupID = groupID; | 656 | profile.GroupID = groupID; |
688 | profile.GroupMembershipCount = m_groupData.GetGroupMembers(grID, groupID).Count; | 657 | profile.GroupMembershipCount = m_groupData.GetGroupMembers(GetRequestingAgentID(remoteClient), groupID).Count; |
689 | profile.GroupRolesCount = m_groupData.GetGroupRoles(grID, groupID).Count; | 658 | profile.GroupRolesCount = m_groupData.GetGroupRoles(GetRequestingAgentID(remoteClient), groupID).Count; |
690 | profile.InsigniaID = groupInfo.GroupPicture; | 659 | profile.InsigniaID = groupInfo.GroupPicture; |
691 | profile.MaturePublish = groupInfo.MaturePublish; | 660 | profile.MaturePublish = groupInfo.MaturePublish; |
692 | profile.MembershipFee = groupInfo.MembershipFee; | 661 | profile.MembershipFee = groupInfo.MembershipFee; |
@@ -697,7 +666,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups | |||
697 | profile.ShowInList = groupInfo.ShowInList; | 666 | profile.ShowInList = groupInfo.ShowInList; |
698 | } | 667 | } |
699 | 668 | ||
700 | GroupMembershipData memberInfo = m_groupData.GetAgentGroupMembership(grID, remoteClient.AgentId, groupID); | 669 | GroupMembershipData memberInfo = m_groupData.GetAgentGroupMembership(GetRequestingAgentID(remoteClient), GetRequestingAgentID(remoteClient), groupID); |
701 | if (memberInfo != null) | 670 | if (memberInfo != null) |
702 | { | 671 | { |
703 | profile.MemberTitle = memberInfo.GroupTitle; | 672 | profile.MemberTitle = memberInfo.GroupTitle; |
@@ -711,7 +680,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups | |||
711 | { | 680 | { |
712 | if (m_debugEnabled) m_log.DebugFormat("[GROUPS]: {0} called", System.Reflection.MethodBase.GetCurrentMethod().Name); | 681 | if (m_debugEnabled) m_log.DebugFormat("[GROUPS]: {0} called", System.Reflection.MethodBase.GetCurrentMethod().Name); |
713 | 682 | ||
714 | return m_groupData.GetAgentGroupMemberships(null, agentID).ToArray(); | 683 | return m_groupData.GetAgentGroupMemberships(UUID.Zero, agentID).ToArray(); |
715 | } | 684 | } |
716 | 685 | ||
717 | public GroupMembershipData GetMembershipData(UUID groupID, UUID agentID) | 686 | public GroupMembershipData GetMembershipData(UUID groupID, UUID agentID) |
@@ -721,33 +690,30 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups | |||
721 | "[GROUPS]: {0} called with groupID={1}, agentID={2}", | 690 | "[GROUPS]: {0} called with groupID={1}, agentID={2}", |
722 | System.Reflection.MethodBase.GetCurrentMethod().Name, groupID, agentID); | 691 | System.Reflection.MethodBase.GetCurrentMethod().Name, groupID, agentID); |
723 | 692 | ||
724 | return m_groupData.GetAgentGroupMembership(null, agentID, groupID); | 693 | return m_groupData.GetAgentGroupMembership(UUID.Zero, agentID, groupID); |
725 | } | 694 | } |
726 | 695 | ||
727 | public void UpdateGroupInfo(IClientAPI remoteClient, UUID groupID, string charter, bool showInList, UUID insigniaID, int membershipFee, bool openEnrollment, bool allowPublish, bool maturePublish) | 696 | public void UpdateGroupInfo(IClientAPI remoteClient, UUID groupID, string charter, bool showInList, UUID insigniaID, int membershipFee, bool openEnrollment, bool allowPublish, bool maturePublish) |
728 | { | 697 | { |
729 | if (m_debugEnabled) m_log.DebugFormat("[GROUPS]: {0} called", System.Reflection.MethodBase.GetCurrentMethod().Name); | 698 | if (m_debugEnabled) m_log.DebugFormat("[GROUPS]: {0} called", System.Reflection.MethodBase.GetCurrentMethod().Name); |
730 | 699 | ||
731 | // TODO: Security Check? | 700 | // Note: Permissions checking for modification rights is handled by the Groups Server/Service |
732 | 701 | m_groupData.UpdateGroup(GetRequestingAgentID(remoteClient), groupID, charter, showInList, insigniaID, membershipFee, openEnrollment, allowPublish, maturePublish); | |
733 | m_groupData.UpdateGroup(GetClientGroupRequestID(remoteClient), groupID, charter, showInList, insigniaID, membershipFee, openEnrollment, allowPublish, maturePublish); | ||
734 | } | 702 | } |
735 | 703 | ||
736 | public void SetGroupAcceptNotices(IClientAPI remoteClient, UUID groupID, bool acceptNotices, bool listInProfile) | 704 | public void SetGroupAcceptNotices(IClientAPI remoteClient, UUID groupID, bool acceptNotices, bool listInProfile) |
737 | { | 705 | { |
738 | // TODO: Security Check? | 706 | // Note: Permissions checking for modification rights is handled by the Groups Server/Service |
739 | if (m_debugEnabled) m_log.DebugFormat("[GROUPS]: {0} called", System.Reflection.MethodBase.GetCurrentMethod().Name); | 707 | if (m_debugEnabled) m_log.DebugFormat("[GROUPS]: {0} called", System.Reflection.MethodBase.GetCurrentMethod().Name); |
740 | 708 | ||
741 | m_groupData.SetAgentGroupInfo(GetClientGroupRequestID(remoteClient), remoteClient.AgentId, groupID, acceptNotices, listInProfile); | 709 | m_groupData.SetAgentGroupInfo(GetRequestingAgentID(remoteClient), GetRequestingAgentID(remoteClient), groupID, acceptNotices, listInProfile); |
742 | } | 710 | } |
743 | 711 | ||
744 | public UUID CreateGroup(IClientAPI remoteClient, string name, string charter, bool showInList, UUID insigniaID, int membershipFee, bool openEnrollment, bool allowPublish, bool maturePublish) | 712 | public UUID CreateGroup(IClientAPI remoteClient, string name, string charter, bool showInList, UUID insigniaID, int membershipFee, bool openEnrollment, bool allowPublish, bool maturePublish) |
745 | { | 713 | { |
746 | if (m_debugEnabled) m_log.DebugFormat("[GROUPS]: {0} called", System.Reflection.MethodBase.GetCurrentMethod().Name); | 714 | if (m_debugEnabled) m_log.DebugFormat("[GROUPS]: {0} called", System.Reflection.MethodBase.GetCurrentMethod().Name); |
747 | 715 | ||
748 | GroupRequestID grID = GetClientGroupRequestID(remoteClient); | 716 | if (m_groupData.GetGroupRecord(GetRequestingAgentID(remoteClient), UUID.Zero, name) != null) |
749 | |||
750 | if (m_groupData.GetGroupRecord(grID, UUID.Zero, name) != null) | ||
751 | { | 717 | { |
752 | remoteClient.SendCreateGroupReply(UUID.Zero, false, "A group with the same name already exists."); | 718 | remoteClient.SendCreateGroupReply(UUID.Zero, false, "A group with the same name already exists."); |
753 | return UUID.Zero; | 719 | return UUID.Zero; |
@@ -761,14 +727,14 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups | |||
761 | remoteClient.SendCreateGroupReply(UUID.Zero, false, "You have got issuficient funds to create a group."); | 727 | remoteClient.SendCreateGroupReply(UUID.Zero, false, "You have got issuficient funds to create a group."); |
762 | return UUID.Zero; | 728 | return UUID.Zero; |
763 | } | 729 | } |
764 | money.ApplyGroupCreationCharge(remoteClient.AgentId); | 730 | money.ApplyGroupCreationCharge(GetRequestingAgentID(remoteClient)); |
765 | } | 731 | } |
766 | UUID groupID = m_groupData.CreateGroup(grID, name, charter, showInList, insigniaID, membershipFee, openEnrollment, allowPublish, maturePublish, remoteClient.AgentId); | 732 | UUID groupID = m_groupData.CreateGroup(GetRequestingAgentID(remoteClient), name, charter, showInList, insigniaID, membershipFee, openEnrollment, allowPublish, maturePublish, GetRequestingAgentID(remoteClient)); |
767 | 733 | ||
768 | remoteClient.SendCreateGroupReply(groupID, true, "Group created successfullly"); | 734 | remoteClient.SendCreateGroupReply(groupID, true, "Group created successfullly"); |
769 | 735 | ||
770 | // Update the founder with new group information. | 736 | // Update the founder with new group information. |
771 | SendAgentGroupDataUpdate(remoteClient, remoteClient.AgentId); | 737 | SendAgentGroupDataUpdate(remoteClient, GetRequestingAgentID(remoteClient)); |
772 | 738 | ||
773 | return groupID; | 739 | return groupID; |
774 | } | 740 | } |
@@ -779,7 +745,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups | |||
779 | 745 | ||
780 | // ToDo: check if agent is a member of group and is allowed to see notices? | 746 | // ToDo: check if agent is a member of group and is allowed to see notices? |
781 | 747 | ||
782 | return m_groupData.GetGroupNotices(GetClientGroupRequestID(remoteClient), groupID).ToArray(); | 748 | return m_groupData.GetGroupNotices(GetRequestingAgentID(remoteClient), groupID).ToArray(); |
783 | } | 749 | } |
784 | 750 | ||
785 | /// <summary> | 751 | /// <summary> |
@@ -789,7 +755,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups | |||
789 | { | 755 | { |
790 | if (m_debugEnabled) m_log.DebugFormat("[GROUPS]: {0} called", System.Reflection.MethodBase.GetCurrentMethod().Name); | 756 | if (m_debugEnabled) m_log.DebugFormat("[GROUPS]: {0} called", System.Reflection.MethodBase.GetCurrentMethod().Name); |
791 | 757 | ||
792 | GroupMembershipData membership = m_groupData.GetAgentActiveMembership(null, avatarID); | 758 | GroupMembershipData membership = m_groupData.GetAgentActiveMembership(UUID.Zero, avatarID); |
793 | if (membership != null) | 759 | if (membership != null) |
794 | { | 760 | { |
795 | return membership.GroupTitle; | 761 | return membership.GroupTitle; |
@@ -804,13 +770,13 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups | |||
804 | { | 770 | { |
805 | if (m_debugEnabled) m_log.DebugFormat("[GROUPS]: {0} called", System.Reflection.MethodBase.GetCurrentMethod().Name); | 771 | if (m_debugEnabled) m_log.DebugFormat("[GROUPS]: {0} called", System.Reflection.MethodBase.GetCurrentMethod().Name); |
806 | 772 | ||
807 | m_groupData.SetAgentActiveGroupRole(GetClientGroupRequestID(remoteClient), remoteClient.AgentId, groupID, titleRoleID); | 773 | m_groupData.SetAgentActiveGroupRole(GetRequestingAgentID(remoteClient), GetRequestingAgentID(remoteClient), groupID, titleRoleID); |
808 | 774 | ||
809 | // TODO: Not sure what all is needed here, but if the active group role change is for the group | 775 | // TODO: Not sure what all is needed here, but if the active group role change is for the group |
810 | // the client currently has set active, then we need to do a scene presence update too | 776 | // the client currently has set active, then we need to do a scene presence update too |
811 | // if (m_groupData.GetAgentActiveMembership(remoteClient.AgentId).GroupID == GroupID) | 777 | // if (m_groupData.GetAgentActiveMembership(GetRequestingAgentID(remoteClient)).GroupID == GroupID) |
812 | 778 | ||
813 | UpdateAllClientsWithGroupInfo(remoteClient.AgentId); | 779 | UpdateAllClientsWithGroupInfo(GetRequestingAgentID(remoteClient)); |
814 | } | 780 | } |
815 | 781 | ||
816 | 782 | ||
@@ -820,16 +786,14 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups | |||
820 | 786 | ||
821 | // Security Checks are handled in the Groups Service. | 787 | // Security Checks are handled in the Groups Service. |
822 | 788 | ||
823 | GroupRequestID grID = GetClientGroupRequestID(remoteClient); | ||
824 | |||
825 | switch ((OpenMetaverse.GroupRoleUpdate)updateType) | 789 | switch ((OpenMetaverse.GroupRoleUpdate)updateType) |
826 | { | 790 | { |
827 | case OpenMetaverse.GroupRoleUpdate.Create: | 791 | case OpenMetaverse.GroupRoleUpdate.Create: |
828 | m_groupData.AddGroupRole(grID, groupID, UUID.Random(), name, description, title, powers); | 792 | m_groupData.AddGroupRole(GetRequestingAgentID(remoteClient), groupID, UUID.Random(), name, description, title, powers); |
829 | break; | 793 | break; |
830 | 794 | ||
831 | case OpenMetaverse.GroupRoleUpdate.Delete: | 795 | case OpenMetaverse.GroupRoleUpdate.Delete: |
832 | m_groupData.RemoveGroupRole(grID, groupID, roleID); | 796 | m_groupData.RemoveGroupRole(GetRequestingAgentID(remoteClient), groupID, roleID); |
833 | break; | 797 | break; |
834 | 798 | ||
835 | case OpenMetaverse.GroupRoleUpdate.UpdateAll: | 799 | case OpenMetaverse.GroupRoleUpdate.UpdateAll: |
@@ -840,7 +804,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups | |||
840 | GroupPowers gp = (GroupPowers)powers; | 804 | GroupPowers gp = (GroupPowers)powers; |
841 | m_log.DebugFormat("[GROUPS]: Role ({0}) updated with Powers ({1}) ({2})", name, powers.ToString(), gp.ToString()); | 805 | m_log.DebugFormat("[GROUPS]: Role ({0}) updated with Powers ({1}) ({2})", name, powers.ToString(), gp.ToString()); |
842 | } | 806 | } |
843 | m_groupData.UpdateGroupRole(grID, groupID, roleID, name, description, title, powers); | 807 | m_groupData.UpdateGroupRole(GetRequestingAgentID(remoteClient), groupID, roleID, name, description, title, powers); |
844 | break; | 808 | break; |
845 | 809 | ||
846 | case OpenMetaverse.GroupRoleUpdate.NoUpdate: | 810 | case OpenMetaverse.GroupRoleUpdate.NoUpdate: |
@@ -851,7 +815,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups | |||
851 | } | 815 | } |
852 | 816 | ||
853 | // TODO: This update really should send out updates for everyone in the role that just got changed. | 817 | // TODO: This update really should send out updates for everyone in the role that just got changed. |
854 | SendAgentGroupDataUpdate(remoteClient, remoteClient.AgentId); | 818 | SendAgentGroupDataUpdate(remoteClient, GetRequestingAgentID(remoteClient)); |
855 | } | 819 | } |
856 | 820 | ||
857 | public void GroupRoleChanges(IClientAPI remoteClient, UUID groupID, UUID roleID, UUID memberID, uint changes) | 821 | public void GroupRoleChanges(IClientAPI remoteClient, UUID groupID, UUID roleID, UUID memberID, uint changes) |
@@ -859,18 +823,16 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups | |||
859 | if (m_debugEnabled) m_log.DebugFormat("[GROUPS]: {0} called", System.Reflection.MethodBase.GetCurrentMethod().Name); | 823 | if (m_debugEnabled) m_log.DebugFormat("[GROUPS]: {0} called", System.Reflection.MethodBase.GetCurrentMethod().Name); |
860 | // Todo: Security check | 824 | // Todo: Security check |
861 | 825 | ||
862 | GroupRequestID grID = GetClientGroupRequestID(remoteClient); | ||
863 | |||
864 | switch (changes) | 826 | switch (changes) |
865 | { | 827 | { |
866 | case 0: | 828 | case 0: |
867 | // Add | 829 | // Add |
868 | m_groupData.AddAgentToGroupRole(grID, memberID, groupID, roleID); | 830 | m_groupData.AddAgentToGroupRole(GetRequestingAgentID(remoteClient), memberID, groupID, roleID); |
869 | 831 | ||
870 | break; | 832 | break; |
871 | case 1: | 833 | case 1: |
872 | // Remove | 834 | // Remove |
873 | m_groupData.RemoveAgentFromGroupRole(grID, memberID, groupID, roleID); | 835 | m_groupData.RemoveAgentFromGroupRole(GetRequestingAgentID(remoteClient), memberID, groupID, roleID); |
874 | 836 | ||
875 | break; | 837 | break; |
876 | default: | 838 | default: |
@@ -879,25 +841,23 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups | |||
879 | } | 841 | } |
880 | 842 | ||
881 | // TODO: This update really should send out updates for everyone in the role that just got changed. | 843 | // TODO: This update really should send out updates for everyone in the role that just got changed. |
882 | SendAgentGroupDataUpdate(remoteClient, remoteClient.AgentId); | 844 | SendAgentGroupDataUpdate(remoteClient, GetRequestingAgentID(remoteClient)); |
883 | } | 845 | } |
884 | 846 | ||
885 | public void GroupNoticeRequest(IClientAPI remoteClient, UUID groupNoticeID) | 847 | public void GroupNoticeRequest(IClientAPI remoteClient, UUID groupNoticeID) |
886 | { | 848 | { |
887 | if (m_debugEnabled) m_log.DebugFormat("[GROUPS]: {0} called", System.Reflection.MethodBase.GetCurrentMethod().Name); | 849 | if (m_debugEnabled) m_log.DebugFormat("[GROUPS]: {0} called", System.Reflection.MethodBase.GetCurrentMethod().Name); |
888 | 850 | ||
889 | GroupRequestID grID = GetClientGroupRequestID(remoteClient); | 851 | GroupNoticeInfo data = m_groupData.GetGroupNotice(GetRequestingAgentID(remoteClient), groupNoticeID); |
890 | |||
891 | GroupNoticeInfo data = m_groupData.GetGroupNotice(grID, groupNoticeID); | ||
892 | 852 | ||
893 | if (data != null) | 853 | if (data != null) |
894 | { | 854 | { |
895 | GroupRecord groupInfo = m_groupData.GetGroupRecord(grID, data.GroupID, null); | 855 | GroupRecord groupInfo = m_groupData.GetGroupRecord(GetRequestingAgentID(remoteClient), data.GroupID, null); |
896 | 856 | ||
897 | GridInstantMessage msg = new GridInstantMessage(); | 857 | GridInstantMessage msg = new GridInstantMessage(); |
898 | msg.imSessionID = UUID.Zero.Guid; | 858 | msg.imSessionID = UUID.Zero.Guid; |
899 | msg.fromAgentID = data.GroupID.Guid; | 859 | msg.fromAgentID = data.GroupID.Guid; |
900 | msg.toAgentID = remoteClient.AgentId.Guid; | 860 | msg.toAgentID = GetRequestingAgentID(remoteClient).Guid; |
901 | msg.timestamp = (uint)Util.UnixTimeSinceEpoch(); | 861 | msg.timestamp = (uint)Util.UnixTimeSinceEpoch(); |
902 | msg.fromAgentName = "Group Notice : " + groupInfo == null ? "Unknown" : groupInfo.GroupName; | 862 | msg.fromAgentName = "Group Notice : " + groupInfo == null ? "Unknown" : groupInfo.GroupName; |
903 | msg.message = data.noticeData.Subject + "|" + data.Message; | 863 | msg.message = data.noticeData.Subject + "|" + data.Message; |
@@ -909,7 +869,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups | |||
909 | msg.RegionID = UUID.Zero.Guid; | 869 | msg.RegionID = UUID.Zero.Guid; |
910 | msg.binaryBucket = data.BinaryBucket; | 870 | msg.binaryBucket = data.BinaryBucket; |
911 | 871 | ||
912 | OutgoingInstantMessage(msg, remoteClient.AgentId); | 872 | OutgoingInstantMessage(msg, GetRequestingAgentID(remoteClient)); |
913 | } | 873 | } |
914 | 874 | ||
915 | } | 875 | } |
@@ -929,7 +889,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups | |||
929 | msg.Position = Vector3.Zero; | 889 | msg.Position = Vector3.Zero; |
930 | msg.RegionID = UUID.Zero.Guid; | 890 | msg.RegionID = UUID.Zero.Guid; |
931 | 891 | ||
932 | GroupNoticeInfo info = m_groupData.GetGroupNotice(null, groupNoticeID); | 892 | GroupNoticeInfo info = m_groupData.GetGroupNotice(agentID, groupNoticeID); |
933 | if (info != null) | 893 | if (info != null) |
934 | { | 894 | { |
935 | msg.fromAgentID = info.GroupID.Guid; | 895 | msg.fromAgentID = info.GroupID.Guid; |
@@ -956,7 +916,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups | |||
956 | if (m_debugEnabled) m_log.DebugFormat("[GROUPS]: {0} called", System.Reflection.MethodBase.GetCurrentMethod().Name); | 916 | if (m_debugEnabled) m_log.DebugFormat("[GROUPS]: {0} called", System.Reflection.MethodBase.GetCurrentMethod().Name); |
957 | 917 | ||
958 | // Send agent information about his groups | 918 | // Send agent information about his groups |
959 | SendAgentGroupDataUpdate(remoteClient, remoteClient.AgentId); | 919 | SendAgentGroupDataUpdate(remoteClient, GetRequestingAgentID(remoteClient)); |
960 | } | 920 | } |
961 | 921 | ||
962 | public void JoinGroupRequest(IClientAPI remoteClient, UUID groupID) | 922 | public void JoinGroupRequest(IClientAPI remoteClient, UUID groupID) |
@@ -964,19 +924,19 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups | |||
964 | if (m_debugEnabled) m_log.DebugFormat("[GROUPS]: {0} called", System.Reflection.MethodBase.GetCurrentMethod().Name); | 924 | if (m_debugEnabled) m_log.DebugFormat("[GROUPS]: {0} called", System.Reflection.MethodBase.GetCurrentMethod().Name); |
965 | 925 | ||
966 | // Should check to see if OpenEnrollment, or if there's an outstanding invitation | 926 | // Should check to see if OpenEnrollment, or if there's an outstanding invitation |
967 | m_groupData.AddAgentToGroup(GetClientGroupRequestID(remoteClient), remoteClient.AgentId, groupID, UUID.Zero); | 927 | m_groupData.AddAgentToGroup(GetRequestingAgentID(remoteClient), GetRequestingAgentID(remoteClient), groupID, UUID.Zero); |
968 | 928 | ||
969 | remoteClient.SendJoinGroupReply(groupID, true); | 929 | remoteClient.SendJoinGroupReply(groupID, true); |
970 | 930 | ||
971 | // Should this send updates to everyone in the group? | 931 | // Should this send updates to everyone in the group? |
972 | SendAgentGroupDataUpdate(remoteClient, remoteClient.AgentId); | 932 | SendAgentGroupDataUpdate(remoteClient, GetRequestingAgentID(remoteClient)); |
973 | } | 933 | } |
974 | 934 | ||
975 | public void LeaveGroupRequest(IClientAPI remoteClient, UUID groupID) | 935 | public void LeaveGroupRequest(IClientAPI remoteClient, UUID groupID) |
976 | { | 936 | { |
977 | if (m_debugEnabled) m_log.DebugFormat("[GROUPS]: {0} called", System.Reflection.MethodBase.GetCurrentMethod().Name); | 937 | if (m_debugEnabled) m_log.DebugFormat("[GROUPS]: {0} called", System.Reflection.MethodBase.GetCurrentMethod().Name); |
978 | 938 | ||
979 | m_groupData.RemoveAgentFromGroup(GetClientGroupRequestID(remoteClient), remoteClient.AgentId, groupID); | 939 | m_groupData.RemoveAgentFromGroup(GetRequestingAgentID(remoteClient), GetRequestingAgentID(remoteClient), groupID); |
980 | 940 | ||
981 | remoteClient.SendLeaveGroupReply(groupID, true); | 941 | remoteClient.SendLeaveGroupReply(groupID, true); |
982 | 942 | ||
@@ -984,33 +944,32 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups | |||
984 | 944 | ||
985 | // SL sends out notifcations to the group messaging session that the person has left | 945 | // SL sends out notifcations to the group messaging session that the person has left |
986 | // Should this also update everyone who is in the group? | 946 | // Should this also update everyone who is in the group? |
987 | SendAgentGroupDataUpdate(remoteClient, remoteClient.AgentId); | 947 | SendAgentGroupDataUpdate(remoteClient, GetRequestingAgentID(remoteClient)); |
988 | } | 948 | } |
989 | 949 | ||
990 | public void EjectGroupMemberRequest(IClientAPI remoteClient, UUID groupID, UUID ejecteeID) | 950 | public void EjectGroupMemberRequest(IClientAPI remoteClient, UUID groupID, UUID ejecteeID) |
991 | { | 951 | { |
992 | if (m_debugEnabled) m_log.DebugFormat("[GROUPS]: {0} called", System.Reflection.MethodBase.GetCurrentMethod().Name); | 952 | if (m_debugEnabled) m_log.DebugFormat("[GROUPS]: {0} called", System.Reflection.MethodBase.GetCurrentMethod().Name); |
993 | 953 | ||
994 | GroupRequestID grID = GetClientGroupRequestID(remoteClient); | ||
995 | 954 | ||
996 | // Todo: Security check? | 955 | // Todo: Security check? |
997 | m_groupData.RemoveAgentFromGroup(grID, ejecteeID, groupID); | 956 | m_groupData.RemoveAgentFromGroup(GetRequestingAgentID(remoteClient), ejecteeID, groupID); |
998 | 957 | ||
999 | remoteClient.SendEjectGroupMemberReply(remoteClient.AgentId, groupID, true); | 958 | remoteClient.SendEjectGroupMemberReply(GetRequestingAgentID(remoteClient), groupID, true); |
959 | |||
960 | GroupRecord groupInfo = m_groupData.GetGroupRecord(GetRequestingAgentID(remoteClient), groupID, null); | ||
1000 | 961 | ||
1001 | GroupRecord groupInfo = m_groupData.GetGroupRecord(grID, groupID, null); | ||
1002 | UserAccount account = m_sceneList[0].UserAccountService.GetUserAccount(remoteClient.Scene.RegionInfo.ScopeID, ejecteeID); | 962 | UserAccount account = m_sceneList[0].UserAccountService.GetUserAccount(remoteClient.Scene.RegionInfo.ScopeID, ejecteeID); |
1003 | if ((groupInfo == null) || (account == null)) | 963 | if ((groupInfo == null) || (account == null)) |
1004 | { | 964 | { |
1005 | return; | 965 | return; |
1006 | } | 966 | } |
1007 | |||
1008 | 967 | ||
1009 | // Send Message to Ejectee | 968 | // Send Message to Ejectee |
1010 | GridInstantMessage msg = new GridInstantMessage(); | 969 | GridInstantMessage msg = new GridInstantMessage(); |
1011 | 970 | ||
1012 | msg.imSessionID = UUID.Zero.Guid; | 971 | msg.imSessionID = UUID.Zero.Guid; |
1013 | msg.fromAgentID = remoteClient.AgentId.Guid; | 972 | msg.fromAgentID = GetRequestingAgentID(remoteClient).Guid; |
1014 | // msg.fromAgentID = info.GroupID; | 973 | // msg.fromAgentID = info.GroupID; |
1015 | msg.toAgentID = ejecteeID.Guid; | 974 | msg.toAgentID = ejecteeID.Guid; |
1016 | //msg.timestamp = (uint)Util.UnixTimeSinceEpoch(); | 975 | //msg.timestamp = (uint)Util.UnixTimeSinceEpoch(); |
@@ -1036,8 +995,8 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups | |||
1036 | 995 | ||
1037 | msg = new GridInstantMessage(); | 996 | msg = new GridInstantMessage(); |
1038 | msg.imSessionID = UUID.Zero.Guid; | 997 | msg.imSessionID = UUID.Zero.Guid; |
1039 | msg.fromAgentID = remoteClient.AgentId.Guid; | 998 | msg.fromAgentID = GetRequestingAgentID(remoteClient).Guid; |
1040 | msg.toAgentID = remoteClient.AgentId.Guid; | 999 | msg.toAgentID = GetRequestingAgentID(remoteClient).Guid; |
1041 | msg.timestamp = 0; | 1000 | msg.timestamp = 0; |
1042 | msg.fromAgentName = remoteClient.Name; | 1001 | msg.fromAgentName = remoteClient.Name; |
1043 | if (account != null) | 1002 | if (account != null) |
@@ -1055,7 +1014,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups | |||
1055 | msg.Position = Vector3.Zero; | 1014 | msg.Position = Vector3.Zero; |
1056 | msg.RegionID = remoteClient.Scene.RegionInfo.RegionID.Guid; | 1015 | msg.RegionID = remoteClient.Scene.RegionInfo.RegionID.Guid; |
1057 | msg.binaryBucket = new byte[0]; | 1016 | msg.binaryBucket = new byte[0]; |
1058 | OutgoingInstantMessage(msg, remoteClient.AgentId); | 1017 | OutgoingInstantMessage(msg, GetRequestingAgentID(remoteClient)); |
1059 | 1018 | ||
1060 | 1019 | ||
1061 | // SL sends out messages to everyone in the group | 1020 | // SL sends out messages to everyone in the group |
@@ -1069,13 +1028,12 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups | |||
1069 | 1028 | ||
1070 | // Todo: Security check, probably also want to send some kind of notification | 1029 | // Todo: Security check, probably also want to send some kind of notification |
1071 | UUID InviteID = UUID.Random(); | 1030 | UUID InviteID = UUID.Random(); |
1072 | GroupRequestID grid = GetClientGroupRequestID(remoteClient); | ||
1073 | 1031 | ||
1074 | m_groupData.AddAgentToGroupInvite(grid, InviteID, groupID, roleID, invitedAgentID); | 1032 | m_groupData.AddAgentToGroupInvite(GetRequestingAgentID(remoteClient), InviteID, groupID, roleID, invitedAgentID); |
1075 | 1033 | ||
1076 | // Check to see if the invite went through, if it did not then it's possible | 1034 | // Check to see if the invite went through, if it did not then it's possible |
1077 | // the remoteClient did not validate or did not have permission to invite. | 1035 | // the remoteClient did not validate or did not have permission to invite. |
1078 | GroupInviteInfo inviteInfo = m_groupData.GetAgentToGroupInvite(grid, InviteID); | 1036 | GroupInviteInfo inviteInfo = m_groupData.GetAgentToGroupInvite(GetRequestingAgentID(remoteClient), InviteID); |
1079 | 1037 | ||
1080 | if (inviteInfo != null) | 1038 | if (inviteInfo != null) |
1081 | { | 1039 | { |
@@ -1087,7 +1045,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups | |||
1087 | 1045 | ||
1088 | msg.imSessionID = inviteUUID; | 1046 | msg.imSessionID = inviteUUID; |
1089 | 1047 | ||
1090 | // msg.fromAgentID = remoteClient.AgentId.Guid; | 1048 | // msg.fromAgentID = GetRequestingAgentID(remoteClient).Guid; |
1091 | msg.fromAgentID = groupID.Guid; | 1049 | msg.fromAgentID = groupID.Guid; |
1092 | msg.toAgentID = invitedAgentID.Guid; | 1050 | msg.toAgentID = invitedAgentID.Guid; |
1093 | //msg.timestamp = (uint)Util.UnixTimeSinceEpoch(); | 1051 | //msg.timestamp = (uint)Util.UnixTimeSinceEpoch(); |
@@ -1140,57 +1098,6 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups | |||
1140 | return child; | 1098 | return child; |
1141 | } | 1099 | } |
1142 | 1100 | ||
1143 | private GroupRequestID GetClientGroupRequestID(IClientAPI client) | ||
1144 | { | ||
1145 | if (client == null) | ||
1146 | { | ||
1147 | return new GroupRequestID(); | ||
1148 | } | ||
1149 | |||
1150 | lock (m_clientRequestIDInfo) | ||
1151 | { | ||
1152 | if (!m_clientRequestIDInfo.ContainsKey(client.AgentId)) | ||
1153 | { | ||
1154 | GroupRequestIDInfo info = new GroupRequestIDInfo(); | ||
1155 | info.RequestID.AgentID = client.AgentId; | ||
1156 | info.RequestID.SessionID = client.SessionId; | ||
1157 | |||
1158 | //UserProfileData userProfile = m_sceneList[0].CommsManager.UserService.GetUserProfile(client.AgentId); | ||
1159 | UserAccount account = m_sceneList[0].UserAccountService.GetUserAccount(client.Scene.RegionInfo.ScopeID, client.AgentId); | ||
1160 | if (account == null) | ||
1161 | { | ||
1162 | // This should be impossible. If I've been passed a reference to a client | ||
1163 | // that client should be registered with the UserService. So something | ||
1164 | // is horribly wrong somewhere. | ||
1165 | |||
1166 | m_log.WarnFormat("[GROUPS]: Could not find a user profile for {0} / {1}", client.Name, client.AgentId); | ||
1167 | |||
1168 | // Default to local user service and hope for the best? | ||
1169 | // REFACTORING PROBLEM | ||
1170 | //info.RequestID.UserServiceURL = m_sceneList[0].CommsManager.NetworkServersInfo.UserURL; | ||
1171 | |||
1172 | } | ||
1173 | else | ||
1174 | { | ||
1175 | string domain = string.Empty; //m_sceneList[0].CommsManager.NetworkServersInfo.UserURL; | ||
1176 | object homeUriObj; | ||
1177 | if (account.ServiceURLs.TryGetValue("HomeURI", out homeUriObj) && homeUriObj != null) | ||
1178 | domain = homeUriObj.ToString(); | ||
1179 | // They're a local user, use this: | ||
1180 | info.RequestID.UserServiceURL = domain; | ||
1181 | } | ||
1182 | |||
1183 | m_clientRequestIDInfo.Add(client.AgentId, info); | ||
1184 | } | ||
1185 | |||
1186 | m_clientRequestIDInfo[client.AgentId].LastUsedTMStamp = DateTime.Now; | ||
1187 | |||
1188 | return m_clientRequestIDInfo[client.AgentId].RequestID; | ||
1189 | } | ||
1190 | // Unreachable code! | ||
1191 | // return new GroupRequestID(); | ||
1192 | } | ||
1193 | |||
1194 | /// <summary> | 1101 | /// <summary> |
1195 | /// Send 'remoteClient' the group membership 'data' for agent 'dataForAgentID'. | 1102 | /// Send 'remoteClient' the group membership 'data' for agent 'dataForAgentID'. |
1196 | /// </summary> | 1103 | /// </summary> |
@@ -1209,7 +1116,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups | |||
1209 | 1116 | ||
1210 | foreach (GroupMembershipData membership in data) | 1117 | foreach (GroupMembershipData membership in data) |
1211 | { | 1118 | { |
1212 | if (remoteClient.AgentId != dataForAgentID) | 1119 | if (GetRequestingAgentID(remoteClient) != dataForAgentID) |
1213 | { | 1120 | { |
1214 | if (!membership.ListInProfile) | 1121 | if (!membership.ListInProfile) |
1215 | { | 1122 | { |
@@ -1237,13 +1144,18 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups | |||
1237 | OSDMap llDataStruct = new OSDMap(3); | 1144 | OSDMap llDataStruct = new OSDMap(3); |
1238 | llDataStruct.Add("AgentData", AgentData); | 1145 | llDataStruct.Add("AgentData", AgentData); |
1239 | llDataStruct.Add("GroupData", GroupData); | 1146 | llDataStruct.Add("GroupData", GroupData); |
1240 | llDataStruct.Add("NewGroupData", NewGroupData); | 1147 | llDataStruct.Add("NewGroupData", NewGroupData); |
1148 | |||
1149 | if (m_debugEnabled) | ||
1150 | { | ||
1151 | m_log.InfoFormat("[GROUPS]: {0}", OSDParser.SerializeJsonString(llDataStruct)); | ||
1152 | } | ||
1241 | 1153 | ||
1242 | IEventQueue queue = remoteClient.Scene.RequestModuleInterface<IEventQueue>(); | 1154 | IEventQueue queue = remoteClient.Scene.RequestModuleInterface<IEventQueue>(); |
1243 | 1155 | ||
1244 | if (queue != null) | 1156 | if (queue != null) |
1245 | { | 1157 | { |
1246 | queue.Enqueue(EventQueueHelper.buildEvent("AgentGroupDataUpdate", llDataStruct), remoteClient.AgentId); | 1158 | queue.Enqueue(EventQueueHelper.buildEvent("AgentGroupDataUpdate", llDataStruct), GetRequestingAgentID(remoteClient)); |
1247 | } | 1159 | } |
1248 | 1160 | ||
1249 | } | 1161 | } |
@@ -1316,7 +1228,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups | |||
1316 | /// <returns></returns> | 1228 | /// <returns></returns> |
1317 | private GroupMembershipData[] GetProfileListedGroupMemberships(IClientAPI requestingClient, UUID dataForAgentID) | 1229 | private GroupMembershipData[] GetProfileListedGroupMemberships(IClientAPI requestingClient, UUID dataForAgentID) |
1318 | { | 1230 | { |
1319 | List<GroupMembershipData> membershipData = m_groupData.GetAgentGroupMemberships(GetClientGroupRequestID(requestingClient), dataForAgentID); | 1231 | List<GroupMembershipData> membershipData = m_groupData.GetAgentGroupMemberships(requestingClient.AgentId, dataForAgentID); |
1320 | GroupMembershipData[] membershipArray; | 1232 | GroupMembershipData[] membershipArray; |
1321 | 1233 | ||
1322 | if (requestingClient.AgentId != dataForAgentID) | 1234 | if (requestingClient.AgentId != dataForAgentID) |
@@ -1338,7 +1250,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups | |||
1338 | m_log.InfoFormat("[GROUPS]: Get group membership information for {0} requested by {1}", dataForAgentID, requestingClient.AgentId); | 1250 | m_log.InfoFormat("[GROUPS]: Get group membership information for {0} requested by {1}", dataForAgentID, requestingClient.AgentId); |
1339 | foreach (GroupMembershipData membership in membershipArray) | 1251 | foreach (GroupMembershipData membership in membershipArray) |
1340 | { | 1252 | { |
1341 | m_log.InfoFormat("[GROUPS]: {0} :: {1} - {2}", dataForAgentID, membership.GroupName, membership.GroupTitle); | 1253 | m_log.InfoFormat("[GROUPS]: {0} :: {1} - {2} - {3}", dataForAgentID, membership.GroupName, membership.GroupTitle, membership.GroupPowers); |
1342 | } | 1254 | } |
1343 | } | 1255 | } |
1344 | 1256 | ||
@@ -1396,7 +1308,24 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups | |||
1396 | // | 1308 | // |
1397 | } | 1309 | } |
1398 | 1310 | ||
1399 | #endregion | 1311 | #endregion |
1312 | |||
1313 | private UUID GetRequestingAgentID(IClientAPI client) | ||
1314 | { | ||
1315 | UUID requestingAgentID = UUID.Zero; | ||
1316 | if (client != null) | ||
1317 | { | ||
1318 | requestingAgentID = client.AgentId; | ||
1319 | } | ||
1320 | return requestingAgentID; | ||
1321 | } | ||
1400 | } | 1322 | } |
1401 | 1323 | ||
1324 | public class GroupNoticeInfo | ||
1325 | { | ||
1326 | public GroupNoticeData noticeData = new GroupNoticeData(); | ||
1327 | public UUID GroupID = UUID.Zero; | ||
1328 | public string Message = string.Empty; | ||
1329 | public byte[] BinaryBucket = new byte[0]; | ||
1330 | } | ||
1402 | } | 1331 | } |
diff --git a/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/IGroupsServicesConnector.cs b/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/IGroupsServicesConnector.cs index 621ab28..6487967 100644 --- a/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/IGroupsServicesConnector.cs +++ b/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/IGroupsServicesConnector.cs | |||
@@ -36,41 +36,41 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups | |||
36 | { | 36 | { |
37 | interface IGroupsServicesConnector | 37 | interface IGroupsServicesConnector |
38 | { | 38 | { |
39 | UUID CreateGroup(GroupRequestID requestID, string name, string charter, bool showInList, UUID insigniaID, int membershipFee, bool openEnrollment, bool allowPublish, bool maturePublish, UUID founderID); | 39 | UUID CreateGroup(UUID RequestingAgentID, string name, string charter, bool showInList, UUID insigniaID, int membershipFee, bool openEnrollment, bool allowPublish, bool maturePublish, UUID founderID); |
40 | void UpdateGroup(GroupRequestID requestID, UUID groupID, string charter, bool showInList, UUID insigniaID, int membershipFee, bool openEnrollment, bool allowPublish, bool maturePublish); | 40 | void UpdateGroup(UUID RequestingAgentID, UUID groupID, string charter, bool showInList, UUID insigniaID, int membershipFee, bool openEnrollment, bool allowPublish, bool maturePublish); |
41 | GroupRecord GetGroupRecord(GroupRequestID requestID, UUID GroupID, string GroupName); | 41 | GroupRecord GetGroupRecord(UUID RequestingAgentID, UUID GroupID, string GroupName); |
42 | List<DirGroupsReplyData> FindGroups(GroupRequestID requestID, string search); | 42 | List<DirGroupsReplyData> FindGroups(UUID RequestingAgentID, string search); |
43 | List<GroupMembersData> GetGroupMembers(GroupRequestID requestID, UUID GroupID); | 43 | List<GroupMembersData> GetGroupMembers(UUID RequestingAgentID, UUID GroupID); |
44 | 44 | ||
45 | void AddGroupRole(GroupRequestID requestID, UUID groupID, UUID roleID, string name, string description, string title, ulong powers); | 45 | void AddGroupRole(UUID RequestingAgentID, UUID groupID, UUID roleID, string name, string description, string title, ulong powers); |
46 | void UpdateGroupRole(GroupRequestID requestID, UUID groupID, UUID roleID, string name, string description, string title, ulong powers); | 46 | void UpdateGroupRole(UUID RequestingAgentID, UUID groupID, UUID roleID, string name, string description, string title, ulong powers); |
47 | void RemoveGroupRole(GroupRequestID requestID, UUID groupID, UUID roleID); | 47 | void RemoveGroupRole(UUID RequestingAgentID, UUID groupID, UUID roleID); |
48 | List<GroupRolesData> GetGroupRoles(GroupRequestID requestID, UUID GroupID); | 48 | List<GroupRolesData> GetGroupRoles(UUID RequestingAgentID, UUID GroupID); |
49 | List<GroupRoleMembersData> GetGroupRoleMembers(GroupRequestID requestID, UUID GroupID); | 49 | List<GroupRoleMembersData> GetGroupRoleMembers(UUID RequestingAgentID, UUID GroupID); |
50 | 50 | ||
51 | void AddAgentToGroup(GroupRequestID requestID, UUID AgentID, UUID GroupID, UUID RoleID); | 51 | void AddAgentToGroup(UUID RequestingAgentID, UUID AgentID, UUID GroupID, UUID RoleID); |
52 | void RemoveAgentFromGroup(GroupRequestID requestID, UUID AgentID, UUID GroupID); | 52 | void RemoveAgentFromGroup(UUID RequestingAgentID, UUID AgentID, UUID GroupID); |
53 | 53 | ||
54 | void AddAgentToGroupInvite(GroupRequestID requestID, UUID inviteID, UUID groupID, UUID roleID, UUID agentID); | 54 | void AddAgentToGroupInvite(UUID RequestingAgentID, UUID inviteID, UUID groupID, UUID roleID, UUID agentID); |
55 | GroupInviteInfo GetAgentToGroupInvite(GroupRequestID requestID, UUID inviteID); | 55 | GroupInviteInfo GetAgentToGroupInvite(UUID RequestingAgentID, UUID inviteID); |
56 | void RemoveAgentToGroupInvite(GroupRequestID requestID, UUID inviteID); | 56 | void RemoveAgentToGroupInvite(UUID RequestingAgentID, UUID inviteID); |
57 | 57 | ||
58 | void AddAgentToGroupRole(GroupRequestID requestID, UUID AgentID, UUID GroupID, UUID RoleID); | 58 | void AddAgentToGroupRole(UUID RequestingAgentID, UUID AgentID, UUID GroupID, UUID RoleID); |
59 | void RemoveAgentFromGroupRole(GroupRequestID requestID, UUID AgentID, UUID GroupID, UUID RoleID); | 59 | void RemoveAgentFromGroupRole(UUID RequestingAgentID, UUID AgentID, UUID GroupID, UUID RoleID); |
60 | List<GroupRolesData> GetAgentGroupRoles(GroupRequestID requestID, UUID AgentID, UUID GroupID); | 60 | List<GroupRolesData> GetAgentGroupRoles(UUID RequestingAgentID, UUID AgentID, UUID GroupID); |
61 | 61 | ||
62 | void SetAgentActiveGroup(GroupRequestID requestID, UUID AgentID, UUID GroupID); | 62 | void SetAgentActiveGroup(UUID RequestingAgentID, UUID AgentID, UUID GroupID); |
63 | GroupMembershipData GetAgentActiveMembership(GroupRequestID requestID, UUID AgentID); | 63 | GroupMembershipData GetAgentActiveMembership(UUID RequestingAgentID, UUID AgentID); |
64 | 64 | ||
65 | void SetAgentActiveGroupRole(GroupRequestID requestID, UUID AgentID, UUID GroupID, UUID RoleID); | 65 | void SetAgentActiveGroupRole(UUID RequestingAgentID, UUID AgentID, UUID GroupID, UUID RoleID); |
66 | void SetAgentGroupInfo(GroupRequestID requestID, UUID AgentID, UUID GroupID, bool AcceptNotices, bool ListInProfile); | 66 | void SetAgentGroupInfo(UUID RequestingAgentID, UUID AgentID, UUID GroupID, bool AcceptNotices, bool ListInProfile); |
67 | 67 | ||
68 | GroupMembershipData GetAgentGroupMembership(GroupRequestID requestID, UUID AgentID, UUID GroupID); | 68 | GroupMembershipData GetAgentGroupMembership(UUID RequestingAgentID, UUID AgentID, UUID GroupID); |
69 | List<GroupMembershipData> GetAgentGroupMemberships(GroupRequestID requestID, UUID AgentID); | 69 | List<GroupMembershipData> GetAgentGroupMemberships(UUID RequestingAgentID, UUID AgentID); |
70 | 70 | ||
71 | void AddGroupNotice(GroupRequestID requestID, UUID groupID, UUID noticeID, string fromName, string subject, string message, byte[] binaryBucket); | 71 | void AddGroupNotice(UUID RequestingAgentID, UUID groupID, UUID noticeID, string fromName, string subject, string message, byte[] binaryBucket); |
72 | GroupNoticeInfo GetGroupNotice(GroupRequestID requestID, UUID noticeID); | 72 | GroupNoticeInfo GetGroupNotice(UUID RequestingAgentID, UUID noticeID); |
73 | List<GroupNoticeData> GetGroupNotices(GroupRequestID requestID, UUID GroupID); | 73 | List<GroupNoticeData> GetGroupNotices(UUID RequestingAgentID, UUID GroupID); |
74 | } | 74 | } |
75 | 75 | ||
76 | public class GroupInviteInfo | 76 | public class GroupInviteInfo |
@@ -80,11 +80,4 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups | |||
80 | public UUID AgentID = UUID.Zero; | 80 | public UUID AgentID = UUID.Zero; |
81 | public UUID InviteID = UUID.Zero; | 81 | public UUID InviteID = UUID.Zero; |
82 | } | 82 | } |
83 | |||
84 | public class GroupRequestID | ||
85 | { | ||
86 | public UUID AgentID = UUID.Zero; | ||
87 | public string UserServiceURL = string.Empty; | ||
88 | public UUID SessionID = UUID.Zero; | ||
89 | } | ||
90 | } | 83 | } |
diff --git a/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/SimianGroupsServicesConnectorModule.cs b/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/SimianGroupsServicesConnectorModule.cs new file mode 100644 index 0000000..590753e --- /dev/null +++ b/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/SimianGroupsServicesConnectorModule.cs | |||
@@ -0,0 +1,1278 @@ | |||
1 | /* | ||
2 | * Copyright (c) Contributors, http://opensimulator.org/ | ||
3 | * See CONTRIBUTORS.TXT for a full list of copyright holders. | ||
4 | * | ||
5 | * Redistribution and use in source and binary forms, with or without | ||
6 | * modification, are permitted provided that the following conditions are met: | ||
7 | * * Redistributions of source code must retain the above copyright | ||
8 | * notice, this list of conditions and the following disclaimer. | ||
9 | * * Redistributions in binary form must reproduce the above copyright | ||
10 | * notice, this list of conditions and the following disclaimer in the | ||
11 | * documentation and/or other materials provided with the distribution. | ||
12 | * * Neither the name of the OpenSimulator Project nor the | ||
13 | * names of its contributors may be used to endorse or promote products | ||
14 | * derived from this software without specific prior written permission. | ||
15 | * | ||
16 | * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY | ||
17 | * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED | ||
18 | * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE | ||
19 | * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY | ||
20 | * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES | ||
21 | * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; | ||
22 | * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND | ||
23 | * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT | ||
24 | * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS | ||
25 | * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | ||
26 | */ | ||
27 | |||
28 | using System; | ||
29 | using System.Collections; | ||
30 | using System.Collections.Generic; | ||
31 | using System.Collections.Specialized; | ||
32 | using System.Reflection; | ||
33 | |||
34 | using Nwc.XmlRpc; | ||
35 | |||
36 | using log4net; | ||
37 | using Mono.Addins; | ||
38 | using Nini.Config; | ||
39 | |||
40 | using OpenMetaverse; | ||
41 | using OpenMetaverse.StructuredData; | ||
42 | |||
43 | using OpenSim.Framework; | ||
44 | using OpenSim.Framework.Communications; | ||
45 | using OpenSim.Region.Framework.Interfaces; | ||
46 | using OpenSim.Services.Interfaces; | ||
47 | |||
48 | /*************************************************************************** | ||
49 | * Simian Data Map | ||
50 | * =============== | ||
51 | * | ||
52 | * OwnerID -> Type -> Key | ||
53 | * ----------------------- | ||
54 | * | ||
55 | * UserID -> Group -> ActiveGroup | ||
56 | * + GroupID | ||
57 | * | ||
58 | * UserID -> GroupMember -> GroupID | ||
59 | * + SelectedRoleID [UUID] | ||
60 | * + AcceptNotices [bool] | ||
61 | * + ListInProfile [bool] | ||
62 | * + Contribution [int] | ||
63 | * | ||
64 | * UserID -> GroupRole[GroupID] -> RoleID | ||
65 | * | ||
66 | * GroupID -> Group -> GroupName | ||
67 | * + Charter | ||
68 | * + ShowInList | ||
69 | * + InsigniaID | ||
70 | * + MembershipFee | ||
71 | * + OpenEnrollment | ||
72 | * + AllowPublish | ||
73 | * + MaturePublish | ||
74 | * + FounderID | ||
75 | * + EveryonePowers | ||
76 | * + OwnerRoleID | ||
77 | * + OwnersPowers | ||
78 | * | ||
79 | * GroupID -> GroupRole -> RoleID | ||
80 | * + Name | ||
81 | * + Description | ||
82 | * + Title | ||
83 | * + Powers | ||
84 | * | ||
85 | * GroupID -> GroupMemberInvite -> InviteID | ||
86 | * + AgentID | ||
87 | * + RoleID | ||
88 | * | ||
89 | * GroupID -> GroupNotice -> NoticeID | ||
90 | * + TimeStamp [uint] | ||
91 | * + FromName [string] | ||
92 | * + Subject [string] | ||
93 | * + Message [string] | ||
94 | * + BinaryBucket [byte[]] | ||
95 | * | ||
96 | * */ | ||
97 | |||
98 | namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups | ||
99 | { | ||
100 | [Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule")] | ||
101 | public class SimianGroupsServicesConnectorModule : ISharedRegionModule, IGroupsServicesConnector | ||
102 | { | ||
103 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); | ||
104 | |||
105 | public const GroupPowers m_DefaultEveryonePowers = GroupPowers.AllowSetHome | | ||
106 | GroupPowers.Accountable | | ||
107 | GroupPowers.JoinChat | | ||
108 | GroupPowers.AllowVoiceChat | | ||
109 | GroupPowers.ReceiveNotices | | ||
110 | GroupPowers.StartProposal | | ||
111 | GroupPowers.VoteOnProposal; | ||
112 | |||
113 | // Would this be cleaner as (GroupPowers)ulong.MaxValue; | ||
114 | public const GroupPowers m_DefaultOwnerPowers = GroupPowers.Accountable | ||
115 | | GroupPowers.AllowEditLand | ||
116 | | GroupPowers.AllowFly | ||
117 | | GroupPowers.AllowLandmark | ||
118 | | GroupPowers.AllowRez | ||
119 | | GroupPowers.AllowSetHome | ||
120 | | GroupPowers.AllowVoiceChat | ||
121 | | GroupPowers.AssignMember | ||
122 | | GroupPowers.AssignMemberLimited | ||
123 | | GroupPowers.ChangeActions | ||
124 | | GroupPowers.ChangeIdentity | ||
125 | | GroupPowers.ChangeMedia | ||
126 | | GroupPowers.ChangeOptions | ||
127 | | GroupPowers.CreateRole | ||
128 | | GroupPowers.DeedObject | ||
129 | | GroupPowers.DeleteRole | ||
130 | | GroupPowers.Eject | ||
131 | | GroupPowers.FindPlaces | ||
132 | | GroupPowers.Invite | ||
133 | | GroupPowers.JoinChat | ||
134 | | GroupPowers.LandChangeIdentity | ||
135 | | GroupPowers.LandDeed | ||
136 | | GroupPowers.LandDivideJoin | ||
137 | | GroupPowers.LandEdit | ||
138 | | GroupPowers.LandEjectAndFreeze | ||
139 | | GroupPowers.LandGardening | ||
140 | | GroupPowers.LandManageAllowed | ||
141 | | GroupPowers.LandManageBanned | ||
142 | | GroupPowers.LandManagePasses | ||
143 | | GroupPowers.LandOptions | ||
144 | | GroupPowers.LandRelease | ||
145 | | GroupPowers.LandSetSale | ||
146 | | GroupPowers.ModerateChat | ||
147 | | GroupPowers.ObjectManipulate | ||
148 | | GroupPowers.ObjectSetForSale | ||
149 | | GroupPowers.ReceiveNotices | ||
150 | | GroupPowers.RemoveMember | ||
151 | | GroupPowers.ReturnGroupOwned | ||
152 | | GroupPowers.ReturnGroupSet | ||
153 | | GroupPowers.ReturnNonGroup | ||
154 | | GroupPowers.RoleProperties | ||
155 | | GroupPowers.SendNotices | ||
156 | | GroupPowers.SetLandingPoint | ||
157 | | GroupPowers.StartProposal | ||
158 | | GroupPowers.VoteOnProposal; | ||
159 | |||
160 | private bool m_connectorEnabled = false; | ||
161 | |||
162 | private string m_serviceURL = string.Empty; | ||
163 | |||
164 | private bool m_debugEnabled = false; | ||
165 | |||
166 | // private IUserAccountService m_accountService = null; | ||
167 | |||
168 | |||
169 | #region IRegionModuleBase Members | ||
170 | |||
171 | public string Name | ||
172 | { | ||
173 | get { return "SimianGroupsServicesConnector"; } | ||
174 | } | ||
175 | |||
176 | // this module is not intended to be replaced, but there should only be 1 of them. | ||
177 | public Type ReplaceableInterface | ||
178 | { | ||
179 | get { return null; } | ||
180 | } | ||
181 | |||
182 | public void Initialise(IConfigSource config) | ||
183 | { | ||
184 | IConfig groupsConfig = config.Configs["Groups"]; | ||
185 | |||
186 | if (groupsConfig == null) | ||
187 | { | ||
188 | // Do not run this module by default. | ||
189 | return; | ||
190 | } | ||
191 | else | ||
192 | { | ||
193 | // if groups aren't enabled, we're not needed. | ||
194 | // if we're not specified as the connector to use, then we're not wanted | ||
195 | if ((groupsConfig.GetBoolean("Enabled", false) == false) | ||
196 | || (groupsConfig.GetString("ServicesConnectorModule", "Default") != Name)) | ||
197 | { | ||
198 | m_connectorEnabled = false; | ||
199 | return; | ||
200 | } | ||
201 | |||
202 | m_log.InfoFormat("[GROUPS-CONNECTOR]: Initializing {0}", this.Name); | ||
203 | |||
204 | m_serviceURL = groupsConfig.GetString("XmlRpcServiceURL", string.Empty); | ||
205 | if ((m_serviceURL == null) || | ||
206 | (m_serviceURL == string.Empty)) | ||
207 | { | ||
208 | m_log.ErrorFormat("Please specify a valid Simian Server URL for XmlRpcServiceURL in OpenSim.ini, [Groups]"); | ||
209 | m_connectorEnabled = false; | ||
210 | return; | ||
211 | } | ||
212 | |||
213 | // If we got all the config options we need, lets start'er'up | ||
214 | m_connectorEnabled = true; | ||
215 | |||
216 | m_debugEnabled = groupsConfig.GetBoolean("DebugEnabled", true); | ||
217 | |||
218 | } | ||
219 | } | ||
220 | |||
221 | public void Close() | ||
222 | { | ||
223 | m_log.InfoFormat("[GROUPS-CONNECTOR]: Closing {0}", this.Name); | ||
224 | } | ||
225 | |||
226 | public void AddRegion(OpenSim.Region.Framework.Scenes.Scene scene) | ||
227 | { | ||
228 | if (m_connectorEnabled) | ||
229 | { | ||
230 | scene.RegisterModuleInterface<IGroupsServicesConnector>(this); | ||
231 | } | ||
232 | } | ||
233 | |||
234 | public void RemoveRegion(OpenSim.Region.Framework.Scenes.Scene scene) | ||
235 | { | ||
236 | if (scene.RequestModuleInterface<IGroupsServicesConnector>() == this) | ||
237 | { | ||
238 | scene.UnregisterModuleInterface<IGroupsServicesConnector>(this); | ||
239 | } | ||
240 | } | ||
241 | |||
242 | public void RegionLoaded(OpenSim.Region.Framework.Scenes.Scene scene) | ||
243 | { | ||
244 | // TODO: May want to consider listenning for Agent Connections so we can pre-cache group info | ||
245 | // scene.EventManager.OnNewClient += OnNewClient; | ||
246 | } | ||
247 | |||
248 | #endregion | ||
249 | |||
250 | #region ISharedRegionModule Members | ||
251 | |||
252 | public void PostInitialise() | ||
253 | { | ||
254 | // NoOp | ||
255 | } | ||
256 | |||
257 | #endregion | ||
258 | |||
259 | |||
260 | |||
261 | |||
262 | #region IGroupsServicesConnector Members | ||
263 | |||
264 | /// <summary> | ||
265 | /// Create a Group, including Everyone and Owners Role, place FounderID in both groups, select Owner as selected role, and newly created group as agent's active role. | ||
266 | /// </summary> | ||
267 | public UUID CreateGroup(UUID requestingAgentID, string name, string charter, bool showInList, UUID insigniaID, | ||
268 | int membershipFee, bool openEnrollment, bool allowPublish, | ||
269 | bool maturePublish, UUID founderID) | ||
270 | { | ||
271 | if (m_debugEnabled) m_log.InfoFormat("[SIMIAN-GROUPS-CONNECTOR] {0} called", System.Reflection.MethodBase.GetCurrentMethod().Name); | ||
272 | |||
273 | UUID GroupID = UUID.Random(); | ||
274 | UUID OwnerRoleID = UUID.Random(); | ||
275 | |||
276 | OSDMap GroupInfoMap = new OSDMap(); | ||
277 | GroupInfoMap["Charter"] = OSD.FromString(charter); | ||
278 | GroupInfoMap["ShowInList"] = OSD.FromBoolean(showInList); | ||
279 | GroupInfoMap["InsigniaID"] = OSD.FromUUID(insigniaID); | ||
280 | GroupInfoMap["MembershipFee"] = OSD.FromInteger(0); | ||
281 | GroupInfoMap["OpenEnrollment"] = OSD.FromBoolean(openEnrollment); | ||
282 | GroupInfoMap["AllowPublish"] = OSD.FromBoolean(allowPublish); | ||
283 | GroupInfoMap["MaturePublish"] = OSD.FromBoolean(maturePublish); | ||
284 | GroupInfoMap["FounderID"] = OSD.FromUUID(founderID); | ||
285 | GroupInfoMap["EveryonePowers"] = OSD.FromULong((ulong)m_DefaultEveryonePowers); | ||
286 | GroupInfoMap["OwnerRoleID"] = OSD.FromUUID(OwnerRoleID); | ||
287 | GroupInfoMap["OwnersPowers"] = OSD.FromULong((ulong)m_DefaultOwnerPowers); | ||
288 | |||
289 | if(SimianAddGeneric(GroupID, "Group", name, GroupInfoMap)) | ||
290 | { | ||
291 | AddGroupRole(requestingAgentID, GroupID, UUID.Zero, "Everyone", "Members of " + name, "Member of " + name, (ulong)m_DefaultEveryonePowers); | ||
292 | AddGroupRole(requestingAgentID, GroupID, OwnerRoleID, "Owners", "Owners of " + name, "Owner of " + name, (ulong)m_DefaultOwnerPowers); | ||
293 | |||
294 | AddAgentToGroup(requestingAgentID, requestingAgentID, GroupID, OwnerRoleID); | ||
295 | |||
296 | return GroupID; | ||
297 | } | ||
298 | else | ||
299 | { | ||
300 | return UUID.Zero; | ||
301 | } | ||
302 | } | ||
303 | |||
304 | |||
305 | public void UpdateGroup(UUID requestingAgentID, UUID groupID, string charter, bool showInList, | ||
306 | UUID insigniaID, int membershipFee, bool openEnrollment, | ||
307 | bool allowPublish, bool maturePublish) | ||
308 | { | ||
309 | if (m_debugEnabled) m_log.InfoFormat("[SIMIAN-GROUPS-CONNECTOR] {0} called", System.Reflection.MethodBase.GetCurrentMethod().Name); | ||
310 | // TODO: Check to make sure requestingAgentID has permission to update group | ||
311 | |||
312 | string GroupName; | ||
313 | OSDMap GroupInfoMap; | ||
314 | if( SimianGetFirstGenericEntry(groupID, "GroupInfo", out GroupName, out GroupInfoMap) ) | ||
315 | { | ||
316 | GroupInfoMap["Charter"] = OSD.FromString(charter); | ||
317 | GroupInfoMap["ShowInList"] = OSD.FromBoolean(showInList); | ||
318 | GroupInfoMap["InsigniaID"] = OSD.FromUUID(insigniaID); | ||
319 | GroupInfoMap["MembershipFee"] = OSD.FromInteger(0); | ||
320 | GroupInfoMap["OpenEnrollment"] = OSD.FromBoolean(openEnrollment); | ||
321 | GroupInfoMap["AllowPublish"] = OSD.FromBoolean(allowPublish); | ||
322 | GroupInfoMap["MaturePublish"] = OSD.FromBoolean(maturePublish); | ||
323 | |||
324 | SimianAddGeneric(groupID, "Group", GroupName, GroupInfoMap); | ||
325 | } | ||
326 | |||
327 | } | ||
328 | |||
329 | |||
330 | public void AddGroupRole(UUID requestingAgentID, UUID groupID, UUID roleID, string name, string description, | ||
331 | string title, ulong powers) | ||
332 | { | ||
333 | if (m_debugEnabled) m_log.InfoFormat("[SIMIAN-GROUPS-CONNECTOR] {0} called", System.Reflection.MethodBase.GetCurrentMethod().Name); | ||
334 | |||
335 | OSDMap GroupRoleInfo = new OSDMap(); | ||
336 | GroupRoleInfo["Name"] = OSD.FromString(name); | ||
337 | GroupRoleInfo["Description"] = OSD.FromString(description); | ||
338 | GroupRoleInfo["Title"] = OSD.FromString(title); | ||
339 | GroupRoleInfo["Powers"] = OSD.FromULong((ulong)powers); | ||
340 | |||
341 | // TODO: Add security, make sure that requestingAgentID has permision to add roles | ||
342 | SimianAddGeneric(groupID, "GroupRole", roleID.ToString(), GroupRoleInfo); | ||
343 | } | ||
344 | |||
345 | public void RemoveGroupRole(UUID requestingAgentID, UUID groupID, UUID roleID) | ||
346 | { | ||
347 | if (m_debugEnabled) m_log.InfoFormat("[SIMIAN-GROUPS-CONNECTOR] {0} called", System.Reflection.MethodBase.GetCurrentMethod().Name); | ||
348 | |||
349 | // TODO: Add security | ||
350 | |||
351 | // Can't delete the Everyone Role | ||
352 | if (roleID != UUID.Zero) | ||
353 | { | ||
354 | // Remove all GroupRole Members from Role | ||
355 | Dictionary<UUID, OSDMap> GroupRoleMembers; | ||
356 | string GroupRoleMemberType = "GroupRole" + groupID.ToString(); | ||
357 | if (SimianGetGenericEntries(GroupRoleMemberType, roleID.ToString(), out GroupRoleMembers)) | ||
358 | { | ||
359 | foreach(UUID UserID in GroupRoleMembers.Keys) | ||
360 | { | ||
361 | EnsureRoleNotSelectedByMember(groupID, roleID, UserID); | ||
362 | |||
363 | SimianRemoveGenericEntry(UserID, GroupRoleMemberType, roleID.ToString()); | ||
364 | } | ||
365 | } | ||
366 | |||
367 | // Remove role | ||
368 | SimianRemoveGenericEntry(groupID, "GroupRole", roleID.ToString()); | ||
369 | } | ||
370 | } | ||
371 | |||
372 | |||
373 | public void UpdateGroupRole(UUID requestingAgentID, UUID groupID, UUID roleID, string name, string description, | ||
374 | string title, ulong powers) | ||
375 | { | ||
376 | if (m_debugEnabled) m_log.InfoFormat("[SIMIAN-GROUPS-CONNECTOR] {0} called", System.Reflection.MethodBase.GetCurrentMethod().Name); | ||
377 | |||
378 | // TODO: Security, check that requestingAgentID is allowed to update group roles | ||
379 | |||
380 | OSDMap GroupRoleInfo; | ||
381 | if (SimianGetGenericEntry(groupID, "GroupRole", roleID.ToString(), out GroupRoleInfo)) | ||
382 | { | ||
383 | if (name != null) | ||
384 | { | ||
385 | GroupRoleInfo["Name"] = OSD.FromString(name); | ||
386 | } | ||
387 | if (description != null) | ||
388 | { | ||
389 | GroupRoleInfo["Description"] = OSD.FromString(description); | ||
390 | } | ||
391 | if (title != null) | ||
392 | { | ||
393 | GroupRoleInfo["Title"] = OSD.FromString(title); | ||
394 | } | ||
395 | GroupRoleInfo["Powers"] = OSD.FromULong((ulong)powers); | ||
396 | |||
397 | } | ||
398 | |||
399 | |||
400 | SimianAddGeneric(groupID, "GroupRole", roleID.ToString(), GroupRoleInfo); | ||
401 | } | ||
402 | |||
403 | public GroupRecord GetGroupRecord(UUID requestingAgentID, UUID groupID, string groupName) | ||
404 | { | ||
405 | if (m_debugEnabled) m_log.InfoFormat("[SIMIAN-GROUPS-CONNECTOR] {0} called", System.Reflection.MethodBase.GetCurrentMethod().Name); | ||
406 | |||
407 | OSDMap GroupInfoMap = null; | ||
408 | if (groupID != UUID.Zero) | ||
409 | { | ||
410 | if (!SimianGetFirstGenericEntry(groupID, "Group", out groupName, out GroupInfoMap)) | ||
411 | { | ||
412 | return null; | ||
413 | } | ||
414 | } | ||
415 | else if ((groupName != null) && (groupName != string.Empty)) | ||
416 | { | ||
417 | if (!SimianGetFirstGenericEntry("Group", groupName, out groupID, out GroupInfoMap)) | ||
418 | { | ||
419 | return null; | ||
420 | } | ||
421 | } | ||
422 | |||
423 | GroupRecord GroupInfo = new GroupRecord(); | ||
424 | |||
425 | GroupInfo.GroupID = groupID; | ||
426 | GroupInfo.GroupName = groupName; | ||
427 | GroupInfo.Charter = GroupInfoMap["Charter"].AsString(); | ||
428 | GroupInfo.ShowInList = GroupInfoMap["ShowInList"].AsBoolean(); | ||
429 | GroupInfo.GroupPicture = GroupInfoMap["InsigniaID"].AsUUID(); | ||
430 | GroupInfo.MembershipFee = GroupInfoMap["MembershipFee"].AsInteger(); | ||
431 | GroupInfo.OpenEnrollment = GroupInfoMap["OpenEnrollment"].AsBoolean(); | ||
432 | GroupInfo.AllowPublish = GroupInfoMap["AllowPublish"].AsBoolean(); | ||
433 | GroupInfo.MaturePublish = GroupInfoMap["MaturePublish"].AsBoolean(); | ||
434 | GroupInfo.FounderID = GroupInfoMap["FounderID"].AsUUID(); | ||
435 | GroupInfo.OwnerRoleID = GroupInfoMap["OwnerRoleID"].AsUUID(); | ||
436 | |||
437 | return GroupInfo; | ||
438 | |||
439 | } | ||
440 | |||
441 | public GroupProfileData GetMemberGroupProfile(UUID requestingAgentID, UUID groupID, UUID memberID) | ||
442 | { | ||
443 | if (m_debugEnabled) m_log.InfoFormat("[SIMIAN-GROUPS-CONNECTOR] {0} called", System.Reflection.MethodBase.GetCurrentMethod().Name); | ||
444 | |||
445 | OSDMap groupProfile; | ||
446 | string groupName; | ||
447 | if (!SimianGetFirstGenericEntry(groupID, "Group", out groupName, out groupProfile)) | ||
448 | { | ||
449 | // GroupProfileData is not nullable | ||
450 | return new GroupProfileData(); | ||
451 | } | ||
452 | |||
453 | GroupProfileData MemberGroupProfile = new GroupProfileData(); | ||
454 | MemberGroupProfile.GroupID = groupID; | ||
455 | MemberGroupProfile.Name = groupName; | ||
456 | |||
457 | if (groupProfile["Charter"] != null) | ||
458 | { | ||
459 | MemberGroupProfile.Charter = groupProfile["Charter"].AsString(); | ||
460 | } | ||
461 | |||
462 | MemberGroupProfile.ShowInList = groupProfile["ShowInList"].AsString() == "1"; | ||
463 | MemberGroupProfile.InsigniaID = groupProfile["InsigniaID"].AsUUID(); | ||
464 | MemberGroupProfile.MembershipFee = groupProfile["MembershipFee"].AsInteger(); | ||
465 | MemberGroupProfile.OpenEnrollment = groupProfile["OpenEnrollment"].AsBoolean(); | ||
466 | MemberGroupProfile.AllowPublish = groupProfile["AllowPublish"].AsBoolean(); | ||
467 | MemberGroupProfile.MaturePublish = groupProfile["MaturePublish"].AsBoolean(); | ||
468 | MemberGroupProfile.FounderID = groupProfile["FounderID"].AsUUID();; | ||
469 | MemberGroupProfile.OwnerRole = groupProfile["OwnerRoleID"].AsUUID(); | ||
470 | |||
471 | Dictionary<UUID, OSDMap> Members; | ||
472 | if (SimianGetGenericEntries("GroupMember",groupID.ToString(), out Members)) | ||
473 | { | ||
474 | MemberGroupProfile.GroupMembershipCount = Members.Count; | ||
475 | } | ||
476 | |||
477 | Dictionary<string, OSDMap> Roles; | ||
478 | if (SimianGetGenericEntries(groupID, "GroupRole", out Roles)) | ||
479 | { | ||
480 | MemberGroupProfile.GroupRolesCount = Roles.Count; | ||
481 | } | ||
482 | |||
483 | // TODO: Get Group Money balance from somewhere | ||
484 | // group.Money = 0; | ||
485 | |||
486 | GroupMembershipData MemberInfo = GetAgentGroupMembership(requestingAgentID, memberID, groupID); | ||
487 | |||
488 | MemberGroupProfile.MemberTitle = MemberInfo.GroupTitle; | ||
489 | MemberGroupProfile.PowersMask = MemberInfo.GroupPowers; | ||
490 | |||
491 | return MemberGroupProfile; | ||
492 | } | ||
493 | |||
494 | public void SetAgentActiveGroup(UUID requestingAgentID, UUID agentID, UUID groupID) | ||
495 | { | ||
496 | if (m_debugEnabled) m_log.InfoFormat("[SIMIAN-GROUPS-CONNECTOR] {0} called", System.Reflection.MethodBase.GetCurrentMethod().Name); | ||
497 | |||
498 | OSDMap ActiveGroup = new OSDMap(); | ||
499 | ActiveGroup.Add("GroupID", OSD.FromUUID(groupID)); | ||
500 | SimianAddGeneric(agentID, "Group", "ActiveGroup", ActiveGroup); | ||
501 | } | ||
502 | |||
503 | public void SetAgentActiveGroupRole(UUID requestingAgentID, UUID agentID, UUID groupID, UUID roleID) | ||
504 | { | ||
505 | if (m_debugEnabled) m_log.InfoFormat("[SIMIAN-GROUPS-CONNECTOR] {0} called", System.Reflection.MethodBase.GetCurrentMethod().Name); | ||
506 | |||
507 | OSDMap GroupMemberInfo; | ||
508 | if (!SimianGetGenericEntry(agentID, "GroupMember", groupID.ToString(), out GroupMemberInfo)) | ||
509 | { | ||
510 | GroupMemberInfo = new OSDMap(); | ||
511 | } | ||
512 | |||
513 | GroupMemberInfo["SelectedRoleID"] = OSD.FromUUID(roleID); | ||
514 | SimianAddGeneric(agentID, "GroupMember", groupID.ToString(), GroupMemberInfo); | ||
515 | } | ||
516 | |||
517 | public void SetAgentGroupInfo(UUID requestingAgentID, UUID agentID, UUID groupID, bool acceptNotices, bool listInProfile) | ||
518 | { | ||
519 | if (m_debugEnabled) m_log.InfoFormat("[SIMIAN-GROUPS-CONNECTOR] {0} called", System.Reflection.MethodBase.GetCurrentMethod().Name); | ||
520 | |||
521 | OSDMap GroupMemberInfo; | ||
522 | if (!SimianGetGenericEntry(agentID, "GroupMember", groupID.ToString(), out GroupMemberInfo)) | ||
523 | { | ||
524 | GroupMemberInfo = new OSDMap(); | ||
525 | } | ||
526 | |||
527 | GroupMemberInfo["AcceptNotices"] = OSD.FromBoolean(acceptNotices); | ||
528 | GroupMemberInfo["ListInProfile"] = OSD.FromBoolean(listInProfile); | ||
529 | GroupMemberInfo["Contribution"] = OSD.FromInteger(0); | ||
530 | GroupMemberInfo["SelectedRole"] = OSD.FromUUID(UUID.Zero); | ||
531 | SimianAddGeneric(agentID, "GroupMember", groupID.ToString(), GroupMemberInfo); | ||
532 | } | ||
533 | |||
534 | public void AddAgentToGroupInvite(UUID requestingAgentID, UUID inviteID, UUID groupID, UUID roleID, UUID agentID) | ||
535 | { | ||
536 | if (m_debugEnabled) m_log.InfoFormat("[SIMIAN-GROUPS-CONNECTOR] {0} called", System.Reflection.MethodBase.GetCurrentMethod().Name); | ||
537 | |||
538 | OSDMap Invite = new OSDMap(); | ||
539 | Invite["AgentID"] = OSD.FromUUID(agentID); | ||
540 | Invite["RoleID"] = OSD.FromUUID(roleID); | ||
541 | |||
542 | SimianAddGeneric(groupID, "GroupMemberInvite", inviteID.ToString(), Invite); | ||
543 | } | ||
544 | |||
545 | public GroupInviteInfo GetAgentToGroupInvite(UUID requestingAgentID, UUID inviteID) | ||
546 | { | ||
547 | if (m_debugEnabled) m_log.InfoFormat("[SIMIAN-GROUPS-CONNECTOR] {0} called", System.Reflection.MethodBase.GetCurrentMethod().Name); | ||
548 | |||
549 | OSDMap GroupMemberInvite; | ||
550 | UUID GroupID; | ||
551 | if (!SimianGetFirstGenericEntry("GroupMemberInvite", inviteID.ToString(), out GroupID, out GroupMemberInvite)) | ||
552 | { | ||
553 | return null; | ||
554 | } | ||
555 | |||
556 | GroupInviteInfo inviteInfo = new GroupInviteInfo(); | ||
557 | inviteInfo.InviteID = inviteID; | ||
558 | inviteInfo.GroupID = GroupID; | ||
559 | inviteInfo.AgentID = GroupMemberInvite["AgentID"].AsUUID(); | ||
560 | inviteInfo.RoleID = GroupMemberInvite["RoleID"].AsUUID(); | ||
561 | |||
562 | return inviteInfo; | ||
563 | } | ||
564 | |||
565 | public void RemoveAgentToGroupInvite(UUID requestingAgentID, UUID inviteID) | ||
566 | { | ||
567 | if (m_debugEnabled) m_log.InfoFormat("[SIMIAN-GROUPS-CONNECTOR] {0} called", System.Reflection.MethodBase.GetCurrentMethod().Name); | ||
568 | |||
569 | GroupInviteInfo invite = GetAgentToGroupInvite(requestingAgentID, inviteID); | ||
570 | SimianRemoveGenericEntry(invite.GroupID, "GroupMemberInvite", inviteID.ToString()); | ||
571 | } | ||
572 | |||
573 | public void AddAgentToGroup(UUID requestingAgentID, UUID AgentID, UUID GroupID, UUID RoleID) | ||
574 | { | ||
575 | if (m_debugEnabled) m_log.InfoFormat("[SIMIAN-GROUPS-CONNECTOR] {0} called", System.Reflection.MethodBase.GetCurrentMethod().Name); | ||
576 | |||
577 | // Setup Agent/Group information | ||
578 | SetAgentGroupInfo(requestingAgentID, AgentID, GroupID, true, true); | ||
579 | |||
580 | // Add agent to Everyone Group | ||
581 | AddAgentToGroupRole(requestingAgentID, AgentID, GroupID, UUID.Zero); | ||
582 | |||
583 | // Add agent to Specified Role | ||
584 | AddAgentToGroupRole(requestingAgentID, AgentID, GroupID, RoleID); | ||
585 | |||
586 | // Set selected role in this group to specified role | ||
587 | SetAgentActiveGroupRole(requestingAgentID, AgentID, GroupID, RoleID); | ||
588 | } | ||
589 | |||
590 | public void RemoveAgentFromGroup(UUID requestingAgentID, UUID agentID, UUID groupID) | ||
591 | { | ||
592 | if (m_debugEnabled) m_log.InfoFormat("[SIMIAN-GROUPS-CONNECTOR] {0} called", System.Reflection.MethodBase.GetCurrentMethod().Name); | ||
593 | |||
594 | // If current active group is the group the agent is being removed from, change their group to UUID.Zero | ||
595 | GroupMembershipData memberActiveMembership = GetAgentActiveMembership(requestingAgentID, agentID); | ||
596 | if (memberActiveMembership.GroupID == groupID) | ||
597 | { | ||
598 | SetAgentActiveGroup(agentID, agentID, UUID.Zero); | ||
599 | } | ||
600 | |||
601 | // Remove Group Member information for this group | ||
602 | SimianRemoveGenericEntry(agentID, "GroupMember", groupID.ToString()); | ||
603 | |||
604 | // By using a Simian Generics Type consisting of a prefix and a groupID, | ||
605 | // combined with RoleID as key allows us to get a list of roles a particular member | ||
606 | // of a group is assigned to. | ||
607 | string GroupRoleMemberType = "GroupRole" + groupID.ToString(); | ||
608 | |||
609 | // Take Agent out of all other group roles | ||
610 | Dictionary<string, OSDMap> GroupRoles; | ||
611 | if (SimianGetGenericEntries(agentID, GroupRoleMemberType, out GroupRoles)) | ||
612 | { | ||
613 | foreach (string roleID in GroupRoles.Keys) | ||
614 | { | ||
615 | SimianRemoveGenericEntry(agentID, GroupRoleMemberType, roleID); | ||
616 | } | ||
617 | } | ||
618 | } | ||
619 | |||
620 | public void AddAgentToGroupRole(UUID requestingAgentID, UUID agentID, UUID groupID, UUID roleID) | ||
621 | { | ||
622 | if (m_debugEnabled) m_log.InfoFormat("[SIMIAN-GROUPS-CONNECTOR] {0} called", System.Reflection.MethodBase.GetCurrentMethod().Name); | ||
623 | |||
624 | SimianAddGeneric(agentID, "GroupRole" + groupID.ToString(), roleID.ToString(), new OSDMap()); | ||
625 | } | ||
626 | |||
627 | public void RemoveAgentFromGroupRole(UUID requestingAgentID, UUID agentID, UUID groupID, UUID roleID) | ||
628 | { | ||
629 | if (m_debugEnabled) m_log.InfoFormat("[SIMIAN-GROUPS-CONNECTOR] {0} called", System.Reflection.MethodBase.GetCurrentMethod().Name); | ||
630 | |||
631 | // Cannot remove members from the Everyone Role | ||
632 | if (roleID != UUID.Zero) | ||
633 | { | ||
634 | EnsureRoleNotSelectedByMember(groupID, roleID, agentID); | ||
635 | |||
636 | string GroupRoleMemberType = "GroupRole" + groupID.ToString(); | ||
637 | SimianRemoveGenericEntry(agentID, GroupRoleMemberType, roleID.ToString()); | ||
638 | } | ||
639 | } | ||
640 | |||
641 | public List<DirGroupsReplyData> FindGroups(UUID requestingAgentID, string search) | ||
642 | { | ||
643 | if (m_debugEnabled) m_log.InfoFormat("[SIMIAN-GROUPS-CONNECTOR] {0} called", System.Reflection.MethodBase.GetCurrentMethod().Name); | ||
644 | |||
645 | List<DirGroupsReplyData> findings = new List<DirGroupsReplyData>(); | ||
646 | |||
647 | NameValueCollection requestArgs = new NameValueCollection | ||
648 | { | ||
649 | { "RequestMethod", "GetGenerics" }, | ||
650 | { "Type", "Group" }, | ||
651 | { "Key", search }, | ||
652 | { "Fuzzy", "1" } | ||
653 | }; | ||
654 | |||
655 | |||
656 | OSDMap response = WebUtil.PostToService(m_serviceURL, requestArgs); | ||
657 | if (response["Success"].AsBoolean() && response["Entries"] is OSDArray) | ||
658 | { | ||
659 | OSDArray entryArray = (OSDArray)response["Entries"]; | ||
660 | foreach (OSDMap entryMap in entryArray) | ||
661 | { | ||
662 | DirGroupsReplyData data = new DirGroupsReplyData(); | ||
663 | data.groupID = entryMap["OwnerID"].AsUUID(); | ||
664 | data.groupName = entryMap["Key"].AsString(); | ||
665 | |||
666 | // TODO: is there a better way to do this? | ||
667 | Dictionary<UUID, OSDMap> Members; | ||
668 | if (SimianGetGenericEntries("GroupMember", data.groupID.ToString(), out Members)) | ||
669 | { | ||
670 | data.members = Members.Count; | ||
671 | } | ||
672 | else | ||
673 | { | ||
674 | data.members = 0; | ||
675 | } | ||
676 | |||
677 | // TODO: sort results? | ||
678 | // data.searchOrder = order; | ||
679 | |||
680 | findings.Add(data); | ||
681 | } | ||
682 | } | ||
683 | |||
684 | |||
685 | return findings; | ||
686 | } | ||
687 | |||
688 | public GroupMembershipData GetAgentGroupMembership(UUID requestingAgentID, UUID agentID, UUID groupID) | ||
689 | { | ||
690 | if (m_debugEnabled) m_log.InfoFormat("[SIMIAN-GROUPS-CONNECTOR] {0} called", System.Reflection.MethodBase.GetCurrentMethod().Name); | ||
691 | |||
692 | GroupMembershipData data = new GroupMembershipData(); | ||
693 | |||
694 | /////////////////////////////// | ||
695 | // Agent Specific Information: | ||
696 | // | ||
697 | OSDMap UserActiveGroup; | ||
698 | if (SimianGetGenericEntry(agentID, "Group", "ActiveGroup", out UserActiveGroup)) | ||
699 | { | ||
700 | data.Active = UserActiveGroup["GroupID"].AsUUID().Equals(groupID); | ||
701 | } | ||
702 | |||
703 | OSDMap UserGroupMemberInfo; | ||
704 | if( SimianGetGenericEntry(agentID, "GroupMember", groupID.ToString(), out UserGroupMemberInfo) ) | ||
705 | { | ||
706 | data.AcceptNotices = UserGroupMemberInfo["AcceptNotices"].AsBoolean(); | ||
707 | data.Contribution = UserGroupMemberInfo["Contribution"].AsInteger(); | ||
708 | data.ListInProfile = UserGroupMemberInfo["ListInProfile"].AsBoolean(); | ||
709 | data.ActiveRole = UserGroupMemberInfo["SelectedRoleID"].AsUUID(); | ||
710 | |||
711 | /////////////////////////////// | ||
712 | // Role Specific Information: | ||
713 | // | ||
714 | |||
715 | OSDMap GroupRoleInfo; | ||
716 | if( SimianGetGenericEntry(groupID, "GroupRole", data.ActiveRole.ToString(), out GroupRoleInfo) ) | ||
717 | { | ||
718 | data.GroupTitle = GroupRoleInfo["Title"].AsString(); | ||
719 | data.GroupPowers = GroupRoleInfo["Powers"].AsULong(); | ||
720 | } | ||
721 | } | ||
722 | |||
723 | /////////////////////////////// | ||
724 | // Group Specific Information: | ||
725 | // | ||
726 | OSDMap GroupInfo; | ||
727 | string GroupName; | ||
728 | if( SimianGetFirstGenericEntry(groupID, "Group", out GroupName, out GroupInfo) ) | ||
729 | { | ||
730 | data.GroupID = groupID; | ||
731 | data.AllowPublish = GroupInfo["AllowPublish"].AsBoolean(); | ||
732 | data.Charter = GroupInfo["Charter"].AsString(); | ||
733 | data.FounderID = GroupInfo["FounderID"].AsUUID(); | ||
734 | data.GroupName = GroupName; | ||
735 | data.GroupPicture = GroupInfo["InsigniaID"].AsUUID(); | ||
736 | data.MaturePublish = GroupInfo["MaturePublish"].AsBoolean(); | ||
737 | data.MembershipFee = GroupInfo["MembershipFee"].AsInteger(); | ||
738 | data.OpenEnrollment = GroupInfo["OpenEnrollment"].AsBoolean(); | ||
739 | data.ShowInList = GroupInfo["ShowInList"].AsBoolean(); | ||
740 | } | ||
741 | |||
742 | return data; | ||
743 | } | ||
744 | |||
745 | public GroupMembershipData GetAgentActiveMembership(UUID requestingAgentID, UUID agentID) | ||
746 | { | ||
747 | if (m_debugEnabled) m_log.InfoFormat("[SIMIAN-GROUPS-CONNECTOR] {0} called", System.Reflection.MethodBase.GetCurrentMethod().Name); | ||
748 | |||
749 | UUID GroupID = UUID.Zero; | ||
750 | OSDMap UserActiveGroup; | ||
751 | if (SimianGetGenericEntry(agentID, "Group", "ActiveGroup", out UserActiveGroup)) | ||
752 | { | ||
753 | GroupID = UserActiveGroup["GroupID"].AsUUID(); | ||
754 | } | ||
755 | |||
756 | if (m_debugEnabled) m_log.InfoFormat("[SIMIAN-GROUPS-CONNECTOR] Active GroupID : {0}", GroupID.ToString()); | ||
757 | return GetAgentGroupMembership(requestingAgentID, agentID, GroupID); | ||
758 | } | ||
759 | |||
760 | public List<GroupMembershipData> GetAgentGroupMemberships(UUID requestingAgentID, UUID agentID) | ||
761 | { | ||
762 | if (m_debugEnabled) m_log.InfoFormat("[SIMIAN-GROUPS-CONNECTOR] {0} called", System.Reflection.MethodBase.GetCurrentMethod().Name); | ||
763 | |||
764 | List<GroupMembershipData> memberships = new List<GroupMembershipData>(); | ||
765 | |||
766 | Dictionary<string,OSDMap> GroupMemberShips; | ||
767 | if (SimianGetGenericEntries(agentID, "GroupMember", out GroupMemberShips)) | ||
768 | { | ||
769 | foreach (string key in GroupMemberShips.Keys) | ||
770 | { | ||
771 | memberships.Add(GetAgentGroupMembership(requestingAgentID, agentID, UUID.Parse(key))); | ||
772 | } | ||
773 | } | ||
774 | |||
775 | return memberships; | ||
776 | } | ||
777 | |||
778 | public List<GroupRolesData> GetAgentGroupRoles(UUID requestingAgentID, UUID agentID, UUID groupID) | ||
779 | { | ||
780 | if (m_debugEnabled) m_log.InfoFormat("[SIMIAN-GROUPS-CONNECTOR] {0} called", System.Reflection.MethodBase.GetCurrentMethod().Name); | ||
781 | |||
782 | List<GroupRolesData> Roles = new List<GroupRolesData>(); | ||
783 | |||
784 | Dictionary<string, OSDMap> GroupRoles; | ||
785 | if (SimianGetGenericEntries(groupID, "GroupRole", out GroupRoles)) | ||
786 | { | ||
787 | Dictionary<string, OSDMap> MemberRoles; | ||
788 | if (SimianGetGenericEntries(agentID, "GroupRole" + groupID.ToString(), out MemberRoles)) | ||
789 | { | ||
790 | foreach (KeyValuePair<string, OSDMap> kvp in MemberRoles) | ||
791 | { | ||
792 | GroupRolesData data = new GroupRolesData(); | ||
793 | data.RoleID = UUID.Parse(kvp.Key); | ||
794 | data.Name = GroupRoles[kvp.Key]["Name"].AsString(); | ||
795 | data.Description = GroupRoles[kvp.Key]["Description"].AsString(); | ||
796 | data.Title = GroupRoles[kvp.Key]["Title"].AsString(); | ||
797 | data.Powers = GroupRoles[kvp.Key]["Powers"].AsULong(); | ||
798 | |||
799 | Roles.Add(data); | ||
800 | } | ||
801 | } | ||
802 | } | ||
803 | return Roles; | ||
804 | } | ||
805 | |||
806 | public List<GroupRolesData> GetGroupRoles(UUID requestingAgentID, UUID groupID) | ||
807 | { | ||
808 | if (m_debugEnabled) m_log.InfoFormat("[SIMIAN-GROUPS-CONNECTOR] {0} called", System.Reflection.MethodBase.GetCurrentMethod().Name); | ||
809 | |||
810 | List<GroupRolesData> Roles = new List<GroupRolesData>(); | ||
811 | |||
812 | Dictionary<string, OSDMap> GroupRoles; | ||
813 | if (SimianGetGenericEntries(groupID, "GroupRole", out GroupRoles)) | ||
814 | { | ||
815 | foreach (KeyValuePair<string, OSDMap> role in GroupRoles) | ||
816 | { | ||
817 | GroupRolesData data = new GroupRolesData(); | ||
818 | |||
819 | data.RoleID = UUID.Parse(role.Key); | ||
820 | |||
821 | data.Name = role.Value["Name"].AsString(); | ||
822 | data.Description = role.Value["Description"].AsString(); | ||
823 | data.Title = role.Value["Title"].AsString(); | ||
824 | data.Powers = role.Value["Powers"].AsULong(); | ||
825 | |||
826 | Dictionary<UUID, OSDMap> GroupRoleMembers; | ||
827 | if (SimianGetGenericEntries("GroupRole" + groupID.ToString(), role.Key, out GroupRoleMembers)) | ||
828 | { | ||
829 | data.Members = GroupRoleMembers.Count; | ||
830 | } | ||
831 | else | ||
832 | { | ||
833 | data.Members = 0; | ||
834 | } | ||
835 | |||
836 | Roles.Add(data); | ||
837 | } | ||
838 | } | ||
839 | |||
840 | return Roles; | ||
841 | |||
842 | } | ||
843 | |||
844 | |||
845 | |||
846 | public List<GroupMembersData> GetGroupMembers(UUID requestingAgentID, UUID GroupID) | ||
847 | { | ||
848 | if (m_debugEnabled) m_log.InfoFormat("[SIMIAN-GROUPS-CONNECTOR] {0} called", System.Reflection.MethodBase.GetCurrentMethod().Name); | ||
849 | |||
850 | List<GroupMembersData> members = new List<GroupMembersData>(); | ||
851 | |||
852 | OSDMap GroupInfo; | ||
853 | string GroupName; | ||
854 | UUID GroupOwnerRoleID = UUID.Zero; | ||
855 | if (!SimianGetFirstGenericEntry(GroupID, "Group", out GroupName, out GroupInfo)) | ||
856 | { | ||
857 | return members; | ||
858 | } | ||
859 | GroupOwnerRoleID = GroupInfo["OwnerRoleID"].AsUUID(); | ||
860 | |||
861 | // Locally cache group roles, since we'll be needing this data for each member | ||
862 | Dictionary<string,OSDMap> GroupRoles; | ||
863 | SimianGetGenericEntries(GroupID, "GroupRole", out GroupRoles); | ||
864 | |||
865 | // Locally cache list of group owners | ||
866 | Dictionary<UUID, OSDMap> GroupOwners; | ||
867 | SimianGetGenericEntries("GroupRole" + GroupID.ToString(), GroupOwnerRoleID.ToString(), out GroupOwners); | ||
868 | |||
869 | |||
870 | Dictionary<UUID, OSDMap> GroupMembers; | ||
871 | if (SimianGetGenericEntries("GroupMember", GroupID.ToString(), out GroupMembers)) | ||
872 | { | ||
873 | foreach (KeyValuePair<UUID, OSDMap> member in GroupMembers) | ||
874 | { | ||
875 | GroupMembersData data = new GroupMembersData(); | ||
876 | |||
877 | data.AgentID = member.Key; | ||
878 | |||
879 | UUID SelectedRoleID = member.Value["SelectedRoleID"].AsUUID(); | ||
880 | |||
881 | data.AcceptNotices = member.Value["AcceptNotices"].AsBoolean(); | ||
882 | data.ListInProfile = member.Value["ListInProfile"].AsBoolean(); | ||
883 | data.Contribution = member.Value["Contribution"].AsInteger(); | ||
884 | |||
885 | data.IsOwner = GroupOwners.ContainsKey(member.Key); | ||
886 | |||
887 | OSDMap GroupRoleInfo = GroupRoles[SelectedRoleID.ToString()]; | ||
888 | data.Title = GroupRoleInfo["Title"].AsString(); | ||
889 | data.AgentPowers = GroupRoleInfo["Powers"].AsULong(); | ||
890 | |||
891 | members.Add(data); | ||
892 | } | ||
893 | } | ||
894 | |||
895 | return members; | ||
896 | |||
897 | } | ||
898 | |||
899 | public List<GroupRoleMembersData> GetGroupRoleMembers(UUID requestingAgentID, UUID groupID) | ||
900 | { | ||
901 | if (m_debugEnabled) m_log.InfoFormat("[SIMIAN-GROUPS-CONNECTOR] {0} called", System.Reflection.MethodBase.GetCurrentMethod().Name); | ||
902 | |||
903 | List<GroupRoleMembersData> members = new List<GroupRoleMembersData>(); | ||
904 | |||
905 | Dictionary<string, OSDMap> GroupRoles; | ||
906 | if (SimianGetGenericEntries(groupID, "GroupRole", out GroupRoles)) | ||
907 | { | ||
908 | foreach( KeyValuePair<string, OSDMap> Role in GroupRoles ) | ||
909 | { | ||
910 | Dictionary<UUID, OSDMap> GroupRoleMembers; | ||
911 | if( SimianGetGenericEntries("GroupRole"+groupID.ToString(), Role.Key, out GroupRoleMembers) ) | ||
912 | { | ||
913 | foreach( KeyValuePair<UUID, OSDMap> GroupRoleMember in GroupRoleMembers ) | ||
914 | { | ||
915 | GroupRoleMembersData data = new GroupRoleMembersData(); | ||
916 | |||
917 | data.MemberID = GroupRoleMember.Key; | ||
918 | data.RoleID = UUID.Parse(Role.Key); | ||
919 | |||
920 | members.Add(data); | ||
921 | } | ||
922 | } | ||
923 | } | ||
924 | } | ||
925 | |||
926 | return members; | ||
927 | } | ||
928 | |||
929 | public List<GroupNoticeData> GetGroupNotices(UUID requestingAgentID, UUID GroupID) | ||
930 | { | ||
931 | if (m_debugEnabled) m_log.InfoFormat("[SIMIAN-GROUPS-CONNECTOR] {0} called", System.Reflection.MethodBase.GetCurrentMethod().Name); | ||
932 | |||
933 | List<GroupNoticeData> values = new List<GroupNoticeData>(); | ||
934 | |||
935 | Dictionary<string, OSDMap> Notices; | ||
936 | if (SimianGetGenericEntries(GroupID, "GroupNotice", out Notices)) | ||
937 | { | ||
938 | foreach (KeyValuePair<string, OSDMap> Notice in Notices) | ||
939 | { | ||
940 | GroupNoticeData data = new GroupNoticeData(); | ||
941 | data.NoticeID = UUID.Parse(Notice.Key); | ||
942 | data.Timestamp = Notice.Value["TimeStamp"].AsUInteger(); | ||
943 | data.FromName = Notice.Value["FromName"].AsString(); | ||
944 | data.Subject = Notice.Value["Subject"].AsString(); | ||
945 | data.HasAttachment = Notice.Value["BinaryBucket"].AsBinary().Length > 0; | ||
946 | |||
947 | //TODO: Figure out how to get this | ||
948 | data.AssetType = 0; | ||
949 | |||
950 | values.Add(data); | ||
951 | } | ||
952 | } | ||
953 | |||
954 | return values; | ||
955 | |||
956 | } | ||
957 | public GroupNoticeInfo GetGroupNotice(UUID requestingAgentID, UUID noticeID) | ||
958 | { | ||
959 | if (m_debugEnabled) m_log.InfoFormat("[SIMIAN-GROUPS-CONNECTOR] {0} called", System.Reflection.MethodBase.GetCurrentMethod().Name); | ||
960 | |||
961 | OSDMap GroupNotice; | ||
962 | UUID GroupID; | ||
963 | if (SimianGetFirstGenericEntry("GroupNotice", noticeID.ToString(), out GroupID, out GroupNotice)) | ||
964 | { | ||
965 | GroupNoticeInfo data = new GroupNoticeInfo(); | ||
966 | data.GroupID = GroupID; | ||
967 | data.Message = GroupNotice["Message"].AsString(); | ||
968 | data.BinaryBucket = GroupNotice["BinaryBucket"].AsBinary(); | ||
969 | data.noticeData.NoticeID = noticeID; | ||
970 | data.noticeData.Timestamp = GroupNotice["TimeStamp"].AsUInteger(); | ||
971 | data.noticeData.FromName = GroupNotice["FromName"].AsString(); | ||
972 | data.noticeData.Subject = GroupNotice["Subject"].AsString(); | ||
973 | data.noticeData.HasAttachment = data.BinaryBucket.Length > 0; | ||
974 | data.noticeData.AssetType = 0; | ||
975 | |||
976 | if (data.Message == null) | ||
977 | { | ||
978 | data.Message = string.Empty; | ||
979 | } | ||
980 | |||
981 | return data; | ||
982 | } | ||
983 | return null; | ||
984 | } | ||
985 | public void AddGroupNotice(UUID requestingAgentID, UUID groupID, UUID noticeID, string fromName, string subject, string message, byte[] binaryBucket) | ||
986 | { | ||
987 | if (m_debugEnabled) m_log.InfoFormat("[SIMIAN-GROUPS-CONNECTOR] {0} called", System.Reflection.MethodBase.GetCurrentMethod().Name); | ||
988 | |||
989 | OSDMap Notice = new OSDMap(); | ||
990 | Notice["TimeStamp"] = OSD.FromUInteger((uint)Util.UnixTimeSinceEpoch()); | ||
991 | Notice["FromName"] = OSD.FromString(fromName); | ||
992 | Notice["Subject"] = OSD.FromString(subject); | ||
993 | Notice["Message"] = OSD.FromString(message); | ||
994 | Notice["BinaryBucket"] = OSD.FromBinary(binaryBucket); | ||
995 | |||
996 | SimianAddGeneric(groupID, "GroupNotice", noticeID.ToString(), Notice); | ||
997 | |||
998 | } | ||
999 | #endregion | ||
1000 | |||
1001 | |||
1002 | private void EnsureRoleNotSelectedByMember(UUID groupID, UUID roleID, UUID userID) | ||
1003 | { | ||
1004 | if (m_debugEnabled) m_log.InfoFormat("[SIMIAN-GROUPS-CONNECTOR] {0} called", System.Reflection.MethodBase.GetCurrentMethod().Name); | ||
1005 | |||
1006 | // If member's SelectedRole is roleID, change their selected role to Everyone | ||
1007 | // before removing them from the role | ||
1008 | OSDMap UserGroupInfo; | ||
1009 | if (SimianGetGenericEntry(userID, "GroupMember", groupID.ToString(), out UserGroupInfo)) | ||
1010 | { | ||
1011 | if (UserGroupInfo["SelectedRoleID"].AsUUID() == roleID) | ||
1012 | { | ||
1013 | UserGroupInfo["SelectedRoleID"] = OSD.FromUUID(UUID.Zero); | ||
1014 | } | ||
1015 | SimianAddGeneric(userID, "GroupMember", groupID.ToString(), UserGroupInfo); | ||
1016 | } | ||
1017 | } | ||
1018 | |||
1019 | |||
1020 | #region Simian Util Methods | ||
1021 | private bool SimianAddGeneric(UUID ownerID, string type, string key, OSDMap map) | ||
1022 | { | ||
1023 | if (m_debugEnabled) m_log.InfoFormat("[SIMIAN-GROUPS-CONNECTOR] {0} called ({1},{2},{3})", System.Reflection.MethodBase.GetCurrentMethod().Name, ownerID, type, key); | ||
1024 | |||
1025 | string value = OSDParser.SerializeJsonString(map); | ||
1026 | |||
1027 | if (m_debugEnabled) m_log.InfoFormat("[SIMIAN-GROUPS-CONNECTOR] value: {0}", value); | ||
1028 | |||
1029 | NameValueCollection RequestArgs = new NameValueCollection | ||
1030 | { | ||
1031 | { "RequestMethod", "AddGeneric" }, | ||
1032 | { "OwnerID", ownerID.ToString() }, | ||
1033 | { "Type", type }, | ||
1034 | { "Key", key }, | ||
1035 | { "Value", value} | ||
1036 | }; | ||
1037 | |||
1038 | |||
1039 | OSDMap Response = WebUtil.PostToService(m_serviceURL, RequestArgs); | ||
1040 | if (Response["Success"].AsBoolean()) | ||
1041 | { | ||
1042 | return true; | ||
1043 | } | ||
1044 | else | ||
1045 | { | ||
1046 | m_log.WarnFormat("[SIMIAN GROUPS CONNECTOR]: Error {0}, {1}, {2}, {3}", ownerID, type, key, Response["Message"]); | ||
1047 | return false; | ||
1048 | } | ||
1049 | } | ||
1050 | |||
1051 | /// <summary> | ||
1052 | /// Returns the first of possibly many entries for Owner/Type pair | ||
1053 | /// </summary> | ||
1054 | private bool SimianGetFirstGenericEntry(UUID ownerID, string type, out string key, out OSDMap map) | ||
1055 | { | ||
1056 | if (m_debugEnabled) m_log.InfoFormat("[SIMIAN-GROUPS-CONNECTOR] {0} called ({1},{2})", System.Reflection.MethodBase.GetCurrentMethod().Name, ownerID, type); | ||
1057 | |||
1058 | NameValueCollection RequestArgs = new NameValueCollection | ||
1059 | { | ||
1060 | { "RequestMethod", "GetGenerics" }, | ||
1061 | { "OwnerID", ownerID.ToString() }, | ||
1062 | { "Type", type } | ||
1063 | }; | ||
1064 | |||
1065 | |||
1066 | OSDMap Response = WebUtil.PostToService(m_serviceURL, RequestArgs); | ||
1067 | if (Response["Success"].AsBoolean() && Response["Entries"] is OSDArray) | ||
1068 | { | ||
1069 | OSDArray entryArray = (OSDArray)Response["Entries"]; | ||
1070 | if (entryArray.Count >= 1) | ||
1071 | { | ||
1072 | OSDMap entryMap = entryArray[0] as OSDMap; | ||
1073 | key = entryMap["Key"].AsString(); | ||
1074 | map = (OSDMap)OSDParser.DeserializeJson(entryMap["Value"].AsString()); | ||
1075 | |||
1076 | if (m_debugEnabled) m_log.InfoFormat("[SIMIAN-GROUPS-CONNECTOR] Generics Result {0}", entryMap["Value"].AsString()); | ||
1077 | |||
1078 | return true; | ||
1079 | } | ||
1080 | else | ||
1081 | { | ||
1082 | if (m_debugEnabled) m_log.InfoFormat("[SIMIAN-GROUPS-CONNECTOR] No Generics Results"); | ||
1083 | } | ||
1084 | } | ||
1085 | else | ||
1086 | { | ||
1087 | m_log.WarnFormat("[SIMIAN GROUPS CONNECTOR]: Error retrieving group info ({0})", Response["Message"]); | ||
1088 | } | ||
1089 | key = null; | ||
1090 | map = null; | ||
1091 | return false; | ||
1092 | } | ||
1093 | private bool SimianGetFirstGenericEntry(string type, string key, out UUID ownerID, out OSDMap map) | ||
1094 | { | ||
1095 | if (m_debugEnabled) m_log.InfoFormat("[SIMIAN-GROUPS-CONNECTOR] {0} called ({1},{2})", System.Reflection.MethodBase.GetCurrentMethod().Name, type, key); | ||
1096 | |||
1097 | |||
1098 | NameValueCollection RequestArgs = new NameValueCollection | ||
1099 | { | ||
1100 | { "RequestMethod", "GetGenerics" }, | ||
1101 | { "Type", type }, | ||
1102 | { "Key", key} | ||
1103 | }; | ||
1104 | |||
1105 | |||
1106 | OSDMap Response = WebUtil.PostToService(m_serviceURL, RequestArgs); | ||
1107 | if (Response["Success"].AsBoolean() && Response["Entries"] is OSDArray) | ||
1108 | { | ||
1109 | OSDArray entryArray = (OSDArray)Response["Entries"]; | ||
1110 | if (entryArray.Count >= 1) | ||
1111 | { | ||
1112 | OSDMap entryMap = entryArray[0] as OSDMap; | ||
1113 | ownerID = entryMap["OwnerID"].AsUUID(); | ||
1114 | map = (OSDMap)OSDParser.DeserializeJson(entryMap["Value"].AsString()); | ||
1115 | |||
1116 | if (m_debugEnabled) m_log.InfoFormat("[SIMIAN-GROUPS-CONNECTOR] Generics Result {0}", entryMap["Value"].AsString()); | ||
1117 | |||
1118 | return true; | ||
1119 | } | ||
1120 | else | ||
1121 | { | ||
1122 | if (m_debugEnabled) m_log.InfoFormat("[SIMIAN-GROUPS-CONNECTOR] No Generics Results"); | ||
1123 | } | ||
1124 | } | ||
1125 | else | ||
1126 | { | ||
1127 | m_log.WarnFormat("[SIMIAN GROUPS CONNECTOR]: Error retrieving group info ({0})", Response["Message"]); | ||
1128 | } | ||
1129 | ownerID = UUID.Zero; | ||
1130 | map = null; | ||
1131 | return false; | ||
1132 | } | ||
1133 | |||
1134 | private bool SimianGetGenericEntry(UUID ownerID, string type, string key, out OSDMap map) | ||
1135 | { | ||
1136 | if (m_debugEnabled) m_log.InfoFormat("[SIMIAN-GROUPS-CONNECTOR] {0} called ({1},{2},{3})", System.Reflection.MethodBase.GetCurrentMethod().Name, ownerID, type, key); | ||
1137 | |||
1138 | NameValueCollection RequestArgs = new NameValueCollection | ||
1139 | { | ||
1140 | { "RequestMethod", "GetGenerics" }, | ||
1141 | { "OwnerID", ownerID.ToString() }, | ||
1142 | { "Type", type }, | ||
1143 | { "Key", key} | ||
1144 | }; | ||
1145 | |||
1146 | |||
1147 | OSDMap Response = WebUtil.PostToService(m_serviceURL, RequestArgs); | ||
1148 | if (Response["Success"].AsBoolean() && Response["Entries"] is OSDArray) | ||
1149 | { | ||
1150 | OSDArray entryArray = (OSDArray)Response["Entries"]; | ||
1151 | if (entryArray.Count == 1) | ||
1152 | { | ||
1153 | OSDMap entryMap = entryArray[0] as OSDMap; | ||
1154 | key = entryMap["Key"].AsString(); | ||
1155 | map = (OSDMap)OSDParser.DeserializeJson(entryMap["Value"].AsString()); | ||
1156 | |||
1157 | if (m_debugEnabled) m_log.InfoFormat("[SIMIAN-GROUPS-CONNECTOR] Generics Result {0}", entryMap["Value"].AsString()); | ||
1158 | |||
1159 | return true; | ||
1160 | } | ||
1161 | else | ||
1162 | { | ||
1163 | if (m_debugEnabled) m_log.InfoFormat("[SIMIAN-GROUPS-CONNECTOR] No Generics Results"); | ||
1164 | } | ||
1165 | } | ||
1166 | else | ||
1167 | { | ||
1168 | m_log.WarnFormat("[SIMIAN GROUPS CONNECTOR]: Error retrieving group info ({0})", Response["Message"]); | ||
1169 | } | ||
1170 | map = null; | ||
1171 | return false; | ||
1172 | } | ||
1173 | |||
1174 | private bool SimianGetGenericEntries(UUID ownerID, string type, out Dictionary<string, OSDMap> maps) | ||
1175 | { | ||
1176 | if (m_debugEnabled) m_log.InfoFormat("[SIMIAN-GROUPS-CONNECTOR] {0} called ({1},{2})", System.Reflection.MethodBase.GetCurrentMethod().Name,ownerID, type); | ||
1177 | |||
1178 | NameValueCollection requestArgs = new NameValueCollection | ||
1179 | { | ||
1180 | { "RequestMethod", "GetGenerics" }, | ||
1181 | { "OwnerID", ownerID.ToString() }, | ||
1182 | { "Type", type } | ||
1183 | }; | ||
1184 | |||
1185 | |||
1186 | |||
1187 | OSDMap response = WebUtil.PostToService(m_serviceURL, requestArgs); | ||
1188 | if (response["Success"].AsBoolean() && response["Entries"] is OSDArray) | ||
1189 | { | ||
1190 | maps = new Dictionary<string, OSDMap>(); | ||
1191 | |||
1192 | OSDArray entryArray = (OSDArray)response["Entries"]; | ||
1193 | foreach (OSDMap entryMap in entryArray) | ||
1194 | { | ||
1195 | if (m_debugEnabled) m_log.InfoFormat("[SIMIAN-GROUPS-CONNECTOR] Generics Result {0}", entryMap["Value"].AsString()); | ||
1196 | maps.Add(entryMap["Key"].AsString(), (OSDMap)OSDParser.DeserializeJson(entryMap["Value"].AsString())); | ||
1197 | } | ||
1198 | if(maps.Count == 0) | ||
1199 | { | ||
1200 | if (m_debugEnabled) m_log.InfoFormat("[SIMIAN-GROUPS-CONNECTOR] No Generics Results"); | ||
1201 | } | ||
1202 | |||
1203 | return true; | ||
1204 | } | ||
1205 | else | ||
1206 | { | ||
1207 | maps = null; | ||
1208 | m_log.WarnFormat("[SIMIAN GROUPS CONNECTOR]: Error retrieving group info ({0})", response["Message"]); | ||
1209 | } | ||
1210 | return false; | ||
1211 | } | ||
1212 | private bool SimianGetGenericEntries(string type, string key, out Dictionary<UUID, OSDMap> maps) | ||
1213 | { | ||
1214 | if (m_debugEnabled) m_log.InfoFormat("[SIMIAN-GROUPS-CONNECTOR] {0} called ({1},{2})", System.Reflection.MethodBase.GetCurrentMethod().Name, type, key); | ||
1215 | |||
1216 | NameValueCollection requestArgs = new NameValueCollection | ||
1217 | { | ||
1218 | { "RequestMethod", "GetGenerics" }, | ||
1219 | { "Type", type }, | ||
1220 | { "Key", key } | ||
1221 | }; | ||
1222 | |||
1223 | |||
1224 | |||
1225 | OSDMap response = WebUtil.PostToService(m_serviceURL, requestArgs); | ||
1226 | if (response["Success"].AsBoolean() && response["Entries"] is OSDArray) | ||
1227 | { | ||
1228 | maps = new Dictionary<UUID, OSDMap>(); | ||
1229 | |||
1230 | OSDArray entryArray = (OSDArray)response["Entries"]; | ||
1231 | foreach (OSDMap entryMap in entryArray) | ||
1232 | { | ||
1233 | if (m_debugEnabled) m_log.InfoFormat("[SIMIAN-GROUPS-CONNECTOR] Generics Result {0}", entryMap["Value"].AsString()); | ||
1234 | maps.Add(entryMap["OwnerID"].AsUUID(), (OSDMap)OSDParser.DeserializeJson(entryMap["Value"].AsString())); | ||
1235 | } | ||
1236 | if (maps.Count == 0) | ||
1237 | { | ||
1238 | if (m_debugEnabled) m_log.InfoFormat("[SIMIAN-GROUPS-CONNECTOR] No Generics Results"); | ||
1239 | } | ||
1240 | return true; | ||
1241 | } | ||
1242 | else | ||
1243 | { | ||
1244 | maps = null; | ||
1245 | m_log.WarnFormat("[SIMIAN-GROUPS-CONNECTOR]: Error retrieving group info ({0})", response["Message"]); | ||
1246 | } | ||
1247 | return false; | ||
1248 | } | ||
1249 | |||
1250 | private bool SimianRemoveGenericEntry(UUID ownerID, string type, string key) | ||
1251 | { | ||
1252 | if (m_debugEnabled) m_log.InfoFormat("[SIMIAN-GROUPS-CONNECTOR] {0} called ({1},{2},{3})", System.Reflection.MethodBase.GetCurrentMethod().Name, ownerID, type, key); | ||
1253 | |||
1254 | NameValueCollection requestArgs = new NameValueCollection | ||
1255 | { | ||
1256 | { "RequestMethod", "RemoveGeneric" }, | ||
1257 | { "OwnerID", ownerID.ToString() }, | ||
1258 | { "Type", type }, | ||
1259 | { "Key", key } | ||
1260 | }; | ||
1261 | |||
1262 | |||
1263 | OSDMap response = WebUtil.PostToService(m_serviceURL, requestArgs); | ||
1264 | if (response["Success"].AsBoolean()) | ||
1265 | { | ||
1266 | return true; | ||
1267 | } | ||
1268 | else | ||
1269 | { | ||
1270 | m_log.WarnFormat("[SIMIAN GROUPS CONNECTOR]: Error {0}, {1}, {2}, {3}", ownerID, type, key, response["Message"]); | ||
1271 | return false; | ||
1272 | } | ||
1273 | } | ||
1274 | #endregion | ||
1275 | } | ||
1276 | |||
1277 | } | ||
1278 | |||
diff --git a/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/XmlRpcGroupsServicesConnectorModule.cs b/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/XmlRpcGroupsServicesConnectorModule.cs index 24ae4f7..ab343c8 100644 --- a/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/XmlRpcGroupsServicesConnectorModule.cs +++ b/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/XmlRpcGroupsServicesConnectorModule.cs | |||
@@ -40,7 +40,9 @@ using OpenMetaverse; | |||
40 | using OpenMetaverse.StructuredData; | 40 | using OpenMetaverse.StructuredData; |
41 | 41 | ||
42 | using OpenSim.Framework; | 42 | using OpenSim.Framework; |
43 | using OpenSim.Framework.Communications; | ||
43 | using OpenSim.Region.Framework.Interfaces; | 44 | using OpenSim.Region.Framework.Interfaces; |
45 | using OpenSim.Services.Interfaces; | ||
44 | 46 | ||
45 | namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups | 47 | namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups |
46 | { | 48 | { |
@@ -66,6 +68,8 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups | |||
66 | private string m_groupReadKey = string.Empty; | 68 | private string m_groupReadKey = string.Empty; |
67 | private string m_groupWriteKey = string.Empty; | 69 | private string m_groupWriteKey = string.Empty; |
68 | 70 | ||
71 | private IUserAccountService m_accountService = null; | ||
72 | |||
69 | 73 | ||
70 | #region IRegionModuleBase Members | 74 | #region IRegionModuleBase Members |
71 | 75 | ||
@@ -116,6 +120,9 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups | |||
116 | m_groupReadKey = groupsConfig.GetString("XmlRpcServiceReadKey", string.Empty); | 120 | m_groupReadKey = groupsConfig.GetString("XmlRpcServiceReadKey", string.Empty); |
117 | m_groupWriteKey = groupsConfig.GetString("XmlRpcServiceWriteKey", string.Empty); | 121 | m_groupWriteKey = groupsConfig.GetString("XmlRpcServiceWriteKey", string.Empty); |
118 | 122 | ||
123 | |||
124 | |||
125 | |||
119 | // If we got all the config options we need, lets start'er'up | 126 | // If we got all the config options we need, lets start'er'up |
120 | m_connectorEnabled = true; | 127 | m_connectorEnabled = true; |
121 | } | 128 | } |
@@ -129,13 +136,24 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups | |||
129 | public void AddRegion(OpenSim.Region.Framework.Scenes.Scene scene) | 136 | public void AddRegion(OpenSim.Region.Framework.Scenes.Scene scene) |
130 | { | 137 | { |
131 | if (m_connectorEnabled) | 138 | if (m_connectorEnabled) |
139 | { | ||
140 | |||
141 | if (m_accountService == null) | ||
142 | { | ||
143 | m_accountService = scene.UserAccountService; | ||
144 | } | ||
145 | |||
146 | |||
132 | scene.RegisterModuleInterface<IGroupsServicesConnector>(this); | 147 | scene.RegisterModuleInterface<IGroupsServicesConnector>(this); |
148 | } | ||
133 | } | 149 | } |
134 | 150 | ||
135 | public void RemoveRegion(OpenSim.Region.Framework.Scenes.Scene scene) | 151 | public void RemoveRegion(OpenSim.Region.Framework.Scenes.Scene scene) |
136 | { | 152 | { |
137 | if (scene.RequestModuleInterface<IGroupsServicesConnector>() == this) | 153 | if (scene.RequestModuleInterface<IGroupsServicesConnector>() == this) |
154 | { | ||
138 | scene.UnregisterModuleInterface<IGroupsServicesConnector>(this); | 155 | scene.UnregisterModuleInterface<IGroupsServicesConnector>(this); |
156 | } | ||
139 | } | 157 | } |
140 | 158 | ||
141 | public void RegionLoaded(OpenSim.Region.Framework.Scenes.Scene scene) | 159 | public void RegionLoaded(OpenSim.Region.Framework.Scenes.Scene scene) |
@@ -155,14 +173,12 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups | |||
155 | 173 | ||
156 | #endregion | 174 | #endregion |
157 | 175 | ||
158 | |||
159 | |||
160 | #region IGroupsServicesConnector Members | 176 | #region IGroupsServicesConnector Members |
161 | 177 | ||
162 | /// <summary> | 178 | /// <summary> |
163 | /// Create a Group, including Everyone and Owners Role, place FounderID in both groups, select Owner as selected role, and newly created group as agent's active role. | 179 | /// Create a Group, including Everyone and Owners Role, place FounderID in both groups, select Owner as selected role, and newly created group as agent's active role. |
164 | /// </summary> | 180 | /// </summary> |
165 | public UUID CreateGroup(GroupRequestID requestID, string name, string charter, bool showInList, UUID insigniaID, | 181 | public UUID CreateGroup(UUID requestingAgentID, string name, string charter, bool showInList, UUID insigniaID, |
166 | int membershipFee, bool openEnrollment, bool allowPublish, | 182 | int membershipFee, bool openEnrollment, bool allowPublish, |
167 | bool maturePublish, UUID founderID) | 183 | bool maturePublish, UUID founderID) |
168 | { | 184 | { |
@@ -234,7 +250,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups | |||
234 | 250 | ||
235 | 251 | ||
236 | 252 | ||
237 | Hashtable respData = XmlRpcCall(requestID, "groups.createGroup", param); | 253 | Hashtable respData = XmlRpcCall(requestingAgentID, "groups.createGroup", param); |
238 | 254 | ||
239 | if (respData.Contains("error")) | 255 | if (respData.Contains("error")) |
240 | { | 256 | { |
@@ -246,7 +262,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups | |||
246 | return UUID.Parse((string)respData["GroupID"]); | 262 | return UUID.Parse((string)respData["GroupID"]); |
247 | } | 263 | } |
248 | 264 | ||
249 | public void UpdateGroup(GroupRequestID requestID, UUID groupID, string charter, bool showInList, | 265 | public void UpdateGroup(UUID requestingAgentID, UUID groupID, string charter, bool showInList, |
250 | UUID insigniaID, int membershipFee, bool openEnrollment, | 266 | UUID insigniaID, int membershipFee, bool openEnrollment, |
251 | bool allowPublish, bool maturePublish) | 267 | bool allowPublish, bool maturePublish) |
252 | { | 268 | { |
@@ -260,10 +276,10 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups | |||
260 | param["AllowPublish"] = allowPublish == true ? 1 : 0; | 276 | param["AllowPublish"] = allowPublish == true ? 1 : 0; |
261 | param["MaturePublish"] = maturePublish == true ? 1 : 0; | 277 | param["MaturePublish"] = maturePublish == true ? 1 : 0; |
262 | 278 | ||
263 | XmlRpcCall(requestID, "groups.updateGroup", param); | 279 | XmlRpcCall(requestingAgentID, "groups.updateGroup", param); |
264 | } | 280 | } |
265 | 281 | ||
266 | public void AddGroupRole(GroupRequestID requestID, UUID groupID, UUID roleID, string name, string description, | 282 | public void AddGroupRole(UUID requestingAgentID, UUID groupID, UUID roleID, string name, string description, |
267 | string title, ulong powers) | 283 | string title, ulong powers) |
268 | { | 284 | { |
269 | Hashtable param = new Hashtable(); | 285 | Hashtable param = new Hashtable(); |
@@ -274,19 +290,19 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups | |||
274 | param["Title"] = title; | 290 | param["Title"] = title; |
275 | param["Powers"] = powers.ToString(); | 291 | param["Powers"] = powers.ToString(); |
276 | 292 | ||
277 | XmlRpcCall(requestID, "groups.addRoleToGroup", param); | 293 | XmlRpcCall(requestingAgentID, "groups.addRoleToGroup", param); |
278 | } | 294 | } |
279 | 295 | ||
280 | public void RemoveGroupRole(GroupRequestID requestID, UUID groupID, UUID roleID) | 296 | public void RemoveGroupRole(UUID requestingAgentID, UUID groupID, UUID roleID) |
281 | { | 297 | { |
282 | Hashtable param = new Hashtable(); | 298 | Hashtable param = new Hashtable(); |
283 | param["GroupID"] = groupID.ToString(); | 299 | param["GroupID"] = groupID.ToString(); |
284 | param["RoleID"] = roleID.ToString(); | 300 | param["RoleID"] = roleID.ToString(); |
285 | 301 | ||
286 | XmlRpcCall(requestID, "groups.removeRoleFromGroup", param); | 302 | XmlRpcCall(requestingAgentID, "groups.removeRoleFromGroup", param); |
287 | } | 303 | } |
288 | 304 | ||
289 | public void UpdateGroupRole(GroupRequestID requestID, UUID groupID, UUID roleID, string name, string description, | 305 | public void UpdateGroupRole(UUID requestingAgentID, UUID groupID, UUID roleID, string name, string description, |
290 | string title, ulong powers) | 306 | string title, ulong powers) |
291 | { | 307 | { |
292 | Hashtable param = new Hashtable(); | 308 | Hashtable param = new Hashtable(); |
@@ -306,10 +322,10 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups | |||
306 | } | 322 | } |
307 | param["Powers"] = powers.ToString(); | 323 | param["Powers"] = powers.ToString(); |
308 | 324 | ||
309 | XmlRpcCall(requestID, "groups.updateGroupRole", param); | 325 | XmlRpcCall(requestingAgentID, "groups.updateGroupRole", param); |
310 | } | 326 | } |
311 | 327 | ||
312 | public GroupRecord GetGroupRecord(GroupRequestID requestID, UUID GroupID, string GroupName) | 328 | public GroupRecord GetGroupRecord(UUID requestingAgentID, UUID GroupID, string GroupName) |
313 | { | 329 | { |
314 | Hashtable param = new Hashtable(); | 330 | Hashtable param = new Hashtable(); |
315 | if (GroupID != UUID.Zero) | 331 | if (GroupID != UUID.Zero) |
@@ -321,7 +337,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups | |||
321 | param["Name"] = GroupName.ToString(); | 337 | param["Name"] = GroupName.ToString(); |
322 | } | 338 | } |
323 | 339 | ||
324 | Hashtable respData = XmlRpcCall(requestID, "groups.getGroup", param); | 340 | Hashtable respData = XmlRpcCall(requestingAgentID, "groups.getGroup", param); |
325 | 341 | ||
326 | if (respData.Contains("error")) | 342 | if (respData.Contains("error")) |
327 | { | 343 | { |
@@ -332,12 +348,12 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups | |||
332 | 348 | ||
333 | } | 349 | } |
334 | 350 | ||
335 | public GroupProfileData GetMemberGroupProfile(GroupRequestID requestID, UUID GroupID, UUID AgentID) | 351 | public GroupProfileData GetMemberGroupProfile(UUID requestingAgentID, UUID GroupID, UUID AgentID) |
336 | { | 352 | { |
337 | Hashtable param = new Hashtable(); | 353 | Hashtable param = new Hashtable(); |
338 | param["GroupID"] = GroupID.ToString(); | 354 | param["GroupID"] = GroupID.ToString(); |
339 | 355 | ||
340 | Hashtable respData = XmlRpcCall(requestID, "groups.getGroup", param); | 356 | Hashtable respData = XmlRpcCall(requestingAgentID, "groups.getGroup", param); |
341 | 357 | ||
342 | if (respData.Contains("error")) | 358 | if (respData.Contains("error")) |
343 | { | 359 | { |
@@ -345,7 +361,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups | |||
345 | return new GroupProfileData(); | 361 | return new GroupProfileData(); |
346 | } | 362 | } |
347 | 363 | ||
348 | GroupMembershipData MemberInfo = GetAgentGroupMembership(requestID, AgentID, GroupID); | 364 | GroupMembershipData MemberInfo = GetAgentGroupMembership(requestingAgentID, AgentID, GroupID); |
349 | GroupProfileData MemberGroupProfile = GroupProfileHashtableToGroupProfileData(respData); | 365 | GroupProfileData MemberGroupProfile = GroupProfileHashtableToGroupProfileData(respData); |
350 | 366 | ||
351 | MemberGroupProfile.MemberTitle = MemberInfo.GroupTitle; | 367 | MemberGroupProfile.MemberTitle = MemberInfo.GroupTitle; |
@@ -354,26 +370,26 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups | |||
354 | return MemberGroupProfile; | 370 | return MemberGroupProfile; |
355 | } | 371 | } |
356 | 372 | ||
357 | public void SetAgentActiveGroup(GroupRequestID requestID, UUID AgentID, UUID GroupID) | 373 | public void SetAgentActiveGroup(UUID requestingAgentID, UUID AgentID, UUID GroupID) |
358 | { | 374 | { |
359 | Hashtable param = new Hashtable(); | 375 | Hashtable param = new Hashtable(); |
360 | param["AgentID"] = AgentID.ToString(); | 376 | param["AgentID"] = AgentID.ToString(); |
361 | param["GroupID"] = GroupID.ToString(); | 377 | param["GroupID"] = GroupID.ToString(); |
362 | 378 | ||
363 | XmlRpcCall(requestID, "groups.setAgentActiveGroup", param); | 379 | XmlRpcCall(requestingAgentID, "groups.setAgentActiveGroup", param); |
364 | } | 380 | } |
365 | 381 | ||
366 | public void SetAgentActiveGroupRole(GroupRequestID requestID, UUID AgentID, UUID GroupID, UUID RoleID) | 382 | public void SetAgentActiveGroupRole(UUID requestingAgentID, UUID AgentID, UUID GroupID, UUID RoleID) |
367 | { | 383 | { |
368 | Hashtable param = new Hashtable(); | 384 | Hashtable param = new Hashtable(); |
369 | param["AgentID"] = AgentID.ToString(); | 385 | param["AgentID"] = AgentID.ToString(); |
370 | param["GroupID"] = GroupID.ToString(); | 386 | param["GroupID"] = GroupID.ToString(); |
371 | param["SelectedRoleID"] = RoleID.ToString(); | 387 | param["SelectedRoleID"] = RoleID.ToString(); |
372 | 388 | ||
373 | XmlRpcCall(requestID, "groups.setAgentGroupInfo", param); | 389 | XmlRpcCall(requestingAgentID, "groups.setAgentGroupInfo", param); |
374 | } | 390 | } |
375 | 391 | ||
376 | public void SetAgentGroupInfo(GroupRequestID requestID, UUID AgentID, UUID GroupID, bool AcceptNotices, bool ListInProfile) | 392 | public void SetAgentGroupInfo(UUID requestingAgentID, UUID AgentID, UUID GroupID, bool AcceptNotices, bool ListInProfile) |
377 | { | 393 | { |
378 | Hashtable param = new Hashtable(); | 394 | Hashtable param = new Hashtable(); |
379 | param["AgentID"] = AgentID.ToString(); | 395 | param["AgentID"] = AgentID.ToString(); |
@@ -381,11 +397,11 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups | |||
381 | param["AcceptNotices"] = AcceptNotices ? "1" : "0"; | 397 | param["AcceptNotices"] = AcceptNotices ? "1" : "0"; |
382 | param["ListInProfile"] = ListInProfile ? "1" : "0"; | 398 | param["ListInProfile"] = ListInProfile ? "1" : "0"; |
383 | 399 | ||
384 | XmlRpcCall(requestID, "groups.setAgentGroupInfo", param); | 400 | XmlRpcCall(requestingAgentID, "groups.setAgentGroupInfo", param); |
385 | 401 | ||
386 | } | 402 | } |
387 | 403 | ||
388 | public void AddAgentToGroupInvite(GroupRequestID requestID, UUID inviteID, UUID groupID, UUID roleID, UUID agentID) | 404 | public void AddAgentToGroupInvite(UUID requestingAgentID, UUID inviteID, UUID groupID, UUID roleID, UUID agentID) |
389 | { | 405 | { |
390 | Hashtable param = new Hashtable(); | 406 | Hashtable param = new Hashtable(); |
391 | param["InviteID"] = inviteID.ToString(); | 407 | param["InviteID"] = inviteID.ToString(); |
@@ -393,16 +409,16 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups | |||
393 | param["RoleID"] = roleID.ToString(); | 409 | param["RoleID"] = roleID.ToString(); |
394 | param["GroupID"] = groupID.ToString(); | 410 | param["GroupID"] = groupID.ToString(); |
395 | 411 | ||
396 | XmlRpcCall(requestID, "groups.addAgentToGroupInvite", param); | 412 | XmlRpcCall(requestingAgentID, "groups.addAgentToGroupInvite", param); |
397 | 413 | ||
398 | } | 414 | } |
399 | 415 | ||
400 | public GroupInviteInfo GetAgentToGroupInvite(GroupRequestID requestID, UUID inviteID) | 416 | public GroupInviteInfo GetAgentToGroupInvite(UUID requestingAgentID, UUID inviteID) |
401 | { | 417 | { |
402 | Hashtable param = new Hashtable(); | 418 | Hashtable param = new Hashtable(); |
403 | param["InviteID"] = inviteID.ToString(); | 419 | param["InviteID"] = inviteID.ToString(); |
404 | 420 | ||
405 | Hashtable respData = XmlRpcCall(requestID, "groups.getAgentToGroupInvite", param); | 421 | Hashtable respData = XmlRpcCall(requestingAgentID, "groups.getAgentToGroupInvite", param); |
406 | 422 | ||
407 | if (respData.Contains("error")) | 423 | if (respData.Contains("error")) |
408 | { | 424 | { |
@@ -418,59 +434,59 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups | |||
418 | return inviteInfo; | 434 | return inviteInfo; |
419 | } | 435 | } |
420 | 436 | ||
421 | public void RemoveAgentToGroupInvite(GroupRequestID requestID, UUID inviteID) | 437 | public void RemoveAgentToGroupInvite(UUID requestingAgentID, UUID inviteID) |
422 | { | 438 | { |
423 | Hashtable param = new Hashtable(); | 439 | Hashtable param = new Hashtable(); |
424 | param["InviteID"] = inviteID.ToString(); | 440 | param["InviteID"] = inviteID.ToString(); |
425 | 441 | ||
426 | XmlRpcCall(requestID, "groups.removeAgentToGroupInvite", param); | 442 | XmlRpcCall(requestingAgentID, "groups.removeAgentToGroupInvite", param); |
427 | } | 443 | } |
428 | 444 | ||
429 | public void AddAgentToGroup(GroupRequestID requestID, UUID AgentID, UUID GroupID, UUID RoleID) | 445 | public void AddAgentToGroup(UUID requestingAgentID, UUID AgentID, UUID GroupID, UUID RoleID) |
430 | { | 446 | { |
431 | Hashtable param = new Hashtable(); | 447 | Hashtable param = new Hashtable(); |
432 | param["AgentID"] = AgentID.ToString(); | 448 | param["AgentID"] = AgentID.ToString(); |
433 | param["GroupID"] = GroupID.ToString(); | 449 | param["GroupID"] = GroupID.ToString(); |
434 | param["RoleID"] = RoleID.ToString(); | 450 | param["RoleID"] = RoleID.ToString(); |
435 | 451 | ||
436 | XmlRpcCall(requestID, "groups.addAgentToGroup", param); | 452 | XmlRpcCall(requestingAgentID, "groups.addAgentToGroup", param); |
437 | } | 453 | } |
438 | 454 | ||
439 | public void RemoveAgentFromGroup(GroupRequestID requestID, UUID AgentID, UUID GroupID) | 455 | public void RemoveAgentFromGroup(UUID requestingAgentID, UUID AgentID, UUID GroupID) |
440 | { | 456 | { |
441 | Hashtable param = new Hashtable(); | 457 | Hashtable param = new Hashtable(); |
442 | param["AgentID"] = AgentID.ToString(); | 458 | param["AgentID"] = AgentID.ToString(); |
443 | param["GroupID"] = GroupID.ToString(); | 459 | param["GroupID"] = GroupID.ToString(); |
444 | 460 | ||
445 | XmlRpcCall(requestID, "groups.removeAgentFromGroup", param); | 461 | XmlRpcCall(requestingAgentID, "groups.removeAgentFromGroup", param); |
446 | } | 462 | } |
447 | 463 | ||
448 | public void AddAgentToGroupRole(GroupRequestID requestID, UUID AgentID, UUID GroupID, UUID RoleID) | 464 | public void AddAgentToGroupRole(UUID requestingAgentID, UUID AgentID, UUID GroupID, UUID RoleID) |
449 | { | 465 | { |
450 | Hashtable param = new Hashtable(); | 466 | Hashtable param = new Hashtable(); |
451 | param["AgentID"] = AgentID.ToString(); | 467 | param["AgentID"] = AgentID.ToString(); |
452 | param["GroupID"] = GroupID.ToString(); | 468 | param["GroupID"] = GroupID.ToString(); |
453 | param["RoleID"] = RoleID.ToString(); | 469 | param["RoleID"] = RoleID.ToString(); |
454 | 470 | ||
455 | XmlRpcCall(requestID, "groups.addAgentToGroupRole", param); | 471 | XmlRpcCall(requestingAgentID, "groups.addAgentToGroupRole", param); |
456 | } | 472 | } |
457 | 473 | ||
458 | public void RemoveAgentFromGroupRole(GroupRequestID requestID, UUID AgentID, UUID GroupID, UUID RoleID) | 474 | public void RemoveAgentFromGroupRole(UUID requestingAgentID, UUID AgentID, UUID GroupID, UUID RoleID) |
459 | { | 475 | { |
460 | Hashtable param = new Hashtable(); | 476 | Hashtable param = new Hashtable(); |
461 | param["AgentID"] = AgentID.ToString(); | 477 | param["AgentID"] = AgentID.ToString(); |
462 | param["GroupID"] = GroupID.ToString(); | 478 | param["GroupID"] = GroupID.ToString(); |
463 | param["RoleID"] = RoleID.ToString(); | 479 | param["RoleID"] = RoleID.ToString(); |
464 | 480 | ||
465 | XmlRpcCall(requestID, "groups.removeAgentFromGroupRole", param); | 481 | XmlRpcCall(requestingAgentID, "groups.removeAgentFromGroupRole", param); |
466 | } | 482 | } |
467 | 483 | ||
468 | public List<DirGroupsReplyData> FindGroups(GroupRequestID requestID, string search) | 484 | public List<DirGroupsReplyData> FindGroups(UUID requestingAgentID, string search) |
469 | { | 485 | { |
470 | Hashtable param = new Hashtable(); | 486 | Hashtable param = new Hashtable(); |
471 | param["Search"] = search; | 487 | param["Search"] = search; |
472 | 488 | ||
473 | Hashtable respData = XmlRpcCall(requestID, "groups.findGroups", param); | 489 | Hashtable respData = XmlRpcCall(requestingAgentID, "groups.findGroups", param); |
474 | 490 | ||
475 | List<DirGroupsReplyData> findings = new List<DirGroupsReplyData>(); | 491 | List<DirGroupsReplyData> findings = new List<DirGroupsReplyData>(); |
476 | 492 | ||
@@ -492,13 +508,13 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups | |||
492 | return findings; | 508 | return findings; |
493 | } | 509 | } |
494 | 510 | ||
495 | public GroupMembershipData GetAgentGroupMembership(GroupRequestID requestID, UUID AgentID, UUID GroupID) | 511 | public GroupMembershipData GetAgentGroupMembership(UUID requestingAgentID, UUID AgentID, UUID GroupID) |
496 | { | 512 | { |
497 | Hashtable param = new Hashtable(); | 513 | Hashtable param = new Hashtable(); |
498 | param["AgentID"] = AgentID.ToString(); | 514 | param["AgentID"] = AgentID.ToString(); |
499 | param["GroupID"] = GroupID.ToString(); | 515 | param["GroupID"] = GroupID.ToString(); |
500 | 516 | ||
501 | Hashtable respData = XmlRpcCall(requestID, "groups.getAgentGroupMembership", param); | 517 | Hashtable respData = XmlRpcCall(requestingAgentID, "groups.getAgentGroupMembership", param); |
502 | 518 | ||
503 | if (respData.Contains("error")) | 519 | if (respData.Contains("error")) |
504 | { | 520 | { |
@@ -510,12 +526,12 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups | |||
510 | return data; | 526 | return data; |
511 | } | 527 | } |
512 | 528 | ||
513 | public GroupMembershipData GetAgentActiveMembership(GroupRequestID requestID, UUID AgentID) | 529 | public GroupMembershipData GetAgentActiveMembership(UUID requestingAgentID, UUID AgentID) |
514 | { | 530 | { |
515 | Hashtable param = new Hashtable(); | 531 | Hashtable param = new Hashtable(); |
516 | param["AgentID"] = AgentID.ToString(); | 532 | param["AgentID"] = AgentID.ToString(); |
517 | 533 | ||
518 | Hashtable respData = XmlRpcCall(requestID, "groups.getAgentActiveMembership", param); | 534 | Hashtable respData = XmlRpcCall(requestingAgentID, "groups.getAgentActiveMembership", param); |
519 | 535 | ||
520 | if (respData.Contains("error")) | 536 | if (respData.Contains("error")) |
521 | { | 537 | { |
@@ -525,12 +541,12 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups | |||
525 | return HashTableToGroupMembershipData(respData); | 541 | return HashTableToGroupMembershipData(respData); |
526 | } | 542 | } |
527 | 543 | ||
528 | public List<GroupMembershipData> GetAgentGroupMemberships(GroupRequestID requestID, UUID AgentID) | 544 | public List<GroupMembershipData> GetAgentGroupMemberships(UUID requestingAgentID, UUID AgentID) |
529 | { | 545 | { |
530 | Hashtable param = new Hashtable(); | 546 | Hashtable param = new Hashtable(); |
531 | param["AgentID"] = AgentID.ToString(); | 547 | param["AgentID"] = AgentID.ToString(); |
532 | 548 | ||
533 | Hashtable respData = XmlRpcCall(requestID, "groups.getAgentGroupMemberships", param); | 549 | Hashtable respData = XmlRpcCall(requestingAgentID, "groups.getAgentGroupMemberships", param); |
534 | 550 | ||
535 | List<GroupMembershipData> memberships = new List<GroupMembershipData>(); | 551 | List<GroupMembershipData> memberships = new List<GroupMembershipData>(); |
536 | 552 | ||
@@ -545,13 +561,13 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups | |||
545 | return memberships; | 561 | return memberships; |
546 | } | 562 | } |
547 | 563 | ||
548 | public List<GroupRolesData> GetAgentGroupRoles(GroupRequestID requestID, UUID AgentID, UUID GroupID) | 564 | public List<GroupRolesData> GetAgentGroupRoles(UUID requestingAgentID, UUID AgentID, UUID GroupID) |
549 | { | 565 | { |
550 | Hashtable param = new Hashtable(); | 566 | Hashtable param = new Hashtable(); |
551 | param["AgentID"] = AgentID.ToString(); | 567 | param["AgentID"] = AgentID.ToString(); |
552 | param["GroupID"] = GroupID.ToString(); | 568 | param["GroupID"] = GroupID.ToString(); |
553 | 569 | ||
554 | Hashtable respData = XmlRpcCall(requestID, "groups.getAgentRoles", param); | 570 | Hashtable respData = XmlRpcCall(requestingAgentID, "groups.getAgentRoles", param); |
555 | 571 | ||
556 | List<GroupRolesData> Roles = new List<GroupRolesData>(); | 572 | List<GroupRolesData> Roles = new List<GroupRolesData>(); |
557 | 573 | ||
@@ -577,12 +593,12 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups | |||
577 | 593 | ||
578 | } | 594 | } |
579 | 595 | ||
580 | public List<GroupRolesData> GetGroupRoles(GroupRequestID requestID, UUID GroupID) | 596 | public List<GroupRolesData> GetGroupRoles(UUID requestingAgentID, UUID GroupID) |
581 | { | 597 | { |
582 | Hashtable param = new Hashtable(); | 598 | Hashtable param = new Hashtable(); |
583 | param["GroupID"] = GroupID.ToString(); | 599 | param["GroupID"] = GroupID.ToString(); |
584 | 600 | ||
585 | Hashtable respData = XmlRpcCall(requestID, "groups.getGroupRoles", param); | 601 | Hashtable respData = XmlRpcCall(requestingAgentID, "groups.getGroupRoles", param); |
586 | 602 | ||
587 | List<GroupRolesData> Roles = new List<GroupRolesData>(); | 603 | List<GroupRolesData> Roles = new List<GroupRolesData>(); |
588 | 604 | ||
@@ -610,12 +626,12 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups | |||
610 | 626 | ||
611 | 627 | ||
612 | 628 | ||
613 | public List<GroupMembersData> GetGroupMembers(GroupRequestID requestID, UUID GroupID) | 629 | public List<GroupMembersData> GetGroupMembers(UUID requestingAgentID, UUID GroupID) |
614 | { | 630 | { |
615 | Hashtable param = new Hashtable(); | 631 | Hashtable param = new Hashtable(); |
616 | param["GroupID"] = GroupID.ToString(); | 632 | param["GroupID"] = GroupID.ToString(); |
617 | 633 | ||
618 | Hashtable respData = XmlRpcCall(requestID, "groups.getGroupMembers", param); | 634 | Hashtable respData = XmlRpcCall(requestingAgentID, "groups.getGroupMembers", param); |
619 | 635 | ||
620 | List<GroupMembersData> members = new List<GroupMembersData>(); | 636 | List<GroupMembersData> members = new List<GroupMembersData>(); |
621 | 637 | ||
@@ -643,12 +659,12 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups | |||
643 | 659 | ||
644 | } | 660 | } |
645 | 661 | ||
646 | public List<GroupRoleMembersData> GetGroupRoleMembers(GroupRequestID requestID, UUID GroupID) | 662 | public List<GroupRoleMembersData> GetGroupRoleMembers(UUID requestingAgentID, UUID GroupID) |
647 | { | 663 | { |
648 | Hashtable param = new Hashtable(); | 664 | Hashtable param = new Hashtable(); |
649 | param["GroupID"] = GroupID.ToString(); | 665 | param["GroupID"] = GroupID.ToString(); |
650 | 666 | ||
651 | Hashtable respData = XmlRpcCall(requestID, "groups.getGroupRoleMembers", param); | 667 | Hashtable respData = XmlRpcCall(requestingAgentID, "groups.getGroupRoleMembers", param); |
652 | 668 | ||
653 | List<GroupRoleMembersData> members = new List<GroupRoleMembersData>(); | 669 | List<GroupRoleMembersData> members = new List<GroupRoleMembersData>(); |
654 | 670 | ||
@@ -667,12 +683,12 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups | |||
667 | return members; | 683 | return members; |
668 | } | 684 | } |
669 | 685 | ||
670 | public List<GroupNoticeData> GetGroupNotices(GroupRequestID requestID, UUID GroupID) | 686 | public List<GroupNoticeData> GetGroupNotices(UUID requestingAgentID, UUID GroupID) |
671 | { | 687 | { |
672 | Hashtable param = new Hashtable(); | 688 | Hashtable param = new Hashtable(); |
673 | param["GroupID"] = GroupID.ToString(); | 689 | param["GroupID"] = GroupID.ToString(); |
674 | 690 | ||
675 | Hashtable respData = XmlRpcCall(requestID, "groups.getGroupNotices", param); | 691 | Hashtable respData = XmlRpcCall(requestingAgentID, "groups.getGroupNotices", param); |
676 | 692 | ||
677 | List<GroupNoticeData> values = new List<GroupNoticeData>(); | 693 | List<GroupNoticeData> values = new List<GroupNoticeData>(); |
678 | 694 | ||
@@ -694,12 +710,12 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups | |||
694 | return values; | 710 | return values; |
695 | 711 | ||
696 | } | 712 | } |
697 | public GroupNoticeInfo GetGroupNotice(GroupRequestID requestID, UUID noticeID) | 713 | public GroupNoticeInfo GetGroupNotice(UUID requestingAgentID, UUID noticeID) |
698 | { | 714 | { |
699 | Hashtable param = new Hashtable(); | 715 | Hashtable param = new Hashtable(); |
700 | param["NoticeID"] = noticeID.ToString(); | 716 | param["NoticeID"] = noticeID.ToString(); |
701 | 717 | ||
702 | Hashtable respData = XmlRpcCall(requestID, "groups.getGroupNotice", param); | 718 | Hashtable respData = XmlRpcCall(requestingAgentID, "groups.getGroupNotice", param); |
703 | 719 | ||
704 | 720 | ||
705 | if (respData.Contains("error")) | 721 | if (respData.Contains("error")) |
@@ -725,7 +741,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups | |||
725 | 741 | ||
726 | return data; | 742 | return data; |
727 | } | 743 | } |
728 | public void AddGroupNotice(GroupRequestID requestID, UUID groupID, UUID noticeID, string fromName, string subject, string message, byte[] binaryBucket) | 744 | public void AddGroupNotice(UUID requestingAgentID, UUID groupID, UUID noticeID, string fromName, string subject, string message, byte[] binaryBucket) |
729 | { | 745 | { |
730 | string binBucket = OpenMetaverse.Utils.BytesToHexString(binaryBucket, ""); | 746 | string binBucket = OpenMetaverse.Utils.BytesToHexString(binaryBucket, ""); |
731 | 747 | ||
@@ -738,7 +754,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups | |||
738 | param["BinaryBucket"] = binBucket; | 754 | param["BinaryBucket"] = binBucket; |
739 | param["TimeStamp"] = ((uint)Util.UnixTimeSinceEpoch()).ToString(); | 755 | param["TimeStamp"] = ((uint)Util.UnixTimeSinceEpoch()).ToString(); |
740 | 756 | ||
741 | XmlRpcCall(requestID, "groups.addGroupNotice", param); | 757 | XmlRpcCall(requestingAgentID, "groups.addGroupNotice", param); |
742 | } | 758 | } |
743 | #endregion | 759 | #endregion |
744 | 760 | ||
@@ -831,15 +847,14 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups | |||
831 | /// <summary> | 847 | /// <summary> |
832 | /// Encapsulate the XmlRpc call to standardize security and error handling. | 848 | /// Encapsulate the XmlRpc call to standardize security and error handling. |
833 | /// </summary> | 849 | /// </summary> |
834 | private Hashtable XmlRpcCall(GroupRequestID requestID, string function, Hashtable param) | 850 | private Hashtable XmlRpcCall(UUID requestingAgentID, string function, Hashtable param) |
835 | { | 851 | { |
836 | if (requestID == null) | 852 | string UserService; |
837 | { | 853 | UUID SessionID; |
838 | requestID = new GroupRequestID(); | 854 | GetClientGroupRequestID(requestingAgentID, out UserService, out SessionID); |
839 | } | 855 | param.Add("requestingAgentID", requestingAgentID.ToString()); |
840 | param.Add("RequestingAgentID", requestID.AgentID.ToString()); | 856 | param.Add("RequestingAgentUserService", UserService); |
841 | param.Add("RequestingAgentUserService", requestID.UserServiceURL); | 857 | param.Add("RequestingSessionID", SessionID.ToString()); |
842 | param.Add("RequestingSessionID", requestID.SessionID.ToString()); | ||
843 | 858 | ||
844 | 859 | ||
845 | param.Add("ReadKey", m_groupReadKey); | 860 | param.Add("ReadKey", m_groupReadKey); |
@@ -930,15 +945,49 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups | |||
930 | } | 945 | } |
931 | } | 946 | } |
932 | 947 | ||
948 | |||
949 | /// <summary> | ||
950 | /// Group Request Tokens are an attempt to allow the groups service to authenticate | ||
951 | /// requests. Currently uses UserService, AgentID, and SessionID | ||
952 | /// TODO: Find a better way to do this. | ||
953 | /// </summary> | ||
954 | /// <param name="client"></param> | ||
955 | /// <returns></returns> | ||
956 | private void GetClientGroupRequestID(UUID AgentID, out string UserServiceURL, out UUID SessionID) | ||
957 | { | ||
958 | UserServiceURL = ""; | ||
959 | SessionID = UUID.Zero; | ||
933 | 960 | ||
934 | } | ||
935 | 961 | ||
936 | public class GroupNoticeInfo | 962 | // Need to rework this based on changes to User Services |
937 | { | 963 | /* |
938 | public GroupNoticeData noticeData = new GroupNoticeData(); | 964 | UserAccount userAccount = m_accountService.GetUserAccount(UUID.Zero,AgentID); |
939 | public UUID GroupID = UUID.Zero; | 965 | if (userAccount == null) |
940 | public string Message = string.Empty; | 966 | { |
941 | public byte[] BinaryBucket = new byte[0]; | 967 | // This should be impossible. If I've been passed a reference to a client |
968 | // that client should be registered with the UserService. So something | ||
969 | // is horribly wrong somewhere. | ||
970 | |||
971 | m_log.WarnFormat("[GROUPS]: Could not find a UserServiceURL for {0}", AgentID); | ||
972 | |||
973 | } | ||
974 | else if (userProfile is ForeignUserProfileData) | ||
975 | { | ||
976 | // They aren't from around here | ||
977 | ForeignUserProfileData fupd = (ForeignUserProfileData)userProfile; | ||
978 | UserServiceURL = fupd.UserServerURI; | ||
979 | SessionID = fupd.CurrentAgent.SessionID; | ||
980 | |||
981 | } | ||
982 | else | ||
983 | { | ||
984 | // They're a local user, use this: | ||
985 | UserServiceURL = m_commManager.NetworkServersInfo.UserURL; | ||
986 | SessionID = userProfile.CurrentAgent.SessionID; | ||
987 | } | ||
988 | */ | ||
989 | } | ||
990 | |||
942 | } | 991 | } |
943 | } | 992 | } |
944 | 993 | ||