diff --git a/calendar/inc/class.calendar_uiforms.inc.php b/calendar/inc/class.calendar_uiforms.inc.php
index fae9c559a1..5d7e896196 100644
--- a/calendar/inc/class.calendar_uiforms.inc.php
+++ b/calendar/inc/class.calendar_uiforms.inc.php
@@ -1583,9 +1583,17 @@ function replace_eTemplate_onsubmit()
if (!is_array($event))
{
- $ical_string = $_GET['ical'] == 'session' ? egw_cache::getSession('calendar', 'ical') : $_GET['ical'];
+ $ical_charset = 'utf-8';
+ $ical_string = $_GET['ical'];
+ if ($ical_string == 'session')
+ {
+ $session_data = egw_cache::getSession('calendar', 'ical');
+ $ical_string = $session_data['attachment'];
+ $ical_charset = $session_data['charset'];
+ unset($session_data);
+ }
$ical = new calendar_ical();
- if (!($events = $ical->icaltoegw($ical_string, '', 'utf-8')) || count($events) != 1)
+ if (!($events = $ical->icaltoegw($ical_string, '', $ical_charset)) || count($events) != 1)
{
error_log(__METHOD__."('$_GET[ical]') error parsing iCal!");
$GLOBALS['egw']->framework->render(html::fieldset(''.htmlspecialchars($ical_string).'
',
diff --git a/calendar/templates/default/meeting.xet b/calendar/templates/default/meeting.xet
new file mode 100644
index 0000000000..3ebb3dc3f6
--- /dev/null
+++ b/calendar/templates/default/meeting.xet
@@ -0,0 +1,85 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ #popupMainDiv {
+ border: none;
+ margin: 0;
+}
+
+.meetingRequestMessage {
+ font-size: 120%;
+}
+
+table.meetingRequest {
+ border: 2px solid black;
+}
+.meetingRequest tr.th {
+ background-color: #4040FF;
+}
+.meetingRequest tr.th td {
+ font-weight: bold;
+ font-size: 120%;
+ color: white;
+}
+.meetingRequest td {
+ padding: 3px;
+}
+
+
+
+
+
+
\ No newline at end of file