extern/egroupware
1
0
Fork 1
mirror of https://github.com/EGroupware/egroupware.git synced 2024-11-08 09:04:53 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix for overlapping of events not overlapping

Browse Source
This commit is contained in:
skeeter 2001-01-27 01:40:03 +00:00
parent 91316c0538
commit f24fa93c1e
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -231,7 +231,7 @@
. "FROM calendar_entry, calendar_entry_user " . "FROM calendar_entry, calendar_entry_user "
. "WHERE (calendar_entry_user.cal_id = calendar_entry.cal_id) AND " . "WHERE (calendar_entry_user.cal_id = calendar_entry.cal_id) AND "
. " (((".$starttime." <= calendar_entry.cal_datetime) AND (".$endtime." >= calendar_entry.cal_datetime) AND (".$endtime." <= calendar_entry.cal_edatetime)) " . " (((".$starttime." <= calendar_entry.cal_datetime) AND (".$endtime." >= calendar_entry.cal_datetime) AND (".$endtime." <= calendar_entry.cal_edatetime)) "
. "OR ((".$starttime." >= calendar_entry.cal_datetime) AND (".$starttime." <= calendar_entry.cal_edatetime) AND (".$endtime." >= calendar_entry.cal_edatetime)) " . "OR ((".$starttime." >= calendar_entry.cal_datetime) AND (".$starttime." < calendar_entry.cal_edatetime) AND (".$endtime." >= calendar_entry.cal_edatetime)) "
. "OR ((".$starttime." <= calendar_entry.cal_datetime) AND (".$endtime." >= calendar_entry.cal_edatetime)) " . "OR ((".$starttime." <= calendar_entry.cal_datetime) AND (".$endtime." >= calendar_entry.cal_edatetime)) "
. "OR ((".$starttime." >= calendar_entry.cal_datetime) AND (".$endtime." <= calendar_entry.cal_edatetime))) "; . "OR ((".$starttime." >= calendar_entry.cal_datetime) AND (".$endtime." <= calendar_entry.cal_edatetime))) ";
@ -785,7 +785,8 @@
$pict = "rpt.gif"; $pict = "rpt.gif";
} }
} }
$p->set_var('link_entry',$this->link_to_entry($lr_events->id, $pict, $this->is_private($lr_events,$owner).' - '.$lr_events->description)); // $p->set_var('link_entry',$this->link_to_entry($lr_events->id, $pict, $this->is_private($lr_events,$owner).' - '.$lr_events->description));
$p->set_var('link_entry',$this->link_to_entry($lr_events->id, $pict, $lr_events->description));
if (intval($phpgw->common->show_date($lr_events->datetime,"Hi"))) { if (intval($phpgw->common->show_date($lr_events->datetime,"Hi"))) {
if ($phpgw_info["user"]["preferences"]["common"]["timeformat"] == "12") { if ($phpgw_info["user"]["preferences"]["common"]["timeformat"] == "12") {
$format = "h:i a"; $format = "h:i a";