extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2024-10-06 10:02:21 +02:00
Code Issues Packages Projects Releases Wiki Activity

fix for displaying of events across days

Browse Source
This commit is contained in:
skeeter 2001-01-17 03:20:35 +00:00
parent 12badc6dc1
commit 051325b3d9
1 changed files with 15 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -767,8 +767,21 @@
} else { } else {
$format = "H:i"; $format = "H:i";
} }
$p->set_var('start_time',$phpgw->common->show_date($lr_events->datetime,$format)); if($lr_events->datetime < $date["raw"]) {
$p->set_var('end_time',$phpgw->common->show_date($lr_events->edatetime,$format)); $temp_time = $this->makegmttime(0,0,0,$date["month"],$date["day"],$date["year"]);
$start_time = $phpgw->common->show_date($temp_time["raw"],$format);
} else {
$start_time = $phpgw->common->show_date($lr_events->datetime,$format);
}
if($lr_events->edatetime > ($date["raw"] + 86400)) {
$temp_time = $this->makegmttime(23,59,59,$date["month"],$date["day"],$date["year"]);
$end_time = $phpgw->common->show_date($temp_time["raw"],$format);
} else {
$end_time = $phpgw->common->show_date($lr_events->edatetime,$format);
}
$p->set_var('start_time',$start_time);
$p->set_var('end_time',$end_time);
} else { } else {
$p->set_var('start_time',''); $p->set_var('start_time','');
$p->set_var('end_time',''); $p->set_var('end_time','');