Show Last Activity menu item in Webadmin only if vhost has mod_last (EJAB-1031)

SVN Revision: 2799

diff --git a/src/web/ejabberd_web_admin.erl b/src/web/ejabberd_web_admin.erl
index ccc38d8795d914e101117ecb96a16886e1373296..b6cb1fb3be4974d590313b012ba56fa47d78a355 100644 (file)
--- a/src/web/ejabberd_web_admin.erl
+++ b/src/web/ejabberd_web_admin.erl
@@ -1597,6 +1597,11 @@ get_lastactivity_module(Server) ->
         _ -> mod_last_odbc
     end.
 
+get_lastactivity_menuitem_list(Server) ->
+    case get_lastactivity_module(Server) of
+        mod_last -> [{"last-activity", "Last Activity"}];
+        mod_last_odbc -> []
+    end.
 
 us_to_list({User, Server}) ->
     jlib:jid_to_string({User, Server, ""}).
@@ -2707,9 +2712,9 @@ make_host_menu(Host, HostNodeMenu, Lang, JID) ->
     HostFixed = [{"acls", "Access Control Lists"},
                 {"access", "Access Rules"},
                 {"users", "Users"},
-                {"online-users", "Online Users"},
-                {"last-activity", "Last Activity"},
-                {"nodes", "Nodes", HostNodeMenu},
+                {"online-users", "Online Users"}]
+               ++ get_lastactivity_menuitem_list(Host) ++
+               [{"nodes", "Nodes", HostNodeMenu},
                 {"stats", "Statistics"}]
        ++ get_menu_items_hook({host, Host}, Lang),
     HostBasePath = url_to_path(HostBase),