diff options
Diffstat (limited to 'views/foaf')
| -rw-r--r-- | views/foaf/canvas/default.php | 13 | ||||
| -rw-r--r-- | views/foaf/page/default.php (renamed from views/foaf/page_shells/default.php) | 17 | ||||
| -rw-r--r-- | views/foaf/page_elements/contentwrapper.php | 8 | ||||
| -rw-r--r-- | views/foaf/search/entity_list.php | 13 | ||||
| -rw-r--r-- | views/foaf/user/default.php | 5 |
5 files changed, 11 insertions, 45 deletions
diff --git a/views/foaf/canvas/default.php b/views/foaf/canvas/default.php deleted file mode 100644 index 4b8d12e6d..000000000 --- a/views/foaf/canvas/default.php +++ /dev/null @@ -1,13 +0,0 @@ -<?php -/** - * Elgg default layout - * - * @package Elgg - * @subpackage Core - */ - -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_shells/default.php b/views/foaf/page/default.php index 7bd69b875..fad46ed35 100644 --- a/views/foaf/page_shells/default.php +++ b/views/foaf/page/default.php @@ -1,10 +1,12 @@ <?php /** - * Elgg XML output pageshell + * 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"); @@ -12,11 +14,11 @@ header("Content-Type: text/xml"); echo "<?xml version='1.0'?>\n"; -if (!$owner = elgg_get_page_owner()) { - if (!isloggedin()) { +if (!$owner = elgg_get_page_owner_entity()) { + if (!elgg_is_logged_in()) { exit; } else { - $owner = get_loggedin_user(); + $owner = elgg_get_logged_in_user_entity(); } } @@ -39,10 +41,7 @@ if (!$owner = elgg_get_page_owner()) { <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->getIcon('large')); ?>" /> - <foaf:weblog rdf:resource="<?php echo elgg_get_site_url(); ?>pg/blog/<?php echo $owner->username; ?>" /> - <?php - echo $vars['body']; - ?> + <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 643492a92..000000000 --- a/views/foaf/page_elements/contentwrapper.php +++ /dev/null @@ -1,8 +0,0 @@ -<?php -/** - * - * @package Elgg - * @subpackage Core - */ - -echo $vars['body'];
\ 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 b786865d7..000000000 --- a/views/foaf/search/entity_list.php +++ /dev/null @@ -1,13 +0,0 @@ -<?php -/** - * Elgg default layout - * - * @package Elgg - * @subpackage Core - */ -$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 3be763a73..dcba55562 100644 --- a/views/foaf/user/default.php +++ b/views/foaf/user/default.php @@ -6,7 +6,8 @@ * @subpackage Core */ -$friends=get_user_friends(elgg_get_page_owner_guid(), $subtype = "", $limit = 10000, $offset = 0); +// @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) { ?> @@ -15,7 +16,7 @@ foreach ($friends as $friend) { <foaf:Person> <foaf:nick><?php echo $friend->username; ?></foaf:nick> <foaf:name><?php echo $friend->name; ?></foaf:name> - <rdfs:seeAlso rdf:resource="<?php echo elgg_get_site_url() . "pg/profile/" . $friend->username . "?view=foaf" ?>" /> + <rdfs:seeAlso rdf:resource="<?php echo $friend->getURL() . "?view=foaf" ?>" /> </foaf:Person> </foaf:knows> |