From: Holger Weiss <holger@zedat.fu-berlin.de>
Date: Mon, 8 Dec 2014 14:51:06 +0000 (+0100)
Subject: mod_muc_log: Fix configuration parsing
X-Git-Tag: 14.12~4^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=455039ae69144992f0204b36242c2db07ce5b6ab;p=ejabberd

mod_muc_log: Fix configuration parsing

Fix mod_muc_log's parsing of the "file_permissions" option.

Resolves #373.
---

diff --git a/src/mod_muc_log.erl b/src/mod_muc_log.erl
index bdaafd197..fa99ed923 100644
--- a/src/mod_muc_log.erl
+++ b/src/mod_muc_log.erl
@@ -146,7 +146,13 @@ init([Host, Opts]) ->
                                     (plaintext) -> plaintext
                                  end, html),
     FilePermissions = gen_mod:get_opt(file_permissions, Opts,
-                                 fun({A, B}) -> {A, B}
+                                 fun(SubOpts) ->
+                                         F = fun({mode, Mode}, {_M, G}) ->
+                                                        {Mode, G};
+                                                ({group, Group}, {M, _G}) ->
+                                                        {M, Group}
+                                             end,
+                                         lists:foldl(F, {644, 33}, SubOpts)
                                  end, {644, 33}),
     CSSFile = gen_mod:get_opt(cssfile, Opts,
                               fun iolist_to_binary/1,