From 82fd517bbdc56884176b6d138fe0a890e179c3cc Mon Sep 17 00:00:00 2001 From: Jason Oster Date: Mon, 22 Jun 2009 14:31:03 +0000 Subject: Fix minical_view config - Thanks Roberto: bug #2800880 --- day.php | 9 ++++++++- month.php | 10 +++++++++- week.php | 10 +++++++++- 3 files changed, 26 insertions(+), 3 deletions(-) diff --git a/day.php b/day.php index 4576bd7..ad01fcd 100644 --- a/day.php +++ b/day.php @@ -15,7 +15,14 @@ require_once(BASE.'functions/ical_parser.php'); require_once(BASE.'functions/list_functions.php'); require_once(BASE.'functions/template.php'); -if ($phpiCal_config->minical_view == 'current') $minical_view = 'day'; +$minical_view = $current_view; +switch ($phpiCal_config->minical_view) { + case 'day': + case 'week': + case 'month': + $minical_view = $phpiCal_config->minical_view; + break; +} $weekstart = 1; $unix_time = strtotime($getdate); diff --git a/month.php b/month.php index 9aec865..04516bd 100644 --- a/month.php +++ b/month.php @@ -5,7 +5,15 @@ require_once(BASE.'functions/ical_parser.php'); require_once(BASE.'functions/list_functions.php'); require_once(BASE.'functions/template.php'); header("Content-Type: text/html; charset=$phpiCal_config->charset"); -if ($phpiCal_config->minical_view == 'current') $minical_view = 'month'; + +$minical_view = $current_view; +switch ($phpiCal_config->minical_view) { + case 'day': + case 'week': + case 'month': + $minical_view = $phpiCal_config->minical_view; + break; +} $unix_time = strtotime($getdate); $today_today = date('Ymd', time() + $phpiCal_config->second_offset); diff --git a/week.php b/week.php index 3c974e4..f755491 100644 --- a/week.php +++ b/week.php @@ -5,7 +5,15 @@ require_once(BASE.'functions/ical_parser.php'); require_once(BASE.'functions/list_functions.php'); require_once(BASE.'functions/template.php'); header("Content-Type: text/html; charset=$phpiCal_config->charset"); -if ($phpiCal_config->minical_view == "current") $minical_view = "week"; + +$minical_view = $current_view; +switch ($phpiCal_config->minical_view) { + case 'day': + case 'week': + case 'month': + $minical_view = $phpiCal_config->minical_view; + break; +} $starttime = "0500"; $weekstart = 1; -- cgit v1.2.3