diff options
author | Mario Vavti <mario@mariovavti.com> | 2017-09-08 09:22:36 +0200 |
---|---|---|
committer | Mario Vavti <mario@mariovavti.com> | 2017-09-08 09:22:36 +0200 |
commit | 108bb7649bb61bee65d9923c9080c3af8e715bc4 (patch) | |
tree | 4b96649d85d098de8e723df85b409cb0a43832d1 /Zotlabs/Web/WebServer.php | |
parent | 7b3aa92b5ad09c0820db2b20bc462c975f0d3aba (diff) | |
parent | 1104e2652f15aaa405208b6dec9e439fb8c39537 (diff) | |
download | volse-hubzilla-108bb7649bb61bee65d9923c9080c3af8e715bc4.tar.gz volse-hubzilla-108bb7649bb61bee65d9923c9080c3af8e715bc4.tar.bz2 volse-hubzilla-108bb7649bb61bee65d9923c9080c3af8e715bc4.zip |
Merge remote-tracking branch 'mike/master' into dev
Diffstat (limited to 'Zotlabs/Web/WebServer.php')
-rw-r--r-- | Zotlabs/Web/WebServer.php | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/Zotlabs/Web/WebServer.php b/Zotlabs/Web/WebServer.php index a66384c40..8431a2e0e 100644 --- a/Zotlabs/Web/WebServer.php +++ b/Zotlabs/Web/WebServer.php @@ -70,6 +70,12 @@ class WebServer { } } + if((x($_REQUEST,'owt')) && (! \App::$install)) { + $token = $_REQUEST['owt']; + \App::$query_string = strip_query_param(\App::$query_string,'owt'); + owt_init($token); + } + if((x($_SESSION, 'authenticated')) || (x($_POST, 'auth-params')) || (\App::$module === 'login')) require('include/auth.php'); |