mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-01-18 22:58:10 +01:00
Code Issues Releases Wiki Activity

[ticket/16533] Add autologin keys management UCP module events

Browse Source 
PHPBB3-16533
This commit is contained in:
rxu 2020-06-21 15:11:24 +07:00
parent e7186f41ed
commit 5a33a141af
No known key found for this signature in database
GPG Key ID: 955F0567380E586A
5 changed files with 141 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

56
phpBB/docs/events.md
View File

@ -2730,6 +2730,62 @@ ucp_prefs_view_select_menu_prepend
* Purpose: Add options to the top of the drop-down lists block of the Edit
Display Options screen
ucp_profile_autologin_keys_tbody_key_after
===
* Locations:
+ styles/prosilver/template/ucp_profile_autologin_keys.html
* Since: 3.3.2-RC1
* Purpose: Add table column after the first column.
ucp_profile_autologin_keys_tbody_key_before
===
* Locations:
+ styles/prosilver/template/ucp_profile_autologin_keys.html
* Since: 3.3.2-RC1
* Purpose: Add table column before the first column.
ucp_profile_autologin_keys_tbody_mark_after
===
* Locations:
+ styles/prosilver/template/ucp_profile_autologin_keys.html
* Since: 3.3.2-RC1
* Purpose: Add table column after the last column.
ucp_profile_autologin_keys_tbody_mark_before
===
* Locations:
+ styles/prosilver/template/ucp_profile_autologin_keys.html
* Since: 3.3.2-RC1
* Purpose: Add table column before the last column.
ucp_profile_autologin_keys_thead_key_after
===
* Locations:
+ styles/prosilver/template/ucp_profile_autologin_keys.html
* Since: 3.3.2-RC1
* Purpose: Add table header content after the first column.
ucp_profile_autologin_keys_thead_key_before
===
* Locations:
+ styles/prosilver/template/ucp_profile_autologin_keys.html
* Since: 3.3.2-RC1
* Purpose: Add table header content before the first column.
ucp_profile_autologin_keys_thead_mark_after
===
* Locations:
+ styles/prosilver/template/ucp_profile_autologin_keys.html
* Since: 3.3.2-RC1
* Purpose: Add table header content after the last column.
ucp_profile_autologin_keys_thead_mark_before
===
* Locations:
+ styles/prosilver/template/ucp_profile_autologin_keys.html
* Since: 3.3.2-RC1
* Purpose: Add table header content before the last column.
ucp_profile_profile_info_after
===
* Locations:

47
phpBB/includes/ucp/ucp_profile.php
View File

@ -810,23 +810,50 @@ class ucp_profile
$error = array_map(array($user, 'lang'), $error);
}
$sql = 'SELECT key_id, last_ip, last_login
FROM ' . SESSIONS_KEYS_TABLE . '
WHERE user_id = ' . (int) $user->data['user_id'] . '
ORDER BY last_login ASC';
$sql_ary = [
'SELECT' => 'sk.key_id, sk.last_ip, sk.last_login',
'FROM' => [SESSIONS_KEYS_TABLE => 'sk'],
'WHERE' => 'sk.user_id = ' . (int) $user->data['user_id'],
'ORDER_BY' => 'sk.last_login ASC',
];
$result = $db->sql_query($sql);
/**
* Event allows changing SQL query for autologin keys
*
* @event core.ucp_profile_autologin_keys_sql
* @var array sql_ary Array with autologin keys SQL query
* @since 3.3.2-RC1
*/
$vars = ['sql_ary'];
extract($phpbb_dispatcher->trigger_event('core.ucp_profile_autologin_keys_sql', compact($vars)));
while ($row = $db->sql_fetchrow($result))
$result = $db->sql_query($db->sql_build_query('SELECT', $sql_ary));
$sessions = (array) $db->sql_fetchrowset($result);
$db->sql_freeresult($result);
$template_vars = [];
foreach ($sessions as $row)
{
$template->assign_block_vars('sessions', array(
'KEY' => substr($row['key_id'], 0, 8),
$key = substr($row['key_id'], 0, 8);
$template_vars[$key] = [
'KEY' => $key,
'IP' => $row['last_ip'],
'LOGIN_TIME' => $user->format_date($row['last_login']),
));
];
}
$db->sql_freeresult($result);
/**
* Event allows changing template variables
*
* @event core.ucp_profile_autologin_keys_template_vars
* @var array sessions Array with session keys data
* @var array template_vars Array with template variables
* @since 3.3.2-RC1
*/
$vars = ['sessions', 'template_vars'];
extract($phpbb_dispatcher->trigger_event('core.ucp_profile_autologin_keys_template_vars', compact($vars)));
$template->assign_block_vars_array('sessions', $template_vars);
break;
}

11
phpBB/styles/prosilver/template/ucp_profile_autologin_keys.html
View File

