mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-07-30 21:40:43 +02:00
Code Issues Releases Wiki Activity

[ticket/17010] Properly handle expired subscriptions and extend tests

Browse Source 
PHPBB3-17010
This commit is contained in:
Marc Alexander
2024-03-01 19:40:26 +01:00
parent 93a6b8d87a
commit fcfed79385
3 changed files with 169 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
phpBB/phpbb/notification/method/webpush.php
View File

@@ -253,7 +253,7 @@ class webpush extends messenger_base implements extended_method_interface
// Fill array of endpoints to remove if subscription has expired
if ($report->isSubscriptionExpired())
{
$expired_endpoints = $report->getEndpoint();
$expired_endpoints[] = $report->getEndpoint();
}
else
{
@@ -415,11 +415,14 @@ class webpush extends messenger_base implements extended_method_interface
$remove_subscriptions = [];
foreach ($expired_endpoints as $endpoint)
{
foreach ($user_subscription_map as $user_id => $subscriptions)
foreach ($user_subscription_map as $subscriptions)
{
if (isset($subscriptions['endpoint']) && $subscriptions['endpoint'] == $endpoint)
foreach ($subscriptions as $subscription)
{
$remove_subscriptions[] = $subscriptions[$endpoint]['subscription_id'];
if (isset($subscription['endpoint']) && $subscription['endpoint'] == $endpoint)
{
$remove_subscriptions[] = $subscription['subscription_id'];
}
}
}
}