Improve ACP

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

Author: iMattPro

event/listener.php

@@ -138,14 +138,26 @@ public function acp_pwa_options($event)
 			$my_config_vars = [
 				'legend_pwa_settings'=> 'PWA_SETTINGS',
 				'pwa_short_name'	=> ['lang' => 'PWA_SHORT_NAME', 'validate' => 'string', 'type' => 'text:40:12', 'explain' => true],
-				'pwa_icon_small'	=> ['lang' => 'PWA_ICON_SMALL', 'validate' => 'pwa_options', 'type' => 'text:40:255', 'explain' => true],
-				'pwa_icon_large'	=> ['lang' => 'PWA_ICON_LARGE', 'validate' => 'pwa_options', 'type' => 'text:40:255', 'explain' => true],
+				'pwa_icon_small'	=> ['lang' => 'PWA_ICON_SMALL', 'validate' => 'pwa_options', 'type' => 'custom', 'function' => [$this, 'pwa_icon_name'], 'explain' => true],
+				'pwa_icon_large'	=> ['lang' => 'PWA_ICON_LARGE', 'validate' => 'pwa_options', 'type' => 'custom', 'function' => [$this, 'pwa_icon_name'], 'explain' => true],
 			];
 
 			$event->update_subarray('display_vars', 'vars', phpbb_insert_config_array($event['display_vars']['vars'], $my_config_vars, ['before' => 'legend4']));
 		}
 	}
 
+	/**
+	 * Return HTML for PWA icon name settings
+	 *
+	 * @param string $value Value of config
+	 * @param string $key Name of config
+	 * @return string
+	 */
+	public function pwa_icon_name($value, $key)
+	{
+		return $this->config['icons_path'] . '/<input id="' . $key . '" type="text" size="40" maxlength="255" name="config[' . $key . ']" value="' . $value . '">';
+	}
+
 	/**
 	 * Validate PWA options
 	 *

language/en/webpushnotifications_common_acp.php

@@ -38,13 +38,13 @@
 //
 
 $lang = array_merge($lang, [
-	'PWA_SETTINGS'				=> 'Web application options',
+	'PWA_SETTINGS'				=> 'Progressive web application options',
 	'PWA_SHORT_NAME'			=> 'Short site name',
 	'PWA_SHORT_NAME_EXPLAIN'	=> 'Your site name in 12 characters or less, which may be used as a label for an icon on a mobile device’s home screen.',
 	'PWA_ICON_SMALL'			=> 'Small mobile device icon',
-	'PWA_ICON_SMALL_EXPLAIN'	=> 'File name of a 192px x 192px PNG image. This file must be uploaded to your <samp>icons</samp> directory, e.g. <samp>./images/icons</samp>',
+	'PWA_ICON_SMALL_EXPLAIN'	=> 'File name of a 192px x 192px PNG image. This file must be uploaded to your board’s <samp>icons</samp> directory.',
 	'PWA_ICON_LARGE'			=> 'Large mobile device icon',
-	'PWA_ICON_LARGE_EXPLAIN'	=> 'File name of a 512px x 512px PNG image. This file must be uploaded to your <samp>icons</samp> directory, e.g. <samp>./images/icons</samp>',
+	'PWA_ICON_LARGE_EXPLAIN'	=> 'File name of a 512px x 512px PNG image. This file must be uploaded to your board’s <samp>icons</samp> directory.',
 	'PWA_ICON_SIZE_INVALID'		=> '%s does not have the correct image dimensions.',
 	'PWA_ICON_MIME_INVALID'		=> '%s must be a PNG image file.',
 	'PWA_IMAGE_INVALID'			=> '%s does not appear to be a valid image file.',

language/en/webpushnotifications_module_acp.php

@@ -38,7 +38,7 @@
 //
 
 $lang = array_merge($lang, [
-	'ACP_WEBPUSH_SETTINGS_EXPLAIN'	=> 'Here you can enable Web Push for board notifications. Web Push is a protocol for the real-time delivery of events to user agents, commonly referred to as push messages. It is compatible with the majority of modern browsers on both desktop and mobile devices. Users can opt to receive Web Push alerts in their browser by subscribing and enabling their preferred notifications in the UCP.',
+	'ACP_WEBPUSH_SETTINGS_EXPLAIN'	=> 'Here you can enable Web Push for board notifications. Web Push is a protocol for the real-time delivery of events to user agents, commonly referred to as push messages. It is compatible with the majority of modern browsers on both desktop and mobile devices. Users can opt to receive Web Push alerts in their browser by subscribing and enabling their preferred notifications in the UCP.<br><br>To enable push notifications on Apple mobile devices, your site needs to operate as a Progressive Web Application (PWA) and be added to users’ home screens. This feature is now built into phpBB. For a better user experience, you can find additional PWA settings under <strong>Board settings</strong>, where you can configure an optional app name and app icons for your site.',
 	'WEBPUSH_ENABLE'				=> 'Enable Web Push',
 	'WEBPUSH_ENABLE_EXPLAIN'		=> 'Allow users to receive notifications in their browser or device via Web Push. To utilize Web Push, you must input or generate valid VAPID identification keys.',
 	'WEBPUSH_GENERATE_VAPID_KEYS'	=> 'Generate Identification keys',

tests/functional/functional_test.php

@@ -41,7 +41,7 @@ public function test_acp_module()
 		$crawler = self::request('GET', 'adm/index.php?i=-phpbb-webpushnotifications-acp-wpn_acp_module&mode=webpush&sid=' . $this->sid);
 
 		$this->assertContainsLang('ACP_WEBPUSH_EXT_SETTINGS', $crawler->filter('div.main > h1')->text());
-		$this->assertContainsLang('ACP_WEBPUSH_SETTINGS_EXPLAIN', $crawler->filter('div.main > p')->text());
+		$this->assertContainsLang('ACP_WEBPUSH_SETTINGS_EXPLAIN', $crawler->filter('div.main > p')->html());
 		$this->assertContainsLang('WEBPUSH_GENERATE_VAPID_KEYS', $crawler->filter('input[type="button"]')->attr('value'));
 
 		$form_data = [