From 9c2f0681f05b318cd3fc0758dee2719be34bea07 Mon Sep 17 00:00:00 2001 From: Badlop Date: Thu, 21 Jul 2011 13:36:16 +0200 Subject: [PATCH] More fix Host usage when running webadmin_page_* --- src/web/ejabberd_web_admin.erl | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/src/web/ejabberd_web_admin.erl b/src/web/ejabberd_web_admin.erl index 14d8be6bd..7ad2ed8ed 100644 --- a/src/web/ejabberd_web_admin.erl +++ b/src/web/ejabberd_web_admin.erl @@ -2451,7 +2451,7 @@ get_node(global, Node, ["pid"], _Query, Lang) -> ProcessesList = lists:map( fun(P) -> PS = pid_to_list(P), - NodePidS = NodeS ++ "/pid/" ++ PS, + NodePidS = NodeS ++ "/pid/process/" ++ PS, ?AC("/admin/node/" ++ NodePidS ++ "/", PS) end, Processes), @@ -2684,11 +2684,12 @@ get_node(global, Node, ["update"], Query, Lang) -> ]; get_node(Host, Node, NPath, Query, Lang) -> - {Hook, Opts} = case Host of - global -> {webadmin_page_node, [Node, NPath, Query, Lang]}; - Host -> {webadmin_page_hostnode, [Host, Node, NPath, Query, Lang]} - end, - case ejabberd_hooks:run_fold(Hook, list_to_binary(Host), [], Opts) of + {Hook, Opts, HostB} = + case Host of + global -> {webadmin_page_node, [Node, NPath, Query, Lang], global}; + Host -> {webadmin_page_hostnode, [Host, Node, NPath, Query, Lang], list_to_binary(Host)} + end, + case ejabberd_hooks:run_fold(Hook, HostB, [], Opts) of [] -> [?XC('h1', "Not Found")]; Res -> Res end.