template for input fields now supports required, autofocus and types email, url

[friendica.git] / include / Scrape.php

diff --git a/include/Scrape.php b/include/Scrape.php
index ad9e030a39b83872500b7dc0c029ed65b1051299..629f7a063bf3ba409177495caa21a4cbcca3e582 100644 (file)
--- a/include/Scrape.php
+++ b/include/Scrape.php
@@ -263,11 +263,6 @@ function scrape_feed($url) {
        }
 
        try {
-               // Cleanup invalid HTML
-               $doc = new DOMDocument();
-               @$doc->loadHTML($s);
-                $s = $doc->saveHTML();
-
                $dom = HTML5_Parser::parse($s);
        } catch (DOMException $e) {
                logger('scrape_feed: parse error: ' . $e);
@@ -755,5 +750,14 @@ function probe_url($url, $mode = PROBE_NORMAL) {
 
        logger('probe_url: ' . print_r($result,true), LOGGER_DEBUG);
 
+       // Trying if it maybe a diaspora account
+       if ($result['network'] == NETWORK_FEED) {
+               require_once('include/bbcode.php');
+               $address = GetProfileUsername($url, "", true);
+               $result2 = probe_url($address, $mode);
+               if ($result2['network'] != "")
+                       $result = $result2;
+       }
+
        return $result;
 }