remove allow_return_all optonion for mnesia and odbc vcard backends

esl · Jul 1, 2015 · 1df7cca · 1df7cca
1 parent d8b4249
commit 1df7cca
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 19 deletions.
diff --git a/apps/ejabberd/src/mod_vcard_mnesia.erl b/apps/ejabberd/src/mod_vcard_mnesia.erl
@@ -55,12 +55,10 @@ set_vcard(User, VHost, VCard, VCardSearch) ->
 
 search(VHost, Data, _Lang, DefaultReportedFields) ->
     MatchHead = make_matchhead(VHost, Data),
-    AllowReturnAll = gen_mod:get_module_opt(VHost, mod_vcard,
-                                            allow_return_all, false),
-    R=if
-        (MatchHead == #vcard_search{_ = '_'}) and (not AllowReturnAll) ->
+    case MatchHead of
+        #vcard_search{_ = '_'} ->
             [];
-        true ->
+        _ ->
             case catch mnesia:dirty_select(vcard_search,
                                            [{MatchHead, [], ['$_']}]) of
                 {'EXIT', Reason} ->

diff --git a/apps/ejabberd/src/mod_vcard_odbc.erl b/apps/ejabberd/src/mod_vcard_odbc.erl
@@ -109,14 +109,12 @@ set_vcard(User, VHost, VCard, VCardSearch) ->
 
 search(LServer, Data, _Lang, DefaultReportedFields) ->
     RestrictionSQL = make_restriction_sql(LServer, Data),
-    AllowReturnAll = gen_mod:get_module_opt(LServer, mod_vcard,
-					    allow_return_all, false),
-
-    R=if
-	(RestrictionSQL == "") and (not AllowReturnAll) ->
-	    [];
-	true ->
-        do_search(LServer, RestrictionSQL)
+
+	case RestrictionSQL of
+        "" ->
+	        [];
+	    true ->
+            do_search(LServer, RestrictionSQL)
     end,
     Items = lists:map(fun(I) -> record_to_item(LServer,I) end, R),
     [DefaultReportedFields | Items].

diff --git a/rel/reltool_vars/node1_vars.config b/rel/reltool_vars/node1_vars.config
@@ -27,8 +27,7 @@
 {mod_privacy, "{mod_privacy, []},"}.
 {mod_private, "{mod_private, []},"}.
 {mod_roster, "{mod_roster, []},"}.
-{mod_vcard, "{mod_vcard, [ {allow_return_all, true},\n"
-                "%{matches, 1},\n"
+{mod_vcard, "{mod_vcard, [ %{matches, 1},\n"
                 "%{search, true},\n"
                 "%{host, directory.@HOST@}\n"
                 "]},"}.

diff --git a/rel/reltool_vars/node2_vars.config b/rel/reltool_vars/node2_vars.config
@@ -12,8 +12,7 @@
 {mod_privacy, "{mod_privacy, []},"}.
 {mod_private, "{mod_private, []},"}.
 {mod_roster, "{mod_roster, []},"}.
-{mod_vcard, "{mod_vcard, [ {allow_return_all, true},\n"
-                "%{matches, 1},\n"
+{mod_vcard, "{mod_vcard, [ %{matches, 1},\n"
                 "%{search, true},\n"
                 "%{host, directory.@HOST@}\n"
                 "]},"}.
diff --git a/rel/vars.config b/rel/vars.config
@@ -17,8 +17,7 @@
 {mod_privacy, "{mod_privacy, []},"}.
 {mod_private, "{mod_private, []},"}.
 {mod_roster, "{mod_roster, []},"}.
-{mod_vcard, "{mod_vcard, [ {allow_return_all, true},\n"
-                "%{matches, 1},\n"
+{mod_vcard, "{mod_vcard, [%{matches, 1},\n"
                 "%{search, true},\n"
                 "%{host, directory.@HOST@}\n"
                 "]},"}.