diff options
| author | sasha <sasha@97f52cf1-0a1b-0410-bd0e-c28be96e8082> | 2008-07-17 11:57:47 +0000 |
|---|---|---|
| committer | sasha <sasha@97f52cf1-0a1b-0410-bd0e-c28be96e8082> | 2008-07-17 11:57:47 +0000 |
| commit | 0b72e200a1a74a5808e6d8efa5423babd701f658 (patch) | |
| tree | aabf7fdcd84ca2e83254616d3308777dff2fea94 | |
| parent | 9c1f6327bf84f4aafe17d6366521ef0e7ffd5765 (diff) | |
| download | zabbix-0b72e200a1a74a5808e6d8efa5423babd701f658.tar.gz zabbix-0b72e200a1a74a5808e6d8efa5423babd701f658.tar.xz zabbix-0b72e200a1a74a5808e6d8efa5423babd701f658.zip | |
- [ZBX-391] added charset info to the email header.
git-svn-id: svn://svn.zabbix.com/trunk@5832 97f52cf1-0a1b-0410-bd0e-c28be96e8082
| -rw-r--r-- | ChangeLog | 1 | ||||
| -rw-r--r-- | src/libs/zbxemail/email.c | 4 |
2 files changed, 4 insertions, 1 deletions
@@ -1,5 +1,6 @@ Changes for 1.5.4 + - [ZBX-391] added charset info to the email header. Thanks to Vadim Pilipenko. (Sasha) - [DEV-189] added full clone to hosts (Artem) - [DEV-182] added massupdate for triggers (Artem) - [DEV-188] implemented sound on/off button in status of triggers screens (Artem) diff --git a/src/libs/zbxemail/email.c b/src/libs/zbxemail/email.c index 71b1f188..af1d7103 100644 --- a/src/libs/zbxemail/email.c +++ b/src/libs/zbxemail/email.c @@ -230,7 +230,9 @@ int send_email(char *smtp_server,char *smtp_helo,char *smtp_email,char *mailto,c time(&email_time); local_time = localtime(&email_time); strftime( str_time, MAX_STRING_LEN, "%a, %d %b %Y %H:%M:%S %z", local_time ); - cp = zbx_dsprintf(cp,"From:<%s>\r\nTo:<%s>\r\nDate: %s\r\nSubject: %s\r\n\r\n%s",smtp_email,mailto,str_time,mailsubject, mailbody); + cp = zbx_dsprintf(cp, "From:<%s>\r\nTo:<%s>\r\nDate: %s\r\nSubject: %s\r\n" + "Content-Type: text/plain; charset=\"UTF-8\"\r\n\r\n%s", + smtp_email, mailto, str_time, mailsubject, mailbody); e=write(s.socket,cp,strlen(cp)); zbx_free(cp); zbx_free(mailsubject); |