diff options
author | markster <markster@f38db490-d61c-443f-a65b-d21fe96a405b> | 2004-07-17 01:34:20 +0000 |
---|---|---|
committer | markster <markster@f38db490-d61c-443f-a65b-d21fe96a405b> | 2004-07-17 01:34:20 +0000 |
commit | 198227109b92cec3421ce24bb3f9dab23db90f80 (patch) | |
tree | 48d0cc6d81273b67d8cf4de54f3f23918e343531 | |
parent | b6de7e334caae383eef4102707667d865eaa406d (diff) |
Voicemail fixes (bug #1982)
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@3453 f38db490-d61c-443f-a65b-d21fe96a405b
-rwxr-xr-x | apps/app_voicemail.c | 16 | ||||
-rwxr-xr-x | sounds.txt | 4 | ||||
-rwxr-xr-x | sounds/vm-incorrect-mailbox.gsm | bin | 0 -> 4554 bytes | |||
-rwxr-xr-x | sounds/vm-incorrect.gsm | bin | 4554 -> 2805 bytes |
4 files changed, 14 insertions, 6 deletions
diff --git a/apps/app_voicemail.c b/apps/app_voicemail.c index 40d9e9217..af7aa80b4 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 4a6276d47..92ea6e6c2 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 Binary files differnew file mode 100755 index 000000000..899340758 --- /dev/null +++ b/sounds/vm-incorrect-mailbox.gsm diff --git a/sounds/vm-incorrect.gsm b/sounds/vm-incorrect.gsm Binary files differindex 899340758..fd42267cf 100755 --- a/sounds/vm-incorrect.gsm +++ b/sounds/vm-incorrect.gsm |