diff options
| author | Nils Adermann <naderman@naderman.de> | 2014-10-25 16:56:05 -0700 |
|---|---|---|
| committer | Nils Adermann <naderman@naderman.de> | 2014-10-25 16:56:05 -0700 |
| commit | 26d4483d36ec82f6dc8f4943f289be94302ab7ce (patch) | |
| tree | 3a14ab74c35a76081d53361b143c454f21b7473e /phpBB | |
| parent | f22cd2d7348dc3a103e53aa773b6f91abe998ddd (diff) | |
| parent | 4859cec0c50cc522e73dba5555def308835b1357 (diff) | |
| download | forums-26d4483d36ec82f6dc8f4943f289be94302ab7ce.tar forums-26d4483d36ec82f6dc8f4943f289be94302ab7ce.tar.gz forums-26d4483d36ec82f6dc8f4943f289be94302ab7ce.tar.bz2 forums-26d4483d36ec82f6dc8f4943f289be94302ab7ce.tar.xz forums-26d4483d36ec82f6dc8f4943f289be94302ab7ce.zip | |
Merge branch 'prep-release-3.1.0' into develop-ascraeus
* prep-release-3.1.0:
[ticket/13207] Add notification manager mock to user_add method in tests
[ticket/13207] Move default user notifications settings to user_add()
[ticket/13207] Add default subscription options for newly registered users
Diffstat (limited to 'phpBB')
| -rw-r--r-- | phpBB/includes/functions_user.php | 28 |
1 files changed, 27 insertions, 1 deletions
diff --git a/phpBB/includes/functions_user.php b/phpBB/includes/functions_user.php index e4479f07b0..f79a8998c4 100644 --- a/phpBB/includes/functions_user.php +++ b/phpBB/includes/functions_user.php @@ -161,9 +161,10 @@ function user_update_name($old_name, $new_name) * * @param mixed $user_row An array containing the following keys (and the appropriate values): username, group_id (the group to place the user in), user_email and the user_type(usually 0). Additional entries not overridden by defaults will be forwarded. * @param string $cp_data custom profile fields, see custom_profile::build_insert_sql_array +* @param array $notifications_data The notifications settings for the new user * @return the new user's ID. */ -function user_add($user_row, $cp_data = false) +function user_add($user_row, $cp_data = false, $notifications_data = null) { global $db, $user, $auth, $config, $phpbb_root_path, $phpEx; global $phpbb_dispatcher, $phpbb_container; @@ -347,6 +348,31 @@ function user_add($user_row, $cp_data = false) set_config('newest_user_colour', $row['group_colour'], true); } + // Use default notifications settings if notifications_data is not set + if ($notifications_data === null) + { + $notifications_data = array( + array( + 'item_type' => 'notification.type.post', + 'method' => 'notification.method.email', + ), + array( + 'item_type' => 'notification.type.topic', + 'method' => 'notification.method.email', + ), + ); + } + + // Subscribe user to notifications if necessary + if (!empty($notifications_data)) + { + $phpbb_notifications = $phpbb_container->get('notification_manager'); + foreach ($notifications_data as $subscription) + { + $phpbb_notifications->add_subscription($subscription['item_type'], 0, $subscription['method'], $user_id); + } + } + /** * Event that returns user id, user detals and user CPF of newly registared user * |