Merged messages interface changes.

git-svn-id: http://code.elgg.org/elgg/trunk@5270 36083f99-b078-4883-b0ff-0f9b5a30f544

1 files changed, 41 insertions, 40 deletions

diff --git a/mod/messages/send.php b/mod/messages/send.php
index 61e0c162d..ecab60073 100644
--- a/mod/messages/send.php
+++ b/mod/messages/send.php
@@ -1,41 +1,42 @@
 <?php
-
-	/**
-	 * Elgg send a message page
-	 *
-	 * @package ElggMessages
-	 * @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.com/
-	 */
-
-	// Load Elgg engine
-		require_once(dirname(dirname(dirname(__FILE__))) . "/engine/start.php");
-
-	// If we're not logged in, forward to the front page
-		gatekeeper(); // if (!isloggedin()) forward();
-
-	// 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());
-		}
-
-	// Get the users friends; this is used in the drop down to select who to send the message to
-		$friends = $_SESSION['user']->getFriends('', 9999);
-
-	// Set the page title
-		$area2 = elgg_view_title(elgg_echo("messages:sendmessage"));
-
-	// Get the send form
-		$area2 .= elgg_view("messages/forms/message",array('friends' => $friends));
-
-	// Format
-		$body = elgg_view_layout("two_column_left_sidebar", '', $area2);
-
-	// Draw page
-		page_draw(sprintf(elgg_echo('messages:send'),$page_owner->name),$body);
-
-?>
\ No newline at end of file
+/**
+* Elgg send a message page
+*
+* @package ElggMessages
+* @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.com/
+*/
+
+// Load Elgg engine
+require_once(dirname(dirname(dirname(__FILE__))) . "/engine/start.php");
+
+// If we're not logged in, forward to the front page
+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());
+}
+
+// Get the users friends; this is used in the drop down to select who to send the message to
+$user = get_loggedin_user();
+$friends = $user->getFriends('', 9999);
+
+// Set the page title
+$area2 = elgg_view_title(elgg_echo("messages:sendmessage"));
+
+// Get the send form
+$area2 .= elgg_view("messages/forms/send",array('friends' => $friends));
+
+// Sidebar menu options
+$area3 = elgg_view("messages/menu_options");
+
+// Format
+$body = elgg_view_layout("one_column_with_sidebar", $area3, $area2);
+
+// Draw page
+page_draw(sprintf(elgg_echo('messages:send'),$page_owner->name),$body);
\ No newline at end of file