[Freeswitch-svn] [commit] r13314 - in freeswitch/trunk: conf/lang/en/vm src/mod/applications/mod_voicemail

FreeSWITCH SVN brian at freeswitch.org
Thu May 14 15:47:44 PDT 2009


Author: brian
Date: Thu May 14 17:47:44 2009
New Revision: 13314

Log:
 MODAPP-173 you'll need the latest sounds and a make vm-sync to use this 

Modified:
   freeswitch/trunk/conf/lang/en/vm/sounds.xml
   freeswitch/trunk/src/mod/applications/mod_voicemail/mod_voicemail.c

Modified: freeswitch/trunk/conf/lang/en/vm/sounds.xml
==============================================================================
--- freeswitch/trunk/conf/lang/en/vm/sounds.xml	(original)
+++ freeswitch/trunk/conf/lang/en/vm/sounds.xml	Thu May 14 17:47:44 2009
@@ -332,4 +332,13 @@
     </input>
   </macro>
 
+  <macro name="voicemail_disk_quota_exceeded">
+    <input pattern="^(.*)$">
+        <match>
+            <action function="play-file" data="voicemail/vm-mailbox_full.wav"/>
+        </match>
+    </input>
+  </macro>
+
+
 </include><!--This line will be ignored it's here to validate the xml and is optional -->

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 May 14 17:47:44 2009
@@ -1046,6 +1046,7 @@
 #define VM_HELLO_MACRO "voicemail_hello"
 #define VM_GOODBYE_MACRO "voicemail_goodbye"
 #define VM_MESSAGE_COUNT_MACRO "voicemail_message_count"
+#define VM_DISK_QUOTA_EXCEEDED_MACRO "voicemail_disk_quota_exceeded"
 #define URGENT_FLAG_STRING "A_URGENT"
 #define NORMAL_FLAG_STRING "B_NORMAL"
 
@@ -2844,6 +2845,7 @@
 	switch_xml_t x_domain = NULL, x_domain_root = NULL, x_user = NULL, x_params = NULL, x_param = NULL;
 	switch_event_t *vars = NULL;
 	const char *vm_cc = NULL, *vtmp, *vm_ext = NULL;
+	int disk_quota = 0;
 	switch_event_t *params = NULL;
 	
 	if (!(caller_id_name = switch_channel_get_variable(channel, "effective_caller_id_name"))) {
@@ -2888,6 +2890,8 @@
 						insert_db = switch_true(val);
 					} else if (!strcasecmp(var, "vm-attach-file")) {
 						email_attach = switch_true(val);
+					} else if (!strcasecmp(var, "vm-disk-quota")) {
+						disk_quota = atoi(val);
 					} else if (!strcasecmp(var, "vm-alternate-greet-id")) {
 						read_id = switch_core_session_strdup(session, val);
 					}
@@ -3032,6 +3036,27 @@
 		}
 	}
 
+	if (disk_quota) {
+		callback_t cbt = { 0 };
+		char sql[256];
+		char disk_usage[256]; 
+
+		cbt.buf = disk_usage;
+		cbt.len = sizeof(disk_usage);
+
+		switch_snprintf(sql, sizeof(sql),
+						"select sum(message_len) from voicemail_msgs where username='%s' and domain='%s'",
+						id, domain_name);
+		vm_execute_sql_callback(profile, profile->mutex, sql, sql2str_callback, &cbt);
+
+		if (atoi(disk_usage) >= disk_quota) {
+			switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_NOTICE, "Voicemail disk quota is exceeded for %s\n", id);
+			TRY_CODE(switch_ivr_phrase_macro(session, VM_DISK_QUOTA_EXCEEDED_MACRO, NULL, NULL, NULL));
+			goto end;
+		}
+	}
+
+
 	memset(&fh, 0, sizeof(fh));
 	args.input_callback = control_playback;
 	memset(&cc, 0, sizeof(cc));



More information about the Freeswitch-svn mailing list