Add new object for VoicemailUserEntry
authorSungtae Kim <pchero21@gmail.com>
Mon, 4 Dec 2017 09:40:18 +0000 (10:40 +0100)
committerstk <pchero21@gmail.com>
Mon, 4 Dec 2017 09:51:49 +0000 (10:51 +0100)
Currently, when the app_voicemail sending VoicemailUserEntry AMI event, there's
no OldMessageCount info for default.
To check the OldMessageCount info, it required IMAP_STORAGE define, but this is
not correct.
Added OldMessageCount item as a default.

ASTERISK-27456

Change-Id: I5c71521c2d1daf8b7b161e31c34d28cca6aea4c7

apps/app_voicemail.c

index ecd423f..d017301 100644 (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;