extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2024-11-23 00:13:35 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fixed preferences for calendar app

Browse Source
This commit is contained in:
skeeter 2000-10-17 01:40:13 +00:00
parent 21ff215242
commit e1c60e9daf
3 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
calendar/inc/functions.inc.php
View File

@ -554,8 +554,8 @@
$phpgw->db->query($sql); $phpgw->db->query($sql);
$hour_arr = Array(); $hour_arr = Array();
$first_hour = ($phpgw_info["user"]["preferences"]["common"]["workdaystarts"] + 1); $first_hour = ($phpgw_info["user"]["preferences"]["calendar"]["workdaystarts"] + 1);
$last_hour = ($phpgw_info["user"]["preferences"]["common"]["workdayends"] + 1); $last_hour = ($phpgw_info["user"]["preferences"]["calendar"]["workdayends"] + 1);
$rowspan_arr = Array(); $rowspan_arr = Array();

4
calendar/index.php
View File

@ -145,10 +145,10 @@
print_date_entries($date,$friendly,$phpgw_info["user"]["sessionid"]); print_date_entries($date,$friendly,$phpgw_info["user"]["sessionid"]);
$thirsday=$i+24*3600*4; $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>"; 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>"; echo "<font size=\"-2\"><a href=\"".$phpgw->link("week.php","date=" . date("Ymd",$date)) . "\">week " . (int)((date("z",$thirsday)+7)/7) . "</a></font>";
} }

10
calendar/week.php
View File

@ -76,9 +76,11 @@
<TABLE BORDER=0 WIDTH=100%> <TABLE BORDER=0 WIDTH=100%>
<TR> <TR>
<?php if (! $friendly) { ?> <?php
<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> if (! $friendly) {
<?php } ?> 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> <TD ALIGN="middle"><FONT SIZE="+2" COLOR="<?php echo $H2COLOR;?>"><B>
<?php <?php
if (date("m", $sun) == date("m", $sat)) { if (date("m", $sun) == date("m", $sat)) {
@ -144,7 +146,7 @@
echo "<TD VALIGN=\"top\" WIDTH=75 HEIGHT=75 ID=\"tablecell\""; echo "<TD VALIGN=\"top\" WIDTH=75 HEIGHT=75 ID=\"tablecell\"";
if (date("Ymd", $date) == date("Ymd", $today)) if (date("Ymd", $date) == date("Ymd", $today))
echo "BGCOLOR=\"".$phpgw_info["theme"][cal_today]."\">"; echo "BGCOLOR=\"".$phpgw_info["theme"]["cal_today"]."\">";
else else
echo "BGCOLOR=\"$CELLBG\">"; echo "BGCOLOR=\"$CELLBG\">";