diff options
| author | mrjive <mrjive@mrjive.it> | 2018-02-21 12:55:29 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-02-21 12:55:29 +0100 |
| commit | 2d17e1c677cd981858a4080af98edb51bbb5d822 (patch) | |
| tree | 54d5d148d368632158584ba7eec7872170524e00 /Zotlabs/Module/Token.php | |
| parent | d7ecaa8b23a36ea1e9a0f185017930b5552c00b5 (diff) | |
| parent | a829256bc4803731881a51bddd19ee59a5a234ff (diff) | |
| download | volse-hubzilla-2d17e1c677cd981858a4080af98edb51bbb5d822.tar.gz volse-hubzilla-2d17e1c677cd981858a4080af98edb51bbb5d822.tar.bz2 volse-hubzilla-2d17e1c677cd981858a4080af98edb51bbb5d822.zip | |
Merge pull request #15 from redmatrix/dev
Dev
Diffstat (limited to 'Zotlabs/Module/Token.php')
| -rw-r--r-- | Zotlabs/Module/Token.php | 49 |
1 files changed, 23 insertions, 26 deletions
diff --git a/Zotlabs/Module/Token.php b/Zotlabs/Module/Token.php index e0d9d74d7..f7c074233 100644 --- a/Zotlabs/Module/Token.php +++ b/Zotlabs/Module/Token.php @@ -2,39 +2,36 @@ namespace Zotlabs\Module; - -class Token extends \Zotlabs\Web\Controller { +use Zotlabs\Identity\OAuth2Storage; - function get() { +class Token extends \Zotlabs\Web\Controller { + 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; - } + // 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(new OAuth2Storage(\DBA::$dba->db)); + $s->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 +} |