aboutsummaryrefslogtreecommitdiffstats
path: root/includes
diff options
context:
space:
mode:
authorJim Hu <jimhu@users.sourceforge.net>2008-12-26 16:59:10 +0000
committerJim Hu <jimhu@users.sourceforge.net>2008-12-26 16:59:10 +0000
commita02ca8fd76dfa6b0f280780f76fb9bfce5a9fd36 (patch)
treecd5c150b2490fdcb9503f4aa581dff868cf9170b /includes
parentae9ce41d6df68ed6449f296dd8af48590d27157d (diff)
downloadphpicalendar-a02ca8fd76dfa6b0f280780f76fb9bfce5a9fd36.tar.gz
phpicalendar-a02ca8fd76dfa6b0f280780f76fb9bfce5a9fd36.tar.bz2
phpicalendar-a02ca8fd76dfa6b0f280780f76fb9bfce5a9fd36.zip
eliminate negative event lengths and adjust display lengths for short events
Diffstat (limited to 'includes')
-rw-r--r--includes/event.php20
1 files changed, 6 insertions, 14 deletions
diff --git a/includes/event.php b/includes/event.php
index d5ac529..fe03042 100644
--- a/includes/event.php
+++ b/includes/event.php
@@ -43,20 +43,10 @@ if (isset($attendee) && is_array($attendee)) {
}
$attendee = implode(', ',$attendees);
}
-
-if (isset($event['location'])) {
- if ($event['url'] != '') $event['location'] = '<a href="'.$event['url'].'" target="_blank">'.stripslashes($event['location']).'</a>';
-}else{
- $event['location'] = stripslashes($event['location']);
-}
-
-if (!isset($event['location']) && isset($event['url'])) {
- $event['location'] = '<a href="'.$event['url'].'" target="_blank">'.$event['url'].'</a>';
- $lang['l_location'] = 'URL';
-}
-
+if (isset($event['location'])) $event['location'] = stripslashes($event['location']);
if (sizeof($attendee) == 0) $attendee = '';
if (sizeof($organizer) == 0) $organizer = '';
+if ($event['url'] != '') $event['url'] = '<a href="'.$event['url'].'" target="_blank">'.$event['url'].'</a>';
switch ($event['status']){
case 'CONFIRMED':
@@ -83,7 +73,8 @@ $page->replace_tags(array(
'organizer' => $organizer,
'attendee' => $attendee,
'status' => $event['status'],
- 'location' => stripslashes($event['location']),
+ 'location' => $event['location'],
+ 'url' => $event['url'],
'cal_title_full' => $event['calname'].' '.$lang['l_calendar'],
'template' => $phpiCal_config->template,
'l_summary' => $lang['l_summary'],
@@ -91,7 +82,8 @@ $page->replace_tags(array(
'l_organizer' => $lang['l_organizer'],
'l_attendee' => $lang['l_attendee'],
'l_status' => $lang['l_status'],
- 'l_location' => $lang['l_location']
+ 'l_location' => $lang['l_location'],
+ 'l_url' => $lang['l_url']
));

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