Merge pull request #749 from surevine/OF-1288

OF-1288 Add missing attributes

src/plugins/monitoring/changelog.html

@@ -43,6 +43,11 @@
 <h1>
 Monitoring Plugin Changelog
 </h1>
+<p><b>1.5.6</b> -- February 16, 2016</p>
+<ul>
+    <li>[<a href='https://igniterealtime.org/issues/browse/OF-1288'>OF-1288</a>] - Add missing queryid and id attributes</li>
+</ul>
+
 <p><b>1.5.5</b> -- December 19, 2016</p>
 <ul>
     <li>[<a href='https://igniterealtime.org/issues/browse/OF-1246'>OF-1246</a>] - Support MAM (XEP-0313) for MUC (XEP-0045)</li>

src/plugins/monitoring/plugin.xml

@@ -5,8 +5,8 @@
     <name>Monitoring Service</name>
     <description>Monitors conversations and statistics of the server.</description>
     <author>IgniteRealtime // Jive Software</author>
-    <version>1.5.5</version>
-    <date>4/27/2016</date>
+    <version>1.5.6</version>
+    <date>2/16/2017</date>
     <minServerVersion>4.0.99</minServerVersion><!-- Allows the beta 4.1.0 -->
     <databaseKey>monitoring</databaseKey>
     <databaseVersion>4</databaseVersion>

src/plugins/monitoring/src/java/com/reucon/openfire/plugin/archive/xep/AbstractXepSupport.java

@@ -78,6 +78,7 @@ public abstract class AbstractXepSupport {
 				MultiUserChatManager manager = server.getMultiUserChatManager();
 				for (MultiUserChatService mucService : manager.getMultiUserChatServices()) {
 					mucService.addIQHandler(iqHandler);
+					mucService.addExtraFeature(namespace);
 				}
 			}
 		}
@@ -110,6 +111,7 @@ public abstract class AbstractXepSupport {
 				MultiUserChatManager manager = server.getMultiUserChatManager();
 				for (MultiUserChatService mucService : manager.getMultiUserChatServices()) {
 					mucService.removeIQHandler(iqHandler);
+					mucService.removeExtraFeature(namespace);
 				}
 			}
 		}

src/plugins/monitoring/src/java/com/reucon/openfire/plugin/archive/xep0313/Result.java

@@ -11,6 +11,8 @@ import java.util.Date;
 public final class Result extends PacketExtension {
     public Result(Forwarded forwarded, String xmlns, String queryId, String id) {
         super("result", xmlns);
+        element.addAttribute("queryid", queryId);
+        element.addAttribute("id", id);
         element.add(forwarded.getElement());
     }
 }