Chapril/xmpp.chapril.org-ejabberd
25
1
Fork 0
mirror of https://github.com/processone/ejabberd.git synced 2024-12-22 17:28:25 +01:00
Code Releases Activity

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

Browse Source 
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
ChangeLog
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> 2008-07-03 Christophe Romain <christophe.romain@process-one.net>
* src/mod_pubsub/mod_pubsub.erl: Fix permission control on item * src/mod_pubsub/mod_pubsub.erl: Fix permission control on item
@ -20,7 +25,7 @@
* src/mod_pubsub/node_zoo.erl: Add node type without * src/mod_pubsub/node_zoo.erl: Add node type without
home/<host>/<user> constraint home/<host>/<user> constraint
* src/ejabberd_local.erl: prevent iq_response table overload * src/ejabberd_local.erl: prevent iq_response table overload
(EJAB-608) (EJAB-608)
* src/mod_caps.erl: Likewise * src/mod_caps.erl: Likewise
@ -147,7 +152,7 @@
2008-05-19 Mickael Remond <mremond@process-one.net> 2008-05-19 Mickael Remond <mremond@process-one.net>
* src/ejabberd_s2s_out.erl: Avoid an harmless error (function clause in * src/ejabberd_s2s_out.erl: Avoid an harmless error (function clause in
logs) logs)
2008-05-17 Badlop <badlop@process-one.net> 2008-05-17 Badlop <badlop@process-one.net>
@ -220,11 +225,11 @@
being immediately shown in an 'all' special shared roster being immediately shown in an 'all' special shared roster
group (thanks to Alexey Shchepin) (EJAB-71) group (thanks to Alexey Shchepin) (EJAB-71)
* src/mod_register.erl: New vhost event user_registered * src/mod_register.erl: New vhost event user_registered
* doc/guide.tex: Document option registration_timeout (EJAB-614) * doc/guide.tex: Document option registration_timeout (EJAB-614)
2008-04-25 Badlop <badlop@process-one.net> 2008-04-25 Badlop <badlop@process-one.net>
* src/ejabberd_c2s.erl: Added forbidden_session_hook * src/ejabberd_c2s.erl: Added forbidden_session_hook
* src/acl.erl: New access types: resource, resource_regexp and * src/acl.erl: New access types: resource, resource_regexp and
@ -382,7 +387,7 @@
* doc/webadmmainru.png: Likewise * doc/webadmmainru.png: Likewise
* doc/disco.png: Removed because not used * doc/disco.png: Removed because not used
* doc/guide.tex: Fix Latex reference to webadmin section. Update * doc/guide.tex: Fix Latex reference to webadmin section. Update
explanation of screenshots. Update xmpp addresses of Mickael explanation of screenshots. Update xmpp addresses of Mickael
Remond and Sander Devrieze. Remond and Sander Devrieze.
@ -495,7 +500,7 @@
* src/eldap.erl: Faster LDAP reconnection (Thanks to Christophe * src/eldap.erl: Faster LDAP reconnection (Thanks to Christophe
Romain) (EJAB-581) Romain) (EJAB-581)
2008-03-17 Mickael Remond <mremond@process-one.net> 2008-03-17 Mickael Remond <mremond@process-one.net>
* src/ejabberd_s2s.erl: Only trigger s2s_connect_hook on * src/ejabberd_s2s.erl: Only trigger s2s_connect_hook on
@ -506,7 +511,7 @@
* src/ejabberd_ctl.erl: API improvement: Added * src/ejabberd_ctl.erl: API improvement: Added
reopen_log_hook (EJAB-565) reopen_log_hook (EJAB-565)
* src/ejabberd_s2s.erl: API improvement: Added s2s_connect_hook * src/ejabberd_s2s.erl: API improvement: Added s2s_connect_hook
(EJAB-566). (EJAB-566).
@ -598,7 +603,7 @@
configuration sanity checks (EJAB-533) configuration sanity checks (EJAB-533)
* src/src/ejabberd_app.erl: Likewise * src/src/ejabberd_app.erl: Likewise
* src/ejabberd_app.erl: Likewise * src/ejabberd_app.erl: Likewise
2008-02-26 Badlop <badlop@process-one.net> 2008-02-26 Badlop <badlop@process-one.net>
* src/msgs/it.msg: Updated (thanks to Smart2128) * src/msgs/it.msg: Updated (thanks to Smart2128)
@ -734,7 +739,7 @@
* src/mod_pubsub/node_pep.erl: Likewise * src/mod_pubsub/node_pep.erl: Likewise
* src/mod_pubsub/node_private.erl: Likewise * src/mod_pubsub/node_private.erl: Likewise
* src/mod_pubsub/node.template: Likewise * src/mod_pubsub/node.template: Likewise
* src/mod_pubsub/gen_pubsub_node.erl: API improvement: Added a way * src/mod_pubsub/gen_pubsub_node.erl: API improvement: Added a way
to generate custom item name to generate custom item name
* src/mod_pubsub/node_dispatch.erl: Likewise * src/mod_pubsub/node_dispatch.erl: Likewise
@ -771,7 +776,7 @@
* src/mod_pubsub/gen_pubsub_nodetree.erl: Likewise * src/mod_pubsub/gen_pubsub_nodetree.erl: Likewise
* src/mod_pubsub/nodetree_default.erl: Likewise * src/mod_pubsub/nodetree_default.erl: Likewise
* src/mod_pubsub/nodetree_virtual.erl: Likewise * src/mod_pubsub/nodetree_virtual.erl: Likewise
2008-01-30 Badlop <badlop@process-one.net> 2008-01-30 Badlop <badlop@process-one.net>
* doc/guide.tex: Removed the option served_hosts in mod_pubsub * doc/guide.tex: Removed the option served_hosts in mod_pubsub
@ -836,7 +841,7 @@
* src/ejabberd.hrl: Likewise * src/ejabberd.hrl: Likewise
* doc/introduction.tex: Updated to 22 languages * doc/introduction.tex: Updated to 22 languages
* doc/Makefile: Ensure that Bash is used * doc/Makefile: Ensure that Bash is used
* doc/guide.tex: Updated copyright dates to 2008. * doc/guide.tex: Updated copyright dates to 2008.

