aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorbrettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544>2010-05-14 16:23:00 +0000
committerbrettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544>2010-05-14 16:23:00 +0000
commit368c947601348a68dd6805658e637a1e634779e5 (patch)
tree88c812bf3e3a289c798926889bcf704c497af5dc
parent2581779073b9e2029a91041c0c775de40e6b8ea8 (diff)
downloadelgg-368c947601348a68dd6805658e637a1e634779e5.tar.gz
elgg-368c947601348a68dd6805658e637a1e634779e5.tar.bz2
merge -r5822:5825 from 1.7 to trunk.
git-svn-id: http://code.elgg.org/elgg/trunk@6054 36083f99-b078-4883-b0ff-0f9b5a30f544
-rw-r--r--views/foaf/pageshells/pageshell.php16
-rw-r--r--views/foaf/user/default.php11
2 files changed, 17 insertions, 10 deletions
diff --git a/views/foaf/pageshells/pageshell.php b/views/foaf/pageshells/pageshell.php
index 9cec8c119..2d7232c3e 100644
--- a/views/foaf/pageshells/pageshell.php
+++ b/views/foaf/pageshells/pageshell.php
@@ -28,17 +28,23 @@ if (!$owner = page_owner_entity()) {
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
xmlns:rdfs="http://www.w3.org/2000/01/rdf-schema#"
xmlns:foaf="http://xmlns.com/foaf/0.1/"
- xmlns:ya="http://blogs.yandex.ru/schema/foaf/"
xmlns:geo="http://www.w3.org/2003/01/geo/wgs84_pos#"
xmlns:dc="http://purl.org/dc/elements/1.1/">
- <foaf:Person>
+
+ <rdf:Description rdf:about="">
+ <rdf:type rdf:resource="http://xmlns.com/foaf/0.1/PersonalProfileDocument"/>
+ <foaf:maker rdf:resource="#me"/>
+ <foaf:primaryTopic rdf:resource="#me"/>
+ </rdf:Description>
+
+ <foaf:Person rdf:about="#me">
<foaf:nick><?php echo $owner->username; ?></foaf:nick>
<foaf:name><?php echo $owner->name; ?></foaf:name>
<foaf:homepage rdf:resource="<?php echo $owner->getURL(); ?>" />
- <foaf:mbox_sha1sum><?php echo sha1("mailto:" . $owner->email); ?></foaf:mbox_sha1sum>
- <foaf:img rdf:resource="<?php echo $vars['url']; ?>pg/icon/<?php echo $owner->username; ?>/large/icon.jpg" />
+ <foaf:depiction rdf:resource="<?php echo elgg_format_url($owner->getIcon('large')); ?>" />
+ <foaf:weblog rdf:resource="<?php echo $vars['url']; ?>pg/blog/<?php echo $owner->username; ?>" />
<?php
echo $vars['body'];
?>
</foaf:Person>
-</rdf:RDF> \ No newline at end of file
+</rdf:RDF>
diff --git a/views/foaf/user/default.php b/views/foaf/user/default.php
index 86ed8619f..fc47e04f8 100644
--- a/views/foaf/user/default.php
+++ b/views/foaf/user/default.php
@@ -8,16 +8,17 @@
* @link http://elgg.org/
*/
-$friend = $vars['entity'];
+$friends=get_user_friends($vars['page_owner'],$subtype = "",$limit = 10000,$offset = 0);
+foreach ($friends as $friend) {
?>
<foaf:knows>
<foaf:Person>
<foaf:nick><?php echo $friend->username; ?></foaf:nick>
- <foaf:member_name><?php echo $friend->name; ?></foaf:member_name>
- <foaf:mbox_sha1sum><?php echo sha1("mailto:" . $friend->email); ?></foaf:mbox_sha1sum>
- <rdfs:seeAlso rdf:resource="<?php echo $vars['url'] . "pg/friends/" . $friend->username . "/?view=foaf" ?>" />
- <foaf:homepage rdf:resource="<?php echo $friend->getURL(); ?>?view=foaf"/>
+ <foaf:name><?php echo $friend->name; ?></foaf:name>
+ <rdfs:seeAlso rdf:resource="<?php echo $vars['url'] . "pg/profile/" . $friend->username . "?view=foaf" ?>" />
</foaf:Person>
</foaf:knows>
+
+<?php } ?>