changed: updated code for Elgg v6.3

jdalsem · jdalsem · commit 567d21a9be2a · 2025-09-11T15:17:21.000+02:00
diff --git a/actions/event_manager/attendees/export.php b/actions/event_manager/attendees/export.php
@@ -42,14 +42,14 @@
 
 $fh = tmpfile();
 
-fputcsv($fh, array_keys($rows[0]), ';');
+fputcsv($fh, array_keys($rows[0]), ';', '"', '\\');
 
 foreach ($rows as $row) {
 	$decoded_rows = array_map(function($row) {
 		return html_entity_decode((string) $row);
 	}, array_values($row));
 	
-	fputcsv($fh, $decoded_rows, ';');
+	fputcsv($fh, $decoded_rows, ';', '"', '\\');
 }
 
 $contents = '';
@@ -60,7 +60,6 @@
 
 fclose($fh);
 
-// create export file
 header('Content-Type: text/csv');
 header('Content-Disposition: Attachment; filename="attendees-' . elgg_get_friendly_title($event->getDisplayName()) . '.csv"');
 header('Content-Length: ' . strlen($contents));
diff --git a/actions/event_manager/day/edit.php b/actions/event_manager/day/edit.php
@@ -59,6 +59,7 @@
 			'elgg-menu-content',
 		],
 	]);
