From: Badlop <badlop@process-one.net>
Date: Tue, 19 Jul 2011 10:23:05 +0000 (+0200)
Subject: Fix Host usage when running webadmin_page_* (thanks to Shaun Kruger)
X-Git-Tag: v3.0.0-alpha-4~51
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=82551036c2ba4ca0bbaa536122a3c4fffb9d3cfe;p=ejabberd

Fix Host usage when running webadmin_page_* (thanks to Shaun Kruger)
---

diff --git a/src/web/ejabberd_web_admin.erl b/src/web/ejabberd_web_admin.erl
index ab394f660..14d8be6bd 100644
--- a/src/web/ejabberd_web_admin.erl
+++ b/src/web/ejabberd_web_admin.erl
@@ -1177,11 +1177,12 @@ process_admin(Host,
 process_admin(Host, #request{lang = Lang, 
 		       auth = {_, _Auth, AJID}
 		    } = Request) ->
-    {Hook, Opts} = case Host of
-		       global -> {webadmin_page_main, [Request]};
-		       Host -> {webadmin_page_host, [Host, Request]}
-		   end,
-    case ejabberd_hooks:run_fold(Hook, list_to_binary(Host), [], Opts) of
+    {Hook, Opts, HostB} =
+	case Host of
+	    global -> {webadmin_page_main, [Request], global};
+	    Host -> {webadmin_page_host, [Host, Request], list_to_binary(Host)}
+	end,
+    case ejabberd_hooks:run_fold(Hook, HostB, [], Opts) of
 	[] ->
 	    setelement(1, make_xhtml([?XC('h1', "Not Found")], Host, Lang, AJID), 404);
 	[{xmlel, _, _, _, _, _} | _] = Res ->