static char vm_reenterpassword[80] = "vm-reenterpassword";
static char vm_mismatch[80] = "vm-mismatch";
static char vm_invalid_password[80] = "vm-invalid-password";
+static char vm_pls_try_again[80] = "vm-pls-try-again";
static struct ast_flags globalflags = {0};
}
if (++tries == 3)
return -1;
+ if (cmd != 0) {
+ cmd = ast_play_and_wait(chan, vm_pls_try_again);
+ }
}
if (pwdchange & PWDCHANGE_INTERNAL)
vm_change_password(vmu, newpassword);
if (cmd != 0) {
ast_log(AST_LOG_NOTICE, "Invalid password for user %s (%s)\n", vms->username, newpassword);
cmd = ast_play_and_wait(chan, vm_invalid_password);
+ if (!cmd) {
+ cmd = ast_play_and_wait(chan, vm_pls_try_again);
+ }
break;
}
newpassword2[1] = '\0';
if (strcmp(newpassword, newpassword2)) {
ast_log(AST_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 (pwdchange & PWDCHANGE_INTERNAL)
ast_copy_string(vm_reenterpassword, val, sizeof(vm_reenterpassword));
if ((val = ast_variable_retrieve(cfg, "general", "vm-mismatch")))
ast_copy_string(vm_mismatch, val, sizeof(vm_mismatch));
+ if ((val = ast_variable_retrieve(cfg, "general", "vm-pls-try-again"))) {
+ ast_copy_string(vm_pls_try_again, val, sizeof(vm_pls_try_again));
+ }
/* load configurable audio prompts */
if ((val = ast_variable_retrieve(cfg, "general", "listen-control-forward-key")) && is_valid_dtmf(val))
ast_copy_string(listen_control_forward_key, val, sizeof(listen_control_forward_key));
; vm-mismatch=custom_sound
; Customize which sound file is used instead of the default
; prompt that says: "The passwords you entered and re-entered
- ; did not match. Please try again."
+ ; did not match."
; vm-invalid-password=custom_sound
; Customize which sound file is used instead of the default
; prompt that says: ...
+; vm-pls-try-again=custom_sound
+ ; Customize which sound file is used instead of the
+ ; default prompt that says "Please try again."
; listen-control-forward-key=# ; Customize the key that fast-forwards message playback
; listen-control-reverse-key=* ; Customize the key that rewinds message playback
; listen-control-pause-key=0 ; Customize the key that pauses/unpauses message playback
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.asterisk.org/pub/telephony/sounds/releases
MCS:=$(subst -EN-,-en-,$(MENUSELECT_CORE_SOUNDS))