Chapril/xmpp.chapril.org-ejabberd
25
1
Fork 0
mirror of https://github.com/processone/ejabberd.git synced 2024-11-24 16:23:40 +01:00
Code Releases Activity

Ensure that returned priority in a number in mod_admin_extra

Browse Source
This commit is contained in:
Paweł Chmielowski 2018-07-13 09:50:38 +02:00
parent 48be8e7b1e
commit e76a57e144
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/mod_admin_extra.erl
View File

@ -1018,7 +1018,7 @@ status_num(Status) ->
status_num(<<"all">>, Status). status_num(<<"all">>, Status).
status_list(Host, Status) -> status_list(Host, Status) ->
Res = get_status_list(Host, Status), Res = get_status_list(Host, Status),
[{U, S, R, P, St} || {U, S, R, P, St} <- Res]. [{U, S, R, num_prio(P), St} || {U, S, R, P, St} <- Res].
status_list(Status) -> status_list(Status) ->
status_list(<<"all">>, Status). status_list(<<"all">>, Status).
@ -1046,7 +1046,7 @@ get_status_list(Host, Status_required) ->
_ -> _ ->
fun(A, B) -> A == B end fun(A, B) -> A == B end
end, end,
[{User, Server, Resource, Priority, stringize(Status_text)} [{User, Server, Resource, num_prio(Priority), stringize(Status_text)}
|| {{User, Resource, Status, Status_text}, Server, Priority} <- Sessions4, || {{User, Resource, Status, Status_text}, Server, Priority} <- Sessions4,
apply(Fstatus, [Status, Status_required])]. apply(Fstatus, [Status, Status_required])].
@ -1127,7 +1127,7 @@ user_session_info(User, Host, Resource) ->
NodeS = atom_to_list(node(Pid)), NodeS = atom_to_list(node(Pid)),
Uptime = CurrentSec - calendar:datetime_to_gregorian_seconds( Uptime = CurrentSec - calendar:datetime_to_gregorian_seconds(
calendar:now_to_local_time(Now)), calendar:now_to_local_time(Now)),
{atom_to_list(Conn), IPS, Port, Priority, NodeS, Uptime, Status, Resource, StatusText}. {atom_to_list(Conn), IPS, Port, num_prio(Priority), NodeS, Uptime, Status, Resource, StatusText}.
%%% %%%
@ -1736,4 +1736,9 @@ is_glob_match(String, <<"!", Glob/binary>>) ->
is_glob_match(String, Glob) -> is_glob_match(String, Glob) ->
is_regexp_match(String, ejabberd_regexp:sh_to_awk(Glob)). is_regexp_match(String, ejabberd_regexp:sh_to_awk(Glob)).
num_prio(Priority) when is_integer(Priority) ->
Priority;
num_prio(_) ->
-1.
mod_options(_) -> []. mod_options(_) -> [].