fix for Week View warnings in calendar

This commit is contained in:
skeeter 2000-11-28 00:59:54 +00:00
parent 3d6ffda207
commit fad064074b
3 changed files with 7 additions and 8 deletions

View File

@ -1,5 +1,4 @@
<!-- $Id$ -->
<!-- BEGIN week -->
{printer_friendly}
<head>
<style type="text/css">
@ -32,4 +31,3 @@
</table>
{week_display}
{print}
<!-- END week -->

View File

@ -78,9 +78,9 @@
}
$first = $phpgw->calendar->splitdate($phpgw->calendar->get_sunday_before($thisyear, $thismonth, $thisday) + $start);
$last = $phpgw->calendar->splitdate($first["raw"] + 518400);
$phpgw->template->set_file(array("week" => "week.tpl"));
$phpgw->template->set_file(array("week_t" => "week.tpl"));
$phpgw->template->set_block("week");
$phpgw->template->set_block("week_t","week");
if ($friendly) {
$phpgw->template->set_var("printer_friendly","<body bgcolor=\"".$phpgw_info["theme"]["bg_color"]."\">");
@ -119,12 +119,12 @@
$param = "year=".$thisyear."&month=".$thismonth."&day=".$thisday."&friendly=1";
$phpgw->template->set_var("print","<a href=\"".$phpgw->link($PHP_SELF,$param)."\" TARGET=\"cal_printer_friendly\" onMouseOver=\"window."
. "status = '" . lang("Generate printer-friendly version"). "'\">[". lang("Printer Friendly") . "]</A>");
$phpgw->template->parse("out","week");
$phpgw->template->pparse("out","week");
$phpgw->template->parse("out","week_t");
$phpgw->template->pparse("out","week_t");
$phpgw->common->phpgw_footer();
} else {
$phpgw->template->set_var("print","");
$phpgw->template->parse("out","week");
$phpgw->template->pparse("out","week");
$phpgw->template->parse("out","week_t");
$phpgw->template->pparse("out","week_t");
}
?>

View File

@ -7,6 +7,7 @@
- Fix for Day View warning in calendar.
- Fix for TTS with Update by non-email user.
- Fixed admin/accesslog.php wasn't using phpgw_access_log
- Fix for Week View warning in calendar.
[0.9.6] - Fix user permissions where not being checked properly.