diff options
| author | Kevin Jardine <kevinjardine@yahoo.com> | 2011-09-28 17:02:51 +0200 |
|---|---|---|
| committer | Kevin Jardine <kevinjardine@yahoo.com> | 2011-09-28 17:02:51 +0200 |
| commit | 8b595e63700e1ebaf0f31b08b0009922acc780e3 (patch) | |
| tree | 986f80c2acca023c8734e4758f03e96c1a43cd44 /models | |
| parent | 1bba961e3cea230e7d6a62a5016c5ea23a5c0e76 (diff) | |
| download | elgg-8b595e63700e1ebaf0f31b08b0009922acc780e3.tar.gz elgg-8b595e63700e1ebaf0f31b08b0009922acc780e3.tar.bz2 | |
restored RSS feed and added iCal feed
Diffstat (limited to 'models')
| -rw-r--r-- | models/model.php | 23 |
1 files changed, 22 insertions, 1 deletions
diff --git a/models/model.php b/models/model.php index 4a7da3dd1..dafc10bc9 100644 --- a/models/model.php +++ b/models/model.php @@ -1096,6 +1096,8 @@ function event_calendar_send_event_request($event,$user_guid) { // pages function event_calendar_get_page_content_list($page_type,$group_guid,$start_date,$display_mode,$filter,$region='-') { + global $autofeed; + $autofeed = true; if ($page_type == 'group') { if (!event_calendar_activated_for_group($group_guid)) { forward(); @@ -1149,8 +1151,26 @@ function event_calendar_get_page_content_list($page_type,$group_guid,$start_date } } } + + $url = full_url(); + if (substr_count($url, '?')) { + $url .= "&view=ical"; + } else { + $url .= "?view=ical"; + } $params = event_calendar_generate_listing_params($page_type,$group_guid,$start_date,$display_mode,$filter,$region); + + $url = elgg_format_url($url); + $menu_options = array( + 'name' => 'ical', + 'text' => '<img src="'.elgg_get_site_url().'mod/event_calendar/images/ics.png" />', + 'href' => $url, + 'title' => elgg_echo('feed:ical'), + 'priority' => 800, + ); + $menu_item = ElggMenuItem::factory($menu_options); + elgg_register_menu_item('extras', $menu_item); $body = elgg_view_layout("content", $params); @@ -1348,8 +1368,8 @@ function event_calendar_generate_listing_params($page_type,$group_guid,$original $user_guid = elgg_get_logged_in_user_guid(); $offset = get_input('offset'); + $limit = get_input('limit',15); - $limit = 15; if ($event_calendar_spots_display == 'yes') { if (!$filter) { $filter = 'open'; @@ -1391,6 +1411,7 @@ function event_calendar_generate_listing_params($page_type,$group_guid,$original ); $content = elgg_view('event_calendar/show_events', $vars); + $filter_override = elgg_view('event_calendar/filter_menu',$vars); if ($event_calendar_listing_format == 'paged') { |