7 files changed, 54 insertions, 101 deletions
diff --git a/views/foaf/canvas/default.php b/views/foaf/canvas/default.php
deleted file mode 100644
index 0cfa8b49a..000000000
--- a/views/foaf/canvas/default.php
+++ /dev/null
@@ -1,15 +0,0 @@
-<?php
-/**
- * Elgg default layout
- *
- * @package Elgg
- * @subpackage Core
- * @author Curverider Ltd
- * @link http://elgg.org/
- */
-
-for ($i = 1; $i < 8; $i++) {
-	if (isset($vars["area{$i}"])) {
-		echo $vars["area{$i}"];
-	}
-}
-\ No newline at end of file
diff --git a/views/foaf/page/default.php b/views/foaf/page/default.php
new file mode 100644
index 000000000..fad46ed35
--- /dev/null
+++ b/views/foaf/page/default.php
@@ -0,0 +1,47 @@
+<?php
+/**
+ * FOAF pageshell
+ *
+ * @package Elgg
+ * @subpackage Core
+ *
+ * // @todo removed below because blog is a plugin
+ * <foaf:weblog rdf:resource="<?php echo elgg_get_site_url(); ?>blog/<?php echo $owner->username; ?>" />
+ */
+
+header("Content-Type: text/xml");
+// echo $vars['body'];
+
+echo "<?xml version='1.0'?>\n";
+
+if (!$owner = elgg_get_page_owner_entity()) {
+	if (!elgg_is_logged_in()) {
+		exit;
+	} else {
+		$owner = elgg_get_logged_in_user_entity();
+	}
+}
+
+?>
+<rdf:RDF
+	xml:lang="en"
+	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:geo="http://www.w3.org/2003/01/geo/wgs84_pos#"
+	xmlns:dc="http://purl.org/dc/elements/1.1/">
+
+	<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:depiction rdf:resource="<?php echo elgg_format_url($owner->getIconURL('large')); ?>" />
+<?php echo $vars['body']; ?>
+	</foaf:Person>
+</rdf:RDF>
diff --git a/views/foaf/page_elements/contentwrapper.php b/views/foaf/page_elements/contentwrapper.php
deleted file mode 100644
index faef29e36..000000000
--- a/views/foaf/page_elements/contentwrapper.php
+++ /dev/null
@@ -1,10 +0,0 @@
-<?php
-/**
- *
- * @package Elgg
- * @subpackage Core
- * @author Curverider Ltd
- * @link http://elgg.org/
- */
-
-echo $vars['body'];
-\ No newline at end of file
diff --git a/views/foaf/page_elements/title.php b/views/foaf/page_elements/title.php
deleted file mode 100644
index 041b15477..000000000
--- a/views/foaf/page_elements/title.php
+++ /dev/null
@@ -1,10 +0,0 @@
-<?php
-/**
- *
- * @package Elgg
- * @subpackage Core
- * @author Curverider Ltd
- * @link http://elgg.org/
- */
-
-// this viewtype needs empty title
-\ No newline at end of file
diff --git a/views/foaf/pageshells/pageshell.php b/views/foaf/pageshells/pageshell.php
deleted file mode 100644
index 9cec8c119..000000000
--- a/views/foaf/pageshells/pageshell.php
+++ /dev/null
@@ -1,44 +0,0 @@
-<?php
-/**
- * Elgg XML output pageshell
- *
- * @package Elgg
- * @subpackage Core
- * @author Curverider Ltd
- * @link http://elgg.org/
- *
- */
-
-header("Content-Type: text/xml");
-// echo $vars['body'];
-
-echo "<?xml version='1.0'?>\n";
-
-if (!$owner = page_owner_entity()) {
-	if (!isloggedin()) {
-		exit;
-	} else {
-		$owner = $vars['user'];
-	}
-}
-
-?>
-<rdf:RDF
-	xml:lang="en"
-	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>
-		<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" />
-		<?php
-			echo $vars['body'];
-		?>
-	</foaf:Person>
-</rdf:RDF>
-\ No newline at end of file
diff --git a/views/foaf/search/entity_list.php b/views/foaf/search/entity_list.php
deleted file mode 100644
index 984efe750..000000000
--- a/views/foaf/search/entity_list.php
+++ /dev/null
@@ -1,15 +0,0 @@
-<?php
-/**
- * Elgg default layout
- *
- * @package Elgg
- * @subpackage Core
- * @author Curverider Ltd
- * @link http://elgg.org/
- */
-$entities = $vars['entities'];
-if (is_array($entities) && sizeof($entities) > 0) {
-	foreach($entities as $entity) {
-		echo elgg_view_entity($entity);
-	}
-}
-\ No newline at end of file
diff --git a/views/foaf/user/default.php b/views/foaf/user/default.php
index 86ed8619f..dcba55562 100644
--- a/views/foaf/user/default.php
+++ b/views/foaf/user/default.php
@@ -4,20 +4,20 @@
  *
  * @package Elgg
  * @subpackage Core
- * @author Curverider Ltd
- * @link http://elgg.org/
  */
 
-$friend = $vars['entity'];
+// @todo update when get_user_friends is deprecated in 1.9
+$friends = get_user_friends(elgg_get_page_owner_guid(), $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 $friend->getURL() . "?view=foaf" ?>" />
 </foaf:Person>
 </foaf:knows>
+
+<?php } ?>