Changeset 1296 for branches/1.2/content/plugins

Timestamp:

03/11/10 14:24:36 (3 years ago)

Author:

nick_ramsay

Message:

[Branch 1.2] Comments 1.7 - Fix for a previous change that broke the set pending and delete links within comments.

Location:

branches/1.2/content/plugins/comments

Files:

• comments.php (modified) (3 diffs)
• readme.txt (modified) (1 diff)

branches/1.2/content/plugins/comments/comments.php

@@ -3 +3 @@
  * name: Comments
  * description: Enables logged-in users to comment on posts
- * version: 1.6
+ * version: 1.7
  * folder: comments
  * class: Comments
@@ -148 +148 @@
         }
         
-        if ($h->pageName == 'comments') {
+        if ($h->pageName == 'comments')
+        {
+            // set current comment and responses to pending:
+            if ($h->cage->get->getAlpha('action') == 'setpending') { 
+            
+                // before setting pending, we need to be certain this user has permission:
+                if ($h->currentUser->getPermission('can_set_comments_pending') == 'yes') {
+                    $cid = $h->cage->get->testInt('cid'); // comment id
+                    $comment = $h->comment->getComment($h, $cid);
+                    $h->comment->readComment($h, $comment); // read comment
+                    $h->comment->status = 'pending'; // set to pending
+                    $h->comment->editComment($h);  // update this comment
+
+                    $h->comment->postId = $h->cage->get->testInt('pid');  // post id
+                    $h->comment->setPendingCommentTree($h,$cid);   // set all responses to 'pending', too.
+                    
+                    // redirect back to thread:
+                    $h->post = new Post();
+                    $h->readPost($h->comment->postId);
+                    header("Location: " . $h->url(array('page'=>$h->post->id)));    // Go to the post
+                    die();
+                }
+            }
+            
+            // delete current comment and responses:
+            if ($h->cage->get->getAlpha('action') == 'delete') { 
+            
+                // before deleting a comment, we need to be certain this user has permission:
+                if ($h->currentUser->getPermission('can_delete_comments') == 'yes') {
+                    $cid = $h->cage->get->testInt('cid'); // comment id
+                    $comment = $h->comment->getComment($h, $cid);
+                    $h->comment->readComment($h, $comment); // read comment
+                    
+                    $h->pluginHook('comments_delete_comment');
+                    
+                    $h->comment->deleteComment($h, $cid); // delete this comment
+                    $h->comment->deleteCommentTree($h, $cid);   // delete all responses, too.
+                    
+                    $h->clearCache('html_cache', false); // clear HTML cache to refresh Comments and Activity widgets
+                    
+                    $h->comment->postId = $h->cage->get->testInt('pid');  // post id
+                    
+                    // redirect back to thread:
+                    $h->readPost($h->comment->postId);
+                    header("Location: " . $h->url(array('page'=>$h->comment->postId)));    // Go to the post
+                    die();
+                }
+            }
+            
+            // FOR THE COMMENTS PAGE:
             $h->pageTitle = $h->lang['comments'];
             if ($h->cage->get->keyExists('user')) {
@@ -257 +306 @@
                     
                 }
-                
-                // set current comment and responses to pending:
-                if ($h->cage->get->getAlpha('action') == 'setpending') { 
-                
-                    // before setting pending, we need to be certain this user has permission:
-                    if ($h->currentUser->getPermission('can_set_comments_pending') == 'yes') {
-                        $cid = $h->cage->get->testInt('cid'); // comment id
-                        $comment = $h->comment->getComment($h, $cid);
-                        $h->comment->readComment($h, $comment); // read comment
-                        $h->comment->status = 'pending'; // set to pending
-                        $h->comment->editComment($h);  // update this comment
-    
-                        $h->comment->postId = $h->cage->get->testInt('pid');  // post id
-                        $h->comment->setPendingCommentTree($h,$cid);   // set all responses to 'pending', too.
-                        
-                        // redirect back to thread:
-                        $h->post = new Post();
-                        $h->readPost($h->comment->postId);
-                        header("Location: " . $h->url(array('page'=>$h->post->id)));    // Go to the post
-                        die();
-                    }
-                }
-                
-                // delete current comment and responses:
-                if ($h->cage->get->getAlpha('action') == 'delete') { 
-                
-                    // before deleting a comment, we need to be certain this user has permission:
-                    if ($h->currentUser->getPermission('can_delete_comments') == 'yes') {
-                        $cid = $h->cage->get->testInt('cid'); // comment id
-                        $comment = $h->comment->getComment($h, $cid);
-                        $h->comment->readComment($h, $comment); // read comment
-                        
-                        $h->pluginHook('comments_delete_comment');
-                        
-                        $h->comment->deleteComment($h, $cid); // delete this comment
-                        $h->comment->deleteCommentTree($h, $cid);   // delete all responses, too.
-                        
-                        $h->clearCache('html_cache', false); // clear HTML cache to refresh Comments and Activity widgets
-                        
-                        $h->comment->postId = $h->cage->get->testInt('pid');  // post id
-                        
-                        // redirect back to thread:
-                        $h->readPost($h->comment->postId);
-                        header("Location: " . $h->url(array('page'=>$h->comment->postId)));    // Go to the post
-                        die();
-                    }
-                }
-    
             }
             

branches/1.2/content/plugins/comments/readme.txt

@@ -15 +15 @@
 Changelog
 ---------
+v.1.7 2010/03/11 - Nick - Fix for a previous change that broke the set pending and delete links within comments.
 v.1.6 2010/02/26 - Nick - Adds link to profile navigation; Email changed to go through Hotaru's "email" function 
 v.1.5 2010/02/23 - Nick - Shows messages for moderated comments: "Awaiting approval", "Exceeded Daily Limit", etc.