mirror of
https://github.com/asterisk/asterisk.git
synced 2025-09-05 20:20:07 +00:00
Even better, let it be specified per-context
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@2820 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
@@ -250,9 +250,6 @@ static int directory_exec(struct ast_channel *chan, void *data)
|
|||||||
}
|
}
|
||||||
LOCAL_USER_ADD(u);
|
LOCAL_USER_ADD(u);
|
||||||
top:
|
top:
|
||||||
dirintro = ast_variable_retrieve(cfg, "general", "directoryintro");
|
|
||||||
if (!dirintro || !strlen(dirintro))
|
|
||||||
dirintro = "dir-intro";
|
|
||||||
context = ast_strdupa(data);
|
context = ast_strdupa(data);
|
||||||
dialcontext = strchr(context, '|');
|
dialcontext = strchr(context, '|');
|
||||||
if (dialcontext) {
|
if (dialcontext) {
|
||||||
@@ -260,6 +257,11 @@ top:
|
|||||||
dialcontext++;
|
dialcontext++;
|
||||||
} else
|
} else
|
||||||
dialcontext = context;
|
dialcontext = context;
|
||||||
|
dirintro = ast_variable_retrieve(cfg, context, "directoryintro");
|
||||||
|
if (!dirintro || !strlen(dirintro))
|
||||||
|
dirintro = ast_variable_retrieve(cfg, "general", "directoryintro");
|
||||||
|
if (!dirintro || !strlen(dirintro))
|
||||||
|
dirintro = "dir-intro";
|
||||||
if (chan->_state != AST_STATE_UP)
|
if (chan->_state != AST_STATE_UP)
|
||||||
res = ast_answer(chan);
|
res = ast_answer(chan);
|
||||||
if (!res)
|
if (!res)
|
||||||
|
@@ -115,4 +115,6 @@ yes
|
|||||||
;
|
;
|
||||||
|
|
||||||
[other]
|
[other]
|
||||||
|
;The intro can be customized on a per-context basis
|
||||||
|
;directoryintro=dir-company2
|
||||||
1234 => 5678,Company2 User,root@localhost
|
1234 => 5678,Company2 User,root@localhost
|
||||||
|
Reference in New Issue
Block a user