Standardized.

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

diff --git a/actions/comments/add.php b/actions/comments/add.php
index 0f0658837a508b08ad4a0da0d853ac834d92830a..62fc2d0e06f1956f43563ba7fa2c90927ed7a766 100644 (file)
--- a/actions/comments/add.php
+++ b/actions/comments/add.php
@@ -1,57 +1,55 @@
 <?php
+/**
+ * Elgg add comment action
+ *
+ * @package Elgg
+ * @author Curverider <curverider.co.uk>
+ * @link http://elgg.org/
+ */
 
-       /**
-        * 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
-                       $annotation = create_annotation($entity->guid, 'generic_comment', $comment_text, "", $_SESSION['guid'], $entity->access_id);
-                       if ($annotation) {
-                                       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, "", 0, $annotation);
-
-                                       
-                               } else {
-                                       register_error(elgg_echo("generic_comment:failure"));
-                               }
-                               
-               } else {
-               
-                       register_error(elgg_echo("generic_comment:notfound"));
-                       
+// 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
+       $annotation = create_annotation($entity->guid, 'generic_comment',
+               $comment_text, "", $_SESSION['guid'], $entity->access_id);
+
+       if ($annotation) {
+               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()
+                               )
+                       );
                }
-               
-       // Forward to the 
-               forward($entity->getURL());
 
-?>
\ No newline at end of file
+               system_message(elgg_echo("generic_comment:posted"));
+               //add to river
+               add_to_river('annotation/annotate','comment',$_SESSION['user']->guid,$entity->guid, "", 0, $annotation);
+       } 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 dc701973b4d42854939e10c9856dfe2fa6176e90..03e575b66859412c4fa9998f554ba059eb09ffa7 100644 (file)
--- a/actions/comments/delete.php
+++ b/actions/comments/delete.php
@@ -1,35 +1,32 @@
 <?php
+/**
+ * Elgg delete comment action
+ *
+ * @package Elgg
+ * @author Curverider <curverider.co.uk>
+ * @link http://elgg.org/
+ */
 
-       /**
-        * Elgg delete comment action
-        * 
-        * @package Elgg
+// Ensure we're logged in
+if (!isloggedin()) {
+       forward();
+}
 
-        * @author Curverider <curverider.co.uk>
+// Make sure we can get the comment in question
+$annotation_id = (int) get_input('annotation_id');
+if ($comment = get_annotation($annotation_id)) {
 
-        * @link http://elgg.org/
-        */
+       $entity = get_entity($comment->entity_guid);
 
-       // 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"));
+       if ($comment->canEdit()) {
+               $comment->delete();
+               system_message(elgg_echo("generic_comment:deleted"));
                forward($entity->getURL());
+       }
 
-?>
\ No newline at end of file
+} else {
+       $url = "";
+}
+
+register_error(elgg_echo("generic_comment:notdeleted"));
+forward($entity->getURL());
\ No newline at end of file