diff options
| author | markster <markster@f38db490-d61c-443f-a65b-d21fe96a405b> | 2004-04-29 13:53:38 +0000 |
|---|---|---|
| committer | markster <markster@f38db490-d61c-443f-a65b-d21fe96a405b> | 2004-04-29 13:53:38 +0000 |
| commit | 6821d911b961ae09167988039b3baa564d1b7f80 (patch) | |
| tree | d2e647d27d29460be89f41f855e0eb59edd7be8f | |
| parent | 2a45a10a64128f7ade6ab8ae16c4cba7c8f50392 (diff) | |
Even better, let it be specified per-context
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@2820 f38db490-d61c-443f-a65b-d21fe96a405b
| -rwxr-xr-x | apps/app_directory.c | 8 | ||||
| -rwxr-xr-x | configs/voicemail.conf.sample | 2 |
2 files changed, 7 insertions, 3 deletions
diff --git a/apps/app_directory.c b/apps/app_directory.c index bd51bb2c7..658798db1 100755 --- a/apps/app_directory.c +++ b/apps/app_directory.c @@ -250,9 +250,6 @@ static int directory_exec(struct ast_channel *chan, void *data) } LOCAL_USER_ADD(u); top: - dirintro = ast_variable_retrieve(cfg, "general", "directoryintro"); - if (!dirintro || !strlen(dirintro)) - dirintro = "dir-intro"; context = ast_strdupa(data); dialcontext = strchr(context, '|'); if (dialcontext) { @@ -260,6 +257,11 @@ top: dialcontext++; } else 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) res = ast_answer(chan); if (!res) diff --git a/configs/voicemail.conf.sample b/configs/voicemail.conf.sample index f850c105a..6a0e1c5ee 100755 --- a/configs/voicemail.conf.sample +++ b/configs/voicemail.conf.sample @@ -115,4 +115,6 @@ yes ; [other] +;The intro can be customized on a per-context basis +;directoryintro=dir-company2 1234 => 5678,Company2 User,root@localhost |