diff options
| author | Mario Vavti <mario@mariovavti.com> | 2018-02-16 20:47:20 +0100 |
|---|---|---|
| committer | Mario Vavti <mario@mariovavti.com> | 2018-02-16 20:47:20 +0100 |
| commit | 547ef772ab1bcdf9cff1ad6d0593f3d27bb33d73 (patch) | |
| tree | 9ecf84264e631939c7d7c342b045b7e17a3f6610 /Zotlabs/Module/Token.php | |
| parent | 2216c3dd32e3e1cb552d50df220b44d75f3950ef (diff) | |
| parent | 27cd26ec1e26b6c389a623395687af5052f0b5a1 (diff) | |
| download | volse-hubzilla-547ef772ab1bcdf9cff1ad6d0593f3d27bb33d73.tar.gz volse-hubzilla-547ef772ab1bcdf9cff1ad6d0593f3d27bb33d73.tar.bz2 volse-hubzilla-547ef772ab1bcdf9cff1ad6d0593f3d27bb33d73.zip | |
Merge remote-tracking branch 'mike/master' into dev
Diffstat (limited to 'Zotlabs/Module/Token.php')
| -rw-r--r-- | Zotlabs/Module/Token.php | 46 |
1 files changed, 21 insertions, 25 deletions
diff --git a/Zotlabs/Module/Token.php b/Zotlabs/Module/Token.php index e0d9d74d7..5cde58895 100644 --- a/Zotlabs/Module/Token.php +++ b/Zotlabs/Module/Token.php @@ -5,36 +5,32 @@ namespace Zotlabs\Module; class Token extends \Zotlabs\Web\Controller { - - function get() { - - - // workaround for HTTP-auth in CGI mode - if (x($_SERVER, 'REDIRECT_REMOTE_USER')) { - $userpass = base64_decode(substr($_SERVER["REDIRECT_REMOTE_USER"], 6)) ; - if(strlen($userpass)) { - list($name, $password) = explode(':', $userpass); - $_SERVER['PHP_AUTH_USER'] = $name; - $_SERVER['PHP_AUTH_PW'] = $password; - } + function init() { + + // workaround for HTTP-auth in CGI mode + if (x($_SERVER, 'REDIRECT_REMOTE_USER')) { + $userpass = base64_decode(substr($_SERVER["REDIRECT_REMOTE_USER"], 6)) ; + if(strlen($userpass)) { + list($name, $password) = explode(':', $userpass); + $_SERVER['PHP_AUTH_USER'] = $name; + $_SERVER['PHP_AUTH_PW'] = $password; } - - if (x($_SERVER, 'HTTP_AUTHORIZATION')) { - $userpass = base64_decode(substr($_SERVER["HTTP_AUTHORIZATION"], 6)) ; - if(strlen($userpass)) { - list($name, $password) = explode(':', $userpass); - $_SERVER['PHP_AUTH_USER'] = $name; - $_SERVER['PHP_AUTH_PW'] = $password; - } + } + + if (x($_SERVER, 'HTTP_AUTHORIZATION')) { + $userpass = base64_decode(substr($_SERVER["HTTP_AUTHORIZATION"], 6)) ; + if(strlen($userpass)) { + list($name, $password) = explode(':', $userpass); + $_SERVER['PHP_AUTH_USER'] = $name; + $_SERVER['PHP_AUTH_PW'] = $password; } + } + $s = new \Zotlabs\Identity\OAuth2Server(); + $s->server->handleTokenRequest(\OAuth2\Request::createFromGlobals())->send(); - - require_once('include/oauth2.php'); - $oauth2_server->handleTokenRequest(\OAuth2\Request::createFromGlobals())->send(); - - killme(); + killme(); } }
\ No newline at end of file |