app_voicemail: Cannot set fromstring on a per-mailbox basis

* apps/app_voicemail.c fromstring field added to mailbox which will
override the global fromstring if set.

ASTERISK-24562 #close

Change-Id: I5e90e3a1ec2b2d5340b49a0db825e4bbb158b2fe

diff --git a/CHANGES b/CHANGES
index 85658a4eceaae8f6ed6740810f0bf4ca3bc71b2b..9668c037b9d47298328104ab96e2adf68508f18c 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -30,6 +30,9 @@ app_voicemail
  * The 'Comedian Mail' prompts can now be overriden using the 'vm-login' and
    'vm-newuser' configuration options in voicemail.conf.
 
+ * Added 'fromstring' field to the voicemail boxes. If set, it will override
+   the global 'fromstring' field on a per-mailbox basis.
+
 res_pjsip_transport_websocket
 ------------------
  * Removed non-secure websocket support.  Firefox and Chrome have not allowed

diff --git a/apps/app_voicemail.c b/apps/app_voicemail.c
index 6089779524a96b2ccbbd795a9f6b720eaf43f6b1..6fad47c9e488730a3eacf795a36408ab8fea66df 100644 (file)
--- a/apps/app_voicemail.c
+++ b/apps/app_voicemail.c
@@ -805,6 +805,7 @@ 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 fromstring[100];            /*!< From: Username */
        char language[MAX_LANGUAGE];     /*!< Config: Language setting */
        char zonetag[80];                /*!< Time zone */
        char locale[20];                 /*!< The locale (for presentation of date/time) */
@@ -813,7 +814,7 @@ struct ast_vm_user {
        char uniqueid[80];               /*!< Unique integer identifier */
        char exit[80];
        char attachfmt[20];              /*!< Attachment format */
-       unsigned int flags;              /*!< VM_ flags */      
+       unsigned int flags;              /*!< VM_ flags */
        int saydurationm;
        int minsecs;                     /*!< Minimum number of seconds per message for this mailbox */
        int maxmsg;                      /*!< Maximum number of msgs per folder for this mailbox */
@@ -1310,6 +1311,8 @@ static void apply_option(struct ast_vm_user *vmu, const char *var, const char *v
                ast_copy_string(vmu->attachfmt, value, sizeof(vmu->attachfmt));
        } else if (!strcasecmp(var, "serveremail")) {
                ast_copy_string(vmu->serveremail, value, sizeof(vmu->serveremail));
+       } else if (!strcasecmp(var, "fromstring")) {
+               ast_copy_string(vmu->fromstring, value, sizeof(vmu->fromstring));
        } else if (!strcasecmp(var, "emailbody")) {
                ast_free(vmu->emailbody);
                vmu->emailbody = ast_strdup(substitute_escapes(value));
@@ -5116,12 +5119,13 @@ static void make_email_file(FILE *p,
        /* Set date format for voicemail mail */
        ast_strftime_locale(date, sizeof(date), emaildateformat, &tm, S_OR(vmu->locale, NULL));
 
-       if (!ast_strlen_zero(fromstring)) {
+       if (!ast_strlen_zero(fromstring) || !ast_strlen_zero(vmu->fromstring)) {
                struct ast_channel *ast;
+               char *e_fromstring = !ast_strlen_zero(vmu->fromstring) ? vmu->fromstring : fromstring;
                if ((ast = ast_dummy_channel_alloc())) {
                        char *ptr;
                        prep_email_sub_vars(ast, vmu, msgnum + 1, context, mailbox, fromfolder, enc_cidnum, enc_cidname, dur, date, category, flag);
-                       ast_str_substitute_variables(&str1, 0, ast, fromstring);
+                       ast_str_substitute_variables(&str1, 0, ast, e_fromstring);
 
                        if (check_mime(ast_str_buffer(str1))) {
                                first_line = 1;
@@ -12234,7 +12238,7 @@ AST_TEST_DEFINE(test_voicemail_vmuser)
        struct ast_vm_user *vmu;
        /* language parameter seems to only be used for display in manager action */
        static const char options_string[] = "attach=yes|attachfmt=wav49|"
-               "serveremail=someguy@digium.com|tz=central|delete=yes|saycid=yes|"
+               "serveremail=someguy@digium.com|fromstring=Voicemail System|tz=central|delete=yes|saycid=yes|"
                "sendvoicemail=yes|review=yes|tempgreetwarn=yes|messagewrap=yes|operator=yes|"
                "envelope=yes|moveheard=yes|sayduration=yes|saydurationm=5|forcename=yes|"
                "forcegreetings=yes|callback=somecontext|dialout=somecontext2|"
@@ -12275,6 +12279,10 @@ AST_TEST_DEFINE(test_voicemail_vmuser)
                ast_test_status_update(test, "Parse failure for attachftm option\n");
                res = 1;
        }
+       if (strcasecmp(vmu->fromstring, "Voicemail System")) {
+               ast_test_status_update(test, "Parse failure for fromstring option\n");
+               res = 1;
+       }
        if (strcasecmp(vmu->serveremail, "someguy@digium.com")) {
                ast_test_status_update(test, "Parse failure for serveremail option\n");
                res = 1;
@@ -12834,6 +12842,7 @@ 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, fromstring, 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)                    \
@@ -12861,6 +12870,7 @@ 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, fromstring, 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)                    \
@@ -13250,6 +13260,7 @@ static int manager_list_voicemail_users(struct mansession *s, const struct messa
                        "Email: %s\r\n"
                        "Pager: %s\r\n"
                        "ServerEmail: %s\r\n"
+                       "FromString: %s\r\n"
                        "MailCommand: %s\r\n"
                        "Language: %s\r\n"
                        "TimeZone: %s\r\n"
@@ -13284,6 +13295,7 @@ static int manager_list_voicemail_users(struct mansession *s, const struct messa
                        vmu->email,
                        vmu->pager,
                        ast_strlen_zero(vmu->serveremail) ? serveremail : vmu->serveremail,
+                       ast_strlen_zero(vmu->fromstring) ? fromstring : vmu->fromstring,
                        mailcmd,
                        vmu->language,
                        vmu->zonetag,

diff --git a/configs/samples/voicemail.conf.sample b/configs/samples/voicemail.conf.sample
index 1c91ffb34b957ae0acd9fe11108ec14a12a37769..f8221eebe05ed738411166f0be87a081b9c92829 100644 (file)
--- a/configs/samples/voicemail.conf.sample
+++ b/configs/samples/voicemail.conf.sample
@@ -439,7 +439,7 @@ european=Europe/Copenhagen|'vm-received' a d b 'digits/at' HM
 ; Note: The rest of the system must reference mailboxes defined here as mailbox@default.
 
 1234 => 4242,Example Mailbox,root@localhost
-;4200 => 9855,Mark Spencer,markster@linux-support.net,mypager@digium.com,attach=no|serveremail=myaddy@digium.com|tz=central|maxmsg=10
+;4200 => 9855,Mark Spencer,markster@linux-support.net,mypager@digium.com,attach=no|serveremail=myaddy@digium.com|fromstring=MySystem|tz=central|maxmsg=10
 ;4300 => 3456,Ben Rigas,ben@american-computer.net
 ;4310 => -5432,Sales,sales@marko.net
 ;4069 => 6522,Matt Brooks,matt@marko.net,,|tz=central|attach=yes|saycid=yes|dialout=fromvm|callback=fromvm|review=yes|operator=yes|envelope=yes|moveheard=yes|sayduration=yes|saydurationm=1