Logger::log('args: ' . print_r($_REQUEST, true), Logger::DATA);
- $addr = ((x($_REQUEST, 'addr')) ? $_REQUEST['addr'] : '');
- $dest = ((x($_REQUEST, 'dest')) ? $_REQUEST['dest'] : '');
- $test = ((x($_REQUEST, 'test')) ? intval($_REQUEST['test']) : 0);
- $owa = ((x($_REQUEST, 'owa')) ? intval($_REQUEST['owa']) : 0);
+ $addr = defaults($_REQUEST, 'addr', '');
+ $dest = defaults($_REQUEST, 'dest', '');
+ $test = (!empty($_REQUEST['test']) ? intval($_REQUEST['test']) : 0);
+ $owa = (!empty($_REQUEST['owa']) ? intval($_REQUEST['owa']) : 0);
+ $cid = 0;
- // NOTE: I guess $dest isn't just the profile url (could be also
- // other profile pages e.g. photo). We need to find a solution
- // to be able to redirct to other pages than the contact profile.
- $cid = Contact::getIdForURL($dest);
-
- if (!$cid && !empty($addr)) {
+ if (!empty($addr)) {
$cid = Contact::getIdForURL($addr);
+ } elseif (!empty($dest)) {
+ $cid = Contact::getIdForURL($dest);
}
if (!$cid) {
- Logger::log('No contact record found: ' . print_r($_REQUEST, true), Logger::DEBUG);
+ Logger::info('No contact record found', $_REQUEST);
// @TODO Finding a more elegant possibility to redirect to either internal or external URL
$a->redirect($dest);
}
$basepath = $exp[0];
$headers = [];
- $headers['Accept'] = 'application/x-dfrn+json';
+ $headers['Accept'] = 'application/x-dfrn+json, application/x-zot+json';
$headers['X-Open-Web-Auth'] = Strings::getRandomHex();
// Create a header that is signed with the local users private key.
);
// Try to get an authentication token from the other instance.
- $curlResult = Network::curl($basepath . '/owa', false, $redirects, ['headers' => $headers]);
+ $curlResult = Network::curl($basepath . '/owa', false, ['headers' => $headers]);
if ($curlResult->isSuccess()) {
$j = json_decode($curlResult->getBody(), true);
$x = strpbrk($dest, '?&');
$args = (($x) ? '&owt=' . $token : '?f=&owt=' . $token);
+ Logger::info('Redirecting', ['path' => $dest . $args]);
System::externalRedirect($dest . $args);
}
}