diff options
| author | Friendika <info@friendika.com> | 2011-05-26 23:10:40 -0700 |
|---|---|---|
| committer | Friendika <info@friendika.com> | 2011-05-26 23:10:40 -0700 |
| commit | ecb300177cf6996170a77880d771f0aa20f2cf11 (patch) | |
| tree | ebf8fd7b06c66c7f45e3908d15347ddda3a75542 | |
| parent | 341f853b042f0f4dcdc5e256c46a25c402d2de2e (diff) | |
| download | volse-hubzilla-ecb300177cf6996170a77880d771f0aa20f2cf11.tar.gz volse-hubzilla-ecb300177cf6996170a77880d771f0aa20f2cf11.tar.bz2 volse-hubzilla-ecb300177cf6996170a77880d771f0aa20f2cf11.zip | |
troublesome feed was a 307 redirect. We didn't recognise 307
| -rw-r--r-- | boot.php | 5 | ||||
| -rw-r--r-- | include/Scrape.php | 7 |
2 files changed, 10 insertions, 2 deletions
@@ -682,7 +682,7 @@ function fetch_url($url,$binary = false, &$redirects = 0) { $s = substr($s,strlen($header)+4); $header = substr($s,0,strpos($s,"\r\n\r\n")); } - if($http_code == 301 || $http_code == 302 || $http_code == 303) { + if($http_code == 301 || $http_code == 302 || $http_code == 303 || $http_code == 307) { $matches = array(); preg_match('/(Location:|URI:)(.*?)\n/', $header, $matches); $url = trim(array_pop($matches)); @@ -2196,12 +2196,13 @@ function smilies($s) { $a = get_app(); return str_replace( - array( '<3', '</3', '<\\3', ':-)', ';-)', ':-(', ':(', ':-P', ':P', ':-"', ':-x', ':-X', ':-D', '8-|', '8-O'), + array( '<3', '</3', '<\\3', ':-)', ':)', ';-)', ':-(', ':(', ':-P', ':P', ':-"', ':-x', ':-X', ':-D', '8-|', '8-O'), array( '<img src="' . $a->get_baseurl() . '/images/smiley-heart.gif" alt="<3" />', '<img src="' . $a->get_baseurl() . '/images/smiley-brokenheart.gif" alt="</3" />', '<img src="' . $a->get_baseurl() . '/images/smiley-brokenheart.gif" alt="<\\3" />', '<img src="' . $a->get_baseurl() . '/images/smiley-smile.gif" alt=":-)" />', + '<img src="' . $a->get_baseurl() . '/images/smiley-smile.gif" alt=":)" />', '<img src="' . $a->get_baseurl() . '/images/smiley-wink.gif" alt=";-)" />', '<img src="' . $a->get_baseurl() . '/images/smiley-frown.gif" alt=":-(" />', '<img src="' . $a->get_baseurl() . '/images/smiley-frown.gif" alt=":(" />', diff --git a/include/Scrape.php b/include/Scrape.php index 1a9c03c8e..505d2bf99 100644 --- a/include/Scrape.php +++ b/include/Scrape.php @@ -446,9 +446,16 @@ function probe_url($url) { $feed = new SimplePie(); $xml = fetch_url($poll); + logger('probe_url: fetch feed: ' . $poll . ' returns: ' . $xml, LOGGER_DATA); + $a = get_app(); + + logger('probe_url: scrape_feed: headers: ' . $a->get_curl_headers(), $LOGGER_DATA); + $feed->set_raw_data($xml); $feed->init(); + if($feed->error()) + logger('probe_url: scrape_feed: Error parsing XML: ' . $feed->error()); if(! x($vcard,'photo')) $vcard['photo'] = $feed->get_image_url(); |