Update of /cvsroot/phpicalendar/phpicalendar/functions
In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv23130/functions
Modified Files:
template.php
Log Message:
day view and month bottom problems bug 2476126
Index: template.php
===================================================================
RCS file: /cvsroot/phpicalendar/phpicalendar/functions/template.php,v
retrieving revision 1.111
retrieving revision 1.112
diff -C2 -d -r1.111 -r1.112
*** template.php 29 Dec 2008 08:20:52 -0000 1.111
--- template.php 30 Dec 2008 03:48:13 -0000 1.112
***************
*** 564,568 ****
$start_wt = strtotime(dateOfWeek($getdate, $phpiCal_config->week_start_day));
$start_day = strtotime(dateOfWeek($getdate, $phpiCal_config->week_start_day));
! for ($i=0; $i<$phpiCal_config->week_length; $i++) {
$day_num = date("w", $start_day);
$daylink = date('Ymd', $start_wt);
--- 564,568 ----
$start_wt = strtotime(dateOfWeek($getdate, $phpiCal_config->week_start_day));
$start_day = strtotime(dateOfWeek($getdate, $phpiCal_config->week_start_day));
! for ($i=0; $i< $phpiCal_config->week_length; $i++) {
$day_num = date("w", $start_day);
$daylink = date('Ymd', $start_wt);
***************
*** 646,650 ****
if (isset($this_time_arr) && sizeof($this_time_arr) > 0) {
foreach ($this_time_arr as $eventKey => $loopevent) {
! $drawEvent = drawEventTimes ($cal_time, $loopevent['event_end']);
$j = 0;
while (isset($event_length[$j])) {
--- 646,650 ----
if (isset($this_time_arr) && sizeof($this_time_arr) > 0) {
foreach ($this_time_arr as $eventKey => $loopevent) {
! $drawEvent = drawEventTimes ($cal_time, $loopevent['display_end']);
$j = 0;
while (isset($event_length[$j])) {
***************
*** 698,706 ****
$event_length[$i]['state'] = 'started';
$uid = $event_length[$i]['key'];
- $event_start = strtotime ($this_time_arr[$uid]['event_start']);
- $event_end = strtotime ($this_time_arr[$uid]['event_end']);
- if (isset($this_time_arr[$uid]['display_end'])) $event_end = strtotime ($this_time_arr[$uid]['display_end']);
- $event_start = date ($timeFormat, $event_start);
- $event_end = date ($timeFormat, $event_end);
$event_calno = $this_time_arr[$uid]['calnumber'];
$event_recur = $this_time_arr[$uid]['recur'];
--- 698,701 ----
***************
*** 717,722 ****
$event = openevent($getdate, $cal_time, $uid, $this_time_arr[$uid], 0, 0, 'ps');
$event_temp = str_replace('{EVENT}', $event, $event_temp);
! $event_temp = str_replace('{EVENT_START}', $event_start, $event_temp);
! $event_temp = str_replace('{EVENT_END}', $event_end, $event_temp);
$event_temp = str_replace('{CONFIRMED}', $confirmed, $event_temp);
$event_temp = str_replace('{EVENT_CALNO}', $event_calno, $event_temp);
--- 712,717 ----
$event = openevent($getdate, $cal_time, $uid, $this_time_arr[$uid], 0, 0, 'ps');
$event_temp = str_replace('{EVENT}', $event, $event_temp);
! $event_temp = str_replace('{EVENT_START}', date($timeFormat, $this_time_arr[$uid]['start_unixtime']), $event_temp);
! $event_temp = str_replace('{EVENT_END}', date($timeFormat, $this_time_arr[$uid]['end_unixtime']), $event_temp);
$event_temp = str_replace('{CONFIRMED}', $confirmed, $event_temp);
$event_temp = str_replace('{EVENT_CALNO}', $event_calno, $event_temp);
***************
*** 1069,1073 ****
$event_end = (isset($val['display_end'])) ? $val['display_end'] : $val["event_end"];
$event_start = date($timeFormat, $val['start_unixtime']);
! $event_end = date($timeFormat, @strtotime ($event_end));
$switch['START_TIME'] = $event_start . ' - ' . $event_end;
$switch['EVENT_TEXT'] = openevent($m_start, $cal_time, $uid, $val, 0, 15, 'psf');
--- 1064,1068 ----
$event_end = (isset($val['display_end'])) ? $val['display_end'] : $val["event_end"];
$event_start = date($timeFormat, $val['start_unixtime']);
! $event_end = date($timeFormat, $val['end_unixtime']);
$switch['START_TIME'] = $event_start . ' - ' . $event_end;
$switch['EVENT_TEXT'] = openevent($m_start, $cal_time, $uid, $val, 0, 15, 'psf');
|
