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

exmpp fixes in c2s, piefxis and mod_vcard_ldap (thanks to Karim Gemayel)

Browse Source 
SVN Revision: 2930
This commit is contained in:
Badlop 2010-01-27 18:53:33 +00:00
parent e98df7acb1
commit 4caac4a322
3 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/ejabberd_c2s.erl
View File

@ -142,8 +142,9 @@
-define(INVALID_FROM, exmpp_stream:error('invalid-from')). -define(INVALID_FROM, exmpp_stream:error('invalid-from')).
-define(STANZA_ERROR(NS, Condition), -define(STANZA_ERROR(NS, Condition),
exmpp_xml:xmlel_to_xmlelement(exmpp_stanza:error(NS, Condition), % exmpp_xml:xmlel_to_xmlelement(exmpp_stanza:error(NS, Condition),
[?NS_JABBER_CLIENT], [{?NS_XMPP, "stream"}])). % [?NS_JABBER_CLIENT], [{?NS_XMPP, "stream"}])).
exmpp_stanza:error(NS, Condition)).
-define(ERR_FEATURE_NOT_IMPLEMENTED(NS), -define(ERR_FEATURE_NOT_IMPLEMENTED(NS),
?STANZA_ERROR(NS, 'feature-not-implemented')). ?STANZA_ERROR(NS, 'feature-not-implemented')).

4
src/ejabberd_piefxis.erl
View File

@ -496,7 +496,9 @@ extract_user_info(offline, Username, Host) ->
case Els of case Els of
[] -> ""; [] -> "";
Els -> Els ->
OfEl = {xmlelement, "offline-messages", [], Els}, OfEl = #xmlel{name = 'offline-messages',
children = Els},
%OfEl = {xmlelement, "offline-messages", [], Els},
exmpp_xml:document_to_list(OfEl) exmpp_xml:document_to_list(OfEl)
end; end;
{ok, mod_offline_odbc} -> {ok, mod_offline_odbc} ->

3
src/mod_vcard_ldap.erl
View File

@ -634,7 +634,8 @@ process_pattern(Str, {User, Domain}, AttrValues) ->
[{"%u", User},{"%d", Domain}] ++ [{"%u", User},{"%d", Domain}] ++
[{"%s", V, 1} || V <- AttrValues]). [{"%s", V, 1} || V <- AttrValues]).
find_xdata_el({xmlelement, _Name, _Attrs, SubEls}) -> find_xdata_el(#xmlel{children = SubEls}) ->
%find_xdata_el({xmlelement, _Name, _Attrs, SubEls}) ->
find_xdata_el1(SubEls). find_xdata_el1(SubEls).
find_xdata_el1([]) -> find_xdata_el1([]) ->