mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-07-31 22:10:45 +02:00
Code Issues Releases Wiki Activity

[ticket/17010] Add new interface and create template data in type

Browse Source 
PHPBB3-17010
This commit is contained in:
Marc Alexander
2023-11-05 12:56:39 +01:00
parent fa91bf791f
commit 8d9a7aa62c
4 changed files with 89 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
phpBB/phpbb/notification/method/extended_method_interface.php Normal file
View File

@@ -0,0 +1,29 @@
<?php
/**
*
* This file is part of the phpBB Forum Software package.
*
* @copyright (c) phpBB Limited <https://www.phpbb.com>
* @license GNU General Public License, version 2 (GPL-2.0)
*
* For full copyright and license information, please see
* the docs/CREDITS.txt file.
*
*/
namespace phpbb\notification\method;
use phpbb\controller\helper;
use phpbb\form\form_helper;
interface extended_method_interface extends method_interface
{
/**
* Get UCP template data for type
*
* @param helper $controller_helper
* @param form_helper $form_helper
* @return array Template data
*/
public function get_ucp_template_data(helper $controller_helper, form_helper $form_helper): array;
}

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

@@ -15,7 +15,9 @@ namespace phpbb\notification\method;
use Minishlink\WebPush\Subscription;
use phpbb\config\config;
use phpbb\controller\helper;
use phpbb\db\driver\driver_interface;
use phpbb\form\form_helper;
use phpbb\log\log_interface;
use phpbb\notification\type\type_interface;
use phpbb\user;
@@ -26,7 +28,7 @@ use phpbb\user_loader;
* This class handles sending push messages for notifications
*/
class webpush extends messenger_base
class webpush extends messenger_base implements extended_method_interface
{
/** @var config */
protected $config;
@@ -320,6 +322,33 @@ class webpush extends messenger_base
return array_intersect_key($data, $row);
}
public function get_ucp_template_data(helper $controller_helper, form_helper $form_helper): array
{
$subscription_map = $this->get_user_subscription_map([$this->user->id()]);
$subscriptions = [];
if (isset($subscription_map[$this->user->id()]))
{
foreach ($subscription_map[$this->user->id()] as $subscription)
{
$subscriptions[] = [
'endpoint' => $subscription['endpoint'],
'expirationTime' => $subscription['expiration_time'],
];
}
}
return [
'NOTIFICATIONS_WEBPUSH_ENABLE' => true,
'U_WEBPUSH_SUBSCRIBE' => $controller_helper->route('phpbb_ucp_push_subscribe_controller'),
'U_WEBPUSH_UNSUBSCRIBE' => $controller_helper->route('phpbb_ucp_push_unsubscribe_controller'),
'VAPID_PUBLIC_KEY' => $this->config['webpush_vapid_public'],
'U_WEBPUSH_WORKER_URL' => $controller_helper->route('phpbb_ucp_push_worker_controller'),
'SUBSCRIPTIONS' => $subscriptions,
'WEBPUSH_FORM_TOKENS' => $form_helper->get_form_tokens(\phpbb\ucp\controller\webpush::FORM_TOKEN_UCP),
];
}
/**
* Get subscriptions for notify users
*
@@ -332,7 +361,7 @@ class webpush extends messenger_base
// Get subscriptions for users
$user_subscription_map = [];
$sql = 'SELECT subscription_id, user_id, endpoint, p256dh, auth
$sql = 'SELECT subscription_id, user_id, endpoint, p256dh, auth, expiration_time
FROM ' . $this->push_subscriptions_table . '
WHERE ' . $this->db->sql_in_set('user_id', $notify_users);
$result = $this->db->sql_query($sql);

2
phpBB/phpbb/ucp/controller/webpush.php
View File

@@ -33,7 +33,7 @@ use Twig\Error\SyntaxError;
class webpush
{
/** @var string UCP form token name */
private const FORM_TOKEN_UCP = 'ucp_webpush';
public const FORM_TOKEN_UCP = 'ucp_webpush';
/** @var config */
protected $config;