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

Leding tabs to spaces.

Browse Source 
Superfluous whitespace removed.
This commit is contained in:
Siebrand Mazeland 2011-04-10 19:33:58 +02:00
parent 8c63d6ead4
commit cad040ce4e
1 changed files with 74 additions and 76 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

150
lib/activityobject.php
View File

@ -426,17 +426,17 @@ class ActivityObject
{ {
$object = new ActivityObject(); $object = new ActivityObject();
if (Event::handle('StartActivityObjectFromNotice', array($notice, &$object))) { if (Event::handle('StartActivityObjectFromNotice', array($notice, &$object))) {
$object->type = (empty($notice->object_type)) ? ActivityObject::NOTE : $notice->object_type; $object->type = (empty($notice->object_type)) ? ActivityObject::NOTE : $notice->object_type;
$object->id = $notice->uri; $object->id = $notice->uri;
$object->title = $notice->content; $object->title = $notice->content;
$object->content = $notice->rendered; $object->content = $notice->rendered;
$object->link = $notice->bestUrl(); $object->link = $notice->bestUrl();
Event::handle('EndActivityObjectFromNotice', array($notice, &$object)); Event::handle('EndActivityObjectFromNotice', array($notice, &$object));
} }
return $object; return $object;
} }
@ -445,62 +445,61 @@ class ActivityObject
{ {
$object = new ActivityObject(); $object = new ActivityObject();
if (Event::handle('StartActivityObjectFromProfile', array($profile, &$object))) { if (Event::handle('StartActivityObjectFromProfile', array($profile, &$object))) {
$object->type = ActivityObject::PERSON;
$object->id = $profile->getUri();
$object->title = $profile->getBestName();
$object->link = $profile->profileurl;
$object->type = ActivityObject::PERSON; $orig = $profile->getOriginalAvatar();
$object->id = $profile->getUri();
$object->title = $profile->getBestName();
$object->link = $profile->profileurl;
$orig = $profile->getOriginalAvatar(); if (!empty($orig)) {
$object->avatarLinks[] = AvatarLink::fromAvatar($orig);
}
if (!empty($orig)) { $sizes = array(
$object->avatarLinks[] = AvatarLink::fromAvatar($orig);
}
$sizes = array(
AVATAR_PROFILE_SIZE, AVATAR_PROFILE_SIZE,
AVATAR_STREAM_SIZE, AVATAR_STREAM_SIZE,
AVATAR_MINI_SIZE AVATAR_MINI_SIZE
); );
foreach ($sizes as $size) { foreach ($sizes as $size) {
$alink = null; $alink = null;
$avatar = $profile->getAvatar($size); $avatar = $profile->getAvatar($size);
if (!empty($avatar)) { if (!empty($avatar)) {
$alink = AvatarLink::fromAvatar($avatar); $alink = AvatarLink::fromAvatar($avatar);
} else { } else {
$alink = new AvatarLink(); $alink = new AvatarLink();
$alink->type = 'image/png'; $alink->type = 'image/png';
$alink->height = $size; $alink->height = $size;
$alink->width = $size; $alink->width = $size;
$alink->url = Avatar::defaultImage($size); $alink->url = Avatar::defaultImage($size);
if ($size == AVATAR_PROFILE_SIZE) { if ($size == AVATAR_PROFILE_SIZE) {
// Hack for Twitter import: we don't have a 96x96 image, // Hack for Twitter import: we don't have a 96x96 image,
// but we do have a 73x73 image. For now, fake it with that. // but we do have a 73x73 image. For now, fake it with that.
$avatar = $profile->getAvatar(73); $avatar = $profile->getAvatar(73);
if ($avatar) { if ($avatar) {
$alink = AvatarLink::fromAvatar($avatar); $alink = AvatarLink::fromAvatar($avatar);
$alink->height= $size; $alink->height= $size;
$alink->width = $size; $alink->width = $size;
} }
} }
} }
$object->avatarLinks[] = $alink; $object->avatarLinks[] = $alink;
} }
if (isset($profile->lat) && isset($profile->lon)) { if (isset($profile->lat) && isset($profile->lon)) {
$object->geopoint = (float)$profile->lat $object->geopoint = (float)$profile->lat
. ' ' . (float)$profile->lon; . ' ' . (float)$profile->lon;
} }
$object->poco = PoCo::fromProfile($profile); $object->poco = PoCo::fromProfile($profile);
Event::handle('EndActivityObjectFromProfile', array($profile, &$object)); Event::handle('EndActivityObjectFromProfile', array($profile, &$object));
} }
return $object; return $object;
} }
@ -509,25 +508,25 @@ class ActivityObject
{ {
$object = new ActivityObject(); $object = new ActivityObject();
if (Event::handle('StartActivityObjectFromGroup', array($group, &$object))) { if (Event::handle('StartActivityObjectFromGroup', array($group, &$object))) {
$object->type = ActivityObject::GROUP; $object->type = ActivityObject::GROUP;
$object->id = $group->getUri(); $object->id = $group->getUri();
$object->title = $group->getBestName(); $object->title = $group->getBestName();
$object->link = $group->getUri(); $object->link = $group->getUri();
$object->avatarLinks[] = AvatarLink::fromFilename($group->homepage_logo, $object->avatarLinks[] = AvatarLink::fromFilename($group->homepage_logo,
AVATAR_PROFILE_SIZE); AVATAR_PROFILE_SIZE);
$object->avatarLinks[] = AvatarLink::fromFilename($group->stream_logo, $object->avatarLinks[] = AvatarLink::fromFilename($group->stream_logo,
AVATAR_STREAM_SIZE); AVATAR_STREAM_SIZE);
$object->avatarLinks[] = AvatarLink::fromFilename($group->mini_logo, $object->avatarLinks[] = AvatarLink::fromFilename($group->mini_logo,
AVATAR_MINI_SIZE); AVATAR_MINI_SIZE);
$object->poco = PoCo::fromGroup($group); $object->poco = PoCo::fromGroup($group);
Event::handle('EndActivityObjectFromGroup', array($group, &$object)); Event::handle('EndActivityObjectFromGroup', array($group, &$object));
} }
return $object; return $object;
} }
@ -544,16 +543,16 @@ class ActivityObject
$object->link = $ptag->homeUrl(); $object->link = $ptag->homeUrl();
$object->owner = Profile::staticGet('id', $ptag->tagger); $object->owner = Profile::staticGet('id', $ptag->tagger);
$object->poco = PoCo::fromProfile($object->owner); $object->poco = PoCo::fromProfile($object->owner);
Event::handle('EndActivityObjectFromPeopletag', array($ptag, &$object)); Event::handle('EndActivityObjectFromPeopletag', array($ptag, &$object));
} }
return $object; return $object;
} }
function outputTo($xo, $tag='activity:object') function outputTo($xo, $tag='activity:object')
{ {
if (!empty($tag)) { if (!empty($tag)) {
$xo->elementStart($tag); $xo->elementStart($tag);
} }
if (Event::handle('StartActivityObjectOutputAtom', array($this, $xo))) { if (Event::handle('StartActivityObjectOutputAtom', array($this, $xo))) {
$xo->element('activity:object-type', null, $this->type); $xo->element('activity:object-type', null, $this->type);
@ -629,7 +628,6 @@ class ActivityObject
} }
} }
if (!empty($this->geopoint)) { if (!empty($this->geopoint)) {
$xo->element( $xo->element(
'georss:point', 'georss:point',
@ -652,18 +650,18 @@ class ActivityObject
Event::handle('EndActivityObjectOutputAtom', array($this, $xo)); Event::handle('EndActivityObjectOutputAtom', array($this, $xo));
} }
if (!empty($tag)) { if (!empty($tag)) {
$xo->elementEnd($tag); $xo->elementEnd($tag);
} }
return; return;
} }
function asString($tag='activity:object') function asString($tag='activity:object')
{ {
$xs = new XMLStringer(true); $xs = new XMLStringer(true);
$this->outputTo($xs, $tag); $this->outputTo($xs, $tag);
return $xs->getString(); return $xs->getString();
} }