Merge "Add new object for VoicemailUserEntry"

This commit is contained in:
Jenkins2 2017-12-05 20:10:51 -06:00 committed by Gerrit Code Review
commit f761206f47
1 changed files with 4 additions and 7 deletions

View File

@ -13283,11 +13283,8 @@ static int manager_list_voicemail_users(struct mansession *s, const struct messa
AST_LIST_TRAVERSE(&users, vmu, list) {
char dirname[256];
#ifdef IMAP_STORAGE
int new, old;
inboxcount(vmu->mailbox, &new, &old);
#endif
make_dir(dirname, sizeof(dirname), vmu->context, vmu->mailbox, "INBOX");
astman_append(s,
@ -13319,8 +13316,8 @@ static int manager_list_voicemail_users(struct mansession *s, const struct messa
"MaxMessageCount: %d\r\n"
"MaxMessageLength: %d\r\n"
"NewMessageCount: %d\r\n"
#ifdef IMAP_STORAGE
"OldMessageCount: %d\r\n"
#ifdef IMAP_STORAGE
"IMAPUser: %s\r\n"
"IMAPServer: %s\r\n"
"IMAPPort: %s\r\n"
@ -13353,14 +13350,14 @@ static int manager_list_voicemail_users(struct mansession *s, const struct messa
ast_test_flag(vmu, VM_OPERATOR) ? "Yes" : "No",
vmu->maxmsg,
vmu->maxsecs,
new,
old
#ifdef IMAP_STORAGE
new, old,
,
vmu->imapuser,
vmu->imapserver,
vmu->imapport,
vmu->imapflags
#else
count_messages(vmu, dirname)
#endif
);
++num_users;