From 3147efd1b9ad00909e075982d89e793fa6477423 Mon Sep 17 00:00:00 2001 From: Mark Friedrich Date: Tue, 20 Mar 2018 01:05:00 +0100 Subject: [PATCH] - fixed a bug where admin permissions were not set correctly, closed #589, closed #591 --- app/main/controller/controller.php | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/app/main/controller/controller.php b/app/main/controller/controller.php index 37f481ea..42687aa2 100644 --- a/app/main/controller/controller.php +++ b/app/main/controller/controller.php @@ -184,6 +184,7 @@ class Controller { * set/update logged in cookie by character model * -> store validation data in DB * @param Model\CharacterModel $character + * @throws \Exception * @throws \Exception\PathfinderException */ protected function setLoginCookie(Model\CharacterModel $character){ @@ -716,11 +717,11 @@ class Controller { * @return array */ static function getScopesByAuthType($authType = ''){ - $scopes = (array)self::getEnvironmentData('CCP_ESI_SCOPES'); + $scopes = array_filter((array)self::getEnvironmentData('CCP_ESI_SCOPES')); switch($authType){ case 'admin': - $scopesAdmin = (array)self::getEnvironmentData('CCP_ESI_SCOPES_ADMIN'); + $scopesAdmin = array_filter((array)self::getEnvironmentData('CCP_ESI_SCOPES_ADMIN')); $scopes = array_merge($scopes, $scopesAdmin); break; }