25
src/mod_privacy_odbc.erl
View File

@ -16,7 +16,7 @@
%%% but WITHOUT ANY WARRANTY; without even the implied warranty of %%% but WITHOUT ANY WARRANTY; without even the implied warranty of
%%% MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU %%% MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
%%% General Public License for more details. %%% General Public License for more details.
%%% %%%
%%% You should have received a copy of the GNU General Public License %%% You should have received a copy of the GNU General Public License
%%% along with this program; if not, write to the Free Software %%% along with this program; if not, write to the Free Software
%%% Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA %%% Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
@ -698,11 +698,11 @@ raw_to_item({SType, SValue, SAction, SOrder, SMatchAll, SMatchIQ,
"d" -> deny "d" -> deny
end, end,
Order = list_to_integer(SOrder), Order = list_to_integer(SOrder),
MatchAll = SMatchAll == "t", MatchAll = SMatchAll == "1" orelse SMatchAll == "t",
MatchIQ = SMatchIQ == "t", MatchIQ = SMatchIQ == "1" orelse SMatchIQ == "t" ,
MatchMessage = SMatchMessage == "t", MatchMessage = SMatchMessage == "1" orelse SMatchMessage == "t",
MatchPresenceIn = SMatchPresenceIn == "t", MatchPresenceIn = SMatchPresenceIn == "1" orelse SMatchPresenceIn == "t",
MatchPresenceOut = SMatchPresenceOut == "t", MatchPresenceOut = SMatchPresenceOut == "1" orelse SMatchPresenceOut == "t",
#listitem{type = Type, #listitem{type = Type,
value = Value, value = Value,
action = Action, action = Action,
@ -750,11 +750,11 @@ item_to_raw(#listitem{type = Type,
deny -> "d" deny -> "d"
end, end,
SOrder = integer_to_list(Order), SOrder = integer_to_list(Order),
SMatchAll = if MatchAll -> "t"; true -> "f" end, SMatchAll = if MatchAll -> "1"; true -> "0" end,
SMatchIQ = if MatchIQ -> "t"; true -> "f" end, SMatchIQ = if MatchIQ -> "1"; true -> "0" end,
SMatchMessage = if MatchMessage -> "t"; true -> "f" end, SMatchMessage = if MatchMessage -> "1"; true -> "0" end,
SMatchPresenceIn = if MatchPresenceIn -> "t"; true -> "f" end, SMatchPresenceIn = if MatchPresenceIn -> "1"; true -> "0" end,
SMatchPresenceOut = if MatchPresenceOut -> "t"; true -> "f" end, SMatchPresenceOut = if MatchPresenceOut -> "1"; true -> "0" end,
["'", SType, "', " ["'", SType, "', "
"'", SValue, "', " "'", SValue, "', "
"'", SAction, "', " "'", SAction, "', "
@ -871,6 +871,3 @@ sql_set_privacy_list(ID, RItems) ->
") " ") "
"values ('", ID, "', ", Items, ");"]) "values ('", ID, "', ", Items, ");"])
end, RItems). end, RItems).