25
1
mirror of https://github.com/processone/ejabberd.git synced 2024-12-22 17:28:25 +01:00

* src/mod_privacy_odbc.erl: Support for privacy lists in MySQL (thanks to Igor Goryachev)(EJAB-538)

SVN Revision: 1409
This commit is contained in:
Jérôme Sautret 2008-07-03 16:09:45 +00:00
parent 35d25d3420
commit d5e2002ffa
2 changed files with 27 additions and 25 deletions

View File

@ -1,3 +1,8 @@
2008-07-03 Jérôme Sautret <jerome.sautret@process-one.net>
* src/mod_privacy_odbc.erl: Support for privacy lists in MySQL
(thanks to Igor Goryachev)(EJAB-538)
2008-07-03 Christophe Romain <christophe.romain@process-one.net>
* src/mod_pubsub/mod_pubsub.erl: Fix permission control on item

View File

@ -698,11 +698,11 @@ raw_to_item({SType, SValue, SAction, SOrder, SMatchAll, SMatchIQ,
"d" -> deny
end,
Order = list_to_integer(SOrder),
MatchAll = SMatchAll == "t",
MatchIQ = SMatchIQ == "t",
MatchMessage = SMatchMessage == "t",
MatchPresenceIn = SMatchPresenceIn == "t",
MatchPresenceOut = SMatchPresenceOut == "t",
MatchAll = SMatchAll == "1" orelse SMatchAll == "t",
MatchIQ = SMatchIQ == "1" orelse SMatchIQ == "t" ,
MatchMessage = SMatchMessage == "1" orelse SMatchMessage == "t",
MatchPresenceIn = SMatchPresenceIn == "1" orelse SMatchPresenceIn == "t",
MatchPresenceOut = SMatchPresenceOut == "1" orelse SMatchPresenceOut == "t",
#listitem{type = Type,
value = Value,
action = Action,
@ -750,11 +750,11 @@ item_to_raw(#listitem{type = Type,
deny -> "d"
end,
SOrder = integer_to_list(Order),
SMatchAll = if MatchAll -> "t"; true -> "f" end,
SMatchIQ = if MatchIQ -> "t"; true -> "f" end,
SMatchMessage = if MatchMessage -> "t"; true -> "f" end,
SMatchPresenceIn = if MatchPresenceIn -> "t"; true -> "f" end,
SMatchPresenceOut = if MatchPresenceOut -> "t"; true -> "f" end,
SMatchAll = if MatchAll -> "1"; true -> "0" end,
SMatchIQ = if MatchIQ -> "1"; true -> "0" end,
SMatchMessage = if MatchMessage -> "1"; true -> "0" end,
SMatchPresenceIn = if MatchPresenceIn -> "1"; true -> "0" end,
SMatchPresenceOut = if MatchPresenceOut -> "1"; true -> "0" end,
["'", SType, "', "
"'", SValue, "', "
"'", SAction, "', "
@ -871,6 +871,3 @@ sql_set_privacy_list(ID, RItems) ->
") "
"values ('", ID, "', ", Items, ");"])
end, RItems).