10 files changed, 110 insertions, 120 deletions

diff --git a/mod/bookmarks/pages/add.php b/mod/bookmarks/pages/add.php
deleted file mode 100644
index c748daca5..000000000
--- a/mod/bookmarks/pages/add.php
+++ /dev/null
@@ -1,34 +0,0 @@
-<?php
-/**
- * Add bookmark page
- *
- * @package Bookmarks
- */
-
-$bookmark_guid = get_input('guid');
-$bookmark = get_entity($bookmark_guid);
-$container_guid = (int) get_input('container_guid');
-$container = get_entity($container_guid);
-
-// for groups.
-$page_owner = $container;
-if (elgg_instanceof($container, 'object')) {
-	$page_owner = $container->getContainerEntity();
-}
-
-elgg_set_page_owner_guid($page_owner->getGUID());
-
-$title = elgg_echo('bookmarks:add');
-elgg_push_breadcrumb($title);
-
-$vars = bookmarks_prepare_form_vars();
-$content = elgg_view_form('bookmarks/save', array(), $vars);
-
-$body = elgg_view_layout('content', array(
-	'filter' => '',
-	'buttons' => '',
-	'content' => $content,
-	'title' => $title,
-));
-
-echo elgg_view_page($title, $body);
\ No newline at end of file
diff --git a/mod/bookmarks/pages/all.php b/mod/bookmarks/pages/all.php
deleted file mode 100644
index 5a01b6f34..000000000
--- a/mod/bookmarks/pages/all.php
+++ /dev/null
@@ -1,32 +0,0 @@
-<?php
-/**
- * Elgg bookmarks plugin everyone page
- *
- * @package ElggBookmarks
- */
-
-$page_owner = elgg_get_page_owner_entity();
-if (!$page_owner) {
-	$page_owner = elgg_get_logged_in_user_guid();
-	elgg_set_page_owner_guid($page_owner);
-}
-
-$offset = (int)get_input('offset', 0);
-$content .= elgg_list_entities(array(
-	'type' => 'object',
-	'subtype' => 'bookmarks',
-	'limit' => 10,
-	'offset' => $offset,
-	'full_view' => false,
-	'view_toggle_type' => false
-));
-
-$title = elgg_echo('bookmarks:everyone');
-
-$body = elgg_view_layout('content', array(
-	'filter_context' => 'all',
-	'content' => $content,
-	'title' => $title
-));
-
-echo elgg_view_page($title, $body);
\ No newline at end of file
diff --git a/mod/bookmarks/pages/bookmarks/add.php b/mod/bookmarks/pages/bookmarks/add.php
new file mode 100644
index 000000000..d80d4a4bc
--- /dev/null
+++ b/mod/bookmarks/pages/bookmarks/add.php
@@ -0,0 +1,22 @@
+<?php
+/**
+ * Add bookmark page
+ *
+ * @package Bookmarks
+ */
+
+$page_owner = elgg_get_page_owner_entity();
+
+$title = elgg_echo('bookmarks:add');
+elgg_push_breadcrumb($title);
+
+$vars = bookmarks_prepare_form_vars();
+$content = elgg_view_form('bookmarks/save', array(), $vars);
+
+$body = elgg_view_layout('content', array(
+	'filter' => '',
+	'content' => $content,
+	'title' => $title,
+));
+
+echo elgg_view_page($title, $body);
\ No newline at end of file
diff --git a/mod/bookmarks/pages/bookmarks/all.php b/mod/bookmarks/pages/bookmarks/all.php
new file mode 100644
index 000000000..5c6011ad9
--- /dev/null
+++ b/mod/bookmarks/pages/bookmarks/all.php
@@ -0,0 +1,33 @@
+<?php
+/**
+ * Elgg bookmarks plugin everyone page
+ *
+ * @package ElggBookmarks
+ */
+
+elgg_pop_breadcrumb();
+elgg_push_breadcrumb(elgg_echo('bookmarks'));
+
+elgg_register_title_button();
+
+$content = elgg_list_entities(array(
+	'type' => 'object',
+	'subtype' => 'bookmarks',
+	'full_view' => false,
+	'view_toggle_type' => false,
+));
+
+if (!$content) {
+	$content = elgg_echo('bookmarks:none');
+}
+
+$title = elgg_echo('bookmarks:everyone');
+
+$body = elgg_view_layout('content', array(
+	'filter_context' => 'all',
+	'content' => $content,
+	'title' => $title,
+	'sidebar' => elgg_view('bookmarks/sidebar'),
+));
+
+echo elgg_view_page($title, $body);
\ No newline at end of file
diff --git a/mod/bookmarks/pages/bookmarklet.php b/mod/bookmarks/pages/bookmarks/bookmarklet.php
index 99866e385..99866e385 100644
--- a/mod/bookmarks/pages/bookmarklet.php
+++ b/mod/bookmarks/pages/bookmarks/bookmarklet.php
diff --git a/mod/bookmarks/pages/edit.php b/mod/bookmarks/pages/bookmarks/edit.php
index 7b055e699..93b143c36 100644
--- a/mod/bookmarks/pages/edit.php
+++ b/mod/bookmarks/pages/bookmarks/edit.php
@@ -7,17 +7,13 @@
 
 $bookmark_guid = get_input('guid');
 $bookmark = get_entity($bookmark_guid);
