Update of /cvsroot/phpicalendar/phpicalendar/includes
In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv18788/includes
Modified Files:
event.php
Log Message:
eliminate negative event lengths and adjust display lengths for short events
Index: event.php
===================================================================
RCS file: /cvsroot/phpicalendar/phpicalendar/includes/event.php,v
retrieving revision 1.44
retrieving revision 1.45
diff -C2 -d -r1.44 -r1.45
*** event.php 20 Dec 2008 09:35:44 -0000 1.44
--- event.php 26 Dec 2008 16:59:10 -0000 1.45
***************
*** 44,61 ****
$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 (sizeof($attendee) == 0) $attendee = '';
if (sizeof($organizer) == 0) $organizer = '';
switch ($event['status']){
--- 44,51 ----
$attendee = implode(', ',$attendees);
}
! 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']){
***************
*** 84,88 ****
'attendee' => $attendee,
'status' => $event['status'],
! 'location' => stripslashes($event['location']),
'cal_title_full' => $event['calname'].' '.$lang['l_calendar'],
'template' => $phpiCal_config->template,
--- 74,79 ----
'attendee' => $attendee,
'status' => $event['status'],
! 'location' => $event['location'],
! 'url' => $event['url'],
'cal_title_full' => $event['calname'].' '.$lang['l_calendar'],
'template' => $phpiCal_config->template,
***************
*** 92,96 ****
'l_attendee' => $lang['l_attendee'],
'l_status' => $lang['l_status'],
! 'l_location' => $lang['l_location']
));
--- 83,88 ----
'l_attendee' => $lang['l_attendee'],
'l_status' => $lang['l_status'],
! 'l_location' => $lang['l_location'],
! 'l_url' => $lang['l_url']
));
|
