fixes igniterealtime#240: Remove scriptaculous

In Openfire 4.8.0, the Scriptaculous javascript library is removed. This plugin should no longer use it.

This commit replaces scriptaculous functionality with javascript-native functionality. There is a minor reduction in visual effects as a result.

Author: guusdk

changelog.html

@@ -48,6 +48,7 @@ <h1>
 <ul>
     <li>[<a href='https://github.com/igniterealtime/openfire-monitoring-plugin/issues/232'>Issue #232</a>] - Fix SQL issue when retrieving archived messages from MSSQL</li>
     <li>[<a href='https://github.com/igniterealtime/openfire-monitoring-plugin/issues/235'>Issue #235</a>] - Plugin compatible with Openfire 4.8.0</li>
+    <li>[<a href='https://github.com/igniterealtime/openfire-monitoring-plugin/issues/240'>Issue #240</a>] - Stop using javascript libraries that are removed from Openfire 4.8</li>
     <li>[<a href='https://github.com/igniterealtime/openfire-monitoring-plugin/issues/242'>Issue #242</a>] - Fix 'Unable to save XML properties' error</li>
 </ul>
 

src/java/org/jivesoftware/openfire/archive/ConversationUtils.java

@@ -119,15 +119,12 @@ public ConversationInfo getConversationInfo(long conversationID, boolean formatP
      * @return a Map of ConversationInfo objects.
      */
     public Map<String, ConversationInfo> getConversations(boolean formatParticipants) {
-        Map<String, ConversationInfo> cons = new HashMap<String, ConversationInfo>();
+        Map<String, ConversationInfo> cons = new HashMap<>();
         MonitoringPlugin plugin = (MonitoringPlugin)XMPPServer.getInstance().getPluginManager()
-            .getPluginByName(MonitoringConstants.NAME).get();
+            .getPluginByName(MonitoringConstants.PLUGIN_NAME).get();
         ConversationManager conversationManager = plugin.getConversationManager();
         Collection<Conversation> conversations = conversationManager.getConversations();
-        List<Conversation> lConversations =
-            Arrays.asList(conversations.toArray(new Conversation[conversations.size()]));
-        for (Iterator<Conversation> i = lConversations.iterator(); i.hasNext();) {
-            Conversation con = i.next();
+        for (Conversation con : conversations) {
             ConversationInfo info = toConversationInfo(conversationManager, con, formatParticipants);
             cons.put(Long.toString(con.getConversationID()), info);
         }

src/java/org/jivesoftware/openfire/plugin/service/MonitoringAPI.java

@@ -19,14 +19,6 @@ public class MonitoringAPI {
 
     private ConversationUtils conversationUtils = new ConversationUtils();
 
-    @GET
-    @Path("/stats/latest")
-    public Response getLatest(@QueryParam("count") int count, 
-            @QueryParam("mostRecentConversationID") long mostRecentConversationID) {
-        return Response.ok(statsAction.getNLatestConversations(
-                count, mostRecentConversationID)).build();
-    }
-
     @GET
     @Path("/stats/updated")
     public Response getUpdated(@QueryParam("timePeriod") String timePeriod) {

src/java/org/jivesoftware/openfire/reporting/stats/StatsAction.java

@@ -97,68 +97,6 @@ private Map getUpdatedStat(String statkey, long[] timePeriod) {
         return stat;
     }
 
-
-    /**
-     * Retrieves the last n conversations from the system that were created after
-     * the given conversationID.
-     *
-     * @param count the count of conversations to return.
-     * @param mostRecentConversationID the last conversationID that has been retrieved.
-     * @return a List of Map objects.
-     */
-    public List<Map<String, Long>> getNLatestConversations(int count, long mostRecentConversationID) {
-        // TODO Fix plugin name 2 lines below and missing classes
-        List<Map<String, Long>> cons = new ArrayList<Map<String, Long>>();
-        MonitoringPlugin plugin = (MonitoringPlugin)XMPPServer.getInstance().getPluginManager().getPluginByName(MonitoringConstants.PLUGIN_NAME).get();
-        ConversationManager conversationManager = plugin.getConversationManager();
-        Collection<Conversation> conversations = conversationManager.getConversations();
-        List<Conversation> lConversations = Arrays.asList(conversations.toArray(new Conversation[conversations.size()]));
-        Collections.sort(lConversations, conversationComparator);
-        int counter = 0;
-        for (Iterator<Conversation> i = lConversations.iterator(); i.hasNext() && counter < count;) {
-            Conversation con = i.next();
-            if (mostRecentConversationID == con.getConversationID()) {
-                break;
-            } else {
-                Map mCon = new HashMap();
-                mCon.put("conversationid", con.getConversationID());
-                String[] users;
-                int usersIdx = 0;
-                if (con.getRoom() == null) {
-                    users = new String[con.getParticipants().size()];
-                    for (JID jid : con.getParticipants()) {
-                        String identifier = jid.toBareJID();
-                        try {
-                            identifier = UserNameManager.getUserName(jid, jid.toBareJID());
-                        }
-                        catch (UserNotFoundException e) {
-                            // Ignore
-                        }
-                        users[usersIdx++] = StringUtils.abbreviate(identifier, 20);
-                    }
-                }
-                else {
-                    users = new String[2];
-                    users[0] = LocaleUtils.getLocalizedString("dashboard.group_conversation", MonitoringConstants.NAME);
-                    try {
-                        users[1] = "(<i>" + LocaleUtils.getLocalizedString("muc.room.summary.room") +
-                                ": <a href='../../muc-room-occupants.jsp?roomName=" +
-                                URLEncoder.encode(con.getRoom().getNode(), "UTF-8") + "'>" + con.getRoom().getNode() +
-                                "</a></i>)";
-                    } catch (UnsupportedEncodingException e) {
-                        Log.error(e.getMessage(), e);
-                    }
-                }
-                mCon.put("users", users);
-                mCon.put("lastactivity", formatTimeLong(con.getLastActivity()));
-                mCon.put("messages", con.getMessageCount());
-                cons.add(0, mCon);
-                counter++;
-            }
-        }
-        return cons;
-    }
-
     /**
      * Given a statistic key and a start date, end date and number of datapoints, returns
      * a String[] containing the low and high values (in that order) for the given time period.

src/web/archive-conversation-participants.jsp

@@ -5,7 +5,6 @@
 <%@ page import="org.jivesoftware.openfire.archive.ConversationParticipation" %>
 <%@ page import="org.jivesoftware.openfire.XMPPServer" %>
 <%@ page import="org.jivesoftware.openfire.user.UserManager" %>
-<%@ page import="org.jivesoftware.util.Log" %>
 <%@ page import="org.jivesoftware.util.NotFoundException" %>
 <%@ page import="org.jivesoftware.util.ParamUtils" %>
 <%@ page import="org.jivesoftware.util.StringUtils" %>
@@ -30,22 +29,18 @@
     MonitoringPlugin plugin = (MonitoringPlugin) server.getPluginManager().getPluginByName(MonitoringConstants.PLUGIN_NAME).get();
 
     ConversationManager conversationmanager = plugin.getConversationManager();
-    List<String[]> values = new ArrayList<String[]>();
-    JID room = null;
+    List<String[]> values = new ArrayList<>();
+    JID room;
     String roomName = "";
     try {
         Conversation conversation = conversationmanager.getConversation(conversationID);
-        List<JID> participants = new ArrayList<JID>(conversation.getParticipants());
+        List<JID> participants = new ArrayList<>(conversation.getParticipants());
         for (JID user : participants) {
             for (ConversationParticipation participation : conversation.getParticipations(user)) {
                 values.add(new String[]{participation.getNickname(), user.toString()});
             }
         }
-        Collections.sort(values, new Comparator<String[]>() {
-            public int compare(String[] o1, String[] o2) {
-                return o1[0].compareTo(o2[0]);
-            }
-        });
+        values.sort(Comparator.comparing(o -> o[0]));
         room = conversation.getRoom();
         if (room != null) {
             roomName = room.getNode();
@@ -62,11 +57,9 @@
 <html>
 <head>
 <meta name="decorator" content="none"/>
-</head>
-<body>
-<script type="text/javascript" language="javascript" src="scripts/tooltips/domTT.js"></script>
-<script type="text/javascript" language="javascript" src="scripts/tooltips/domLib.js"></script>
-<style type="text/css">
+<script type="text/javascript" src="scripts/tooltips/domTT.js"></script>
+<script type="text/javascript" src="scripts/tooltips/domLib.js"></script>
+<style>
 .jive-testPanel {
     display: block;
     position: relative;
@@ -123,6 +116,8 @@
     color: #890000;
     }
 </style>
+</head>
+<body>
 
 <!-- BEGIN connection settings test panel -->
 <div class="jive-testPanel">
@@ -176,8 +171,8 @@
                 int from = (curPage-1) * range;
                 int to = curPage * range;
                 // Check ranges
-                from = from > values.size() ? values.size() : from;
-                to = to > values.size() ? values.size() : to;
+                from = Math.min(from, values.size());
+                to = Math.min(to, values.size());
                 // Get subset of participants to display 
                 values = values.subList(from, to);
                 for (Iterator<String[]> it = values.iterator(); it.hasNext();) {