eliseuamaro/gnu-social
1
0
Fork 0
forked from GNUsocial/gnu-social
Code Issues Pull Requests Releases Wiki Activity

Remote Profile Action from ModPlus now more generic

Browse Source
This commit is contained in:
Mikael Nordfeldth
2013-10-08 21:08:02 +02:00
parent fcf47f315b
commit 390556d932
4 changed files with 67 additions and 105 deletions
Download Patch File Download Diff File Expand all files Collapse all files

55
plugins/ModPlus/actions/remoteprofile.php
View File

@@ -6,53 +6,10 @@
class RemoteProfileAction extends ShowstreamAction
{
function prepare($args)
{
Action::prepare($args); // skip the ProfileAction code and replace it...
$id = $this->arg('id');
$this->user = false;
$this->profile = Profile::getKV('id', $id);
if (!$this->profile) {
// TRANS: Error message displayed when referring to a user without a profile.
$this->serverError(_m('User has no profile.'));
return false;
}
$user = User::getKV('id', $this->profile->id);
if ($user) {
// This is a local user -- send to their regular profile.
$url = common_local_url('showstream', array('nickname' => $user->nickname));
common_redirect($url);
return false;
}
$this->tag = $this->trimmed('tag');
$this->page = ($this->arg('page')) ? ($this->arg('page')+0) : 1;
common_set_returnto($this->selfUrl());
$p = Profile::current();
if (empty($this->tag)) {
$stream = new ProfileNoticeStream($this->profile, $p);
} else {
$stream = new TaggedProfileNoticeStream($this->profile, $this->tag, $p);
}
$this->notice = $stream->getNotices(($this->page-1)*NOTICES_PER_PAGE, NOTICES_PER_PAGE + 1);
return true;
}
function handle($args)
{
// skip yadis thingy
$this->showPage();
}
function title()
{
$base = $this->profile->getBestName();
$host = parse_url($this->profile->profileurl, PHP_URL_HOST);
$base = $this->target->getBestName();
$host = parse_url($this->target->profileurl, PHP_URL_HOST);
// TRANS: Remote profile action page title.
// TRANS: %1$s is a username, %2$s is a hostname.
return sprintf(_m('%1$s on %2$s'), $base, $host);
@@ -63,20 +20,20 @@ class RemoteProfileAction extends ShowstreamAction
*/
function showNotices()
{
$url = $this->profile->profileurl;
$url = $this->target->profileurl;
$host = parse_url($url, PHP_URL_HOST);
$markdown = sprintf(
// TRANS: Message on remote profile page.
// TRANS: This message contains Markdown links in the form [description](link).
// TRANS: %1$s is a profile nickname, %2$s is a hostname, %3$s is a URL.
_m('This remote profile is registered on another site; see [%1$s\'s original profile page on %2$s](%3$s).'),
$this->profile->nickname,
$this->target->nickname,
$host,
$url);
$html = common_markup_to_html($markdown);
$this->raw($html);
if ($this->profile->hasRole(Profile_role::SILENCED)) {
if ($this->target->hasRole(Profile_role::SILENCED)) {
// TRANS: Message on blocked remote profile page.
$markdown = _m('Site moderators have silenced this profile, which prevents delivery of new messages to any users on this site.');
$this->raw(common_markup_to_html($markdown));
@@ -91,7 +48,7 @@ class RemoteProfileAction extends ShowstreamAction
$this->showEmptyListMessage();
}
$args = array('id' => $this->profile->id);
$args = array('id' => $this->target->id);
if (!empty($this->tag))
{
$args['tag'] = $this->tag;