changed: updated for Elgg 5.1

Author: jdalsem

README.md

@@ -1,7 +1,7 @@
 Event Manager
 =============
 
-![Elgg 5.0](https://img.shields.io/badge/Elgg-5.0-green.svg)
+![Elgg 5.1](https://img.shields.io/badge/Elgg-5.1-green.svg)
 ![Lint Checks](https://github.com/ColdTrick/event_manager/actions/workflows/lint.yml/badge.svg?event=push)
 [![Latest Stable Version](https://poser.pugx.org/coldtrick/event_manager/v/stable.svg)](https://packagist.org/packages/coldtrick/event_manager)
 [![License](https://poser.pugx.org/coldtrick/event_manager/license.svg)](https://packagist.org/packages/coldtrick/event_manager)

actions/event_manager/event/rsvp.php

@@ -35,7 +35,6 @@
 		if ($event->registration_needed && $event->hasRegistrationForm()) {
 			return elgg_redirect_response(elgg_generate_url('default:object:event:register', [
 				'guid' => $guid,
-				'relation' => $rel,
 			]));
 		} else {
 			$rsvp = $event->rsvp($rel, $user_guid);

composer.json

@@ -11,7 +11,6 @@
 	},
 	"require": {
 		"composer/installers": "^1.0.8",
-		"ext-json": "*",
 		"dompdf/dompdf" : "~2.0.0",
 		"npm-asset/fullcalendar": "~6.1.0"
 	},
@@ -30,6 +29,6 @@
 		}
 	},
 	"conflict": {
-		"elgg/elgg": "<5.0"
+		"elgg/elgg": "<5.1"
 	}
 }

composer.lock

@@ -195,12 +195,18 @@
 			'resource' => 'event/upcoming',
 		],
 		'collection:object:event:owner' => [
-			'path' => '/event/owner/{username?}',
+			'path' => '/event/owner/{username}',
 			'resource' => 'event/owner',
+			'middleware' => [
+				\Elgg\Router\Middleware\UserPageOwnerGatekeeper::class,
+			],
 		],
 		'collection:object:event:attending' => [
-			'path' => '/event/attending/{username?}',
+			'path' => '/event/attending/{username}',
 			'resource' => 'event/attending',
+			'middleware' => [
+				\Elgg\Router\Middleware\UserPageOwnerGatekeeper::class,
+			],
 		],
 		'collection:object:event:group' => [
 			'path' => '/event/group/{guid}',

elgg-plugin.php

@@ -2,23 +2,18 @@
 
 use Elgg\Exceptions\Http\EntityPermissionsException;
 
-elgg_gatekeeper();
-
-// new event
 $page_owner = elgg_get_page_owner_entity();
 
 if (!$page_owner->canWriteToContainer(0, 'object', 'subtype')) {
 	throw new EntityPermissionsException();
 }
 
-elgg_push_collection_breadcrumbs('object', 'event', $page_owner, false);
-
-$form = elgg_view_form('event_manager/event/edit', [
-	'id' => 'event_manager_event_edit',
-	'name' 	=> 'event_manager_event_edit',
-]);
+elgg_push_collection_breadcrumbs('object', 'event', $page_owner);
 
 echo elgg_view_page(elgg_echo('event_manager:edit:title'), [
-	'content' => $form,
+	'content' => elgg_view_form('event_manager/event/edit', [
+		'id' => 'event_manager_event_edit',
+		'name' 	=> 'event_manager_event_edit',
+	]),
 	'filter_id' => 'event/edit',
 ]);

views/default/resources/event/add.php

@@ -21,7 +21,6 @@
 
 $rel_text = $valid_relationships[$relationship];
 
-// page owner
 elgg_set_page_owner_guid($entity->container_guid);
 
 elgg_push_entity_breadcrumbs($entity);

views/default/resources/event/attendees.php

@@ -1,16 +1,10 @@
 <?php
 
-use Elgg\Exceptions\Http\EntityNotFoundException;
-
 $user = elgg_get_page_owner_entity();
-if (!$user instanceof \ElggUser) {
-	throw new EntityNotFoundException();
-}
 
-elgg_push_collection_breadcrumbs('object', 'event', $user, false);
+elgg_push_collection_breadcrumbs('object', 'event', $user);
 
 $filter_value = '';
-
 if ($user->guid === elgg_get_logged_in_user_guid()) {
 	$filter_value = 'attending';
 }

views/default/resources/event/attending.php

@@ -1,30 +1,23 @@
 <?php
 
-use Elgg\Exceptions\Http\EntityPermissionsException;
-
-elgg_gatekeeper();
-
 $guid = (int) elgg_extract('guid', $vars);
+elgg_entity_gatekeeper($guid, 'object', \Event::SUBTYPE, true);
 
-// existing event
-elgg_entity_gatekeeper($guid, 'object', \Event::SUBTYPE);
+/* @var $event \Event */
 $event = get_entity($guid);
-if (!$event->canEdit()) {
-	throw new EntityPermissionsException();
-}
 
 elgg_set_page_owner_guid($event->container_guid);
 
 elgg_push_entity_breadcrumbs($event);
 
 // add copy menu item
-elgg_register_menu_item('title', \ElggMenuItem::factory([
+elgg_register_menu_item('title', [
 	'name' => 'copy',
 	'icon' => 'clone-regular',
 	'href' => 'ajax/form/event_manager/event/copy?guid=' . $event->guid,
 	'text' => elgg_echo('event_manager:menu:copy'),
 	'link_class' => 'elgg-lightbox elgg-button elgg-button-action',
-]));
+]);
 
 $form_vars = [
 	'id' => 'event_manager_event_edit',

views/default/resources/event/edit.php

@@ -1,16 +1,10 @@
 <?php
 
-use Elgg\Exceptions\Http\EntityPermissionsException;
-
-elgg_gatekeeper();
-
 $guid = (int) elgg_extract('guid', $vars);
-elgg_entity_gatekeeper($guid, 'object', Event::SUBTYPE);
+elgg_entity_gatekeeper($guid, 'object', \Event::SUBTYPE, true);
 
+/* @var $event \Event */
 $event = get_entity($guid);
-if (!$event->canEdit()) {
-	throw new EntityPermissionsException();
-}
 
 elgg_register_menu_item('title', [
 	'name' => 'event',