Chapril/xmpp.chapril.org-ejabberd
25
1
Fork 0
mirror of https://github.com/processone/ejabberd.git synced 2024-11-26 16:26:24 +01:00
Code Releases Activity

o Remove unappropriate comments in get_sm_features/5.

Browse Source 
o  Use the '_s' variants of NS_* macros instead of a call to
atom_to_list/1 in do_route/4.
o  A call to the stringprep module was left in filter_fields/3.

SVN Revision: 1567
This commit is contained in:
Jean-Sébastien Pédron 2008-09-22 11:17:23 +00:00
parent e9d7ac68da
commit 35a7342416
2 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ChangeLog
View File

@ -1,3 +1,11 @@
2008-09-22 Jean-Sébastien Pédron <js.pedron@meetic-corp.com>
* src/mod_vcard.erl (get_sm_features): Remove unappropriate
comments.
(do_route): Use the '_s' variants of NS_* macros instead of a call to
atom_to_list/1.
(filter_fields): A call to the stringprep module was left.
2008-09-18 Jean-Sébastien Pédron <js.pedron@meetic-corp.com> 2008-09-18 Jean-Sébastien Pédron <js.pedron@meetic-corp.com>
* src/mod_roster_odbc.erl: Convert to exmpp. * src/mod_roster_odbc.erl: Convert to exmpp.

8
src/mod_vcard.erl
View File

@ -141,10 +141,8 @@ get_sm_features(Acc, _From, _To, Node, _Lang) ->
[] -> [] ->
case Acc of case Acc of
{result, Features} -> {result, Features} ->
% XXX OLD FORMAT: NS as string.
{result, [?NS_VCARD_s | Features]}; {result, [?NS_VCARD_s | Features]};
empty -> empty ->
% XXX OLD FORMAT: NS as string.
{result, [?NS_VCARD_s]} {result, [?NS_VCARD_s]}
end; end;
_ -> _ ->
@ -372,11 +370,11 @@ do_route(ServerHost, From, To, Packet) ->
#xmlel{ns = ?NS_DISCO_INFO, name = 'feature', #xmlel{ns = ?NS_DISCO_INFO, name = 'feature',
attrs = [ attrs = [
#xmlattr{name = 'var', #xmlattr{name = 'var',
value = atom_to_list(?NS_SEARCH)}]}, value = ?NS_SEARCH_s}]},
#xmlel{ns = ?NS_DISCO_INFO, name = 'feature', #xmlel{ns = ?NS_DISCO_INFO, name = 'feature',
attrs = [ attrs = [
#xmlattr{name = 'var', #xmlattr{name = 'var',
value = atom_to_list(?NS_VCARD)}]} value = ?NS_VCARD_s}]}
]}, ]},
ResIQ = exmpp_iq:result(Packet, Result), ResIQ = exmpp_iq:result(Packet, Result),
ejabberd_router:route(To, ejabberd_router:route(To,
@ -516,7 +514,7 @@ filter_fields([], Match, _LServer) ->
Match; Match;
filter_fields([{SVar, [Val]} | Ds], Match, LServer) filter_fields([{SVar, [Val]} | Ds], Match, LServer)
when is_list(Val) and (Val /= "") -> when is_list(Val) and (Val /= "") ->
LVal = stringprep:tolower(Val), LVal = exmpp_stringprep:to_lower(Val),
NewMatch = case SVar of NewMatch = case SVar of
"user" -> "user" ->
case gen_mod:get_module_opt(LServer, ?MODULE, case gen_mod:get_module_opt(LServer, ?MODULE,