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

small fixes for the change of get_sunday_before()

Browse Source
This commit is contained in:
skeeter 2001-01-16 03:26:16 +00:00
parent 252ee3f160
commit fef98bc693
3 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -38,8 +38,8 @@
$this->printer_friendly = $p_friendly; $this->printer_friendly = $p_friendly;
$now = time(); // $now = time();
$this->today = $this->splitdate($now); $this->today = $this->localdates(time());
} }
function set_filter() { function set_filter() {

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

@ -75,9 +75,7 @@
} }
$d_time = mktime(0,0,0,$m,$d,$y); $d_time = mktime(0,0,0,$m,$d,$y);
$thisdate = date("Ymd", $d_time); $thisdate = date("Ymd", $d_time);
$sun = $phpgw->calendar->get_sunday_before($y,$m,$d); $sun = $phpgw->calendar->get_weekday_start($y,$m,$d);
if ($phpgw_info["user"]["preferences"]["calendar"]["weekdaystarts"] == "Monday")
$sun += 86400;
for ($i = -7; $i <= 7; $i++) { for ($i = -7; $i <= 7; $i++) {
$tsun = $sun + (3600 * 24 * 7 * $i); $tsun = $sun + (3600 * 24 * 7 * $i);
$tsat = $tsun + (3600 * 24 * 6); $tsat = $tsun + (3600 * 24 * 6);

6
calendar/inc/hook_home.inc.php
View File

@ -10,9 +10,9 @@
if ($phpgw_info["user"]["preferences"]["calendar"]["mainscreen_showevents"]) { if ($phpgw_info["user"]["preferences"]["calendar"]["mainscreen_showevents"]) {
include($phpgw_info["server"]["app_inc"].'/functions.inc.php'); include($phpgw_info["server"]["app_inc"].'/functions.inc.php');
echo "\n".'<tr valign="top"><td><table border="0" cols="2"><tr><td align="center" width="30%" valign="top"><!-- Calendar info -->'."\n"; echo "\n".'<tr valign="top"><td><table border="0" cols="3"><tr><td align="center" width="30%" valign="top"><!-- Calendar info -->'."\n";
echo $phpgw->calendar->mini_calendar($phpgw->calendar->today["day"],$phpgw->calendar->today["month"],$phpgw->calendar->today["year"],"day.php").'</td><td align="center" width="70%">'; echo $phpgw->calendar->mini_calendar($phpgw->calendar->today["day"],$phpgw->calendar->today["month"],$phpgw->calendar->today["year"],"day.php").'</td><td align="center">';
$now = $phpgw->calendar->splitdate(mktime (0, 0, 0, $phpgw->calendar->today["month"], $phpgw->calendar->today["day"], $phpgw->calendar->today["year"]) - ((60 * 60) * $phpgw_info["user"]["preferences"]["common"]["tz_offset"])); $now = $phpgw->calendar->gmtdate($phpgw->calendar->today["raw"]);
echo '<table border="0" width="70%" cellspacing="0" cellpadding="0"><tr><td align="center">' echo '<table border="0" width="70%" cellspacing="0" cellpadding="0"><tr><td align="center">'
. lang(date("F",$phpgw->calendar->today["raw"])).' '.$phpgw->calendar->today["day"].', '.$phpgw->calendar->today["year"].'</tr></td>' . lang(date("F",$phpgw->calendar->today["raw"])).' '.$phpgw->calendar->today["day"].', '.$phpgw->calendar->today["year"].'</tr></td>'
. '<tr><td bgcolor="'.$phpgw_info["theme"]["bg_text"].'" valign="top">'; . '<tr><td bgcolor="'.$phpgw_info["theme"]["bg_text"].'" valign="top">';