+
 	$content_title = elgg_format_element('li', [
 		'data-menu-item' => "event_manager_event_view_program-tab-{$day->guid}",
 		'class' => [
diff --git a/actions/event_manager/delete_program_item.php b/actions/event_manager/delete_program_item.php
@@ -7,6 +7,7 @@
 $entity = elgg_call(ELGG_IGNORE_ACCESS | ELGG_SHOW_DISABLED_ENTITIES | ELGG_SHOW_DELETED_ENTITIES, function() use ($guid) {
 	return get_entity($guid);
 });
+
 if (!$entity instanceof \ColdTrick\EventManager\Event\Day && !$entity instanceof \ColdTrick\EventManager\Event\Slot) {
 	return elgg_error_response(elgg_echo('entity:delete:item_not_found'));
 }
@@ -25,14 +26,14 @@
 	return elgg_error_response(elgg_echo('entity:delete:fail', [$display_name]));
 }
 
-$success_keys = [
-	"entity:delete:{$type}:{$subtype}:success",
-	"entity:delete:{$type}:success",
-	'entity:delete:success',
-];
-
 $message = '';
 if (get_input('show_success', true)) {
+	$success_keys = [
+		"entity:delete:{$type}:{$subtype}:success",
+		"entity:delete:{$type}:success",
+		'entity:delete:success',
+	];
+
 	foreach ($success_keys as $success_key) {
 		if (elgg_language_key_exists($success_key)) {
 			$message = elgg_echo($success_key, [$display_name]);
diff --git a/actions/event_manager/event/mail.php b/actions/event_manager/event/mail.php
@@ -1,7 +1,5 @@
 <?php
 
-elgg_make_sticky_form('event_manager/event/mail');
-
 $guid = (int) get_input('guid');
 $title = get_input('title');
 $description = get_input('description');
@@ -27,6 +25,4 @@
 	return elgg_error_response(elgg_echo('save:fail'));
 }
 
-elgg_clear_sticky_form('event_manager/event/mail');
-
 return elgg_ok_response('', elgg_echo('event_manager:action:event:mail:success'), $entity->getURL());
diff --git a/actions/event_manager/event/register.php b/actions/event_manager/event/register.php
@@ -187,7 +187,7 @@
 	$relation = EVENT_MANAGER_RELATION_ATTENDING_PENDING;
 	$slot_relation = EVENT_MANAGER_RELATION_SLOT_REGISTRATION_PENDING;
 } else {
-	if ($register_type == 'waitinglist') {
+	if ($register_type === 'waitinglist') {
 		$relation = EVENT_MANAGER_RELATION_ATTENDING_WAITINGLIST;
 		$slot_relation = EVENT_MANAGER_RELATION_SLOT_REGISTRATION_WAITINGLIST;
 	} else {
diff --git a/classes/ColdTrick/EventManager/Forms/EventMail.php b/classes/ColdTrick/EventManager/Forms/EventMail.php
diff --git a/classes/ColdTrick/EventManager/Menus/Entity.php b/classes/ColdTrick/EventManager/Menus/Entity.php
@@ -23,7 +23,7 @@ public static function registerMailAttendees(\Elgg\Event $event): ?MenuItems {
 			return null;
 		}
 		
-		if (!(bool) elgg_get_plugin_setting('event_mail', 'event_manager')) {
+		if (!elgg_get_plugin_setting('event_mail', 'event_manager')) {
 			return null;
 		}
 		
diff --git a/elgg-plugin.php b/elgg-plugin.php
@@ -46,6 +46,7 @@
 				'searchable' => true,
 				'likable' => true,
 				'restorable' => true,
+				'subscribable' => true,
 			],
 		],
 		[
@@ -208,6 +209,9 @@
 		'collection:object:event:group' => [
 			'path' => '/event/group/{guid}',
 			'resource' => 'event/upcoming',
+			'required_plugins' => [
+				'groups',
+			],
 		],
 		'collection:object:event:attendees' => [
 			'path' => '/event/attendees/{guid}/{relationship}',
@@ -355,9 +359,6 @@
 			'menu:site' => [
 				'\ColdTrick\EventManager\Menus\Site::registerEvents' => [],
 			],
-			'menu:title:object:event' => [
-				\Elgg\Notifications\RegisterSubscriptionMenuItemsHandler::class => [],
-			],
 		],
 		'search:fields' => [
 			'object:event' => [
diff --git a/languages/de.php b/languages/de.php
@@ -25,7 +25,7 @@
   'event_manager:notification:summary' => 'Es wurde eine Veranstaltung erstellt: %s',
   'event_manager:notification:body' => '%s hat eine neue Veranstaltung erstellt %s',
   'event_manager:list:upcoming' => 'Veranstaltungen',
-  'event_manager:list:noresults' => 'keine Veranstaltungen gefunden',
+  'list:object:event:no_results' => 'keine Veranstaltungen gefunden',
   'event_manager:list:navigation:calendar' => 'Kalender',
   'event_manager:list:navigation:onthemap' => 'Karte',
   'event_manager:owner:title' => '%s\'s Veranstaltungen',
diff --git a/languages/en.php b/languages/en.php
@@ -20,6 +20,8 @@
 	'collection:object:eventregistrationquestion' => "Event Registration Questions",
 	'collection:object:eventmail' => "Event Attendees e-mails",
 
+	'list:object:event:no_results' => 'No events found',
+
 	'notification:object:event:create' => "Send a notification when an event is created",
 	'input:container_guid:object:event:info' => "This event will be created in %s",
 	
@@ -44,7 +46,6 @@
 
 	'event_manager:list:live' => 'Live events',
 	'event_manager:list:upcoming' => 'Upcoming events',
-	'event_manager:list:noresults' => 'No events found',
 
 	'event_manager:list:navigation:live' => 'Live',
 	'event_manager:list:navigation:upcoming' => 'Upcoming',
diff --git a/languages/es.php b/languages/es.php
@@ -21,7 +21,7 @@
   'event_manager:notification:summary' => 'Se ha creado un evento: %s',
   'event_manager:notification:body' => '%s creó un nuevo evento %s',
   'event_manager:list:live' => 'Eventos',
-  'event_manager:list:noresults' => 'No se econtraron eventos',
+  'list:object:event:no_results' => 'No se econtraron eventos',
   'event_manager:list:navigation:onthemap' => 'En el mapa',
   'event_manager:full' => 'completo',
   'event_manager:personwaitinglist' => 'persona en la lista de espera',
diff --git a/languages/fi.php b/languages/fi.php
@@ -15,7 +15,7 @@
   'event_manager:notification:subject' => 'Uusi tapahtuma: %s',
   'event_manager:notification:summary' => 'Uusi tapahtuma: %s',
   'event_manager:notification:body' => '%s loi uuden tapahtuman %s',
-  'event_manager:list:noresults' => 'Ei tapahtumia',
+  'list:object:event:no_results' => 'Ei tapahtumia',
   'event_manager:list:navigation:onthemap' => 'Kartta',
   'event_manager:edit:title' => 'Luo / Muokkaa tapahtumaa',
   'event_manager:edit:upload:title' => 'Lisää tiedostoja',
diff --git a/languages/fr.php b/languages/fr.php
@@ -56,7 +56,7 @@
   'event_manager:notification:summary' => 'Un événement a été créé: %s',
   'event_manager:notification:body' => '%s a créé un nouvel événement %s',
   'event_manager:list:live' => 'Evènements',
-  'event_manager:list:noresults' => 'Aucuns évènements trouvé',
+  'list:object:event:no_results' => 'Aucuns évènements trouvé',
   'event_manager:list:navigation:calendar' => 'Calendrier',
   'event_manager:list:navigation:onthemap' => 'Sur la carte',
   'event_manager:owner:title' => 'Événements de %s',
diff --git a/languages/gd.php b/languages/gd.php
@@ -18,7 +18,7 @@
   'event_manager:list:more:with_tag' => 'Barrachd tachartasan leis an taga: "%s"',
   'event_manager:list:live' => 'Tachartasan beò',
   'event_manager:list:upcoming' => 'Tachartasan san àm ri teachd',
-  'event_manager:list:noresults' => 'Gun tachartas',
+  'list:object:event:no_results' => 'Gun tachartas',
   'event_manager:list:navigation:live' => 'Beò',
   'event_manager:list:navigation:upcoming' => 'San àm ri teachd',
   'event_manager:list:navigation:calendar' => 'Mìosachan',
diff --git a/languages/ja.php b/languages/ja.php
@@ -27,7 +27,7 @@
   'event_manager:notification:body' => '%sが新しいイベント%sを作成しました',
   'event_manager:list:live' => 'ライブイベント',
   'event_manager:list:upcoming' => '今後のイベント',
-  'event_manager:list:noresults' => 'イベントは見つかりませんでした',
+  'list:object:event:no_results' => 'イベントは見つかりませんでした',
   'event_manager:list:navigation:live' => 'ライブ',
   'event_manager:list:navigation:upcoming' => '今後',
   'event_manager:list:navigation:calendar' => 'カレンダー',
diff --git a/languages/nl.php b/languages/nl.php
@@ -233,7 +233,7 @@
   'event_manager:menu:group_events' => 'Groeps evenementen',
   'add:object:event' => 'Nieuw Evenement',
   'event_manager:list:live' => 'Live evenementen',
-  'event_manager:list:noresults' => 'Geen evenementen gevonden',
+  'list:object:event:no_results' => 'Geen evenementen gevonden',
   'event_manager:list:navigation:onthemap' => 'Op de kaart',
   'event_manager:full' => 'vol',
   'event_manager:personwaitinglist' => 'persoon op de wachtlijst',
diff --git a/views/default/event_manager/event/view/description.php b/views/default/event_manager/event/view/description.php
@@ -5,7 +5,6 @@
 	return;
 }
 
-// description
 $description = $event->description ?: $event->shortdescription;
 if (empty($description)) {
 	return;
diff --git a/views/default/event_manager/event/view/files.php b/views/default/event_manager/event/view/files.php
@@ -5,7 +5,6 @@
 	return;
 }
 
-// files
 $event_files = elgg_view_menu('event_files', ['entity' => $event]);
 $can_edit = $event->canEdit();
 if (empty($event_files) && !$can_edit) {
diff --git a/views/default/event_manager/listing/list.php b/views/default/event_manager/listing/list.php
@@ -10,7 +10,7 @@
 $defaults = [
 	'type' => 'object',
 	'subtype' => \Event::SUBTYPE,
-	'no_results' => elgg_echo('event_manager:list:noresults'),
+	'no_results' => true,
 ];
 
 $options = array_merge($defaults, $options);
diff --git a/views/default/forms/event_manager/event/mail.php b/views/default/forms/event_manager/event/mail.php
@@ -56,7 +56,7 @@
 	'#label' => elgg_echo('event_manager:mail:recipients'),
 	'name' => 'recipients',
 	'options_values' => $recipient_options,
-	'value' => elgg_extract('recipients', $vars),
+	'value' => elgg_extract('recipients', $vars, EVENT_MANAGER_RELATION_ATTENDING),
 ]);
 
 $footer = elgg_view_field([
diff --git a/views/default/forms/event_manager/event/tabs/profile.php b/views/default/forms/event_manager/event/tabs/profile.php
@@ -36,14 +36,11 @@
 echo elgg_view('forms/event_manager/event/edit/event_type', $vars);
 
 echo elgg_view_field([
-	'#type' => 'checkbox',
+	'#type' => 'switch',
 	'#label' => elgg_echo('event_manager:edit:form:comments_on'),
 	'#help' => elgg_echo('event_manager:edit:form:comments_on:help'),
 	'name' => 'comments_on',
-	'checked' => (int) $vars['comments_on'] === 1,
-	'switch' => true,
-	'default' => '0',
-	'value' => '1',
+	'value' => $vars['comments_on'],
 ]);
 
 echo elgg_view_field([
diff --git a/views/default/forms/event_manager/event/tabs/registration.php b/views/default/forms/event_manager/event/tabs/registration.php
@@ -54,73 +54,52 @@
 
 $fields = [
 	[
-		'#type' => 'checkbox',
+		'#type' => 'switch',
 		'#label' => elgg_echo('event_manager:edit:form:with_program'),
 		'name' => 'with_program',
 		'id' => 'with_program',
-		'checked' => (bool) $vars['with_program'],
-		'switch' => true,
-		'default' => 0,
-		'value' => 1,
+		'value' => $vars['with_program'],
 	],
 	[
-		'#type' => 'checkbox',
+		'#type' => 'switch',
 		'#label' => elgg_echo('event_manager:edit:form:registration_needed'),
 		'name' => 'registration_needed',
-		'checked' => (bool) $vars['registration_needed'],
-		'switch' => true,
-		'default' => 0,
-		'value' => 1,
+		'value' => $vars['registration_needed'],
 	],
 	[
-		'#type' => 'checkbox',
+		'#type' => 'switch',
 		'#label' => elgg_echo('event_manager:edit:form:show_attendees'),
 		'name' => 'show_attendees',
-		'checked' => (bool) $vars['show_attendees'],
-		'switch' => true,
-		'default' => 0,
-		'value' => 1,
+		'value' => $vars['show_attendees'],
 	],
 	[
-		'#type' => 'checkbox',
+		'#type' => 'switch',
 		'#label' => elgg_echo('event_manager:edit:form:notify_onsignup'),
 		'name' => 'notify_onsignup',
-		'checked' => (bool) $vars['notify_onsignup'],
-		'switch' => true,
-		'default' => 0,
-		'value' => 1,
+		'value' => $vars['notify_onsignup'],
 	],
 	[
-		'#type' => 'checkbox',
+		'#type' => 'switch',
 		'#label' => elgg_echo('event_manager:edit:form:notify_onsignup_contact'),
 		'#class' => 'pll',
 		'name' => 'notify_onsignup_contact',
-		'checked' => (bool) $vars['notify_onsignup_contact'],
-		'switch' => true,
-		'default' => 0,
-		'value' => 1,
+		'value' => (bool) $vars['notify_onsignup_contact'],
 	],
 	[
-		'#type' => 'checkbox',
+		'#type' => 'switch',
 		'#label' => elgg_echo('event_manager:edit:form:notify_onsignup_organizer'),
 		'#class' => 'pll',
 		'name' => 'notify_onsignup_organizer',
-		'checked' => (bool) $vars['notify_onsignup_organizer'],
-		'switch' => true,
-		'default' => 0,
-		'value' => 1,
+		'value' => $vars['notify_onsignup_organizer'],
 	],
 ];
 
 if (!elgg_get_config('walled_garden')) {
 	array_unshift($fields, [
-		'#type' => 'checkbox',
+		'#type' => 'switch',
 		'#label' => elgg_echo('event_manager:edit:form:register_nologin'),
 		'name' => 'register_nologin',
-		'checked' => (bool) $vars['register_nologin'],
-		'switch' => true,
-		'default' => 0,
-		'value' => 1,
+		'value' => $vars['register_nologin'],
 	]);
 }
 
diff --git a/views/default/forms/event_manager/registrationform/question.php b/views/default/forms/event_manager/registrationform/question.php
diff --git a/views/default/plugins/event_manager/settings.php b/views/default/plugins/event_manager/settings.php
diff --git a/views/default/resources/event/mail.php b/views/default/resources/event/mail.php
diff --git a/views/default/widgets/events/content.php b/views/default/widgets/events/content.php
diff --git a/views/default/widgets/highlighted_events/content.php b/views/default/widgets/highlighted_events/content.php
diff --git a/views/default/widgets/highlighted_events/edit.php b/views/default/widgets/highlighted_events/edit.php

Original file line number	Diff line number	Diff line change
`@@ -23,7 +23,7 @@ public static function registerMailAttendees(\Elgg\Event $event): ?MenuItems {`
`23`	`23`	`return null;`
`24`	`24`	`}`
`25`	`25`
`26`		`- if (!(bool) elgg_get_plugin_setting('event_mail', 'event_manager')) {`
	`26`	`+ if (!elgg_get_plugin_setting('event_mail', 'event_manager')) {`
`27`	`27`	`return null;`
`28`	`28`	`}`
`29`	`29`