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

OStatus: fix for avatars, submit button in updated remote profile preview

Browse Source
This commit is contained in:
Brion Vibber 2010-02-23 11:37:49 -08:00
parent 1bffe42413
commit e070fcaaae
1 changed files with 25 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
plugins/OStatus/actions/ostatussub.php
View File

@ -126,7 +126,13 @@ class OStatusSubAction extends Action
$oprofile = $this->oprofile; $oprofile = $this->oprofile;
$profile = $oprofile->localProfile(); $profile = $oprofile->localProfile();
$this->showEntity($profile); $avatar = $profile->getAvatar(AVATAR_PROFILE_SIZE);
$avatarUrl = $avatar ? $avatar->displayUrl() : false;
$this->showEntity($profile,
$profile->profileurl,
$avatarUrl,
$profile->bio);
} }
/** /**
@ -137,31 +143,33 @@ class OStatusSubAction extends Action
$oprofile = $this->oprofile; $oprofile = $this->oprofile;
$group = $oprofile->localGroup(); $group = $oprofile->localGroup();
$this->showEntity($group); $this->showEntity($group,
$group->getProfileUrl(),
$group->homepage_logo,
$group->description);
} }
function showEntity($entity) function showEntity($entity, $profile, $avatar, $note)
{ {
$nickname = $entity->nickname; $nickname = $entity->nickname;
$profile = $entity->profileurl;
$fullname = $entity->fullname; $fullname = $entity->fullname;
$homepage = $entity->homepage; $homepage = $entity->homepage;
$bio = $entity->bio;
$location = $entity->location; $location = $entity->location;
$avatar = $entity->avatarurl;
if (!$avatar) {
$avatar = Avatar::defaultImage(AVATAR_PROFILE_SIZE);
}
$this->elementStart('div', 'entity_profile vcard'); $this->elementStart('div', 'entity_profile vcard');
$this->elementStart('dl', 'entity_depiction'); $this->elementStart('dl', 'entity_depiction');
$this->element('dt', null, _('Photo')); $this->element('dt', null, _('Photo'));
$this->elementStart('dd'); $this->elementStart('dd');
if ($avatar) {
$this->element('img', array('src' => $avatar, $this->element('img', array('src' => $avatar,
'class' => 'photo avatar', 'class' => 'photo avatar',
'width' => AVATAR_PROFILE_SIZE, 'width' => AVATAR_PROFILE_SIZE,
'height' => AVATAR_PROFILE_SIZE, 'height' => AVATAR_PROFILE_SIZE,
'alt' => $nickname)); 'alt' => $nickname));
}
$this->elementEnd('dd'); $this->elementEnd('dd');
$this->elementEnd('dl'); $this->elementEnd('dl');
@ -206,11 +214,11 @@ class OStatusSubAction extends Action
$this->elementEnd('dl'); $this->elementEnd('dl');
} }
if (!is_null($bio)) { if (!is_null($note)) {
$this->elementStart('dl', 'entity_note'); $this->elementStart('dl', 'entity_note');
$this->element('dt', null, _('Note')); $this->element('dt', null, _('Note'));
$this->elementStart('dd', 'note'); $this->elementStart('dd', 'note');
$this->raw($bio); $this->raw($note);
$this->elementEnd('dd'); $this->elementEnd('dd');
$this->elementEnd('dl'); $this->elementEnd('dl');
} }
@ -368,7 +376,7 @@ class OStatusSubAction extends Action
} }
if ($this->validateFeed()) { if ($this->validateFeed()) {
if ($this->arg('subscribe')) { if ($this->arg('submit')) {
$this->saveFeed(); $this->saveFeed();
return; return;
} }
@ -424,7 +432,7 @@ class OStatusSubAction extends Action
function showPageNotice() function showPageNotice()
{ {
if ($this->error) { if (!empty($this->error)) {
$this->element('p', 'error', $this->error); $this->element('p', 'error', $this->error);
} }
} }