<!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][16673] </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=16673">16673</a></dd>
<dt>Author</dt> <dd>anthm</dd>
<dt>Date</dt> <dd>2010-02-16 23:00:01 -0600 (Tue, 16 Feb 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>add vm_list vm_delete and alias voicemail_inject to vm_inject</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 (16672 => 16673)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/src/mod/applications/mod_voicemail/mod_voicemail.c 2010-02-17 03:09:21 UTC (rev 16672)
+++ freeswitch/trunk/src/mod/applications/mod_voicemail/mod_voicemail.c 2010-02-17 05:00:01 UTC (rev 16673)
</span><span class="lines">@@ -3907,6 +3907,156 @@
</span><span class="cx"> return SWITCH_STATUS_SUCCESS;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+
+static int api_del_callback(void *pArg, int argc, char **argv, char **columnNames)
+{
+
+ unlink(argv[2]);
+
+ return 0;
+}
+
+
+#define VM_DELETE_USAGE "<id>@<domain>[/profile] [<uuid>]"
+SWITCH_STANDARD_API(voicemail_delete_api_function)
+{
+ char *sql;
+ char *id = NULL, *domain = NULL, *uuid = NULL, *profile_name = "default";
+ char *p, *e = NULL;
+ vm_profile_t *profile;
+
+ if (zstr(cmd)) {
+ stream->write_function(stream, "Usage: %s\n", VM_DELETE_USAGE);
+ return SWITCH_STATUS_SUCCESS;
+ }
+
+ id = strdup(cmd);
+
+ if ((p = strchr(id, '@'))) {
+ *p++ = '\0';
+ domain = e = p;
+ }
+
+ if ((p = strchr(domain, '/'))) {
+ *p++ = '\0';
+ profile_name = e = p;
+ }
+
+ if (e && (p = strchr(e, ' '))) {
+ *p++ = '\0';
+ uuid = p;
+ }
+
+
+ if (id && domain && profile_name && (profile = get_profile(profile_name))) {
+
+ if (uuid) {
+ sql = switch_mprintf("select username, domain, in_folder, file_path from voicemail_msgs where uuid='%q'", uuid);
+ } else {
+ sql = switch_mprintf("select username, domain, in_folder, file_path from voicemail_msgs where username='%q' and domain='%q'", id, domain);
+ }
+
+ vm_execute_sql_callback(profile, profile->mutex, sql, api_del_callback, profile);
+ switch_safe_free(sql);
+
+ if (uuid) {
+ sql = switch_mprintf("delete from voicemail_msgs where uuid='%q'", uuid);
+ } else {
+ sql = switch_mprintf("delete from voicemail_msgs where username='%q' and domain='%q'", id, domain);
+ }
+
+ vm_execute_sql(profile, sql, profile->mutex);
+ switch_safe_free(sql);
+
+ update_mwi(profile, id, domain, "inbox");
+
+ stream->write_function(stream, "%s", "+OK\n");
+ } else {
+ stream->write_function(stream, "%s", "-ERR can't find user or profile.\n");
+ }
+
+ switch_safe_free(id);
+
+ return SWITCH_STATUS_SUCCESS;
+}
+
+
+
+static int api_list_callback(void *pArg, int argc, char **argv, char **columnNames)
+{
+ switch_stream_handle_t *stream = (switch_stream_handle_t *) pArg;
+
+ if (!strcasecmp(argv[5], "xml")) {
+ stream->write_function(stream, " <message>\n");
+ stream->write_function(stream, " <username>%s</username>\n", argv[0]);
+ stream->write_function(stream, " <domain>%s</domain>\n", argv[1]);
+ stream->write_function(stream, " <folder>%s</folder>\n", argv[2]);
+ stream->write_function(stream, " <path>%s</path>\n", argv[3]);
+ stream->write_function(stream, " <uuid>%s</uuid>\n", argv[4]);
+ stream->write_function(stream, " </message>\n");
+ } else {
+ stream->write_function(stream, "%s:%s:%s:%s:%s\n", argv[0], argv[1], argv[2], argv[3], argv[4]);
+ }
+
+ return 0;
+}
+
+
+#define VM_LIST_USAGE "<id>@<domain>[/profile] [xml]"
+SWITCH_STANDARD_API(voicemail_list_api_function)
+{
+ char *sql;
+ char *id = NULL, *domain = NULL, *format = "text", *profile_name = "default";
+ char *p, *e = NULL;
+ vm_profile_t *profile;
+
+ if (zstr(cmd)) {
+ stream->write_function(stream, "Usage: %s\n", VM_DELETE_USAGE);
+ return SWITCH_STATUS_SUCCESS;
+ }
+
+ id = strdup(cmd);
+
+ if ((p = strchr(id, '@'))) {
+ *p++ = '\0';
+ domain = e = p;
+ }
+
+ if ((p = strchr(domain, '/'))) {
+ *p++ = '\0';
+ profile_name = e = p;
+ }
+
+ if (e && (p = strchr(e, ' '))) {
+ *p++ = '\0';
+ format = p;
+ }
+
+ if (id && domain && profile_name && (profile = get_profile(profile_name))) {
+ sql = switch_mprintf("select username, domain, in_folder, file_path, uuid, '%q' from voicemail_msgs where username='%q' and domain='%q'",
+ format, id, domain);
+
+ if (!strcasecmp(format, "xml")) {
+ stream->write_function(stream, "<voicemail>\n");
+ }
+
+ vm_execute_sql_callback(profile, profile->mutex, sql, api_list_callback, stream);
+ switch_safe_free(sql);
+ update_mwi(profile, id, domain, "inbox");
+
+ if (!strcasecmp(format, "xml")) {
+ stream->write_function(stream, "</voicemail>\n");
+ }
+
+ } else {
+ stream->write_function(stream, "%s", "-ERR can't find user or profile.\n");
+ }
+
+ switch_safe_free(id);
+
+ return SWITCH_STATUS_SUCCESS;
+}
+
</ins><span class="cx"> #define VOICEMAIL_SYNTAX "rss [<host> <port> <uri> <user> <domain>] | [load|unload|reload] <profile> [reloadxml]"
</span><span class="cx"> SWITCH_STANDARD_API(voicemail_api_function)
</span><span class="cx"> {
</span><span class="lines">@@ -4095,8 +4245,11 @@
</span><span class="cx"> SWITCH_ADD_APP(app_interface, "voicemail", "Voicemail", VM_DESC, voicemail_function, VM_USAGE, SAF_NONE);
</span><span class="cx"> SWITCH_ADD_API(commands_api_interface, "voicemail", "voicemail", voicemail_api_function, VOICEMAIL_SYNTAX);
</span><span class="cx"> SWITCH_ADD_API(commands_api_interface, "voicemail_inject", "voicemail_inject", voicemail_inject_api_function, VM_INJECT_USAGE);
</span><ins>+ SWITCH_ADD_API(commands_api_interface, "vm_inject", "vm_inject", voicemail_inject_api_function, VM_INJECT_USAGE);
</ins><span class="cx"> SWITCH_ADD_API(commands_api_interface, "vm_boxcount", "vm_boxcount", boxcount_api_function, BOXCOUNT_SYNTAX);
</span><span class="cx"> SWITCH_ADD_API(commands_api_interface, "vm_prefs", "vm_prefs", prefs_api_function, PREFS_SYNTAX);
</span><ins>+ SWITCH_ADD_API(commands_api_interface, "vm_delete", "vm_delete", voicemail_delete_api_function, VM_DELETE_USAGE);
+ SWITCH_ADD_API(commands_api_interface, "vm_list", "vm_list", voicemail_list_api_function, VM_LIST_USAGE);
</ins><span class="cx">
</span><span class="cx"> return SWITCH_STATUS_SUCCESS;
</span><span class="cx"> }
</span></span></pre>
</div>
</div>
<div id="footer">See you at ClueCon</div>
</body>
</html>