Merge branch 'master' of github.com:annando/friendica

[friendica.git] / include / Scrape.php

diff --git a/include/Scrape.php b/include/Scrape.php
index 141c90dcfd6a92bbb5246ee78fc61a040ba06a05..ca8f6e83ae3d9f3b0fa0e2508f76374465c6e722 100644 (file)
--- a/include/Scrape.php
+++ b/include/Scrape.php
@@ -282,7 +282,7 @@ function scrape_feed($url) {
                }
        }
        if(! $basename)
-               $basename = substr($url,0,strrpos($url,'/')) . '/';
+               $basename = implode('/', array_slice(explode('/',$url),0,3)) . '/';
 
        $items = $dom->getElementsByTagName('link');
 
@@ -435,10 +435,13 @@ function probe_url($url, $mode = PROBE_NORMAL) {
                                        $password = '';
                                        openssl_private_decrypt(hex2bin($r[0]['pass']),$password,$x[0]['prvkey']);
                                        $mbox = email_connect($mailbox,$r[0]['user'],$password);
+                                       if(! $mbox)
+                                               logger('probe_url: email_connect failed.');
                                        unset($password);
                                }
                                if($mbox) {
                                        $msgs = email_poll($mbox,$orig_url);
+                                       logger('probe_url: searching ' . $orig_url . ', ' . count($msgs) . ' messages found.', LOGGER_DEBUG);
                                        if(count($msgs)) {
                                                $addr = $orig_url;
                                                $network = NETWORK_MAIL;
@@ -593,7 +596,7 @@ function probe_url($url, $mode = PROBE_NORMAL) {
                        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);
+                       logger('probe_url: scrape_feed: headers: ' . $a->get_curl_headers(), LOGGER_DATA);
 
                        $feed->set_raw_data($xml);