@ -7,25 +7,34 @@
<div class="inner">
<p>{L_PROFILE_AUTOLOGIN_KEYS}</p>
<!-- IF ERROR --><p class="error">{ERROR}</p><!-- ENDIF -->
{% DEFINE COLSPAN = 4 %}
<table class="table1">
<thead>
<tr>
{% EVENT ucp_profile_autologin_keys_thead_key_before %}
<th class="name">{L_LOGIN_KEY}</th>
{% EVENT ucp_profile_autologin_keys_thead_key_after %}
<th class="center">{L_IP}</th>
<th class="center">{L_LOGIN_TIME}</th>
{% EVENT ucp_profile_autologin_keys_thead_mark_before %}
<th class="center mark">{L_MARK}</th>
{% EVENT ucp_profile_autologin_keys_thead_mark_after %}
</tr>
</thead>
<tbody>
<!-- BEGIN sessions -->
<!-- IF sessions.S_ROW_COUNT is even --><tr class="bg1"><!-- ELSE --><tr class="bg2"><!-- ENDIF -->
{% EVENT ucp_profile_autologin_keys_tbody_key_before %}
<td><label for="{sessions.KEY}">{sessions.KEY}</label></td>
{% EVENT ucp_profile_autologin_keys_tbody_key_after %}
<td class="center">{sessions.IP}</td>
<td class="center">{sessions.LOGIN_TIME}</td>
{% EVENT ucp_profile_autologin_keys_tbody_mark_before %}
<td class="center mark"><input type="checkbox" name="keys[]" value="{sessions.KEY}" id="{sessions.KEY}" /></td>
{% EVENT ucp_profile_autologin_keys_tbody_mark_after %}
</tr>
<!-- BEGINELSE -->
<tr><td colspan="4" class="bg1" style="text-align: center">{L_PROFILE_NO_AUTOLOGIN_KEYS}</td></tr>
<tr><td colspan="{{ definition.COLSPAN }}" class="bg1" style="text-align: center">{L_PROFILE_NO_AUTOLOGIN_KEYS}</td></tr>
<!-- END sessions -->
</tbody>
</table>

33
tests/functional/ucp_profile_test.php
View File

@ -44,4 +44,37 @@ class phpbb_functional_ucp_profile_test extends phpbb_functional_test_case
$this->assertEquals('phpbb_twitter', $form->get('pf_phpbb_twitter')->getValue());
$this->assertEquals('phpbb.youtube', $form->get('pf_phpbb_youtube')->getValue());
}
public function test_autologin_keys_manage()
{
$this->add_lang('ucp');
$this->login('admin', true);
$db = $this->get_db();
$crawler = self::request('GET', 'ucp.php?i=ucp_profile&mode=autologin_keys');
$this->assertContainsLang('UCP_PROFILE_AUTOLOGIN_KEYS', $crawler->filter('#cp-main h2')->text());
$profile_url = $crawler->filter('a[title="Profile"]')->attr('href');
$user_id = $this->get_parameter_from_link($profile_url, 'u');
$sql_ary = [
'SELECT' => 'sk.key_id',
'FROM' => [SESSIONS_KEYS_TABLE => 'sk'],
'WHERE' => 'sk.user_id = ' . (int) $user_id,
'ORDER_BY' => 'sk.last_login ASC',
];
$result = $db->sql_query_limit($db->sql_build_query('SELECT', $sql_ary), 1);
$key_id = substr($db->sql_fetchfield('key_id'), 0, 8);
$db->sql_freeresult($result);
$this->assertContains($key_id, $crawler->filter('label[for="' . $key_id . '"]')->text());
$form = $crawler->selectButton('submit')->form();
$form['keys'][0]->tick();
$crawler = self::submit($form);
$this->assertContains($this->lang('AUTOLOGIN_SESSION_KEYS_DELETED'), $crawler->filter('html')->text());
$crawler = self::request('GET', 'ucp.php?i=ucp_profile&mode=autologin_keys');
$this->assertContains($this->lang('PROFILE_NO_AUTOLOGIN_KEYS'), $crawler->filter('tbody > tr > td[class="bg1"]')->text());
}
}

6
tests/test_framework/phpbb_functional_test_case.php
View File

@ -788,7 +788,7 @@ class phpbb_functional_test_case extends phpbb_test_case
return group_user_add($group_id, false, $usernames, $group_name, $default, $leader);
}
protected function login($username = 'admin')
protected function login($username = 'admin', $autologin = false)
{
$this->add_lang('ucp');
@ -796,6 +796,10 @@ class phpbb_functional_test_case extends phpbb_test_case
$this->assertContains($this->lang('LOGIN_EXPLAIN_UCP'), $crawler->filter('html')->text());
$form = $crawler->selectButton($this->lang('LOGIN'))->form();
if ($autologin)
{
$form['autologin']->tick();
}
$crawler = self::submit($form, array('username' => $username, 'password' => $username . $username));
$this->assertNotContains($this->lang('LOGIN'), $crawler->filter('.navbar')->text());