From e603c947a5ae2869164b11fee827d4c595e4a3f8 Mon Sep 17 00:00:00 2001
From: cash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544>
Date: Sat, 19 Mar 2011 15:10:41 +0000
Subject: Refs #3158 update messages plugin

git-svn-id: http://code.elgg.org/elgg/trunk@8768 36083f99-b078-4883-b0ff-0f9b5a30f544
---
 mod/messages/inbox.php                | 41 -------------------------
 mod/messages/pages/messages/inbox.php | 41 +++++++++++++++++++++++++
 mod/messages/pages/messages/read.php  | 57 +++++++++++++++++++++++++++++++++++
 mod/messages/pages/messages/send.php  | 28 +++++++++++++++++
 mod/messages/pages/messages/sent.php  | 41 +++++++++++++++++++++++++
 mod/messages/read.php                 | 57 -----------------------------------
 mod/messages/send.php                 | 28 -----------------
 mod/messages/sent.php                 | 41 -------------------------
 mod/messages/start.php                |  2 +-
 9 files changed, 168 insertions(+), 168 deletions(-)
 delete mode 100644 mod/messages/inbox.php
 create mode 100644 mod/messages/pages/messages/inbox.php
 create mode 100644 mod/messages/pages/messages/read.php
 create mode 100644 mod/messages/pages/messages/send.php
 create mode 100644 mod/messages/pages/messages/sent.php
 delete mode 100644 mod/messages/read.php
 delete mode 100644 mod/messages/send.php
 delete mode 100644 mod/messages/sent.php

(limited to 'mod/messages')

