var $profile;
var $err;
- function prepare($args)
+ protected function prepare(array $args=array())
{
parent::prepare($args);
if (common_logged_in()) {
// TRANS: Client error.
$this->clientError(_m('You can use the local subscription!'));
- return false;
}
// Local user or group the remote wants to subscribe to
return true;
}
- function handle($args)
+ protected function handle()
{
- parent::handle($args);
+ parent::handle();
if ($_SERVER['REQUEST_METHOD'] == 'POST') {
/* Use a session token for CSRF protection. */
{
$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'));
$this->elementStart('body');
$this->showContent();
$this->elementEnd('body');
- $this->elementEnd('html');
+ $this->endHTML();
} else {
$this->showPage();
}
function showContent()
{
+
if ($this->group) {
// TRANS: Form legend. %s is a group name.
$header = sprintf(_m('Join group %s'), $this->group);
// TRANS: Button text to join a group.
$submit = _m('BUTTON','Join');
} else if ($this->peopletag && $this->tagger) {
- // TRANS: Form legend. %1$s is a list, %2$s is a tagger's name.
+ // TRANS: Form legend. %1$s is a list, %2$s is a lister's name.
$header = sprintf(_m('Subscribe to list %1$s by %2$s'), $this->peopletag, $this->tagger);
// TRANS: Button text to subscribe to a list.
$submit = _m('BUTTON','Subscribe');
// TRANS: Field label.
$this->input('profile', _m('Profile Account'), $this->profile,
// TRANS: Tooltip for field label "Profile Account".
- _m('Your account ID (e.g. user@identi.ca).'));
+ _m('Your account ID (e.g. user@example.com).'));
$this->elementEnd('li');
$this->elementEnd('ul');
$this->submit('submit', $submit);
$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.'));
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 {
$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 {
$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.'));