diff options
Diffstat (limited to 'pages/friends')
| -rw-r--r-- | pages/friends/add.php | 23 | ||||
| -rw-r--r-- | pages/friends/collections.php | 20 | ||||
| -rw-r--r-- | pages/friends/collections/add.php | 22 | ||||
| -rw-r--r-- | pages/friends/collections/pickercallback.php (renamed from pages/friends/pickercallback.php) | 28 | ||||
| -rw-r--r-- | pages/friends/collections/view.php | 21 | ||||
| -rw-r--r-- | pages/friends/edit.php | 30 | ||||
| -rw-r--r-- | pages/friends/index.php | 24 | ||||
| -rw-r--r-- | pages/friends/of.php | 24 |
8 files changed, 87 insertions, 105 deletions
diff --git a/pages/friends/add.php b/pages/friends/add.php deleted file mode 100644 index 23881b7c5..000000000 --- a/pages/friends/add.php +++ /dev/null @@ -1,23 +0,0 @@ -<?php -/** - * Elgg add a collection of friends - * - * @package Elgg - * @subpackage Core - */ - -// You need to be logged in for this one -gatekeeper(); - -$title = elgg_echo('friends:collections:add'); - -$content = elgg_view_title($title); - -$content .= elgg_view('friends/forms/edit', array( - 'friends' => get_user_friends(get_loggedin_userid(), "", 9999) - ) -); - -$body = elgg_view_layout('one_column_with_sidebar', array('content' => $content)); - -echo elgg_view_page(elgg_echo('friends:collections:add'), $body); diff --git a/pages/friends/collections.php b/pages/friends/collections.php deleted file mode 100644 index 80e472f66..000000000 --- a/pages/friends/collections.php +++ /dev/null @@ -1,20 +0,0 @@ -<?php -/** - * Elgg collections of friends - * - * @package Elgg - * @subpackage Core - */ - -// You need to be logged in for this one -gatekeeper(); - -$title = elgg_echo('friends:collections'); - -$content = elgg_view_title($title); - -$content .= elgg_view_access_collections(get_loggedin_userid()); - -$body = elgg_view_layout('one_column_with_sidebar', array('content' => $content)); - -echo elgg_view_page($title, $body); diff --git a/pages/friends/collections/add.php b/pages/friends/collections/add.php new file mode 100644 index 000000000..60f7586ba --- /dev/null +++ b/pages/friends/collections/add.php @@ -0,0 +1,22 @@ +<?php +/** + * Elgg add a collection of friends + * + * @package Elgg.Core + * @subpackage Social.Collections + */ + +// You need to be logged in for this one +gatekeeper(); + +$title = elgg_echo('friends:collections:add'); + +$content = elgg_view_title($title); + +$content .= elgg_view_form('friends/collections/add', array(), array( + 'friends' => get_user_friends(elgg_get_logged_in_user_guid(), "", 9999), +)); + +$body = elgg_view_layout('one_sidebar', array('content' => $content)); + +echo elgg_view_page(elgg_echo('friends:collections:add'), $body); diff --git a/pages/friends/pickercallback.php b/pages/friends/collections/pickercallback.php index 338511708..c6ed61cf0 100644 --- a/pages/friends/pickercallback.php +++ b/pages/friends/collections/pickercallback.php @@ -2,12 +2,12 @@ /** * Elgg friends picker callback * - * @package Elgg - * @subpackage Core + * @package Elgg.Core + * @subpackage Social.Collections */ // Load Elgg engine -require_once(dirname(dirname(dirname(__FILE__))) . "/engine/start.php"); +require_once(dirname(dirname(dirname(dirname(__FILE__)))) . "/engine/start.php"); $site_url = elgg_get_site_url(); @@ -23,7 +23,7 @@ if (!$members) { $friendspicker = (int) get_input('friendspicker', 0); // Get page owner (bomb out if there isn't one) -$pageowner = elgg_get_page_owner(); +$pageowner = elgg_get_page_owner_entity(); if (!$pageowner) { forward(); exit; @@ -32,21 +32,25 @@ if (!$pageowner) { // Depending on the view type, launch a different view switch($type) { case 'list': - $js_segment = elgg_view('friends/tablelistcountupdate', - array('friendspicker' => $friendspicker, 'count' => sizeof($members))); - $content = elgg_view('friends/tablelist', - array('entities' => $members, 'content' => $js_segment)); + $js_segment = elgg_view('core/friends/tablelistcountupdate', array( + 'friendspicker' => $friendspicker, + 'count' => sizeof($members), + )); + $content = elgg_view('core/friends/tablelist', array( + 'entities' => $members, + 'content' => $js_segment, + )); break; default: $friends = $pageowner->getFriends('', 9999); - $content = elgg_view('friends/picker', array( + + $content = elgg_view('input/friendspicker', array( 'entities' => $friends, 'value' => $members, 'callback' => true, 'friendspicker' => $friendspicker, - 'formcontents' => elgg_view('friends/forms/collectionfields', - array('collection' => get_access_collection($collection))), - 'formtarget' => $site_url . 'action/friends/editcollection', + 'collection_id' => $collection, + 'formtarget' => $site_url . 'action/friends/collections/edit', )); break; } diff --git a/pages/friends/collections/view.php b/pages/friends/collections/view.php new file mode 100644 index 000000000..0d72fe788 --- /dev/null +++ b/pages/friends/collections/view.php @@ -0,0 +1,21 @@ +<?php +/** + * Elgg collections of friends + * + * @package Elgg.Core + * @subpackage Social.Collections + */ + +$title = elgg_echo('friends:collections'); +elgg_register_title_button('collections', 'add'); + +$content = elgg_view_access_collections(elgg_get_logged_in_user_guid()); + +$body = elgg_view_layout('content', array( + 'filter' => false, + 'content' => $content, + 'title' => $title, + 'context' => 'collections', +)); + +echo elgg_view_page($title, $body); diff --git a/pages/friends/edit.php b/pages/friends/edit.php deleted file mode 100644 index 94527a243..000000000 --- a/pages/friends/edit.php +++ /dev/null @@ -1,30 +0,0 @@ -<?php -/** - * Elgg add a collection of friends - * - * @package Elgg - * @subpackage Core - */ - -// You need to be logged in for this one -gatekeeper(); - -$title = elgg_echo('friends:collectionedit'); - -$content = elgg_view_title($title); - -//grab the collection id passed to the edit form -$collection_id = get_input('collection'); - -//get the full collection -$collection = get_access_collection($collection_id); - -//get all members of the collection -$collection_members = get_members_of_access_collection($collection_id); - -$content .= elgg_view('friends/forms/edit', array('collection' => $collection, - 'collection_members' => $collection_members)); - -$body = elgg_view_layout('one_column_with_sidebar', array('content' => $content)); - -echo elgg_view_page($title, $body);
\ No newline at end of file diff --git a/pages/friends/index.php b/pages/friends/index.php index 13799e973..63518a413 100644 --- a/pages/friends/index.php +++ b/pages/friends/index.php @@ -2,21 +2,18 @@ /** * Elgg friends page * - * @package Elgg - * @subpackage Core + * @package Elgg.Core + * @subpackage Social.Friends */ -$owner = elgg_get_page_owner(); +$owner = elgg_get_page_owner_entity(); if (!$owner) { - gatekeeper(); - set_page_owner(get_loggedin_userid()); - $owner = elgg_get_page_owner(); + // unknown user so send away (@todo some sort of 404 error) + forward(); } $title = elgg_echo("friends:owned", array($owner->name)); -$content = elgg_view_title($title); - $options = array( 'relationship' => 'friend', 'relationship_guid' => $owner->getGUID(), @@ -24,8 +21,15 @@ $options = array( 'type' => 'user', 'full_view' => FALSE ); -$content .= elgg_list_entities_from_relationship($options); +$content = elgg_list_entities_from_relationship($options); +if (!$content) { + $content = elgg_echo('friends:none'); +} -$body = elgg_view_layout('one_column_with_sidebar', array('content' => $content)); +$params = array( + 'content' => $content, + 'title' => $title, +); +$body = elgg_view_layout('one_sidebar', $params); echo elgg_view_page($title, $body); diff --git a/pages/friends/of.php b/pages/friends/of.php index 66cda587d..aa9ee8bee 100644 --- a/pages/friends/of.php +++ b/pages/friends/of.php @@ -2,21 +2,18 @@ /** * Elgg friends of page * - * @package Elgg - * @subpackage Core + * @package Elgg.Core + * @subpackage Social.Friends */ -$owner = elgg_get_page_owner(); +$owner = elgg_get_page_owner_entity(); if (!$owner) { - gatekeeper(); - set_page_owner(get_loggedin_userid()); - $owner = elgg_get_page_owner(); + // unknown user so send away (@todo some sort of 404 error) + forward(); } $title = elgg_echo("friends:of:owned", array($owner->name)); -$content = elgg_view_title($title); - $options = array( 'relationship' => 'friend', 'relationship_guid' => $owner->getGUID(), @@ -24,8 +21,15 @@ $options = array( 'type' => 'user', 'full_view' => FALSE ); -$content .= elgg_list_entities_from_relationship($options); +$content = elgg_list_entities_from_relationship($options); +if (!$content) { + $content = elgg_echo('friends:none'); +} -$body = elgg_view_layout('one_column_with_sidebar', array('content' => $content)); +$params = array( + 'content' => $content, + 'title' => $title, +); +$body = elgg_view_layout('one_sidebar', $params); echo elgg_view_page($title, $body); |