12 files changed, 217 insertions, 183 deletions

diff --git a/mod/bookmarks/pages/add.php b/mod/bookmarks/pages/add.php
deleted file mode 100644
index 17e1e6fa4..000000000
--- a/mod/bookmarks/pages/add.php
+++ /dev/null
@@ -1,36 +0,0 @@
-<?php
-
-/**
- * Elgg bookmarks plugin add bookmark page
- *
- * @package ElggBookmarks
- */
-
-gatekeeper();
-
-// Get the current page's owner
-$page_owner = page_owner_entity();
-if ($page_owner === false || is_null($page_owner)) {
-	$page_owner = $_SESSION['user'];
-	set_page_owner($page_owner->getGUID());
-}
-if ($page_owner instanceof ElggGroup)
-	$container = $page_owner->guid;
-
-$area2 .= elgg_view_title(elgg_echo('bookmarks:this'), false);
-
-// If we've been given a bookmark to edit, grab it
-if ($this_guid = get_input('bookmark',0)) {
-	$entity = get_entity($this_guid);
-	if ($entity->canEdit()) {
-		$area2 .= elgg_view('bookmarks/form',array('entity' => $entity, 'container_guid' => $container));
-	}
-} else {
-	$area2 .= elgg_view('bookmarks/form', array('container_guid' => $container));
-}
-
-// Format page
-$body = elgg_view_layout('two_column_left_sidebar', $area1, $area2);
-
-// Draw it
-page_draw(elgg_echo('bookmarks:add'),$body);
diff --git a/mod/bookmarks/pages/all.php b/mod/bookmarks/pages/all.php
deleted file mode 100644
index 2bde462ba..000000000
--- a/mod/bookmarks/pages/all.php
+++ /dev/null
@@ -1,36 +0,0 @@
-<?php
-/**
- * Elgg bookmarks plugin everyone page
- *
- * @package ElggBookmarks
- */
-
-elgg_push_context('bookmarks');
-elgg_push_breadcrumb(elgg_echo('bookmarks'));
-
-$page_owner = elgg_get_page_owner_entity();
-if (!$page_owner) {
-	$page_owner = get_loggedin_userid();
-	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);
-elgg_pop_context();
\ 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/bookmarks/bookmarklet.php b/mod/bookmarks/pages/bookmarks/bookmarklet.php
new file mode 100644
index 000000000..99866e385
--- /dev/null
+++ b/mod/bookmarks/pages/bookmarks/bookmarklet.php
@@ -0,0 +1,36 @@
+<?php
+/**
+* Elgg bookmarks plugin bookmarklet page
+*
+* @package Bookmarks
+*/
+
+gatekeeper();
+
+$container_guid = get_input('container_guid');
+$container = get_entity($container_guid);
+$page_owner = $container;
+
+if (elgg_instanceof($container, 'object')) {
+	$page_owner = $container->getContainerEntity();
+}
+
+elgg_set_page_owner_guid($page_owner->getGUID());
+
+$title = elgg_echo('bookmarks:bookmarklet');
+
+if ($page_owner instanceof ElggGroup) {
+	elgg_push_breadcrumb($page_owner->name, $page_owner->getURL());
+}
+
+elgg_push_breadcrumb($title);
+
+$content = elgg_view("bookmarks/bookmarklet");
+
+$body = elgg_view_layout('content', array(
+	'content' => $content,
+	'title' => $title,
+	'filter' => false
+));
+
+echo elgg_view_page($title, $body);
\ No newline at end of file
diff --git a/mod/bookmarks/pages/bookmarks/edit.php b/mod/bookmarks/pages/bookmarks/edit.php
new file mode 100644
index 000000000..93b143c36
--- /dev/null
+++ b/mod/bookmarks/pages/bookmarks/edit.php
@@ -0,0 +1,30 @@
+<?php
+/**
+ * Add bookmark page
+ *
+ * @package ElggBookmarks
+ */
+
+$bookmark_guid = get_input('guid');
+$bookmark = get_entity($bookmark_guid);
+
+if (!elgg_instanceof($bookmark, 'object', 'bookmarks') || !$bookmark->canEdit()) {
+	register_error(elgg_echo('bookmarks:unknown_bookmark'));
+	forward(REFERRER);
+}
+
+$page_owner = elgg_get_page_owner_entity();
+
+$title = elgg_echo('bookmarks:edit');
+elgg_push_breadcrumb($title);
+
+$vars = bookmarks_prepare_form_vars($bookmark);
+$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/friends.php b/mod/bookmarks/pages/bookmarks/friends.php
index 5c930434b..173996346 100644
--- a/mod/bookmarks/pages/friends.php
+++ b/mod/bookmarks/pages/bookmarks/friends.php
@@ -4,19 +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_context('bookmarks');
-elgg_push_breadcrumb(elgg_echo('bookmarks'), 'pg/bookmarks/all');
-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');
 }
