From 01435072dc7d9b46bc30a3216501684a72e716a1 Mon Sep 17 00:00:00 2001
From: cash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544>
Date: Fri, 18 Mar 2011 01:31:22 +0000
Subject: Refs #3158 namespaced pages for bookmarks and thewire

git-svn-id: http://code.elgg.org/elgg/trunk@8759 36083f99-b078-4883-b0ff-0f9b5a30f544
---
 mod/bookmarks/pages/add.php                   | 23 -------------
 mod/bookmarks/pages/all.php                   | 28 ----------------
 mod/bookmarks/pages/bookmarklet.php           | 36 --------------------
 mod/bookmarks/pages/bookmarks/add.php         | 23 +++++++++++++
 mod/bookmarks/pages/bookmarks/all.php         | 28 ++++++++++++++++
 mod/bookmarks/pages/bookmarks/bookmarklet.php | 36 ++++++++++++++++++++
 mod/bookmarks/pages/bookmarks/edit.php        | 31 ++++++++++++++++++
 mod/bookmarks/pages/bookmarks/friends.php     | 28 ++++++++++++++++
 mod/bookmarks/pages/bookmarks/owner.php       | 47 +++++++++++++++++++++++++++
 mod/bookmarks/pages/bookmarks/view.php        | 34 +++++++++++++++++++
 mod/bookmarks/pages/edit.php                  | 31 ------------------
 mod/bookmarks/pages/friends.php               | 28 ----------------
 mod/bookmarks/pages/owner.php                 | 47 ---------------------------
 mod/bookmarks/pages/view.php                  | 34 -------------------
 mod/bookmarks/start.php                       |  2 +-
 mod/thewire/pages/everyone.php                | 29 -----------------
 mod/thewire/pages/friends.php                 | 23 -------------
 mod/thewire/pages/previous.php                | 11 -------
 mod/thewire/pages/reply.php                   | 28 ----------------
 mod/thewire/pages/tag.php                     | 36 --------------------
 mod/thewire/pages/thewire/everyone.php        | 29 +++++++++++++++++
 mod/thewire/pages/thewire/friends.php         | 23 +++++++++++++
 mod/thewire/pages/thewire/previous.php        | 11 +++++++
 mod/thewire/pages/thewire/reply.php           | 28 ++++++++++++++++
 mod/thewire/pages/thewire/tag.php             | 36 ++++++++++++++++++++
 mod/thewire/pages/thewire/thread.php          | 28 ++++++++++++++++
 mod/thewire/pages/thewire/user.php            | 33 +++++++++++++++++++
 mod/thewire/pages/thread.php                  | 28 ----------------
 mod/thewire/pages/user.php                    | 33 -------------------
 mod/thewire/start.php                         | 16 ++++-----
 30 files changed, 424 insertions(+), 424 deletions(-)
 delete mode 100644 mod/bookmarks/pages/add.php
 delete mode 100644 mod/bookmarks/pages/all.php
 delete mode 100644 mod/bookmarks/pages/bookmarklet.php
 create mode 100644 mod/bookmarks/pages/bookmarks/add.php
 create mode 100644 mod/bookmarks/pages/bookmarks/all.php
 create mode 100644 mod/bookmarks/pages/bookmarks/bookmarklet.php
 create mode 100644 mod/bookmarks/pages/bookmarks/edit.php
 create mode 100644 mod/bookmarks/pages/bookmarks/friends.php
 create mode 100644 mod/bookmarks/pages/bookmarks/owner.php
 create mode 100644 mod/bookmarks/pages/bookmarks/view.php
 delete mode 100644 mod/bookmarks/pages/edit.php
 delete mode 100644 mod/bookmarks/pages/friends.php
 delete mode 100644 mod/bookmarks/pages/owner.php
 delete mode 100644 mod/bookmarks/pages/view.php
 delete mode 100644 mod/thewire/pages/everyone.php
 delete mode 100644 mod/thewire/pages/friends.php
 delete mode 100644 mod/thewire/pages/previous.php
 delete mode 100644 mod/thewire/pages/reply.php
 delete mode 100644 mod/thewire/pages/tag.php
 create mode 100644 mod/thewire/pages/thewire/everyone.php
 create mode 100644 mod/thewire/pages/thewire/friends.php
 create mode 100644 mod/thewire/pages/thewire/previous.php
 create mode 100644 mod/thewire/pages/thewire/reply.php
 create mode 100644 mod/thewire/pages/thewire/tag.php
 create mode 100644 mod/thewire/pages/thewire/thread.php
 create mode 100644 mod/thewire/pages/thewire/user.php
 delete mode 100644 mod/thewire/pages/thread.php
 delete mode 100644 mod/thewire/pages/user.php

