aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/adm/style
diff options
context:
space:
mode:
authorpaul sohier <paul999@phpbb.com>2020-01-02 15:21:34 +0100
committerpaul sohier <paul999@phpbb.com>2020-01-02 15:36:00 +0100
commitf866a8fd1bac7da74c88763447ad2f3ff1b9a10c (patch)
treea44ccad225e77725be342a9dad60b69eaef35d80 /phpBB/adm/style
parentdce0441ecf5fb3b163268be63552a85196dec020 (diff)
downloadforums-f866a8fd1bac7da74c88763447ad2f3ff1b9a10c.tar
forums-f866a8fd1bac7da74c88763447ad2f3ff1b9a10c.tar.gz
forums-f866a8fd1bac7da74c88763447ad2f3ff1b9a10c.tar.bz2
forums-f866a8fd1bac7da74c88763447ad2f3ff1b9a10c.tar.xz
forums-f866a8fd1bac7da74c88763447ad2f3ff1b9a10c.zip
[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
Diffstat (limited to 'phpBB/adm/style')
-rw-r--r--phpBB/adm/style/acp_help_phpbb.html10
-rw-r--r--phpBB/adm/style/ajax.js4
2 files changed, 10 insertions, 4 deletions
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>
diff --git a/phpBB/adm/style/ajax.js b/phpBB/adm/style/ajax.js
index 644e74bef7..b9424723bb 100644
--- a/phpBB/adm/style/ajax.js
+++ b/phpBB/adm/style/ajax.js
@@ -1,4 +1,4 @@
-/* global phpbb */
+/* global phpbb, statsData */
(function($) { // Avoid conflicts with other libraries
@@ -87,7 +87,7 @@ phpbb.prepareSendStats = function () {
$.ajax({
url: $this.attr('data-ajax-action').replace('&amp;', '&'),
type: 'POST',
- data: 'systemdata=' + encodeURIComponent($this.find('input[name=systemdata]').val()),
+ data: statsData,
success: returnHandler,
error: errorHandler,
cache: false