From e1c60e9daf1ba471a7443581ff2fd9e59524c7d8 Mon Sep 17 00:00:00 2001
From: skeeter <skeeter@alumni.egroupware.org>
Date: Tue, 17 Oct 2000 01:40:13 +0000
Subject: [PATCH] Fixed preferences for calendar app

---
 calendar/inc/functions.inc.php |  4 ++--
 calendar/index.php             |  4 ++--
 calendar/week.php              | 10 ++++++----
 3 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/calendar/inc/functions.inc.php b/calendar/inc/functions.inc.php
index c7ae8aa769..e0458fab4d 100755
--- a/calendar/inc/functions.inc.php
+++ b/calendar/inc/functions.inc.php
@@ -554,8 +554,8 @@
 
   $phpgw->db->query($sql);
   $hour_arr = Array();
-  $first_hour = ($phpgw_info["user"]["preferences"]["common"]["workdaystarts"] + 1);
-  $last_hour  = ($phpgw_info["user"]["preferences"]["common"]["workdayends"] + 1);
+  $first_hour = ($phpgw_info["user"]["preferences"]["calendar"]["workdaystarts"] + 1);
+  $last_hour  = ($phpgw_info["user"]["preferences"]["calendar"]["workdayends"] + 1);
 
   $rowspan_arr = Array();
 
diff --git a/calendar/index.php b/calendar/index.php
index 8da2e4d597..68c22b1f4f 100755
--- a/calendar/index.php
+++ b/calendar/index.php
@@ -145,10 +145,10 @@
          print_date_entries($date,$friendly,$phpgw_info["user"]["sessionid"]);
 
          $thirsday=$i+24*3600*4;
-         if ($phpgw_info["user"]["preferences"]["weekdaystarts"] == "Sunday" && $j == 0) {
+         if ($phpgw_info["user"]["preferences"]["calendar"]["weekdaystarts"] == "Sunday" && $j == 0) {
             echo "<font size=\"-2\"><a href=\"".$phpgw->link("week.php","date=".date("Ymd",$date))."\">week " .(int)((date("z",$thirsday)+7)/7) . "</a></font>";
          }
-         if ($phpgw_info["user"]["preferences"]["weekdaystarts"] == "Monday" && $j == 1) {
+         if ($phpgw_info["user"]["preferences"]["calendar"]["weekdaystarts"] == "Monday" && $j == 1) {
             echo "<font size=\"-2\"><a href=\"".$phpgw->link("week.php","date=" . date("Ymd",$date)) . "\">week " . (int)((date("z",$thirsday)+7)/7) . "</a></font>";
          }
 
diff --git a/calendar/week.php b/calendar/week.php
index 0a8cc6558f..f42b2ca47b 100755
--- a/calendar/week.php
+++ b/calendar/week.php
@@ -76,9 +76,11 @@
 
 <TABLE BORDER=0 WIDTH=100%>
 <TR>
-<?php if (! $friendly) { ?>
-<TD ALIGN="left"><A HREF="week.php?sessionid=<?php echo $phpgw_info["user"]["sessionid"]; ?>&year=<?php echo $prevyear;?>&month=<?php echo $prevmonth;?>&day=<?php echo $prevday;?>">&lt;&lt;</A></TD>
-<?php } ?>
+<?php 
+  if (! $friendly) {
+    echo "<td align=\"left\"><a href=\"".$phpgw->link("week.php","year=$prevyear&month=$prevmonth&day=$prevday")."\">&lt;&lt;</a></td>";
+  }
+?>
 <TD ALIGN="middle"><FONT SIZE="+2" COLOR="<?php echo $H2COLOR;?>"><B>
 <?php
   if (date("m", $sun) == date("m", $sat)) {
@@ -144,7 +146,7 @@
 
     echo "<TD VALIGN=\"top\" WIDTH=75 HEIGHT=75 ID=\"tablecell\"";
     if (date("Ymd", $date) == date("Ymd", $today))
-       echo "BGCOLOR=\"".$phpgw_info["theme"][cal_today]."\">";
+       echo "BGCOLOR=\"".$phpgw_info["theme"]["cal_today"]."\">";
     else
        echo "BGCOLOR=\"$CELLBG\">";