All line endings are now Unix-style.

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

2 files changed, 87 insertions, 87 deletions

diff --git a/actions/comments/add.php b/actions/comments/add.php
index b026c64f0..80478b9ad 100644
--- a/actions/comments/add.php
+++ b/actions/comments/add.php
@@ -1,58 +1,58 @@
-<?php

-

-	/**

-	 * Elgg add comment action

-	 * 

-	 * @package Elgg

+<?php
 
-	 * @author Curverider <curverider.co.uk>

+	/**
+	 * Elgg add comment action
+	 * 
+	 * @package Elgg
+
+	 * @author Curverider <curverider.co.uk>
+
+	 * @link http://elgg.org/
+	 */
+
+	// Make sure we're logged in; forward to the front page if not
+		gatekeeper();
+		action_gatekeeper();
+		
+	// Get input
+		$entity_guid = (int) get_input('entity_guid');
+		$comment_text = get_input('generic_comment');
+		
+	// Let's see if we can get an entity with the specified GUID
+		if ($entity = get_entity($entity_guid)) {
+			
+	        // If posting the comment was successful, say so
+				if ($entity->annotate('generic_comment',$comment_text,$entity->access_id, $_SESSION['guid'])) {
+					
+					if ($entity->owner_guid != $_SESSION['user']->getGUID())
+					notify_user($entity->owner_guid, $_SESSION['user']->getGUID(), elgg_echo('generic_comment:email:subject'), 
+						sprintf(
+									elgg_echo('generic_comment:email:body'),
+									$entity->title,
+									$_SESSION['user']->name,
+									$comment_text,
+									$entity->getURL(),
+									$_SESSION['user']->name,
+									$_SESSION['user']->getURL()
+								)
+					); 
+					
+					system_message(elgg_echo("generic_comment:posted"));
+					//add to river
+					add_to_river('annotation/annotate','comment',$_SESSION['user']->guid,$entity->guid);
+
+					
+				} else {
+					register_error(elgg_echo("generic_comment:failure"));
+				}
+				
+		} else {
+		
+			register_error(elgg_echo("generic_comment:notfound"));
+			
+		}
+		
+	// Forward to the 
+		forward($entity->getURL());
 
-	 * @link http://elgg.org/

-	 */

-

-	// Make sure we're logged in; forward to the front page if not

-		gatekeeper();

-		action_gatekeeper();

-		

-	// Get input

-		$entity_guid = (int) get_input('entity_guid');

-		$comment_text = get_input('generic_comment');

-		

-	// Let's see if we can get an entity with the specified GUID

-		if ($entity = get_entity($entity_guid)) {

-			

-	        // If posting the comment was successful, say so

-				if ($entity->annotate('generic_comment',$comment_text,$entity->access_id, $_SESSION['guid'])) {

-					

-					if ($entity->owner_guid != $_SESSION['user']->getGUID())

-					notify_user($entity->owner_guid, $_SESSION['user']->getGUID(), elgg_echo('generic_comment:email:subject'), 

-						sprintf(

-									elgg_echo('generic_comment:email:body'),

-									$entity->title,

-									$_SESSION['user']->name,

-									$comment_text,

-									$entity->getURL(),

-									$_SESSION['user']->name,

-									$_SESSION['user']->getURL()

-								)

-					); 

-					

-					system_message(elgg_echo("generic_comment:posted"));

-					//add to river

-					add_to_river('annotation/annotate','comment',$_SESSION['user']->guid,$entity->guid);

-

-					

-				} else {

-					register_error(elgg_echo("generic_comment:failure"));

-				}

-				

-		} else {

-		

-			register_error(elgg_echo("generic_comment:notfound"));

-			

-		}

-		

-	// Forward to the 

-		forward($entity->getURL());

-

 ?>
\ No newline at end of file
diff --git a/actions/comments/delete.php b/actions/comments/delete.php
index 2d3b9b3fd..dc701973b 100644
--- a/actions/comments/delete.php
+++ b/actions/comments/delete.php
@@ -1,35 +1,35 @@
-<?php

-

-	/**

-	 * Elgg delete comment action

-	 * 

-	 * @package Elgg

+<?php
 
-	 * @author Curverider <curverider.co.uk>

+	/**
+	 * Elgg delete comment action
+	 * 
+	 * @package Elgg
+
+	 * @author Curverider <curverider.co.uk>
+
+	 * @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');
+		if ($comment = get_annotation($annotation_id)) {
+    		
+    		$entity = get_entity($comment->entity_guid);
+			
+			if ($comment->canEdit()) {
+				$comment->delete();
+				system_message(elgg_echo("generic_comment:deleted"));
+				forward($entity->getURL());
+			}
+			
+		} else {
+			$url = "";
+		}
+		
+		register_error(elgg_echo("generic_comment:notdeleted"));
+		forward($entity->getURL());
 
-	 * @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');

-		if ($comment = get_annotation($annotation_id)) {

-    		

-    		$entity = get_entity($comment->entity_guid);

-			

-			if ($comment->canEdit()) {

-				$comment->delete();

-				system_message(elgg_echo("generic_comment:deleted"));

-				forward($entity->getURL());

-			}

-			

-		} else {

-			$url = "";

-		}

-		

-		register_error(elgg_echo("generic_comment:notdeleted"));

-		forward($entity->getURL());

-

 ?>
\ No newline at end of file