extern/egroupware
1
0
Fork 1
mirror of https://github.com/EGroupware/egroupware.git synced 2025-01-29 01:09:10 +01:00
Code Issues Packages Projects Releases Wiki Activity

now displays group events on members calendar

Browse Source
This commit is contained in:
skeeter 2000-09-13 00:24:24 +00:00
parent ffd1efa794
commit bd8f8f4afe
2 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -383,12 +383,19 @@ function month_name ( $m ) {
$sql = "SELECT webcal_entry.cal_name, webcal_entry.cal_date, " $sql = "SELECT webcal_entry.cal_name, webcal_entry.cal_date, "
. "webcal_entry_repeats.*, webcal_entry.cal_description, " . "webcal_entry_repeats.*, webcal_entry.cal_description, "
. "webcal_entry.cal_time,webcal_entry.cal_priority, " . "webcal_entry.cal_time,webcal_entry.cal_priority, "
. "webcal_entry.cal_duration " . "webcal_entry.cal_duration, webcal_entry_groups.groups "
. "FROM webcal_entry, webcal_entry_repeats, webcal_entry_user " . "FROM webcal_entry, webcal_entry_repeats, webcal_entry_user, webcal_entry_groups "
. "WHERE webcal_entry.cal_id = webcal_entry_repeats.cal_id " . "WHERE webcal_entry.cal_id = webcal_entry_repeats.cal_id "
. "AND webcal_entry.cal_id = webcal_entry_user.cal_id " . "AND webcal_entry.cal_id = webcal_entry_user.cal_id "
. "AND webcal_entry_user.cal_login = '" . $phpgw_info["user"]["userid"] . "' " . "AND webcal_entry_groups.cal_id = webcal_entry.cal_id "
. "AND webcal_entry.cal_type='M'"; . "AND (webcal_entry_user.cal_login = '" . $phpgw_info["user"]["userid"] . "' OR (webcal_entry.cal_access='group' AND (";
$group_names = $phpgw->accounts->read_group_names();
for ($i=0;$i<count($group_names);$i++) {
$sql .= "webcal_entry_groups.groups like '%".$group_names[$i][1]."%'";
if (count($group_names) != 0 && $i != count($group_names)-1)
$sql .= " OR ";
}
$sql .= "))) AND webcal_entry.cal_type='M'";
$phpgw->db->query($sql); $phpgw->db->query($sql);

3
doc/CHANGELOG
View File

@ -6,7 +6,8 @@
- Fixed changing of password not getting set in session table - Fixed changing of password not getting set in session table
- email now displays "Could not open mailbox" if mailbox could - email now displays "Could not open mailbox" if mailbox could
not be opened (formerly displayed just "mailbox empty") not be opened (formerly displayed just "mailbox empty")
- Fixed displaying of repeated events by owner - Fixed displaying of repeated calendar events by owner
- Fixed displaying of calendar events to include group events
[09072000] - Added print icon that allows you to print out a page without having [09072000] - Added print icon that allows you to print out a page without having
the navbar. Thanks Sam Wynn Jr <sam.wynn@lmco.com> the navbar. Thanks Sam Wynn Jr <sam.wynn@lmco.com>