<!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][16289] </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=16289">16289</a></dd>
<dt>Author</dt> <dd>anthm</dd>
<dt>Date</dt> <dd>2010-01-13 14:29:21 -0600 (Wed, 13 Jan 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>update on last commit</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 (16288 => 16289)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/src/mod/applications/mod_voicemail/mod_voicemail.c 2010-01-13 20:14:36 UTC (rev 16288)
+++ freeswitch/trunk/src/mod/applications/mod_voicemail/mod_voicemail.c 2010-01-13 20:29:21 UTC (rev 16289)
</span><span class="lines">@@ -1525,7 +1525,7 @@
</span><span class="cx">
</span><span class="cx"> TRY_CODE(switch_ivr_read(session, 0, sizeof(vm_cc), macro_buf, NULL, vm_cc, sizeof(vm_cc), profile->digit_timeout, profile->terminator_key));
</span><span class="cx">
</span><del>- cmd = switch_core_session_sprintf(session, "%s@%s %s %s %s", vm_cc, cbt->domain, new_file_path, cbt->cid_number, cbt->cid_name);
</del><ins>+ cmd = switch_core_session_sprintf(session, "%s@%s %s %s '%s'", vm_cc, cbt->domain, new_file_path, cbt->cid_number, cbt->cid_name);
</ins><span class="cx">
</span><span class="cx"> if (voicemail_inject(cmd) == SWITCH_STATUS_SUCCESS) {
</span><span class="cx"> switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_NOTICE, "Sent Carbon Copy to %s\n", vm_cc);
</span><span class="lines">@@ -2625,10 +2625,11 @@
</span><span class="cx"> switch_status_t status = SWITCH_STATUS_SUCCESS;
</span><span class="cx"> int isgroup = 0, isall = 0;
</span><span class="cx"> int argc = 0;
</span><del>- char *argv[5] = { 0 };
</del><ins>+ char *argv[6] = { 0 };
</ins><span class="cx"> char *box, *path, *cid_num, *cid_name;
</span><span class="cx"> switch_memory_pool_t *pool = NULL;
</span><span class="cx"> char *forwarded_by = NULL;
</span><ins>+ char *read_flags = "B";
</ins><span class="cx">
</span><span class="cx"> if (zstr(data)) {
</span><span class="cx"> status = SWITCH_STATUS_FALSE;
</span><span class="lines">@@ -2649,6 +2650,9 @@
</span><span class="cx"> cid_num = argv[2] ? argv[2] : "anonymous";
</span><span class="cx"> cid_name = argv[3] ? argv[3] : "anonymous";
</span><span class="cx"> forwarded_by = argv[4];
</span><ins>+ if (!zstr(argv[5])) {
+ read_flags = argv[5];
+ }
</ins><span class="cx">
</span><span class="cx"> user = box;
</span><span class="cx">
</span><span class="lines">@@ -2736,14 +2740,14 @@
</span><span class="cx">
</span><span class="cx"> if (switch_xml_locate_user_in_domain(uname, x_domain, &ux, NULL) == SWITCH_STATUS_SUCCESS) {
</span><span class="cx"> switch_event_create(&my_params, SWITCH_EVENT_REQUEST_PARAMS);
</span><del>- status = deliver_vm(profile, ux, domain, path, 0, "B", my_params, pool, cid_name, cid_num, forwarded_by, SWITCH_TRUE);
</del><ins>+ status = deliver_vm(profile, ux, domain, path, 0, read_flags, my_params, pool, cid_name, cid_num, forwarded_by, SWITCH_TRUE);
</ins><span class="cx"> switch_event_destroy(&my_params);
</span><span class="cx"> }
</span><span class="cx"> continue;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> switch_event_create(&my_params, SWITCH_EVENT_REQUEST_PARAMS);
</span><del>- status = deliver_vm(profile, ut, domain, path, 0, "B", my_params, pool, cid_name, cid_num, forwarded_by, SWITCH_TRUE);
</del><ins>+ status = deliver_vm(profile, ut, domain, path, 0, read_flags, my_params, pool, cid_name, cid_num, forwarded_by, SWITCH_TRUE);
</ins><span class="cx"> switch_event_destroy(&my_params);
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="lines">@@ -2764,7 +2768,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> switch_event_create(&my_params, SWITCH_EVENT_REQUEST_PARAMS);
</span><del>- status = deliver_vm(profile, ut, domain, path, 0, "B", my_params, pool, cid_name, cid_num, forwarded_by, SWITCH_TRUE);
</del><ins>+ status = deliver_vm(profile, ut, domain, path, 0, read_flags, my_params, pool, cid_name, cid_num, forwarded_by, SWITCH_TRUE);
</ins><span class="cx"> switch_event_destroy(&my_params);
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="lines">@@ -2776,7 +2780,7 @@
</span><span class="cx">
</span><span class="cx"> if ((status = switch_xml_locate_user_in_domain(user, x_domain, &ut, &x_group)) == SWITCH_STATUS_SUCCESS) {
</span><span class="cx"> switch_event_create(&my_params, SWITCH_EVENT_REQUEST_PARAMS);
</span><del>- status = deliver_vm(profile, ut, domain, path, 0, "B", my_params, pool, cid_name, cid_num, forwarded_by, SWITCH_TRUE);
</del><ins>+ status = deliver_vm(profile, ut, domain, path, 0, read_flags, my_params, pool, cid_name, cid_num, forwarded_by, SWITCH_TRUE);
</ins><span class="cx"> switch_event_destroy(&my_params);
</span><span class="cx"> } else {
</span><span class="cx"> status = SWITCH_STATUS_FALSE;
</span><span class="lines">@@ -3116,7 +3120,8 @@
</span><span class="cx"> switch_event_destroy(&vars);
</span><span class="cx"> if (status == SWITCH_STATUS_SUCCESS) {
</span><span class="cx"> if ((vm_cc = switch_channel_get_variable(channel, "vm_cc"))) {
</span><del>- char *cmd = switch_core_session_sprintf(session, "%s %s %s %s %s@%s", vm_cc, file_path, caller_id_number, caller_id_name, id, domain_name);
</del><ins>+ char *cmd = switch_core_session_sprintf(session, "%s %s %s %s %s@%s %s",
+ vm_cc, file_path, caller_id_number, caller_id_name, id, domain_name, read_flags);
</ins><span class="cx">
</span><span class="cx"> if (voicemail_inject(cmd) == SWITCH_STATUS_SUCCESS) {
</span><span class="cx"> switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_NOTICE, "Sent Carbon Copy to %s\n", vm_cc);
</span></span></pre>
</div>
</div>
<div id="footer">See you at ClueCon</div>
</body>
</html>