Changeset 1049:1d17674d50ad

Timestamp:

12/02/12 16:04:27 (13 years ago)

Author:

JcDenis

Branch:

default

Message:

Fix #903 : Added action "Delete all spam" to comments page.

Files:

• admin/comments.php (modified) (1 diff)
• admin/js/_comments.js (modified) (1 diff)
• inc/admin/lib.dc.page.php (modified) (1 diff)
• plugins/antispam/antispam.js (modified) (1 diff)
• plugins/antispam/index.php (modified) (4 diffs)

admin/comments.php

@@ -211 +211 @@
      if (!$with_spam) {
           $spam_count = $core->blog->getComments(array('comment_status'=>-2),true)->f(0);
-          if ($spam_count == 1) {
-               echo '<p>'.sprintf(__('You have one spam comments.'),'<strong>'.$spam_count.'</strong>').' '.
-               '<a href="comments.php?status=-2">'.__('Show it.').'</a></p>';
-          } elseif ($spam_count > 1) {
-               echo '<p>'.sprintf(__('You have %s spam comments.'),'<strong>'.$spam_count.'</strong>').' '.
-               '<a href="comments.php?status=-2">'.__('Show them.').'</a></p>';
+          
+          if (!empty($_GET['delspam'])) {
+               dcPage::message(__('Spam comments have been successfully deleted.'));
+          }
+          
+          if ($spam_count > 0) {
+               $moderationTTL = $core->blog->settings->antispam->antispam_moderation_ttl;
+               
+               echo 
+               '<form action="plugin.php?p=antispam" method="post" class="fieldset">';
+               
+               if ($spam_count == 1) {
+                    echo '<p>'.sprintf(__('You have one spam comments.'),'<strong>'.$spam_count.'</strong>').' '.
+                    '<a href="comments.php?status=-2">'.__('Show it.').'</a></p>';
+               } elseif ($spam_count > 1) {
+                    echo '<p>'.sprintf(__('You have %s spam comments.'),'<strong>'.$spam_count.'</strong>').' '.
+                    '<a href="comments.php?status=-2">'.__('Show them.').'</a></p>';
+               }
+               
+               if ($core->plugins->moduleExists('antispam')) {
+                    $spam_redir =
+                    'comments.php?type='.$type.
+                    '&author='.preg_replace('/%/','%%',$author).
+                    '&status='.$status.
+                    '&sortby='.$sortby.
+                    '&ip='.preg_replace('/%/','%%',$ip).
+                    '&order='.$order.
+                    '&page='.$page.
+                    '&nb='.$nb_per_page;
+                    
+                    echo
+                    $core->formNonce().
+                    form::hidden('ts',time()).
+                    form::hidden('redir',$spam_redir).
+                    '<input name="delete_all_spam" class="delete" type="submit" value="'.__('Delete all spams').'" /></p>';
+               }
+               
+               if ($moderationTTL != null && $moderationTTL >=0) {
+                    echo '<p>'.sprintf(__('All spam comments older than %s day(s) will be automatically deleted.'), $moderationTTL).' '.
+                    __('You can modify this duration in ').
+                    '<a href="blog_pref.php"> '.__('Blog preferences').'</a></p>';
+               }
+               echo '</form>';
           }
      }

admin/js/_comments.js

@@ -115 +115 @@
      $('#form-comments td input[type=checkbox]').enableShiftClick();
      dotclear.commentsActionsHelper();
+     $('form input[type=submit][name=delete_all_spam]').click(function(){
+          return window.confirm(dotclear.msg.confirm_spam_delete);
+     });
 });

inc/admin/lib.dc.page.php

@@ -433 +433 @@
           self::jsVar('dotclear.msg.confirm_delete_post',
                __("Are you sure you want to delete this entry?")).
+          self::jsVar('dotclear.msg.confirm_spam_delete',
+               __('Are you sure you want to delete all spams?')).
           self::jsVar('dotclear.msg.confirm_delete_comments',
                __('Are you sure you want to delete selected comments (%s)?')).

plugins/antispam/antispam.js

@@ -4 +4 @@
           dragsort.makeTableSortable(this,dotclear.sortable.setHandle, dotclear.sortable.saveOrder);
      });
-     $('form input[type=submit][name=delete_all]').click(function(){
+     $('form input[type=submit][name=delete_all_spam]').click(function(){
           return window.confirm(dotclear.msg.confirm_spam_delete);
      });

plugins/antispam/index.php

@@ -20 +20 @@
 $default_tab = null;
 
+$redir = isset($_POST['redir']) && strpos($_POST['redir'],'://') === false ?
+     $_POST['redir'] : $p_url;
+
 try
 {
@@ -38 +41 @@
 
      # Remove all spam
-     if (!empty($_POST['delete_all']))
+     if (!empty($_POST['delete_all_spam']))
      {
           $ts = dt::str('%Y-%m-%d %H:%M:%S',$_POST['ts'],$core->blog->settings->system->blog_timezone);
 
           dcAntispam::delAllSpam($core,$ts);
-          http::redirect($p_url.'&del=1');
+          http::redirect($redir.'&delspam=1');
      }
 
@@ -138 +141 @@
      '<h3>'.__('Information').'</h3>';
 
-     if (!empty($_GET['del'])) {
+     if (!empty($_GET['delspam'])) {
           dcPage::message(__('Spam comments have been successfully deleted.'));
      }
@@ -155 +158 @@
           '<p>'.$core->formNonce().
           form::hidden('ts',time()).
-          '<input name="delete_all" class="delete" type="submit" value="'.__('Delete all spams').'" /></p>';
+          '<input name="delete_all_spam" class="delete" type="submit" value="'.__('Delete all spams').'" /></p>';
      }
      if ($moderationTTL != null && $moderationTTL >=0) {