extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2024-11-26 01:43:47 +01:00
Code Issues Packages Projects Releases Wiki Activity

should fix where events showing on previous day if less than 0200

Browse Source
This commit is contained in:
skeeter 2000-12-06 04:34:55 +00:00
parent 848bb744bc
commit 06be3c35e2
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
calendar/edit_entry.php
View File

@ -41,6 +41,7 @@
$cal_info = $phpgw->common->appsession();
$can_edit = true;
} else {
// $cal_info->owner = $phpgw_info["user"]["account_id"];
$can_edit = true;
if (!isset($day) || !$day)
@ -230,7 +231,10 @@
// Groups
$phpgw->template->set_var("field",lang("Groups"));
$str = "<select name=\"groups[]\" multiple size=\"5\">";
$user_groups = $phpgw->accounts->read_group_names();
$db2 = $phpgw->db;
$db2->query("SELECT account_lid FROM accounts WHERE account_id=".$cal_info->owner,__LINE__,__FILE__);
$db2->next_record();
$user_groups = $phpgw->accounts->read_group_names($db2->f("account_lid"));
for ($i=0;$i<count($user_groups);$i++) {
$str .= "<option value=\"" . $user_groups[$i][0] . "\"";
for($j=0;$j<count($cal_info->groups);$j++) {

2
calendar/edit_entry_handler.php
View File

@ -33,7 +33,7 @@
$cal_info->owner = $cal_info->participants[0];
}
$phpgw->common->appsession($cal_info);
$overlapping_events = $phpgw->calendar->overlap($cal_info->month,$cal_info->day,$cal_info->year,$cal_info->hour,$cal_info->minute,$cal_info->ampm,$cal_info->end_month,$cal_info->end_day,$cal_info->end_year,$cal_info->end_hour,$cal_info->end_minute,$cal_info->end_ampm,$cal_info->participants,$cal_info->id);
$overlapping_events = $phpgw->calendar->overlap($cal_info->month,$cal_info->day,$cal_info->year,$cal_info->hour,$cal_info->minute,$cal_info->ampm,$cal_info->end_month,$cal_info->end_day,$cal_info->end_year,$cal_info->end_hour,$cal_info->end_minute,$cal_info->end_ampm,$cal_info->participants,$cal_info->owner,$cal_info->id);
} else {
$cal_info = $phpgw->common->appsession();
}