In Overview module, displays the detected TLS version

Skouat · Oct 17, 2024 · ad8a44b · ad8a44b
1 parent d484151
commit ad8a44b
Show file tree

Hide file tree

Showing 5 changed files with 34 additions and 7 deletions.
diff --git a/adm/style/ppde_overview.html b/adm/style/ppde_overview.html
@@ -120,8 +120,8 @@
 		<td><strong {% if S_SSL %}style="color: #228822;"{% else %}style="color: #BC2A4D;"{% endif %}>{{ PPDE_ESI_VERSION_SSL }}</strong></td>
 	</tr>
 	<tr>
-		<td>{{ lang('PPDE_ESI_TLS') ~ lang('COLON') }}</td>
-		<td><strong {% if S_TLS %}style="color: #228822;"{% else %}style="color: #BC2A4D;"{% endif %}>{{ PPDE_ESI_TLS }}</strong></td>
+		<td>{{ lang('PPDE_ESI_VERSION_TLS') ~ lang('COLON') }}</td>
+		<td><strong {% if S_TLS %}style="color: #228822;"{% else %}style="color: #BC2A4D;"{% endif %}>{{ PPDE_ESI_VERSION_TLS }}</strong></td>
 		<td>{{ lang('PPDE_ESI_VERSION_INTL') ~ lang('COLON') }}</td>
 		<td><strong {% if S_INTL %}style="color: #228822;"{% else %}style="color: #FF6600;"{% endif %}>{PPDE_ESI_VERSION_INTL}</strong></td>
 	</tr>

diff --git a/controller/admin/overview_controller.php b/controller/admin/overview_controller.php
@@ -234,11 +234,11 @@ private function prepare_template_vars($ext_meta): array
 			'L_PPDE_ESI_INSTALL_DATE'        => $this->language->lang('PPDE_ESI_INSTALL_DATE', $ext_meta['extra']['display-name']),
 			'L_PPDE_ESI_VERSION'             => $this->language->lang('PPDE_ESI_VERSION', $ext_meta['extra']['display-name']),
 			'PPDE_ESI_INSTALL_DATE'          => $this->user->format_date($this->config['ppde_install_date']),
-			'PPDE_ESI_TLS'                   => $this->config['ppde_tls_detected'] ? $this->language->lang('PPDE_ESI_DETECTED') : $this->language->lang('PPDE_ESI_NOT_DETECTED'),
 			'PPDE_ESI_VERSION'               => $ext_meta['version'],
 			'PPDE_ESI_VERSION_CURL'          => !empty($this->config['ppde_curl_version']) ? $this->config['ppde_curl_version'] : $this->language->lang('PPDE_ESI_NOT_DETECTED'),
 			'PPDE_ESI_VERSION_INTL'          => $this->config['ppde_intl_detected'] ? $this->config['ppde_intl_version'] : $this->language->lang('PPDE_ESI_INTL_NOT_DETECTED'),
 			'PPDE_ESI_VERSION_SSL'           => !empty($this->config['ppde_curl_ssl_version']) ? $this->config['ppde_curl_ssl_version'] : $this->language->lang('PPDE_ESI_NOT_DETECTED'),
+			'PPDE_ESI_VERSION_TLS'           => $this->config['ppde_tls_detected'] ?: $this->language->lang('PPDE_ESI_NOT_DETECTED'),
 			'S_ACTION_OPTIONS'               => $this->auth->acl_get('a_ppde_manage'),
 			'S_CURL'                         => $this->config['ppde_curl_detected'],
 			'S_INTL'                         => $this->config['ppde_intl_detected'] && $this->config['ppde_intl_version_valid'],

diff --git a/language/en/acp_overview.php b/language/en/acp_overview.php
@@ -3,7 +3,7 @@
  *
  * PayPal Donation extension for the phpBB Forum Software package.
  *
- * @copyright (c) 2015-2020 Skouat
+ * @copyright (c) 2015-2024 Skouat
  * @license GNU General Public License, version 2 (GPL-2.0)
  *
  */
@@ -47,11 +47,11 @@
 	'PPDE_ESI_MORE_INFORMATION'  => 'More information…',
 	'PPDE_ESI_NOT_DETECTED'      => 'Not detected',
 	'PPDE_ESI_RESYNC_OPTIONS'    => 'Reset or recheck extension and system information',
-	'PPDE_ESI_TLS'               => 'TLS 1.2',
 	'PPDE_ESI_VERSION'           => '<strong>%s</strong> version',
 	'PPDE_ESI_VERSION_CURL'      => '<code>cURL</code> version',
 	'PPDE_ESI_VERSION_INTL'      => 'PHP <code>Intl</code> version',
 	'PPDE_ESI_VERSION_SSL'       => 'SSL version',
+	'PPDE_ESI_VERSION_TLS'       => 'TLS version',
 
 	'PPDE_STATS'         => 'Donation Statistics',
 	'PPDE_STATS_SANDBOX' => 'Sandbox Statistics',

diff --git a/language/fr/acp_overview.php b/language/fr/acp_overview.php
@@ -3,7 +3,7 @@
  *
  * PayPal Donation extension for the phpBB Forum Software package.
  *
- * @copyright (c) 2015-2020 Skouat
+ * @copyright (c) 2015-2024 Skouat
  * @license GNU General Public License, version 2 (GPL-2.0)
  *
  */
@@ -47,11 +47,11 @@
 	'PPDE_ESI_MORE_INFORMATION'  => 'Plus d’informations…',
 	'PPDE_ESI_NOT_DETECTED'      => 'Non détecté',
 	'PPDE_ESI_RESYNC_OPTIONS'    => 'Réinitialiser or revérifier les informations de l’extension et du système',
-	'PPDE_ESI_TLS'               => 'TLS 1.2',
 	'PPDE_ESI_VERSION'           => 'Version de <strong>%s</strong>',
 	'PPDE_ESI_VERSION_CURL'      => 'Version de <code>cURL</code>',
 	'PPDE_ESI_VERSION_INTL'      => 'Version de PHP <code>intl</code>',
 	'PPDE_ESI_VERSION_SSL'       => 'Version de SSL',
+	'PPDE_ESI_VERSION_TLS'       => 'Version de TLS',
 
 	'PPDE_STATS'         => 'Statistiques des dons',
 	'PPDE_STATS_SANDBOX' => 'Statistiques Sandbox',

diff --git a/migrations/v33x/v330_m3_update_data.php b/migrations/v33x/v330_m3_update_data.php
@@ -0,0 +1,27 @@
+<?php
+/**
+ *
+ * PayPal Donation extension for the phpBB Forum Software package.
+ *
+ * @copyright (c) 2015-2020 Skouat
+ * @license GNU General Public License, version 2 (GPL-2.0)
+ *
+ */
+
+namespace skouat\ppde\migrations\v33x;
+
+class v330_m1_update_data extends \phpbb\db\migration\migration
+{
+	public static function depends_on()
+	{
+		return ['\skouat\ppde\migrations\v32x\v330_m2_update_data'];
+	}
+
+	public function update_data()
+	{
+		return [
+			['config.update', ['ppde_tls_detected', false]],
+			['config.update', ['ppde_first_start', true]],
+		];
+	}
+}