[svn-commits] branch 1.2 - r7999 in /branches/1.2: apps/ configs/

[svn-commits at lists.digium.com]

Author: tilghman
Date: Thu Jan 12 00:14:22 2006
New Revision: 7999

URL: http://svn.digium.com/view/asterisk?rev=7999&view=rev
Log:
Bug 6211 - Add option deletevoicemail as equivalent to option delete for Realtime

Modified:
    branches/1.2/apps/app_voicemail.c
    branches/1.2/configs/voicemail.conf.sample

Modified: branches/1.2/apps/app_voicemail.c
URL: http://svn.digium.com/view/asterisk/branches/1.2/apps/app_voicemail.c?rev=7999&r1=7998&r2=7999&view=diff
==============================================================================
--- branches/1.2/apps/app_voicemail.c (original)
+++ branches/1.2/apps/app_voicemail.c Thu Jan 12 00:14:22 2006
@@ -445,7 +445,7 @@
 		ast_copy_string(vmu->language, value, sizeof(vmu->language));
 	} else if (!strcasecmp(var, "tz")) {
 		ast_copy_string(vmu->zonetag, value, sizeof(vmu->zonetag));
-	} else if (!strcasecmp(var, "delete")) {
+	} else if (!strcasecmp(var, "delete") || !strcasecmp(var, "deletevoicemail")) {
 		ast_set2_flag(vmu, ast_true(value), VM_DELETE);	
 	} else if (!strcasecmp(var, "saycid")){
 		ast_set2_flag(vmu, ast_true(value), VM_SAYCID);	
@@ -2613,8 +2613,8 @@
 				}
 			}
 			if (ast_fileexists(fn, NULL, NULL)) {
+				STORE(dir, vmu->mailbox, vmu->context, msgnum);
 				notify_new_message(chan, vmu, msgnum, duration, fmt, chan->cid.cid_num, chan->cid.cid_name);
-				STORE(dir, vmu->mailbox, vmu->context, msgnum);
 				DISPOSE(dir, msgnum);
 			}
 			pbx_builtin_setvar_helper(chan, "VMSTATUS", "SUCCESS");

Modified: branches/1.2/configs/voicemail.conf.sample
URL: http://svn.digium.com/view/asterisk/branches/1.2/configs/voicemail.conf.sample?rev=7999&r1=7998&r2=7999&view=diff
==============================================================================
--- branches/1.2/configs/voicemail.conf.sample (original)
+++ branches/1.2/configs/voicemail.conf.sample Thu Jan 12 00:14:22 2006
@@ -172,6 +172,7 @@
 			;     This does NOT affect option 3,3 from the advanced options menu
 ; delete=yes		; After notification, the voicemail is deleted from the server. [per-mailbox only]
 			;     This is intended for use with users who wish to receive their voicemail ONLY by email.
+			;     Note:  deletevoicemail is provided as an equivalent option for Realtime configuration.
 ; nextaftercmd=yes	; Skips to the next message after hitting 7 or 9 to delete/save current message.
 			;     [global option only at this time] 
 ; forcename=yes		; Forces a new user to record their name.  A new user is