Support in user list page of WebAdmin when mod_offline is disabled (EJAB-377)

SVN Revision: 2877

1 files changed, 16 insertions, 2 deletions

diff --git a/src/web/ejabberd_web_admin.erl b/src/web/ejabberd_web_admin.erl
index 06890f142..a9681e001 100644
--- a/src/web/ejabberd_web_admin.erl
+++ b/src/web/ejabberd_web_admin.erl
@@ -1546,6 +1546,7 @@ list_users_in_diapason(Host, Diap, Lang, URLFunc) ->
 
 list_given_users(Host, Users, Prefix, Lang, URLFunc) ->
     ModLast = get_lastactivity_module(Host),
+    ModOffline = get_offlinemsg_module(Host),
     ?XE("table",
 	[?XE("thead",
 	     [?XE("tr",
@@ -1556,10 +1557,10 @@ list_given_users(Host, Users, Prefix, Lang, URLFunc) ->
 	     lists:map(
 	       fun(_SU = {Server, User}) ->
 		       US = {User, Server},
-		       QueueLen = length(mnesia:dirty_read({offline_msg, US})),
+		       QueueLenStr = get_offlinemsg_length(ModOffline, User, Server),
 		       FQueueLen = [?AC(URLFunc({users_queue, Prefix,
 						 User, Server}),
-					pretty_string_int(QueueLen))],
+					QueueLenStr)],
 		       FLast =
 			   case ejabberd_sm:get_user_resources(User, Server) of
 			       [] ->
@@ -1591,6 +1592,19 @@ list_given_users(Host, Users, Prefix, Lang, URLFunc) ->
 	       end, Users)
 	    )]).
 
+get_offlinemsg_length(ModOffline, User, Server) ->
+    case ModOffline of
+	none -> "disabled";
+	_ -> pretty_string_int(ModOffline:get_queue_length(User, Server))
+    end.
+
+get_offlinemsg_module(Server) ->
+    case [mod_offline, mod_offline_odbc] -- gen_mod:loaded_modules(Server) of
+        [mod_offline, mod_offline_odbc] -> none;
+        [mod_offline_odbc] -> mod_offline;
+        [mod_offline] -> mod_offline_odbc
+    end.
+
 get_lastactivity_module(Server) ->
     case lists:member(mod_last, gen_mod:loaded_modules(Server)) of
         true -> mod_last;