Chapril/xmpp.chapril.org-ejabberd
24
1
Fork 0
mirror of https://github.com/processone/ejabberd.git synced 2024-06-18 22:15:20 +02:00
Code Releases Activity

* src/gen_mod.erl: Added get_module_opt_host/3 (thanks to Badlop)

Browse Source 
SVN Revision: 927
This commit is contained in:
Alexey Shchepin 2007-09-11 11:20:36 +00:00
parent b5465a3f90
commit e809c6c322
2 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@ -1,3 +1,7 @@
2007-09-11 Alexey Shchepin <alexey@process-one.net>
* src/gen_mod.erl: Added get_module_opt_host/3 (thanks to Badlop)
2007-09-10 Mickael Remond <mremond@process-one.net> 2007-09-10 Mickael Remond <mremond@process-one.net>
* src/guide.tex: Fix: user_regexp acls are valid for all local * src/guide.tex: Fix: user_regexp acls are valid for all local

11
src/gen_mod.erl
View File

@ -15,6 +15,7 @@
get_opt/3, get_opt/3,
get_opt_host/3, get_opt_host/3,
get_module_opt/4, get_module_opt/4,
get_module_opt_host/3,
loaded_modules/1, loaded_modules/1,
loaded_modules_with_opts/1, loaded_modules_with_opts/1,
get_hosts/2, get_hosts/2,
@ -92,7 +93,7 @@ wait_for_stop1(MonitorReference) ->
get_opt(Opt, Opts) -> get_opt(Opt, Opts) ->
case lists:keysearch(Opt, 1, Opts) of case lists:keysearch(Opt, 1, Opts) of
false -> false ->
% TODO: replace with more appropriate function % TODO: replace with more appropriate function
throw({undefined_option, Opt}); throw({undefined_option, Opt});
{value, {_, Val}} -> {value, {_, Val}} ->
Val Val
@ -114,9 +115,9 @@ get_module_opt(global, Module, Opt, Default) ->
end, end,
Hosts), Hosts),
Same_all = lists:all( Same_all = lists:all(
fun(Other_value) -> fun(Other_value) ->
Other_value == Value Other_value == Value
end, end,
Values), Values),
case Same_all of case Same_all of
true -> Value; true -> Value;
@ -132,6 +133,10 @@ get_module_opt(Host, Module, Opt, Default) ->
get_opt(Opt, Opts, Default) get_opt(Opt, Opts, Default)
end. end.
get_module_opt_host(Host, Module, Default) ->
Val = get_module_opt(Host, Module, host, Default),
element(2, regexp:gsub(Val, "@HOST@", Host)).
get_opt_host(Host, Opts, Default) -> get_opt_host(Host, Opts, Default) ->
Val = get_opt(host, Opts, Default), Val = get_opt(host, Opts, Default),
element(2, regexp:gsub(Val, "@HOST@", Host)). element(2, regexp:gsub(Val, "@HOST@", Host)).