X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=plugins%2FOStatus%2Factions%2Fostatusinit.php;h=9832f33c057889b918d4ab931001683f9af46a31;hb=fd8dad39633870d2d71c3829a756e724acb45c2a;hp=4afde2c36e31fc16d8d839e8bc19131bda017b34;hpb=5565216b42fc97d84c9602864b2095e557769717;p=quix0rs-gnu-social.git diff --git a/plugins/OStatus/actions/ostatusinit.php b/plugins/OStatus/actions/ostatusinit.php index 4afde2c36e..9832f33c05 100644 --- a/plugins/OStatus/actions/ostatusinit.php +++ b/plugins/OStatus/actions/ostatusinit.php @@ -22,14 +22,15 @@ * @maintainer James Walker */ -if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); } - +if (!defined('STATUSNET')) { + exit(1); +} class OStatusInitAction extends Action { - var $nickname; - var $acct; + var $group; + var $profile; var $err; function prepare($args) @@ -37,16 +38,21 @@ class OStatusInitAction extends Action parent::prepare($args); if (common_logged_in()) { + // TRANS: Client error. $this->clientError(_m('You can use the local subscription!')); return false; } - $this->nickname = $this->trimmed('nickname'); - $this->acct = $this->trimmed('acct'); + // Local user or group the remote wants to subscribe to + $this->nickname = $this->trimmed('nickname'); + $this->group = $this->trimmed('group'); + + // Webfinger or profile URL of the remote user + $this->profile = $this->trimmed('profile'); return true; } - + function handle($args) { parent::handle($args); @@ -64,7 +70,7 @@ class OStatusInitAction extends Action $this->showForm(); } } - + function showForm($err = null) { $this->err = $err; @@ -73,6 +79,7 @@ class OStatusInitAction extends Action $this->xw->startDocument('1.0', 'UTF-8'); $this->elementStart('html'); $this->elementStart('head'); + // TRANS: Form title. $this->element('title', null, _m('Subscribe to user')); $this->elementEnd('head'); $this->elementStart('body'); @@ -86,25 +93,45 @@ class OStatusInitAction extends Action function showContent() { + if ($this->group) { + // TRANS: Form legend. + $header = sprintf(_m('Join group %s'), $this->group); + // TRANS: Button text. + $submit = _m('BUTTON','Join'); + } else { + // TRANS: Form legend. + $header = sprintf(_m('Subscribe to %s'), $this->nickname); + // TRANS: Button text. + $submit = _m('BUTTON','Subscribe'); + } $this->elementStart('form', array('id' => 'form_ostatus_connect', 'method' => 'post', 'class' => 'form_settings', 'action' => common_local_url('ostatusinit'))); $this->elementStart('fieldset'); - $this->element('legend', null, sprintf(_m('Subscribe to %s'), $this->nickname)); + $this->element('legend', null, $header); $this->hidden('token', common_session_token()); $this->elementStart('ul', 'form_data'); $this->elementStart('li', array('id' => 'ostatus_nickname')); - $this->input('nickname', _m('User nickname'), $this->nickname, - _m('Nickname of the user you want to follow')); + if ($this->group) { + // TRANS: Field label. + $this->input('group', _m('Group nickname'), $this->group, + _m('Nickname of the group you want to join.')); + } else { + // TRANS: Field label. + $this->input('nickname', _m('User nickname'), $this->nickname, + _m('Nickname of the user you want to follow.')); + } $this->elementEnd('li'); $this->elementStart('li', array('id' => 'ostatus_profile')); - $this->input('acct', _m('Profile Account'), $this->acct, - _m('Your account id (i.e. user@identi.ca)')); + // 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).')); $this->elementEnd('li'); $this->elementEnd('ul'); - $this->submit('submit', _m('Subscribe')); + $this->submit('submit', $submit); $this->elementEnd('fieldset'); $this->elementEnd('form'); } @@ -112,57 +139,87 @@ class OStatusInitAction extends Action function ostatusConnect() { $opts = array('allowed_schemes' => array('http', 'https', 'acct')); - if (Validate::uri($this->acct, $opts)) { - $bits = parse_url($this->acct); + if (Validate::uri($this->profile, $opts)) { + $bits = parse_url($this->profile); if ($bits['scheme'] == 'acct') { $this->connectWebfinger($bits['path']); } else { - $this->connectProfile($this->acct); + $this->connectProfile($this->profile); } - } elseif (strpos('@', $this->acct) !== false) { - $this->connectWebfinger($this->acct); + } elseif (strpos($this->profile, '@') !== false) { + $this->connectWebfinger($this->profile); + } else { + // TRANS: Client error. + $this->clientError(_m("Must provide a remote profile.")); } } function connectWebfinger($acct) { - $w = new Webfinger; + $target_profile = $this->targetProfile(); - $result = $w->lookup($acct); + $disco = new Discovery; + $result = $disco->lookup($acct); if (!$result) { + // TRANS: Client error. $this->clientError(_m("Couldn't look up OStatus account profile.")); } + foreach ($result->links as $link) { if ($link['rel'] == 'http://ostatus.org/schema/1.0/subscribe') { // We found a URL - let's redirect! - - $user = User::staticGet('nickname', $this->nickname); - $target_profile = common_local_url('userbyid', array('id' => $user->id)); - - $url = $w->applyTemplate($link['template'], $feed_url); - + $url = Discovery::applyTemplate($link['template'], $target_profile); + 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.")); } function connectProfile($subscriber_profile) { - $user = User::staticGet('nickname', $this->nickname); - $target_profile = common_local_url('userbyid', array('id' => $user->id)); + $target_profile = $this->targetProfile(); // @fixme hack hack! We should look up the remote sub URL from XRDS $suburl = preg_replace('!^(.*)/(.*?)$!', '$1/main/ostatussub', $subscriber_profile); $suburl .= '?profile=' . urlencode($target_profile); + common_log(LOG_INFO, "Sending remote subscriber $subscriber_profile to $suburl"); common_redirect($suburl, 303); } + /** + * Build the canonical profile URI+URL of the requested user or group + */ + function targetProfile() + { + if ($this->nickname) { + $user = User::staticGet('nickname', $this->nickname); + if ($user) { + return common_local_url('userbyid', array('id' => $user->id)); + } else { + // TRANS: Client error. + $this->clientError("No such user."); + } + } else if ($this->group) { + $group = Local_group::staticGet('nickname', $this->group); + if ($group) { + return common_local_url('groupbyid', array('id' => $group->group_id)); + } else { + // TRANS: Client error. + $this->clientError("No such group."); + } + } else { + // TRANS: Client error. + $this->clientError("No local user or group nickname provided."); + } + } + function title() { - return _m('OStatus Connect'); + // TRANS: Page title. + return _m('OStatus Connect'); } - }