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

@@ -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)

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