oqapi/webgui
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Forward port Calendar location field fix in ical.

Browse source
This commit is contained in:
Colin Kuskie 2008-12-09 04:29:22 +00:00
parent dcb22dfd6a
commit 415221fb4d
3 changed files with 10 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

1
docs/changelog/7.x.x.txt
View file

@ -8,6 +8,7 @@
- fixed #9231: Singleton workflows should not report an error when an attempt is made to run them again - fixed #9231: Singleton workflows should not report an error when an attempt is made to run them again
- fixed #9244: i18n for colin - fixed #9244: i18n for colin
- fixed #9252: Thingy defaultValue length causes input to be truncated (SDH Consulting Group) - fixed #9252: Thingy defaultValue length causes input to be truncated (SDH Consulting Group)
- fixed #8937: Feeds in Calendar strip information
7.6.5 7.6.5
- security: A problem was discovered and fixed in which users could email executable attachments to a collaboration system and then when viewed online, could execute them. - security: A problem was discovered and fixed in which users could email executable attachments to a collaboration system and then when viewed online, could execute them.

14
lib/WebGUI/Asset/Wobject/Calendar.pm
View file

@ -1877,13 +1877,15 @@ sub www_ical {
# Summary (the title) # Summary (the title)
# Wrapped at 75 columns # Wrapped at 75 columns
$ical .= $self->wrapIcal("SUMMARY:".$event->get("title"))."\r\n"; $ical .= $self->wrapIcal("SUMMARY:".$event->get("title"))."\r\n";
# Description (the text) # Description (the text)
# Wrapped at 75 columns # Wrapped at 75 columns
$ical .= $self->wrapIcal("DESCRIPTION:".$event->get("description"))."\r\n"; $ical .= $self->wrapIcal("DESCRIPTION:".$event->get("description"))."\r\n";
# Location (the text)
# Wrapped at 75 columns
$ical .= $self->wrapIcal("LOCATION:".$event->get("location"))."\r\n";
# X-WEBGUI lines # X-WEBGUI lines
if ($event->get("groupIdView")) { if ($event->get("groupIdView")) {
$ical .= "X-WEBGUI-GROUPIDVIEW:".$event->get("groupIdView")."\r\n"; $ical .= "X-WEBGUI-GROUPIDVIEW:".$event->get("groupIdView")."\r\n";
@ -1893,11 +1895,11 @@ sub www_ical {
} }
$ical .= "X-WEBGUI-URL:".$event->get("url")."\r\n"; $ical .= "X-WEBGUI-URL:".$event->get("url")."\r\n";
$ical .= "X-WEBGUI-MENUTITLE:".$event->get("menuTitle")."\r\n"; $ical .= "X-WEBGUI-MENUTITLE:".$event->get("menuTitle")."\r\n";
$ical .= qq{END:VEVENT\r\n}; $ical .= qq{END:VEVENT\r\n};
} }
# ENDVEVENT # ENDVEVENT
$ical .= qq{END:VCALENDAR\r\n}; $ical .= qq{END:VCALENDAR\r\n};

1
lib/WebGUI/Workflow/Activity/CalendarUpdateFeeds.pm
View file

@ -212,6 +212,7 @@ sub execute {
feedId => $feed->{feedId}, feedId => $feed->{feedId},
description => _unwrapIcalText($events{$id}->{description}->[1]), description => _unwrapIcalText($events{$id}->{description}->[1]),
title => _unwrapIcalText($events{$id}->{summary}->[1]), title => _unwrapIcalText($events{$id}->{summary}->[1]),
location => _unwrapIcalText($events{$id}->{location}->[1]),
menuTitle => substr($events{$id}->{summary}->[1],0,15), menuTitle => substr($events{$id}->{summary}->[1],0,15),
className => 'WebGUI::Asset::Event', className => 'WebGUI::Asset::Event',
isHidden => 1, isHidden => 1,