From 484da42d6ced3c882fa46e851a00719cdb8a7899 Mon Sep 17 00:00:00 2001
From: Naveen Albert <asterisk@phreaknet.org>
Date: Sun, 19 Sep 2021 11:14:10 +0000
Subject: [PATCH] func_vmcount: Add support for multiple mailboxes
Allows multiple mailboxes to be specified for VMCOUNT
instead of just one.
ASTERISK-29661 #close
Change-Id: I9108528300795fd5b607efa9d4dd7b74be031813
---
doc/CHANGES-staging/func_vmcount.txt | 3 +++
funcs/func_vmcount.c | 23 ++++++++++++++++++++---
2 files changed, 23 insertions(+), 3 deletions(-)
create mode 100644 doc/CHANGES-staging/func_vmcount.txt
diff --git a/doc/CHANGES-staging/func_vmcount.txt b/doc/CHANGES-staging/func_vmcount.txt
new file mode 100644
index 0000000000..ba2a0a1178
--- /dev/null
+++ b/doc/CHANGES-staging/func_vmcount.txt
@@ -0,0 +1,3 @@
+Subject: func_vmcount
+
+Multiple mailboxes may now be specified instead of just one.
diff --git a/funcs/func_vmcount.c b/funcs/func_vmcount.c
index cb7511048a..66007034a1 100644
--- a/funcs/func_vmcount.c
+++ b/funcs/func_vmcount.c
@@ -44,10 +44,12 @@
/*** DOCUMENTATION
<function name="VMCOUNT" language="en_US">
<synopsis>
- Count the voicemails in a specified mailbox.
+ Count the voicemails in a specified mailbox or mailboxes.
</synopsis>
<syntax>
- <parameter name="vmbox" required="true" />
+ <parameter name="vmbox" required="true" argsep="&">
+ <para>A mailbox or list of mailboxes</para>
+ </parameter>
<parameter name="folder" required="false">
<para>If not specified, defaults to <literal>INBOX</literal></para>
</parameter>
@@ -56,12 +58,19 @@
<para>Count the number of voicemails in a specified mailbox, you could also specify
the mailbox <replaceable>folder</replaceable>.</para>
<para>Example: <literal>exten => s,1,Set(foo=${VMCOUNT(125@default)})</literal></para>
+ <para>An ampersand-separated list of mailboxes may be specified to count voicemails in
+ multiple mailboxes. If a folder is specified, this will apply to all mailboxes specified.</para>
+ <example title="Multiple mailbox inbox count">
+ same => n,NoOp(${VMCOUNT(1234@default&1235@default&1236@default,INBOX)})
+ </example>
</description>
</function>
***/
static int acf_vmcount_exec(struct ast_channel *chan, const char *cmd, char *argsstr, char *buf, size_t len)
{
+ int total = 0;
+ char *mailbox = NULL;
AST_DECLARE_APP_ARGS(args,
AST_APP_ARG(vmbox);
AST_APP_ARG(folder);
@@ -82,7 +91,15 @@ static int acf_vmcount_exec(struct ast_channel *chan, const char *cmd, char *arg
args.folder = "INBOX";
}
- snprintf(buf, len, "%d", ast_app_messagecount(args.vmbox, args.folder));
+ while ((mailbox = strsep(&args.vmbox, "&"))) {
+ int c;
+ if (ast_strlen_zero(mailbox)) {
+ continue;
+ }
+ c = ast_app_messagecount(mailbox, args.folder);
+ total += (c > 0 ? c : 0);
+ }
+ snprintf(buf, len, "%d", total);
return 0;
}
--
GitLab