diff --git a/ChangeLog b/ChangeLog index eef5e0557..a42f782fe 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,7 @@ 2006-09-10 Alexey Shchepin + * src/ejd2odbc.erl: Updated + * src/mod_muc/mod_muc_log.erl: Fixed html special characters escaping, added new image buttons, chatroom titles now point to xmpp: URIs (thanks to Badlop) diff --git a/src/ejd2odbc.erl b/src/ejd2odbc.erl index a03af9d33..8a7f6ada0 100644 --- a/src/ejd2odbc.erl +++ b/src/ejd2odbc.erl @@ -74,7 +74,7 @@ export_roster(Server, Output) -> " and jid='", SJID, "';" "insert into rosterusers(" " username, jid, nick, " - " subscription, ask, " + " subscription, ask, askmessage, " " server, subscribe, type) " " values ", ItemVals, ";" "delete from rostergroups " @@ -271,7 +271,8 @@ output(LServer, IO, SQL) -> record_to_string(#roster{usj = {User, Server, JID}, name = Name, subscription = Subscription, - ask = Ask}) -> + ask = Ask, + askmessage = AskMessage}) -> Username = ejabberd_odbc:escape(User), SJID = ejabberd_odbc:escape(jlib:jid_to_string(JID)), Nick = ejabberd_odbc:escape(Name), @@ -295,6 +296,7 @@ record_to_string(#roster{usj = {User, Server, JID}, "'", Nick, "'," "'", SSubscription, "'," "'", SAsk, "'," + "'", AskMessage, "'," "'N', '', 'item')"]. groups_to_string(#roster{usj = {User, Server, JID},