From 7c1003de8443578d56c95ddba4268181497488b6 Mon Sep 17 00:00:00 2001 From: Richard Mudgett Date: Fri, 7 Sep 2012 21:30:17 +0000 Subject: 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 ........ Merged revisions 372620 from http://svn.asterisk.org/svn/asterisk/branches/1.8 ........ Merged revisions 372621 from http://svn.asterisk.org/svn/asterisk/branches/10 ........ Merged revisions 372622 from http://svn.asterisk.org/svn/asterisk/branches/11 git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@372623 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- apps/app_voicemail.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) (limited to 'apps/app_voicemail.c') diff --git a/apps/app_voicemail.c b/apps/app_voicemail.c index e80a60398..dee45c853 100644 --- a/apps/app_voicemail.c +++ b/apps/app_voicemail.c @@ -753,7 +753,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) */ @@ -12308,7 +12307,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) \ @@ -12336,7 +12334,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) \ @@ -12715,8 +12712,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, -- cgit v1.2.3