[asterisk-commits] russell: branch group/upenn r107724 - /team/group/upenn/apps/app_voicemail.c

[SVN commits to the Asterisk project]

Author: russell
Date: Tue Mar 11 16:14:38 2008
New Revision: 107724

URL: http://svn.digium.com/view/asterisk?view=rev&rev=107724
Log:
add the extended help prompts patch from issue #11705 to the upenn branch

Modified:
    team/group/upenn/apps/app_voicemail.c

Modified: team/group/upenn/apps/app_voicemail.c
URL: http://svn.digium.com/view/asterisk/team/group/upenn/apps/app_voicemail.c?view=diff&rev=107724&r1=107723&r2=107724
==============================================================================
--- team/group/upenn/apps/app_voicemail.c (original)
+++ team/group/upenn/apps/app_voicemail.c Tue Mar 11 16:14:38 2008
@@ -6041,13 +6041,28 @@
 	while (!res) {
 		if (vms->starting) {
 			if (vms->lastmsg > -1) {
-				res = ast_play_and_wait(chan, "vm-onefor");
+				if (skipadvanced)
+					res = ast_play_and_wait(chan, "vm-onefor-full");
+				else
+					res = ast_play_and_wait(chan, "vm-onefor");
 				if (!res)
 					res = vm_play_folder_name(chan, vms->vmbox);
 			}
 			if (!res)
 				res = ast_play_and_wait(chan, main_sound);
+			if (!res) {
+				if (skipadvanced)
+					res = ast_play_and_wait(chan, "vm-opts-full");
+				else
+					res = ast_play_and_wait(chan, "vm-opts");
+			}
 		} else {
+			if (skipadvanced) {
+				res = ast_play_and_wait(chan, "vm-onefor-full");
+				if (!res)
+					res = vm_play_folder_name(chan, vms->vmbox);
+				res = ast_play_and_wait(chan, "vm-opts-full");
+			}
 			if (vms->curmsg)
 				res = ast_play_and_wait(chan, listen_previous_sound);
 			if (!res && !skipadvanced)
@@ -6067,8 +6082,12 @@
 					res = ast_play_and_wait(chan, listen_save_sound);
 			}
 		}
-		if (!res)
-			res = ast_play_and_wait(chan, "vm-helpexit");
+		if (!res) {
+			if (skipadvanced)
+				res = ast_play_and_wait(chan, "vm-helpexit-full");
+			else
+				res = ast_play_and_wait(chan, "vm-helpexit");
+		}
 		if (!res)
 			res = ast_waitfordigit(chan, 6000);
 		if (!res) {