diff options
Diffstat (limited to 'src/web/ejabberd_web_admin.erl')
| -rw-r--r-- | src/web/ejabberd_web_admin.erl | 27 |
1 files changed, 10 insertions, 17 deletions
diff --git a/src/web/ejabberd_web_admin.erl b/src/web/ejabberd_web_admin.erl index 447926e26..59e9b0313 100644 --- a/src/web/ejabberd_web_admin.erl +++ b/src/web/ejabberd_web_admin.erl @@ -1564,7 +1564,6 @@ list_users_in_diapason(Host, Diap, Lang, URLFunc) -> [list_given_users(Host, Sub, "../../", Lang, URLFunc)]. list_given_users(Host, Users, Prefix, Lang, URLFunc) -> - ModLast = get_lastactivity_module(Host), ModOffline = get_offlinemsg_module(Host), ?XE("table", [?XE("thead", @@ -1583,7 +1582,7 @@ list_given_users(Host, Users, Prefix, Lang, URLFunc) -> FLast = case ejabberd_sm:get_user_resources(User, Server) of [] -> - case ModLast:get_last_info(User, Server) of + case mod_last:get_last_info(User, Server) of not_found -> ?T("Never"); {ok, Shift, _Status} -> @@ -1618,22 +1617,17 @@ get_offlinemsg_length(ModOffline, 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; - _ -> mod_last_odbc + case gen_mod:is_loaded(Server, mod_offline) of + true -> + mod_offline; + false -> + none end. get_lastactivity_menuitem_list(Server) -> - case get_lastactivity_module(Server) of - mod_last -> [{"last-activity", "Last Activity"}]; - mod_last_odbc -> [] + case gen_mod:db_type(Server, mod_last) of + mnesia -> [{"last-activity", "Last Activity"}]; + _ -> [] end. us_to_list({User, Server}) -> @@ -1735,10 +1729,9 @@ user_info(User, Server, Query, Lang) -> UserItems = ejabberd_hooks:run_fold(webadmin_user, LServer, [], [User, Server, Lang]), %% Code copied from list_given_users/5: - ModLast = get_lastactivity_module(Server), LastActivity = case ejabberd_sm:get_user_resources(User, Server) of [] -> - case ModLast:get_last_info(User, Server) of + case mod_last:get_last_info(User, Server) of not_found -> ?T("Never"); {ok, Shift, _Status} -> |