more enotify

[friendica.git] / include / Scrape.php

diff --git a/include/Scrape.php b/include/Scrape.php
index 2af02fff5e06b3040d6eba0d3ebc5b646257b38f..e42d22afc64c9e0a792a90bc8abcd0a6c7a8930d 100644 (file)
--- a/include/Scrape.php
+++ b/include/Scrape.php
@@ -30,8 +30,11 @@ function scrape_dfrn($url) {
                }
        }
 
-
-       $dom = HTML5_Parser::parse($s);
+       try {
+               $dom = HTML5_Parser::parse($s);
+       } catch (DOMException $e) {
+               logger('scrape_dfrn: parse error: ' . $e);
+       }
 
        if(! $dom)
                return $ret;
@@ -132,9 +135,11 @@ function scrape_meta($url) {
                }
        }
 
-
-
-       $dom = HTML5_Parser::parse($s);
+       try {
+               $dom = HTML5_Parser::parse($s);
+       } catch (DOMException $e) {
+               logger('scrape_meta: parse error: ' . $e);
+       }
 
        if(! $dom)
                return $ret;
@@ -177,7 +182,11 @@ function scrape_vcard($url) {
                }
        }
 
-       $dom = HTML5_Parser::parse($s);
+       try {
+               $dom = HTML5_Parser::parse($s);
+       } catch (DOMException $e) {
+               logger('scrape_vcard: parse error: ' . $e);
+       }
 
        if(! $dom)
                return $ret;
@@ -243,7 +252,11 @@ function scrape_feed($url) {
                }
        }
 
-       $dom = HTML5_Parser::parse($s);
+       try {
+               $dom = HTML5_Parser::parse($s);
+       } catch (DOMException $e) {
+               logger('scrape_feed: parse error: ' . $e);
+       }
 
        if(! $dom)
                return $ret;
@@ -356,6 +369,8 @@ function probe_url($url, $mode = PROBE_NORMAL) {
                                        $hcard = unamp($link['@attributes']['href']);
                                if($link['@attributes']['rel'] === 'http://webfinger.net/rel/profile-page')
                                        $profile = unamp($link['@attributes']['href']);
+                               if($link['@attributes']['rel'] === 'http://portablecontacts.net/spec/1.0')
+                                       $poco = unamp($link['@attributes']['href']);
                                if($link['@attributes']['rel'] === 'http://joindiaspora.com/seed_location') {
                                        $diaspora_base = unamp($link['@attributes']['href']);
                                        $diaspora = true;
@@ -533,7 +548,7 @@ function probe_url($url, $mode = PROBE_NORMAL) {
 
                if($twitter || ! $poll)
                        $check_feed = true;
-               if((! isset($vcard)) || (! $profile))
+               if((! isset($vcard)) || (! x($vcard,'fn')) || (! $profile))
                        $check_feed = true;
                if(($at_addr) && (! count($links)))
                        $check_feed = false;
@@ -671,6 +686,7 @@ function probe_url($url, $mode = PROBE_NORMAL) {
        $result['poll'] = $poll;
        $result['request'] = $request;
        $result['confirm'] = $confirm;
+       $result['poco'] = $poco;
        $result['photo'] = $vcard['photo'];
        $result['priority'] = $priority;
        $result['network'] = $network;