holm/egroupware
1
1
Fork 0
forked from extern/egroupware
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix for overlapping

Browse Source
This commit is contained in:
skeeter 2001-01-13 03:36:36 +00:00
parent fb2047767f
commit a60ef898e2
2 changed files with 10 additions and 1593 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
calendar/edit_entry_handler.php
View File

@ -72,10 +72,10 @@
$datetime_check = validate($cal_info);
if ($phpgw_info["user"]["preferences"]["common"]["timeformat"] == "12") {
if ($cal_info->hour >= 12) {
$cal_info->ampm = "";
$cal_info->ampm = "";
}
if ($cal_info->end_hour >= 12) {
$cal_info->end_ampm = "";
$cal_info->end_ampm = "";
}
}
$cal_info->datetime += ((60 * 60) * $phpgw_info["user"]["preferences"]["common"]["tz_offset"]);
@ -110,12 +110,13 @@
for($i=0;$i<count($calendar_overlaps);$i++) {
$cal_over = $calendar_overlaps[$i];
if($cal_over) {
$overlap .= "<li>";
if(strtoupper($cal_over->access) == "PRIVATE")
$overlap .= "(PRIVATE)";
else
$overlap .= $phpgw->calendar->link_to_entry($cal_over->id,"circle.gif",$cal_over->name);
$overlap .= " (".$phpgw->common->show_date($cal_over->datetime)." - ".$phpgw->common->show_date($cal_over->edatetime).")<br>";
$overlap .= "<li>";
$private = $phpgw->calendar->is_private($cal_over,$cal_over->owner);
if(strtoupper($private) == "PRIVATE")
$overlap .= "(PRIVATE)";
else
$overlap .= $phpgw->calendar->link_to_entry($cal_over->id,"circle.gif",$cal_over->description).$cal_over->name;
$overlap .= " (".$phpgw->common->show_date($cal_over->datetime)." - ".$phpgw->common->show_date($cal_over->edatetime).")<br>";
}
}
if(strlen($overlap)) {

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

File diff suppressed because it is too large Load Diff