GNUsocial
/
gnu-social
4
0
Fork 1
Code Issues Releases Wiki Activity

Network wide public feed auth check fix

This commit is contained in:
Mikael Nordfeldth 2015-01-29 23:30:13 +01:00
parent 4c14794cae
commit 95751331de
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
actions/apitimelinenetworkpublic.php
View File

@ -11,6 +11,9 @@ class ApiTimelineNetworkPublicAction extends ApiTimelinePublicAction
protected function getStream() protected function getStream()
{ {
if (!$this->scoped instanceof Profile && common_config('public', 'localonly')) {
$this->clientError(_('Network wide public feed is not permitted without authorization'), 403);
}
return new NetworkPublicNoticeStream($this->scoped); return new NetworkPublicNoticeStream($this->scoped);
} }
} }

2
actions/networkpublic.php
View File

@ -7,7 +7,7 @@ class NetworkpublicAction extends PublicAction
protected function streamPrepare() protected function streamPrepare()
{ {
if (!$this->scoped instanceof Profile && common_config('public', 'localonly')) { if (!$this->scoped instanceof Profile && common_config('public', 'localonly')) {
$this->serverError(_('Network wide public feed is not permitted without authorization'), 403); $this->clientError(_('Network wide public feed is not permitted without authorization'), 403);
} }
if ($this->scoped instanceof Profile && $this->scoped->isLocal() && $this->scoped->getUser()->streamModeOnly()) { if ($this->scoped instanceof Profile && $this->scoped->isLocal() && $this->scoped->getUser()->streamModeOnly()) {
$this->stream = new NetworkPublicNoticeStream($this->scoped); $this->stream = new NetworkPublicNoticeStream($this->scoped);