From 06be3c35e2a41493fc4668dca80703870fcb089b Mon Sep 17 00:00:00 2001
From: skeeter <skeeter@alumni.egroupware.org>
Date: Wed, 6 Dec 2000 04:34:55 +0000
Subject: [PATCH] should fix where events showing on previous day if less than
 0200

---
 calendar/edit_entry.php         | 6 +++++-
 calendar/edit_entry_handler.php | 2 +-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/calendar/edit_entry.php b/calendar/edit_entry.php
index caf58a1d11..beab44b914 100755
--- a/calendar/edit_entry.php
+++ b/calendar/edit_entry.php
@@ -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++) {
diff --git a/calendar/edit_entry_handler.php b/calendar/edit_entry_handler.php
index df11f0048f..c3f34cce01 100755
--- a/calendar/edit_entry_handler.php
+++ b/calendar/edit_entry_handler.php
@@ -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();
   }