4 files changed, 70 insertions, 78 deletions
diff --git a/views/foaf/export/entity.php b/views/foaf/export/entity.php
deleted file mode 100644
index 8fb7558fe..000000000
--- a/views/foaf/export/entity.php
+++ /dev/null
@@ -1,62 +0,0 @@
-<?php
-	/**
-	 * Elgg FOAF Entity export.
-	 * Displays an ElggUser entity as FOAF.
-	 * 
-	 * @package Elgg
-	 * @subpackage Core
-	 * @license http://www.gnu.org/licenses/old-licenses/gpl-2.0.html GNU Public License version 2
-	 * @author Marcus Povey
-	 * @copyright Curverider Ltd 2008
-	 * @link http://elgg.org/
-	 */
-
-	global $CONFIG;
-	
-	$entity = $vars['entity'];
-	
-	if (!($entity instanceof ElggUser))
-		exit;
-
-?>
-<rdf:RDF
-  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/">
-
-  <foaf:Person>
-  	<foaf:name><?php echo $entity->name; ?></foaf:name>
-  	<foaf:mbox rdf:resource="<?php echo $entity->email; ?>"/>
-  	<foaf:nick><?php echo $entity->username; ?></foaf:nick>
-  	
-  	<!--  TODO : more -->
-  	
-<?php
-	
-	// Get friends
-	$friends = get_entities_from_relationship("friend", $entity->guid);
-
-	// Iterate through and generate foaf:knows
-	if ($friends)
-	{
-		echo "<foaf:knows>\n";
-		
-		foreach ($friends as $friend)
-		{
-			if ($friend instanceof ElggUser) 
-			{
-?>
-				<foaf:Person>
-					<foaf:name><?php echo $friend->name; ?></foaf:name>
-  					<foaf:mbox rdf:resource="<?php echo $friend->email; ?>"/>
-  					<rdfs:seeAlso rdf:resource="<?php echo guid_to_uuid($friend->guid); ?>?view=foaf"/>
-				</foaf:Person>		
-<?php		
-			}	
-		}
-
-		echo "</foaf:knows>\n";
-	}
-?>
-  </foaf:Person>
-</rdf:RDF>
-\ 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/pageshells/pageshell.php b/views/foaf/pageshells/pageshell.php
deleted file mode 100644
index f5c7a4ce0..000000000
--- a/views/foaf/pageshells/pageshell.php
+++ /dev/null
@@ -1,16 +0,0 @@
-<?php
-	/**
-	 * Elgg XML output pageshell
-	 * 
-	 * @package Elgg
-	 * @subpackage Core
-	 * @license http://www.gnu.org/licenses/old-licenses/gpl-2.0.html GNU Public License version 2
-	 * @author Marcus Povey
-	 * @copyright Curverider Ltd 2008
-	 * @link http://elgg.org/
-	 * 
-	 */
-
-	header("Content-Type: text/xml");
-	echo $vars['body'];
-?>
-\ No newline at end of file
diff --git a/views/foaf/user/default.php b/views/foaf/user/default.php
new file mode 100644
index 000000000..dcba55562
--- /dev/null
+++ b/views/foaf/user/default.php
@@ -0,0 +1,23 @@
+<?php
+/**
+ * Elgg default user view
+ *
+ * @package Elgg
+ * @subpackage Core
+ */
+
+// @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:name><?php echo $friend->name; ?></foaf:name>
+	<rdfs:seeAlso rdf:resource="<?php echo $friend->getURL() . "?view=foaf" ?>" />
+</foaf:Person>
+</foaf:knows>
+
+<?php } ?>