<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[Freeswitch-trunk][14990] </title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<div id="header">FreeSWITCH Subversion</div>
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://fisheye.freeswitch.org/changelog/FreeSWITCH?cs=14990">14990</a></dd>
<dt>Author</dt> <dd>mochouinard</dd>
<dt>Date</dt> <dd>2009-09-25 16:27:00 -0500 (Fri, 25 Sep 2009)</dd>
</dl>
<h3>Log Message</h3>
<pre>mod_voicemail: Add ability to skip greeting and instructions when leaving voicemail (<a href="http://jira.freeswitch.org/browse/MODAPP-331">MODAPP-331</a>)
Add 1 or 2 of these variable in your user directory :
skip_greeting = Will skip the user greeting or generated greeting
skip_instructions = Will skip the system standards instructions to record message </pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#freeswitchtrunksrcmodapplicationsmod_voicemailmod_voicemailc">freeswitch/trunk/src/mod/applications/mod_voicemail/mod_voicemail.c</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="freeswitchtrunksrcmodapplicationsmod_voicemailmod_voicemailc"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/src/mod/applications/mod_voicemail/mod_voicemail.c (14989 => 14990)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/src/mod/applications/mod_voicemail/mod_voicemail.c 2009-09-25 21:18:09 UTC (rev 14989)
+++ freeswitch/trunk/src/mod/applications/mod_voicemail/mod_voicemail.c 2009-09-25 21:27:00 UTC (rev 14990)
</span><span class="lines">@@ -2826,6 +2826,11 @@
</span><span class="cx"> switch_event_t *vars = NULL;
</span><span class="cx"> const char *vm_cc = NULL, *vtmp, *vm_ext = NULL;
</span><span class="cx"> int disk_quota = 0;
</span><ins>+ switch_bool_t skip_greeting = switch_true(switch_channel_get_variable(channel, "skip_greeting"));
+ switch_bool_t skip_instructions = switch_true(switch_channel_get_variable(channel, "skip_instructions"));
+
+ switch_channel_set_variable(channel, "skip_greeting", NULL);
+ switch_channel_set_variable(channel, "skip_instructions", NULL);
</ins><span class="cx">
</span><span class="cx"> if (!(caller_id_name = switch_channel_get_variable(channel, "effective_caller_id_name"))) {
</span><span class="cx"> caller_id_name = caller_profile->caller_id_name;
</span><span class="lines">@@ -2949,72 +2954,78 @@
</span><span class="cx"> greet_path = cbt.greeting_path;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- greet:
- memset(buf, 0, sizeof(buf));
- args.input_callback = cancel_on_dtmf;
- args.buf = buf;
- args.buflen = sizeof(buf);
</del><ins>+greet:
+ if (!skip_greeting) {
+ memset(buf, 0, sizeof(buf));
+ args.input_callback = cancel_on_dtmf;
+ args.buf = buf;
+ args.buflen = sizeof(buf);
</ins><span class="cx">
</span><del>- switch_ivr_sleep(session, 100, SWITCH_TRUE, NULL);
</del><ins>+ switch_ivr_sleep(session, 100, SWITCH_TRUE, NULL);
</ins><span class="cx">
</span><del>- if (!switch_strlen_zero(greet_path)) {
- memset(buf, 0, sizeof(buf));
- TRY_CODE(switch_ivr_play_file(session, NULL, greet_path, &args));
- } else {
- if (!switch_strlen_zero(cbt.name_path)) {
</del><ins>+ if (!switch_strlen_zero(greet_path)) {
</ins><span class="cx"> memset(buf, 0, sizeof(buf));
</span><del>- TRY_CODE(switch_ivr_play_file(session, NULL, cbt.name_path, &args));
- }
- if (*buf == '\0') {
- if (!read_id) {
- if (!(read_id = switch_channel_get_variable(channel, "voicemail_alternate_greet_id"))) {
- read_id = id;
</del><ins>+ TRY_CODE(switch_ivr_play_file(session, NULL, greet_path, &args));
+ } else {
+ if (!switch_strlen_zero(cbt.name_path)) {
+ memset(buf, 0, sizeof(buf));
+ TRY_CODE(switch_ivr_play_file(session, NULL, cbt.name_path, &args));
+ }
+ if (*buf == '\0') {
+ if (!read_id) {
+ if (!(read_id = switch_channel_get_variable(channel, "voicemail_alternate_greet_id"))) {
+ read_id = id;
+ }
</ins><span class="cx"> }
</span><ins>+ memset(buf, 0, sizeof(buf));
+ TRY_CODE(switch_ivr_phrase_macro(session, VM_PLAY_GREETING_MACRO, read_id, NULL, &args));
</ins><span class="cx"> }
</span><del>- memset(buf, 0, sizeof(buf));
- TRY_CODE(switch_ivr_phrase_macro(session, VM_PLAY_GREETING_MACRO, read_id, NULL, &args));
</del><span class="cx"> }
</span><del>- }
</del><span class="cx">
</span><del>- if (*buf != '\0') {
- greet_key_press:
- if (switch_stristr(buf, profile->login_keys)) {
- voicemail_check_main(session, profile, domain_name, id, 0);
- } else if (!strcasecmp(buf, profile->operator_key) && !switch_strlen_zero(profile->operator_key)) {
- int argc;
- char *argv[4];
- char *mycmd;
</del><ins>+ if (*buf != '\0') {
+greet_key_press:
+ if (switch_stristr(buf, profile->login_keys)) {
+ voicemail_check_main(session, profile, domain_name, id, 0);
+ } else if (!strcasecmp(buf, profile->operator_key) && !switch_strlen_zero(profile->operator_key)) {
+ int argc;
+ char *argv[4];
+ char *mycmd;
</ins><span class="cx">
</span><del>- if (!switch_strlen_zero(profile->operator_ext) && (mycmd = switch_core_session_strdup(session, profile->operator_ext))) {
- argc = switch_separate_string(mycmd, ' ', argv, (sizeof(argv) / sizeof(argv[0])));
- if (argc >= 1 && argc <= 4) {
- switch_ivr_session_transfer(session, argv[0], argv[1], argv[2]);
- /* the application still runs after we leave it so we need to make sure that we don't do anything evil */
- send_mail = 0;
- goto end;
- }
- }
- } else if (!strcasecmp(buf, profile->vmain_key) && !switch_strlen_zero(profile->vmain_key)) {
- int argc;
- char *argv[4];
- char *mycmd;
</del><ins>+ if (!switch_strlen_zero(profile->operator_ext) && (mycmd = switch_core_session_strdup(session, profile->operator_ext))) {
+ argc = switch_separate_string(mycmd, ' ', argv, (sizeof(argv) / sizeof(argv[0])));
+ if (argc >= 1 && argc <= 4) {
+ switch_ivr_session_transfer(session, argv[0], argv[1], argv[2]);
+ /* the application still runs after we leave it so we need to make sure that we don't do anything evil */
+ send_mail = 0;
+ goto end;
+ }
+ }
+ } else if (!strcasecmp(buf, profile->vmain_key) && !switch_strlen_zero(profile->vmain_key)) {
+ int argc;
+ char *argv[4];
+ char *mycmd;
</ins><span class="cx">
</span><del>- if (!switch_strlen_zero(profile->vmain_ext) && (mycmd = switch_core_session_strdup(session, profile->vmain_ext))) {
- argc = switch_separate_string(mycmd, ' ', argv, (sizeof(argv) / sizeof(argv[0])));
- if (argc >= 1 && argc <= 4) {
- switch_ivr_session_transfer(session, argv[0], argv[1], argv[2]);
- /* the application still runs after we leave it so we need to make sure that we don't do anything evil */
- send_mail = 0;
- goto end;
- }
</del><ins>+ if (!switch_strlen_zero(profile->vmain_ext) && (mycmd = switch_core_session_strdup(session, profile->vmain_ext))) {
+ argc = switch_separate_string(mycmd, ' ', argv, (sizeof(argv) / sizeof(argv[0])));
+ if (argc >= 1 && argc <= 4) {
+ switch_ivr_session_transfer(session, argv[0], argv[1], argv[2]);
+ /* the application still runs after we leave it so we need to make sure that we don't do anything evil */
+ send_mail = 0;
+ goto end;
+ }
+ }
+ } else if (*profile->skip_greet_key && !strcasecmp(buf, profile->skip_greet_key)) {
+ skip_instructions = SWITCH_TRUE;
+ } else {
+ goto greet;
</ins><span class="cx"> }
</span><del>- } else if (*profile->skip_greet_key && !strcasecmp(buf, profile->skip_greet_key)) {
- record_macro = NULL;
- } else {
- goto greet;
</del><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ if (skip_instructions) {
+ record_macro = NULL;
+ }
+
</ins><span class="cx"> if (disk_quota) {
</span><span class="cx"> callback_t callback = { 0 };
</span><span class="cx"> char sqlstmt[256];
</span></span></pre>
</div>
</div>
<div id="footer">See you at ClueCon</div>
</body>
</html>