Fix VoicemailUserEntry event headers ServerEmail and MailCommand reported values.

The AMI action VoicemailUsersList VoicemailUserEntry event headers
ServerEmail and MailCommand did not report the global values if they were
not overridden.  The VoicemailUserEntry event header ServerEmail was not
populated with the global value if the voicemail user did not override it.
The VoicemailUserEntry event header MailCommand was never populated with a
value.

* Removed unused struct ast_vm_user member mailcmd[].

(closes issue AST-973)
Reported by: John Bigelow
Tested by: rmudgett

git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.8@372620 65c4cc65-6c06-0410-ace0-fbb531ad65f3

diff --git a/apps/app_voicemail.c b/apps/app_voicemail.c
index 15becf4a4724c92261b1a082ca3b3508f43cb692..9ee4f3660dc3ecce59233886be1612994ecdfa0a 100644 (file)
--- a/apps/app_voicemail.c
+++ b/apps/app_voicemail.c
@@ -648,7 +648,6 @@ struct ast_vm_user {
        char *emailbody;                 /*!< E-mail body */
        char pager[80];                  /*!< E-mail address to pager (no attachment) */
        char serveremail[80];            /*!< From: Mail address */
-       char mailcmd[160];               /*!< Configurable mail command */
        char language[MAX_LANGUAGE];     /*!< Config: Language setting */
        char zonetag[80];                /*!< Time zone */
        char locale[20];                 /*!< The locale (for presentation of date/time) */
@@ -11327,7 +11326,6 @@ static struct ast_cli_entry cli_voicemail[] = {
                USER(ast_vm_user, emailbody, AST_DATA_STRING)                   \
                USER(ast_vm_user, pager, AST_DATA_STRING)                       \
                USER(ast_vm_user, serveremail, AST_DATA_STRING)                 \
-               USER(ast_vm_user, mailcmd, AST_DATA_STRING)                     \
                USER(ast_vm_user, language, AST_DATA_STRING)                    \
                USER(ast_vm_user, zonetag, AST_DATA_STRING)                     \
                USER(ast_vm_user, callback, AST_DATA_STRING)                    \
@@ -11355,7 +11353,6 @@ static struct ast_cli_entry cli_voicemail[] = {
                USER(ast_vm_user, emailbody, AST_DATA_STRING)                   \
                USER(ast_vm_user, pager, AST_DATA_STRING)                       \
                USER(ast_vm_user, serveremail, AST_DATA_STRING)                 \
-               USER(ast_vm_user, mailcmd, AST_DATA_STRING)                     \
                USER(ast_vm_user, language, AST_DATA_STRING)                    \
                USER(ast_vm_user, zonetag, AST_DATA_STRING)                     \
                USER(ast_vm_user, callback, AST_DATA_STRING)                    \
@@ -11731,8 +11728,8 @@ static int manager_list_voicemail_users(struct mansession *s, const struct messa
                        vmu->fullname,
                        vmu->email,
                        vmu->pager,
-                       vmu->serveremail,
-                       vmu->mailcmd,
+                       ast_strlen_zero(vmu->serveremail) ? serveremail : vmu->serveremail,
+                       mailcmd,
                        vmu->language,
                        vmu->zonetag,
                        vmu->callback,