diff options
| author | Mark Spencer <markster@digium.com> | 2004-05-10 13:27:39 +0000 |
|---|---|---|
| committer | Mark Spencer <markster@digium.com> | 2004-05-10 13:27:39 +0000 |
| commit | 87e3b8b2ad2d6d57cabaaedf613f4c1305da05c4 (patch) | |
| tree | dac12024236634a936f87d75bc9479864e8be447 | |
| parent | 230eb50e96595cf584b0a50e97fa042c8117e9c4 (diff) | |
Allow characterset to be specified (bug #1598)
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@2943 65c4cc65-6c06-0410-ace0-fbb531ad65f3
| -rwxr-xr-x | apps/app_voicemail.c | 6 | ||||
| -rwxr-xr-x | configs/voicemail.conf.sample | 3 |
2 files changed, 7 insertions, 2 deletions
diff --git a/apps/app_voicemail.c b/apps/app_voicemail.c index 8bae30c90..fbff1eef8 100755 --- a/apps/app_voicemail.c +++ b/apps/app_voicemail.c @@ -238,6 +238,7 @@ static int pbxskip = 0; static char *emailsubject = NULL; static char fromstring[100]; static char emailtitle[100]; +static char charset[32] = "ISO-8859-1"; STANDARD_LOCAL_USER; @@ -867,7 +868,7 @@ static int sendmail(char *srcemail, struct ast_vm_user *vmu, int msgnum, char *m fprintf(p, "--%s\n", bound); } - fprintf(p, "Content-Type: text/plain; charset=ISO-8859-1\nContent-Transfer-Encoding: 8bit\n\n"); + fprintf(p, "Content-Type: text/plain; charset=%s\nContent-Transfer-Encoding: 8bit\n\n", charset); strftime(date, sizeof(date), "%A, %B %d, %Y at %r", &tm); if (emailbody) { struct ast_channel *ast = ast_channel_alloc(0); @@ -3828,6 +3829,7 @@ static int load_config(void) } memset(fromstring,0,sizeof(fromstring)); memset(emailtitle,0,sizeof(emailtitle)); + strncpy(charset, "ISO-8859-1", sizeof(charset) - 1); if (emailbody) { free(emailbody); emailbody = NULL; @@ -3840,6 +3842,8 @@ static int load_config(void) pbxskip = ast_true(s); if ((s=ast_variable_retrieve(cfg, "general", "fromstring"))) strncpy(fromstring,s,sizeof(fromstring)-1); + if ((s=ast_variable_retrieve(cfg, "general", "charset"))) + strncpy(charset,s,sizeof(charset)-1); if ((s=ast_variable_retrieve(cfg, "general", "emailtitle"))) strncpy(emailtitle,s,sizeof(emailtitle)-1); if ((s=ast_variable_retrieve(cfg, "general", "emailsubject"))) diff --git a/configs/voicemail.conf.sample b/configs/voicemail.conf.sample index 80836515e..3e83c7d32 100755 --- a/configs/voicemail.conf.sample +++ b/configs/voicemail.conf.sample @@ -30,7 +30,8 @@ maxlogins=3 ;externnotify=/usr/bin/myapp ; For the directory, you can override the intro file if you want ;directoryintro=dir-intro - +; The character set for voicemail messages can be specified here +;charset=ISO-8859-1 ; Skip the "[PBX]:" string from the message title ;pbxskip=yes ; Change the From: string |