makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-07 20:08:53 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #6734 from marc1706/ticket/17410

Browse source 
[ticket/17410] Only fall back acp main page when in ACP with test permission
This commit is contained in:
Marc Alexander 2024-10-19 21:06:24 +02:00 • committed by GitHub
commit 5abc36f651
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 52 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
phpBB/includes/functions_module.php
View file

@ -502,8 +502,8 @@ class p_master
$id = $this->p_class . '_' . $id;
}
// Fallback to acp main page for special restore permission mode
if ($user->data['user_perm_from'] && $auth->acl_get('a_switchperm'))
// Fallback to acp main page for special test permission mode
if ($this->p_class === 'acp' && $user->data['user_perm_from'] && $auth->acl_get('a_switchperm'))
{
$id = '';
$mode = '';

51
tests/functional/switch_permissions_test.php
View file

@ -28,7 +28,7 @@ class phpbb_functional_switch_permissions_test extends phpbb_functional_test_cas
$this->add_lang(['common', 'ucp']);
}
public function test_switch_permissions()
public function test_switch_permissions_acp()
{
$user_id = $this->create_user(self::TEST_USER);
@ -67,4 +67,53 @@ class phpbb_functional_switch_permissions_test extends phpbb_functional_test_cas
$crawler->text()
);
}
/**
* @depends test_switch_permissions_acp
*/
public function test_switch_permissions_ucp()
{
$db = $this->get_db();
$sql = 'SELECT user_id
FROM ' . USERS_TABLE . "
WHERE username = '" . self::TEST_USER . "'";
$result = $db->sql_query($sql);
$user_id = $db->sql_fetchfield('user_id');
$db->sql_freeresult($result);
// Open memberlist profile page for user
$crawler = self::request('GET', "memberlist.php?mode=viewprofile&u={$user_id}&sid={$this->sid}");
// Use permissions
$link = $crawler->selectLink($this->lang('USE_PERMISSIONS'))->link();
$crawler = self::$client->click($link);
// Check that we switched permissions to test user
$this->assertStringContainsString(
str_replace('<br />', '<br>', $this->lang('PERMISSIONS_TRANSFERRED', self::TEST_USER)),
$crawler->html()
);
// Check that UCP pages don't get forced to UCP main with restore permission info
$this->add_lang(['memberlist', 'ucp']);
$crawler = self::request('GET', "ucp.php?i=ucp_profile&mode=profile_info&sid={$this->sid}");
$this->assertStringContainsString(
$this->lang('EDIT_PROFILE'),
$crawler->text()
);
// Check that restore permissions link exists
$crawler = self::$client->request('GET', 'index.php?sid=' . $this->sid);
$this->assertStringContainsString(
$this->lang('RESTORE_PERMISSIONS'),
$crawler->text()
);
// Check that restore permissions works
$crawler = self::$client->request('GET', 'ucp.php?mode=restore_perm&sid=' . $this->sid);
$this->assertStringContainsString(
$this->lang('PERMISSIONS_RESTORED'),
$crawler->text()
);
}
}