diff options
| author | Chad Little <clittle@users.sourceforge.net> | 2004-10-08 21:20:17 +0000 |
|---|---|---|
| committer | Chad Little <clittle@users.sourceforge.net> | 2004-10-08 21:20:17 +0000 |
| commit | ed66aa0f099f5f50d327048912ce6a116f473ba1 (patch) | |
| tree | 56aabfdf635bb676ad0b45774df12e2e4997e7b4 | |
| parent | 47e7968e1400cb68a070cb118a898fa08c94998b (diff) | |
| download | phpicalendar-ed66aa0f099f5f50d327048912ce6a116f473ba1.tar.gz phpicalendar-ed66aa0f099f5f50d327048912ce6a116f473ba1.tar.bz2 phpicalendar-ed66aa0f099f5f50d327048912ce6a116f473ba1.zip | |
Fixed windows date error, cleaned up webcal display in monthview.
| -rw-r--r-- | functions/template.php | 6 | ||||
| -rw-r--r-- | month.php | 2 | ||||
| -rw-r--r-- | templates/default/calendar_nav.tpl | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/functions/template.php b/functions/template.php index 9bd9dc0..cb0d805 100644 --- a/functions/template.php +++ b/functions/template.php @@ -597,12 +597,10 @@ class Page { $event_text = stripslashes(urldecode($val["event_text"])); $event_text = strip_tags($event_text, '<b><i><u>'); if ($event_text != "") { - $event_start = $val["event_start"]; - $event_end = $val["event_end"]; $event_calna = $val["calname"]; $event_url = $val["url"]; - $event_start = date ($timeFormat, @strtotime ($event_start)); - $event_end = date ($timeFormat, @strtotime ($event_end)); + $event_start = date ($timeFormat, $val["start_unixtime"]); + $event_end = date ($timeFormat, $val["end_unixtime"]); if (!isset($val["event_start"])) { $event_start = $lang['l_all_day']; $event_end = ''; @@ -16,6 +16,7 @@ $unix_time = strtotime($getdate); $today_today = date('Ymd', strtotime("now + $second_offset seconds")); $tomorrows_date = date('Ymd', strtotime("+1 day", $unix_time)); $yesterdays_date = date('Ymd', strtotime("-1 day", $unix_time)); +$sidebar_date = localizeDate($dateFormat_week_list, $unix_time); // find out next month $next_month_month = ($this_month+1 == '13') ? '1' : ($this_month+1); @@ -81,6 +82,7 @@ $page->replace_tags(array( 'legend' => $list_calcolors, 'current_view' => $current_view, 'style_select' => $style_select, + 'sidebar_date' => $sidebar_date, 'l_goprint' => $lang['l_goprint'], 'l_preferences' => $lang['l_preferences'], 'l_calendar' => $lang['l_calendar'], diff --git a/templates/default/calendar_nav.tpl b/templates/default/calendar_nav.tpl index 5d556c3..75fac01 100644 --- a/templates/default/calendar_nav.tpl +++ b/templates/default/calendar_nav.tpl @@ -56,7 +56,7 @@ <td width="160" valign="top"> <table width="170" border="0" cellpadding="3" cellspacing="0" class="calborder"> <tr> - <td align="center" class="sideback"><div style="height:16px;"><b>{CALENDAR_NAME}</b></div></td> + <td align="center" class="sideback"><div style="height:16px;"><b>{SIDEBAR_DATE}</b></div></td> </tr> <tr> <td> |