From c7df3b4b2219f7624e218a8da147774f35e42ba4 Mon Sep 17 00:00:00 2001 From: Mark Spencer Date: Thu, 29 Apr 2004 13:53:38 +0000 Subject: [PATCH] Even better, let it be specified per-context git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@2820 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- apps/app_directory.c | 8 +++++--- 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 bd51bb2c7e..658798db1a 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 f850c105ae..6a0e1c5ee5 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