From 09c3679e2d6ab1932f98598945a74ac016d39fbd Mon Sep 17 00:00:00 2001
From: Mark Spencer <markster@digium.com>
Date: Sat, 17 Jul 2004 01:34:20 +0000
Subject: [PATCH] Voicemail fixes (bug #1982)
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@3453 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---
apps/app_voicemail.c | 16 +++++++++++-----
sounds.txt | 4 +++-
sounds/vm-incorrect-mailbox.gsm | Bin 0 -> 4554 bytes
sounds/vm-incorrect.gsm | Bin 4554 -> 2805 bytes
4 files changed, 14 insertions(+), 6 deletions(-)
create mode 100755 sounds/vm-incorrect-mailbox.gsm
diff --git a/apps/app_voicemail.c b/apps/app_voicemail.c
index 40d9e9217e..af7aa80b4c 100755
--- a/apps/app_voicemail.c
+++ b/apps/app_voicemail.c
@@ -3567,13 +3567,19 @@ static int vm_execmain(struct ast_channel *chan, void *data)
if (prefix)
strncpy(vms.username, empty, sizeof(vms.username) -1);
}
+ logretries++;
if (!valid) {
- if (useadsi)
- adsi_login(chan);
- if (ast_streamfile(chan, "vm-incorrect", chan->language))
- break;
+ if (skipuser || logretries >= maxlogins) {
+ if (ast_streamfile(chan, "vm-incorrect", chan->language))
+ break;
+ } else {
+ if (useadsi)
+ adsi_login(chan);
+ if (ast_streamfile(chan, "vm-incorrect-mailbox", chan->language))
+ break;
+ }
+ ast_waitstream(chan, "");
}
- logretries++;
}
if (!valid && (logretries >= maxlogins)) {
ast_stopstream(chan);
diff --git a/sounds.txt b/sounds.txt
index 4a6276d47d..92ea6e6c2c 100755
--- a/sounds.txt
+++ b/sounds.txt
@@ -128,7 +128,9 @@
%vm-INBOX.gsm%new
-%vm-incorrect.gsm%Login incorrect. Mailbox?
+%vm-incorrect-mailbox.gsm%Login incorrect. Mailbox?
+
+%vm-incorrect.gsm%Login incorrect.
%vm-instructions.gsm%To look into your messages press 1 now. You may quit voicemail at any time by pressing the pound key.
diff --git a/sounds/vm-incorrect-mailbox.gsm b/sounds/vm-incorrect-mailbox.gsm
new file mode 100755
index 0000000000000000000000000000000000000000..899340758d70f3fbea10ff7457ba766955734d20
GIT binary patch
literal 4554
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
BNiYBa
literal 0
HcmV?d00001
diff --git a/sounds/vm-incorrect.gsm b/sounds/vm-incorrect.gsm
index 899340758d70f3fbea10ff7457ba766955734d20..fd42267cf36d1ae714bc31721b938c0e7f626aab 100755
GIT binary patch
literal 2805
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
QMU7Le4lKSYmYq}w0Bo453;+NC
literal 4554
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
BNiYBa
--
GitLab