$a = get_app();
$ret = array();
- $s = fetch_url($url);
+ $cookiejar = tempnam(get_temppath(), 'cookiejar-scrape-feed-');
+ $s = fetch_url($url, false, $redirects, 0, Null, $cookiejar);
+ unlink($cookiejar);
$headers = $a->get_curl_headers();
$code = $a->get_curl_code();
}
}
+ // Scrape the public key from the hcard.
+ // Diaspora will remove it from the webfinger somewhere in the future.
+ if (($hcard != "") AND ($pubkey == "")) {
+ $ret = scrape_dfrn(($hcard) ? $hcard : $dfrn, true);
+ if (isset($ret["key"])) {
+ $hcard_key = $ret["key"];
+ if(strstr($hcard_key,'RSA '))
+ $pubkey = rsatopem($hcard_key);
+ else
+ $pubkey = $hcard_key;
+ }
+ }
if($diaspora && $diaspora_base && $diaspora_guid) {
- if($mode == PROBE_DIASPORA || ! $notify) {
- $notify = $diaspora_base . 'receive/users/' . $diaspora_guid;
+ $diaspora_notify = $diaspora_base.'receive/users/'.$diaspora_guid;
+
+ if($mode == PROBE_DIASPORA || ! $notify || ($notify == $diaspora_notify)) {
+ $notify = $diaspora_notify;
$batch = $diaspora_base . 'receive/public' ;
}
if(strpos($url,'@'))
if ($connectornetworks)
$check_feed = false;
+
if($check_feed) {
+
$feedret = scrape_feed(($poll) ? $poll : $url);
logger('probe_url: scrape_feed ' . (($poll)? $poll : $url) . ' returns: ' . print_r($feedret,true), LOGGER_DATA);
$vcard['photo'] = $feedret['photo'];
require_once('library/simplepie/simplepie.inc');
$feed = new SimplePie();
- $xml = fetch_url($poll);
+ $cookiejar = tempnam(get_temppath(), 'cookiejar-scrape-feed-');
+ $xml = fetch_url($poll, false, $redirects, 0, Null, $cookiejar);
+ unlink($cookiejar);
logger('probe_url: fetch feed: ' . $poll . ' returns: ' . $xml, LOGGER_DATA);
$a = get_app();
if (isset($noscrapedata["dfrn-poll"]))
$poll = $noscrapedata["dfrn-poll"];
-// print_r($noscrapedata);
}
}