1 files changed, 38 insertions, 33 deletions

diff --git a/views/default/settings/event_calendar/edit.php b/views/default/settings/event_calendar/edit.php
index 429a85b26..51bd2c49f 100644
--- a/views/default/settings/event_calendar/edit.php
+++ b/views/default/settings/event_calendar/edit.php
@@ -10,12 +10,13 @@ $access_options = array(	ACCESS_PRIVATE => elgg_echo("PRIVATE"),
 // TODO - merge the agenda view into the list format options
 
 $listing_options = array(elgg_echo('event_calendar:settings:paged')=>'paged',
+	elgg_echo('event_calendar:settings:agenda')=>'agenda',
 	elgg_echo('event_calendar:settings:month')=>'month',
 );
 
 $body = '';
 
-$event_calendar_hide_access = get_plugin_setting('hide_access', 'event_calendar');
+$event_calendar_hide_access = elgg_get_plugin_setting('hide_access', 'event_calendar');
 if (!$event_calendar_hide_access) {
 	$event_calendar_hide_access = 'no';
 }
@@ -26,7 +27,7 @@ $body .= elgg_view('input/radio',array('internalname'=>'params[hide_access]','va
 
 $body .= '<br />';
 
-$event_calendar_default_access = get_plugin_setting('default_access', 'event_calendar');
+$event_calendar_default_access = elgg_get_plugin_setting('default_access', 'event_calendar');
 if (!$event_calendar_default_access) {
 	$event_calendar_default_access = ACCESS_LOGGED_IN;
 }
@@ -37,7 +38,7 @@ $body .= elgg_view('input/pulldown',array('internalname'=>'params[default_access
 
 $body .= '<br /><br />';
 
-$event_calendar_hide_end = get_plugin_setting('hide_end', 'event_calendar');
+$event_calendar_hide_end = elgg_get_plugin_setting('hide_end', 'event_calendar');
 if (!$event_calendar_hide_end) {
 	$event_calendar_hide_end = 'no';
 }
@@ -48,7 +49,7 @@ $body .= elgg_view('input/radio',array('internalname'=>'params[hide_end]','value
 
 $body .= '<br />';
 
-$event_calendar_listing_format = get_plugin_setting('listing_format', 'event_calendar');
+$event_calendar_listing_format = elgg_get_plugin_setting('listing_format', 'event_calendar');
 if (!$event_calendar_listing_format) {
 	$event_calendar_listing_format = 'month';
 }
@@ -59,7 +60,7 @@ $body .= elgg_view('input/radio',array('internalname'=>'params[listing_format]',
 
 $body .= '<br />';
 
-$event_calendar_times = get_plugin_setting('times', 'event_calendar');
+$event_calendar_times = elgg_get_plugin_setting('times', 'event_calendar');
 if (!$event_calendar_times) {
 	$event_calendar_times = 'no';
 }
@@ -70,7 +71,7 @@ $body .= elgg_view('input/radio',array('internalname'=>'params[times]','value'=>
 
 $body .= '<br />';
 
-$event_calendar_autopersonal = get_plugin_setting('autopersonal', 'event_calendar');
+$event_calendar_autopersonal = elgg_get_plugin_setting('autopersonal', 'event_calendar');
 if (!$event_calendar_autopersonal) {
 	$event_calendar_autopersonal = 'yes';
 }
@@ -81,7 +82,7 @@ $body .= elgg_view('input/radio',array('internalname'=>'params[autopersonal]','v
 
 $body .= '<br />';
 
-$event_calendar_autogroup = get_plugin_setting('autogroup', 'event_calendar');
+$event_calendar_autogroup = elgg_get_plugin_setting('autogroup', 'event_calendar');
 if (!$event_calendar_autogroup) {
 	$event_calendar_autogroup = 'no';
 }
@@ -92,7 +93,7 @@ $body .= elgg_view('input/radio',array('internalname'=>'params[autogroup]','valu
 
 $body .= '<br />';
 
-$event_calendar_add_to_group_calendar = get_plugin_setting('add_to_group_calendar', 'event_calendar');
+$event_calendar_add_to_group_calendar = elgg_get_plugin_setting('add_to_group_calendar', 'event_calendar');
 if (!$event_calendar_add_to_group_calendar) {
 	$event_calendar_add_to_group_calendar = 'no';
 }
@@ -103,7 +104,9 @@ $body .= elgg_view('input/radio',array('internalname'=>'params[add_to_group_cale
 
 $body .= '<br />';
 
-$event_calendar_agenda_view = get_plugin_setting('agenda_view', 'event_calendar');
+// agenda view is now handled in the listing area
+
+/*$event_calendar_agenda_view = get_plugin_setting('agenda_view', 'event_calendar');
 if (!$event_calendar_agenda_view) {
 	$event_calendar_agenda_view = 'no';
 }
@@ -112,9 +115,9 @@ $body .= elgg_echo('event_calendar:settings:agenda_view:title');
 $body .= '<br />';
 $body .= elgg_view('input/radio',array('internalname'=>'params[agenda_view]','value'=>$event_calendar_agenda_view,'options'=>$yn_options));
 
-$body .= '<br />';
+$body .= '<br />';*/
 
-$event_calendar_venue_view = get_plugin_setting('venue_view', 'event_calendar');
+$event_calendar_venue_view = elgg_get_plugin_setting('venue_view', 'event_calendar');
 if (!$event_calendar_venue_view) {
 	$event_calendar_venue_view = 'no';
 }
@@ -130,7 +133,7 @@ $options = array(elgg_echo('event_calendar:settings:no')=>'no',
 	elgg_echo('event_calendar:settings:site_calendar:loggedin')=>'loggedin',
 );
 
-$event_calendar_site_calendar = get_plugin_setting('site_calendar', 'event_calendar');
+$event_calendar_site_calendar = elgg_get_plugin_setting('site_calendar', 'event_calendar');
 if (!$event_calendar_site_calendar) {
 	$event_calendar_site_calendar = 'admin';
 }
@@ -145,7 +148,7 @@ $options = array(elgg_echo('event_calendar:settings:no')=>'no',
 	elgg_echo('event_calendar:settings:group_calendar:members')=>'members',
 );
 
-$event_calendar_group_calendar = get_plugin_setting('group_calendar', 'event_calendar');
+$event_calendar_group_calendar = elgg_get_plugin_setting('group_calendar', 'event_calendar');
 if (!$event_calendar_group_calendar) {
 	$event_calendar_group_calendar = 'members';
 }
@@ -159,7 +162,7 @@ $options = array(elgg_echo('event_calendar:settings:group_default:yes')=>'yes',
 	elgg_echo('event_calendar:settings:group_default:no')=>'no',
 );
 
-$event_calendar_group_default = get_plugin_setting('group_default', 'event_calendar');
+$event_calendar_group_default = elgg_get_plugin_setting('group_default', 'event_calendar');
 if (!$event_calendar_group_default) {
 	$event_calendar_group_default = 'yes';
 }
@@ -170,7 +173,7 @@ $body .= elgg_view('input/radio',array('internalname'=>'params[group_default]','
 
 $body .= '<br />';
 
-$event_calendar_group_always_display = get_plugin_setting('group_always_display', 'event_calendar');
+$event_calendar_group_always_display = elgg_get_plugin_setting('group_always_display', 'event_calendar');
 if (!$event_calendar_group_always_display) {
 	$event_calendar_group_always_display = 'no';
 }
@@ -181,12 +184,14 @@ $body .= elgg_view('input/radio',array('internalname'=>'params[group_always_disp
 
 $body .= '<br />';
 
-$options = array(elgg_echo('event_calendar:settings:group_profile_display_option:left')=>'left',
+// There does not seem to be a way to determine where the group calendar box will appear in Elgg 1.8
+
+/*$options = array(elgg_echo('event_calendar:settings:group_profile_display_option:left')=>'left',
 	elgg_echo('event_calendar:settings:group_profile_display_option:right')=>'right',
 	elgg_echo('event_calendar:settings:group_profile_display_option:none')=>'none',
 );
 
-$event_calendar_group_profile_display = get_plugin_setting('group_profile_display', 'event_calendar');
+$event_calendar_group_profile_display = elgg_get_plugin_setting('group_profile_display', 'event_calendar');
 if (!$event_calendar_group_profile_display) {
 	$event_calendar_group_profile_display = 'right';
 }
@@ -194,9 +199,9 @@ if (!$event_calendar_group_profile_display) {
 $body .= elgg_echo('event_calendar:settings:group_profile_display:title').'<br />';
 $body .= elgg_view('input/radio',array('internalname'=>'params[group_profile_display]','value'=>$event_calendar_group_profile_display,'options'=>$options));
 
-$body .= '<br />';
+$body .= '<br />';*/
 
-$event_calendar_add_users = get_plugin_setting('add_users', 'event_calendar');
+$event_calendar_add_users = elgg_get_plugin_setting('add_users', 'event_calendar');
 if (!$event_calendar_add_users) {
 	$event_calendar_add_users = 'no';
 }
@@ -207,7 +212,7 @@ $body .= elgg_view('input/radio',array('internalname'=>'params[add_users]','valu
 
 $body .= '<br />';
 
-$event_calendar_add_users_notify = get_plugin_setting('add_users_notify', 'event_calendar');
+$event_calendar_add_users_notify = elgg_get_plugin_setting('add_users_notify', 'event_calendar');
 if (!$event_calendar_add_users_notify) {
 	$event_calendar_add_users_notify = 'no';
 }
@@ -218,7 +223,7 @@ $body .= elgg_view('input/radio',array('internalname'=>'params[add_users_notify]
 
 $body .= '<br />';
 
-$event_calendar_personal_manage = get_plugin_setting('personal_manage', 'event_calendar');
+$event_calendar_personal_manage = elgg_get_plugin_setting('personal_manage', 'event_calendar');
 if (!$event_calendar_personal_manage) {
 	$event_calendar_personal_manage = 'yes';
 }
@@ -229,7 +234,7 @@ $body .= elgg_view('input/radio',array('internalname'=>'params[personal_manage]'
 
 $body .= '<br />';
 
-$event_calendar_spots_display = get_plugin_setting('spots_display', 'event_calendar');
+$event_calendar_spots_display = elgg_get_plugin_setting('spots_display', 'event_calendar');
 if (!$event_calendar_spots_display) {
 	$event_calendar_spots_display = 'no';
 }
@@ -240,7 +245,7 @@ $body .= elgg_view('input/radio',array('internalname'=>'params[spots_display]','
 
 $body .= '<br />';
 
-$event_calendar_no_collisions = get_plugin_setting('no_collisions', 'event_calendar');
+$event_calendar_no_collisions = elgg_get_plugin_setting('no_collisions', 'event_calendar');
 if (!$event_calendar_no_collisions) {
 	$event_calendar_no_collisions = 'no';
 }
@@ -251,7 +256,7 @@ $body .= elgg_view('input/radio',array('internalname'=>'params[no_collisions]','
 
 $body .= '<br />';
 
-$event_calendar_collision_length = get_plugin_setting('collision_length', 'event_calendar');
+$event_calendar_collision_length = elgg_get_plugin_setting('collision_length', 'event_calendar');
 if (!$event_calendar_collision_length) {
 	$event_calendar_collision_length = '3600';
 }
@@ -262,7 +267,7 @@ $body .= elgg_view('input/text',array('internalname'=>'params[collision_length]'
 
 $body .= '<br /><br />';
 
-$event_calendar_region_display = get_plugin_setting('region_display', 'event_calendar');
+$event_calendar_region_display = elgg_get_plugin_setting('region_display', 'event_calendar');
 if (!$event_calendar_region_display) {
 	$event_calendar_region_display = 'no';
 }
@@ -273,7 +278,7 @@ $body .= elgg_view('input/radio',array('internalname'=>'params[region_display]',
 
 $body .= '<br />';
 
-$event_calendar_region_list = get_plugin_setting('region_list', 'event_calendar');
+$event_calendar_region_list = elgg_get_plugin_setting('region_list', 'event_calendar');
 if (!$event_calendar_region_list) {
 	$event_calendar_region_list = '';
 }
@@ -284,7 +289,7 @@ $body .= elgg_view('event_calendar/input/longtext',array('internalname'=>'params
 
 $body .= '<br />';
 
-$event_calendar_region_list_handles = get_plugin_setting('region_list_handles', 'event_calendar');
+$event_calendar_region_list_handles = elgg_get_plugin_setting('region_list_handles', 'event_calendar');
 if (!$event_calendar_region_list_handles) {
 	$event_calendar_region_list_handles = 'no';
 }
@@ -295,7 +300,7 @@ $body .= elgg_view('input/radio',array('internalname'=>'params[region_list_handl
 
 $body .= '<br />';
 
-$event_calendar_type_display = get_plugin_setting('type_display', 'event_calendar');
+$event_calendar_type_display = elgg_get_plugin_setting('type_display', 'event_calendar');
 if (!$event_calendar_type_display) {
 	$event_calendar_type_display = 'no';
 }
@@ -306,7 +311,7 @@ $body .= elgg_view('input/radio',array('internalname'=>'params[type_display]','v
 
 $body .= '<br />';
 
-$event_calendar_type_list = get_plugin_setting('type_list', 'event_calendar');
+$event_calendar_type_list = elgg_get_plugin_setting('type_list', 'event_calendar');
 if (!$event_calendar_type_list) {
 	$event_calendar_type_list = '';
 }
@@ -317,7 +322,7 @@ $body .= elgg_view('event_calendar/input/longtext',array('internalname'=>'params
 
 $body .= '<br />';
 
-$event_calendar_type_list_handles = get_plugin_setting('type_list_handles', 'event_calendar');
+$event_calendar_type_list_handles = elgg_get_plugin_setting('type_list_handles', 'event_calendar');
 if (!$event_calendar_type_list_handles) {
 	$event_calendar_type_list_handles = 'no';
 }
@@ -328,7 +333,7 @@ $body .= elgg_view('input/radio',array('internalname'=>'params[type_list_handles
 
 $body .= '<br />';
 
-$event_calendar_first_date = get_plugin_setting('first_date', 'event_calendar');
+$event_calendar_first_date = elgg_get_plugin_setting('first_date', 'event_calendar');
 if (!$event_calendar_first_date) {
 	$event_calendar_first_date = '';
 }
@@ -339,7 +344,7 @@ $body .= elgg_view('input/text',array('internalname'=>'params[first_date]','valu
 
 $body .= '<br /><br />';
 
-$event_calendar_last_date = get_plugin_setting('last_date', 'event_calendar');
+$event_calendar_last_date = elgg_get_plugin_setting('last_date', 'event_calendar');
 if (!$event_calendar_last_date) {
 	$event_calendar_last_date = '';
 }
@@ -350,7 +355,7 @@ $body .= elgg_view('input/text',array('internalname'=>'params[last_date]','value
 
 $body .= '<br /><br />';
 
-$event_calendar_more_required = get_plugin_setting('more_required', 'event_calendar');
+$event_calendar_more_required = elgg_get_plugin_setting('more_required', 'event_calendar');
 if (!$event_calendar_more_required) {
 	$event_calendar_more_required = 'no';
 }