@@ -30,4 +31,3 @@ $params = array(
 $body = elgg_view_layout('content', $params);
 
 echo elgg_view_page($title, $body);
-elgg_pop_context();
\ No newline at end of file
diff --git a/mod/bookmarks/pages/bookmarks/owner.php b/mod/bookmarks/pages/bookmarks/owner.php
new file mode 100644
index 000000000..b7b907916
--- /dev/null
+++ b/mod/bookmarks/pages/bookmarks/owner.php
@@ -0,0 +1,50 @@
+<?php
+/**
+ * Elgg bookmarks plugin everyone page
+ *
+ * @package Bookmarks
+ */
+
+$page_owner = elgg_get_page_owner_entity();
+if (!$page_owner) {
+	forward('', '404');
+}
+
+elgg_push_breadcrumb($page_owner->name);
+
+elgg_register_title_button();
+
+$content .= elgg_list_entities(array(
+	'type' => 'object',
+	'subtype' => 'bookmarks',
+	'container_guid' => $page_owner->guid,
+	'full_view' => false,
+	'view_toggle_type' => false
+));
+
+if (!$content) {
+	$content = elgg_echo('bookmarks:none');
+}
+
+$title = elgg_echo('bookmarks:owner', array($page_owner->name));
+
+$filter_context = '';
+if ($page_owner->getGUID() == elgg_get_logged_in_user_guid()) {
+	$filter_context = 'mine';
+}
+
+$vars = array(
+	'filter_context' => $filter_context,
+	'content' => $content,
+	'title' => $title,
+	'sidebar' => elgg_view('bookmarks/sidebar'),
+);
+
+// don't show filter if out of filter context
+if ($page_owner instanceof ElggGroup) {
+	$vars['filter'] = false;
+}
+
+$body = elgg_view_layout('content', $vars);
+
+echo elgg_view_page($title, $body);
\ No newline at end of file
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/inbox.php b/mod/bookmarks/pages/inbox.php
deleted file mode 100644
index 061a51e18..000000000
--- a/mod/bookmarks/pages/inbox.php
+++ /dev/null
@@ -1,28 +0,0 @@
-<?php
-
-	/**
-	 * Elgg bookmarks plugin inbox page
-	 * 
-	 * @package ElggBookmarks
-	 * @license http://www.gnu.org/licenses/old-licenses/gpl-2.0.html GNU Public License version 2
-	 * @author Curverider Ltd <info@elgg.com>
-	 * @copyright Curverider Ltd 2008-2010
-	 * @link http://elgg.org/
-	 */
-
-	// Start engine
-		require_once(dirname(dirname(dirname(__FILE__))) . "/engine/start.php");
-		
-	// List bookmarks
-		$area2 = elgg_view_title(elgg_echo('bookmarks:inbox'));
-		set_context('search');
-		$area2 .= list_entities_from_relationship('share',page_owner(),true,'object','bookmarks');
-		set_context('bookmarks');
-		
-	// Format page
-		$body = elgg_view_layout('two_column_left_sidebar', $area1, $area2);
-		
-	// Draw it
-		page_draw(elgg_echo('bookmarks:inbox'),$body);
-
-?>
\ No newline at end of file
diff --git a/mod/bookmarks/pages/owner.php b/mod/bookmarks/pages/owner.php
deleted file mode 100644
index 1e45bc518..000000000
--- a/mod/bookmarks/pages/owner.php
+++ /dev/null
@@ -1,39 +0,0 @@
-<?php
-/**
- * Elgg bookmarks plugin everyone page
- *
- * @package ElggBookmarks
- */
-
-elgg_push_context('bookmarks');
-elgg_push_breadcrumb(elgg_echo('bookmarks'), 'pg/bookmarks/all');
-
-$page_owner = elgg_get_page_owner_entity();
-if (!$page_owner) {
-	$page_owner = get_loggedin_userid();
-	elgg_set_page_owner_guid($page_owner);
-}
-
-elgg_push_breadcrumb($page_owner->name, "pg/bookmarks/owner/$page_owner->username");
-
-$offset = (int)get_input('offset', 0);
-$content .= elgg_list_entities(array(
-	'type' => 'object',
-	'subtype' => 'bookmarks',
-	'owner_guid' => $page_owner->guid,
-	'limit' => 10,
-	'offset' => $offset,
-	'full_view' => false,
-	'view_toggle_type' => false
-));
-
-$title = elgg_echo('bookmarks:owner', array($page_owner->name));
-
-$body = elgg_view_layout('content', array(
-	'filter_context' => 'mine',
-	'content' => $content,
-	'title' => $title
-));
-
-echo elgg_view_page($title, $body);
-elgg_pop_context();
\ No newline at end of file
diff --git a/mod/bookmarks/pages/view.php b/mod/bookmarks/pages/view.php
deleted file mode 100644
index 6b4b839b1..000000000
--- a/mod/bookmarks/pages/view.php
+++ /dev/null
@@ -1,36 +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();
-
-elgg_push_breadcrumb(elgg_echo('bookmarks'), 'pg/bookmarks/all');
-
-$crumbs_title = elgg_echo('blog:owned_blogs', array($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);