From e4bc53c61702b22c845cbbd22ba3335935ee2c9c Mon Sep 17 00:00:00 2001
From: cash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544>
Date: Sat, 19 Mar 2011 15:33:06 +0000
Subject: Fixes #3176 replaced usage of index.php where appropriate

git-svn-id: http://code.elgg.org/elgg/trunk@8770 36083f99-b078-4883-b0ff-0f9b5a30f544
---
 mod/thewire/pages/thewire/owner.php | 33 +++++++++++++++++++++++++++++++++
 mod/thewire/pages/thewire/user.php  | 33 ---------------------------------
 mod/thewire/start.php               | 18 ++++++++++--------
 3 files changed, 43 insertions(+), 41 deletions(-)
 create mode 100644 mod/thewire/pages/thewire/owner.php
 delete mode 100644 mod/thewire/pages/thewire/user.php

(limited to 'mod/thewire')

diff --git a/mod/thewire/pages/thewire/owner.php b/mod/thewire/pages/thewire/owner.php
new file mode 100644
index 000000000..5645b23ba
--- /dev/null
+++ b/mod/thewire/pages/thewire/owner.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/thewire/user.php b/mod/thewire/pages/thewire/user.php
deleted file mode 100644
index 5645b23ba..000000000
--- a/mod/thewire/pages/thewire/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 26a1adbec..c87831bee 100644
--- a/mod/thewire/start.php
+++ b/mod/thewire/start.php
@@ -80,49 +80,51 @@ function thewire_init() {
  */
 function thewire_page_handler($page) {
 
+	$base_dir = elgg_get_plugins_path() . 'thewire/pages/thewire';
+
 	// if just /thewire go to global view in the else statement
 	if (isset($page[0]) && $page[0]) {
 
 		switch ($page[0]) {
 			case "all":
-				include dirname(__FILE__) . "/pages/thewire/everyone.php";
+				include "$base_dir/everyone.php";
 				break;
 
 			case "friends":
-				include dirname(__FILE__) . "/pages/thewire/friends.php";
+				include "$base_dir/friends.php";
 				break;
 
 			case "owner":
-				include dirname(__FILE__) . "/pages/thewire/user.php";
+				include "$base_dir/owner.php";
 				break;
 
 			case "thread":
 				if (isset($page[1])) {
 					set_input('thread_id', $page[1]);
 				}
-				include dirname(__FILE__) . "/pages/thewire/thread.php";
+				include "$base_dir/thread.php";
 				break;
 			case "reply":
 				if (isset($page[1])) {
 					set_input('guid', $page[1]);
 				}
-				include dirname(__FILE__) . "/pages/thewire/reply.php";
+				include "$base_dir/reply.php";
 				break;
 			case "tag":
 				if (isset($page[1])) {
 					set_input('tag', $page[1]);
 				}
-				include dirname(__FILE__) . "/pages/thewire/tag.php";
+				include "$base_dir/tag.php";
 				break;
 			case "previous":
 				if (isset($page[1])) {
 					set_input('guid', $page[1]);
 				}
-				include dirname(__FILE__) . "/pages/thewire/previous.php";
+				include "$base_dir/previous.php";
 				break;
 		}
 	} else {
-		include dirname(__FILE__) . "/pages/thewire/everyone.php";
+		include "$base_dir/everyone.php";
 	}
 
 	return true;
-- 
cgit v1.2.3