Friendica/friendica-github
1
0
Fork 0
mirror of https://github.com/friendica/friendica synced 2025-04-25 01:10:12 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #13336 from annando/moderator

Browse source 
Preparations for a moderator role
This commit is contained in:
Hypolite Petovan 2023-08-10 23:17:43 +02:00 • committed by GitHub
commit 1d556b78c1
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
6 changed files with 245 additions and 208 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/Module/BaseModeration.php
View file

@ -82,12 +82,12 @@ abstract class BaseModeration extends BaseModule
}
}
if (!$this->app->isSiteAdmin()) {
throw new HTTPException\ForbiddenException($this->t('You don\'t have access to administration pages.'));
if (!$this->session->isModerator()) {
throw new HTTPException\ForbiddenException($this->t('You don\'t have access to moderation pages.'));
}
if ($this->session->getSubManagedUserId()) {
throw new HTTPException\ForbiddenException($this->t('Submanaged account can\'t access the administration pages. Please log back in as the main account.'));
throw new HTTPException\ForbiddenException($this->t('Submanaged account can\'t access the moderation pages. Please log back in as the main account.'));
}
}

2
src/Module/Notifications/Ping.php
View file

@ -175,7 +175,7 @@ class Ping extends BaseModule
$myurl = $this->session->getMyUrl();
$mail_count = $this->database->count('mail', ["`uid` = ? AND NOT `seen` AND `from-url` != ?", $this->session->getLocalUserId(), $myurl]);
if (intval($this->config->get('config', 'register_policy')) === Register::APPROVE && $this->app->isSiteAdmin()) {
if (intval($this->config->get('config', 'register_policy')) === Register::APPROVE && $this->session->isSiteAdmin()) {
$registrations = \Friendica\Model\Register::getPending();
$register_count = count($registrations);
}