diff options
| author | Marc Alexander <admin@m-a-styles.de> | 2020-01-03 11:25:50 +0100 |
|---|---|---|
| committer | Marc Alexander <admin@m-a-styles.de> | 2020-01-03 11:25:50 +0100 |
| commit | b83de54bb4fd3217b41f61de896e73732752d196 (patch) | |
| tree | da7dc53e5d6804286f0abd500fa9b0efe767c799 /phpBB/includes | |
| parent | 261bf416ee4238c56df57e2d3cf4165b3a654e62 (diff) | |
| parent | a0ffbfce315ce45df4085d4c83536f2024e71a3f (diff) | |
| download | forums-b83de54bb4fd3217b41f61de896e73732752d196.tar forums-b83de54bb4fd3217b41f61de896e73732752d196.tar.gz forums-b83de54bb4fd3217b41f61de896e73732752d196.tar.bz2 forums-b83de54bb4fd3217b41f61de896e73732752d196.tar.xz forums-b83de54bb4fd3217b41f61de896e73732752d196.zip | |
Merge pull request #5811 from paul999/ticket/16287
[ticket/16287] After installation an error message regarding statisti…
Diffstat (limited to 'phpBB/includes')
| -rw-r--r-- | phpBB/includes/acp/acp_help_phpbb.php | 11 | ||||
| -rw-r--r-- | phpBB/includes/questionnaire/questionnaire.php | 4 |
2 files changed, 9 insertions, 6 deletions
diff --git a/phpBB/includes/acp/acp_help_phpbb.php b/phpBB/includes/acp/acp_help_phpbb.php index a36b36eddc..798cff5cee 100644 --- a/phpBB/includes/acp/acp_help_phpbb.php +++ b/phpBB/includes/acp/acp_help_phpbb.php @@ -32,7 +32,7 @@ class acp_help_phpbb include($phpbb_root_path . 'includes/questionnaire/questionnaire.' . $phpEx); } - $collect_url = "https://www.phpbb.com/stats/receive_stats.php"; + $collect_url = "https://www.phpbb.com/statistics/send"; $this->tpl_name = 'acp_help_phpbb'; $this->page_title = 'ACP_HELP_PHPBB'; @@ -90,13 +90,15 @@ class acp_help_phpbb if (!empty($response)) { - if ((strpos($response, 'Thank you') !== false || strpos($response, 'Flood protection') !== false)) + $decoded_response = json_decode(htmlspecialchars_decode($response), true); + + if ($decoded_response && isset($decoded_response['status']) && $decoded_response['status'] == 'ok') { trigger_error($user->lang('THANKS_SEND_STATISTICS') . adm_back_link($this->u_action)); } else { - trigger_error($user->lang('FAIL_SEND_STATISTICS') . adm_back_link($this->u_action)); + trigger_error($user->lang('FAIL_SEND_STATISTICS') . adm_back_link($this->u_action), E_USER_WARNING); } } @@ -106,7 +108,8 @@ class acp_help_phpbb $template->assign_vars(array( 'U_COLLECT_STATS' => $collect_url, 'S_COLLECT_STATS' => (!empty($config['help_send_statistics'])) ? true : false, - 'RAW_DATA' => $collector->get_data_for_form(), + 'S_STATS' => $collector->get_data_raw(), + 'S_STATS_DATA' => json_encode($collector->get_data_raw()), 'U_ACP_MAIN' => append_sid("{$phpbb_admin_path}index.$phpEx"), 'U_ACTION' => $this->u_action, // Pass earliest time we should try to send stats again diff --git a/phpBB/includes/questionnaire/questionnaire.php b/phpBB/includes/questionnaire/questionnaire.php index 95036a95bc..ec2e6fea5d 100644 --- a/phpBB/includes/questionnaire/questionnaire.php +++ b/phpBB/includes/questionnaire/questionnaire.php @@ -68,7 +68,7 @@ class phpbb_questionnaire_data_collector function get_data_for_form() { - return base64_encode(serialize($this->get_data_raw())); + return base64_encode(json_encode($this->get_data_raw())); } /** @@ -124,7 +124,7 @@ class phpbb_questionnaire_php_data_provider 'zend.ze1_compatibility_mode' => (int) @ini_get('zend.ze1_compatibility_mode'), 'unicode.semantics' => (int) @ini_get('unicode.semantics'), 'zend_thread_safty' => (int) function_exists('zend_thread_id'), - 'extensions' => get_loaded_extensions(), + 'extensions' => implode(',', get_loaded_extensions()), ); } } |