diff options
Diffstat (limited to 'include')
| -rw-r--r-- | include/api_zot.php | 7 | ||||
| -rw-r--r-- | include/network.php | 4 |
2 files changed, 6 insertions, 5 deletions
diff --git a/include/api_zot.php b/include/api_zot.php index 1d30a0845..921242152 100644 --- a/include/api_zot.php +++ b/include/api_zot.php @@ -96,9 +96,10 @@ // json_return_and_die(post_activity_item($_REQUEST)); } else { - $mindate = (($_REQUEST['mindate']) ? datetime_convert('UTC','UTC',$_REQUEST['mindate']) : ''); - if(! $mindate) - $mindate = datetime_convert('UTC','UTC', 'now - 14 days'); + if(array_key_exists('dbegin',$_REQUEST)) + $_REQUEST['datequery2'] = $_REQUEST['dbegin']; + if(array_key_exists('dend',$_REQUEST)) + $_REQUEST['datequery'] = $_REQUEST['dend']; $arr = $_REQUEST; $ret = []; diff --git a/include/network.php b/include/network.php index ceba56e06..7e8f823a3 100644 --- a/include/network.php +++ b/include/network.php @@ -1216,7 +1216,7 @@ function webfinger_rfc7033($webbie, $zot = false) { if(strpos($webbie,'@')) { $lhs = substr($webbie,0,strpos($webbie,'@')); $rhs = substr($webbie,strpos($webbie,'@')+1); - $resource = 'acct:' . $webbie; + $resource = urlencode('acct:' . $webbie); } else { $m = parse_url($webbie); @@ -1234,7 +1234,7 @@ function webfinger_rfc7033($webbie, $zot = false) { $counter = 0; $s = z_fetch_url('https://' . $rhs . '/.well-known/webfinger?f=&resource=' . $resource . (($zot) ? '&zot=1' : ''), - false, $counter, [ 'headers' => [ 'Accept: application/jrd+json, */*' ] ]); + false, $counter, [ 'headers' => [ 'Accept: application/jrd+json, application/json, */*' ] ]); if($s['success']) { $j = json_decode($s['body'], true); |