troublesome feed was a 307 redirect. We didn't recognise 307

diff --git a/boot.php b/boot.php
index 7d96eac9f7a819b6805e17bee2f123ddac8cc2eb..104e20f56d5ead4b7f8c54e03ec573776c2ee149 100644 (file)
--- a/boot.php
+++ b/boot.php
@@ -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 1a9c03c8eccb99adc362b0a8a674552e8906b19a..505d2bf99e6dc6c866eafa0ccaade92a2543df14 100644 (file)
--- 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();