aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjpeeler <jpeeler@f38db490-d61c-443f-a65b-d21fe96a405b>2010-05-06 18:39:06 +0000
committerjpeeler <jpeeler@f38db490-d61c-443f-a65b-d21fe96a405b>2010-05-06 18:39:06 +0000
commit37337662a0fd7424321f02dcbc0caff67b64b0b2 (patch)
treefce76bd93772f195a5e3c0309ccc5776706381e9
parentdd6dd79c3b3347a8ebd25f82336fe95a560a34b9 (diff)
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: http://svn.digium.com/svn/asterisk/branches/1.4@261698 f38db490-d61c-443f-a65b-d21fe96a405b
-rw-r--r--apps/app_voicemail.c20
1 files changed, 1 insertions, 19 deletions
diff --git a/apps/app_voicemail.c b/apps/app_voicemail.c
index 03dd532a8..20cb63c95 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