From 394245620e0097161da5e1321892f3b9afd410ea Mon Sep 17 00:00:00 2001
From: Badlop <badlop@process-one.net>
Date: Fri, 26 Dec 2008 12:44:54 +0000
Subject: [PATCH] * src/web/ejabberd_web_admin.erl: Show in ejabberd Web Admin
 the connection method and connected node of Jabber clients (thanks to Oleg
 Palij)(EJAB-319)

SVN Revision: 1757
---
 ChangeLog                      |  4 ++++
 src/web/ejabberd_web_admin.erl | 15 ++++++++++++---
 2 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index fe1367479..d60614fea 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2008-12-26  Badlop  <badlop@process-one.net>
 
+	* src/web/ejabberd_web_admin.erl: Show in ejabberd Web Admin the
+	connection method and connected node of Jabber clients (thanks to
+	Oleg Palij)(EJAB-319)
+
 	* src/ejabberd_config.erl: Option outgoing_s2s_options to define
 	s2s outgoing behaviour: IPv4, IPv6 and timeout (thanks to Stephan
 	Maka)(EJAB-665)
diff --git a/src/web/ejabberd_web_admin.erl b/src/web/ejabberd_web_admin.erl
index c7da8cf69..8f15fd718 100644
--- a/src/web/ejabberd_web_admin.erl
+++ b/src/web/ejabberd_web_admin.erl
@@ -1442,15 +1442,24 @@ user_info(User, Server, Query, Lang) ->
 	    _ ->
 		[?XE("ul",
 		     lists:map(fun(R) ->
-				       FIP = case ejabberd_sm:get_user_ip(
+				       FIP = case ejabberd_sm:get_user_info(
 						    User, Server, R) of
-						 undefined ->
+						 offline ->
 						     "";
-						 {IP, Port} ->
+						 [{node, Node}, {conn, Conn}, {ip, {IP, Port}}] ->
+						     ConnS = case Conn of
+								 c2s -> "plain";
+								 c2s_tls -> "tls";
+								 c2s_compressed -> "zlib";
+								 http_bind -> "http-bind";
+								 http_poll -> "http-poll"
+							     end,
 						     " (" ++
+						         ConnS ++ "://" ++
 							 inet_parse:ntoa(IP) ++
 							 ":" ++
 							 integer_to_list(Port)
+						         ++ "#" ++ atom_to_list(Node)
 							 ++ ")"
 					     end,
 				       ?LI([?C(R ++ FIP)])