diff --git a/mod/bookmarks/pages/add.php b/mod/bookmarks/pages/add.php
deleted file mode 100644
index c7fd3cf79..000000000
--- a/mod/bookmarks/pages/add.php
+++ /dev/null
@@ -1,23 +0,0 @@
-<?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' => '',
-	'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 07ae5d327..000000000
--- a/mod/bookmarks/pages/all.php
+++ /dev/null
@@ -1,28 +0,0 @@
-<?php
-/**
- * Elgg bookmarks plugin everyone page
- *
- * @package ElggBookmarks
- */
-
-elgg_set_page_owner_guid(elgg_get_logged_in_user_guid());
-
-$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/bookmarklet.php b/mod/bookmarks/pages/bookmarklet.php
deleted file mode 100644
index 99866e385..000000000
--- a/mod/bookmarks/pages/bookmarklet.php
+++ /dev/null
@@ -1,36 +0,0 @@
-<?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/add.php b/mod/bookmarks/pages/bookmarks/add.php
new file mode 100644
index 000000000..c7fd3cf79
--- /dev/null
+++ b/mod/bookmarks/pages/bookmarks/add.php
@@ -0,0 +1,23 @@
+<?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' => '',
+	'buttons' => '',
+	'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..07ae5d327
--- /dev/null
+++ b/mod/bookmarks/pages/bookmarks/all.php
@@ -0,0 +1,28 @@
+<?php
+/**
+ * Elgg bookmarks plugin everyone page
+ *
+ * @package ElggBookmarks
+ */
+
+elgg_set_page_owner_guid(elgg_get_logged_in_user_guid());
+
+$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/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..24513a960
--- /dev/null
+++ b/mod/bookmarks/pages/bookmarks/edit.php
@@ -0,0 +1,31 @@
+<?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' => '',
+	'buttons' => '',
+	'content' => $content,
+	'title' => $title,
+));
+
+echo elgg_view_page($title, $body);
\ No newline at end of file
diff --git a/mod/bookmarks/pages/bookmarks/friends.php b/mod/bookmarks/pages/bookmarks/friends.php
new file mode 100644
index 000000000..6e3f77cf6
--- /dev/null
+++ b/mod/bookmarks/pages/bookmarks/friends.php
@@ -0,0 +1,28 @@
+<?php
+/**
+ * Elgg bookmarks plugin friends page
+ *
+ * @package ElggBookmarks
+ */
+
+$owner = elgg_get_page_owner_entity();
+
+elgg_push_breadcrumb($owner->name, "bookmarks/owner/$owner->username");
+elgg_push_breadcrumb(elgg_echo('friends'));
+
+$title = elgg_echo('bookmarks:friends');
+
+$content = list_user_friends_objects($owner->guid, 'bookmarks', 10, false);
+if (!$content) {
+	$content = elgg_echo('bookmarks:none');
+}
+
+$params = array(
+	'filter_context' => 'friends',
+	'content' => $content,
+	'title' => $title,
+);
+
+$body = elgg_view_layout('content', $params);
+
+echo elgg_view_page($title, $body);
\ 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..d1564f751
--- /dev/null
+++ b/mod/bookmarks/pages/bookmarks/owner.php
@@ -0,0 +1,47 @@
+<?php
+/**
+ * Elgg bookmarks plugin everyone page
+ *
+ * @package Bookmarks
+ */
+
+$page_owner = elgg_get_page_owner_entity();
+
+elgg_push_breadcrumb($page_owner->name);
+
+$offset = (int)get_input('offset', 0);
+$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
+));
+
+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
+);
+
+// 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..142e0b246
--- /dev/null
+++ b/mod/bookmarks/pages/bookmarks/view.php
@@ -0,0 +1,34 @@
+<?php
+/**
+ * View a bookmark
+ *
+ * @package ElggBookmarks
+ */
+
+$bookmark = get_entity(get_input('guid'));
+
+$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/owner");
+} else {
+	elgg_push_breadcrumb($crumbs_title, "bookmarks/owner/$page_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);
diff --git a/mod/bookmarks/pages/edit.php b/mod/bookmarks/pages/edit.php
deleted file mode 100644
index 24513a960..000000000
--- a/mod/bookmarks/pages/edit.php
+++ /dev/null
@@ -1,31 +0,0 @@
-<?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' => '',
-	'buttons' => '',
-	'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/friends.php
deleted file mode 100644
index 6e3f77cf6..000000000
--- a/mod/bookmarks/pages/friends.php
+++ /dev/null
@@ -1,28 +0,0 @@
-<?php
-/**
- * Elgg bookmarks plugin friends page
- *
- * @package ElggBookmarks
- */
-
-$owner = elgg_get_page_owner_entity();
-
-elgg_push_breadcrumb($owner->name, "bookmarks/owner/$owner->username");
-elgg_push_breadcrumb(elgg_echo('friends'));
-
-$title = elgg_echo('bookmarks:friends');
-
-$content = list_user_friends_objects($owner->guid, 'bookmarks', 10, false);
-if (!$content) {
-	$content = elgg_echo('bookmarks:none');
-}
-
-$params = array(
-	'filter_context' => 'friends',
-	'content' => $content,
-	'title' => $title,
-);
-
-$body = elgg_view_layout('content', $params);
-
-echo elgg_view_page($title, $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 d1564f751..000000000
--- a/mod/bookmarks/pages/owner.php
+++ /dev/null
@@ -1,47 +0,0 @@
-<?php
-/**
- * Elgg bookmarks plugin everyone page
- *
- * @package Bookmarks
- */
-
-$page_owner = elgg_get_page_owner_entity();
-
-elgg_push_breadcrumb($page_owner->name);
-
-$offset = (int)get_input('offset', 0);
-$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
-));
-
-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
-);
-
-// 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/view.php b/mod/bookmarks/pages/view.php
deleted file mode 100644
index 142e0b246..000000000
--- a/mod/bookmarks/pages/view.php
+++ /dev/null
@@ -1,34 +0,0 @@
-<?php
-/**
- * View a bookmark
- *
- * @package ElggBookmarks
- */
-
-$bookmark = get_entity(get_input('guid'));
-
-$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/owner");
-} else {
-	elgg_push_breadcrumb($crumbs_title, "bookmarks/owner/$page_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);
diff --git a/mod/bookmarks/start.php b/mod/bookmarks/start.php
index bf7e372a3..9d0aa362e 100644
--- a/mod/bookmarks/start.php
+++ b/mod/bookmarks/start.php
@@ -107,7 +107,7 @@ function bookmarks_page_handler($page) {
 		bookmarks_url_forwarder($page);
 	}
 
-	$pages = dirname(__FILE__) . '/pages';
+	$pages = dirname(__FILE__) . '/pages/bookmarks';
 
 	switch ($page[0]) {
 		case "all":
diff --git a/mod/thewire/pages/everyone.php b/mod/thewire/pages/everyone.php
deleted file mode 100644
index 75abd282d..000000000
--- a/mod/thewire/pages/everyone.php
+++ /dev/null
@@ -1,29 +0,0 @@
-<?php
-/**
- * All wire posts
- * 
- */
-
-elgg_push_breadcrumb(elgg_echo('thewire'));
-
-$title = elgg_echo('thewire:everyone');
-
-if (elgg_is_logged_in()) {
-	$content .= elgg_view_form('thewire/add');
-	$content .= elgg_view('input/urlshortener');
-}
-
-$content .= elgg_list_entities(array(
-	'type' => 'object',
-	'subtype' => 'thewire',
-	'limit' => 15,
-));
-
-$body = elgg_view_layout('content', array(
-	'filter_context' => 'all',
-	'content' => $content,
-	'title' => $title,
-	'buttons' => false,
-));
-
-echo elgg_view_page($title, $body);
diff --git a/mod/thewire/pages/friends.php b/mod/thewire/pages/friends.php
deleted file mode 100644
index 6e8642544..000000000
--- a/mod/thewire/pages/friends.php
+++ /dev/null
@@ -1,23 +0,0 @@
-<?php
-/**
- * Wire posts of your friends
- */
-
-$owner = elgg_get_page_owner_entity();
-
-$title = elgg_echo('thewire:friends');
-
-elgg_push_breadcrumb(elgg_echo('thewire'), "thewire/all");
-elgg_push_breadcrumb($owner->name, "thewire/owner/$owner->username");
-elgg_push_breadcrumb(elgg_echo('friends'));
-
-$content = list_user_friends_objects($owner->guid, 'thewire', 15, false);
-
-$body = elgg_view_layout('content', array(
-	'filter_context' => 'friends',
-	'content' => $content,
-	'title' => $title,
-	'buttons' => false,
-));
-
-echo elgg_view_page($title, $body);
diff --git a/mod/thewire/pages/previous.php b/mod/thewire/pages/previous.php
deleted file mode 100644
index 05fc3267e..000000000
--- a/mod/thewire/pages/previous.php
+++ /dev/null
@@ -1,11 +0,0 @@
-<?php
-/**
- * Server up html for a post
- */
-
-$guid = (int) get_input('guid');
-
-$parent = thewire_get_parent($guid);
-if ($parent) {
-	echo elgg_view_entity($parent);
-}
\ No newline at end of file
diff --git a/mod/thewire/pages/reply.php b/mod/thewire/pages/reply.php
deleted file mode 100644
index c29f81669..000000000
--- a/mod/thewire/pages/reply.php
+++ /dev/null
@@ -1,28 +0,0 @@
-<?php
-/**
- * Reply page
- * 
- */
-
-gatekeeper();
-
-$post = get_entity(get_input('guid'));
-
-$title = elgg_echo('thewire:reply');
-
-elgg_push_breadcrumb(elgg_echo('thewire'), 'thewire/all');
-elgg_push_breadcrumb($title);
-
-$content = elgg_view('thewire/reply', array('post' => $post));
-$content .= elgg_view_form('thewire/add', array(), array('post' => $post));
-$content .= elgg_view('input/urlshortener');
-
-
-$body = elgg_view_layout('content', array(
-	'filter' => false,
-	'content' => $content,
-	'title' => $title,
-	'buttons' => false,
-));
-
-echo elgg_view_page($title, $body);
diff --git a/mod/thewire/pages/tag.php b/mod/thewire/pages/tag.php
deleted file mode 100644
index 53f9e9db9..000000000
--- a/mod/thewire/pages/tag.php
+++ /dev/null
@@ -1,36 +0,0 @@
-<?php
-/**
- * Wire posts tagged with <tag>
- */
-
-$tag = get_input('tag');
-if (!$tag) {
-	forward('thewire/all');
-}
-
-elgg_push_breadcrumb(elgg_echo('thewire'), 'thewire/all');
-elgg_push_breadcrumb('#' . $tag);
-
-// remove # from tag
-$tag = trim($tag, '# ');
-
-$title = elgg_echo('thewire:tags', array($tag));
-
-
-$content = elgg_list_entities_from_metadata(array(
-	'metadata_name' => 'tags',
-	'metadata_value' => $tag,
-	'metadata_case_sensitive' => false,
-	'type' => 'object',
-	'subtype' => 'thewire',
-	'limit' => 15,
-));
-
-$body = elgg_view_layout('content', array(
-	'filter' => false,
-	'content' => $content,
-	'title' => $title,
-	'buttons' => false,
-));
-
-echo elgg_view_page($title, $body);
diff --git a/mod/thewire/pages/thewire/everyone.php b/mod/thewire/pages/thewire/everyone.php
new file mode 100644
index 000000000..75abd282d
--- /dev/null
+++ b/mod/thewire/pages/thewire/everyone.php
@@ -0,0 +1,29 @@
+<?php
+/**
+ * All wire posts
+ * 
+ */
+
+elgg_push_breadcrumb(elgg_echo('thewire'));
+
+$title = elgg_echo('thewire:everyone');
+
+if (elgg_is_logged_in()) {
+	$content .= elgg_view_form('thewire/add');
+	$content .= elgg_view('input/urlshortener');
+}
+
+$content .= elgg_list_entities(array(
+	'type' => 'object',
+	'subtype' => 'thewire',
+	'limit' => 15,
+));
+
+$body = elgg_view_layout('content', array(
+	'filter_context' => 'all',
+	'content' => $content,
+	'title' => $title,
+	'buttons' => false,
+));
+
+echo elgg_view_page($title, $body);
diff --git a/mod/thewire/pages/thewire/friends.php b/mod/thewire/pages/thewire/friends.php
new file mode 100644
index 000000000..6e8642544
--- /dev/null
+++ b/mod/thewire/pages/thewire/friends.php
@@ -0,0 +1,23 @@
+<?php
+/**
+ * Wire posts of your friends
+ */
+
+$owner = elgg_get_page_owner_entity();
+
+$title = elgg_echo('thewire:friends');
+
+elgg_push_breadcrumb(elgg_echo('thewire'), "thewire/all");
+elgg_push_breadcrumb($owner->name, "thewire/owner/$owner->username");
+elgg_push_breadcrumb(elgg_echo('friends'));
+
+$content = list_user_friends_objects($owner->guid, 'thewire', 15, false);
+
+$body = elgg_view_layout('content', array(
+	'filter_context' => 'friends',
+	'content' => $content,
+	'title' => $title,
+	'buttons' => false,
+));
+
+echo elgg_view_page($title, $body);
diff --git a/mod/thewire/pages/thewire/previous.php b/mod/thewire/pages/thewire/previous.php
new file mode 100644
index 000000000..05fc3267e
--- /dev/null
+++ b/mod/thewire/pages/thewire/previous.php
@@ -0,0 +1,11 @@
+<?php
+/**
+ * Server up html for a post
+ */
+
+$guid = (int) get_input('guid');
+
+$parent = thewire_get_parent($guid);
+if ($parent) {
+	echo elgg_view_entity($parent);
+}
\ No newline at end of file
diff --git a/mod/thewire/pages/thewire/reply.php b/mod/thewire/pages/thewire/reply.php
new file mode 100644
index 000000000..c29f81669
--- /dev/null
+++ b/mod/thewire/pages/thewire/reply.php
@@ -0,0 +1,28 @@
+<?php
+/**
+ * Reply page
+ * 
+ */
+
+gatekeeper();
+
+$post = get_entity(get_input('guid'));
+
+$title = elgg_echo('thewire:reply');
+
+elgg_push_breadcrumb(elgg_echo('thewire'), 'thewire/all');
+elgg_push_breadcrumb($title);
+
+$content = elgg_view('thewire/reply', array('post' => $post));
+$content .= elgg_view_form('thewire/add', array(), array('post' => $post));
+$content .= elgg_view('input/urlshortener');
+
+
+$body = elgg_view_layout('content', array(
+	'filter' => false,
+	'content' => $content,
+	'title' => $title,
+	'buttons' => false,
+));
+
+echo elgg_view_page($title, $body);
diff --git a/mod/thewire/pages/thewire/tag.php b/mod/thewire/pages/thewire/tag.php
new file mode 100644
index 000000000..53f9e9db9
--- /dev/null
+++ b/mod/thewire/pages/thewire/tag.php
@@ -0,0 +1,36 @@
+<?php
+/**
+ * Wire posts tagged with <tag>
+ */
+
+$tag = get_input('tag');
+if (!$tag) {
+	forward('thewire/all');
+}
+
+elgg_push_breadcrumb(elgg_echo('thewire'), 'thewire/all');
+elgg_push_breadcrumb('#' . $tag);
+
+// remove # from tag
+$tag = trim($tag, '# ');
+
+$title = elgg_echo('thewire:tags', array($tag));
+
+
+$content = elgg_list_entities_from_metadata(array(
+	'metadata_name' => 'tags',
+	'metadata_value' => $tag,
+	'metadata_case_sensitive' => false,
+	'type' => 'object',
+	'subtype' => 'thewire',
+	'limit' => 15,
+));
+
+$body = elgg_view_layout('content', array(
+	'filter' => false,
+	'content' => $content,
+	'title' => $title,
+	'buttons' => false,
+));
+
+echo elgg_view_page($title, $body);
diff --git a/mod/thewire/pages/thewire/thread.php b/mod/thewire/pages/thewire/thread.php
new file mode 100644
index 000000000..8b6ee4bd0
--- /dev/null
+++ b/mod/thewire/pages/thewire/thread.php
@@ -0,0 +1,28 @@
+<?php
+/**
+ * View conversation thread
+ */
+
+$thread_id = get_input('thread_id');
+
+$title = elgg_echo('thewire:thread');
+
+elgg_push_breadcrumb(elgg_echo('thewire'), 'thewire/all');
+elgg_push_breadcrumb($title);
+
+$content = elgg_list_entities_from_metadata(array(
+	"metadata_name" => "wire_thread",
+	"metadata_value" => $thread_id,
+	"type" => "object",
+	"subtype" => "thewire",
+	"limit" => 20,
+));
+
+$body = elgg_view_layout('content', array(
+	'filter' => false,
+	'content' => $content,
+	'title' => $title,
+	'buttons' => false,
+));
+
+echo elgg_view_page($title, $body);
diff --git a/mod/thewire/pages/thewire/user.php b/mod/thewire/pages/thewire/user.php
new file mode 100644
index 000000000..5645b23ba
--- /dev/null
+++ b/mod/thewire/pages/thewire/user.php
@@ -0,0 +1,33 @@
+<?php
+/**
+ * User's wire posts
+ * 
+ */
+
+$owner = elgg_get_page_owner_entity();
+
+$title = elgg_echo('thewire:user', array($owner->name));
+
+elgg_push_breadcrumb(elgg_echo('thewire'), "thewire/all");
+elgg_push_breadcrumb($owner->name);
+
+if (get_loggedin_userid() == $owner->guid) {
+	$content = elgg_view_form('thewire/add');
+	$content .= elgg_view('input/urlshortener');
+}
+
+$content .= elgg_list_entities(array(
+	'type' => 'object',
+	'subtype' => 'thewire',
+	'owner_guid' => $owner->guid,
+	'limit' => 15,
+));
+
+$body = elgg_view_layout('content', array(
+	'filter_context' => 'mine',
+	'content' => $content,
+	'title' => $title,
+	'buttons' => false,
+));
+
+echo elgg_view_page($title, $body);
diff --git a/mod/thewire/pages/thread.php b/mod/thewire/pages/thread.php
deleted file mode 100644
index 8b6ee4bd0..000000000
--- a/mod/thewire/pages/thread.php
+++ /dev/null
@@ -1,28 +0,0 @@
-<?php
-/**
- * View conversation thread
- */
-
-$thread_id = get_input('thread_id');
-
-$title = elgg_echo('thewire:thread');
-
-elgg_push_breadcrumb(elgg_echo('thewire'), 'thewire/all');
-elgg_push_breadcrumb($title);
-
-$content = elgg_list_entities_from_metadata(array(
-	"metadata_name" => "wire_thread",
-	"metadata_value" => $thread_id,
-	"type" => "object",
-	"subtype" => "thewire",
-	"limit" => 20,
-));
-
-$body = elgg_view_layout('content', array(
-	'filter' => false,
-	'content' => $content,
-	'title' => $title,
-	'buttons' => false,
-));
-
-echo elgg_view_page($title, $body);
diff --git a/mod/thewire/pages/user.php b/mod/thewire/pages/user.php
deleted file mode 100644
index 5645b23ba..000000000
--- a/mod/thewire/pages/user.php
+++ /dev/null
@@ -1,33 +0,0 @@
-<?php
-/**
- * User's wire posts
- * 
- */
-
-$owner = elgg_get_page_owner_entity();
-
-$title = elgg_echo('thewire:user', array($owner->name));
-
-elgg_push_breadcrumb(elgg_echo('thewire'), "thewire/all");
-elgg_push_breadcrumb($owner->name);
-
-if (get_loggedin_userid() == $owner->guid) {
-	$content = elgg_view_form('thewire/add');
-	$content .= elgg_view('input/urlshortener');
-}
-
-$content .= elgg_list_entities(array(
-	'type' => 'object',
-	'subtype' => 'thewire',
-	'owner_guid' => $owner->guid,
-	'limit' => 15,
-));
-
-$body = elgg_view_layout('content', array(
-	'filter_context' => 'mine',
-	'content' => $content,
-	'title' => $title,
-	'buttons' => false,
-));
-
-echo elgg_view_page($title, $body);
diff --git a/mod/thewire/start.php b/mod/thewire/start.php
index c2006ddb0..26a1adbec 100644
--- a/mod/thewire/start.php
+++ b/mod/thewire/start.php
@@ -85,44 +85,44 @@ function thewire_page_handler($page) {
 
 		switch ($page[0]) {
 			case "all":
-				include dirname(__FILE__) . "/pages/everyone.php";
+				include dirname(__FILE__) . "/pages/thewire/everyone.php";
 				break;
 
 			case "friends":
-				include dirname(__FILE__) . "/pages/friends.php";
+				include dirname(__FILE__) . "/pages/thewire/friends.php";
 				break;
 
 			case "owner":
-				include dirname(__FILE__) . "/pages/user.php";
+				include dirname(__FILE__) . "/pages/thewire/user.php";
 				break;
 
 			case "thread":
 				if (isset($page[1])) {
 					set_input('thread_id', $page[1]);
 				}
-				include dirname(__FILE__) . "/pages/thread.php";
+				include dirname(__FILE__) . "/pages/thewire/thread.php";
 				break;
 			case "reply":
 				if (isset($page[1])) {
 					set_input('guid', $page[1]);
 				}
-				include dirname(__FILE__) . "/pages/reply.php";
+				include dirname(__FILE__) . "/pages/thewire/reply.php";
 				break;
 			case "tag":
 				if (isset($page[1])) {
 					set_input('tag', $page[1]);
 				}
-				include dirname(__FILE__) . "/pages/tag.php";
+				include dirname(__FILE__) . "/pages/thewire/tag.php";
 				break;
 			case "previous":
 				if (isset($page[1])) {
 					set_input('guid', $page[1]);
 				}
-				include dirname(__FILE__) . "/pages/previous.php";
+				include dirname(__FILE__) . "/pages/thewire/previous.php";
 				break;
 		}
 	} else {
-		include dirname(__FILE__) . "/pages/everyone.php";
+		include dirname(__FILE__) . "/pages/thewire/everyone.php";
 	}
 
 	return true;
-- 
cgit v1.2.3