summaryrefslogtreecommitdiff
path: root/classes/Profile.php
diff options
context:
space:
mode:
authorEvan Prodromou <evan@status.net>2010-02-22 07:09:08 -0500
committerEvan Prodromou <evan@status.net>2010-02-22 07:09:08 -0500
commit074e3fa895f554a912c7d6657c51d137cfcbe9f9 (patch)
treebe27d714b5674b80899baf4313b1265b7c84084a /classes/Profile.php
parente94800ced9884f20df73cd6325d0fefb33ac2236 (diff)
parent35be39e30eacda1b0425a2ae9f8e58cd0867d157 (diff)
Merge branch 'testing' of git@gitorious.org:statusnet/mainline into testing
Diffstat (limited to 'classes/Profile.php')
-rw-r--r--classes/Profile.php45
1 files changed, 43 insertions, 2 deletions
diff --git a/classes/Profile.php b/classes/Profile.php
index 5ff746e30..1ba3281ff 100644
--- a/classes/Profile.php
+++ b/classes/Profile.php
@@ -792,9 +792,11 @@ class Profile extends Memcached_DataObject
* Returns an XML string fragment with profile information as an
* Activity Streams noun object with the given element type.
*
- * Assumes that 'activity' namespace has been previously defined.
+ * Assumes that 'activity', 'georss', and 'poco' namespace has been
+ * previously defined.
*
* @param string $element one of 'actor', 'subject', 'object', 'target'
+ *
* @return string
*/
function asActivityNoun($element)
@@ -811,9 +813,46 @@ class Profile extends Memcached_DataObject
'id',
null,
$this->getUri()
- );
+ );
+
+ // title should contain fullname
$xs->element('title', null, $this->getBestName());
+ // Portable Contacts stuff
+
+ if (isset($this->bio)) {
+
+ // XXX: Possible to use OpenSocial's aboutMe?
+
+ $xs->element('poco:note', null, $this->bio);
+ }
+
+ if (isset($this->homepage)) {
+
+ $xs->elementStart('poco:urls');
+ $xs->element('poco:value', null, $this->homepage);
+ $xs->element('poco:type', null, 'homepage');
+ $xs->element('poco:primary', null, 'true');
+ $xs->elementEnd('poco:urls');
+ }
+
+ if (isset($this->location)) {
+ $xs->elementStart('poco:address');
+ $xs->element('poco:formatted', null, $this->location);
+ $xs->elementEnd('poco:address');
+ }
+
+ if (isset($this->lat) && isset($this->lon)) {
+ $this->element(
+ 'georss:point',
+ null,
+ (float)$this->lat . ' ' . (float)$this->lon
+ );
+ }
+
+ // XXX: Should we send all avatar sizes we have? I think
+ // cliqset does -Z
+
$avatar = $this->getAvatar(AVATAR_PROFILE_SIZE);
$xs->element(
@@ -829,6 +868,8 @@ class Profile extends Memcached_DataObject
$xs->elementEnd('activity:' . $element);
+ // XXX: Add people tags with <poco:tags> plural?
+
return $xs->getString();
}