From: Jeff Peeler <jpeeler@digium.com>
Date: Thu, 6 May 2010 18:39:06 +0000 (+0000)
Subject: Remove some hidden broken code in the voicemail mailbox options menu.
X-Git-Tag: 1.4.33-rc1~37
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7fd6beb05400a287fd518df92553b24dfb5a48d9;p=thirdparty%2Fasterisk.git

Remove some hidden broken code in the voicemail mailbox options menu.

After finishing a recording from within the mailbox options menu, pressing 0
exhibited strange behavior with operator=yes turned on. Pressing 0 was not
even advertised as an option and the options from the vm-saveoper prompt:
"Press 1 to accept this recording. Otherwise, please continue to hold" did
not function correctly. While this of course could be fixed, it didn't really
seem to make sense even if it was working properly.

ABE-2121
SWP-1267


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@261698 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---

diff --git a/apps/app_voicemail.c b/apps/app_voicemail.c
index 03dd532a82..20cb63c958 100644
--- a/apps/app_voicemail.c
+++ b/apps/app_voicemail.c
@@ -9468,6 +9468,7 @@ static int play_record_review(struct ast_channel *chan, char *playfile, char *re
 		case '7':
 		case '8':
 		case '9':
+		case '0':
 		case '*':
 		case '#':
 			cmd = ast_play_and_wait(chan, "vm-sorry");
@@ -9486,25 +9487,6 @@ static int play_record_review(struct ast_channel *chan, char *playfile, char *re
 			else
 				return 1;
 #endif
-		case '0':
-			if (!ast_test_flag(vmu, VM_OPERATOR)) {
-				cmd = ast_play_and_wait(chan, "vm-sorry");
-				break;
-			}
-			if (message_exists || recorded) {
-				cmd = ast_play_and_wait(chan, "vm-saveoper");
-				if (!cmd)
-					cmd = ast_waitfordigit(chan, 3000);
-				if (cmd == '1') {
-					ast_play_and_wait(chan, "vm-msgsaved");
-					cmd = '0';
-				} else {
-					ast_play_and_wait(chan, "vm-deleted");
-					DELETE(recordfile, -1, recordfile, vmu);
-					cmd = '0';
-				}
-			}
-			return cmd;
 		default:
 			/* If the caller is an ouside caller, and the review option is enabled,
 			   allow them to review the message, but let the owner of the box review