-$container_guid = (int) get_input('container_guid');
-$container = get_entity($container_guid);
 
 if (!elgg_instanceof($bookmark, 'object', 'bookmarks') || !$bookmark->canEdit()) {
 	register_error(elgg_echo('bookmarks:unknown_bookmark'));
 	forward(REFERRER);
 }
 
-// for groups.
-$container = $bookmark->getContainerEntity();
-elgg_set_page_owner_guid($container->getGUID());
+$page_owner = elgg_get_page_owner_entity();
 
 $title = elgg_echo('bookmarks:edit');
 elgg_push_breadcrumb($title);
@@ -27,7 +23,6 @@ $content = elgg_view_form('bookmarks/save', array(), $vars);
 
 $body = elgg_view_layout('content', array(
 	'filter' => '',
-	'buttons' => '',
 	'content' => $content,
 	'title' => $title,
 ));
diff --git a/mod/bookmarks/pages/friends.php b/mod/bookmarks/pages/bookmarks/friends.php
index 3c55317eb..173996346 100644
--- a/mod/bookmarks/pages/friends.php
+++ b/mod/bookmarks/pages/bookmarks/friends.php
@@ -4,17 +4,20 @@
  *
  * @package ElggBookmarks
  */
-$guid = get_input('guid');
 
-elgg_set_page_owner_guid($guid);
-$owner = elgg_get_page_owner_entity();
+$page_owner = elgg_get_page_owner_entity();
+if (!$page_owner) {
+	forward('', '404');
+}
 
-elgg_push_breadcrumb($owner->name, "pg/bookmarks/owner/$owner->username");
+elgg_push_breadcrumb($page_owner->name, "bookmarks/owner/$page_owner->username");
 elgg_push_breadcrumb(elgg_echo('friends'));
 
+elgg_register_title_button();
+
 $title = elgg_echo('bookmarks:friends');
 
-$content = list_user_friends_objects($owner->guid, 'bookmarks', 10, false);
+$content = list_user_friends_objects($page_owner->guid, 'bookmarks', 10, false);
 if (!$content) {
 	$content = elgg_echo('bookmarks:none');
 }
