Friendica/friendica-github
1
0
Fork 0
mirror of https://github.com/friendica/friendica synced 2025-02-22 21:58:14 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'develop' into new-addonproxy

Browse source
This commit is contained in:
Art4 2025-02-04 15:20:01 +00:00
commit a006aba9d4
3 changed files with 10 additions and 6 deletions
Show stats 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 private function processGetActions(): void
{ {
$action = (string)$this->parameters['action'] ?? ''; $action = (string) ($this->parameters['action'] ?? '');
$uid = (int)$this->parameters['uid'] ?? 0; $uid = (int) ($this->parameters['uid'] ?? 0);
if ($uid === 0) { if ($uid === 0) {
return; return;
@ -150,6 +150,7 @@ class Active extends BaseUsers
} }
$this->baseUrl->redirect('moderation/users/active'); $this->baseUrl->redirect('moderation/users/active');
// no break
case 'block': case 'block':
self::checkFormSecurityTokenRedirectOnError('moderation/users/active', 'moderation_users_active', 't'); self::checkFormSecurityTokenRedirectOnError('moderation/users/active', 'moderation_users_active', 't');
User::block($uid); User::block($uid);

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

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