Merge pull request #2151 from annando/1512-misconfigured-friendica

Workaround for misconfigured Friendica servers with probe_url

diff --git a/include/Scrape.php b/include/Scrape.php
index af90a07506af141ef34fbad327c7c68aad439298..6ee3dabfca88c11c42576e2a5c75c5194a96283e 100644 (file)
--- a/include/Scrape.php
+++ b/include/Scrape.php
@@ -726,6 +726,45 @@ function probe_url($url, $mode = PROBE_NORMAL, $level = 1) {
                                }
                        }
 
+                       // Workaround for misconfigured Friendica servers
+                       if (($network == "") AND (strstr($url, "/profile/"))) {
+                               $noscrape = str_replace("/profile/", "/noscrape/", $url);
+                               $noscrapejson = fetch_url($noscrape);
+                               if ($noscrapejson) {
+
+                                       $network = NETWORK_DFRN;
+
+                                       $poco = str_replace("/profile/", "/poco/", $url);
+
+                                       $noscrapedata = json_decode($noscrapejson, true);
+
+                                       if (isset($noscrapedata["addr"]))
+                                               $addr = $noscrapedata["addr"];
+
+                                       if (isset($noscrapedata["fn"]))
+                                               $vcard["fn"] = $noscrapedata["fn"];
+
+                                       if (isset($noscrapedata["key"]))
+                                               $pubkey = $noscrapedata["key"];
+
+                                       if (isset($noscrapedata["photo"]))
+                                               $vcard["photo"] = $noscrapedata["photo"];
+
+                                       if (isset($noscrapedata["dfrn-request"]))
+                                               $request = $noscrapedata["dfrn-request"];
+
+                                       if (isset($noscrapedata["dfrn-confirm"]))
+                                               $confirm = $noscrapedata["dfrn-confirm"];
+
+                                       if (isset($noscrapedata["dfrn-notify"]))
+                                               $notify = $noscrapedata["dfrn-notify"];
+
+                                       if (isset($noscrapedata["dfrn-poll"]))
+                                               $poll = $noscrapedata["dfrn-poll"];
+
+                               }
+                       }
+
                        if((! $vcard['photo']) && strlen($email))
                                $vcard['photo'] = avatar_img($email);
                        if($poll === $profile)

diff --git a/mod/noscrape.php b/mod/noscrape.php
index 34d5254fc0efe24eac3f31b25ffcbd324116762c..51bd7234cf283a6b63e1d55d5af7e814ec6a589d 100644 (file)
--- a/mod/noscrape.php
+++ b/mod/noscrape.php
@@ -24,6 +24,7 @@ function noscrape_init(&$a) {
 
        $json_info = array(
                'fn' => $a->profile['name'],
+               'addr' => $a->profile['addr'],
                'key' => $a->profile['pubkey'],
                'homepage' => $a->get_baseurl()."/profile/{$which}",
                'comm' => (x($a->profile,'page-flags')) && ($a->profile['page-flags'] == PAGE_COMMUNITY),