From 5d0b1661f21e129e013b7287bb51297aca4b3d7f Mon Sep 17 00:00:00 2001
From: Alexey Dolzhenko <tooroff@gmail.com>
Date: Sat, 9 Nov 2024 21:55:30 +0700
Subject: [PATCH 1/2] [ticket/17429] Adding event before users have been added
 to a group

PHPBB-17429
---
 phpBB/includes/functions_user.php | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/phpBB/includes/functions_user.php b/phpBB/includes/functions_user.php
index 4846436a72..31b886a7de 100644
--- a/phpBB/includes/functions_user.php
+++ b/phpBB/includes/functions_user.php
@@ -2759,6 +2759,26 @@ function group_user_add($group_id, $user_id_ary = false, $username_ary = false,
 		return 'GROUP_USERS_EXIST';
 	}
 
+	/**
+	 * Event before users are added to a group
+	 *
+	 * @event core.group_add_user_before
+	 * @var	int		group_id		ID of the group to which users are added
+	 * @var	string 	group_name		Name of the group
+	 * @var	array	user_id_ary		IDs of the users which are added
+	 * @var	array	username_ary	names of the users which are added
+	 * @var	int		pending			Pending setting, 1 if user(s) added are pending
+	 * @since 3.3.14
+	 */
+	$vars = array(
+		'group_id',
+		'group_name',
+		'user_id_ary',
+		'username_ary',
+		'pending',
+	);
+	extract($phpbb_dispatcher->trigger_event('core.group_add_user_before', compact($vars)));
+
 	$db->sql_transaction('begin');
 
 	// Insert the new users

From 5538b9a37b1bf7dc15fe923aebd149966fb0ac24 Mon Sep 17 00:00:00 2001
From: Marc Alexander <admin@m-a-styles.de>
Date: Sun, 24 Nov 2024 20:15:18 +0100
Subject: [PATCH 2/2] [ticket/17429] Add add_id_ary to event and fix since
 version

PHPBB-17429
---
 phpBB/includes/functions_user.php | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/phpBB/includes/functions_user.php b/phpBB/includes/functions_user.php
index 31b886a7de..a87b79d3a6 100644
--- a/phpBB/includes/functions_user.php
+++ b/phpBB/includes/functions_user.php
@@ -2765,10 +2765,11 @@ function group_user_add($group_id, $user_id_ary = false, $username_ary = false,
 	 * @event core.group_add_user_before
 	 * @var	int		group_id		ID of the group to which users are added
 	 * @var	string 	group_name		Name of the group
-	 * @var	array	user_id_ary		IDs of the users which are added
-	 * @var	array	username_ary	names of the users which are added
+	 * @var	array	user_id_ary		IDs of the users to be added
+	 * @var	array	username_ary	Names of the users to be added
 	 * @var	int		pending			Pending setting, 1 if user(s) added are pending
-	 * @since 3.3.14
+	 * @var	array	add_id_ary		IDs of the users to be added who are not members yet
+	 * @since 3.3.15-RC1
 	 */
 	$vars = array(
 		'group_id',
@@ -2776,6 +2777,7 @@ function group_user_add($group_id, $user_id_ary = false, $username_ary = false,
 		'user_id_ary',
 		'username_ary',
 		'pending',
+		'add_id_ary',
 	);
 	extract($phpbb_dispatcher->trigger_event('core.group_add_user_before', compact($vars)));