diff --git a/app/controllers/api/oauth.php b/app/controllers/api/oauth.php index dce5084ec3320a528093e2f9fe2c02f6e627bff5..22caab1bc7fbcbb19544c3acae6004069ebdbf88 100644 --- a/app/controllers/api/oauth.php +++ b/app/controllers/api/oauth.php @@ -66,6 +66,12 @@ class Api_OauthController extends StudipController try { $consumer = RESTAPI\Consumer\Base::detectConsumer('oauth', 'request'); + if (!$consumer) { + $this->response->set_status(400, 'No consumer detected'); + $this->render_nothing(); + return; + } + if (Request::submitted('allow')) { $result = $consumer->grantAccess($GLOBALS['user']->id); diff --git a/app/controllers/smileys.php b/app/controllers/smileys.php index 19dea64ba7ac79139c6cf46b3427a54c24c85d5a..600645dd49fa132ada42c46507771d57eeb1aab0 100644 --- a/app/controllers/smileys.php +++ b/app/controllers/smileys.php @@ -30,7 +30,7 @@ class SmileysController extends AuthenticatedController PageLayout::setTitle(_('Smiley-Ãœbersicht')); $this->favorites_activated = SmileyFavorites::isEnabled() - && $GLOBALS['user']->id != nobody; + && $GLOBALS['user']->id != 'nobody'; if ($this->favorites_activated) { $this->favorites = new SmileyFavorites($GLOBALS['user']->id); diff --git a/public/jsonapi.php b/public/jsonapi.php index 4b3237082a3dfbab1c4af9659da3c9717f363b1f..1dfd51bdb450ad2521ad128383aa0aac311e48db 100644 --- a/public/jsonapi.php +++ b/public/jsonapi.php @@ -35,7 +35,7 @@ $app = AppFactory::create(); $container->set(\Slim\App::class, $app); // Set the base path -$app->setBasePath('/jsonapi.php'); +$app->setBasePath($GLOBALS['CANONICAL_RELATIVE_PATH_STUDIP'] . 'jsonapi.php'); // Register middleware $middleware = require 'lib/classes/JsonApi/middleware.php';