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

Checking user properties for instanceof User

Browse Source
This commit is contained in:
Mikael Nordfeldth 2014-11-10 11:57:53 +01:00
parent 403cb858be
commit e91deb683f
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/apiauthaction.php
View File

@ -296,7 +296,7 @@ class ApiAuthAction extends ApiAction
if (Event::handle('StartSetApiUser', array(&$user))) { if (Event::handle('StartSetApiUser', array(&$user))) {
if (!empty($user)) { if ($user instanceof User) {
if (!$user->hasRight(Right::API)) { if (!$user->hasRight(Right::API)) {
// TRANS: Authorization exception thrown when a user without API access tries to access the API. // TRANS: Authorization exception thrown when a user without API access tries to access the API.
throw new AuthorizationException(_('Not allowed to use API.')); throw new AuthorizationException(_('Not allowed to use API.'));
@ -310,7 +310,7 @@ class ApiAuthAction extends ApiAction
// By default, basic auth users have rw access // By default, basic auth users have rw access
$this->access = self::READ_WRITE; $this->access = self::READ_WRITE;
if (empty($this->auth_user) && ($required || isset($_SERVER['PHP_AUTH_USER']))) { if (!$this->auth_user instanceof User && ($required || isset($_SERVER['PHP_AUTH_USER']))) {
$msg = sprintf( $msg = sprintf(
"basic auth nickname = %s", "basic auth nickname = %s",
$this->auth_user_nickname $this->auth_user_nickname