Merge remote-tracking branch 'upstream/master' into social-master

[quix0rs-gnu-social.git] / plugins / Linkback / LinkbackPlugin.php

diff --git a/plugins/Linkback/LinkbackPlugin.php b/plugins/Linkback/LinkbackPlugin.php
index 0ab76f1d53512ee9688bdce5407a3d65225155fb..3a7de0d04558336f4166bc99211918d403e362a0 100644 (file)
--- a/plugins/Linkback/LinkbackPlugin.php
+++ b/plugins/Linkback/LinkbackPlugin.php
@@ -140,14 +140,17 @@ class LinkbackPlugin extends Plugin
 
     // Based on https://github.com/indieweb/mention-client-php
     // which is licensed Apache 2.0
-    function getWebmention($result) {
-        // XXX: the fetcher only gives back one of each header, so this may fail on multiple Link headers
-        if(preg_match('~<((?:https?://)?[^>]+)>; rel="webmention"~', $result->headers['Link'], $match)) {
-            return $match[1];
-        } elseif(preg_match('~<((?:https?://)?[^>]+)>; rel="http://webmention.org/?"~', $result->headers['Link'], $match)) {
-            return $match[1];
+    function getWebmention(Auth_Yadis_HTTPFetcher $result) {
+        if (isset($result->headers['Link'])) {
+            // XXX: the fetcher only gives back one of each header, so this may fail on multiple Link headers
+            if(preg_match('~<((?:https?://)?[^>]+)>; rel="webmention"~', $result->headers['Link'], $match)) {
+                return $match[1];
+            } elseif(preg_match('~<((?:https?://)?[^>]+)>; rel="http://webmention.org/?"~', $result->headers['Link'], $match)) {
+                return $match[1];
+            }
         }
 
+        // FIXME: Do proper DOM traversal
         if(preg_match('/<(?:link|a)[ ]+href="([^"]+)"[ ]+rel="[^" ]* ?webmention ?[^" ]*"[ ]*\/?>/i', $result->body, $match)
            || preg_match('/<(?:link|a)[ ]+rel="[^" ]* ?webmention ?[^" ]*"[ ]+href="([^"]+)"[ ]*\/?>/i', $result->body, $match)) {
             return $match[1];
@@ -185,7 +188,7 @@ class LinkbackPlugin extends Plugin
         }
     }
 
-    function getPingback($result) {
+    function getPingback(Auth_Yadis_HTTPFetcher $result) {
         if (array_key_exists('X-Pingback', $result->headers)) {
             return $result->headers['X-Pingback'];
         } else if(preg_match('/<(?:link|a)[ ]+href="([^"]+)"[ ]+rel="[^" ]* ?pingback ?[^" ]*"[ ]*\/?>/i', $result->body, $match)
@@ -230,7 +233,7 @@ class LinkbackPlugin extends Plugin
     // Largely cadged from trackback_cls.php by
     // Ran Aroussi <ran@blogish.org>, GPL2 or any later version
     // http://phptrackback.sourceforge.net/
-    function getTrackback($result)
+    function getTrackback(Auth_Yadis_HTTPFetcher $result)
     {
         $text = $result->body;
         $url = $result->final_url;
@@ -346,7 +349,7 @@ class LinkbackPlugin extends Plugin
         return true;
     }
 
-    function onEndAccountSettingsNav($action)
+    function onEndAccountSettingsNav(Action $action)
     {
         $action_name = $action->trimmed('action');