1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-03-25 18:13:28 +01:00

[ticket/14492] Add events for modifying help phpBB page

PHPBB3-14492
This commit is contained in:
Marc Alexander 2016-02-02 12:19:55 +01:00
parent cc7a0aa4fb
commit c07ecb060d
No known key found for this signature in database
GPG Key ID: 50E0D2423696F995
4 changed files with 51 additions and 38 deletions

View File

@ -6,6 +6,7 @@
<form id="acp_board" method="post" action="{U_ACTION}">
<div class="send-stats-row">
<!-- EVENT acp_help_phpbb_stats_before -->
<div class="send-stats-tile">
<h2><i class="icon fa-bar-chart"></i>Send statistics</h2>
<p>{L_EXPLAIN_SEND_STATISTICS}</p>
@ -31,23 +32,13 @@
</div>
<dl class="send-stats-settings">
<dt>
<input id="enable-stats" type="checkbox" checked="checked" />
<label for="enable-stats"></label>
<input id="help_send_statistics" type="checkbox"<!-- IF S_COLLECT_STATS --> checked="checked"<!-- ENDIF --> />
<label for="help_send_statistics"></label>
</dt>
<dd>{L_SEND_STATISTICS_LONG}</dd>
</dl>
</div>
<div class="send-stats-tile">
<h2><span class="viglink-header">VigLink</span></h2>
<p>{L_EXPLAIN_ENABLE_VIGLINK}</p>
<dl class="send-stats-settings">
<dt>
<input id="enable-viglink" type="checkbox" />
<label for="enable-viglink"></label>
</dt>
<dd>Enable</dd>
</dl>
</div>
<!-- EVENT acp_help_phpbb_stats_after -->
<fieldset>
<p class="submit-buttons">
<input class="button1" type="submit" id="submit" name="submit" value="{L_SUBMIT}" />

View File

@ -2612,12 +2612,6 @@ fieldset.permissions .padding {
padding-right: 0.3em;
}
.viglink-header {
background: url('http://www.viglink.com/wp-content/uploads/2015/05/favicon-96x96.png') no-repeat 0 0;
padding-left: 30px;
background-size: 25px;
}
.icon {
font-family: FontAwesome;
font-style: normal;

View File

@ -196,6 +196,18 @@ acp_groups_position_teampage_add_button_before
* Since: 3.1.7-RC1
* Purpose: Add content before adding group to teampage submit button
acp_help_phpbb_stats_after
===
* Location: adm/style/acp_help_phpbb.html
* Since: 3.2.0-b2
* Purpose: Add content after send statistics tile
acp_help_phpbb_stats_before
===
* Location: adm/style/acp_help_phpbb.html
* Since: 3.2.0-b2
* Purpose: Add content before send statistics tile
acp_logs_quick_select_forum_button_append
===
* Location: adm/style/acp_logs.html

View File

@ -25,7 +25,7 @@ class acp_help_phpbb
function main($id, $mode)
{
global $config, $request, $template, $user, $phpbb_admin_path, $phpbb_root_path, $phpEx;
global $config, $request, $template, $user, $phpbb_dispatcher, $phpbb_admin_path, $phpbb_root_path, $phpEx;
if (!class_exists('phpbb_questionnaire_data_collector'))
{
@ -71,33 +71,49 @@ class acp_help_phpbb
$collector->add_data_provider(new phpbb_questionnaire_system_data_provider());
$collector->add_data_provider(new phpbb_questionnaire_phpbb_data_provider($config));
/**
* Event to add and/or modify acp_board configurations
*
* @event core.acp_help_phpbb_submit_before
* @var boolean submit Do we display the form or process the submission
* @since 3.2.0-b2
*/
$vars = array('submit');
extract($phpbb_dispatcher->trigger_event('core.acp_help_phpbb_submit_before', compact($vars)));
if ($submit)
{
$client = new \Guzzle\Http\Client(
$this->u_action,
array(
'timeout' => 6,
'connect_timeout' => 6,
)
);
$config->set('help_send_statistics', $request->variable('help_send_statistics', false));
$collect_request = $client->post($collect_url, [], [
'systemdata' => $collector->get_data_for_form(),
]);
if ($config['help_send_statistics'])
{
$client = new \Guzzle\Http\Client(
$this->u_action,
array(
'timeout' => 6,
'connect_timeout' => 6,
)
);
$response = $collect_request->send();
if ($response->isSuccessful())
{
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));
$collect_request = $client->post($collect_url, [], [
'systemdata' => $collector->get_data_for_form(),
]);
$response = $collect_request->send();
if ($response->isSuccessful())
{
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));
}
}
}
$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(),
'U_ACP_MAIN' => append_sid("{$phpbb_admin_path}index.$phpEx"),
));