Chapril/xmpp.chapril.org-ejabberd
24
1
Fork 0
mirror of https://github.com/processone/ejabberd.git synced 2024-06-02 21:17:12 +02:00
Code Releases Activity

* src/mod_muc/mod_muc_room.erl: Allow to store room

Browse Source 
description (thanks to Christopher Dupont)(EJAB-670)

SVN Revision: 1385
This commit is contained in:
Badlop 2008-06-28 17:47:19 +00:00
parent b6fd0a5ca5
commit 152efbb112
2 changed files with 17 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -1,3 +1,8 @@
2008-06-28 Badlop <badlop@process-one.net>
* src/mod_muc/mod_muc_room.erl: Allow to store room
description (thanks to Christopher Dupont)(EJAB-670)
2008-06-21 Badlop <badlop@process-one.net> 2008-06-21 Badlop <badlop@process-one.net>
* src/web/ejabberd_http.erl: Support PUT and DELETE methods in * src/web/ejabberd_http.erl: Support PUT and DELETE methods in

13
src/mod_muc/mod_muc_room.erl
View File

@ -59,6 +59,7 @@
-record(lqueue, {queue, len, max}). -record(lqueue, {queue, len, max}).
-record(config, {title = "", -record(config, {title = "",
description = "",
allow_change_subj = true, allow_change_subj = true,
allow_query_users = true, allow_query_users = true,
allow_private_messages = true, allow_private_messages = true,
@ -2614,7 +2615,10 @@ get_config(Lang, StateData, From) ->
[{xmlcdata, "http://jabber.org/protocol/muc#roomconfig"}]}]}, [{xmlcdata, "http://jabber.org/protocol/muc#roomconfig"}]}]},
?STRINGXFIELD("Room title", ?STRINGXFIELD("Room title",
"muc#roomconfig_roomname", "muc#roomconfig_roomname",
Config#config.title) Config#config.title),
?STRINGXFIELD("Room description",
"muc#roomconfig_roomdesc",
Config#config.description)
] ++ ] ++
case acl:match_rule(StateData#state.server_host, AccessPersistent, From) of case acl:match_rule(StateData#state.server_host, AccessPersistent, From) of
allow -> allow ->
@ -2761,6 +2765,8 @@ set_xoption([], Config) ->
Config; Config;
set_xoption([{"muc#roomconfig_roomname", [Val]} | Opts], Config) -> set_xoption([{"muc#roomconfig_roomname", [Val]} | Opts], Config) ->
?SET_STRING_XOPT(title, Val); ?SET_STRING_XOPT(title, Val);
set_xoption([{"muc#roomconfig_roomdesc", [Val]} | Opts], Config) ->
?SET_STRING_XOPT(description, Val);
set_xoption([{"muc#roomconfig_changesubject", [Val]} | Opts], Config) -> set_xoption([{"muc#roomconfig_changesubject", [Val]} | Opts], Config) ->
?SET_BOOL_XOPT(allow_change_subj, Val); ?SET_BOOL_XOPT(allow_change_subj, Val);
set_xoption([{"allow_query_users", [Val]} | Opts], Config) -> set_xoption([{"allow_query_users", [Val]} | Opts], Config) ->
@ -2856,6 +2862,7 @@ set_opts([], StateData) ->
set_opts([{Opt, Val} | Opts], StateData) -> set_opts([{Opt, Val} | Opts], StateData) ->
NSD = case Opt of NSD = case Opt of
title -> StateData#state{config = (StateData#state.config)#config{title = Val}}; title -> StateData#state{config = (StateData#state.config)#config{title = Val}};
description -> StateData#state{config = (StateData#state.config)#config{description = Val}};
allow_change_subj -> StateData#state{config = (StateData#state.config)#config{allow_change_subj = Val}}; allow_change_subj -> StateData#state{config = (StateData#state.config)#config{allow_change_subj = Val}};
allow_query_users -> StateData#state{config = (StateData#state.config)#config{allow_query_users = Val}}; allow_query_users -> StateData#state{config = (StateData#state.config)#config{allow_query_users = Val}};
allow_private_messages -> StateData#state{config = (StateData#state.config)#config{allow_private_messages = Val}}; allow_private_messages -> StateData#state{config = (StateData#state.config)#config{allow_private_messages = Val}};
@ -2895,6 +2902,7 @@ make_opts(StateData) ->
Config = StateData#state.config, Config = StateData#state.config,
[ [
?MAKE_CONFIG_OPT(title), ?MAKE_CONFIG_OPT(title),
?MAKE_CONFIG_OPT(description),
?MAKE_CONFIG_OPT(allow_change_subj), ?MAKE_CONFIG_OPT(allow_change_subj),
?MAKE_CONFIG_OPT(allow_query_users), ?MAKE_CONFIG_OPT(allow_query_users),
?MAKE_CONFIG_OPT(allow_private_messages), ?MAKE_CONFIG_OPT(allow_private_messages),
@ -2991,9 +2999,12 @@ process_iq_disco_info(_From, get, Lang, StateData) ->
iq_disco_info_extras(Lang, StateData) -> iq_disco_info_extras(Lang, StateData) ->
Len = length(?DICT:to_list(StateData#state.users)), Len = length(?DICT:to_list(StateData#state.users)),
RoomDescription = (StateData#state.config)#config.description,
[{xmlelement, "x", [{"xmlns", ?NS_XDATA}, {"type", "result"}], [{xmlelement, "x", [{"xmlns", ?NS_XDATA}, {"type", "result"}],
[?RFIELDT("hidden", "FORM_TYPE", [?RFIELDT("hidden", "FORM_TYPE",
"http://jabber.org/protocol/muc#roominfo"), "http://jabber.org/protocol/muc#roominfo"),
?RFIELD("Room description", "muc#roominfo_description",
RoomDescription),
?RFIELD("Number of occupants", "muc#roominfo_occupants", ?RFIELD("Number of occupants", "muc#roominfo_occupants",
integer_to_list(Len)) integer_to_list(Len))
]}]. ]}].