Make notification dropdown subscribe toggle an option

Signed-off-by: Matt Friedman <maf675@gmail.com>

Author: iMattPro

acp/wpn_acp_module.php

@@ -98,11 +98,12 @@ public function main($id, $mode)
 	public function display_settings()
 	{
 		$this->template->assign_vars([
-			'S_WEBPUSH_ENABLE'		=> $this->config['wpn_webpush_enable'],
-			'WEBPUSH_VAPID_PUBLIC'	=> $this->config['wpn_webpush_vapid_public'],
-			'WEBPUSH_VAPID_PRIVATE'	=> $this->config['wpn_webpush_vapid_private'] ? self::MASKED_PRIVATE_KEY : '',
-			'S_WEBPUSH_METHOD_ENABLED' => $this->config['wpn_webpush_method_enabled'],
-			'U_ACTION'				=> $this->u_action,
+			'S_WEBPUSH_ENABLE'					=> $this->config['wpn_webpush_enable'],
+			'WEBPUSH_VAPID_PUBLIC'				=> $this->config['wpn_webpush_vapid_public'],
+			'WEBPUSH_VAPID_PRIVATE'				=> $this->config['wpn_webpush_vapid_private'] ? self::MASKED_PRIVATE_KEY : '',
+			'S_WPN_WEBPUSH_DROPDOWN_SUBSCRIBE'	=> $this->config['wpn_webpush_dropdown_subscribe'],
+			'S_WEBPUSH_METHOD_ENABLED' 			=> $this->config['wpn_webpush_method_enabled'],
+			'U_ACTION'							=> $this->u_action,
 		]);
 	}
 
@@ -118,6 +119,7 @@ public function save_settings()
 			'wpn_webpush_enable' => ['validate' => 'bool'],
 			'wpn_webpush_vapid_public' => ['validate' => 'string:25:255', 'lang' => 'WEBPUSH_VAPID_PUBLIC'],
 			'wpn_webpush_vapid_private'=> ['validate' => 'string:25:255', 'lang' => 'WEBPUSH_VAPID_PRIVATE'],
+			'wpn_webpush_dropdown_subscribe' => ['validate' => 'bool'],
 			'wpn_webpush_method_enabled' => ['validate' => 'bool'],
 		];
 

adm/style/wpn_acp_settings.html

@@ -29,6 +29,11 @@ <h3>{{ lang('WARNING') }}</h3>
 			<dt><label for="webpush_vapid_private">{{ lang('WEBPUSH_VAPID_PRIVATE') ~ lang('COLON') }}</label><br><span>{{ lang('WEBPUSH_VAPID_PRIVATE_EXPLAIN') }}</span></dt>
 			<dd><label><input id="webpush_vapid_private" type="password" name="config[wpn_webpush_vapid_private]" size="25" maxlength="255" autocomplete="off" value="{{ WEBPUSH_VAPID_PRIVATE }}"></label></dd>
 		</dl>
+		<dl>
+			<dt><label>{{ lang('WPN_WEBPUSH_DROPDOWN_SUBSCRIBE') ~ lang('COLON') }}</label><br><span>{{ lang('WPN_WEBPUSH_DROPDOWN_SUBSCRIBE_EXPLAIN') }}</span></dt>
+			<dd><label><input type="radio" class="radio" name="config[wpn_webpush_dropdown_subscribe]" value="1" {% if S_WPN_WEBPUSH_DROPDOWN_SUBSCRIBE %}checked="checked"{% endif %}> {{ lang('YES') }}</label>
+				<label><input type="radio" class="radio" name="config[wpn_webpush_dropdown_subscribe]" value="0"{% if not S_WPN_WEBPUSH_DROPDOWN_SUBSCRIBE %} checked="checked"{% endif %}> {{ lang('NO') }}</label>
+		</dl>
 		<dl>
 			<dt><label>{{ lang('WEBPUSH_METHOD_ENABLED') ~ lang('COLON') }}</label><br><span>{{ lang('WEBPUSH_METHOD_ENABLED_EXPLAIN') }}</span></dt>
 			<dd><label><input type="radio" class="radio" name="config[wpn_webpush_method_enabled]" value="1" {% if S_WEBPUSH_METHOD_ENABLED %}checked="checked"{% endif %}> {{ lang('YES') }}</label>

language/en/webpushnotifications_module_acp.php

