aboutsummaryrefslogtreecommitdiffstats
path: root/functions
diff options
context:
space:
mode:
authorChad Little <clittle@users.sourceforge.net>2004-01-25 22:23:33 +0000
committerChad Little <clittle@users.sourceforge.net>2004-01-25 22:23:33 +0000
commit6d7c73941f7cc58add284f9a13b3883061c85afd (patch)
tree94ed8f790bc9ad1e8ff9c747b42ccd525f3b8ee3 /functions
parent93226db1830807ea4cc260bfc75bcd23488d4803 (diff)
downloadphpicalendar-6d7c73941f7cc58add284f9a13b3883061c85afd.tar.gz
phpicalendar-6d7c73941f7cc58add284f9a13b3883061c85afd.tar.bz2
phpicalendar-6d7c73941f7cc58add284f9a13b3883061c85afd.zip
Fix for recurrence keeping location, url, etc. Fix for eating newlines in
location.
Diffstat (limited to 'functions')
-rw-r--r--functions/ical_parser.php7
1 files changed, 7 insertions, 0 deletions
diff --git a/functions/ical_parser.php b/functions/ical_parser.php
index 4120d91..937e3b4 100644
--- a/functions/ical_parser.php
+++ b/functions/ical_parser.php
@@ -154,6 +154,11 @@ foreach ($cal_filelist as $filename) {
if (!isset($summary)) $summary = $master_array[$old_start_date][$old_start_time][$uid]['event_text'];
if (!isset($length)) $length = $master_array[$old_start_date][$old_start_time][$uid]['event_length'];
if (!isset($description)) $description = $master_array[$old_start_date][$old_start_time][$uid]['description'];
+ if (!isset($location)) $location = $master_array[$old_start_date][$old_start_time][$uid]['location'];
+ if (!isset($organizer)) $organizer = $master_array[$old_start_date][$old_start_time][$uid]['organizer'];
+ if (!isset($status)) $status = $master_array[$old_start_date][$old_start_time][$uid]['status'];
+ if (!isset($attendee)) $attendee = $master_array[$old_start_date][$old_start_time][$uid]['attendee'];
+ if (!isset($url)) $url = $master_array[$old_start_date][$old_start_time][$uid]['url'];
removeOverlap($start_date_tmp, $old_start_time, $uid);
if (isset($master_array[$start_date_tmp][$old_start_time][$uid])) {
unset($master_array[$start_date_tmp][$old_start_time][$uid]); // SJBO added $uid twice here
@@ -1029,6 +1034,8 @@ foreach ($cal_filelist as $filename) {
$organizer[] = array ('name' => $field, 'email' => $data);
break;
case 'LOCATION':
+ $data = str_replace("\\n", "<br>", $data);
+ $data = str_replace("\\r", "<br>", $data);
$location = $data;
break;
case 'URL':

© 2014-2024 Faster IT GmbH | imprint | privacy policy