GNUsocial
/
gnu-social
4
0
Fork 1
Code Issues Releases Wiki Activity

OStatus: use 'profile' consistently as param on ostatussub and ostatusinit to help us stay sane.

This commit is contained in:
Brion Vibber 2010-02-22 10:03:34 -08:00
parent c88507fe11
commit 2b16532ffb
2 changed files with 17 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
plugins/OStatus/actions/ostatusinit.php
View File

@ -29,7 +29,7 @@ class OStatusInitAction extends Action
{ {
var $nickname; var $nickname;
var $acct; var $profile;
var $err; var $err;
function prepare($args) function prepare($args)
@ -41,8 +41,11 @@ class OStatusInitAction extends Action
return false; return false;
} }
$this->nickname = $this->trimmed('nickname'); // Local user the remote wants to subscribe to
$this->acct = $this->trimmed('acct'); $this->nickname = $this->trimmed('nickname');
// Webfinger or profile URL of the remote user
$this->profile = $this->trimmed('profile');
return true; return true;
} }
@ -100,7 +103,7 @@ class OStatusInitAction extends Action
_m('Nickname of the user you want to follow')); _m('Nickname of the user you want to follow'));
$this->elementEnd('li'); $this->elementEnd('li');
$this->elementStart('li', array('id' => 'ostatus_profile')); $this->elementStart('li', array('id' => 'ostatus_profile'));
$this->input('acct', _m('Profile Account'), $this->acct, $this->input('profile', _m('Profile Account'), $this->profile,
_m('Your account id (i.e. user@identi.ca)')); _m('Your account id (i.e. user@identi.ca)'));
$this->elementEnd('li'); $this->elementEnd('li');
$this->elementEnd('ul'); $this->elementEnd('ul');
@ -112,15 +115,17 @@ class OStatusInitAction extends Action
function ostatusConnect() function ostatusConnect()
{ {
$opts = array('allowed_schemes' => array('http', 'https', 'acct')); $opts = array('allowed_schemes' => array('http', 'https', 'acct'));
if (Validate::uri($this->acct, $opts)) { if (Validate::uri($this->profile, $opts)) {
$bits = parse_url($this->acct); $bits = parse_url($this->profile);
if ($bits['scheme'] == 'acct') { if ($bits['scheme'] == 'acct') {
$this->connectWebfinger($bits['path']); $this->connectWebfinger($bits['path']);
} else { } else {
$this->connectProfile($this->acct); $this->connectProfile($this->profile);
} }
} elseif (strpos($this->acct, '@') !== false) { } elseif (strpos($this->profile, '@') !== false) {
$this->connectWebfinger($this->acct); $this->connectWebfinger($this->profile);
} else {
$this->clientError(_m("Must provide a remote profile."));
} }
} }
@ -140,12 +145,12 @@ class OStatusInitAction extends Action
$target_profile = common_local_url('userbyid', array('id' => $user->id)); $target_profile = common_local_url('userbyid', array('id' => $user->id));
$url = $w->applyTemplate($link['template'], $target_profile); $url = $w->applyTemplate($link['template'], $target_profile);
common_log(LOG_INFO, "Sending remote subscriber $acct to $url");
common_redirect($url, 303); common_redirect($url, 303);
} }
} }
$this->clientError(_m("Couldn't confirm remote profile address."));
} }
function connectProfile($subscriber_profile) function connectProfile($subscriber_profile)
@ -157,6 +162,7 @@ class OStatusInitAction extends Action
$suburl = preg_replace('!^(.*)/(.*?)$!', '$1/main/ostatussub', $subscriber_profile); $suburl = preg_replace('!^(.*)/(.*?)$!', '$1/main/ostatussub', $subscriber_profile);
$suburl .= '?profile=' . urlencode($target_profile); $suburl .= '?profile=' . urlencode($target_profile);
common_log(LOG_INFO, "Sending remote subscriber $subscriber_profile to $suburl");
common_redirect($suburl, 303); common_redirect($suburl, 303);
} }

1
plugins/OStatus/js/ostatus.js
View File

@ -40,7 +40,6 @@ SN.U.DialogBox = {
return false; return false;
}); });
form.find('#acct').focus();
form.find('#profile').focus(); form.find('#profile').focus();
} }