Add option to make method enabled default

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

Author: iMattPro

acp/wpn_acp_module.php

@@ -101,6 +101,7 @@ public function display_settings()
 			'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,
 		]);
 	}
@@ -117,6 +118,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_method_enabled' => ['validate' => 'bool'],
 		];
 
 		// Do not validate and update private key field if the content is ******** and the key was already set

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('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>
+				<label><input type="radio" class="radio" name="config[wpn_webpush_method_enabled]" value="0"{% if not S_WEBPUSH_METHOD_ENABLED %} checked="checked"{% endif %}> {{ lang('NO') }}</label>
+		</dl>
 	</fieldset>
 	<fieldset class="submit-buttons">
 		<input class="button1" type="submit" id="submit" name="submit" value="{{ lang('SUBMIT') }}">&nbsp;

language/en/webpushnotifications_module_acp.php

@@ -46,4 +46,6 @@
 	'WEBPUSH_VAPID_PUBLIC_EXPLAIN'	=> 'The Voluntary Application Server Identification (VAPID) public key is shared to authenticate push messages from your site.<br><em><strong>Caution:</strong> Modifying the VAPID public key will automatically render all Web Push subscriptions invalid.</em>',
 	'WEBPUSH_VAPID_PRIVATE'			=> 'Server identification private key',
 	'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.',
 ]);

migrations/add_acp_configs.php

@@ -0,0 +1,40 @@
+<?php
+/**
+ *
+ * phpBB Browser Push Notifications. An extension for the phpBB Forum Software package.
+ *
+ * @copyright (c) 2024, phpBB Limited <https://www.phpbb.com>
+ * @license GNU General Public License, version 2 (GPL-2.0)
+ *
+ */
+
+namespace phpbb\webpushnotifications\migrations;
+
+use phpbb\db\migration\migration;
+
+class add_acp_configs extends migration
+{
+	public function effectively_installed(): bool
+	{
+		return $this->config->offsetExists('wpn_webpush_method_enabled');
+	}
+
+	public static function depends_on()
+	{
+		return ['\phpbb\webpushnotifications\migrations\add_webpush'];
+	}
+
+	public function update_data(): array
+	{
+		return [
+			['config.add', ['wpn_webpush_method_enabled', false]],
+		];
+	}
+
+	public function revert_data(): array
+	{
+		return [
+			['config.remove', ['wpn_webpush_method_enabled']],
+		];
+	}
+}

notification/method/webpush.php

@@ -96,6 +96,11 @@ public function is_available(type_interface $notification_type = null): bool
 			&& !empty($this->config['wpn_webpush_vapid_public']) && !empty($this->config['wpn_webpush_vapid_private']);
 	}
 
+	public function is_enabled_by_default()
+	{
+		return $this->config['wpn_webpush_method_enabled'];
+	}
+
 	/**
 	* {@inheritdoc}
 	*/