[svn-commits] mmichelson: branch 1.6.1 r163214 - in /branches/1.6.1: ./ apps/ configs/

[SVN commits to the Digium repositories]

Author: mmichelson
Date: Thu Dec 11 15:00:25 2008
New Revision: 163214

URL: http://svn.digium.com/view/asterisk?view=rev&rev=163214
Log:
Merged revisions 163213 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/trunk

........
r163213 | mmichelson | 2008-12-11 14:57:44 -0600 (Thu, 11 Dec 2008) | 9 lines

Add an option to voicemail.conf to allow urgent messages to be
forwarded as not urgent.

(closes issue #14063)
Reported by: jaroth
Patches:
      urgfwd_v2.patch uploaded by jaroth (license 50)


........

Modified:
    branches/1.6.1/   (props changed)
    branches/1.6.1/apps/app_voicemail.c
    branches/1.6.1/configs/voicemail.conf.sample

Propchange: branches/1.6.1/
------------------------------------------------------------------------------
Binary property 'trunk-merged' - no diff available.

Modified: branches/1.6.1/apps/app_voicemail.c
URL: http://svn.digium.com/view/asterisk/branches/1.6.1/apps/app_voicemail.c?view=diff&rev=163214&r1=163213&r2=163214
==============================================================================
--- branches/1.6.1/apps/app_voicemail.c (original)
+++ branches/1.6.1/apps/app_voicemail.c Thu Dec 11 15:00:25 2008
@@ -224,6 +224,7 @@
 #define VM_TEMPGREETWARN (1 << 15)  /*!< Remind user tempgreeting is set */
 #define VM_MOVEHEARD     (1 << 16)  /*!< Move a "heard" message to Old after listening to it */
 #define VM_MESSAGEWRAP   (1 << 17)  /*!< Wrap around from the last message to the first, and vice-versa */
+#define VM_FWDURGAUTO    (1 << 18)  /*!< Autoset of Urgent flag on forwarded Urgent messages set globally */
 #define ERROR_LOCK_PATH  -100
 
 
@@ -6163,7 +6164,9 @@
 	char urgent_str[7] = "";
 	char tmptxtfile[PATH_MAX];
 
-	ast_copy_string(urgent_str, urgent ? "Urgent" : "", sizeof(urgent_str));
+	if (ast_test_flag((&globalflags), VM_FWDURGAUTO)) {
+		ast_copy_string(urgent_str, urgent ? "Urgent" : "", sizeof(urgent_str));
+	}
 
 	if (vms == NULL) return -1;
 	dir = vms->curdir;
@@ -10550,6 +10553,12 @@
 		}
 		ast_set2_flag((&globalflags), ast_true(val), VM_MOVEHEARD);	
 
+		if (!(val = ast_variable_retrieve(cfg, "general", "forward_urgent_auto"))) {
+			ast_debug(1,"Autoset of Urgent flag on forwarded Urgent messages disabled globally\n");
+			val = "no";
+		}
+		ast_set2_flag((&globalflags), ast_true(val), VM_FWDURGAUTO);	
+
 		if (!(val = ast_variable_retrieve(cfg, "general", "sayduration"))) {
 			ast_debug(1,"Duration info before msg enabled globally\n");
 			val = "yes";

Modified: branches/1.6.1/configs/voicemail.conf.sample
URL: http://svn.digium.com/view/asterisk/branches/1.6.1/configs/voicemail.conf.sample?view=diff&rev=163214&r1=163213&r2=163214
==============================================================================
--- branches/1.6.1/configs/voicemail.conf.sample (original)
+++ branches/1.6.1/configs/voicemail.conf.sample Thu Dec 11 15:00:25 2008
@@ -54,6 +54,10 @@
 ;
 ; Move heard messages to the 'Old' folder automagically.  Defaults to on.
 ;moveheard=yes
+;
+; Forward an urgent message as an urgent message.  Defaults to no so
+; sender can set the urgency on the envelope of the forwarded message.
+;forward_urgent_auto=no
 ;
 ; User context is where entries from users.conf are registered.  The
 ; default value is 'default'