[asterisk-commits] jpeeler: branch 1.4 r261698 - /branches/1.4/apps/app_voicemail.c

[SVN commits to the Asterisk project]

Author: jpeeler
Date: Thu May  6 13:39:06 2010
New Revision: 261698

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=261698
Log:
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

Modified:
    branches/1.4/apps/app_voicemail.c

Modified: branches/1.4/apps/app_voicemail.c
URL: http://svnview.digium.com/svn/asterisk/branches/1.4/apps/app_voicemail.c?view=diff&rev=261698&r1=261697&r2=261698
==============================================================================
--- branches/1.4/apps/app_voicemail.c (original)
+++ branches/1.4/apps/app_voicemail.c Thu May  6 13:39:06 2010
@@ -9468,6 +9468,7 @@
 		case '7':
 		case '8':
 		case '9':
+		case '0':
 		case '*':
 		case '#':
 			cmd = ast_play_and_wait(chan, "vm-sorry");
@@ -9486,25 +9487,6 @@
 			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