Changeset 1052:de274bbd7b80 for plugins

Timestamp:

12/03/12 14:14:58 (13 years ago)

Author:

franck <carnet.franck.paul@…>

Branch:

default

Message:

Cope with junk comments without antispam plugin enabled (addresses #903)

Location:

plugins/antispam

Files:

• _admin.php (modified) (1 diff)
• antispam.js (modified) (1 diff)
• index.php (modified) (4 diffs)

plugins/antispam/_admin.php

@@ -49 +49 @@
      $core->addBehavior('adminBlogPreferencesForm',array('antispamBehaviors','adminBlogPreferencesForm'));
      $core->addBehavior('adminBeforeBlogSettingsUpdate',array('antispamBehaviors','adminBeforeBlogSettingsUpdate'));
+     $core->addBehavior('adminCommentsSpamForm',array('antispamBehaviors','adminCommentsSpamForm'));
 }
 
 class antispamBehaviors
 {
+     public static function adminCommentsSpamForm($core)
+     {
+          $ttl = $core->blog->settings->antispam->antispam_moderation_ttl;
+          if ($ttl != null && $ttl >=0) {
+               echo '<p>'.sprintf(__('All spam comments older than %s day(s) will be automatically deleted.'), $ttl).' '.
+               sprintf(__('You can modify this duration in the %s'),'<a href="blog_pref.php"> '.__('Blog preferences').'</a>').
+               '</p>';
+          }
+     }
+
      public static function adminBlogPreferencesForm($core,$settings)
      {

plugins/antispam/antispam.js

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