diff options
| -rw-r--r-- | apps/app_voicemail.c | 13 | ||||
| -rw-r--r-- | configs/voicemail.conf.sample | 5 | ||||
| -rw-r--r-- | sounds/Makefile | 2 |
3 files changed, 18 insertions, 2 deletions
diff --git a/apps/app_voicemail.c b/apps/app_voicemail.c index a61af0ef0..536a9aa85 100644 --- a/apps/app_voicemail.c +++ b/apps/app_voicemail.c @@ -783,6 +783,7 @@ static char vm_passchanged[80] = "vm-passchanged"; 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}; @@ -8431,6 +8432,9 @@ static int vm_newuser(struct ast_channel *chan, struct ast_vm_user *vmu, struct } 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); @@ -8528,6 +8532,9 @@ static int vm_options(struct ast_channel *chan, struct ast_vm_user *vmu, struct 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'; @@ -8545,6 +8552,9 @@ static int vm_options(struct ast_channel *chan, struct ast_vm_user *vmu, struct 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) @@ -10965,6 +10975,9 @@ static int load_config(int reload) 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)); diff --git a/configs/voicemail.conf.sample b/configs/voicemail.conf.sample index 25336425d..18615dcd8 100644 --- a/configs/voicemail.conf.sample +++ b/configs/voicemail.conf.sample @@ -296,10 +296,13 @@ sendvoicemail=yes ; Allow the user to compose and send a voicemail while inside ; 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 diff --git a/sounds/Makefile b/sounds/Makefile index c0e39cb5f..6ce8ba950 100644 --- a/sounds/Makefile +++ b/sounds/Makefile @@ -17,7 +17,7 @@ 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)) |