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

[FreeSWITCH SVN]

Author: anthm
Date: Wed Dec  3 10:45:20 2008
New Revision: 10569

Log:
MODAPP-172

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	Wed Dec  3 10:45:20 2008
@@ -2241,11 +2241,9 @@
 			vm_notify_email = switch_core_strdup(pool, val);
 		} else if (!strcasecmp(var, "email-addr")) {
 			email_addr = switch_core_strdup(pool, val);
-		} else if (!strcasecmp(var, "vm-email-all-messages")) {
-			send_main = switch_true(val);
+		} else if (!strcasecmp(var, "vm-email-all-messages") && (send_main = switch_true(val))) {
 			send_mail++;
-		} else if (!strcasecmp(var, "vm-notify-email-all-messages")) {
-			send_notify = switch_true(val);
+		} else if (!strcasecmp(var, "vm-notify-email-all-messages") && (send_notify = switch_true(val))) {
 			send_mail++;
 		} else if (!strcasecmp(var, "vm-keep-local-after-email")) {
 			insert_db = switch_true(val);
@@ -2684,13 +2682,11 @@
 						vm_notify_email = switch_core_session_strdup(session, val);
 					} else if (!strcasecmp(var, "email-addr")) {
 						email_addr = switch_core_session_strdup(session, val);
-					} else if (!strcasecmp(var, "vm-email-all-messages")) {
-						send_main = switch_true(val);
+					} else if (!strcasecmp(var, "vm-email-all-messages") && (send_main = switch_true(val))) {
 						send_mail++;
 					} else if (!strcasecmp(var, "storage-dir")) {
 						vm_storage_dir = switch_core_session_strdup(session, val);
-					} else if (!strcasecmp(var, "vm-notify-email-all-messages")) {
-						send_notify = switch_true(val);
+					} else if (!strcasecmp(var, "vm-notify-email-all-messages") && (send_notify = switch_true(val))) {
 						send_mail++;
 					} else if (!strcasecmp(var, "vm-keep-local-after-email")) {
 						insert_db = switch_true(val);
@@ -2768,7 +2764,7 @@
 		if (num > 0 && num <= VM_MAX_GREETINGS) {
 			greet_path = switch_mprintf("%s%sgreeting_%d.%s", dir_path, SWITCH_PATH_SEPARATOR, num, profile->file_ext);
 		}
-	} else {
+	} else if (!(greet_path = (char *) switch_channel_get_variable(channel, "voicemail_greeting_path"))) {
 		greet_path = cbt.greeting_path;
 	}