X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=plugins%2FOStatus%2Factions%2Fostatusinit.php;h=4edaafaa4eb97f3003d25febd17746fa0fb074a3;hb=be62f44ef4c61565c369f10a5e1dee022645aa49;hp=9832f33c057889b918d4ab931001683f9af46a31;hpb=8eb66467165e107d0c80c64f6c429fed1d1101d5;p=quix0rs-gnu-social.git diff --git a/plugins/OStatus/actions/ostatusinit.php b/plugins/OStatus/actions/ostatusinit.php index 9832f33c05..4edaafaa4e 100644 --- a/plugins/OStatus/actions/ostatusinit.php +++ b/plugins/OStatus/actions/ostatusinit.php @@ -29,22 +29,25 @@ if (!defined('STATUSNET')) { class OStatusInitAction extends Action { var $nickname; + var $tagger; + var $peopletag; var $group; 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 $this->nickname = $this->trimmed('nickname'); + $this->tagger = $this->trimmed('tagger'); + $this->peopletag = $this->trimmed('peopletag'); $this->group = $this->trimmed('group'); // Webfinger or profile URL of the remote user @@ -53,14 +56,15 @@ class OStatusInitAction extends Action 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. */ $token = $this->trimmed('token'); if (!$token || $token != common_session_token()) { + // TRANS: Client error displayed when the session token does not match or is not given. $this->showForm(_m('There was a problem with your session token. '. 'Try again, please.')); return; @@ -75,17 +79,15 @@ 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('Subscribe to user')); + $this->element('title', null, _m('TITLE','Subscribe to user')); $this->elementEnd('head'); $this->elementStart('body'); $this->showContent(); $this->elementEnd('body'); - $this->elementEnd('html'); + $this->endHTML(); } else { $this->showPage(); } @@ -93,15 +95,22 @@ class OStatusInitAction extends Action function showContent() { + if ($this->group) { - // TRANS: Form legend. + // TRANS: Form legend. %s is a group name. $header = sprintf(_m('Join group %s'), $this->group); - // TRANS: Button text. + // 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 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: Button text. } else { - // TRANS: Form legend. + // TRANS: Form legend. %s is a nickname. $header = sprintf(_m('Subscribe to %s'), $this->nickname); - // TRANS: Button text. + // TRANS: Button text to subscribe to a profile. $submit = _m('BUTTON','Subscribe'); } $this->elementStart('form', array('id' => 'form_ostatus_connect', @@ -114,21 +123,27 @@ class OStatusInitAction extends Action $this->elementStart('ul', 'form_data'); $this->elementStart('li', array('id' => 'ostatus_nickname')); + if ($this->group) { // TRANS: Field label. $this->input('group', _m('Group nickname'), $this->group, + // TRANS: Field title. _m('Nickname of the group you want to join.')); } else { // TRANS: Field label. $this->input('nickname', _m('User nickname'), $this->nickname, + // TRANS: Field title. _m('Nickname of the user you want to follow.')); + $this->hidden('tagger', $this->tagger); + $this->hidden('peopletag', $this->peopletag); } + $this->elementEnd('li'); $this->elementStart('li', array('id' => 'ostatus_profile')); // 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); @@ -150,7 +165,7 @@ class OStatusInitAction extends Action $this->connectWebfinger($this->profile); } else { // TRANS: Client error. - $this->clientError(_m("Must provide a remote profile.")); + $this->clientError(_m('Must provide a remote profile.')); } } @@ -159,23 +174,21 @@ class OStatusInitAction extends Action $target_profile = $this->targetProfile(); $disco = new Discovery; - $result = $disco->lookup($acct); - if (!$result) { - // TRANS: Client error. - $this->clientError(_m("Couldn't 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("Couldn't confirm remote profile address.")); + $this->clientError(_m('Could not confirm remote profile address.')); } function connectProfile($subscriber_profile) @@ -196,24 +209,38 @@ 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 { // TRANS: Client error. - $this->clientError("No such user."); + $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 { // TRANS: Client error. - $this->clientError("No such group."); + $this->clientError(_m('No such group.')); + } + } else if ($this->peopletag && $this->tagger) { + $user = User::getKV('nickname', $this->tagger); + if (empty($user)) { + // TRANS: Client error. + $this->clientError(_m('No such user.')); } + + $peopletag = Profile_list::getByTaggerAndTag($user->id, $this->peopletag); + if ($peopletag) { + return common_local_url('profiletagbyid', + array('tagger_id' => $user->id, 'id' => $peopletag->id)); + } + // TRANS: Client error. + $this->clientError(_m('No such list.')); } else { // TRANS: Client error. - $this->clientError("No local user or group nickname provided."); + $this->clientError(_m('No local user or group nickname provided.')); } }