* src/web/ejabberd_web_admin.erl: When requesting page of

nonexistent user, show 'Not Found' page (EJAB-771)

SVN Revision: 1644

diff --git a/ChangeLog b/ChangeLog
index e5ba49ceaaedec70d5d0a20dc242fb6232a8d819..53b1fa0771abc9a2e544406186d694e14ed1bd2b 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2008-10-13  Badlop  <badlop@process-one.net>
+
+       * src/web/ejabberd_web_admin.erl: When requesting page of
+       nonexistent user, show 'Not Found' page (EJAB-771)
+
 2008-10-12  Badlop  <badlop@process-one.net>
 
        * src/web/ejabberd_web_admin.erl: Run new hook

diff --git a/src/web/ejabberd_web_admin.erl b/src/web/ejabberd_web_admin.erl
index 8a24e5f7d508e5a106c9df5bb2386ea17ff1bd6d..c7da8cf6958bc376839bb1cebf62c919ab1e44f6 100644 (file)
--- a/src/web/ejabberd_web_admin.erl
+++ b/src/web/ejabberd_web_admin.erl
@@ -908,8 +908,13 @@ process_admin(Host,
              #request{path = ["user", U],
                       q = Query,
                       lang = Lang}) ->
-    Res = user_info(U, Host, Query, Lang),
-    make_xhtml(Res, Host, Lang);
+    case ejabberd_auth:is_user_exists(U, Host) of
+       true ->
+           Res = user_info(U, Host, Query, Lang),
+           make_xhtml(Res, Host, Lang);
+       false ->
+           make_xhtml([?XCT("h1", "Not Found")], Host, Lang)
+    end;
 
 process_admin(Host,
              #request{path = ["nodes"],