diff --git a/mod/messages/inbox.php b/mod/messages/inbox.php
deleted file mode 100644
index 4b2d11bbf..000000000
--- a/mod/messages/inbox.php
+++ /dev/null
@@ -1,41 +0,0 @@
-<?php
-/**
- * Elgg messages inbox page
- *
- * @package ElggMessages
-*/
-
-gatekeeper();
-
-$page_owner = elgg_get_page_owner_entity();
-if (!$page_owner) {
-	register_error(elgg_echo());
-	forward();
-}
-
-elgg_push_breadcrumb(elgg_echo('messages:inbox'));
-
-$title = elgg_echo('messages:user', array($page_owner->name));
-
-$list = elgg_list_entities_from_metadata(array(
-	'type' => 'object',
-	'subtype' => 'messages',
-	'metadata_name' => 'toId',
-	'metadata_value' => elgg_get_page_owner_guid(),
-	'owner_guid' => elgg_get_page_owner_guid(),
-	'full_view' => false,
-));
-
-$body_vars = array(
-	'folder' => 'inbox',
-	'list' => $list,
-);
-$content = elgg_view_form('messages/process', array(), $body_vars);
-
-$body = elgg_view_layout('content', array(
-	'content' => $content,
-	'title' => elgg_echo('messages:inbox'),
-	'filter' => '',
-));
-
-echo elgg_view_page($title, $body);
diff --git a/mod/messages/pages/messages/inbox.php b/mod/messages/pages/messages/inbox.php
new file mode 100644
index 000000000..4b2d11bbf
--- /dev/null
+++ b/mod/messages/pages/messages/inbox.php
@@ -0,0 +1,41 @@
+<?php
+/**
+ * Elgg messages inbox page
+ *
+ * @package ElggMessages
+*/
+
+gatekeeper();
+
+$page_owner = elgg_get_page_owner_entity();
+if (!$page_owner) {
+	register_error(elgg_echo());
+	forward();
+}
+
+elgg_push_breadcrumb(elgg_echo('messages:inbox'));
+
+$title = elgg_echo('messages:user', array($page_owner->name));
+
+$list = elgg_list_entities_from_metadata(array(
+	'type' => 'object',
+	'subtype' => 'messages',
+	'metadata_name' => 'toId',
+	'metadata_value' => elgg_get_page_owner_guid(),
+	'owner_guid' => elgg_get_page_owner_guid(),
+	'full_view' => false,
+));
+
+$body_vars = array(
+	'folder' => 'inbox',
+	'list' => $list,
+);
+$content = elgg_view_form('messages/process', array(), $body_vars);
+
+$body = elgg_view_layout('content', array(
+	'content' => $content,
+	'title' => elgg_echo('messages:inbox'),
+	'filter' => '',
+));
+
+echo elgg_view_page($title, $body);
diff --git a/mod/messages/pages/messages/read.php b/mod/messages/pages/messages/read.php
new file mode 100644
index 000000000..c5d1d4941
--- /dev/null
+++ b/mod/messages/pages/messages/read.php
@@ -0,0 +1,57 @@
+<?php
+/**
+* Read a message page
+*
+* @package ElggMessages
+*/
+
+gatekeeper();
+
+$message = get_entity(get_input('guid'));
+if (!$message) {
+	forward();
+}
+
+elgg_set_page_owner_guid($message->getOwnerGUID());
+$page_owner = elgg_get_page_owner_entity();
+
+$title = $message->title;
+
+$inbox = false;
+if ($page_owner->getGUID() == $message->toId) {
+	$inbox = true;
+	elgg_push_breadcrumb(elgg_echo('messages:inbox'), 'messages/inbox/' . $page_owner->username);
+} else {
+	elgg_push_breadcrumb(elgg_echo('messages:sent'), 'messages/sent/' . $page_owner->username);
+}
+elgg_push_breadcrumb($title);
+
+$buttons = '';
+$content = elgg_view_entity($message, true);
+if ($inbox) {
+	$form_params = array(
+		'id' => 'messages-reply-form',
+		'class' => 'hidden',
+		'action' => 'action/messages/send',
+	);
+	$body_params = array('message' => $message);
+	$content .= elgg_view_form('messages/reply', $form_params, $body_params);
+
+	if (elgg_get_logged_in_user_guid() == elgg_get_page_owner_guid()) {
+		$buttons = elgg_view('output/url', array(
+			'text' => elgg_echo('messages:answer'),
+			'class' => 'elgg-button elgg-button-action',
+			'id' => 'messages-show-reply',
+		));
+		$buttons = "<ul class=\"elgg-menu elgg-menu-title\"><li>$buttons</li></ul>";
+	}
+}
+
+$body = elgg_view_layout('content', array(
+	'content' => $content,
+	'title' => $title,
+	'filter' => '',
+	'buttons' => $buttons,
+));
+
+echo elgg_view_page($title, $body);
diff --git a/mod/messages/pages/messages/send.php b/mod/messages/pages/messages/send.php
new file mode 100644
index 000000000..884c20cca
--- /dev/null
+++ b/mod/messages/pages/messages/send.php
@@ -0,0 +1,28 @@
+<?php
+/**
+* Compose a message
+*
+* @package ElggMessages
+*/
+
+gatekeeper();
+
+$page_owner = elgg_get_logged_in_user_entity();
+set_page_owner($page_owner->getGUID());
+
+$title = elgg_echo('messages:add');
+
+elgg_push_breadcrumb($title);
+
+$params = messages_prepare_form_vars(get_input('send_to'));
+$params['friends'] = $page_owner->getFriends();
+$content = elgg_view_form('messages/send', array(), $params);
+
+$body = elgg_view_layout('content', array(
+	'content' => $content,
+	'title' => $title,
+	'filter' => '',
+	'buttons' => '',
+));
+
+echo elgg_view_page($title, $body);
diff --git a/mod/messages/pages/messages/sent.php b/mod/messages/pages/messages/sent.php
new file mode 100644
index 000000000..f884643e0
--- /dev/null
+++ b/mod/messages/pages/messages/sent.php
@@ -0,0 +1,41 @@
+<?php
+/**
+* Elgg sent messages page
+*
+* @package ElggMessages
+*/
+
+gatekeeper();
+
+$page_owner = elgg_get_page_owner_entity();
+if (!$page_owner) {
+	register_error(elgg_echo());
+	forward();
+}
+
+elgg_push_breadcrumb(elgg_echo('messages:sent'));
+
+$title = elgg_echo('messages:sentmessages', array($page_owner->name));
+
+$list = elgg_list_entities_from_metadata(array(
+	'type' => 'object',
+	'subtype' => 'messages',
+	'metadata_name' => 'fromId',
+	'metadata_value' => elgg_get_page_owner_guid(),
+	'owner_guid' => elgg_get_page_owner_guid(),
+	'full_view' => false,
+));
+
+$body_vars = array(
+	'folder' => 'sent',
+	'list' => $list,
+);
+$content = elgg_view_form('messages/process', array(), $body_vars);
+
+$body = elgg_view_layout('content', array(
+	'content' => $content,
+	'title' => $title,
+	'filter' => '',
+));
+
+echo elgg_view_page($title, $body);
diff --git a/mod/messages/read.php b/mod/messages/read.php
deleted file mode 100644
index c5d1d4941..000000000
--- a/mod/messages/read.php
+++ /dev/null
@@ -1,57 +0,0 @@
-<?php
-/**
-* Read a message page
-*
-* @package ElggMessages
-*/
-
-gatekeeper();
-
-$message = get_entity(get_input('guid'));
-if (!$message) {
-	forward();
-}
-
-elgg_set_page_owner_guid($message->getOwnerGUID());
-$page_owner = elgg_get_page_owner_entity();
-
-$title = $message->title;
-
-$inbox = false;
-if ($page_owner->getGUID() == $message->toId) {
-	$inbox = true;
-	elgg_push_breadcrumb(elgg_echo('messages:inbox'), 'messages/inbox/' . $page_owner->username);
-} else {
-	elgg_push_breadcrumb(elgg_echo('messages:sent'), 'messages/sent/' . $page_owner->username);
-}
-elgg_push_breadcrumb($title);
-
-$buttons = '';
-$content = elgg_view_entity($message, true);
-if ($inbox) {
-	$form_params = array(
-		'id' => 'messages-reply-form',
-		'class' => 'hidden',
-		'action' => 'action/messages/send',
-	);
-	$body_params = array('message' => $message);
-	$content .= elgg_view_form('messages/reply', $form_params, $body_params);
-
-	if (elgg_get_logged_in_user_guid() == elgg_get_page_owner_guid()) {
-		$buttons = elgg_view('output/url', array(
-			'text' => elgg_echo('messages:answer'),
-			'class' => 'elgg-button elgg-button-action',
-			'id' => 'messages-show-reply',
-		));
-		$buttons = "<ul class=\"elgg-menu elgg-menu-title\"><li>$buttons</li></ul>";
-	}
-}
-
-$body = elgg_view_layout('content', array(
-	'content' => $content,
-	'title' => $title,
-	'filter' => '',
-	'buttons' => $buttons,
-));
-
-echo elgg_view_page($title, $body);
diff --git a/mod/messages/send.php b/mod/messages/send.php
deleted file mode 100644
index 884c20cca..000000000
--- a/mod/messages/send.php
+++ /dev/null
@@ -1,28 +0,0 @@
-<?php
-/**
-* Compose a message
-*
-* @package ElggMessages
-*/
-
-gatekeeper();
-
-$page_owner = elgg_get_logged_in_user_entity();
-set_page_owner($page_owner->getGUID());
-
-$title = elgg_echo('messages:add');
-
-elgg_push_breadcrumb($title);
-
-$params = messages_prepare_form_vars(get_input('send_to'));
-$params['friends'] = $page_owner->getFriends();
-$content = elgg_view_form('messages/send', array(), $params);
-
-$body = elgg_view_layout('content', array(
-	'content' => $content,
-	'title' => $title,
-	'filter' => '',
-	'buttons' => '',
-));
-
-echo elgg_view_page($title, $body);
diff --git a/mod/messages/sent.php b/mod/messages/sent.php
deleted file mode 100644
index f884643e0..000000000
--- a/mod/messages/sent.php
+++ /dev/null
@@ -1,41 +0,0 @@
-<?php
-/**
-* Elgg sent messages page
-*
-* @package ElggMessages
-*/
-
-gatekeeper();
-
-$page_owner = elgg_get_page_owner_entity();
-if (!$page_owner) {
-	register_error(elgg_echo());
-	forward();
-}
-
-elgg_push_breadcrumb(elgg_echo('messages:sent'));
-
-$title = elgg_echo('messages:sentmessages', array($page_owner->name));
-
-$list = elgg_list_entities_from_metadata(array(
-	'type' => 'object',
-	'subtype' => 'messages',
-	'metadata_name' => 'fromId',
-	'metadata_value' => elgg_get_page_owner_guid(),
-	'owner_guid' => elgg_get_page_owner_guid(),
-	'full_view' => false,
-));
-
-$body_vars = array(
-	'folder' => 'sent',
-	'list' => $list,
-);
-$content = elgg_view_form('messages/process', array(), $body_vars);
-
-$body = elgg_view_layout('content', array(
-	'content' => $content,
-	'title' => $title,
-	'filter' => '',
-));
-
-echo elgg_view_page($title, $body);
diff --git a/mod/messages/start.php b/mod/messages/start.php
index bf8272b1a..fd8b7712d 100644
--- a/mod/messages/start.php
+++ b/mod/messages/start.php
@@ -107,7 +107,7 @@ function messages_page_handler($page) {
 		$page[1] = elgg_get_logged_in_user_entity()->username;
 	}
 
-	$base_dir = elgg_get_plugins_path() . 'messages';
+	$base_dir = elgg_get_plugins_path() . 'messages/pages/messages';
 
 	switch ($page[0]) {
 		case 'inbox':
-- 
cgit v1.2.3