Merged revisions 218361 via svnmerge from

https://origsvn.digium.com/svn/asterisk/trunk

................
  r218361 | tilghman | 2009-09-14 14:29:48 -0500 (Mon, 14 Sep 2009) | 11 lines
  
  Recorded merge of revisions 218331 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.4
  
  ........
    r218331 | tilghman | 2009-09-14 14:16:35 -0500 (Mon, 14 Sep 2009) | 4 lines
    
    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: http://svn.digium.com/svn/asterisk/branches/1.6.0@218362 f38db490-d61c-443f-a65b-d21fe96a405b

3 files changed, 15 insertions, 2 deletions

diff --git a/apps/app_voicemail.c b/apps/app_voicemail.c
index 04ad657f1..64fb016ad 100644
--- a/apps/app_voicemail.c
+++ b/apps/app_voicemail.c
@@ -634,6 +634,7 @@ static char vm_newpassword[80] = "vm-newpassword";
 static char vm_passchanged[80] = "vm-passchanged";
 static char vm_reenterpassword[80] = "vm-reenterpassword";
 static char vm_mismatch[80] = "vm-mismatch";
+static char vm_pls_try_again[80] = "vm-pls-try-again";
 
 static struct ast_flags globalflags = {0};
 
@@ -7349,6 +7350,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 (pwdchange & PWDCHANGE_INTERNAL)
 		vm_change_password(vmu, newpassword);
@@ -7457,6 +7461,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 (pwdchange & PWDCHANGE_INTERNAL)
@@ -9575,6 +9582,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 7b10c6ef2..1ddbf5674 100644
--- a/configs/voicemail.conf.sample
+++ b/configs/voicemail.conf.sample
@@ -279,7 +279,10 @@ 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-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 b9c306c44..eb0cc9036 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.digium.com/pub/telephony/sounds/releases
 MCS:=$(subst -EN-,-en-,$(MENUSELECT_CORE_SOUNDS))