mirror of
https://github.com/processone/ejabberd.git
synced 2024-06-14 22:00:16 +02:00
Update coming from trunk (SVN #604):
* src/ejd2odbc.erl: Updated SVN Revision: 613
This commit is contained in:
parent
0b660a42f4
commit
ec668cd85a
|
@ -1,5 +1,7 @@
|
||||||
2006-09-10 Alexey Shchepin <alexey@sevcom.net>
|
2006-09-10 Alexey Shchepin <alexey@sevcom.net>
|
||||||
|
|
||||||
|
* src/ejd2odbc.erl: Updated
|
||||||
|
|
||||||
* src/mod_muc/mod_muc_log.erl: Fixed html special characters
|
* src/mod_muc/mod_muc_log.erl: Fixed html special characters
|
||||||
escaping, added new image buttons, chatroom titles now point to
|
escaping, added new image buttons, chatroom titles now point to
|
||||||
xmpp: URIs (thanks to Badlop)
|
xmpp: URIs (thanks to Badlop)
|
||||||
|
|
|
@ -74,7 +74,7 @@ export_roster(Server, Output) ->
|
||||||
" and jid='", SJID, "';"
|
" and jid='", SJID, "';"
|
||||||
"insert into rosterusers("
|
"insert into rosterusers("
|
||||||
" username, jid, nick, "
|
" username, jid, nick, "
|
||||||
" subscription, ask, "
|
" subscription, ask, askmessage, "
|
||||||
" server, subscribe, type) "
|
" server, subscribe, type) "
|
||||||
" values ", ItemVals, ";"
|
" values ", ItemVals, ";"
|
||||||
"delete from rostergroups "
|
"delete from rostergroups "
|
||||||
|
@ -271,7 +271,8 @@ output(LServer, IO, SQL) ->
|
||||||
record_to_string(#roster{usj = {User, Server, JID},
|
record_to_string(#roster{usj = {User, Server, JID},
|
||||||
name = Name,
|
name = Name,
|
||||||
subscription = Subscription,
|
subscription = Subscription,
|
||||||
ask = Ask}) ->
|
ask = Ask,
|
||||||
|
askmessage = AskMessage}) ->
|
||||||
Username = ejabberd_odbc:escape(User),
|
Username = ejabberd_odbc:escape(User),
|
||||||
SJID = ejabberd_odbc:escape(jlib:jid_to_string(JID)),
|
SJID = ejabberd_odbc:escape(jlib:jid_to_string(JID)),
|
||||||
Nick = ejabberd_odbc:escape(Name),
|
Nick = ejabberd_odbc:escape(Name),
|
||||||
|
@ -295,6 +296,7 @@ record_to_string(#roster{usj = {User, Server, JID},
|
||||||
"'", Nick, "',"
|
"'", Nick, "',"
|
||||||
"'", SSubscription, "',"
|
"'", SSubscription, "',"
|
||||||
"'", SAsk, "',"
|
"'", SAsk, "',"
|
||||||
|
"'", AskMessage, "',"
|
||||||
"'N', '', 'item')"].
|
"'N', '', 'item')"].
|
||||||
|
|
||||||
groups_to_string(#roster{usj = {User, Server, JID},
|
groups_to_string(#roster{usj = {User, Server, JID},
|
||||||
|
|
Loading…
Reference in New Issue
Block a user