merging messageboard cleanup from 1.7 branch [5908],[5909],[5917]

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

2 files changed, 71 insertions, 102 deletions

diff --git a/mod/messageboard/actions/add.php b/mod/messageboard/actions/add.php
index 98ffe4b47..7b2402732 100644
--- a/mod/messageboard/actions/add.php
+++ b/mod/messageboard/actions/add.php
@@ -1,68 +1,40 @@
 <?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/
-	 */
+/**
+ * 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/
+ */
 
-	// Make sure we're logged in; forward to the front page if not
-		if (!isloggedin()) forward();
-		
-	// Get input
-		$message_content = get_input('message_content'); // the actual message
-		$page_owner = get_input("pageOwner"); // the message board owner
-		$message_owner = get_input("guid"); // the user posting the message
-		$user = get_entity($page_owner); // the message board owner's details
-		
-	// Let's see if we can get a user entity from the specified page_owner
-		if ($user && !empty($message_content)) {
-    		
-	        // If posting the comment was successful, say so
-				if ($user->annotate('messageboard',$message_content,$user->access_id, $_SESSION['user']->getGUID())) {
-					
-					global $CONFIG;
-					
-					if ($user->getGUID() != $_SESSION['user']->getGUID())
-					notify_user($user->getGUID(), $_SESSION['user']->getGUID(), elgg_echo('messageboard:email:subject'), 
-						sprintf(
-									elgg_echo('messageboard:email:body'),
-									$_SESSION['user']->name,
-									$message_content,
-									$CONFIG->wwwroot . "pg/messageboard/" . $user->username,
-									$_SESSION['user']->name,
-									$_SESSION['user']->getURL()
-								)
-					); 
-					
-    				system_message(elgg_echo("messageboard:posted"));
-    				// add to river
-				    add_to_river('river/object/messageboard/create','messageboard',$_SESSION['user']->guid,$user->guid);
+// 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
 
-					
-				} 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);
+// Let's see if we can get a user entity from the specified page_owner
+if ($user && !empty($message_content)) {
 
-?>
\ No newline at end of file
+	if (messageboard_add(get_loggedin_user(), $user, $message_content, $user->access_id)) {
+		system_message(elgg_echo("messageboard:posted"));
+	} 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);
diff --git a/mod/messageboard/actions/delete.php b/mod/messageboard/actions/delete.php
index 9c17f1fcd..c903a0d20 100644
--- a/mod/messageboard/actions/delete.php
+++ b/mod/messageboard/actions/delete.php
@@ -1,44 +1,41 @@
 <?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/
-	 */
+/**
+ * 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/
+ */
 
-	// Ensure we're logged in
-		if (!isloggedin()) forward();
-		
-	// Make sure we can get the comment in question
-		$annotation_id = (int) get_input('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();
-				//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);
-			}
-			
-		} else {
-			$url = "";
-			system_message(elgg_echo("messageboard:notdeleted"));
-		}
-		
+// Make sure we can get the comment in question
+$annotation_id = (int) get_input('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);
+	}
+
+} else {
+	$url = "";
+	system_message(elgg_echo("messageboard:notdeleted"));
+}
 
-?>
\ No newline at end of file
+forward($url);