From 3353064e3b542ad1a4f64a23e696d3a6df515a4d Mon Sep 17 00:00:00 2001 From: skeeter Date: Sun, 21 Jan 2001 13:15:21 +0000 Subject: [PATCH] fixes to defaultcalendar usage --- calendar/inc/hook_calendar_add_def_pref.inc.php | 2 +- calendar/index.php | 5 ++++- calendar/preferences.php | 2 +- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/calendar/inc/hook_calendar_add_def_pref.inc.php b/calendar/inc/hook_calendar_add_def_pref.inc.php index cb35b6ac0a..247aa9e91b 100755 --- a/calendar/inc/hook_calendar_add_def_pref.inc.php +++ b/calendar/inc/hook_calendar_add_def_pref.inc.php @@ -16,7 +16,7 @@ $pref->change("calendar","weekstarts","Monday"); $pref->change("calendar","workdaystarts","9"); $pref->change("calendar","workdayends","17"); - $pref->change("calendar","defaultcalendar","index.php"); + $pref->change("calendar","defaultcalendar","month.php"); $pref->change("calendar","defaultfilter","all"); $pref->change("calendar","mainscreen_showevents","Y"); ?> diff --git a/calendar/index.php b/calendar/index.php index 1a41ab157e..e0cb8d7150 100755 --- a/calendar/index.php +++ b/calendar/index.php @@ -22,6 +22,9 @@ $phpgw_info["flags"]["nofooter"] = True; include("../header.inc.php"); - Header("Location: ".$phpgw_info["user"]["preferences"]["calendar"]["defaultcalendar"]."?".$QUERY_STRING); + $newpage = $phpgw_info["user"]["preferences"]["calendar"]["defaultcalendar"]; + if ($namepage=="index.php") $newpage = "month.php"; + + Header("Location: ".$newpage."?".$QUERY_STRING); $phpgw->common->phpgw_exit(); ?> diff --git a/calendar/preferences.php b/calendar/preferences.php index f3dc1a69eb..597c006bd0 100644 --- a/calendar/preferences.php +++ b/calendar/preferences.php @@ -115,7 +115,7 @@ } ?> - +