aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEvgeniy Khramtsov <ekhramtsov@process-one.net>2011-12-19 16:10:48 +1000
committerEvgeniy Khramtsov <ekhramtsov@process-one.net>2011-12-19 16:10:48 +1000
commit707bb0a3214137c998ebe7157785ba83bd82d2c2 (patch)
tree2aba706d35051222ca05d27f856d4f7484d73ca7
parentGet rid of +driver option because it is incompatible with R15B (diff)
Replace regexp with ejabberd_regexp
-rw-r--r--src/eldap/eldap_utils.erl11
1 files changed, 6 insertions, 5 deletions
diff --git a/src/eldap/eldap_utils.erl b/src/eldap/eldap_utils.erl
index 66a1fcfef..056499d4a 100644
--- a/src/eldap/eldap_utils.erl
+++ b/src/eldap/eldap_utils.erl
@@ -94,17 +94,18 @@ get_user_part(String, Pattern) ->
{'EXIT', _} ->
{error, badmatch};
Result ->
- case regexp:sub(Pattern, "%u", Result) of
- {ok, StringRes, _} ->
+ case catch ejabberd_regexp:replace(Pattern, "%u", Result) of
+ {'EXIT', _} ->
+ {error, badmatch};
+ StringRes ->
case (string:to_lower(StringRes) ==
string:to_lower(String)) of
true ->
{ok, Result};
false ->
{error, badmatch}
- end;
- _ -> {error, badmatch}
- end
+ end
+ end
end.
make_filter(Data, UIDs) ->