@@ -27,4 +30,4 @@ $params = array(
 
 $body = elgg_view_layout('content', $params);
 
-echo elgg_view_page($title, $body);
\ No newline at end of file
+echo elgg_view_page($title, $body);
diff --git a/mod/bookmarks/pages/owner.php b/mod/bookmarks/pages/bookmarks/owner.php
index 72843f9f0..b7b907916 100644
--- a/mod/bookmarks/pages/owner.php
+++ b/mod/bookmarks/pages/bookmarks/owner.php
@@ -5,20 +5,19 @@
  * @package Bookmarks
  */
 
-$guid = get_input('guid');
-
-elgg_set_page_owner_guid($guid);
 $page_owner = elgg_get_page_owner_entity();
+if (!$page_owner) {
+	forward('', '404');
+}
 
 elgg_push_breadcrumb($page_owner->name);
 
-$offset = (int)get_input('offset', 0);
+elgg_register_title_button();
+
 $content .= elgg_list_entities(array(
 	'type' => 'object',
 	'subtype' => 'bookmarks',
 	'container_guid' => $page_owner->guid,
-	'limit' => 10,
-	'offset' => $offset,
 	'full_view' => false,
 	'view_toggle_type' => false
 ));
@@ -37,7 +36,8 @@ if ($page_owner->getGUID() == elgg_get_logged_in_user_guid()) {
 $vars = array(
 	'filter_context' => $filter_context,
 	'content' => $content,
-	'title' => $title
+	'title' => $title,
+	'sidebar' => elgg_view('bookmarks/sidebar'),
 );
 
 // don't show filter if out of filter context
diff --git a/mod/bookmarks/pages/bookmarks/view.php b/mod/bookmarks/pages/bookmarks/view.php
new file mode 100644
index 000000000..70a6a5bfe
--- /dev/null
+++ b/mod/bookmarks/pages/bookmarks/view.php
@@ -0,0 +1,38 @@
+<?php
+/**
+ * View a bookmark
+ *
+ * @package ElggBookmarks
+ */
+
+$bookmark = get_entity(get_input('guid'));
+if (!$bookmark) {
+	register_error(elgg_echo('noaccess'));
+	$_SESSION['last_forward_from'] = current_page_url();
+	forward('');
+}
+
+$page_owner = elgg_get_page_owner_entity();
+
+$crumbs_title = $page_owner->name;
+
+if (elgg_instanceof($page_owner, 'group')) {
+	elgg_push_breadcrumb($crumbs_title, "bookmarks/group/$page_owner->guid/all");
+} else {
+	elgg_push_breadcrumb($crumbs_title, "bookmarks/owner/$page_owner->username");
+}
+
+$title = $bookmark->title;
+
+elgg_push_breadcrumb($title);
+
+$content = elgg_view_entity($bookmark, array('full_view' => true));
+$content .= elgg_view_comments($bookmark);
+
+$body = elgg_view_layout('content', array(
+	'content' => $content,
+	'title' => $title,
+	'filter' => '',
+));
+
+echo elgg_view_page($title, $body);
diff --git a/mod/bookmarks/pages/view.php b/mod/bookmarks/pages/view.php
deleted file mode 100644
index 131a0b52b..000000000
--- a/mod/bookmarks/pages/view.php
+++ /dev/null
@@ -1,35 +0,0 @@
-<?php
-/**
- * View a bookmark
- *
- * @package ElggBookmarks
- */
-
-$bookmark = get_entity(get_input('guid'));
-
-elgg_set_page_owner_guid($bookmark->getContainerGUID());
-$owner = elgg_get_page_owner_entity();
-
-$crumbs_title = $owner->name;
-
-if (elgg_instanceof($owner, 'group')) {
-	elgg_push_breadcrumb($crumbs_title, "pg/bookmarks/group/$owner->guid/owner");
-} else {
-	elgg_push_breadcrumb($crumbs_title, "pg/bookmarks/owner/$owner->username");
-}
-
-$title = $bookmark->title;
-
-elgg_push_breadcrumb($title);
-
-$content = elgg_view_entity($bookmark, true);
-$content .= elgg_view_comments($bookmark);
-
-$body = elgg_view_layout('content', array(
-	'content' => $content,
-	'title' => $title,
-	'filter' => '',
-	'header' => '',
-));
-
-echo elgg_view_page($title, $body);