mirror of
https://github.com/processone/ejabberd.git
synced 2024-11-20 16:15:59 +01:00
mod_muc_log: Support allowpm introduced in 2bd61ab
This commit is contained in:
parent
6bdbafcd5c
commit
c0055b7a7f
@ -583,7 +583,7 @@ put_header(F, Room, Date, CSSFile, Lang, Hour_offset,
|
||||
"class=\"nav\" href=\"~ts\">></a></span></di"
|
||||
"v>">>,
|
||||
[Date, Date_prev, Date_next]),
|
||||
case {htmlize(Room#room.subject_author),
|
||||
case {htmlize(prepare_subject_author(Room#room.subject_author)),
|
||||
htmlize(Room#room.subject)}
|
||||
of
|
||||
{<<"">>, <<"">>} -> ok;
|
||||
@ -783,6 +783,12 @@ roomconfig_to_string(Options, Lang, FileFormat) ->
|
||||
(htmlize(tr(Lang, misc:atom_to_binary(T)),
|
||||
FileFormat))/binary,
|
||||
"\"</div>">>;
|
||||
allowpm ->
|
||||
<<"<div class=\"rcot\">",
|
||||
OptText/binary, ": \"",
|
||||
(htmlize(tr(Lang, misc:atom_to_binary(T)),
|
||||
FileFormat))/binary,
|
||||
"\"</div>">>;
|
||||
_ -> <<"\"", T/binary, "\"">>
|
||||
end
|
||||
end,
|
||||
@ -898,6 +904,11 @@ get_room_occupants(RoomJIDString) ->
|
||||
[]
|
||||
end.
|
||||
|
||||
prepare_subject_author({Nick, _}) ->
|
||||
Nick;
|
||||
prepare_subject_author(SA) ->
|
||||
SA.
|
||||
|
||||
-spec get_room_state(binary(), binary()) -> {ok, mod_muc_room:state()} | error.
|
||||
|
||||
get_room_state(RoomName, MucService) ->
|
||||
|
Loading…
Reference in New Issue
Block a user