* src/mod_stats.erl: Updated

* src/web/ejabberd_web_admin.erl: Likewise

SVN Revision: 767
This commit is contained in:
Alexey Shchepin 2007-05-12 18:14:21 +00:00
parent 8aab10d28c
commit a087c00a92
3 changed files with 7 additions and 5 deletions

View File

@ -6,6 +6,8 @@
* src/odbc/odbc_queries.erl: Added users_number/1 function * src/odbc/odbc_queries.erl: Added users_number/1 function
* src/ejabberd.cfg.example: Added an example for * src/ejabberd.cfg.example: Added an example for
pgsql_users_number_estimate option pgsql_users_number_estimate option
* src/mod_stats.erl: Updated
* src/web/ejabberd_web_admin.erl: Likewise
* src/ejabberd_auth_anonymous.erl: Added anonymous_purge_hook * src/ejabberd_auth_anonymous.erl: Added anonymous_purge_hook
(thanks to Christophe Romain and Mickael Remond) (thanks to Christophe Romain and Mickael Remond)

View File

@ -129,11 +129,11 @@ get_local_stat(Server, [], Name) when Name == "users/online" ->
get_local_stat(Server, [], Name) when Name == "users/total" -> get_local_stat(Server, [], Name) when Name == "users/total" ->
LServer = jlib:nameprep(Server), LServer = jlib:nameprep(Server),
case catch ejabberd_auth:get_vh_registered_users(Server) of case catch ejabberd_auth:get_vh_registered_users_number(Server) of
{'EXIT', Reason} -> {'EXIT', Reason} ->
?STATERR("500", "Internal Server Error"); ?STATERR("500", "Internal Server Error");
Users -> NUsers ->
?STATVAL(integer_to_list(length(Users)), "users") ?STATVAL(integer_to_list(NUsers), "users")
end; end;
get_local_stat(_Server, [], Name) when Name == "users/all-hosts/online" -> get_local_stat(_Server, [], Name) when Name == "users/all-hosts/online" ->

View File

@ -1289,7 +1289,7 @@ list_vhosts(Lang) ->
OnlineUsers = OnlineUsers =
length(ejabberd_sm:get_vh_session_list(Host)), length(ejabberd_sm:get_vh_session_list(Host)),
RegisteredUsers = RegisteredUsers =
length(ejabberd_auth:get_vh_registered_users(Host)), ejabberd_auth:get_vh_registered_users_number(Host),
?XE("tr", ?XE("tr",
[?XE("td", [?AC("../server/" ++ Host ++ "/", Host)]), [?XE("td", [?AC("../server/" ++ Host ++ "/", Host)]),
?XC("td", integer_to_list(RegisteredUsers)), ?XC("td", integer_to_list(RegisteredUsers)),
@ -1461,7 +1461,7 @@ get_stats(global, Lang) ->
get_stats(Host, Lang) -> get_stats(Host, Lang) ->
OnlineUsers = length(ejabberd_sm:get_vh_session_list(Host)), OnlineUsers = length(ejabberd_sm:get_vh_session_list(Host)),
RegisteredUsers = length(ejabberd_auth:get_vh_registered_users(Host)), RegisteredUsers = ejabberd_auth:get_vh_registered_users_number(Host),
[?XAE("table", [], [?XAE("table", [],
[?XE("tbody", [?XE("tbody",
[?XE("tr", [?XCT("td", "Registered Users:"), [?XE("tr", [?XCT("td", "Registered Users:"),