3 files changed, 11 insertions, 11 deletions

diff --git a/views/default/event_calendar/forms/add_to_group.php b/views/default/event_calendar/forms/add_to_group.php
index 07e2e8b33..330f72526 100644
--- a/views/default/event_calendar/forms/add_to_group.php
+++ b/views/default/event_calendar/forms/add_to_group.php
@@ -9,7 +9,7 @@ $event_container = $vars['event']->container_guid;
 
 // get the list of all groups:
 
-if (isadminloggedin()) {
+if (elgg_is_admin_logged_in()) {
 	$groups = elgg_get_entities(array(
 		'type' => 'group',
 		'limit' => 5000,
@@ -17,7 +17,7 @@ if (isadminloggedin()) {
 } else {
 	$groups = elgg_get_entities(array(
 		'type' => 'group',
-		'owner_guid' => get_loggedin_userid(),
+		'owner_guid' => elgg_get_logged_in_user_guid(),
 		'limit' => 5000,
 	));
 }
@@ -59,14 +59,14 @@ if ($add_options || $remove_options) {
 	$event_bit = elgg_view('input/hidden', array("internalname" => "event_id","value" => $event_id));
 	if ($add_options) {
 		echo "<h4>".elgg_echo('event_calendar:add_to_group:add_group_title')."</h4>";
-		$add_pulldown = elgg_view("input/pulldown",array("internalname" => "group_id","options_values" => $add_options));
+		$add_pulldown = elgg_view("input/dropdown",array("internalname" => "group_id","options_values" => $add_options));
 		$submit_button = "<p>".elgg_view("input/submit",array("value"=>elgg_echo('event_calendar:add_to_group:add_group_button')))."</p>";
 		echo elgg_view ('input/form',array("body" => $event_bit.$add_pulldown.$submit_button,"action" => $vars['url']."action/event_calendar/add_to_group"));
 	}
 	
 	if ($remove_options) {
 		echo "<h4>".elgg_echo('event_calendar:add_to_group:remove_group_title')."</h4>";
-		$remove_pulldown = elgg_view("input/pulldown",array("internalname" => "group_id","options_values" => $remove_options));
+		$remove_pulldown = elgg_view("input/dropdown",array("internalname" => "group_id","options_values" => $remove_options));
 		$submit_button = "<p>".elgg_view("input/submit",array("value"=>elgg_echo('event_calendar:add_to_group:remove_group_button')))."</p>";
 		echo elgg_view ('input/form',array("body" => $event_bit.$remove_pulldown.$submit_button,"action" => $vars['url']."action/event_calendar/remove_from_group"));
 	}
diff --git a/views/default/event_calendar/forms/manage_event_content.php b/views/default/event_calendar/forms/manage_event_content.php
index 59498e861..6ae3f60ce 100644
--- a/views/default/event_calendar/forms/manage_event_content.php
+++ b/views/default/event_calendar/forms/manage_event_content.php
@@ -165,8 +165,8 @@ $body .= '</label></p>';
 $body .= '<p class="description">'.$prefix['brief_description'].elgg_echo('event_calendar:brief_description_description').'</p>';
 
 if ($event_calendar_region_display == 'yes') {
-	$region_list = trim(get_plugin_setting('region_list', 'event_calendar'));
-	$region_list_handles = get_plugin_setting('region_list_handles', 'event_calendar');
+	$region_list = trim(elgg_get_plugin_setting('region_list', 'event_calendar'));
+	$region_list_handles = elgg_get_plugin_setting('region_list_handles', 'event_calendar');
 	// make sure that we are using Unix line endings
 	$region_list = str_replace("\r\n","\n",$region_list);
 	$region_list = str_replace("\r","\n",$region_list);
@@ -182,15 +182,15 @@ if ($event_calendar_region_display == 'yes') {
 			}
 		}
 		$body .= '<p><label>'.elgg_echo("event_calendar:region_label").'<br />';
-		$body .= elgg_view("input/pulldown",array('internalname' => 'region','value'=>$region,'options_values'=>$options));
+		$body .= elgg_view("input/dropdown",array('internalname' => 'region','value'=>$region,'options_values'=>$options));
 		$body .= '</label></p>';
 		$body .= '<p class="description">'.$prefix['region'].elgg_echo('event_calendar:region_description').'</p>';
 	}
 }
 
 if ($event_calendar_type_display == 'yes') {
-	$type_list = trim(get_plugin_setting('type_list', 'event_calendar'));
-	$type_list_handles = get_plugin_setting('type_list_handles', 'event_calendar');
+	$type_list = trim(elgg_get_plugin_setting('type_list', 'event_calendar'));
+	$type_list_handles = elgg_get_plugin_setting('type_list_handles', 'event_calendar');
 	// make sure that we are using Unix line endings
 	$type_list = str_replace("\r\n","\n",$type_list);
 	$type_list = str_replace("\r","\n",$type_list);
@@ -206,7 +206,7 @@ if ($event_calendar_type_display == 'yes') {
 			}			
 		}
 		$body .= '<p><label>'.elgg_echo("event_calendar:type_label").'<br />';
-		$body .= elgg_view("input/pulldown",array('internalname' => 'event_type','value'=>$event_type,'options_values'=>$options));
+		$body .= elgg_view("input/dropdown",array('internalname' => 'event_type','value'=>$event_type,'options_values'=>$options));
 		$body .= '</label></p>';
 		$body .= '<p class="description">'.$prefix['event_type'].elgg_echo('event_calendar:type_description').'</p>';
 	}
diff --git a/views/default/plugins/event_calendar/settings.php b/views/default/plugins/event_calendar/settings.php
index c8dcdf299..a1c8e3d41 100644
--- a/views/default/plugins/event_calendar/settings.php
+++ b/views/default/plugins/event_calendar/settings.php
@@ -51,7 +51,7 @@ if (!$event_calendar_default_access) {
 
 $body .= elgg_echo('event_calendar:settings:default_access:title');
 $body .= '<br />';
-$body .= elgg_view('input/pulldown',array('name'=>'params[default_access]','value'=>$event_calendar_default_access,'options_values'=>$access_options));
+$body .= elgg_view('input/dropdown',array('name'=>'params[default_access]','value'=>$event_calendar_default_access,'options_values'=>$access_options));
 
 $body .= '<br /><br />';