mirror of
https://github.com/asterisk/asterisk.git
synced 2025-09-22 13:25:17 +00:00
Don't say "Please try again" if we don't give the user another chance to try again.
(issue #15055, SWP-129) Reported by: jthurman git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@218331 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
@@ -6861,6 +6861,9 @@ static int vm_newuser(struct ast_channel *chan, struct ast_vm_user *vmu, struct
|
||||
cmd = ast_play_and_wait(chan, "vm-mismatch");
|
||||
if (++tries == 3)
|
||||
return -1;
|
||||
if (cmd == 0) {
|
||||
cmd = ast_play_and_wait(chan, "vm-pls-try-again");
|
||||
}
|
||||
}
|
||||
if (ast_strlen_zero(ext_pass_cmd))
|
||||
vm_change_password(vmu,newpassword);
|
||||
@@ -6970,6 +6973,9 @@ static int vm_options(struct ast_channel *chan, struct ast_vm_user *vmu, struct
|
||||
if (strcmp(newpassword, newpassword2)) {
|
||||
ast_log(LOG_NOTICE,"Password mismatch for user %s (%s != %s)\n", vms->username, newpassword, newpassword2);
|
||||
cmd = ast_play_and_wait(chan, "vm-mismatch");
|
||||
if (!cmd) {
|
||||
cmd = ast_play_and_wait(chan, "vm-pls-try-again");
|
||||
}
|
||||
break;
|
||||
}
|
||||
if (ast_strlen_zero(ext_pass_cmd))
|
||||
|
@@ -18,7 +18,7 @@
|
||||
PWD:=$(shell pwd)
|
||||
SOUNDS_DIR:=$(DESTDIR)$(ASTDATADIR)/sounds
|
||||
MOH_DIR:=$(DESTDIR)$(ASTDATADIR)/moh
|
||||
CORE_SOUNDS_VERSION:=1.4.15
|
||||
CORE_SOUNDS_VERSION:=1.4.16
|
||||
EXTRA_SOUNDS_VERSION:=1.4.9
|
||||
SOUNDS_URL:=http://downloads.digium.com/pub/telephony/sounds/releases
|
||||
MCS:=$(subst -EN-,-en-,$(MENUSELECT_CORE_SOUNDS))
|
||||
|
Reference in New Issue
Block a user