diff options
| author | Badlop <badlop@process-one.net> | 2008-07-09 18:39:41 +0000 |
|---|---|---|
| committer | Badlop <badlop@process-one.net> | 2008-07-09 18:39:41 +0000 |
| commit | fc911a43ff97a8878b90c50d7cb00f4feda68260 (patch) | |
| tree | aad2eeb8b2fe412d76c83f75886ab16a5c79d7cb /src/mod_muc/mod_muc_log.erl | |
| parent | * src/mod_register.erl: Support for io_lib newline character in (diff) | |
* src/mod_muc/mod_muc_log.erl: Fix XHTML compliance: ensure some
language is set, include ID attribute in each message, add
microseconds to ensure unique value (EJAB-497)
SVN Revision: 1426
Diffstat (limited to '')
| -rw-r--r-- | src/mod_muc/mod_muc_log.erl | 19 |
1 files changed, 12 insertions, 7 deletions
diff --git a/src/mod_muc/mod_muc_log.erl b/src/mod_muc/mod_muc_log.erl index fce9c15b2..9ab8d4ce2 100644 --- a/src/mod_muc/mod_muc_log.erl +++ b/src/mod_muc/mod_muc_log.erl @@ -120,9 +120,11 @@ init([Host, Opts]) -> NoFollow = gen_mod:get_opt(spam_prevention, Opts, true), Lang = case ejabberd_config:get_local_option({language, Host}) of undefined -> - ""; - L -> - L + case ejabberd_config:get_global_option(language) of + undefined -> "en"; + L -> L + end; + L -> L end, {ok, #state{host = Host, out_dir = OutDir, @@ -286,9 +288,10 @@ add_message_to_log(Nick1, Message, RoomJID, Opts, State) -> top_link = TopLink} = State, Room = get_room_info(RoomJID, Opts), + Now = now(), TimeStamp = case Timezone of - local -> calendar:now_to_local_time(now()); - universal -> calendar:now_to_universal_time(now()) + local -> calendar:now_to_local_time(Now); + universal -> calendar:now_to_universal_time(Now) end, {Fd, Fn, _Dir} = build_filename_string(TimeStamp, OutDir, Room#room.jid, DirType), {Date, Time} = TimeStamp, @@ -382,10 +385,12 @@ add_message_to_log(Nick1, Message, RoomJID, Opts, State) -> {Hour, Minute, Second} = Time, STime = lists:flatten( io_lib:format("~2..0w:~2..0w:~2..0w", [Hour, Minute, Second])), + {_, _, Microsecs} = Now, + STimeUnique = io_lib:format("~s.~w", [STime, Microsecs]), % Write message - file:write(F, io_lib:format("<a name=\"~s\" href=\"#~s\" class=\"ts\">[~s]</a> ~s~n", - [STime, STime, STime, Text])), + file:write(F, io_lib:format("<a id=\"~s\" name=\"~s\" href=\"#~s\" class=\"ts\">[~s]</a> ~s~n", + [STimeUnique, STimeUnique, STimeUnique, STime, Text])), % Close file file:close(F), |