Changeset 1222 for branches/1.2

Timestamp:

02/23/10 12:08:52 (3 years ago)

Author:

nick_ramsay

Message:

[Branch 1.2] Comments 1.5 - shows messages for moderated comments: "Awaiting approval", "Exceeded Daily Limit", etc.

Location:

branches/1.2/content/plugins/comments

Files:

• comments.php (modified) (5 diffs)
• languages/comments_language.php (modified) (1 diff)
• readme.txt (modified) (2 diffs)
• templates/comment_form.php (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.4
+ * version: 1.5
  * folder: comments
  * class: Comments
@@ -158 +158 @@
         $h->comment->thisForm = $h->comment->formStatus($h, 'select'); // returns 'open' or 'closed'
 
-        if (   ($h->pageName == 'comments') 
+        if (   ($h->pageType == 'post') 
             && ($h->comment->thisForm == 'open')
             && ($h->comment->allForms == 'checked')) {
@@ -202 +202 @@
                         if ($can_comment == 'mod') { $safe = true; $h->comment->status = 'pending'; }
                         
+                        $result = array(); // holds results from addComment function
+                        
                         // Okay, safe to add the comment...
                         if ($safe) {
                             // A user can unsubscribe by submitting an empty comment, so...
                             if ($h->comment->content != '') {
-                                $h->comment->addComment($h);
+                                $result = $h->comment->addComment($h);
             
                                 // notify chosen mods of new comment by email if enabled and UserFunctions file exists
@@ -223 +225 @@
                                 //comment empty so just check subscribe box:
                                 $h->comment->updateSubscribe($h, $h->comment->postId);
+                                $h->messages[$h->lang['comment_moderation_unsubscribed']] = 'green';
                             }
+                        }
+                        
+                        if ($result['exceeded_daily_limit']) {
+                            $h->messages[$h->lang['comment_moderation_exceeded_daily_limit']] = 'green';
+                        } elseif ($result['exceeded_url_limit']) {
+                            $h->messages[$h->lang['comment_moderation_exceeded_url_limit']] = 'green';
+                        } elseif ($result['not_enough_comments']) {
+                            $h->messages[$h->lang['comment_moderation_not_enough_comments']] = 'green';
                         }
                     }
@@ -238 +249 @@
                     }
                    
+                    if ($h->comment->status == 'pending') {
+                        return false;
+                    }
+                    
                     header("Location: " . $h->url(array('page'=>$h->comment->postId)));    // Go to the post
                     die();

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

@@ -53 +53 @@
 $lang['comments_form_delete'] = "Delete this and responses";
 $lang['comments_form_moderation_on'] = "<b>Note</b>: <span style='color: red;'>All comments are moderated</span>.";
+
+/* Comment Submission */
+$lang['comment_moderation_unsubscribed'] = "You have unsubscribed from this thread.";
+$lang['comment_moderation_exceeded_daily_limit'] = "You've exceeded the daily comment limit. This and any further comments will need approval.";
+$lang['comment_moderation_exceeded_url_limit'] = "You used too many URLs so your comment will need approval.";
+$lang['comment_moderation_not_enough_comments'] = "Your comment is awaiting approval.";
 
 /* All Comments */

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

@@ -5 +5 @@
 Description
 -----------
-Enable your registered users to comment on each post. Supports avatars (e.g. Gravatar plugin), replies, unlimited nesting, editing, HTML tags (chosen by the Admin) and comment subscription. 
+Enable your registered users to comment on each post. Supports avatars (e.g. Gravatar plugin), replies, unlimited nesting, editing, HTML tags (chosen by the Admin), pagination and comment subscription. 
 
 Instructions
@@ -15 +15 @@
 Changelog
 ---------
+v.1.5 2009/02/23 - Nick - Shows messages for moderated comments: "Awaiting approval", "Exceeded Daily Limit", etc.
 v.1.4 2009/02/09 - Nick - Option to hide comments after X down votes, plus pagination code changes
 v.1.3 2009/01/17 - Nick - Added option for avatar size

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

@@ -35 +35 @@
 <?php } // JavaScript changes this form! See comments.js ?>
 
-    <form name='comment_form' action='<?php echo BASEURL; ?>index.php?page=comments' method='post'>
+    <form name='comment_form' action='<?php echo $h->url(array('page' => $h->post->id)); ?>' method='post'>
         <textarea name="comment_content" id="comment_content_<?php echo $h->comment->id; ?>" rows="6" cols="50"></textarea><br />
         <div class="comment_instructions"><?php echo $h->lang['comments_form_allowable_tags']; ?><?php echo htmlentities($h->comment->allowableTags); ?></div>