More changes for groupchat invitations; CS-4034, r=Gato

git-svn-id: http://svn.igniterealtime.org/svn/repos/openfire/trunk@10169 b35dd754-fafc-0310-a699-88a17e54d16e

src/java/org/jivesoftware/openfire/clearspace/ClearspaceMUCEventDelegate.java

@@ -37,23 +37,29 @@ public class ClearspaceMUCEventDelegate extends MUCEventDelegate {
         csComponentAddress = ClearspaceManager.CLEARSPACE_COMPONENT + "." + xmppDomain;
     }
 
-    public InvitationResult sendingInvitation(MUCRoom room, JID userjid)
+    public InvitationResult sendingInvitation(MUCRoom room, JID invitee, JID inviter, String reason)
     {
         // Packet should look like:
         // <iq to="clearspace.example.org" from="clearspace-conference.example.org">
         //    <room-invite xmlns="http://jivesoftware.com/clearspace">
-        //        <user>username@example.org</user>
-        //        <roomjid>14-1234@clearspace-conference.example.org</roomjid>
+        //        <inviter>username@example.org</inviter>
+        //        <room>14-1234@clearspace-conference.example.org</roomjid>
+        //        <reason>Example Message</reason>
+        //        <invitee>anotheruser@example.org</invitee>
         //    </room-invite>
         // </iq>
 
         IQ query = new IQ();
         query.setFrom(csMucDomain);
         Element cmd = query.setChildElement("room-invite", "http://jivesoftware.com/clearspace");
-        Element userjidElement = cmd.addElement("userjid");
-        userjidElement.setText(userjid.toBareJID());
-        Element roomjidElement = cmd.addElement("roomjid");
+        Element inviterjidElement = cmd.addElement("inviter");
+        inviterjidElement.setText(inviter.toBareJID());
+        Element inviteejidElement = cmd.addElement("invitee");
+        inviteejidElement.setText(invitee.toBareJID());
+        Element roomjidElement = cmd.addElement("room");
         roomjidElement.setText(room.getJID().toBareJID());
+        Element messageElement = cmd.addElement("reason");
+        messageElement.setText(reason);
 
         IQ result = ClearspaceManager.getInstance().query(query, 15000);
         if (null != result) {

src/java/org/jivesoftware/openfire/muc/MUCEventDelegate.java

@@ -39,9 +39,11 @@ public abstract class MUCEventDelegate {
      *
      * @param room the MUC room.
      * @param inviteeJID the JID of the user the invitation will be sent to.
+     * @param inviterJID the JID of the user that is sending the invitation
+     * @param inviteMessage the (optional) message that is sent explaining the invitation
      * @return true if the user is allowed to join the room.
      */
-    public abstract InvitationResult sendingInvitation(MUCRoom room, JID inviteeJID);
+    public abstract InvitationResult sendingInvitation(MUCRoom room, JID inviteeJID, JID inviterJID, String inviteMessage);
 
     /**
      * Returns a map containing room configuration variables and values.

src/java/org/jivesoftware/openfire/muc/spi/LocalMUCRoom.java

@@ -1633,7 +1633,7 @@ public class LocalMUCRoom implements MUCRoom {
             message.setTo(to);
 
             if (((MultiUserChatServiceImpl)mucService).getMUCDelegate() != null) {
-                switch(((MultiUserChatServiceImpl)mucService).getMUCDelegate().sendingInvitation(this, to)) {
+                switch(((MultiUserChatServiceImpl)mucService).getMUCDelegate().sendingInvitation(this, to, role.getRoleAddress(), reason)) {
                     case HANDLED_BY_DELEGATE:
                         //if the delegate is taking care of it, there's nothing for us to do
                         return;

src/web/muc-room-affiliations.jsp

@@ -22,6 +22,7 @@
 <%@ page import="java.util.Collections" %>
 <%@ page import="java.util.HashMap" %>
 <%@ page import="java.util.Map" %>
+<%@ page import="org.jivesoftware.openfire.muc.CannotBeInvitedException" %>
 
 <%@ taglib uri="http://java.sun.com/jstl/core_rt" prefix="c"%>
 <%@ taglib uri="http://java.sun.com/jstl/fmt_rt" prefix="fmt" %>
@@ -91,6 +92,9 @@
             catch (NotAllowedException e) {
                 errors.put("NotAllowedException","NotAllowedException");
             }
+            catch (CannotBeInvitedException e) {
+                errors.put("CannotBeInvitedException", "CannotBeInvitedExcpetion");
+            }
         }
     }
 
@@ -111,6 +115,9 @@
         catch (ConflictException e) {
             errors.put("ConflictException","ConflictException");
         }
+        catch (CannotBeInvitedException e) {
+                errors.put("CannotBeInvitedException", "CannotBeInvitedExcpetion");
+        }
     }
 %>