diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/mod_version.erl | 50 |
1 files changed, 27 insertions, 23 deletions
diff --git a/src/mod_version.erl b/src/mod_version.erl index c62e27a0d..236f2de7f 100644 --- a/src/mod_version.erl +++ b/src/mod_version.erl @@ -1,14 +1,12 @@ %%%---------------------------------------------------------------------- %%% File : mod_version.erl %%% Author : Alexey Shchepin <alexey@sevcom.net> -%%% Purpose : +%%% Purpose : XEP-0092: Software Version %%% Created : 18 Jan 2003 by Alexey Shchepin <alexey@sevcom.net> -%%% Id : $Id$ %%%---------------------------------------------------------------------- -module(mod_version). -author('alexey@sevcom.net'). --vsn('$Revision$ '). -behaviour(gen_mod). @@ -36,32 +34,38 @@ process_local_iq(From, To, #iq{id = ID, type = Type, set -> IQ#iq{type = error, sub_el = [SubEl, ?ERR_NOT_ALLOWED]}; get -> - OSType = case os:type() of - {Osfamily, Osname} -> - atom_to_list(Osfamily) ++ "/" ++ - atom_to_list(Osname); - Osfamily -> - atom_to_list(Osfamily) - end, - OSVersion = case os:version() of - {Major, Minor, Release} -> - lists:flatten( - io_lib:format("~w.~w.~w", - [Major, Minor, Release])); - VersionString -> - VersionString - end, - OS = OSType ++ " " ++ OSVersion, + Host = To#jid.server, + OS = case gen_mod:get_module_opt(Host, ?MODULE, show_os, true) of + true -> [get_os()]; + false -> [] + end, IQ#iq{type = result, sub_el = [{xmlelement, "query", [{"xmlns", ?NS_VERSION}], [{xmlelement, "name", [], [{xmlcdata, "ejabberd"}]}, {xmlelement, "version", [], - [{xmlcdata, ?VERSION}]}, - {xmlelement, "os", [], - [{xmlcdata, OS}]} - ]}]} + [{xmlcdata, ?VERSION}]} + ] ++ OS + }]} end. +get_os() -> + OSType = case os:type() of + {Osfamily, Osname} -> + atom_to_list(Osfamily) ++ "/" ++ + atom_to_list(Osname); + Osfamily -> + atom_to_list(Osfamily) + end, + OSVersion = case os:version() of + {Major, Minor, Release} -> + lists:flatten( + io_lib:format("~w.~w.~w", + [Major, Minor, Release])); + VersionString -> + VersionString + end, + OS = OSType ++ " " ++ OSVersion, + {xmlelement, "os", [], [{xmlcdata, OS}]}. |