2 files changed, 24 insertions, 50 deletions

diff --git a/mod/messageboard/actions/add.php b/mod/messageboard/actions/add.php
index 7b2402732..971dd22fc 100644
--- a/mod/messageboard/actions/add.php
+++ b/mod/messageboard/actions/add.php
@@ -1,40 +1,38 @@
 <?php
-
 /**
  * Elgg Message board: add message action
  *
  * @package ElggMessageBoard
- * @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/
  */
 
-// Get input
-$message_content = get_input('message_content'); // the actual message
-$page_owner = get_input("pageOwner"); // the message board owner
-$user = get_entity($page_owner); // the message board owner's details
+$message_content = get_input('message_content');
+$owner_guid = get_input("owner_guid");
+$owner = get_entity($owner_guid);
 
-// Let's see if we can get a user entity from the specified page_owner
-if ($user && !empty($message_content)) {
+if ($owner && !empty($message_content)) {
+	$result = messageboard_add(elgg_get_logged_in_user_entity(), $owner, $message_content, $owner->access_id);
 
-	if (messageboard_add(get_loggedin_user(), $user, $message_content, $user->access_id)) {
+	if ($result) {
 		system_message(elgg_echo("messageboard:posted"));
+
+		$options = array(
+			'annotations_name' => 'messageboard',
+			'guid' => $owner->getGUID(),
+			'limit' => $num_display,
+			'pagination' => false,
+			'reverse_order_by' => true,
+			'limit' => 1
+		);
+
+		$output = elgg_list_annotations($options);
+		echo $output;
+
 	} else {
 		register_error(elgg_echo("messageboard:failure"));
 	}
 
-	//set the url to return the user to the correct message board
-	$url = "pg/messageboard/" . $user->username;
-
 } else {
-
 	register_error(elgg_echo("messageboard:blank"));
-
-	//set the url to return the user to the correct message board
-	$url = "pg/messageboard/" . $user->username;
-
 }
 
-// Forward back to the messageboard
-forward($url);
+forward(REFERER);
diff --git a/mod/messageboard/actions/delete.php b/mod/messageboard/actions/delete.php
index c903a0d20..a1f62278c 100644
--- a/mod/messageboard/actions/delete.php
+++ b/mod/messageboard/actions/delete.php
@@ -1,41 +1,17 @@
 <?php
-
 /**
  * Elgg Message board: delete message action
  *
  * @package ElggMessageBoard
- * @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/
  */
 
-// Make sure we can get the comment in question
 $annotation_id = (int) get_input('annotation_id');
+$message = elgg_get_annotation_from_id($annotation_id);
 
-//make sure that there is a message on the message board matching the passed id
-if ($message = get_annotation($annotation_id)) {
-
-	//grab the user or group entity
-	$entity = get_entity($message->entity_guid);
-
-	//check to make sure the current user can actually edit the message board
-	if ($message->canEdit()) {
-		//delete the comment
-		$message->delete();
-		// delete river entry
-		remove_from_river_by_annotation($annotation_id);
-		//display message
-		system_message(elgg_echo("messageboard:deleted"));
-		//generate the url to forward to
-		$url = "pg/messageboard/" . $entity->username;
-		//forward the user back to their message board
-		forward($url);
-	}
-
+if ($message && $message->canEdit() && $message->delete()) {
+	system_message(elgg_echo("messageboard:deleted"));
 } else {
-	$url = "";
 	system_message(elgg_echo("messageboard:notdeleted"));
 }
 
-forward($url);
+forward(REFERER);