Fixed regression in OStatus sub from WebFinger/XML_XRD update

[quix0rs-gnu-social.git] / plugins / OStatus / actions / ostatusinit.php

diff --git a/plugins/OStatus/actions/ostatusinit.php b/plugins/OStatus/actions/ostatusinit.php
index 1c862aa9974351f3269f368ca4e08ee2bed7dbcd..b31320b44483a12660ef535b301122f121b84ace 100644 (file)
--- a/plugins/OStatus/actions/ostatusinit.php
+++ b/plugins/OStatus/actions/ostatusinit.php
@@ -80,9 +80,7 @@ class OStatusInitAction extends Action
     {
         $this->err = $err;
         if ($this->boolean('ajax')) {
-            header('Content-Type: text/xml;charset=utf-8');
-            $this->xw->startDocument('1.0', 'UTF-8');
-            $this->elementStart('html');
+            $this->startHTML('text/xml;charset=utf-8');
             $this->elementStart('head');
             // TRANS: Form title.
             $this->element('title', null, _m('TITLE','Subscribe to user'));
@@ -90,7 +88,7 @@ class OStatusInitAction extends Action
             $this->elementStart('body');
             $this->showContent();
             $this->elementEnd('body');
-            $this->elementEnd('html');
+            $this->endHTML();
         } else {
             $this->showPage();
         }
@@ -177,20 +175,18 @@ class OStatusInitAction extends Action
         $target_profile = $this->targetProfile();
 
         $disco = new Discovery;
-        $result = $disco->lookup($acct);
-        if (!$result) {
-            // TRANS: Client error.
-            $this->clientError(_m('Could not look up OStatus account profile.'));
-        }
+        $xrd = $disco->lookup($acct);
 
-        foreach ($result->links as $link) {
-            if ($link['rel'] == 'http://ostatus.org/schema/1.0/subscribe') {
-                // We found a URL - let's redirect!
-                $url = Discovery::applyTemplate($link['template'], $target_profile);
-                common_log(LOG_INFO, "Sending remote subscriber $acct to $url");
-                common_redirect($url, 303);
+        $link = $xrd->get('http://ostatus.org/schema/1.0/subscribe');
+        if (!is_null($link)) {
+            // We found a URL - let's redirect!
+            if (!empty($link->template)) {
+                $url = Discovery::applyTemplate($link->template, $target_profile);
+            } else {
+                $url = $link->href;
             }
-
+            common_log(LOG_INFO, "Sending remote subscriber $acct to $url");
+            common_redirect($url, 303);
         }
         // TRANS: Client error.
         $this->clientError(_m('Could not confirm remote profile address.'));
@@ -214,7 +210,7 @@ class OStatusInitAction extends Action
     function targetProfile()
     {
         if ($this->nickname) {
-            $user = User::staticGet('nickname', $this->nickname);
+            $user = User::getKV('nickname', $this->nickname);
             if ($user) {
                 return common_local_url('userbyid', array('id' => $user->id));
             } else {
@@ -222,7 +218,7 @@ class OStatusInitAction extends Action
                 $this->clientError(_m('No such user.'));
             }
         } else if ($this->group) {
-            $group = Local_group::staticGet('nickname', $this->group);
+            $group = Local_group::getKV('nickname', $this->group);
             if ($group) {
                 return common_local_url('groupbyid', array('id' => $group->group_id));
             } else {
@@ -230,7 +226,7 @@ class OStatusInitAction extends Action
                 $this->clientError(_m('No such group.'));
             }
         } else if ($this->peopletag && $this->tagger) {
-            $user = User::staticGet('nickname', $this->tagger);
+            $user = User::getKV('nickname', $this->tagger);
             if (empty($user)) {
                 // TRANS: Client error.
                 $this->clientError(_m('No such user.'));