@@ -48,4 +48,6 @@
 	'WEBPUSH_VAPID_PRIVATE_EXPLAIN'	=> 'The Voluntary Application Server Identification (VAPID) private key is used to generate authenticated push messages dispatched from your site. The VAPID private key <strong>must</strong> form a valid public-private key pair alongside the VAPID public key.<br><em><strong>Caution:</strong> Modifying the VAPID private key will automatically render all Web Push subscriptions invalid.</em>',
 	'WEBPUSH_METHOD_ENABLED'		=> 'Enable user-based web push notifications by default',
 	'WEBPUSH_METHOD_ENABLED_EXPLAIN'=> 'When this setting is enabled, users who subscribe and allow browser notifications will start receiving them automatically. They only need to visit the UCP Notification settings to disable any unwanted notifications.<br><br>If this setting is disabled, users will not receive any notifications, even if they have subscribed, until they visit the UCP Notification settings to enable the specific notifications they wish to receive.',
+	'WPN_WEBPUSH_DROPDOWN_SUBSCRIBE'		=> 'Show “Subscribe” button in notification dropdown',
+	'WPN_WEBPUSH_DROPDOWN_SUBSCRIBE_EXPLAIN'=> 'Enable or disable the “Subscribe” button in the Notification dropdown, allowing users to easily subscribe to push notifications from any page of the forum.',
 ]);

language/en/webpushnotifications_module_ucp.php

@@ -45,5 +45,4 @@
 	'NOTIFY_WEBPUSH_SUBSCRIBE'		=> 'Subscribe',
 	'NOTIFY_WEBPUSH_UNSUBSCRIBE'	=> 'Unsubscribe',
 	'NOTIFY_WEBPUSH_SUBSCRIBED'		=> 'Subscribed',
-	'NOTIFY_WEBPUSH_DROPDOWN_TITLE'	=> 'Visit notifications settings to set your preferred push notifications.',
 ]);

language/ru/webpushnotifications_module_ucp.php

@@ -45,5 +45,4 @@
 	'NOTIFY_WEBPUSH_SUBSCRIBE'		=> 'Подписаться',
 	'NOTIFY_WEBPUSH_UNSUBSCRIBE'	=> 'Отписаться',
 	'NOTIFY_WEBPUSH_SUBSCRIBED'		=> 'Включено',
-	'NOTIFY_WEBPUSH_DROPDOWN_TITLE'	=> 'Посетите настройки уведомлений, чтобы установить предпочтительные push-уведомления.',
 ]);

migrations/add_acp_configs.php

@@ -28,13 +28,15 @@ public function update_data(): array
 	{
 		return [
 			['config.add', ['wpn_webpush_method_enabled', false]],
+			['config.add', ['wpn_webpush_dropdown_subscribe', false]],
 		];
 	}
 
 	public function revert_data(): array
 	{
 		return [
 			['config.remove', ['wpn_webpush_method_enabled']],
+			['config.remove', ['wpn_webpush_dropdown_subscribe']],
 		];
 	}
 }

notification/method/webpush.php

@@ -364,7 +364,7 @@ public function get_ucp_template_data(helper $controller_helper, form_helper $fo
 		}
 
 		return [
-			'NOTIFICATIONS_WEBPUSH_ENABLE'	=> true,
+			'NOTIFICATIONS_WEBPUSH_ENABLE'	=> $this->config['wpn_webpush_dropdown_subscribe'] || stripos($this->user->page['page'], 'notification_options'),
 			'U_WEBPUSH_SUBSCRIBE'			=> $controller_helper->route('phpbb_webpushnotifications_ucp_push_subscribe_controller'),
 			'U_WEBPUSH_UNSUBSCRIBE'			=> $controller_helper->route('phpbb_webpushnotifications_ucp_push_unsubscribe_controller'),
 			'VAPID_PUBLIC_KEY'				=> $this->config['wpn_webpush_vapid_public'],

styles/all/template/event/notification_dropdown_footer_after.html

@@ -1,5 +1,5 @@
 {% if NOTIFICATIONS_WEBPUSH_ENABLE and notification_types is not defined %}
-	<div class="wpn-notification-dropdown-footer" title="{{ lang('NOTIFY_WEBPUSH_DROPDOWN_TITLE') }}">
+	<div class="wpn-notification-dropdown-footer">
 		<span class="ellipsis-text">{{ lang('NOTIFY_WEBPUSH_ENABLE_SHORT') ~ lang('COLON') }}</span>
 		<button id="subscribe_webpush" name="subscribe_webpush"><i class="icon fa-toggle-off fa-fw icon-lightgray"></i><span>{{ lang('NOTIFY_WEBPUSH_SUBSCRIBE') }}</span></button>
 		<button id="unsubscribe_webpush" name="unsubscribe_webpush" class="hidden"><i class="icon fa-toggle-on fa-fw icon-blue"></i><span>{{ lang('NOTIFY_WEBPUSH_SUBSCRIBED') }}</span></button>