[Freeswitch-svn] [commit] r10594 - freeswitch/trunk/src/mod/applications/mod_voicemail

[FreeSWITCH SVN]

Author: anthm
Date: Thu Dec  4 10:22:43 2008
New Revision: 10594

Log:
MODAPP-174

Modified:
   freeswitch/trunk/src/mod/applications/mod_voicemail/mod_voicemail.c

Modified: freeswitch/trunk/src/mod/applications/mod_voicemail/mod_voicemail.c
==============================================================================
--- freeswitch/trunk/src/mod/applications/mod_voicemail/mod_voicemail.c	(original)
+++ freeswitch/trunk/src/mod/applications/mod_voicemail/mod_voicemail.c	Thu Dec  4 10:22:43 2008
@@ -2640,6 +2640,7 @@
 	int send_main = 0;
 	int send_notify = 0;
 	int insert_db = 1;
+	const char *read_id = NULL;
 	const char *caller_id_name = NULL;
 	const char *caller_id_number = NULL;
 	switch_xml_t x_domain = NULL, x_domain_root = NULL, x_user = NULL, x_params = NULL, x_param = NULL;
@@ -2692,6 +2693,8 @@
 						insert_db = switch_true(val);
 					} else if (!strcasecmp(var, "vm-attach-file")) {
 						email_attach = switch_true(val);
+					} else if (!strcasecmp(var, "vm-alternate-greet-id")) {
+						read_id = switch_core_session_strdup(session, val);
 					}
 				}
 			}
@@ -2783,9 +2786,10 @@
 			TRY_CODE(switch_ivr_play_file(session, NULL, cbt.name_path, &args));
 		}
 		if (*buf == '\0') {
-			const char *read_id;
-			if (!(read_id = switch_channel_get_variable(channel, "voicemail_alternate_greet_id"))) {
-				read_id = id;
+			if (!read_id) {
+				if (!(read_id = switch_channel_get_variable(channel, "voicemail_alternate_greet_id"))) {
+					read_id = id;
+				}
 			}
 			memset(buf, 0, sizeof(buf));
 			TRY_CODE(switch_ivr_phrase_macro(session, VM_PLAY_GREETING_MACRO, read_id, NULL, &args));