Well I got tired of waiting and have modified made all the changes except one which I need a little help with. This is for 1.3.11.
I haven't looked at 1.4.0 yet. Here is the diff file. It's a little messy right now but I have the line numbers that I have changed. The part I'm not sure about is between the hash marks /////. I put the new line numbers under the old one.
Text Formatted Code
2d1
<
34c33
< // $Id: calendar.php,v 1.28 2003/03/29 19:12:28 dhaun Exp $
---
> // $Id: calendar.php,v 1.28 2003/03/29 19:12:28 dhaun Exp $ ** modified by klync
152c151
236
< global $_CONF, $LANG30;
---
> global $_CONF, $LANG30, $group;
164c163
250 Don't change the whole line only add the change
< . '<tr><td align=center colspan=7><a href="' . $_CONF['site_url'] . '/calendar.php?month=' . $m . '&year=' . $y . $mode . '">'
---
> . '<tr><td align=center colspan=7><a href="' . $_CONF['site_url'] . '/calendar.php?month=' . $m . '&year=' . $y . $mode . '&group=' . $group . '">'
289a289,303
After 358
/////////////////////////////////////////////////////////////////////
// This is where the custom menu for group_events will go!!!!
// The rest of the code needs to be modified to allow another get variable
// $group = numeric gid of selected group calendar
// (has to be 0 or in $_TABLE['vars'] where name = event_groups)
if (!isset($group)) {
$group = '0';
}
$display .= GroupCalendarsLinks($group);
/////////////////////////////////////////////////////////////////////
380c394
475
< $cal_templates->set_var('calendar_toggle', '[<a href="' . $_CONF['site_url'] . "/calendar.php?mode=&view=day&month=$month&day=$day&year=$year">" . $LANG30[11] . '</a>]');
---
> $cal_templates->set_var('calendar_toggle', '[<a href="' . $_CONF['site_url'] . "/calendar.php?mode=&view=day&month=$month&day=$day&year=$year&group=$group">" . $LANG30[11] . '</a>]');
384c398
479
< $cal_templates->set_var('calendar_toggle', '[<a href="' . $_CONF['site_url'] . "/calendar.php?mode=personal&view=day&month=$month&day=$day&year=$year">" . $LANG30[12] . '</a>]');
---
> $cal_templates->set_var('calendar_toggle', '[<a href="' . $_CONF['site_url'] . "/calendar.php?mode=personal&view=day&month=$month&day=$day&year=$year&group=$group">" . $LANG30[12] . '</a>]');
394c408,413
489
< $calsql = "SELECT * FROM {$_TABLES["events"]} WHERE ((allday=1 AND datestart = "$year-$month-$day") OR (datestart >= "$year-$month-$day 00:00:00" AND datestart <= "$year-$month-$day 23:59:59") OR (dateend >= "$year-$month-$day 00:00:00" AND dateend <= "$year-$month-$day 23:59:59") OR ("$year-$month-$day" between datestart and dateend)) ORDER BY datestart,timestart";
---
if ($group == 0) {
$calsql = "SELECT * FROM {$_TABLES["events"]} WHERE ((allday=1 AND datestart = "$year-$month-$day") OR (datestart >= "$year-$month-$day 00:00:00" AND datestart <= "$year-$month-$day 23:59:59") OR (dateend >= "$year-$month-$day 00:00:00" AND dateend <= "$year-$month-$day 23:59:59") OR ("$year-$month-$day" between datestart and dateend)) ORDER BY datestart,timestart";
} else {
$calsql = "SELECT * FROM {$_TABLES["events"]} WHERE ((group_id = $group) AND ((allday=1 AND datestart = "$year-$month-$day") OR (datestart >= "$year-$month-$day 00:00:00" AND datestart <= "$year-$month-$day 23:59:59") OR (dateend >= "$year-$month-$day 00:00:00" AND dateend <= "$year-$month-$day 23:59:59") OR ("$year-$month-$day" between datestart and dateend))) ORDER BY datestart,timestart";
}
>
481c500
570
< $cal_templates->set_var('calendar_toggle', '[<a href="' . $_CONF['site_url'] . "/calendar.php?mode=&view=week&month=$month&day=$day&year=$year">" . $LANG30[11] . '</a>]');
---
> $cal_templates->set_var('calendar_toggle', '[<a href="' . $_CONF['site_url'] . "/calendar.php?mode=&view=week&month=$month&day=$day&year=$year&group=$group">" . $LANG30[11] . '</a>]');
485c504
574
< $cal_templates->set_var('calendar_toggle', '[<a href="' . $_CONF['site_url'] . "/calendar.php?mode=personal&view=week&month=$month&day=$day&year=$year">" . $LANG30[12] . '</a>]');
---
> $cal_templates->set_var('calendar_toggle', '[<a href="' . $_CONF['site_url'] . "/calendar.php?mode=personal&view=week&month=$month&day=$day&year=$year&group=$group">" . $LANG30[12] . '</a>]');
536c555
646
< $cal_templates->set_var('day'.$i,$dayname . ", <a href="{$_CONF['site_url']}/calendar.php?mode=$mode&view=day&day=$daynum&month=$monthnum&year=$yearnum">" . strftime ("%x", $thedate[1]) . '</a>');
---
> $cal_templates->set_var('day'.$i,$dayname . ", <a href="{$_CONF['site_url']}/calendar.php?mode=$mode&group=$group&view=day&day=$daynum&month=$monthnum&year=$yearnum">" . strftime ("%x", $thedate[1]) . '</a>');
541c560,564
658
< $calsql = "SELECT * FROM {$_TABLES["events"]} WHERE ((allday=1 AND datestart = "$yearnum-$monthnum-$daynum") OR (datestart >= "$yearnum-$monthnum-$daynum 00:00:00" AND datestart <= "$yearnum-$monthnum-$daynum 23:59:59") OR (dateend >= "$yearnum-$monthnum-$daynum 00:00:00" AND dateend <= "$yearnum-$monthnum-$daynum 23:59:59") OR ("$yearnum-$monthnum-$daynum" between datestart and dateend)) ORDER BY datestart,timestart";
---
> if ($group == 0) {
> $calsql = "SELECT * FROM {$_TABLES["events"]} WHERE ((allday=1 AND datestart = "$yearnum-$monthnum-$daynum") OR (datestart >= "$yearnum-$monthnum-$daynum 00:00:00" AND datestart <= "$yearnum-$monthnum-$daynum 23:59:59") OR (dateend >= "$yearnum-$monthnum-$daynum 00:00:00" AND dateend <= "$yearnum-$monthnum-$daynum 23:59:59") OR ("$yearnum-$monthnum-$daynum" between datestart and dateend)) ORDER BY datestart,timestart";
> } else {
> $calsql = "SELECT * FROM {$_TABLES["events"]} WHERE ((group_id = $group) AND ((allday=1 AND datestart = "$yearnum-$monthnum-$daynum") OR (datestart >= "$yearnum-$monthnum-$daynum 00:00:00" AND datestart <= "$yearnum-$monthnum-$daynum 23:59:59") OR (dateend >= "$yearnum-$monthnum-$daynum 00:00:00" AND dateend <= "$yearnum-$monthnum-$daynum 23:59:59") OR ("$yearnum-$monthnum-$daynum" between datestart and dateend))) ORDER BY datestart,timestart";
> }
686c709
<
---
> /// fix me with &group=$group
688c711
844
< . '&year=' . $year . '" class="cal_date">' . $curday->daynumber. '</a><hr>');
---
> . '&year=' . $year . '&group=' . $group . '" class="cal_date">' . $curday->daynumber. '</a><hr>');
699c722,733
851
< $calsql = "SELECT * FROM {$_TABLES["events"]} WHERE (datestart >= "$year-$month-$curday->daynumber 00:00:00" AND datestart <= "$year-$month-$curday->daynumber 23:59:59") OR (dateend >= "$year-$month-$curday->daynumber 00:00:00" AND dateend <= "$year-$month-$curday->daynumber 23:59:59") OR ("$year-$month-$curday->daynumber" between datestart and dateend) ORDER BY datestart,timestart";
---
> if ($group == 0) {
> $calsql = "SELECT * FROM {$_TABLES["events"]} WHERE (datestart >= "$year-$month-$curday->daynumber 00:00:00" AND datestart <= "$year-$month-$curday->daynumber 23:59:59") OR (dateend >= "$year-$month-$curday->daynumber 00:00:00" AND dateend <= "$year-$month-$curday->daynumber 23:59:59") OR ("$year-$month-$curday->daynumber" between datestart and dateend) ORDER BY datestart,timestart";
> } else {
> $calsql = "SELECT * FROM {$_TABLES["events"]} WHERE ((group_id = $group) AND ((datestart >= "$year-$month-$curday->daynumber 00:00:00" AND datestart <= "$year-$month-$curday->daynumber 23:59:59") OR (dateend >= "$year-$month-$curday->daynumber 00:00:00" AND dateend <= "$year-$month-$curday->daynumber 23:59:59") OR ("$year-$month-$curday->daynumber" between datestart and dateend))) ORDER BY datestart,timestart";
>
> /* Returns this crap:
>
> SELECT * FROM gl_events WHERE ((group_id = 19) AND (datestart >= "2003-05-31 00:00:00" AND datestart <= "2003-05-31 23:59:59") OR (dateend >= "2003-05-31 00:00:00" AND dateend <= "2003-05-31 23:59:59") OR ("2003-05-31" between datestart and dateend)) ORDER BY datestart,timestart
>
>
> */
> }
712c746
870
< $entries .= '<a href="calendar_event.php?mode=' . $mode . '&eid=' . $results['eid'] . '" class="cal_event">'
---
> $entries .= '<a href="calendar_event.php?mode=' . $mode . '&eid=' . $results['eid'] . '&group=' . $group . '" class="cal_event">'
Also I think there were some template changes. Does anyone still have a old geeklog with this working?