Changeset 1107:3943962d69b8 for plugins/antispam

Timestamp:

02/27/13 11:48:32 (13 years ago)

Author:

JcDenis

Branch:

sexy

Parents:

880:02c78f56f430 (diff), 1105:ce855d61f9ce (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

merge with default branch in 2.5-RC

Location:

plugins/antispam

Files:

• _admin.php (modified) (1 diff)
• _admin.php (modified) (2 diffs)
• _define.php (modified) (1 diff)
• _disabled (added)

plugins/antispam/_admin.php

@@ -19 +19 @@
           preg_match('/plugin.php\?p=antispam(&.*)?$/',$_SERVER['REQUEST_URI']),
           $core->auth->check('admin',$core->blog->id));
-
+/*
 $core->addBehavior('coreAfterCommentUpdate',array('dcAntispam','trainFilters'));
 $core->addBehavior('adminAfterCommentDesc',array('dcAntispam','statusMessage'));
 $core->addBehavior('adminDashboardIcons',array('dcAntispam','dashboardIcon'));
-
+*/
 $core->addBehavior('adminDashboardFavs','antispamDashboardFavs');
 $core->addBehavior('adminDashboardFavsIcon','antispamDashboardFavsIcon');

plugins/antispam/_admin.php

@@ -19 +19 @@
           preg_match('/plugin.php\?p=antispam(&.*)?$/',$_SERVER['REQUEST_URI']),
           $core->auth->check('admin',$core->blog->id));
-
+/*
 $core->addBehavior('coreAfterCommentUpdate',array('dcAntispam','trainFilters'));
 $core->addBehavior('adminAfterCommentDesc',array('dcAntispam','statusMessage'));
 $core->addBehavior('adminDashboardIcons',array('dcAntispam','dashboardIcon'));
-
+*/
 $core->addBehavior('adminDashboardFavs','antispamDashboardFavs');
 $core->addBehavior('adminDashboardFavsIcon','antispamDashboardFavsIcon');
@@ -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/_define.php

@@ -16 +16 @@
      /* Description*/         "Generic antispam plugin for Dotclear",
      /* Author */             "Alain Vagner",
-     /* Version */            '1.3.1',
+     /* Version */            '1.4',
      array(
           'permissions' =>    'usage,contentadmin',