changed: concept / admin approval groups have more options

jeabakker · jeabakker · commit a6c59dbd4f04 · 2026-02-04T15:04:36.000+01:00
diff --git a/actions/group_tools/admin/approve.php b/actions/group_tools/admin/approve.php
@@ -31,9 +31,10 @@
 
 // unset temp access
 unset($group->intended_access_id);
+unset($group->admin_approval);
 
 // notify owner
-/* @var $owner \ElggUser */
+/** @var \ElggUser $owner */
 $owner = $group->getOwnerEntity();
 
 $owner->notify('approve', $group, [], elgg_get_logged_in_user_entity());
diff --git a/actions/group_tools/remove_concept_status.php b/actions/group_tools/remove_concept_status.php
@@ -10,13 +10,12 @@
 	return elgg_error_response(elgg_echo('actionunauthorized'));
 }
 
+// remove concept status
+unset($group->is_concept);
+
 // should the group be approved by and admin?
 if (!elgg_is_admin_logged_in() && (elgg_get_plugin_setting('admin_approve', 'group_tools') === 'yes')) {
-	// request approval
-	unset($group->is_concept);
-	
-	// prevent advanced notifications from preventing the enqueuing of this event
-	elgg_unregister_event_handler('enqueue', 'notification', '\ColdTrick\AdvancedNotifications\Enqueue::delayPrivateContentNotification');
+	$group->admin_approval = true;
 	
 	elgg_trigger_event('admin_approval', 'group', $group);
 	
diff --git a/actions/groups/edit.php b/actions/groups/edit.php
@@ -151,7 +151,8 @@
 // new groups get access private, so an admin can validate it
 $access_id = (int) $group->access_id;
 if ($is_new_group && ($admin_approve || $concept_group)) {
-	$access_id = ACCESS_PRIVATE;
+	$acl = $group->getOwnedAccessCollection('group_acl');
+	$access_id = ($acl instanceof ElggAccessCollection) ? $acl->id : ACCESS_PRIVATE;
 	
 	if ((bool) elgg_get_plugin_setting('creation_reason', 'group_tools')) {
 		$reasons = (array) get_input('reasons', []);
@@ -161,6 +162,8 @@
 	}
 	
 	if (!$concept_group) {
+		$group->admin_approval = true;
+		
 		elgg_trigger_event('admin_approval', 'group', $group);
 	} else {
 		$group->is_concept = true;
@@ -185,7 +188,7 @@
 			$group->setContentAccessMode(ElggGroup::CONTENT_ACCESS_MODE_MEMBERS_ONLY);
 		}
 		
-		if (($access_id === ACCESS_PRIVATE) && ($admin_approve || $concept_group)) {
+		if ($admin_approve || $concept_group) {
 			// admins has not yet approved the group, store wanted access
 			$group->intended_access_id = $visibility;
 		} else {
diff --git a/actions/groups/invite.php b/actions/groups/invite.php
@@ -38,10 +38,7 @@
 
 $csv = elgg_get_uploaded_file('csv');
 
-$resend = false;
-if (get_input('resend') === 'yes') {
-	$resend = true;
-}
+$resend = (bool) get_input('resend');
 
 $group = get_entity($group_guid);
 if (!$group instanceof \ElggGroup) {
diff --git a/classes/ColdTrick/GroupTools/Cron.php b/classes/ColdTrick/GroupTools/Cron.php
@@ -225,20 +225,19 @@ public static function removeExpiredConceptGroups(\Elgg\Event $event): void {
 		}
 		
 		elgg_call(ELGG_IGNORE_ACCESS | ELGG_SHOW_DELETED_ENTITIES, function() use ($days) {
-			/* @var $groups \ElggBatch */
+			/** @var \ElggBatch $groups */
 			$groups = elgg_get_entities([
 				'type' => 'group',
 				'metadata_name_value_pairs' => [
 					'name' => 'is_concept',
 					'value' => true,
 				],
-				'access_id' => ACCESS_PRIVATE,
 				'created_before' => "-{$days} days",
 				'limit' => false,
 				'batch' => true,
 				'batch_inc_offset' => false,
 			]);
-			/* @var $group \ElggGroup */
+			/** @var \ElggGroup $group  */
 			foreach ($groups as $group) {
 				if (!$group->delete(true, true)) {
 					$groups->reportFailure();
@@ -262,20 +261,19 @@ public static function notifyConceptGroupOwners(\Elgg\Event $event): void {
 		$days = (int) elgg_get_plugin_setting('concept_groups_retention', 'group_tools');
 		
 		elgg_call(ELGG_IGNORE_ACCESS, function() use ($days) {
-			/* @var $groups \ElggBatch */
+			/** @var \ElggBatch $groups */
 			$groups = elgg_get_entities([
 				'type' => 'group',
 				'metadata_name_value_pairs' => [
 					'name' => 'is_concept',
 					'value' => true,
 				],
-				'access_id' => ACCESS_PRIVATE,
 				'limit' => false,
 				'batch' => true,
 			]);
-			/* @var $group \ElggGroup */
+			/** @var \ElggGroup $group */
 			foreach ($groups as $group) {
-				/* @var $owner \ElggUser */
+				/** @var \ElggUser $owner */
 				$owner = $group->getOwnerEntity();
 				
 				$owner->notify('concept_group_reminder', $group, [
diff --git a/classes/ColdTrick/GroupTools/Menus/Title.php b/classes/ColdTrick/GroupTools/Menus/Title.php
@@ -27,7 +27,7 @@ public static function groupMembership(\Elgg\Event $event): ?MenuItems {
 			return null;
 		}
 		
-		/* @var $menu_items MenuItems */
+		/** @var MenuItems $menu_items */
 		$menu_items = $event->getValue();
 		
 		$menu_item = $menu_items->get('groups:joinrequest');
@@ -91,7 +91,7 @@ public static function groupAdminStatus(\Elgg\Event $event): ?MenuItems {
 			return null;
 		}
 		
-		/* @var $result MenuItems */
+		/** @var MenuItems $result */
 		$result = $event->getValue();
 		
 		$menu_item = $result->get('group-dropdown');
@@ -123,7 +123,7 @@ public static function pendingApproval(\Elgg\Event $event): ?MenuItems {
 		}
 		
 		$page_owner = elgg_get_page_owner_entity();
-		if (!$page_owner instanceof \ElggGroup || $page_owner->access_id !== ACCESS_PRIVATE) {
+		if (!$page_owner instanceof \ElggGroup || !(bool) $page_owner->admin_approval) {
 			return null;
 		}
 		
@@ -133,7 +133,7 @@ public static function pendingApproval(\Elgg\Event $event): ?MenuItems {
 			'trash',
 		];
 		
-		/* @var $return MenuItems */
+		/** @var MenuItems $return */
 		$return = $event->getValue();
 		
 		// cleanup all items
@@ -203,7 +203,7 @@ public static function conceptGroup(\Elgg\Event $event): ?MenuItems {
 		}
 		
 		$page_owner = elgg_get_page_owner_entity();
-		if (!$page_owner instanceof \ElggGroup || $page_owner->access_id !== ACCESS_PRIVATE || !(bool) $page_owner->is_concept) {
+		if (!$page_owner instanceof \ElggGroup || !(bool) $page_owner->is_concept) {
 			return null;
 		}
 		
@@ -215,7 +215,7 @@ public static function conceptGroup(\Elgg\Event $event): ?MenuItems {
 			'opensearch_inspect', // OpenSearch
 		];
 		
-		/* @var $return MenuItems */
+		/** @var MenuItems $return */
 		$return = $event->getValue();
 		
 		// cleanup all items
@@ -282,7 +282,7 @@ public static function addGroupToolPresets(\Elgg\Event $event): ?MenuItems {
 			return null;
 		}
 		
-		/* @var $return MenuItems */
+		/** @var MenuItems $return */
 		$return = $event->getValue();
 		
 		$add_button = $return->get('add');
diff --git a/classes/ColdTrick/GroupTools/Notifications.php b/classes/ColdTrick/GroupTools/Notifications.php
@@ -23,11 +23,11 @@ public static function sendConfirmationOfGroupAdminApprovalToOwner(\Elgg\Event $
 		}
 		
 		$object = $notification_event->getObject();
-		if ($notification_event->getAction() !== 'admin_approval' || !$object instanceof \ElggGroup || $object->access_id !== ACCESS_PRIVATE) {
+		if ($notification_event->getAction() !== 'admin_approval' || !$object instanceof \ElggGroup || !(bool) $object->admin_approval) {
 			return;
 		}
 		
-		/* @var $owner \ElggUser */
+		/** @var \ElggUser $owner */
 		$owner = $object->getOwnerEntity();
 		
 		$owner->notify('admin_approval:owner', $object);
diff --git a/classes/ColdTrick/GroupTools/Notifications/AddUserHandler.php b/classes/ColdTrick/GroupTools/Notifications/AddUserHandler.php
@@ -2,6 +2,7 @@
 
 namespace ColdTrick\GroupTools\Notifications;
 
+use Elgg\Notifications\InstantNotificationEvent;
 use Elgg\Notifications\InstantNotificationEventHandler;
 
 /**
@@ -38,7 +39,7 @@ protected function getNotificationSummary(\ElggUser $recipient, string $method):
 	 */
 	protected function getNotificationBody(\ElggUser $recipient, string $method): string {
 		$group = $this->getEventEntity();
-		$actor = $this->getEventActor();
+		$actor = ($this->event instanceof InstantNotificationEvent) ? elgg_get_logged_in_user_entity() : $this->getEventActor();
 		if (!$group instanceof \ElggGroup || !$actor instanceof \ElggUser) {
 			return parent::getNotificationBody($recipient, $method);
 		}
diff --git a/classes/ColdTrick/GroupTools/Notifications/GroupOwnerTransferHandler.php b/classes/ColdTrick/GroupTools/Notifications/GroupOwnerTransferHandler.php
@@ -2,6 +2,7 @@
 
 namespace ColdTrick\GroupTools\Notifications;
 
+use Elgg\Notifications\InstantNotificationEvent;
 use Elgg\Notifications\InstantNotificationEventHandler;
 
 /**
@@ -38,7 +39,7 @@ protected function getNotificationSummary(\ElggUser $recipient, string $method):
 	 */
 	protected function getNotificationBody(\ElggUser $recipient, string $method): string {
 		$group = $this->getEventEntity();
-		$actor = $this->getEventActor();
+		$actor = ($this->event instanceof InstantNotificationEvent) ? elgg_get_logged_in_user_entity() : $this->getEventActor();
 		if (!$group instanceof \ElggGroup || !$actor instanceof \ElggUser) {
 			return parent::getNotificationBody($recipient, $method);
 		}
diff --git a/classes/ColdTrick/GroupTools/Notifications/InviteGroupHandler.php b/classes/ColdTrick/GroupTools/Notifications/InviteGroupHandler.php
@@ -2,6 +2,7 @@
 
 namespace ColdTrick\GroupTools\Notifications;
 
+use Elgg\Notifications\InstantNotificationEvent;
 use Elgg\Notifications\InstantNotificationEventHandler;
 
 /**
@@ -46,7 +47,8 @@ protected function getNotificationSummary(\ElggUser $recipient, string $method):
 	 */
 	protected function getNotificationBody(\ElggUser $recipient, string $method): string {
 		$group = $this->getEventEntity();
-		$actor = $this->getEventActor();
+		$actor = ($this->event instanceof InstantNotificationEvent) ? elgg_get_logged_in_user_entity() : $this->getEventActor();
+		
 		if (!$group instanceof \ElggGroup || !$actor instanceof \ElggUser) {
 			return parent::getNotificationBody($recipient, $method);
 		}
diff --git a/classes/ColdTrick/GroupTools/Notifications/RelatedGroupHandler.php b/classes/ColdTrick/GroupTools/Notifications/RelatedGroupHandler.php
@@ -2,6 +2,7 @@
 
 namespace ColdTrick\GroupTools\Notifications;
 
+use Elgg\Notifications\InstantNotificationEvent;
 use Elgg\Notifications\InstantNotificationEventHandler;
 
 /**
@@ -27,7 +28,7 @@ protected function getNotificationSummary(\ElggUser $recipient, string $method):
 	 * {@inheritdoc}
 	 */
 	protected function getNotificationBody(\ElggUser $recipient, string $method): string {
-		$actor = $this->getEventActor();
+		$actor = ($this->event instanceof InstantNotificationEvent) ? elgg_get_logged_in_user_entity() : $this->getEventActor();
 		$entity = $this->getEventEntity();
 		$group = $this->getParam('group');
 		if (!$actor instanceof \ElggUser || !$entity instanceof \ElggGroup || !$group instanceof \ElggGroup) {
diff --git a/classes/ColdTrick/GroupTools/Upgrades/MigrateConceptAdminApproval.php b/classes/ColdTrick/GroupTools/Upgrades/MigrateConceptAdminApproval.php
@@ -0,0 +1,96 @@
+<?php
+
+namespace ColdTrick\GroupTools\Upgrades;
+
+use Elgg\Upgrade\Result;
+use Elgg\Upgrade\SystemUpgrade;
+
+class MigrateConceptAdminApproval extends SystemUpgrade {
+	
+	/**
+	 * {@inheritdoc}
+	 */
+	public function getVersion(): int {
+		return 2026020401;
+	}
+	
+	/**
+	 * {@inheritdoc}
+	 */
+	public function shouldBeSkipped(): bool {
+		return empty($this->countItems());
+	}
+	
+	/**
+	 * {@inheritdoc}
+	 */
+	public function needsIncrementOffset(): bool {
+		return false;
+	}
+	
+	/**
+	 * {@inheritdoc}
+	 */
+	public function countItems(): int {
+		return elgg_call(ELGG_IGNORE_ACCESS | ELGG_SHOW_DELETED_ENTITIES, function() {
+			return elgg_count_entities($this->getOptions());
+		});
+	}
+	
+	/**
+	 * {@inheritdoc}
+	 */
+	public function run(Result $result, $offset): Result {
+		return elgg_call(ELGG_IGNORE_ACCESS | ELGG_SHOW_DELETED_ENTITIES, function() use ($result, $offset) {
+			/** @var \ElggBatch $batch */
+			$batch = elgg_get_entities($this->getOptions([
+				'offset' => $offset,
+			]));
+			
+			/** @var \ElggGroup $entity */
+			foreach ($batch as $entity) {
+				if (!$entity->is_concept) {
+					$entity->admin_approval = true;
+				}
+				
+				$acl = $entity->getOwnedAccessCollection('group_acl');
+				if ($acl instanceof \ElggAccessCollection) {
+					$entity->access_id = $acl->id;
+				} else {
+					$result->addFailures();
+					$batch->reportFailure();
+					continue;
+				}
+				
+				if ($entity->save()) {
+					$result->addSuccesses();
+				} else {
+					$result->addFailures();
+					$batch->reportFailure();
+				}
+			}
+			
+			return $result;
+		});
+	}
+	
+	/**
+	 * Get options to fetch entities which need upgrade
+	 *
+	 * @param array $options additional options
+	 *
+	 * @return array
+	 * @see elgg_get_entities()
+	 */
+	protected function getOptions(array $options = []): array {
+		$defaults = [
+			'type' => 'group',
+			'access_id' => ACCESS_PRIVATE,
+			'limit' => false,
+			'batch' => true,
+			'batch_inc_offset' => $this->needsIncrementOffset(),
+		];
+		
+		return array_merge($defaults, $options);
+	}
+}
diff --git a/elgg-plugin.php b/elgg-plugin.php
@@ -15,6 +15,7 @@
 use ColdTrick\GroupTools\Notifications\RequestMembershipMotivationHandler;
 use ColdTrick\GroupTools\Notifications\StaleGroupHandler;
 use ColdTrick\GroupTools\Notifications\WelcomeMessageGroupHandler;
+use ColdTrick\GroupTools\Upgrades\MigrateConceptAdminApproval;
 use ColdTrick\GroupTools\Upgrades\MigrateNotificationSettings;
 use Elgg\Router\Middleware\Gatekeeper;
 use Elgg\Router\Middleware\GroupPageOwnerCanEditGatekeeper;
@@ -352,6 +353,7 @@
 	],
 	'upgrades' => [
 		MigrateNotificationSettings::class,
+		MigrateConceptAdminApproval::class,
 	],
 	'view_extensions' => [
 		'admin.css' => [
diff --git a/languages/en.php b/languages/en.php
@@ -554,4 +554,6 @@
 	// upgrades
 	'group_tools:upgrade:2024061101:title' => "Migrate group approval notification settings",
 	'group_tools:upgrade:2024061101:description' => "Migrate the old plugin user setting to a correct user notification setting",
+	'group_tools:upgrade:2026020401:title' => "Migrate group concept/admin approval status",
+	'group_tools:upgrade:2026020401:description' => "Changes have been made to how concept or admin approval is being stored",
 ];
diff --git a/languages/nl.php b/languages/nl.php
@@ -1,10 +1,12 @@
 <?php
 /**
- * This file was created by Translation Editor v14.0.1
- * On 2024-11-26 15:22
+ * This file was created by Translation Editor v14.0.4
+ * On 2026-02-04 15:03
  */
 
 return array (
+  'group_tools:upgrade:2026020401:title' => 'Migreer groep concept / goedkeuring status',
+  'group_tools:upgrade:2026020401:description' => 'Er zijn wijzigingen doorgevoerd in hoe wordt opgeslagen dat een groep in concept is of wacht op goedkeuring',
   'group_tools:group:edit:suggested' => 'Vergelijkbare groepen',
   'river:group:owner_transfer' => '%s is nu de eigenaar van de groep %s',
   'group_tools:notifications::admin:notify_approval' => 'Ontvang een notificatie als er een groep moet worden goedgekeurd',
diff --git a/views/default/admin/groups/admin_approval.php b/views/default/admin/groups/admin_approval.php
diff --git a/views/default/forms/groups/edit.php b/views/default/forms/groups/edit.php
diff --git a/views/default/group_tools/extends/groups/edit/admin_approve.php b/views/default/group_tools/extends/groups/edit/admin_approve.php
diff --git a/views/default/group_tools/extends/groups/profile/concept.php b/views/default/group_tools/extends/groups/profile/concept.php
diff --git a/views/default/groups/edit/access.php b/views/default/groups/edit/access.php

Original file line number	Diff line number	Diff line change
`@@ -23,11 +23,11 @@ public static function sendConfirmationOfGroupAdminApprovalToOwner(\Elgg\Event $`
`23`	`23`	`}`
`24`	`24`
`25`	`25`	`$object = $notification_event->getObject();`
`26`		`- if ($notification_event->getAction() !== 'admin_approval' \|\| !$object instanceof \ElggGroup \|\| $object->access_id !== ACCESS_PRIVATE) {`
	`26`	`+ if ($notification_event->getAction() !== 'admin_approval' \|\| !$object instanceof \ElggGroup \|\| !(bool) $object->admin_approval) {`
`27`	`27`	`return;`
`28`	`28`	`}`
`29`	`29`
`30`		`- /* @var $owner \ElggUser */`
	`30`	`+ /** @var \ElggUser $owner */`
`31`	`31`	`$owner = $object->getOwnerEntity();`
`32`	`32`
`33`	`33`	`$owner->notify('admin_approval:owner', $object);`