From f866a8fd1bac7da74c88763447ad2f3ff1b9a10c Mon Sep 17 00:00:00 2001
From: paul sohier <paul999@phpbb.com>
Date: Thu, 2 Jan 2020 15:21:34 +0100
Subject: [ticket/16287] After installation an error is given over statistics
 submission

The phpBB.com website required specific fields to be available for the
statistics. This change switched over to a new statistics page on
www.phpbb.com that uses form fields instead, and that returns JSON as value.

PHPBB3-16287
---
 phpBB/adm/style/acp_help_phpbb.html | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

(limited to 'phpBB/adm/style/acp_help_phpbb.html')

diff --git a/phpBB/adm/style/acp_help_phpbb.html b/phpBB/adm/style/acp_help_phpbb.html
index 478ecc162a..2426bf57cd 100644
--- a/phpBB/adm/style/acp_help_phpbb.html
+++ b/phpBB/adm/style/acp_help_phpbb.html
@@ -38,10 +38,12 @@
 			<dd>{L_SEND_STATISTICS_LONG}</dd>
 		</dl>
 	</div>
+	<script>
+        var statsData = {S_STATS_DATA};
+	</script>
 	<!-- EVENT acp_help_phpbb_stats_after -->
 	<fieldset>
 		<p class="submit-buttons">
-			<input type="hidden" name="systemdata" value="{RAW_DATA}" />
 			<input type="hidden" name="help_send_statistics_time" value="{COLLECT_STATS_TIME}" />
 			<input class="button1" type="submit" id="submit" name="submit" value="{L_SUBMIT}" />
 		</p>
@@ -52,7 +54,11 @@
 <form action="{U_COLLECT_STATS}" method="post" target="questionaire_result" id="questionnaire-form">
 	<fieldset>
 		<p class="submit-buttons">
-			<input type="hidden" name="systemdata" value="{RAW_DATA}" />
+			<!-- BEGIN providers -->
+				<!-- BEGIN values -->
+					<input type="hidden" name="{providers.NAME}[{providers.values.KEY}]" value="{providers.values.VALUE}" />
+				<!-- END values -->
+			<!-- END providers -->
 			<input class="button1" type="submit" id="submit_stats" name="submit" value="{L_SEND_STATISTICS}" />
 		</p>
 	</fieldset>
-- 
cgit v1.2.1


From b3f80239c1204cdaa69d4de66674d27fd4091da9 Mon Sep 17 00:00:00 2001
From: Marc Alexander <admin@m-a-styles.de>
Date: Thu, 2 Jan 2020 21:06:58 +0100
Subject: [ticket/16287] Use twig syntax and fix coding guidelines issues

PHPBB3-16287
---
 phpBB/adm/style/acp_help_phpbb.html | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

(limited to 'phpBB/adm/style/acp_help_phpbb.html')

diff --git a/phpBB/adm/style/acp_help_phpbb.html b/phpBB/adm/style/acp_help_phpbb.html
index 2426bf57cd..d526bf6ee7 100644
--- a/phpBB/adm/style/acp_help_phpbb.html
+++ b/phpBB/adm/style/acp_help_phpbb.html
@@ -39,7 +39,7 @@
 		</dl>
 	</div>
 	<script>
-        var statsData = {S_STATS_DATA};
+		var statsData = {{ S_STATS_DATA }};
 	</script>
 	<!-- EVENT acp_help_phpbb_stats_after -->
 	<fieldset>
@@ -54,11 +54,11 @@
 <form action="{U_COLLECT_STATS}" method="post" target="questionaire_result" id="questionnaire-form">
 	<fieldset>
 		<p class="submit-buttons">
-			<!-- BEGIN providers -->
-				<!-- BEGIN values -->
-					<input type="hidden" name="{providers.NAME}[{providers.values.KEY}]" value="{providers.values.VALUE}" />
-				<!-- END values -->
-			<!-- END providers -->
+			{% for providers in loops.providers %}
+				{% for values in providers.values %}
+					<input type="hidden" name="{{ providers.NAME }}[{{ values.KEY }}]" value="{{ values.VALUE }}" />
+				{% endfor %}
+			{% endfor %}
 			<input class="button1" type="submit" id="submit_stats" name="submit" value="{L_SEND_STATISTICS}" />
 		</p>
 	</fieldset>
-- 
cgit v1.2.1


From d50d1101fbe991abcc7c42b7e624d4c202c2a8a1 Mon Sep 17 00:00:00 2001
From: Marc Alexander <admin@m-a-styles.de>
Date: Fri, 3 Jan 2020 08:57:09 +0100
Subject: [ticket/16287] Remove loops. prefix in providers loop

PHPBB3-16287
---
 phpBB/adm/style/acp_help_phpbb.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'phpBB/adm/style/acp_help_phpbb.html')

diff --git a/phpBB/adm/style/acp_help_phpbb.html b/phpBB/adm/style/acp_help_phpbb.html
index d526bf6ee7..7d3c503e77 100644
--- a/phpBB/adm/style/acp_help_phpbb.html
+++ b/phpBB/adm/style/acp_help_phpbb.html
@@ -54,7 +54,7 @@
 <form action="{U_COLLECT_STATS}" method="post" target="questionaire_result" id="questionnaire-form">
 	<fieldset>
 		<p class="submit-buttons">
-			{% for providers in loops.providers %}
+			{% for providers in providers %}
 				{% for values in providers.values %}
 					<input type="hidden" name="{{ providers.NAME }}[{{ values.KEY }}]" value="{{ values.VALUE }}" />
 				{% endfor %}
-- 
cgit v1.2.1