Invite fixes for http://jira.jiveland.com/browse/CS-4034, reviewed by Armando.

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

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

@@ -51,7 +51,7 @@ public class ClearspaceMUCEventDelegate extends MUCEventDelegate {
 
         IQ query = new IQ();
         query.setFrom(csMucDomain);
-        Element cmd = query.setChildElement("room-invite", "http://jivesoftware.com/clearspace");
+        Element cmd = query.setChildElement("invite-check", "http://jivesoftware.com/clearspace");
         Element inviterjidElement = cmd.addElement("inviter");
         inviterjidElement.setText(inviter.toBareJID());
         Element inviteejidElement = cmd.addElement("invitee");

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

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