]> granicus.if.org Git - ejabberd/commitdiff
Improve srg_get_info result format (processone/ejabberd-contrib#92)
authorBadlop <badlop@process-one.net>
Fri, 3 Apr 2015 10:16:11 +0000 (12:16 +0200)
committerBadlop <badlop@process-one.net>
Fri, 3 Apr 2015 10:16:11 +0000 (12:16 +0200)
src/mod_admin_extra.erl

index 97220299615719ce588617cdd2ad24c4418b2310..043b6f3c16bfbc25e7368f2db97c49871ac133c0 100644 (file)
@@ -1302,7 +1302,7 @@ private_set2(Username, Host, Xml) ->
 
 srg_create(Group, Host, Name, Description, Display) ->
     DisplayList = case Display of
-       [] -> [];
+       <<>> -> [];
        _ -> ejabberd_regexp:split(Display, <<"\\\\n">>)
     end,
     Opts = [{name, Name},
@@ -1323,7 +1323,12 @@ srg_get_info(Group, Host) ->
        Os when is_list(Os) -> Os;
        error -> []
     end,
-    [{jlib:atom_to_binary(Title), Value} || {Title, Value} <- Opts].
+    [{jlib:atom_to_binary(Title),
+      io_lib:format("~p", [btl(Value)])} || {Title, Value} <- Opts].
+
+btl([]) -> [];
+btl([B|L]) -> [btl(B)|btl(L)];
+btl(B) -> binary_to_list(B).
 
 srg_get_members(Group, Host) ->
     Members = mod_shared_roster:get_group_explicit_users(Host,Group),