From 6ec002f023431d53c8759a95fff2a1139bdb3927 Mon Sep 17 00:00:00 2001 From: Ludovic Marcotte Date: Fri, 12 Jun 2020 08:42:00 -0400 Subject: [PATCH] fix(core): always set the charset when sending IMIP replies --- SoObjects/Appointments/SOGoAptMailICalReply.h | 4 +--- SoObjects/Appointments/SOGoAptMailICalReply.m | 4 +--- SoObjects/Appointments/SOGoAptMailNotification.m | 2 +- SoObjects/Appointments/SOGoCalendarComponent.m | 3 ++- 4 files changed, 5 insertions(+), 8 deletions(-) diff --git a/SoObjects/Appointments/SOGoAptMailICalReply.h b/SoObjects/Appointments/SOGoAptMailICalReply.h index 539966932b..42805cb3b3 100644 --- a/SoObjects/Appointments/SOGoAptMailICalReply.h +++ b/SoObjects/Appointments/SOGoAptMailICalReply.h @@ -1,8 +1,6 @@ /* SOGoAptMailICalReply.h - this file is part of SOGo * - * Copyright (C) 2007 Inverse inc. - * - * Author: Wolfgang Sourdeau + * Copyright (C) 2007-2020 Inverse inc. * * This file is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/SoObjects/Appointments/SOGoAptMailICalReply.m b/SoObjects/Appointments/SOGoAptMailICalReply.m index e8ebaf0c96..8e51214fb7 100644 --- a/SoObjects/Appointments/SOGoAptMailICalReply.m +++ b/SoObjects/Appointments/SOGoAptMailICalReply.m @@ -1,8 +1,6 @@ /* SOGoAptMailICalReply - this file is part of SOGo * - * Copyright (C) 2010-2012 Inverse inc. - * - * Author: Wolfgang Sourdeau + * Copyright (C) 2010-2020 Inverse inc. * * This file is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/SoObjects/Appointments/SOGoAptMailNotification.m b/SoObjects/Appointments/SOGoAptMailNotification.m index 90a1710408..e95de69d03 100644 --- a/SoObjects/Appointments/SOGoAptMailNotification.m +++ b/SoObjects/Appointments/SOGoAptMailNotification.m @@ -1,5 +1,5 @@ /* - Copyright (C) 2006-2019 Inverse inc. + Copyright (C) 2006-2020 Inverse inc. Copyright (C) 2000-2005 SKYRIX Software AG This file is part of SOGo. diff --git a/SoObjects/Appointments/SOGoCalendarComponent.m b/SoObjects/Appointments/SOGoCalendarComponent.m index 846c09a933..9b34b493eb 100644 --- a/SoObjects/Appointments/SOGoCalendarComponent.m +++ b/SoObjects/Appointments/SOGoCalendarComponent.m @@ -981,7 +981,8 @@ - (void) _sendIMIPReplyForEvent: (iCalRepeatableEntityObject *) event [headerMap setObject: @"1.0" forKey: @"MIME-Version"]; if (textOnly) - [headerMap setObject: @"text/html" forKey: @"content-type"]; + [headerMap setObject: @"text/html; charset=utf-8" + forKey: @"content-type"]; else [headerMap setObject: @"multipart/mixed" forKey: @"content-type"];