Friendica/friendica
Friendica/friendica
1
0
Fork 1
mirror of https://git.friendi.ca/friendica/friendica.git synced 2025-06-07 22:17:17 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #14760 from MrPetovan/bug/warnings

Browse source 
Prioritize coalescing parameters in Moderation\Users\*->processGetActions
This commit is contained in:
Tobias Diekershoff 2025-02-04 14:59:47 +01:00 • committed by GitHub
commit edbf86449d
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 10 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

5
src/Module/Moderation/Users/Active.php
View file

@ -124,8 +124,8 @@ class Active extends BaseUsers
*/
private function processGetActions(): void
{
$action = (string)$this->parameters['action'] ?? '';
$uid = (int)$this->parameters['uid'] ?? 0;
$action = (string) ($this->parameters['action'] ?? '');
$uid = (int) ($this->parameters['uid'] ?? 0);
if ($uid === 0) {
return;
@ -150,6 +150,7 @@ class Active extends BaseUsers
}
$this->baseUrl->redirect('moderation/users/active');
// no break
case 'block':
self::checkFormSecurityTokenRedirectOnError('moderation/users/active', 'moderation_users_active', 't');
User::block($uid);

5
src/Module/Moderation/Users/Blocked.php
View file

@ -123,8 +123,8 @@ class Blocked extends BaseUsers
*/
private function processGetActions(): void
{
$action = (string)$this->parameters['action'] ?? '';
$uid = (int)$this->parameters['uid'] ?? 0;
$action = (string) ($this->parameters['action'] ?? '');
$uid = (int) ($this->parameters['uid'] ?? 0);
if ($uid === 0) {
return;
@ -148,6 +148,7 @@ class Blocked extends BaseUsers
$this->systemMessages->addNotice($this->t('You can\'t remove yourself'));
}
$this->baseUrl->redirect('moderation/users/blocked');
// no break
case 'unblock':
self::checkFormSecurityTokenRedirectOnError('/moderation/users/blocked', 'moderation_users_blocked', 't');
User::block($uid, false);

6
src/Module/Moderation/Users/Index.php
View file

@ -135,8 +135,8 @@ class Index extends BaseUsers
*/
private function processGetActions(): void
{
$action = (string) $this->parameters['action'] ?? '';
$uid = (int) $this->parameters['uid'] ?? 0;
$action = (string) ($this->parameters['action'] ?? '');
$uid = (int) ($this->parameters['uid'] ?? 0);
if ($uid === 0) {
return;
@ -161,11 +161,13 @@ class Index extends BaseUsers
}
$this->baseUrl->redirect('moderation/users');
// no break
case 'block':
self::checkFormSecurityTokenRedirectOnError('moderation/users', 'moderation_users', 't');
User::block($uid);
$this->systemMessages->addNotice($this->t('User "%s" blocked', $user['username']));
$this->baseUrl->redirect('moderation/users');
// no break
case 'unblock':
self::checkFormSecurityTokenRedirectOnError('moderation/users', 'moderation_users', 't');
User::block($uid, false);